From 9a096e808f24e953dcfcdb1383a05032187bd819 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期四, 28 三月 2024 18:55:30 +0800
Subject: [PATCH] 修改 监测站编号获取绑定记录接口 ID由Long变为String

---
 pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerSv.java |   49 +++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 41 insertions(+), 8 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..362b1ca 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,6 +2,7 @@
 
 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;
@@ -12,7 +13,11 @@
 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;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -38,8 +43,13 @@
     @Autowired
     private PrIntakeControllerMapper prIntakeControllerMapper;
 
+    @Autowired
+    private RestTemplate restTemplate;
+
+
     /**
      * 鏍规嵁鎸囧畾鑾峰彇鎺у埗鍣ㄨ褰�
+     *
      * @param queryVo
      * @return
      */
@@ -48,17 +58,32 @@
 
         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 ;
+
+
+        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;
     }
 
     /**
      * 娣诲姞鎺у埗鍣�
+     *
      * @param po
      * @return
      */
@@ -77,6 +102,7 @@
 
     /**
      * 鏍规嵁鎺у埗鍣ㄥ湴鍧�鑾峰彇鎺у埗鍣ㄥ垪琛�
+     *
      * @param rtuAddr
      * @return
      */
@@ -86,6 +112,7 @@
 
     /**
      * 鏍规嵁鎺у埗鍣ㄧ紪鍙烽�昏緫鍒犻櫎鎺у埗
+     *
      * @param controllerId
      * @return
      */
@@ -95,6 +122,7 @@
 
     /**
      * 鏍规嵁鎸囧畾鏉′欢瀵煎嚭鎺у埗鍣ㄥ垪琛�
+     *
      * @param queryVo
      * @return
      */
@@ -102,19 +130,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 +155,7 @@
 
     /**
      * 鏍规嵁涓婚敭鍒犻櫎澶栭敭
+     *
      * @param controllerId
      * @return
      */
@@ -133,13 +165,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