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

pmsbug修改

Browse Source
This commit is contained in:
hzj
2025-07-16 20:00:23 +08:00
parent 5f1f42f8d7
commit 74808dbd05
13 changed files with 327 additions and 171 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/DeviceController.java
View File

@@ -26,6 +26,7 @@ import org.springframework.web.bind.annotation.*;
import java.nio.charset.StandardCharsets;
import java.util.List;
import java.util.Objects;
/**
@@ -183,7 +184,7 @@ public class DeviceController extends BaseController {
@ApiOperation("修改装置通讯状态")
public HttpResult<Boolean> updateDevComFlag(@RequestBody DevComFlagDTO devComFlagDTO) {
String methodDescribe = getMethodDescribe("updateDevComFlag");
boolean update = iDeviceService.lambdaUpdate().set(Device::getComFlag, devComFlagDTO.getStatus()).set(Device::getUpdateTime, devComFlagDTO.getDate()).eq(Device::getId, devComFlagDTO.getId()).update();
boolean update = iDeviceService.lambdaUpdate().set(Objects.nonNull(devComFlagDTO.getStatus()), Device::getComFlag,devComFlagDTO.getStatus()).set(Device::getUpdateTime, devComFlagDTO.getDate()).eq(Device::getId, devComFlagDTO.getId()).update();
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, update, methodDescribe);
}

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

@@ -121,13 +121,13 @@ public class TerminalBaseController extends BaseController {
}
terminalBaseService.addTerminal(addTerminalParam);
//新增终端后发送消息给前置重启设备
if (Objects.nonNull(addTerminalParam.getDeviceParam())) {
addTerminalParam.getDeviceParam().forEach(temp->{
Line line = terminalBaseService.queryTerminalByName(temp.getName());
terminalBaseService.askRestartDevice(line.getId(), DeviceRebootType.ADD_TERMINAL);
});
}
// if (Objects.nonNull(addTerminalParam.getDeviceParam())) {
// addTerminalParam.getDeviceParam().forEach(temp->{
// Line line = terminalBaseService.queryTerminalByName(temp.getName());
// terminalBaseService.askRestartDevice(line.getId(), DeviceRebootType.ADD_TERMINAL);
// });
//
// }
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
}
@@ -163,7 +163,7 @@ public class TerminalBaseController extends BaseController {
Boolean b = terminalBaseService.terminalSyncDeleteFly(lineId);
//删除监测点即修改终端通知前置重启
terminalBaseService.askRestartDevice(devId,DeviceRebootType.LEDGER_MODIFY);
// terminalBaseService.askRestartDevice(devId,DeviceRebootType.LEDGER_MODIFY);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, b, methodDescribe);
}

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

@@ -1513,7 +1513,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
lineLambdaQueryWrapper.in(DeptLine::getLineId, lineIndexList);
deptLineMapper.delete(lineLambdaQueryWrapper);
// 删除终端通知前置重启
this.askRestartDevice(id,DeviceRebootType.DELETE_TERMINAL);
// this.askRestartDevice(id,DeviceRebootType.DELETE_TERMINAL);
}
@@ -1535,8 +1535,8 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
lineLambdaQueryWrapper.in(DeptLine::getLineId, lineIndexList);
deptLineMapper.delete(lineLambdaQueryWrapper);
//通知前置删除监测点
String[] split = obj.getPids().split(",");
this.askRestartDevice(split[4],DeviceRebootType.LEDGER_MODIFY);
// String[] split = obj.getPids().split(",");
// this.askRestartDevice(split[4],DeviceRebootType.LEDGER_MODIFY);
}
@@ -1547,8 +1547,8 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
overlimitMapper.deleteById(obj.getId());
deptLineMapper.deleteById(obj.getId());
//通知前置删除监测点
String[] split = obj.getPids().split(",");
this.askRestartDevice(split[4],DeviceRebootType.LEDGER_MODIFY);
// String[] split = obj.getPids().split(",");
// this.askRestartDevice(split[4],DeviceRebootType.LEDGER_MODIFY);
} else {
throw new BusinessException(CommonResponseEnum.FAIL);