Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

台账日志

Browse Source
This commit is contained in:
chendaofei
2025-05-13 15:12:43 +08:00
parent 0e3ece7007
commit 9eab6c28e4
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java
View File

@@ -1502,6 +1502,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
this.removeById(deviceId); this.removeById(deviceId);
deviceMapper.deleteById(deviceId); deviceMapper.deleteById(deviceId);
deviceProcessService.removeById(deviceId); deviceProcessService.removeById(deviceId);
// 1. 查询并删除所有母线 // 1. 查询并删除所有母线
List<Line> busbars = findChildren(deviceId); List<Line> busbars = findChildren(deviceId);
if (CollectionUtil.isEmpty(busbars)) { if (CollectionUtil.isEmpty(busbars)) {
@@ -1518,8 +1519,6 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
// 2. 对每条母线删除其下级 // 2. 对每条母线删除其下级
busbarIds.forEach(it-> deleteBusbarAndChildren(it,logsList)); busbarIds.forEach(it-> deleteBusbarAndChildren(it,logsList));
// 3. 通知设备重启
// askRestartDevice(deviceId, DeviceRebootType.DELETE_TERMINAL);
} }
private void deleteBusbarAndChildren(String busbarId,List<Line> logsList) { private void deleteBusbarAndChildren(String busbarId,List<Line> logsList) {
@@ -1605,6 +1604,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
break; break;
case DEVICE_LEVEL: case DEVICE_LEVEL:
deleteDeviceAndChildren(obj.getId(),logsList); deleteDeviceAndChildren(obj.getId(),logsList);
logsList.add(obj);
break; break;
case SUB_V_LEVEL: case SUB_V_LEVEL:
deleteBusbarAndChildren(obj.getId(),logsList); deleteBusbarAndChildren(obj.getId(),logsList);