From f27eb8fbd596d4c11374c9b0e006ed3b4f93cd03 Mon Sep 17 00:00:00 2001 From: htjcAdmin Date: Fri, 29 Aug 2025 14:47:46 +0800 Subject: [PATCH] =?UTF-8?q?/*=E8=A7=A3=E5=86=B3=E9=B2=81=E8=83=BD=E6=9C=BA?= =?UTF-8?q?=E5=99=A8=E7=8B=97=E4=BB=BB=E5=8A=A1=E4=B8=8A=E6=8A=A5=E8=BF=87?= =?UTF-8?q?=E7=A8=8B=E4=B8=AD=E5=87=BA=E7=8E=B0=E7=9A=84=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98*/?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PatrolTaskExecController.java | 2 +- .../controller/PatrolResultController.java | 37 +++++++++++++------ .../mapper/PatrolTaskStatusMapper.java | 2 + .../service/IPatrolTaskStatusService.java | 2 + .../impl/PatrolTaskStatusServiceImpl.java | 4 ++ .../mapper/task/PatrolTaskStatusMapper.xml | 9 +++++ .../BasedataMontHeartBeatConsumerHandle.java | 4 +- 7 files changed, 46 insertions(+), 14 deletions(-) diff --git a/inspect-main/inspect-main-task-exec/src/main/java/com/inspect/exec/controller/PatrolTaskExecController.java b/inspect-main/inspect-main-task-exec/src/main/java/com/inspect/exec/controller/PatrolTaskExecController.java index 0ed6b39..01cbcd9 100644 --- a/inspect-main/inspect-main-task-exec/src/main/java/com/inspect/exec/controller/PatrolTaskExecController.java +++ b/inspect-main/inspect-main-task-exec/src/main/java/com/inspect/exec/controller/PatrolTaskExecController.java @@ -237,7 +237,7 @@ public class PatrolTaskExecController extends BaseController { @PostMapping({"/selectPatrolTaskStatusByTaskPatrolledId"}) public PatrolTaskStatus selectPatrolTaskStatusByTaskPatrolledId(String taskPatrolledId) { - log.info("taskPatrolledId: {}", taskPatrolledId); + //log.info("taskPatrolledId: {}", taskPatrolledId); return patrolTaskStatusService.selectPatrolTaskStatusByTaskPatrolledId(taskPatrolledId); } 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 cce908c..ce24ae5 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 @@ -1117,13 +1117,14 @@ public class PatrolResultController extends BaseController { final String jsonArrayStr = String.valueOf(jsonArray); List patrolTaskStatusListItems = JSONArray.parseArray(jsonArrayStr, PatrolTaskStatus.class); + logger.info("GET_INFO_41 ROBOT_TASK_STATUS size: {}", patrolTaskStatusListItems.size()); if (!patrolTaskStatusListItems.isEmpty()) { for (PatrolTaskStatus patrolTaskStatusItem : patrolTaskStatusListItems) { PatrolTask patrolTask = new PatrolTask(); patrolTask.setTaskCode(patrolTaskStatusItem.getTaskCode()); List patrolTaskListOfDb = patrolTaskService.selectPatrolTaskList(patrolTask); if (StringUtils.isEmpty(patrolTaskStatusItem.getTaskCode()) || CollectionUtils.isEmpty(patrolTaskListOfDb)) { - logger.info("TASK CODE: {} NO EXIST, SKIP IT!", patrolTaskStatusItem.getTaskCode()); + logger.info("GET_INFO_41 ROBOT_TASK_STATUS CODE {} NO EXIST, SKIP IT!", patrolTaskStatusItem.getTaskCode()); } else { try { sendWebsocket(patrolTaskStatusItem); @@ -1148,7 +1149,7 @@ public class PatrolResultController extends BaseController { patrolTaskStatusItem.setCode(channelCode); } } - List patrolTaskStatusList = iPatrolTaskStatusService.selectPatrolTaskStatusList(patrolTaskStatus); + if (patrolTaskStatusItem.getTaskState() != null && (patrolTaskStatusItem.getTaskState().equals(TaskStatus.DONE.getCode()) || patrolTaskStatusItem.getTaskState().equals(TaskStatus.HALTED.getCode()) @@ -1156,23 +1157,36 @@ public class PatrolResultController extends BaseController { patrolTaskStatusItem.setTaskState(patrolTaskStatusItem.getTaskState()); patrolTaskStatusItem.setEndTime(DateUtils.parseDateToStr(DateUtils.yyyyMMddHHmmss2, new Date())); } + List patrolTaskStatusList = iPatrolTaskStatusService.selectPatrolTaskStatusList(patrolTaskStatus); + logger.info("GET_INFO_41 ROBOT_TASK_STATUS patrolTaskStatusList: {}", patrolTaskStatusList); if (!patrolTaskStatusList.isEmpty()) { PatrolTaskStatus patrolTaskStatusOfDb = patrolTaskStatusList.get(0); double runProgress = 0.0; double dbProgress = 0.0; try { - String runProgressStr = patrolTaskStatusItem.getTaskProgress().replaceAll("[^0-9]", ""); - String dbProgressStr = patrolTaskStatusOfDb.getTaskProgress().replaceAll("[^0-9]", ""); + String runProgressStr = patrolTaskStatusItem.getTaskProgress().replaceAll("[^0-9.]", ""); + String taskProgressFromDb = patrolTaskStatusOfDb.getTaskProgress(); + logger.info("GET_INFO_41 ROBOT_TASK_STATUS taskProgress: {}", taskProgressFromDb); + String dbProgressStr = taskProgressFromDb.replaceAll("[^0-9.]", ""); runProgress = Double.parseDouble(runProgressStr); dbProgress = Double.parseDouble(dbProgressStr); + logger.info("patrol_task_status calc number, taskPatrolledId: {}, runProgressStr: {}, dbProgressStr: {}, run_progress: {}, db_progress: {}, cal_progress: {}", + patrolTaskStatusItem.getTaskPatrolledId(), + runProgressStr, + dbProgressStr, + runProgress, + dbProgress, + patrolTaskStatusOfDb.getTaskEstimatedTime()); } catch (Exception e) { - logger.error("patrol_task_status error number, run_progress: {}, db_progress: {}, cal_progress: {}", + logger.error("patrol_task_status error number, taskPatrolledId: {}, run_progress: {}, db_progress: {}, cal_progress: {}", + patrolTaskStatusItem.getTaskPatrolledId(), patrolTaskStatusItem.getTaskProgress(), patrolTaskStatusOfDb.getTaskProgress(), patrolTaskStatusOfDb.getTaskEstimatedTime()); } - logger.info("patrol_task_status run_progress: {}, db_progress: {}, cal_progress: {}", + logger.info("patrol_task_status taskPatrolledId: {}, run_progress: {}, db_progress: {}, cal_progress: {}", + patrolTaskStatusItem.getTaskPatrolledId(), runProgress, dbProgress, patrolTaskStatusOfDb.getTaskEstimatedTime()); @@ -1218,8 +1232,8 @@ public class PatrolResultController extends BaseController { RedisConst.TASK_CURRENT_CODE + patrolTaskStatusItem.getTaskCode(), patrolTaskStatusOfDb.getTaskEstimatedTime()); patrolTaskStatusItem.setTaskState(TaskStatus.RUNNING.getCode()); - patrolTaskStatusItem.setTaskEstimatedTime(patrolTaskStatusOfDb.getTaskEstimatedTime()); - i = iPatrolTaskStatusService.updatePatrolTaskStatus(patrolTaskStatusItem); + patrolTaskStatusItem.setTaskProgress(String.valueOf(runProgress)); + i = iPatrolTaskStatusService.updatePatrolTaskStatusRunning(patrolTaskStatusItem); } } } @@ -1254,7 +1268,7 @@ public class PatrolResultController extends BaseController { } return toAjax(i); } else { - logger.info("items empty!!!"); + logger.info("GET_INFO_41 ROBOT_TASK_STATUS EMPTY"); } } catch (Exception e) { logger.error("error", e); @@ -2340,8 +2354,9 @@ public class PatrolResultController extends BaseController { double runProgress = 0.0; double dbProgress = 0.0; - String input = "100%"; - String input2 = input.replaceAll("[^0-9]", ""); + //String input = "100%"; + String input = "3.0"; + String input2 = input.replaceAll("[^0-9.]", ""); try { runProgress = Double.parseDouble(input2); } catch (Exception e) { diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/mapper/PatrolTaskStatusMapper.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/mapper/PatrolTaskStatusMapper.java index 6f9d38a..59c3975 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/mapper/PatrolTaskStatusMapper.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/mapper/PatrolTaskStatusMapper.java @@ -26,6 +26,8 @@ public interface PatrolTaskStatusMapper { int updatePatrolTaskStatusOfTaskProgress(PatrolTaskStatus patrolTaskStatus); + int updatePatrolTaskStatusRunning(PatrolTaskStatus patrolTaskStatus); + int deletePatrolTaskStatusByLineId(Long lineId); int deletePatrolTaskStatusByLineIds(Long[] lineIds); diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/service/IPatrolTaskStatusService.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/service/IPatrolTaskStatusService.java index 112ac82..a1bcd28 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/service/IPatrolTaskStatusService.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/service/IPatrolTaskStatusService.java @@ -24,6 +24,8 @@ public interface IPatrolTaskStatusService { int updatePatrolTaskStatusOfTaskProgress(PatrolTaskStatus patrolTaskStatus); + int updatePatrolTaskStatusRunning(PatrolTaskStatus patrolTaskStatus); + int deletePatrolTaskStatusByLineIds(Long[] lineIds); int deletePatrolTaskStatusByLineId(Long lineId); diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/service/impl/PatrolTaskStatusServiceImpl.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/service/impl/PatrolTaskStatusServiceImpl.java index 2879cc9..2f31a22 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/service/impl/PatrolTaskStatusServiceImpl.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/service/impl/PatrolTaskStatusServiceImpl.java @@ -63,6 +63,10 @@ public class PatrolTaskStatusServiceImpl implements IPatrolTaskStatusService { return this.patrolTaskStatusMapper.updatePatrolTaskStatusOfTaskProgress(patrolTaskStatus); } + public int updatePatrolTaskStatusRunning(PatrolTaskStatus patrolTaskStatus) { + return this.patrolTaskStatusMapper.updatePatrolTaskStatusRunning(patrolTaskStatus); + } + public int deletePatrolTaskStatusByLineIds(Long[] lineIds) { return this.patrolTaskStatusMapper.deletePatrolTaskStatusByLineIds(lineIds); } diff --git a/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolTaskStatusMapper.xml b/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolTaskStatusMapper.xml index 8ce3b31..4d5f8db 100644 --- a/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolTaskStatusMapper.xml +++ b/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolTaskStatusMapper.xml @@ -263,6 +263,15 @@ where line_id = #{lineId} + + update patrol_task_status + + task_progress = #{taskProgress}, + task_state = #{taskState}, + + where line_id = #{lineId} + + delete from patrol_task_status diff --git a/inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/impl/BasedataMontHeartBeatConsumerHandle.java b/inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/impl/BasedataMontHeartBeatConsumerHandle.java index a2187a2..89a6126 100644 --- a/inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/impl/BasedataMontHeartBeatConsumerHandle.java +++ b/inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/impl/BasedataMontHeartBeatConsumerHandle.java @@ -45,7 +45,7 @@ public class BasedataMontHeartBeatConsumerHandle implements IBasedataMontDataHan log.info("handleMontData-heartbeat: {}", jsonObject.toString()); String Type = jsonObject.getString("Type"); String uuid = jsonObject.getString("uuid"); - log.info(Color.GREEN + "[METADATA] handMontData 会话: {}, 类型: {}, 消息体: {}" + Color.END, uuid, Type, jsonObject.toJSONString()); + log.info("[METADATA] handMontData 会话: {}, 类型: {}, 消息体: {}", uuid, Type, jsonObject.toJSONString()); String SendCode = jsonObject.getString("SendCode"); if (null != SendCode && !SendCode.isEmpty()) { @@ -64,7 +64,7 @@ public class BasedataMontHeartBeatConsumerHandle implements IBasedataMontDataHan String Type = jsonObject.getString("Type"); String uuid = jsonObject.getString("uuid"); - log.info(Color.GREEN + "[METADATA] handMontData 会话: {}, 类型: {}, 消息体: {}, 台账: {}" + Color.END, uuid, Type, jsonObject.toJSONString(), basedataEqpbook); + log.info("[METADATA] handMontData 会话: {}, 类型: {}, 消息体: {}, 台账: {}", uuid, Type, jsonObject.toJSONString(), basedataEqpbook); List eqpBooks = this.basedataEqpBookService.selectBasedataEqpBookList(basedataEqpbook); if (null != eqpBooks && !eqpBooks.isEmpty()) {