diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java index 4b7d4e0e0..ecb5ec9c4 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java @@ -1502,6 +1502,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl imple this.removeById(deviceId); deviceMapper.deleteById(deviceId); deviceProcessService.removeById(deviceId); + // 1. 查询并删除所有母线 List busbars = findChildren(deviceId); if (CollectionUtil.isEmpty(busbars)) { @@ -1518,8 +1519,6 @@ public class TerminalBaseServiceImpl extends ServiceImpl imple // 2. 对每条母线删除其下级 busbarIds.forEach(it-> deleteBusbarAndChildren(it,logsList)); - // 3. 通知设备重启 - // askRestartDevice(deviceId, DeviceRebootType.DELETE_TERMINAL); } private void deleteBusbarAndChildren(String busbarId,List logsList) { @@ -1605,6 +1604,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl imple break; case DEVICE_LEVEL: deleteDeviceAndChildren(obj.getId(),logsList); + logsList.add(obj); break; case SUB_V_LEVEL: deleteBusbarAndChildren(obj.getId(),logsList);