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()); // 如果上报状态为终止或超期限制状态时,需更新终止时间