|
|
|
@ -328,7 +328,7 @@ public class BasedataDeviceServiceImpl implements IBasedataDeviceService { |
|
|
|
List<BasedataDevice> mainDeviceExistPointList = new ArrayList<>(); |
|
|
|
if (!mainDevices.isEmpty()) { |
|
|
|
Iterator<BasedataDevice> iterator = mainDevices.iterator(); |
|
|
|
|
|
|
|
logger.info("---111-------mainDevices:{}", mainDevices); |
|
|
|
BasedataDevice mainDevice; |
|
|
|
BasedataPatrolPoint basedataPatrolpoint; |
|
|
|
while (iterator.hasNext()) { |
|
|
|
@ -354,7 +354,7 @@ public class BasedataDeviceServiceImpl implements IBasedataDeviceService { |
|
|
|
} |
|
|
|
|
|
|
|
iterator = mainDeviceExistPointList.iterator(); |
|
|
|
|
|
|
|
logger.info("---222-------mainDeviceExistPointList:{}", mainDeviceExistPointList); |
|
|
|
label70: |
|
|
|
while (true) { |
|
|
|
List patrolpointList; |
|
|
|
@ -374,7 +374,7 @@ public class BasedataDeviceServiceImpl implements IBasedataDeviceService { |
|
|
|
} while (patrolpointList.isEmpty()); |
|
|
|
|
|
|
|
Iterator iterator1 = patrolpointList.iterator(); |
|
|
|
|
|
|
|
logger.info("---333-------patrolpointList:{}", patrolpointList); |
|
|
|
BasedataPatrolPoint patrolpoint; |
|
|
|
while (iterator1.hasNext()) { |
|
|
|
patrolpoint = (BasedataPatrolPoint) iterator1.next(); |
|
|
|
@ -417,7 +417,7 @@ public class BasedataDeviceServiceImpl implements IBasedataDeviceService { |
|
|
|
basedataPatrolpointPreset.setPatrolPointId(patrolpoint.getPatrolPointId()); |
|
|
|
patrolpointPresetS = this.basedataPatrolPointPresetMapper.selectBasedataPatrolPointPresetList(basedataPatrolpointPreset); |
|
|
|
} while (patrolpointPresetS.isEmpty()); |
|
|
|
|
|
|
|
logger.info("---444-------patrolpointPresetS:{}", patrolpointPresetS); |
|
|
|
HashMap<Long, Long> map = new HashMap<>(); |
|
|
|
for (Object patrolPointPreset : patrolpointPresetS) { |
|
|
|
BasedataPatrolPointPreset preset = (BasedataPatrolPointPreset) patrolPointPreset; |
|
|
|
@ -426,6 +426,7 @@ public class BasedataDeviceServiceImpl implements IBasedataDeviceService { |
|
|
|
pointPreSetTreeVO.setParentId(patrolpoint.getDeviceId() + "-" + patrolpoint.getPatrolPointId()); |
|
|
|
pointPreSetTreeVO.setEqpbookId(preset.getEqpBookId()); |
|
|
|
pointPreSetTreeVO.setPresetCode(preset.getPresetCode()); |
|
|
|
logger.info("---555-------BasedataPatrolPointPreset:{}", preset); |
|
|
|
if (null != preset.getEqpBookId()) { |
|
|
|
BasedataEqpBook basedataEqpbook = this.basedataEqpbookMapper.selectBasedataEqpBookByEqpBookId(preset.getEqpBookId()); |
|
|
|
if (null != basedataEqpbook) { |
|
|
|
@ -445,7 +446,7 @@ public class BasedataDeviceServiceImpl implements IBasedataDeviceService { |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
logger.info("----------------mainDevVOS:{} ", mainDevVOS); |
|
|
|
return (List<ProMainDevicePatrolEquTreeSelect>) ProMainDevicePatrolEquTreeSelectUtil.buildDeviceTree(mainDevVOS); |
|
|
|
} |
|
|
|
|
|
|
|
|