From 1d43866363b4f3c01fb419b78e250bfb6cc3a637 Mon Sep 17 00:00:00 2001 From: yinhuaiwei Date: Tue, 28 Oct 2025 09:49:20 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E9=92=88=E5=AF=B9=E5=A2=9E=E9=87=8F?= =?UTF-8?q?=E6=83=85=E5=86=B5=E4=B8=8B=E7=9A=84=E6=A8=A1=E5=9E=8B=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=EF=BC=8C=E6=8F=92=E5=85=A5device=E8=A1=A8=E6=97=B6old?= =?UTF-8?q?AreaId=E5=9C=A8redis=E5=8F=AF=E8=83=BD=E8=AF=BB=E5=8F=96?= =?UTF-8?q?=E4=B8=8D=E5=88=B0=E4=BB=8E=E8=80=8C=E5=80=BC=E4=B8=BA0?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BasedataMontPatrolPointHandleComponent.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/component/BasedataMontPatrolPointHandleComponent.java b/inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/component/BasedataMontPatrolPointHandleComponent.java index 6d6606a..bc1a5c7 100644 --- a/inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/component/BasedataMontPatrolPointHandleComponent.java +++ b/inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/component/BasedataMontPatrolPointHandleComponent.java @@ -602,10 +602,16 @@ public class BasedataMontPatrolPointHandleComponent { String areaName = deviceKey.split(StringUtils.COLON)[3]; device.setOldDeviceId(sendCode + "_main_" + deviceId); List basedataDeviceList = this.basedataDeviceService.selectBasedataDeviceList(device); - Long pid; + Long pid = 0L; if (CollectionUtils.isEmpty(basedataDeviceList)) { ++count1; - pid = (Long) this.redisTemplate.opsForValue().get(oldAreaId); + BaseDataArea area = new BaseDataArea(); + area.setOldAreaId(sendCode + "_" + oldAreaId); + List areaList = this.baseDataAreaService.selectAreaList(area); + if (!CollectionUtils.isEmpty(areaList)) { + BaseDataArea baseDataArea = areaList.get(0); + pid = baseDataArea.getAreaId(); + } device.setParentId(0L); device.setOldAreaName(areaName); device.setOldAreaId(sendCode + "_" + oldAreaId); @@ -699,7 +705,7 @@ public class BasedataMontPatrolPointHandleComponent { bayData.setOldParentId(sendCode + "_" + oldPid); this.baseDataAreaService.insertArea(bayData); } else { - if(baseDataAreaList.size() > 0) { + if (baseDataAreaList.size() > 0) { bayData = baseDataAreaList.get(0); bayData.setAreaName(bayName); this.baseDataAreaService.updateArea(bayData); From 86f3bf9e52b1f3326e66ba52314dbb138353ea8d Mon Sep 17 00:00:00 2001 From: yinhuaiwei Date: Tue, 28 Oct 2025 10:13:22 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BB=BB=E5=8A=A1=E7=8A=B6=E6=80=81?= =?UTF-8?q?=EF=BC=88=E9=99=A4=E4=BA=86=E5=B7=B2=E5=AE=8C=E6=88=90=E7=9A=84?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=EF=BC=89=E6=94=AF=E6=8C=81=E7=94=B1=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E4=B8=BB=E5=8A=A8=E4=B8=8A=E6=8A=A5=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PatrolResultController.java | 30 ++++++++----------- 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java index 9357cd4..2075d85 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java @@ -1155,28 +1155,22 @@ public class PatrolResultController extends BaseController { patrolTaskStatusItem.setCode(channelCode); } } - // 设备上报暂停、终止或超期限制状态时，更新任务状态和结束时间 - if (patrolTaskStatusItem.getTaskState() != null && - (/*patrolTaskStatusItem.getTaskState().equals(TaskStatus.DONE.getCode()) || */ - patrolTaskStatusItem.getTaskState().equals(TaskStatus.HALTED.getCode()) - || patrolTaskStatusItem.getTaskState().equals(TaskStatus.EXPIRED.getCode()) - || patrolTaskStatusItem.getTaskState().equals(TaskStatus.PAUSED.getCode()))) { - patrolTaskStatusItem.setTaskState(patrolTaskStatusItem.getTaskState()); - patrolTaskStatusItem.setEndTime(DateUtils.parseDateToStr(DateUtils.yyyyMMddHHmmss2, new Date())); - - List statusList = patrolTaskStatusService.selectPatrolTaskStatusList(PatrolTaskStatus.builder().taskPatrolledId(patrolTaskStatusItem.getTaskPatrolledId()).build()); - if (!statusList.isEmpty()) { - PatrolTaskStatus taskStatus = statusList.get(0); - taskStatus.setTaskState(patrolTaskStatusItem.getTaskState()); - taskStatus.setEndTime(DateUtils.parseDateToStr(DateUtils.yyyyMMddHHmmss2, new Date())); - logger.info("GET_INFO_41 UPDATE TASK_STATE TO HALTED taskStatus: {}", taskStatus); - iPatrolTaskStatusService.updatePatrolTaskStatusOfTaskStateAndEndTime(taskStatus); - } - } List patrolTaskStatusList = iPatrolTaskStatusService.selectPatrolTaskStatusList(patrolTaskStatus); logger.info("GET_INFO_41 ROBOT_TASK_STATUS patrolTaskStatusList: {}", patrolTaskStatusList); if (!patrolTaskStatusList.isEmpty()) { PatrolTaskStatus patrolTaskStatusOfDb = patrolTaskStatusList.get(0); + // 除了上报完成状态，当db状态与上报状态不一致时，更新db状态 + if(!patrolTaskStatusItem.getTaskState().equals(TaskStatus.DONE.getCode()) && !patrolTaskStatusOfDb.getTaskState().equals(patrolTaskStatusItem.getTaskState())) { + logger.info("GET_INFO_41 UPDATE TASK_STATE old: {} TO new: {}", patrolTaskStatusOfDb.getTaskState(), patrolTaskStatusItem.getTaskState()); + patrolTaskStatusOfDb.setTaskState(patrolTaskStatusItem.getTaskState()); + // 如果上报状态为终止或超期限制状态时，需更新终止时间 + if(patrolTaskStatusItem.getTaskState().equals(TaskStatus.HALTED.getCode())|| patrolTaskStatusItem.getTaskState().equals(TaskStatus.EXPIRED.getCode())) { + String endTime = DateUtils.parseDateToStr(DateUtils.yyyyMMddHHmmss2, new Date()); + patrolTaskStatusItem.setEndTime(endTime); + patrolTaskStatusOfDb.setEndTime(endTime); + } + iPatrolTaskStatusService.updatePatrolTaskStatusOfTaskState(patrolTaskStatusOfDb); + } double runProgress = 0.0; double dbProgress = 0.0; try {