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());