From 98709abec30e894e3d0bfaa60abdb5edf7a36843 Mon Sep 17 00:00:00 2001 From: htjcAdmin Date: Tue, 2 Sep 2025 22:02:04 +0800 Subject: [PATCH] =?UTF-8?q?/*=E4=BA=91=E6=B7=B1=E5=A4=84=E7=8B=97=E5=AF=B9?= =?UTF-8?q?=E6=8E=A5=E8=BF=9B=E5=BA=A6=E6=9D=A1=E6=98=BE=E7=A4=BA=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E9=97=AE=E9=A2=98=E8=A7=A3=E5=86=B3*/?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/AnalyseResponseServiceImpl.java | 4 +- .../controller/PatrolResultController.java | 45 +++++++++++-------- .../mapper/PatrolTaskStatusMapper.java | 2 + .../service/IPatrolTaskStatusService.java | 2 + .../impl/PatrolTaskStatusServiceImpl.java | 4 ++ .../mapper/task/PatrolTaskStatusMapper.xml | 8 ++++ 6 files changed, 45 insertions(+), 20 deletions(-) diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/AnalyseResponseServiceImpl.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/AnalyseResponseServiceImpl.java index d4a4e63..8801917 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/AnalyseResponseServiceImpl.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/AnalyseResponseServiceImpl.java @@ -902,7 +902,9 @@ public class AnalyseResponseServiceImpl implements IAnalyseResponseService { algorithmProgress, patrolTaskStatus.getTaskProgress()); //patrolTaskStatus.setTaskProgress("100.0"); - patrolTaskStatus.setTaskState(TaskStatus.DONE.getCode()); + if("100.0".equals(patrolTaskStatus.getTaskProgress())) { + patrolTaskStatus.setTaskState(TaskStatus.DONE.getCode()); + } patrolTaskStatusService.updatePatrolTaskStatus(patrolTaskStatus); } else { log.info(Color.GREEN + "RUNNING CALC_REMOTE_ALGORITHM_PROGRESS taskPatrolledId: {}, objectId: {}, curNumber: {}, totalNumer: {}, algorithmProgress: {}, status: {}" + Color.END, 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 2229c85..fcbaa5c 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,8 +1155,8 @@ public class PatrolResultController extends BaseController { } if (patrolTaskStatusItem.getTaskState() != null && - (patrolTaskStatusItem.getTaskState().equals(TaskStatus.DONE.getCode()) - || patrolTaskStatusItem.getTaskState().equals(TaskStatus.HALTED.getCode()) + (/*patrolTaskStatusItem.getTaskState().equals(TaskStatus.DONE.getCode()) || */ + patrolTaskStatusItem.getTaskState().equals(TaskStatus.HALTED.getCode()) || patrolTaskStatusItem.getTaskState().equals(TaskStatus.EXPIRED.getCode()))) { patrolTaskStatusItem.setTaskState(patrolTaskStatusItem.getTaskState()); patrolTaskStatusItem.setEndTime(DateUtils.parseDateToStr(DateUtils.yyyyMMddHHmmss2, new Date())); @@ -1189,11 +1189,12 @@ public class PatrolResultController extends BaseController { patrolTaskStatusOfDb.getTaskEstimatedTime()); } + String calProgressInDb = patrolTaskStatusOfDb.getTaskEstimatedTime(); logger.info("patrol_task_status taskPatrolledId: {}, run_progress: {}, db_progress: {}, cal_progress: {}", patrolTaskStatusItem.getTaskPatrolledId(), runProgress, dbProgress, - patrolTaskStatusOfDb.getTaskEstimatedTime()); + calProgressInDb); if (runProgress > dbProgress) { patrolTaskStatusItem.setLineId(patrolTaskStatusOfDb.getLineId()); if (patrolTaskStatusItem.getTaskName().contains("联合") && !patrolTaskStatusItem.getTaskName().startsWith(sendCode)) { @@ -1211,7 +1212,8 @@ public class PatrolResultController extends BaseController { * 更新智巡的进度值为100即可 */ if ("100.0".equals(String.valueOf(runProgress)) - && TaskStatus.RUNNING.getCode().equals(patrolTaskStatusItem.getTaskState())) { +// && TaskStatus.RUNNING.getCode().equals(patrolTaskStatusItem.getTaskState()) + ) { List statusList = patrolTaskStatusService.selectPatrolTaskStatusList(PatrolTaskStatus.builder().taskPatrolledId(patrolTaskStatusItem.getTaskPatrolledId()).build()); if (!statusList.isEmpty()) { logger.info(Color.CYAN + "updating patrol_task_status 100%, taskPatrolledId: {}, progress: {}, taskState: {}, taskCurCodeInRedis: {}" + Color.END, @@ -1222,6 +1224,11 @@ public class PatrolResultController extends BaseController { PatrolTaskStatus taskStatus = statusList.get(0); taskStatus.setTaskProgress(String.valueOf(runProgress)); iPatrolTaskStatusService.updatePatrolTaskStatusOfTaskProgress(taskStatus); + if ("100.0".equals(calProgressInDb)) { + logger.info("!!!!!!!!!!!!!!!!!! set task_status done!!!"); + taskStatus.setTaskState(TaskStatus.DONE.getCode()); + iPatrolTaskStatusService.updatePatrolTaskStatusOfTaskState(taskStatus); + } redisService.deleteObjectOfTask(RedisConst.TASK_CURRENT_CODE, taskStatus.getTaskCode()); } } else { @@ -1447,20 +1454,20 @@ public class PatrolResultController extends BaseController { InputStream is = doGetRequestForInputStream(intranetFtpAddress + patrolResult.getFilePath()); logger.info("feedback from robot image size: {}", (is != null)); - if (is != null) { - try { - is = ImageUtil.overlaying(is, patrolResult.getRectangle(), patrolResult.getValue()); - strfile = patrolResult.getFilePath(); - strfile = strfile.substring(0, strfile.lastIndexOf("/")); - String fileName = "modify_" + strfile.substring(strfile.lastIndexOf("/") + 1); - String file = saveFile(is, fileName, strfile); - patrolResult.setFilePath(file); - logger.info("robot image path: {}", file); - } catch (Exception e) { - //e.printStackTrace(); - logger.info("ImageUtil.overlaying error: {}", e.getMessage()); - } - } +// if (is != null) { +// try { +// is = ImageUtil.overlaying(is, patrolResult.getRectangle(), patrolResult.getValue()); +// strfile = patrolResult.getFilePath(); +// strfile = strfile.substring(0, strfile.lastIndexOf("/")); +// String fileName = "modify_" + strfile.substring(strfile.lastIndexOf("/") + 1); +// String file = saveFile(is, fileName, strfile); +// patrolResult.setFilePath(file); +// logger.info("robot image path: {}", file); +// } catch (Exception e) { +// //e.printStackTrace(); +// logger.info("ImageUtil.overlaying error: {}", e.getMessage()); +// } +// } } // 无人机点位id处理 @@ -1620,7 +1627,7 @@ public class PatrolResultController extends BaseController { logger.info("algCount: {}", algCount); jsonRootBean.setTotalNumber(algCount); } - if(!tasks.isEmpty()) { + if (!tasks.isEmpty()) { callRemoteAlgorithm(jsonRootBean.getTotalNumber(), resultList); } else { logger.info(Color.CYAN + "callAlgorithm task: {} not exist!!!" + Color.END, code); 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 59c3975..09724fa 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 updatePatrolTaskStatusOfTaskState(PatrolTaskStatus patrolTaskStatus); + int updatePatrolTaskStatusRunning(PatrolTaskStatus patrolTaskStatus); int deletePatrolTaskStatusByLineId(Long lineId); 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 a1bcd28..6f6edd9 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 updatePatrolTaskStatusOfTaskState(PatrolTaskStatus patrolTaskStatus); + int updatePatrolTaskStatusRunning(PatrolTaskStatus patrolTaskStatus); int deletePatrolTaskStatusByLineIds(Long[] lineIds); 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 2f31a22..7fc453a 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 updatePatrolTaskStatusOfTaskState(PatrolTaskStatus patrolTaskStatus) { + return this.patrolTaskStatusMapper.updatePatrolTaskStatusOfTaskState(patrolTaskStatus); + } + public int updatePatrolTaskStatusRunning(PatrolTaskStatus patrolTaskStatus) { return this.patrolTaskStatusMapper.updatePatrolTaskStatusRunning(patrolTaskStatus); } 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 4d5f8db..c2cd14b 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 @@ -272,6 +272,14 @@ where line_id = #{lineId} + + update patrol_task_status + + task_state = #{taskState}, + + where line_id = #{lineId} + + delete from patrol_task_status