From bf46f8776f02832eceeab4a93f817f7b9eb8798b Mon Sep 17 00:00:00 2001
From: guoshengxiong <1923636941@qq.com>
Date: Mon, 29 Jul 2024 13:59:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=90=E6=96=99=E8=BF=9B=E5=9C=BA=E4=BB=8E?=
 =?UTF-8?q?=E4=B8=B4=E6=97=B6=E8=A1=A8=E5=88=A0=E9=99=A4=E5=AF=B9=E5=BA=94?=
 =?UTF-8?q?=E7=9A=84=E9=A2=84=E7=BA=A6=E8=BD=A6=E8=BE=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/zhgd/xmgl/task/ExamTask.java | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/task/ExamTask.java b/src/main/java/com/zhgd/xmgl/task/ExamTask.java
index e06123667..a6b17d5ef 100644
--- a/src/main/java/com/zhgd/xmgl/task/ExamTask.java
+++ b/src/main/java/com/zhgd/xmgl/task/ExamTask.java
@@ -4,10 +4,8 @@ import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.zhgd.xmgl.async.AsyncHikvision;
 import com.zhgd.xmgl.modules.basicdata.entity.SystemUser;
 import com.zhgd.xmgl.modules.basicdata.service.ISystemUserService;
 import com.zhgd.xmgl.modules.car.entity.CarInfo;
@@ -30,7 +28,10 @@ import org.springframework.context.annotation.Lazy;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 @Slf4j
@@ -113,7 +114,9 @@ public class ExamTask {
                 flows = flows.stream().filter(f ->
                         carMap.get(f.getCarNumber() + ":" + f.getReserveStartTime() + ":" + f.getReserveEndTime()) != null
                 ).collect(Collectors.toList());
-                carInfoApprovalFlowService.removeByIds(flows.stream().map(c -> c.getId()).collect(Collectors.toSet()));
+                if (flows.size() > 0) {
+                    carInfoApprovalFlowService.removeByIds(flows.stream().map(CarInfoApprovalFlow::getId).collect(Collectors.toSet()));
+                }
                 for (CarInfo carInfo : carInfos) {
                     //同步海康
                     Project project = projectService.getProjectInfoBySn(carInfo.getProjectSn());
@@ -201,7 +204,7 @@ public class ExamTask {
         examNoticeService.saveBatch(noticeList);
     }
 
-    private DateTime getTime(int type, int num){
+    private DateTime getTime(int type, int num) {
         DateTime dateTime = null;
         if (type == 1) {
             dateTime = DateUtil.offsetHour(new Date(), num);