From 685a6664f4d83256421cfd4b177908c8da1d4c2f Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期二, 21 五月 2024 14:01:01 +0800
Subject: [PATCH] 田间灌溉项目管理 修改灌溉单元查一个接口 变为id
---
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerSv.java | 33 +++++++++++++++++----------------
1 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerSv.java
index 362b1ca..090d07f 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerSv.java
@@ -3,6 +3,9 @@
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
+import com.dy.common.mw.protocol.Command;
+import com.dy.common.webUtil.BaseResponse;
+import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.pipIrrGlobal.daoPr.PrControllerMapper;
import com.dy.pipIrrGlobal.daoPr.PrIntakeControllerMapper;
@@ -10,19 +13,24 @@
import com.dy.pipIrrGlobal.pojoPr.PrController;
import com.dy.pipIrrGlobal.pojoPr.PrIntakeController;
import com.dy.pipIrrGlobal.voPr.VoController;
+import com.dy.pipIrrProject.result.ProjectResultCode;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.common.utils.PojoUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpMethod;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestClientException;
import org.springframework.web.client.RestTemplate;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Optional;
+
+import static com.dy.common.mw.protocol.CommandType.innerCommand;
/**
* @author ZhuBaoMin
@@ -65,19 +73,6 @@
rsVo.calculateAndSet(itemTotal, params);
rsVo.obj = prControllerMapper.getControllers(params);
-
- ArrayList<Object> list = new ArrayList<>();
- List<VoController> controllers = prControllerMapper.getControllers(params);
- for (int i = 0; i < controllers.size(); i++) {
- VoController controller = controllers.get(i);
- String rtuAddr = controller.getRtuAddr();
- list.add(rtuAddr);
- }
- String url = "http://localhost:8080/accMw/com/send";
- HttpEntity<?> httpEntity = new HttpEntity<>(list);
- ResponseEntity<String> entity = restTemplate.exchange(url, HttpMethod.GET, httpEntity, String.class);
- JSONObject data = JSONObject.parseObject(entity.getBody()).getJSONObject("data");
- data.getString("rtuAddr");
return rsVo;
}
@@ -88,7 +83,10 @@
* @return
*/
public Integer addController(PrController po) {
- prControllerMapper.insert(po);
+ int rows = prControllerMapper.insert(po);
+ if(rows == 0) {
+ return 0;
+ }
PrIntakeController addPrIntakeController = new PrIntakeController();
addPrIntakeController.setIntakeid(po.getIntakeId());
addPrIntakeController.setControllerid(po.getId());
@@ -96,8 +94,11 @@
addPrIntakeController.setOperator(po.getOperator());
addPrIntakeController.setOperatedt(po.getOperateDt());
addPrIntakeController.setRemarks("缁戝畾");
- prIntakeControllerMapper.insert(addPrIntakeController);
- return 1;
+ int rec = prIntakeControllerMapper.insert(addPrIntakeController);
+ if(rec == 0) {
+ return 0;
+ }
+ return 1 ;
}
/**
--
Gitblit v1.8.0