From 5a94b6d8b443918cc7b192597b87d44718deb151 Mon Sep 17 00:00:00 2001
From: xy <748613696@qq.com>
Date: Mon, 23 Sep 2024 20:33:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BE=BF=E6=90=BA=E5=BC=8F=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=201.=E8=BD=AF=E4=BB=B6=E4=BF=A1=E6=81=AF=E5=85=BC=E5=AE=B9?=
 =?UTF-8?q?=EF=BC=9B=202.=E7=9B=91=E6=B5=8B=E7=82=B9=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=85=BC=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../access/handler/MqttMessageHandler.java    | 38 ++++++++++---------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/iot-access/access-boot/src/main/java/com/njcn/access/handler/MqttMessageHandler.java b/iot-access/access-boot/src/main/java/com/njcn/access/handler/MqttMessageHandler.java
index b09c0d7..478c90c 100644
--- a/iot-access/access-boot/src/main/java/com/njcn/access/handler/MqttMessageHandler.java
+++ b/iot-access/access-boot/src/main/java/com/njcn/access/handler/MqttMessageHandler.java
@@ -393,27 +393,29 @@ public class MqttMessageHandler {
                                     List<CsDevCapacityPO> list = new ArrayList<>();
                                     devInfo.forEach(item->{
                                         //1.更新治理监测点信息
+                                        CsLineParam csLineParam = new CsLineParam();
                                         if (Objects.equals(item.getClDid(),0)){
-                                            CsLineParam csLineParam = new CsLineParam();
                                             csLineParam.setLineId(nDid.concat("0"));
-                                            csLineParam.setVolGrade(item.getVolGrade());
-                                            csLineParam.setPtRatio(item.getPtRatio());
-                                            csLineParam.setCtRatio(item.getCtRatio());
-                                            csLineParam.setConType(item.getConType());
-                                            csLineFeignClient.updateLine(csLineParam);
+                                            //2.录入各个模块设备容量
+                                            CsDevCapacityPO csDevCapacity = new CsDevCapacityPO();
+                                            csDevCapacity.setLineId(nDid.concat("0"));
+                                            csDevCapacity.setCldid(item.getClDid());
+                                            csDevCapacity.setCapacity(Objects.isNull(item.getCapacityA())?0.0:item.getCapacityA());
+                                            list.add(csDevCapacity);
+                                        } else {
+                                            csLineParam.setLineId(nDid.concat(item.getClDid().toString()));
                                         }
-                                        //2.录入各个模块设备容量
-                                        CsDevCapacityPO csDevCapacity = new CsDevCapacityPO();
-                                        csDevCapacity.setLineId(nDid.concat("0"));
-                                        csDevCapacity.setCldid(item.getClDid());
-                                        csDevCapacity.setCapacity(Objects.isNull(item.getCapacityA())?0.0:item.getCapacityA());
-                                        list.add(csDevCapacity);
+                                        csLineParam.setVolGrade(item.getVolGrade());
+                                        csLineParam.setPtRatio(item.getPtRatio());
+                                        csLineParam.setCtRatio(item.getCtRatio());
+                                        csLineParam.setConType(item.getConType());
+                                        csLineFeignClient.updateLine(csLineParam);
                                     });
-                                    devCapacityFeignClient.addList(list);
-                                    //3.更新设备模块个数
-                                    equipmentFeignClient.updateModuleNumber(nDid,(devInfo.size()-1));
-                                    //4.询问监测点pt/ct信息
-                                    //askDevData(nDid,version,3,(res.getMid()+1));
+                                    if (CollectionUtil.isNotEmpty(list)) {
+                                        devCapacityFeignClient.addList(list);
+                                        //3.更新设备模块个数
+                                        equipmentFeignClient.updateModuleNumber(nDid,(devInfo.size()-1));
+                                    }
                                 } else if (Objects.equals(res.getDid(),2)) {
                                     logDto.setOperate(nDid + "更新电网侧、负载侧监测点信息");
                                     //1.更新电网侧、负载侧监测点相关信息
@@ -680,7 +682,7 @@ public class MqttMessageHandler {
         askDataDto.setEndTime(-1);
         switch (type) {
             case 1:
-                reqAndResParam.setDid(2);
+                reqAndResParam.setDid(0);
                 askDataDto.setCldid(0);
                 askDataDto.setDataType(1);
                 break;