From 554ebdffb0a1acc22d019200fffa035573cc2192 Mon Sep 17 00:00:00 2001
From: chenlinghy <chenlinghy@cmhi.chinamobile.com>
Date: Wed, 25 Aug 2021 17:00:08 +0800
Subject: [PATCH] =?UTF-8?q?OCT=20REM:=201.=20=E4=BF=AE=E6=94=B9=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E7=AE=A1=E7=90=86=E8=BF=9B=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dispose/service/impl/DeviceTaskManagerServiceImpl.java | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/main/java/com/dispose/service/impl/DeviceTaskManagerServiceImpl.java b/src/main/java/com/dispose/service/impl/DeviceTaskManagerServiceImpl.java
index 2a836203..ccc3e741 100644
--- a/src/main/java/com/dispose/service/impl/DeviceTaskManagerServiceImpl.java
+++ b/src/main/java/com/dispose/service/impl/DeviceTaskManagerServiceImpl.java
@@ -482,6 +482,13 @@ public class DeviceTaskManagerServiceImpl implements DeviceTaskManagerService {
 
         // 对新建的任务，创建对应处置设备任务信息
         for (DisposeTask v : disposeTaskManager.getUnExpiredTasks()) {
+            //数据库数据太多，存在数据库一次性读取的信息和当前最新信息不一致（改动数据库）的情况，再次从数据库获取最新信息
+            DisposeTaskStatus taskStatus = disposeTaskManager.getDisposeTaskById(v.getId()).getCurrentStatus();
+            if (taskStatus.equals(DisposeTaskStatus.TASK_FINISHED) ||
+                    taskStatus.equals(DisposeTaskStatus.TASK_CANCELED) ||
+                    taskStatus.equals(DisposeTaskStatus.TASK_EXPIRED)) {
+                continue;
+            }
             // 设置任务状态, 开始创建任务
             disposeTaskManager.changeDisposeTaskStatus(v.getId(), DisposeTaskStatus.TASK_STARTING);