From 9eab6c28e4954de0fa6afc8120d8dd3e10d664dc Mon Sep 17 00:00:00 2001
From: chendaofei <857448963@qq.com>
Date: Tue, 13 May 2025 15:12:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=B0=E8=B4=A6=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../njcn/device/pq/service/impl/TerminalBaseServiceImpl.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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