From cf30dd4d7622429b06aa0ffeca4d1eeed4d3749e Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 23 五月 2024 08:53:10 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerSv.java | 29 +++++++++--------------------
1 files changed, 9 insertions(+), 20 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..32ae257 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
@@ -2,7 +2,6 @@
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONArray;
-import com.alibaba.fastjson2.JSONObject;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.pipIrrGlobal.daoPr.PrControllerMapper;
import com.dy.pipIrrGlobal.daoPr.PrIntakeControllerMapper;
@@ -13,9 +12,6 @@
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.HttpMethod;
-import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
import org.springframework.web.client.RestTemplate;
@@ -65,19 +61,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 +71,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 +82,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