From 2b3defc58765bdd126901b809448868a5f8feb3c Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期三, 29 五月 2024 15:12:56 +0800
Subject: [PATCH] 2024-05-29 朱宝民
---
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerSv.java | 44 +++++++++++++++++++++++++++++++++-----------
1 files changed, 33 insertions(+), 11 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 70235e1..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
@@ -13,6 +13,7 @@
import org.apache.dubbo.common.utils.PojoUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestTemplate;
import java.util.ArrayList;
import java.util.List;
@@ -38,8 +39,13 @@
@Autowired
private PrIntakeControllerMapper prIntakeControllerMapper;
+ @Autowired
+ private RestTemplate restTemplate;
+
+
/**
* 鏍规嵁鎸囧畾鑾峰彇鎺у埗鍣ㄨ褰�
+ *
* @param queryVo
* @return
*/
@@ -48,22 +54,27 @@
Long itemTotal = prControllerMapper.getRecordCount(params);
- QueryResultVo<List<VoController>> rsVo = new QueryResultVo<>() ;
- rsVo.pageSize = queryVo.pageSize ;
- rsVo.pageCurr = queryVo.pageCurr ;
+ QueryResultVo<List<VoController>> rsVo = new QueryResultVo<>();
+ rsVo.pageSize = queryVo.pageSize;
+ rsVo.pageCurr = queryVo.pageCurr;
rsVo.calculateAndSet(itemTotal, params);
rsVo.obj = prControllerMapper.getControllers(params);
- return rsVo ;
+
+ return rsVo;
}
/**
* 娣诲姞鎺у埗鍣�
+ *
* @param po
* @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());
@@ -71,12 +82,16 @@
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 ;
}
/**
* 鏍规嵁鎺у埗鍣ㄥ湴鍧�鑾峰彇鎺у埗鍣ㄥ垪琛�
+ *
* @param rtuAddr
* @return
*/
@@ -86,6 +101,7 @@
/**
* 鏍规嵁鎺у埗鍣ㄧ紪鍙烽�昏緫鍒犻櫎鎺у埗
+ *
* @param controllerId
* @return
*/
@@ -95,6 +111,7 @@
/**
* 鏍规嵁鎸囧畾鏉′欢瀵煎嚭鎺у埗鍣ㄥ垪琛�
+ *
* @param queryVo
* @return
*/
@@ -102,19 +119,22 @@
Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo);
List<VoController> rsVo = new ArrayList<>();
rsVo = prControllerMapper.getControllers(params);
- return rsVo ;
+ return rsVo;
}
/**
* 鏍规嵁鎺у埗鍣ㄧ紪鍙疯幏鍙栨湭鍒犻櫎鐨勬帶鍒跺櫒鏁伴噺
+ *
* @param controllerId
* @return
*/
public Integer getRecordCountOfController(Long controllerId) {
return prControllerMapper.getRecordCountOfController(controllerId);
}
+
/**
* 鏍规嵁鎺у埗鍣ㄧ紪鍙疯幏鍙栧凡缁戝畾璁板綍鏁�
+ *
* @param controllerId
* @return
*/
@@ -124,6 +144,7 @@
/**
* 鏍规嵁涓婚敭鍒犻櫎澶栭敭
+ *
* @param controllerId
* @return
*/
@@ -133,13 +154,14 @@
/**
* 鑾峰彇鏈粦鎺у埗鍣ㄧ殑鍙栨按鍙e垪琛�
+ *
* @return
*/
public JSONArray getNoBindingIntakes() {
List<Map<String, Object>> list = Optional.ofNullable(prIntakeMapper.getNoBindingIntakes()).orElse(new ArrayList<>());
- JSONArray array= null;
- if(list.size() > 0) {
- array= JSONArray.parseArray(JSON.toJSONString(list));
+ JSONArray array = null;
+ if (list.size() > 0) {
+ array = JSONArray.parseArray(JSON.toJSONString(list));
}
return array;
}
--
Gitblit v1.8.0