From f439a4f2c82ba21d477177e4c43c2fdc9300f247 Mon Sep 17 00:00:00 2001
From: xy <748613696@qq.com>
Date: Fri, 26 Jun 2026 15:22:20 +0800
Subject: [PATCH] =?UTF-8?q?fix(device):=20=E4=BF=AE=E5=A4=8D=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E6=9C=8D=E5=8A=A1=E4=B8=AD=E7=9A=84=E5=BE=AA=E7=8E=AF?=
 =?UTF-8?q?=E6=AC=A1=E6=95=B0=E5=92=8C=E6=8E=92=E5=BA=8F=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将等待设备上线的循环次数从3次增加到10次
- 为负载侧和电源侧拓扑图参数添加正确的排序值设置
- 移除重复的排序设置逻辑，避免数据冲突
- 确保设备数据集按正确顺序进行初始化配置
---
 .../com/njcn/access/service/impl/CsDeviceServiceImpl.java   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDeviceServiceImpl.java b/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDeviceServiceImpl.java
index 8659435..f786c7f 100644
--- a/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDeviceServiceImpl.java
+++ b/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDeviceServiceImpl.java
@@ -191,7 +191,7 @@ public class CsDeviceServiceImpl implements ICsDeviceService {
         Object model = null;
         try {
             String key = AppRedisKey.LINE + nDid;
-            for (int i = 0; i < 3 ; i++) {
+            for (int i = 0; i < 10 ; i++) {
                 Thread.sleep(1000);
                 model = redisUtil.getObjectByKey(key);
                 if (!Objects.isNull(model)){
@@ -277,6 +277,7 @@ public class CsDeviceServiceImpl implements ICsDeviceService {
                     param.setId(uuid);
                     appLineTopologyDiagramPo.setLineId(uuid);
                     po.setClDid(1);
+                    param.setSort(1);
                 } else if (Objects.equals(DicDataEnum.LOAD_SIDE.getCode(),location)){
                     if (!Objects.isNull(clDidToIdMap.get(2))) {
                         uuid = clDidToIdMap.get(2);
@@ -291,6 +292,7 @@ public class CsDeviceServiceImpl implements ICsDeviceService {
                     param.setId(uuid);
                     appLineTopologyDiagramPo.setLineId(uuid);
                     po.setClDid(2);
+                    param.setSort(2);
                 } else {
                     if (!Objects.isNull(clDidToIdMap.get(0))) {
                         uuid = clDidToIdMap.get(0);
@@ -303,6 +305,7 @@ public class CsDeviceServiceImpl implements ICsDeviceService {
                     String dataSetId = Objects.requireNonNull(dataSets.stream().filter(it -> Objects.equals(it.getClDev(), 0)&&Objects.equals(it.getType(), 0)).findFirst().orElse(null)).getId();
                     po.setDataSetId(dataSetId);
                     param.setId(uuid);
+                    param.setSort(0);
                     appLineTopologyDiagramPo.setLineId(uuid);
                 }
                 po.setStatus(1);
@@ -310,7 +313,6 @@ public class CsDeviceServiceImpl implements ICsDeviceService {
                 param.setPid(vo.getId());
                 param.setName(item.getName());
                 param.setLevel(3);
-                param.setSort(po.getClDid());
                 csLedgerService.addLedgerTree(param);
                 appLineTopologyDiagramPo.setId(devAccessParam.getTopologyDiagram());
                 appLineTopologyDiagramPo.setLat(item.getLat());