From 7cbaae35171cf16bff0773eb2c7d2ae80933cfcc Mon Sep 17 00:00:00 2001 From: yinhuaiwei Date: Sat, 21 Mar 2026 11:02:15 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B941=E6=8C=87=E4=BB=A4?= =?UTF-8?q?=E6=9A=82=E5=81=9C=E5=90=8E=E6=81=A2=E5=A4=8D=E6=89=A7=E8=A1=8C?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../partrolresult/controller/PatrolResultController.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 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 2101efa..1952b6a 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 @@ -1166,9 +1166,12 @@ public class PatrolResultController extends BaseController { if (!patrolTaskStatusList.isEmpty()) { PatrolTaskStatus patrolTaskStatusOfDb = patrolTaskStatusList.get(0); // 除了db非完成或终止或暂停状态，当db状态与上报状态不一致时，更新db状态 - if (!Arrays.asList(TaskStatus.DONE.getCode(), TaskStatus.HALTED.getCode(), TaskStatus.PAUSED.getCode()).contains(patrolTaskStatusOfDb.getTaskState()) + // sendCode.isEmpty为摄像机 + if (!Arrays.asList(TaskStatus.DONE.getCode(), TaskStatus.HALTED.getCode()).contains(patrolTaskStatusOfDb.getTaskState()) && !patrolTaskStatusItem.getTaskState().equals(TaskStatus.DONE.getCode()) - && !patrolTaskStatusOfDb.getTaskState().equals(patrolTaskStatusItem.getTaskState())) { + && !patrolTaskStatusOfDb.getTaskState().equals(patrolTaskStatusItem.getTaskState()) + && !sendCode.isEmpty() + ) { logger.info("GET_INFO_41 UPDATE TASK_STATE old: {} TO new: {}", patrolTaskStatusOfDb.getTaskState(), patrolTaskStatusItem.getTaskState()); patrolTaskStatusOfDb.setTaskState(patrolTaskStatusItem.getTaskState()); // 如果上报状态为终止或超期限制状态时，需更新终止时间