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

提交台账变更推送前置逻辑

Browse Source
This commit is contained in:
hzj
2025-04-23 15:27:48 +08:00
parent 2f909e100c
commit b8ea00c47d
3 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/DeviceFeignClient.java
View File

@@ -38,7 +38,7 @@ public interface DeviceFeignClient {
@RequestParam("nextTimeCheck") String nextTimeCheck); @RequestParam("nextTimeCheck") String nextTimeCheck);
@PostMapping("/updateDevComFlag") @PostMapping("/updateDevComFlag")
@ApiOperation("修改装置通讯状态") @ApiOperation("修改装置通讯状态及时间")
HttpResult<Boolean> updateDevComFlag(@RequestBody DevComFlagDTO devComFlagDTO); HttpResult<Boolean> updateDevComFlag(@RequestBody DevComFlagDTO devComFlagDTO);
} }

5
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.nio.charset.StandardCharsets;
import java.util.List; import java.util.List;
import java.util.Objects;
/** /**
@@ -180,10 +181,10 @@ public class DeviceController extends BaseController {
@OperateInfo(info = LogEnum.SYSTEM_COMMON) @OperateInfo(info = LogEnum.SYSTEM_COMMON)
@PostMapping("/updateDevComFlag") @PostMapping("/updateDevComFlag")
@ApiOperation("修改装置通讯状态") @ApiOperation("修改装置通讯状态及时间")
public HttpResult<Boolean> updateDevComFlag(@RequestBody DevComFlagDTO devComFlagDTO) { public HttpResult<Boolean> updateDevComFlag(@RequestBody DevComFlagDTO devComFlagDTO) {
String methodDescribe = getMethodDescribe("updateDevComFlag"); 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); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, update, methodDescribe);
} }

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

@@ -3695,13 +3695,16 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
List<String> updateDevIds = new ArrayList<>(); List<String> updateDevIds = new ArrayList<>();
List<String> lineIds = list.stream().filter(temp -> Objects.equals(temp.getTerminalType(), 6)).map(PqsTerminalLogs::getObjIndex).distinct().collect(Collectors.toList()); List<String> lineIds = list.stream().filter(temp -> Objects.equals(temp.getTerminalType(), 6)).map(PqsTerminalLogs::getObjIndex).distinct().collect(Collectors.toList());
List<String> devIds = list.stream().filter(temp -> Objects.equals(temp.getTerminalType(), 4)).map(PqsTerminalLogs::getObjIndex).distinct().collect(Collectors.toList()); List<String> devIds = list.stream().filter(temp -> Objects.equals(temp.getTerminalType(), 4)).map(PqsTerminalLogs::getObjIndex).distinct().collect(Collectors.toList());
if(!CollectionUtils.isEmpty(lineIds)){
//更新的终端
List<Line> lineById = this.getLineById(lineIds);
List<String> devIdList = lineById.stream().map(temp -> {
return temp.getPids().split(",")[4];
}).distinct().collect(Collectors.toList());
updateDevIds.addAll(devIdList);
}
//更新的终端
List<Line> lineById = this.getLineById(lineIds);
List<String> devIdList = lineById.stream().map(temp -> {
return temp.getPids().split(",")[4];
}).distinct().collect(Collectors.toList());
updateDevIds.addAll(devIdList);
updateDevIds.addAll(devIds); updateDevIds.addAll(devIds);
if(!CollectionUtils.isEmpty(delDevIds)){ if(!CollectionUtils.isEmpty(delDevIds)){
updateDevIds.removeAll(delDevIds); updateDevIds.removeAll(delDevIds);