diff --git a/src/main/java/com/zhgd/xmgl/task/ExamTask.java b/src/main/java/com/zhgd/xmgl/task/ExamTask.java index 2950ba9a0..18007dd2f 100644 --- a/src/main/java/com/zhgd/xmgl/task/ExamTask.java +++ b/src/main/java/com/zhgd/xmgl/task/ExamTask.java @@ -5,6 +5,7 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; 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.car.entity.CarInfo; import com.zhgd.xmgl.modules.car.service.ICarInfoService; import com.zhgd.xmgl.modules.exam.entity.*; @@ -68,12 +69,15 @@ public class ExamTask { @Autowired private ICarInfoService carInfoService; + @Autowired + private AsyncHikvision asyncHikvision; + @Scheduled(cron = "0 0/1 * * * ?") public void xzMaterial() { List list = xzMaterialService.list(); List carNumber = new ArrayList<>(); for (XzMaterial xzMaterial : list) { - if (xzMaterial.getEntryEndTime().compareTo(new Date()) < 0) { + if (xzMaterial.getEntryEndTime() != null && xzMaterial.getEntryEndTime().compareTo(new Date()) < 0) { if (StringUtils.isNotBlank(xzMaterial.getCarNumber())) { carNumber.add(xzMaterial.getCarNumber()); } @@ -84,6 +88,10 @@ public class ExamTask { carInfos = carInfos.stream().filter(c -> carNumber.contains(c.getCarNumber())).collect(Collectors.toList()); if (carInfos.size() > 0) { carInfoService.removeByIds(carInfos.stream().map(c -> c.getId()).collect(Collectors.toSet())); + for (CarInfo carInfo : carInfos) { + //同步海康 + asyncHikvision.deleteCarInfoForHikvision(carInfo); + } } } }