From 03caef0034cbb339ae02a378db786d1a5360dc52 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期二, 12 三月 2024 16:58:59 +0800
Subject: [PATCH] 2024-03-12 朱宝民 根据取水口编号获取绑定记录、根据条件获取控制器

---
 pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerSv.java |   68 ++++++++++++++++++++++++++--------
 1 files changed, 52 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 b479db8..9fb3d15 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
@@ -1,7 +1,10 @@
 package com.dy.pipIrrProject.controller;
 
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONArray;
 import com.dy.common.webUtil.QueryResultVo;
 import com.dy.pipIrrGlobal.daoPr.PrControllerMapper;
+import com.dy.pipIrrGlobal.daoPr.PrIntakeMapper;
 import com.dy.pipIrrGlobal.pojoPr.PrController;
 import com.dy.pipIrrGlobal.voPr.VoController;
 import lombok.extern.slf4j.Slf4j;
@@ -12,6 +15,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 
 /**
  * @author ZhuBaoMin
@@ -26,6 +30,9 @@
     @Autowired
     private PrControllerMapper prControllerMapper;
 
+    @Autowired
+    private PrIntakeMapper prIntakeMapper;
+
     /**
      * 鏍规嵁鎸囧畾鑾峰彇鎺у埗鍣ㄨ褰�
      * @param queryVo
@@ -37,18 +44,8 @@
         Long itemTotal = prControllerMapper.getRecordCount(params);
 
         QueryResultVo<List<VoController>> rsVo = new QueryResultVo<>() ;
-        Integer pageCurr = 0;
-        Integer pageSize = 10000;
-        rsVo.pageCurr = 1;
-        rsVo.pageSize = 10000;
-        if(queryVo.pageSize != null && queryVo.pageCurr != null) {
-            rsVo.pageSize = queryVo.pageSize ;
-            rsVo.pageCurr = queryVo.pageCurr;
-            pageSize = queryVo.pageSize ;
-            pageCurr = (Integer.parseInt(params.get("pageCurr").toString()) - 1) * Integer.parseInt(params.get("pageSize").toString());
-        }
-        params.put("pageCurr", pageCurr);
-        params.put("pageSize", pageSize);
+        rsVo.pageSize = queryVo.pageSize ;
+        rsVo.pageCurr = queryVo.pageCurr ;
 
         rsVo.calculateAndSet(itemTotal, params);
         rsVo.obj = prControllerMapper.getControllers(params);
@@ -65,12 +62,12 @@
     }
 
     /**
-     * 鏍规嵁鎺у埗鍣ㄧ紪鍙疯幏鍙栨帶鍒跺櫒鍒楄〃
-     * @param controllerCode
+     * 鏍规嵁鎺у埗鍣ㄥ湴鍧�鑾峰彇鎺у埗鍣ㄥ垪琛�
+     * @param rtuAddr
      * @return
      */
-    public List<Map<String, Object>> getControllersByCode(String controllerCode) {
-        return prControllerMapper.getControllersByCode(controllerCode);
+    public List<Map<String, Object>> getControllersByAddr(String rtuAddr) {
+        return prControllerMapper.getControllersByAddr(rtuAddr);
     }
 
     /**
@@ -93,4 +90,43 @@
         rsVo = prControllerMapper.getControllers(params);
         return rsVo ;
     }
+
+    /**
+     * 鏍规嵁鎺у埗鍣ㄧ紪鍙疯幏鍙栨湭鍒犻櫎鐨勬帶鍒跺櫒鏁伴噺
+     * @param controllerId
+     * @return
+     */
+    public Integer getRecordCountOfController(Long controllerId) {
+        return prControllerMapper.getRecordCountOfController(controllerId);
+    }
+    /**
+     * 鏍规嵁鎺у埗鍣ㄧ紪鍙疯幏鍙栧凡缁戝畾璁板綍鏁�
+     * @param controllerId
+     * @return
+     */
+    public Integer getBindedCount(Long controllerId) {
+        return prControllerMapper.getBindedCount(controllerId);
+    }
+
+    /**
+     * 鏍规嵁涓婚敭鍒犻櫎澶栭敭
+     * @param controllerId
+     * @return
+     */
+    public Integer deleteIntakeId(Long controllerId) {
+        return prControllerMapper.deleteIntakeId(controllerId);
+    }
+
+    /**
+     * 鑾峰彇鏈粦鎺у埗鍣ㄧ殑鍙栨按鍙ｅ垪琛�
+     * @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));
+        }
+        return array;
+    }
 }

--
Gitblit v1.8.0