From cebf0cafac47189c48f49ad9dd13cb5894341b4f Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期日, 02 六月 2024 20:26:35 +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 |   54 +++++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 45 insertions(+), 9 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 9fb3d15..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
@@ -4,13 +4,16 @@
 import com.alibaba.fastjson2.JSONArray;
 import com.dy.common.webUtil.QueryResultVo;
 import com.dy.pipIrrGlobal.daoPr.PrControllerMapper;
+import com.dy.pipIrrGlobal.daoPr.PrIntakeControllerMapper;
 import com.dy.pipIrrGlobal.daoPr.PrIntakeMapper;
 import com.dy.pipIrrGlobal.pojoPr.PrController;
+import com.dy.pipIrrGlobal.pojoPr.PrIntakeController;
 import com.dy.pipIrrGlobal.voPr.VoController;
 import lombok.extern.slf4j.Slf4j;
 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;
@@ -33,8 +36,16 @@
     @Autowired
     private PrIntakeMapper prIntakeMapper;
 
+    @Autowired
+    private PrIntakeControllerMapper prIntakeControllerMapper;
+
+    @Autowired
+    private RestTemplate restTemplate;
+
+
     /**
      * 鏍规嵁鎸囧畾鑾峰彇鎺у埗鍣ㄨ褰�
+     *
      * @param queryVo
      * @return
      */
@@ -43,26 +54,44 @@
 
         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) {
-        return 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());
+        addPrIntakeController.setOperatetype((byte) 1);
+        addPrIntakeController.setOperator(po.getOperator());
+        addPrIntakeController.setOperatedt(po.getOperateDt());
+        addPrIntakeController.setRemarks("缁戝畾");
+        int rec = prIntakeControllerMapper.insert(addPrIntakeController);
+        if(rec == 0) {
+            return 0;
+        }
+        return 1 ;
     }
 
     /**
      * 鏍规嵁鎺у埗鍣ㄥ湴鍧�鑾峰彇鎺у埗鍣ㄥ垪琛�
+     *
      * @param rtuAddr
      * @return
      */
@@ -72,6 +101,7 @@
 
     /**
      * 鏍规嵁鎺у埗鍣ㄧ紪鍙烽�昏緫鍒犻櫎鎺у埗
+     *
      * @param controllerId
      * @return
      */
@@ -81,6 +111,7 @@
 
     /**
      * 鏍规嵁鎸囧畾鏉′欢瀵煎嚭鎺у埗鍣ㄥ垪琛�
+     *
      * @param queryVo
      * @return
      */
@@ -88,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
      */
@@ -110,6 +144,7 @@
 
     /**
      * 鏍规嵁涓婚敭鍒犻櫎澶栭敭
+     *
      * @param controllerId
      * @return
      */
@@ -119,13 +154,14 @@
 
     /**
      * 鑾峰彇鏈粦鎺у埗鍣ㄧ殑鍙栨按鍙ｅ垪琛�
+     *
      * @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