diff --git a/src/main/java/com/zhgd/xmgl/async/AsyncHikvision.java b/src/main/java/com/zhgd/xmgl/async/AsyncHikvision.java index 9216c388d..33fc484d7 100644 --- a/src/main/java/com/zhgd/xmgl/async/AsyncHikvision.java +++ b/src/main/java/com/zhgd/xmgl/async/AsyncHikvision.java @@ -2,6 +2,7 @@ package com.zhgd.xmgl.async; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.zhgd.jeecg.common.execption.OpenPromptException; +import com.zhgd.jeecg.common.util.SpringContextUtils; import com.zhgd.jeecg.common.util.pass.HttpUtils; import com.zhgd.xmgl.call.HikvisionCall; import com.zhgd.xmgl.modules.basicdata.service.INoticeService; @@ -38,6 +39,7 @@ import java.util.Objects; @Slf4j @Component public class AsyncHikvision { + public static final String XZ_HIKVISION_SYNC_TIME = "xzHikvisionSyncTime"; @Autowired @Lazy WorkerInfoServiceImpl workerInfoService; @@ -72,25 +74,38 @@ public class AsyncHikvision { @Autowired private XzHikvisionCompareDataServiceImpl xzHikvisionCompareDataService; - public static Date getSyncLotNowOrSetIfNull() { - Date now = ThreadLocalUtil.getNotNull().getDate("now"); + /** + * @param bigType 1人员2车辆 + * @param tableId + * @return + */ + public static Date getSyncTimeWithInitIfAbsent(int bigType, Long tableId) { + Date now = ThreadLocalUtil.getNotNull().getDate(XZ_HIKVISION_SYNC_TIME); if (now == null) { + //首次执行，清空以前同步记录 now = new Date(); - ThreadLocalUtil.addInKey("now", now); + ThreadLocalUtil.addInKey(XZ_HIKVISION_SYNC_TIME, now); + SpringContextUtils.getBean(XzHikvisionSyncMapper.class).delete(new LambdaQueryWrapper() + .eq(XzHikvisionSync::getBigType, bigType) + .eq(XzHikvisionSync::getWhoId, tableId) + ); } return now; } + public static Date getSyncTime() { + return ThreadLocalUtil.getNotNull().getDate(XZ_HIKVISION_SYNC_TIME); + } + + /** * 添加劳务人员-海康 * * @param workerInfo - * @param now */ @Async("hikvisionExecutor") - public void addWorkerForHikvisionAsync(WorkerInfo workerInfo, Date now) { + public void addWorkerForHikvisionAsync(WorkerInfo workerInfo) { try { - ThreadLocalUtil.addInKey("now", now); hikvisionCall.addWorkerForHikvision(workerInfo); } catch (Exception e) { log.error("海康：", e); @@ -99,16 +114,15 @@ public class AsyncHikvision { } public void addWorkerForHikvision(WorkerInfo workerInfo) { - Date now = getSyncLotNowOrSetIfNull(); - xzHikvisionSyncMapper.insert(new XzHikvisionSync().setProjectSn(workerInfo.getProjectSn()).setType(1).setOperate(1).setWhoId(workerInfo.getId()).setCreateDate(now)); - xzHikvisionSyncMapper.insert(new XzHikvisionSync().setProjectSn(workerInfo.getProjectSn()).setType(2).setOperate(1).setWhoId(workerInfo.getId()).setCreateDate(now)); - asyncHikvision.addWorkerForHikvisionAsync(workerInfo, now); + getSyncTimeWithInitIfAbsent(1, workerInfo.getId()); + xzHikvisionSyncMapper.insert(new XzHikvisionSync().setProjectSn(workerInfo.getProjectSn()).setType(1).setOperate(1).setWhoId(workerInfo.getId()).setCreateDate(getSyncTimeWithInitIfAbsent(1, workerInfo.getId()))); + xzHikvisionSyncMapper.insert(new XzHikvisionSync().setProjectSn(workerInfo.getProjectSn()).setType(2).setOperate(1).setWhoId(workerInfo.getId()).setCreateDate(getSyncTimeWithInitIfAbsent(1, workerInfo.getId()))); + asyncHikvision.addWorkerForHikvisionAsync(workerInfo); } @Async("hikvisionExecutor") - public void editWorkerForHikvisionAsync(WorkerInfo workerInfo, Date now) { + public void editWorkerForHikvisionAsync(WorkerInfo workerInfo) { try { - ThreadLocalUtil.addInKey("now", now); hikvisionCall.editWorkerForHikvision(workerInfo); } catch (Exception e) { log.error("海康：", e); @@ -117,10 +131,10 @@ public class AsyncHikvision { } public void editWorkerForHikvision(WorkerInfo workerInfo) { - Date now = getSyncLotNowOrSetIfNull(); - xzHikvisionSyncMapper.insert(new XzHikvisionSync().setProjectSn(workerInfo.getProjectSn()).setType(1).setOperate(2).setWhoId(workerInfo.getId()).setCreateDate(now)); - xzHikvisionSyncMapper.insert(new XzHikvisionSync().setProjectSn(workerInfo.getProjectSn()).setType(2).setOperate(2).setWhoId(workerInfo.getId()).setCreateDate(now)); - asyncHikvision.editWorkerForHikvisionAsync(workerInfo, now); + getSyncTimeWithInitIfAbsent(1, workerInfo.getId()); + xzHikvisionSyncMapper.insert(new XzHikvisionSync().setProjectSn(workerInfo.getProjectSn()).setType(1).setOperate(2).setWhoId(workerInfo.getId()).setCreateDate(getSyncTimeWithInitIfAbsent(1, workerInfo.getId()))); + xzHikvisionSyncMapper.insert(new XzHikvisionSync().setProjectSn(workerInfo.getProjectSn()).setType(2).setOperate(2).setWhoId(workerInfo.getId()).setCreateDate(getSyncTimeWithInitIfAbsent(1, workerInfo.getId()))); + asyncHikvision.editWorkerForHikvisionAsync(workerInfo); } private void sendNoticeForWorker(WorkerInfo workerInfo, Exception e, String action) { @@ -137,13 +151,12 @@ public class AsyncHikvision { if (SecurityUtils.getUser() != null && SecurityUtils.getUser().getUserId() != null) { noticeService.addUserNotice(SecurityUtils.getUser().getUserId(), msg, title, type); } - hikvisionCall.updateAllFailStatusIfNullByNow(workerInfo.getProjectSn(), workerInfo.getId(), 1, getSyncLotNowOrSetIfNull()); + hikvisionCall.updateAllFailStatusIfNullByNow(workerInfo.getProjectSn(), workerInfo.getId(), 1, getSyncTimeWithInitIfAbsent(1, workerInfo.getId())); } @Async("hikvisionExecutor") - public void deleteWorkerForHikvisionAsync(WorkerInfo workerInfo, Date now) { + public void deleteWorkerForHikvisionAsync(WorkerInfo workerInfo) { try { - ThreadLocalUtil.addInKey("now", now); hikvisionCall.deleteWorkerForHikvision(workerInfo); } catch (Exception e) { log.error("海康：", e); @@ -152,32 +165,30 @@ public class AsyncHikvision { } public void deleteWorkerForHikvision(WorkerInfo workerInfo) { - Date now = getSyncLotNowOrSetIfNull(); - xzHikvisionSyncMapper.insert(new XzHikvisionSync().setProjectSn(workerInfo.getProjectSn()).setType(1).setOperate(3).setWhoId(workerInfo.getId()).setCreateDate(now)); - xzHikvisionSyncMapper.insert(new XzHikvisionSync().setProjectSn(workerInfo.getProjectSn()).setType(2).setOperate(3).setWhoId(workerInfo.getId()).setCreateDate(now)); - asyncHikvision.deleteWorkerForHikvisionAsync(workerInfo, now); + getSyncTimeWithInitIfAbsent(1, workerInfo.getId()); + xzHikvisionSyncMapper.insert(new XzHikvisionSync().setProjectSn(workerInfo.getProjectSn()).setType(1).setOperate(3).setWhoId(workerInfo.getId()).setCreateDate(getSyncTimeWithInitIfAbsent(1, workerInfo.getId()))); + xzHikvisionSyncMapper.insert(new XzHikvisionSync().setProjectSn(workerInfo.getProjectSn()).setType(2).setOperate(3).setWhoId(workerInfo.getId()).setCreateDate(getSyncTimeWithInitIfAbsent(1, workerInfo.getId()))); + asyncHikvision.deleteWorkerForHikvisionAsync(workerInfo); } public void addCarInfoForHikvision(CarInfo carInfo) { - Date now = new Date(); if (carInfo.getIsBlack() == 1) { deleteCarInfoForHikvision(carInfo, true); } else { if (Objects.equals(carInfo.getCarModuleType(), 1)) { - xzHikvisionSyncMapper.insert(new XzHikvisionSync().setProjectSn(carInfo.getProjectSn()).setType(4).setOperate(1).setWhoId(carInfo.getId()).setCreateDate(now)); - xzHikvisionSyncMapper.insert(new XzHikvisionSync().setProjectSn(carInfo.getProjectSn()).setType(5).setOperate(1).setWhoId(carInfo.getId()).setCreateDate(now)); + xzHikvisionSyncMapper.insert(new XzHikvisionSync().setProjectSn(carInfo.getProjectSn()).setType(4).setOperate(1).setWhoId(carInfo.getId()).setCreateDate(getSyncTimeWithInitIfAbsent(2, carInfo.getId()))); + xzHikvisionSyncMapper.insert(new XzHikvisionSync().setProjectSn(carInfo.getProjectSn()).setType(5).setOperate(1).setWhoId(carInfo.getId()).setCreateDate(getSyncTimeWithInitIfAbsent(2, carInfo.getId()))); } else if (Objects.equals(carInfo.getCarModuleType(), 2) || Objects.equals(carInfo.getCarModuleType(), 3)) { - xzHikvisionSyncMapper.insert(new XzHikvisionSync().setProjectSn(carInfo.getProjectSn()).setType(6).setOperate(1).setWhoId(carInfo.getId()).setCreateDate(now)); + xzHikvisionSyncMapper.insert(new XzHikvisionSync().setProjectSn(carInfo.getProjectSn()).setType(6).setOperate(1).setWhoId(carInfo.getId()).setCreateDate(getSyncTimeWithInitIfAbsent(2, carInfo.getId()))); } - xzHikvisionSyncMapper.insert(new XzHikvisionSync().setProjectSn(carInfo.getProjectSn()).setType(7).setOperate(3).setWhoId(carInfo.getId()).setCreateDate(now)); - asyncHikvision.addCarInfoForHikvisionAsyc(carInfo, now); + xzHikvisionSyncMapper.insert(new XzHikvisionSync().setProjectSn(carInfo.getProjectSn()).setType(7).setOperate(3).setWhoId(carInfo.getId()).setCreateDate(getSyncTimeWithInitIfAbsent(2, carInfo.getId()))); + asyncHikvision.addCarInfoForHikvisionAsyc(carInfo); } } @Async("carInfoExecutor") - public void addCarInfoForHikvisionAsyc(CarInfo carInfo, Date now) { + public void addCarInfoForHikvisionAsyc(CarInfo carInfo) { try { - ThreadLocalUtil.addInKey("now", now); hikvisionCall.saveCarInfoFromHikvision(carInfo); } catch (Exception e) { log.error("海康：", e); @@ -185,15 +196,8 @@ public class AsyncHikvision { } } - public void handleAlarmCarForHikvision(CarInfo carInfo) { - Date now = new Date(); - xzHikvisionSyncMapper.insert(new XzHikvisionSync().setProjectSn(carInfo.getProjectSn()).setType(7).setOperate(carInfo.getIsBlack() == 1 ? 1 : 3).setWhoId(carInfo.getId()).setCreateDate(now)); - asyncHikvision.handleAlarmCarForHikvision(carInfo, now); - } - @Async("carInfoExecutor") - public void handleAlarmCarForHikvision(CarInfo carInfo, Date now) { - ThreadLocalUtil.addInKey("now", now); + public void handleAlarmCarForHikvision(CarInfo carInfo) { Project project = projectMapper.selectOne(new LambdaQueryWrapper().eq(Project::getProjectSn, carInfo.getProjectSn())); if (project == null || !Objects.equals(project.getSyncHikvision(), 1)) { return; @@ -215,29 +219,28 @@ public class AsyncHikvision { if (SecurityUtils.getUser() != null && SecurityUtils.getUser().getUserId() != null) { noticeService.addUserNotice(SecurityUtils.getUser().getUserId(), msg, title, type); } - hikvisionCall.updateAllFailStatusIfNullByNow(carInfo.getProjectSn(), carInfo.getId(), 4, getSyncLotNowOrSetIfNull()); + hikvisionCall.updateAllFailStatusIfNullByNow(carInfo.getProjectSn(), carInfo.getId(), 4, getSyncTimeWithInitIfAbsent(2, carInfo.getId())); } public void editCarInfoForHikvision(CarInfo carInfo, CarInfo old) { - Date now = new Date(); + if (carInfo.getIsBlack() == 1) { deleteCarInfoForHikvision(carInfo, true); } else { if (Objects.equals(carInfo.getCarModuleType(), 1)) { - xzHikvisionSyncMapper.insert(new XzHikvisionSync().setProjectSn(carInfo.getProjectSn()).setType(4).setOperate(2).setWhoId(carInfo.getId()).setCreateDate(now)); - xzHikvisionSyncMapper.insert(new XzHikvisionSync().setProjectSn(carInfo.getProjectSn()).setType(5).setOperate(1).setWhoId(carInfo.getId()).setCreateDate(now)); + xzHikvisionSyncMapper.insert(new XzHikvisionSync().setProjectSn(carInfo.getProjectSn()).setType(4).setOperate(2).setWhoId(carInfo.getId()).setCreateDate(getSyncTimeWithInitIfAbsent(2, carInfo.getId()))); + xzHikvisionSyncMapper.insert(new XzHikvisionSync().setProjectSn(carInfo.getProjectSn()).setType(5).setOperate(1).setWhoId(carInfo.getId()).setCreateDate(getSyncTimeWithInitIfAbsent(2, carInfo.getId()))); } else if (Objects.equals(carInfo.getCarModuleType(), 2) || Objects.equals(carInfo.getCarModuleType(), 3)) { - xzHikvisionSyncMapper.insert(new XzHikvisionSync().setProjectSn(carInfo.getProjectSn()).setType(6).setOperate(1).setWhoId(carInfo.getId()).setCreateDate(now)); + xzHikvisionSyncMapper.insert(new XzHikvisionSync().setProjectSn(carInfo.getProjectSn()).setType(6).setOperate(1).setWhoId(carInfo.getId()).setCreateDate(getSyncTimeWithInitIfAbsent(2, carInfo.getId()))); } - xzHikvisionSyncMapper.insert(new XzHikvisionSync().setProjectSn(carInfo.getProjectSn()).setType(7).setOperate(3).setWhoId(carInfo.getId()).setCreateDate(now)); - asyncHikvision.editCarInfoForHikvisionAsync(carInfo, old, now); + xzHikvisionSyncMapper.insert(new XzHikvisionSync().setProjectSn(carInfo.getProjectSn()).setType(7).setOperate(3).setWhoId(carInfo.getId()).setCreateDate(getSyncTimeWithInitIfAbsent(2, carInfo.getId()))); + asyncHikvision.editCarInfoForHikvisionAsync(carInfo, old); } } @Async("carInfoExecutor") - public void editCarInfoForHikvisionAsync(CarInfo carInfo, CarInfo old, Date now) { + public void editCarInfoForHikvisionAsync(CarInfo carInfo, CarInfo old) { try { - ThreadLocalUtil.addInKey("now", now); hikvisionCall.editCarInfoForHikvision(carInfo, old); } catch (Exception e) { log.error("海康：", e); @@ -246,18 +249,16 @@ public class AsyncHikvision { } public void deleteCarInfoForHikvision(CarInfo carInfo, boolean isSetBlack) { - Date now = new Date(); - xzHikvisionSyncMapper.insert(new XzHikvisionSync().setProjectSn(carInfo.getProjectSn()).setType(4).setOperate(3).setWhoId(carInfo.getId()).setCreateDate(now)); - xzHikvisionSyncMapper.insert(new XzHikvisionSync().setProjectSn(carInfo.getProjectSn()).setType(5).setOperate(3).setWhoId(carInfo.getId()).setCreateDate(now)); - xzHikvisionSyncMapper.insert(new XzHikvisionSync().setProjectSn(carInfo.getProjectSn()).setType(6).setOperate(3).setWhoId(carInfo.getId()).setCreateDate(now)); - xzHikvisionSyncMapper.insert(new XzHikvisionSync().setProjectSn(carInfo.getProjectSn()).setType(7).setOperate(isSetBlack ? 1 : 3).setWhoId(carInfo.getId()).setCreateDate(now)); - asyncHikvision.deleteCarInfoForHikvisionAsync(carInfo, now, isSetBlack); + xzHikvisionSyncMapper.insert(new XzHikvisionSync().setProjectSn(carInfo.getProjectSn()).setType(4).setOperate(3).setWhoId(carInfo.getId()).setCreateDate(getSyncTimeWithInitIfAbsent(2, carInfo.getId()))); + xzHikvisionSyncMapper.insert(new XzHikvisionSync().setProjectSn(carInfo.getProjectSn()).setType(5).setOperate(3).setWhoId(carInfo.getId()).setCreateDate(getSyncTimeWithInitIfAbsent(2, carInfo.getId()))); + xzHikvisionSyncMapper.insert(new XzHikvisionSync().setProjectSn(carInfo.getProjectSn()).setType(6).setOperate(3).setWhoId(carInfo.getId()).setCreateDate(getSyncTimeWithInitIfAbsent(2, carInfo.getId()))); + xzHikvisionSyncMapper.insert(new XzHikvisionSync().setProjectSn(carInfo.getProjectSn()).setType(7).setOperate(isSetBlack ? 1 : 3).setWhoId(carInfo.getId()).setCreateDate(getSyncTimeWithInitIfAbsent(2, carInfo.getId()))); + asyncHikvision.deleteCarInfoForHikvisionAsync(carInfo, isSetBlack); } @Async("carInfoExecutor") - public void deleteCarInfoForHikvisionAsync(CarInfo carInfo, Date now, boolean isSetBlack) { + public void deleteCarInfoForHikvisionAsync(CarInfo carInfo, boolean isSetBlack) { try { - ThreadLocalUtil.addInKey("now", now); hikvisionCall.deleteCarInfoForHikvision(carInfo, isSetBlack); } catch (Exception e) { log.error("海康：", e); @@ -385,18 +386,17 @@ public class AsyncHikvision { if (StringUtils.isBlank(devSn)) { return; } - Date now = getSyncLotNowOrSetIfNull(); + getSyncTimeWithInitIfAbsent(1, workerInfo.getId()); String[] devSnArr = StringUtils.split(devSn, ","); for (String ds : devSnArr) { - xzHikvisionSyncMapper.insert(new XzHikvisionSync().setProjectSn(workerInfo.getProjectSn()).setType(3).setOperate(1).setWhoId(workerInfo.getId()).setDeviceSn(ds).setCreateDate(now)); + xzHikvisionSyncMapper.insert(new XzHikvisionSync().setProjectSn(workerInfo.getProjectSn()).setType(3).setOperate(1).setWhoId(workerInfo.getId()).setDeviceSn(ds).setCreateDate(getSyncTimeWithInitIfAbsent(1, workerInfo.getId()))); } - asyncHikvision.addPersonAuthAsync(workerInfo, devSn, now); + asyncHikvision.addPersonAuthAsync(workerInfo, devSn); } @Async("hikvisionExecutor") - public void addPersonAuthAsync(WorkerInfo workerInfo, String devSn, Date now) { + public void addPersonAuthAsync(WorkerInfo workerInfo, String devSn) { try { - ThreadLocalUtil.addInKey("now", now); StringBuilder sucSb = new StringBuilder(); StringBuilder failSb = new StringBuilder(); String[] devSnArr = StringUtils.split(devSn, ","); @@ -410,7 +410,7 @@ public class AsyncHikvision { } else { noticeService.addUserNotice(SecurityUtils.getUser().getUserId(), e.getMessage(), "人员下发设备提醒", "1"); } - hikvisionCall.updateAllFailStatusIfNullByNowForAuth(workerInfo.getProjectSn(), workerInfo.getId(), 3, 1, getSyncLotNowOrSetIfNull()); + hikvisionCall.updateAllFailStatusIfNullByNowForAuth(workerInfo.getProjectSn(), workerInfo.getId(), 3, 1, getSyncTimeWithInitIfAbsent(1, workerInfo.getId())); return; } @@ -430,7 +430,7 @@ public class AsyncHikvision { if (SecurityUtils.getUser() != null && SecurityUtils.getUser().getUserId() != null) { noticeService.addUserNotice(SecurityUtils.getUser().getUserId(), StringUtils.substring(msg, 0, msg.length() - 1), title, type); } - hikvisionCall.updateAllFailStatusIfNullByNowForAuth(workerInfo.getProjectSn(), workerInfo.getId(), 3, 1, getSyncLotNowOrSetIfNull()); + hikvisionCall.updateAllFailStatusIfNullByNowForAuth(workerInfo.getProjectSn(), workerInfo.getId(), 3, 1, getSyncTimeWithInitIfAbsent(1, workerInfo.getId())); } catch (Exception e) { log.error("海康：", e); } @@ -446,21 +446,20 @@ public class AsyncHikvision { if (StringUtils.isBlank(devSns)) { return; } - Date now = getSyncLotNowOrSetIfNull(); + getSyncTimeWithInitIfAbsent(1, workerInfo.getId()); String[] devSnArr = StringUtils.split(devSns, ","); for (String ds : devSnArr) { - xzHikvisionSyncMapper.insert(new XzHikvisionSync().setProjectSn(workerInfo.getProjectSn()).setType(3).setOperate(3).setWhoId(workerInfo.getId()).setDeviceSn(ds).setCreateDate(now)); + xzHikvisionSyncMapper.insert(new XzHikvisionSync().setProjectSn(workerInfo.getProjectSn()).setType(3).setOperate(3).setWhoId(workerInfo.getId()).setDeviceSn(ds).setCreateDate(getSyncTimeWithInitIfAbsent(1, workerInfo.getId()))); } - asyncHikvision.deletePersonAuthAsync(workerInfo, devSns, now); + asyncHikvision.deletePersonAuthAsync(workerInfo, devSns); } @Async("hikvisionExecutor") - public void deletePersonAuthAsync(WorkerInfo workerInfo, String devSn, Date now) { + public void deletePersonAuthAsync(WorkerInfo workerInfo, String devSn) { try { if (StringUtils.isBlank(devSn)) { return; } - ThreadLocalUtil.addInKey("now", now); StringBuilder sucSb = new StringBuilder(); StringBuilder failSb = new StringBuilder(); String[] devSnArr = StringUtils.split(devSn, ","); @@ -474,7 +473,7 @@ public class AsyncHikvision { } else { noticeService.addUserNotice(SecurityUtils.getUser().getUserId(), e.getMessage(), "人员下发设备提醒", "1"); } - hikvisionCall.updateAllFailStatusIfNullByNowForAuth(workerInfo.getProjectSn(), workerInfo.getId(), 3, 3, getSyncLotNowOrSetIfNull()); + hikvisionCall.updateAllFailStatusIfNullByNowForAuth(workerInfo.getProjectSn(), workerInfo.getId(), 3, 3, getSyncTimeWithInitIfAbsent(1, workerInfo.getId())); return; } @@ -494,7 +493,7 @@ public class AsyncHikvision { if (SecurityUtils.getUser() != null && SecurityUtils.getUser().getUserId() != null) { noticeService.addUserNotice(SecurityUtils.getUser().getUserId(), StringUtils.substring(msg, 0, msg.length() - 1), title, type); } - hikvisionCall.updateAllFailStatusIfNullByNowForAuth(workerInfo.getProjectSn(), workerInfo.getId(), 3, 3, getSyncLotNowOrSetIfNull()); + hikvisionCall.updateAllFailStatusIfNullByNowForAuth(workerInfo.getProjectSn(), workerInfo.getId(), 3, 3, getSyncTimeWithInitIfAbsent(1, workerInfo.getId())); } catch (Exception e) { log.error("海康：", e); } diff --git a/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java b/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java index b4cfb3b58..39f9e788d 100644 --- a/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java +++ b/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java @@ -17,6 +17,7 @@ import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.execption.OpenPromptException; import com.zhgd.redis.lock.RedisRepository; import com.zhgd.xmgl.async.AsyncAiAnalyse; +import com.zhgd.xmgl.async.AsyncHikvision; import com.zhgd.xmgl.base.*; import com.zhgd.xmgl.call.entity.ChargeDeletionParam; import com.zhgd.xmgl.constant.Cts; @@ -1061,9 +1062,9 @@ public class HikvisionCall { } if (success) { - updateSuccessStatusByNow(carInfo.getProjectSn(), carInfo.getId(), type, operate, ThreadLocalUtil.getNotNull().getDate("now"), null); + updateSuccessStatusByNow(carInfo.getProjectSn(), carInfo.getId(), type, operate, AsyncHikvision.getSyncTime(), null); } else { - updateFailStatusByNow(carInfo.getProjectSn(), carInfo.getId(), type, operate, ThreadLocalUtil.getNotNull().getDate("now"), null); + updateFailStatusByNow(carInfo.getProjectSn(), carInfo.getId(), type, operate, AsyncHikvision.getSyncTime(), null); } if (SecurityUtils.getUser() != null && SecurityUtils.getUser().getUserId() != null) { noticeService.addUserNotice(SecurityUtils.getUser().getUserId(), msg, title, "24"); @@ -1156,9 +1157,9 @@ public class HikvisionCall { } } if (success) { - updateSuccessStatusByNow(workerInfo.getProjectSn(), workerInfo.getId(), type, operate, ThreadLocalUtil.getNotNull().getDate("now"), null); + updateSuccessStatusByNow(workerInfo.getProjectSn(), workerInfo.getId(), type, operate, AsyncHikvision.getSyncTime(), null); } else { - updateFailStatusByNow(workerInfo.getProjectSn(), workerInfo.getId(), type, operate, ThreadLocalUtil.getNotNull().getDate("now"), null); + updateFailStatusByNow(workerInfo.getProjectSn(), workerInfo.getId(), type, operate, AsyncHikvision.getSyncTime(), null); } if (SecurityUtils.getUser() != null && SecurityUtils.getUser().getUserId() != null) { noticeService.addUserNotice(SecurityUtils.getUser().getUserId(), msg, title, noticeType); @@ -2510,7 +2511,7 @@ public class HikvisionCall { } private void updateSucForUpdatePersonAuth(WorkerInfo workerInfo, String devSn, int i) { - updateSuccessStatusByNow(workerInfo.getProjectSn(), workerInfo.getId(), 3, i == 0 ? 1 : 3, ThreadLocalUtil.getNotNull().getDate("now"), devSn); + updateSuccessStatusByNow(workerInfo.getProjectSn(), workerInfo.getId(), 3, i == 0 ? 1 : 3, AsyncHikvision.getSyncTime(), devSn); } diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java index d7dc4d9ce..d5205dbf3 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java @@ -456,7 +456,7 @@ public class WorkerInfoServiceImpl extends ServiceImpl