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 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 implements TerminalBaseService { - private final DeviceMapper deviceMapper; private final SuperDataMapper superDataMapper; private final IPqsTerminalLogsService iPqsTerminalLogsService; @@ -1511,7 +1510,8 @@ public class TerminalBaseServiceImpl extends ServiceImpl imple LambdaQueryWrapper 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 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);