From 37c6e522812069c6d3c40a0f386568cb5f9230df Mon Sep 17 00:00:00 2001
From: hzj <826100833@qq.com>
Date: Thu, 13 Mar 2025 16:57:24 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../njcn/device/pq/controller/TerminalBaseController.java   | 3 +--
 .../device/pq/service/impl/TerminalBaseServiceImpl.java     | 6 ++++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/TerminalBaseController.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/TerminalBaseController.java
index 4d73bff8b..e4a846ca7 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/TerminalBaseController.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/TerminalBaseController.java
@@ -211,8 +211,7 @@ public class TerminalBaseController extends BaseController {
     public HttpResult<Object> delTerminal(@RequestParam("id") String id) {
         String methodDescribe = getMethodDescribe("delTerminal");
         terminalBaseService.delTerminal(id);
-//        删除终端通知前置重启
-        terminalBaseService.askRestartDevice(id,DeviceRebootType.DELETE_TERMINAL);
+
 
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
     }
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 21a11dd2d..9f1c029f3 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
@@ -93,7 +93,6 @@ import java.util.stream.Stream;
 @Service
 @RequiredArgsConstructor
 public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> implements TerminalBaseService {
-
     private final DeviceMapper deviceMapper;
     private final SuperDataMapper superDataMapper;
     private final IPqsTerminalLogsService iPqsTerminalLogsService;
@@ -1511,7 +1510,8 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
                         LambdaQueryWrapper<DeptLine> lineLambdaQueryWrapper = new LambdaQueryWrapper<>();
                         lineLambdaQueryWrapper.in(DeptLine::getLineId, lineIndexList);
                         deptLineMapper.delete(lineLambdaQueryWrapper);
-
+                        //        删除终端通知前置重启
+                        this.askRestartDevice(id,DeviceRebootType.DELETE_TERMINAL);
 
                     }
 
@@ -1542,6 +1542,8 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
             lineDetailMapper.deleteById(obj.getId());
             overlimitMapper.deleteById(obj.getId());
             deptLineMapper.deleteById(obj.getId());
+            String[] split = obj.getPids().split(",");
+            this.askRestartDevice(split[4],DeviceRebootType.LEDGER_MODIFY);
 
         } else {
             throw new BusinessException(CommonResponseEnum.FAIL);