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

bug修改

Browse Source
This commit is contained in:
hzj
2025-03-13 16:57:24 +08:00
parent 533cf97495
commit 37c6e52281
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/TerminalBaseController.java
View File

@@ -211,8 +211,7 @@ public class TerminalBaseController extends BaseController {
public HttpResult<Object> delTerminal(@RequestParam("id") String id) { public HttpResult<Object> delTerminal(@RequestParam("id") String id) {
String methodDescribe = getMethodDescribe("delTerminal"); String methodDescribe = getMethodDescribe("delTerminal");
terminalBaseService.delTerminal(id); terminalBaseService.delTerminal(id);
// 删除终端通知前置重启
terminalBaseService.askRestartDevice(id,DeviceRebootType.DELETE_TERMINAL);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
} }

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

@@ -93,7 +93,6 @@ import java.util.stream.Stream;
@Service @Service
@RequiredArgsConstructor @RequiredArgsConstructor
public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> implements TerminalBaseService { public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> implements TerminalBaseService {
private final DeviceMapper deviceMapper; private final DeviceMapper deviceMapper;
private final SuperDataMapper superDataMapper; private final SuperDataMapper superDataMapper;
private final IPqsTerminalLogsService iPqsTerminalLogsService; private final IPqsTerminalLogsService iPqsTerminalLogsService;
@@ -1511,7 +1510,8 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
LambdaQueryWrapper<DeptLine> lineLambdaQueryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<DeptLine> lineLambdaQueryWrapper = new LambdaQueryWrapper<>();
lineLambdaQueryWrapper.in(DeptLine::getLineId, lineIndexList); lineLambdaQueryWrapper.in(DeptLine::getLineId, lineIndexList);
deptLineMapper.delete(lineLambdaQueryWrapper); 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()); lineDetailMapper.deleteById(obj.getId());
overlimitMapper.deleteById(obj.getId()); overlimitMapper.deleteById(obj.getId());
deptLineMapper.deleteById(obj.getId()); deptLineMapper.deleteById(obj.getId());
String[] split = obj.getPids().split(",");
this.askRestartDevice(split[4],DeviceRebootType.LEDGER_MODIFY);
} else { } else {
throw new BusinessException(CommonResponseEnum.FAIL); throw new BusinessException(CommonResponseEnum.FAIL);