台账日志

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