admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

海康同步删除旧数据

Browse Source
This commit is contained in:
GUO 2024-06-01 15:55:49 +08:00
parent b21a1822e0
commit 33ade0064c
4 changed files with 78 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

139
src/main/java/com/zhgd/xmgl/async/AsyncHikvision.java
View File

@ -2,6 +2,7 @@ package com.zhgd.xmgl.async;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.zhgd.jeecg.common.execption.OpenPromptException; 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.jeecg.common.util.pass.HttpUtils;
import com.zhgd.xmgl.call.HikvisionCall; import com.zhgd.xmgl.call.HikvisionCall;
import com.zhgd.xmgl.modules.basicdata.service.INoticeService; import com.zhgd.xmgl.modules.basicdata.service.INoticeService;
@ -38,6 +39,7 @@ import java.util.Objects;
@Slf4j @Slf4j
@Component @Component
public class AsyncHikvision { public class AsyncHikvision {
public static final String XZ_HIKVISION_SYNC_TIME = "xzHikvisionSyncTime";
@Autowired @Autowired
@Lazy @Lazy
WorkerInfoServiceImpl workerInfoService; WorkerInfoServiceImpl workerInfoService;
@ -72,25 +74,38 @@ public class AsyncHikvision {
@Autowired @Autowired
private XzHikvisionCompareDataServiceImpl xzHikvisionCompareDataService; 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) { if (now == null) {
//首次执行，清空以前同步记录
now = new Date(); now = new Date();
ThreadLocalUtil.addInKey("now", now); ThreadLocalUtil.addInKey(XZ_HIKVISION_SYNC_TIME, now);
SpringContextUtils.getBean(XzHikvisionSyncMapper.class).delete(new LambdaQueryWrapper<XzHikvisionSync>()
.eq(XzHikvisionSync::getBigType, bigType)
.eq(XzHikvisionSync::getWhoId, tableId)
);
} }
return now; return now;
} }
public static Date getSyncTime() {
return ThreadLocalUtil.getNotNull().getDate(XZ_HIKVISION_SYNC_TIME);
}
/** /**
* 添加劳务人员-海康 * 添加劳务人员-海康
* *
* @param workerInfo * @param workerInfo
* @param now
*/ */
@Async("hikvisionExecutor") @Async("hikvisionExecutor")
public void addWorkerForHikvisionAsync(WorkerInfo workerInfo, Date now) { public void addWorkerForHikvisionAsync(WorkerInfo workerInfo) {
try { try {
ThreadLocalUtil.addInKey("now", now);
hikvisionCall.addWorkerForHikvision(workerInfo); hikvisionCall.addWorkerForHikvision(workerInfo);
} catch (Exception e) { } catch (Exception e) {
log.error("海康：", e); log.error("海康：", e);
@ -99,16 +114,15 @@ public class AsyncHikvision {
} }
public void addWorkerForHikvision(WorkerInfo workerInfo) { public void addWorkerForHikvision(WorkerInfo workerInfo) {
Date now = getSyncLotNowOrSetIfNull(); getSyncTimeWithInitIfAbsent(1, workerInfo.getId());
xzHikvisionSyncMapper.insert(new XzHikvisionSync().setProjectSn(workerInfo.getProjectSn()).setType(1).setOperate(1).setWhoId(workerInfo.getId()).setCreateDate(now)); 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(now)); xzHikvisionSyncMapper.insert(new XzHikvisionSync().setProjectSn(workerInfo.getProjectSn()).setType(2).setOperate(1).setWhoId(workerInfo.getId()).setCreateDate(getSyncTimeWithInitIfAbsent(1, workerInfo.getId())));
asyncHikvision.addWorkerForHikvisionAsync(workerInfo, now); asyncHikvision.addWorkerForHikvisionAsync(workerInfo);
} }
@Async("hikvisionExecutor") @Async("hikvisionExecutor")
public void editWorkerForHikvisionAsync(WorkerInfo workerInfo, Date now) { public void editWorkerForHikvisionAsync(WorkerInfo workerInfo) {
try { try {
ThreadLocalUtil.addInKey("now", now);
hikvisionCall.editWorkerForHikvision(workerInfo); hikvisionCall.editWorkerForHikvision(workerInfo);
} catch (Exception e) { } catch (Exception e) {
log.error("海康：", e); log.error("海康：", e);
@ -117,10 +131,10 @@ public class AsyncHikvision {
} }
public void editWorkerForHikvision(WorkerInfo workerInfo) { public void editWorkerForHikvision(WorkerInfo workerInfo) {
Date now = getSyncLotNowOrSetIfNull(); getSyncTimeWithInitIfAbsent(1, workerInfo.getId());
xzHikvisionSyncMapper.insert(new XzHikvisionSync().setProjectSn(workerInfo.getProjectSn()).setType(1).setOperate(2).setWhoId(workerInfo.getId()).setCreateDate(now)); 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(now)); xzHikvisionSyncMapper.insert(new XzHikvisionSync().setProjectSn(workerInfo.getProjectSn()).setType(2).setOperate(2).setWhoId(workerInfo.getId()).setCreateDate(getSyncTimeWithInitIfAbsent(1, workerInfo.getId())));
asyncHikvision.editWorkerForHikvisionAsync(workerInfo, now); asyncHikvision.editWorkerForHikvisionAsync(workerInfo);
} }
private void sendNoticeForWorker(WorkerInfo workerInfo, Exception e, String action) { private void sendNoticeForWorker(WorkerInfo workerInfo, Exception e, String action) {
@ -137,13 +151,12 @@ public class AsyncHikvision {
if (SecurityUtils.getUser() != null && SecurityUtils.getUser().getUserId() != null) { if (SecurityUtils.getUser() != null && SecurityUtils.getUser().getUserId() != null) {
noticeService.addUserNotice(SecurityUtils.getUser().getUserId(), msg, title, type); 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") @Async("hikvisionExecutor")
public void deleteWorkerForHikvisionAsync(WorkerInfo workerInfo, Date now) { public void deleteWorkerForHikvisionAsync(WorkerInfo workerInfo) {
try { try {
ThreadLocalUtil.addInKey("now", now);
hikvisionCall.deleteWorkerForHikvision(workerInfo); hikvisionCall.deleteWorkerForHikvision(workerInfo);
} catch (Exception e) { } catch (Exception e) {
log.error("海康：", e); log.error("海康：", e);
@ -152,32 +165,30 @@ public class AsyncHikvision {
} }
public void deleteWorkerForHikvision(WorkerInfo workerInfo) { public void deleteWorkerForHikvision(WorkerInfo workerInfo) {
Date now = getSyncLotNowOrSetIfNull(); getSyncTimeWithInitIfAbsent(1, workerInfo.getId());
xzHikvisionSyncMapper.insert(new XzHikvisionSync().setProjectSn(workerInfo.getProjectSn()).setType(1).setOperate(3).setWhoId(workerInfo.getId()).setCreateDate(now)); 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(now)); xzHikvisionSyncMapper.insert(new XzHikvisionSync().setProjectSn(workerInfo.getProjectSn()).setType(2).setOperate(3).setWhoId(workerInfo.getId()).setCreateDate(getSyncTimeWithInitIfAbsent(1, workerInfo.getId())));
asyncHikvision.deleteWorkerForHikvisionAsync(workerInfo, now); asyncHikvision.deleteWorkerForHikvisionAsync(workerInfo);
} }
public void addCarInfoForHikvision(CarInfo carInfo) { public void addCarInfoForHikvision(CarInfo carInfo) {
Date now = new Date();
if (carInfo.getIsBlack() == 1) { if (carInfo.getIsBlack() == 1) {
deleteCarInfoForHikvision(carInfo, true); deleteCarInfoForHikvision(carInfo, true);
} else { } else {
if (Objects.equals(carInfo.getCarModuleType(), 1)) { 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(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(now)); 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)) { } 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)); xzHikvisionSyncMapper.insert(new XzHikvisionSync().setProjectSn(carInfo.getProjectSn()).setType(7).setOperate(3).setWhoId(carInfo.getId()).setCreateDate(getSyncTimeWithInitIfAbsent(2, carInfo.getId())));
asyncHikvision.addCarInfoForHikvisionAsyc(carInfo, now); asyncHikvision.addCarInfoForHikvisionAsyc(carInfo);
} }
} }
@Async("carInfoExecutor") @Async("carInfoExecutor")
public void addCarInfoForHikvisionAsyc(CarInfo carInfo, Date now) { public void addCarInfoForHikvisionAsyc(CarInfo carInfo) {
try { try {
ThreadLocalUtil.addInKey("now", now);
hikvisionCall.saveCarInfoFromHikvision(carInfo); hikvisionCall.saveCarInfoFromHikvision(carInfo);
} catch (Exception e) { } catch (Exception e) {
log.error("海康：", 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") @Async("carInfoExecutor")
public void handleAlarmCarForHikvision(CarInfo carInfo, Date now) { public void handleAlarmCarForHikvision(CarInfo carInfo) {
ThreadLocalUtil.addInKey("now", now);
Project project = projectMapper.selectOne(new LambdaQueryWrapper<Project>().eq(Project::getProjectSn, carInfo.getProjectSn())); Project project = projectMapper.selectOne(new LambdaQueryWrapper<Project>().eq(Project::getProjectSn, carInfo.getProjectSn()));
if (project == null || !Objects.equals(project.getSyncHikvision(), 1)) { if (project == null || !Objects.equals(project.getSyncHikvision(), 1)) {
return; return;
@ -215,29 +219,28 @@ public class AsyncHikvision {
if (SecurityUtils.getUser() != null && SecurityUtils.getUser().getUserId() != null) { if (SecurityUtils.getUser() != null && SecurityUtils.getUser().getUserId() != null) {
noticeService.addUserNotice(SecurityUtils.getUser().getUserId(), msg, title, type); 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) { public void editCarInfoForHikvision(CarInfo carInfo, CarInfo old) {
Date now = new Date();
if (carInfo.getIsBlack() == 1) { if (carInfo.getIsBlack() == 1) {
deleteCarInfoForHikvision(carInfo, true); deleteCarInfoForHikvision(carInfo, true);
} else { } else {
if (Objects.equals(carInfo.getCarModuleType(), 1)) { 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(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(now)); 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)) { } 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)); xzHikvisionSyncMapper.insert(new XzHikvisionSync().setProjectSn(carInfo.getProjectSn()).setType(7).setOperate(3).setWhoId(carInfo.getId()).setCreateDate(getSyncTimeWithInitIfAbsent(2, carInfo.getId())));
asyncHikvision.editCarInfoForHikvisionAsync(carInfo, old, now); asyncHikvision.editCarInfoForHikvisionAsync(carInfo, old);
} }
} }
@Async("carInfoExecutor") @Async("carInfoExecutor")
public void editCarInfoForHikvisionAsync(CarInfo carInfo, CarInfo old, Date now) { public void editCarInfoForHikvisionAsync(CarInfo carInfo, CarInfo old) {
try { try {
ThreadLocalUtil.addInKey("now", now);
hikvisionCall.editCarInfoForHikvision(carInfo, old); hikvisionCall.editCarInfoForHikvision(carInfo, old);
} catch (Exception e) { } catch (Exception e) {
log.error("海康：", e); log.error("海康：", e);
@ -246,18 +249,16 @@ public class AsyncHikvision {
} }
public void deleteCarInfoForHikvision(CarInfo carInfo, boolean isSetBlack) { 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(getSyncTimeWithInitIfAbsent(2, carInfo.getId())));
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(getSyncTimeWithInitIfAbsent(2, carInfo.getId())));
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(getSyncTimeWithInitIfAbsent(2, carInfo.getId())));
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(getSyncTimeWithInitIfAbsent(2, carInfo.getId())));
xzHikvisionSyncMapper.insert(new XzHikvisionSync().setProjectSn(carInfo.getProjectSn()).setType(7).setOperate(isSetBlack ? 1 : 3).setWhoId(carInfo.getId()).setCreateDate(now)); asyncHikvision.deleteCarInfoForHikvisionAsync(carInfo, isSetBlack);
asyncHikvision.deleteCarInfoForHikvisionAsync(carInfo, now, isSetBlack);
} }
@Async("carInfoExecutor") @Async("carInfoExecutor")
public void deleteCarInfoForHikvisionAsync(CarInfo carInfo, Date now, boolean isSetBlack) { public void deleteCarInfoForHikvisionAsync(CarInfo carInfo, boolean isSetBlack) {
try { try {
ThreadLocalUtil.addInKey("now", now);
hikvisionCall.deleteCarInfoForHikvision(carInfo, isSetBlack); hikvisionCall.deleteCarInfoForHikvision(carInfo, isSetBlack);
} catch (Exception e) { } catch (Exception e) {
log.error("海康：", e); log.error("海康：", e);
@ -385,18 +386,17 @@ public class AsyncHikvision {
if (StringUtils.isBlank(devSn)) { if (StringUtils.isBlank(devSn)) {
return; return;
} }
Date now = getSyncLotNowOrSetIfNull(); getSyncTimeWithInitIfAbsent(1, workerInfo.getId());
String[] devSnArr = StringUtils.split(devSn, ","); String[] devSnArr = StringUtils.split(devSn, ",");
for (String ds : devSnArr) { 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") @Async("hikvisionExecutor")
public void addPersonAuthAsync(WorkerInfo workerInfo, String devSn, Date now) { public void addPersonAuthAsync(WorkerInfo workerInfo, String devSn) {
try { try {
ThreadLocalUtil.addInKey("now", now);
StringBuilder sucSb = new StringBuilder(); StringBuilder sucSb = new StringBuilder();
StringBuilder failSb = new StringBuilder(); StringBuilder failSb = new StringBuilder();
String[] devSnArr = StringUtils.split(devSn, ","); String[] devSnArr = StringUtils.split(devSn, ",");
@ -410,7 +410,7 @@ public class AsyncHikvision {
} else { } else {
noticeService.addUserNotice(SecurityUtils.getUser().getUserId(), e.getMessage(), "人员下发设备提醒", "1"); 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; return;
} }
@ -430,7 +430,7 @@ public class AsyncHikvision {
if (SecurityUtils.getUser() != null && SecurityUtils.getUser().getUserId() != null) { if (SecurityUtils.getUser() != null && SecurityUtils.getUser().getUserId() != null) {
noticeService.addUserNotice(SecurityUtils.getUser().getUserId(), StringUtils.substring(msg, 0, msg.length() - 1), title, type); 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) { } catch (Exception e) {
log.error("海康：", e); log.error("海康：", e);
} }
@ -446,21 +446,20 @@ public class AsyncHikvision {
if (StringUtils.isBlank(devSns)) { if (StringUtils.isBlank(devSns)) {
return; return;
} }
Date now = getSyncLotNowOrSetIfNull(); getSyncTimeWithInitIfAbsent(1, workerInfo.getId());
String[] devSnArr = StringUtils.split(devSns, ","); String[] devSnArr = StringUtils.split(devSns, ",");
for (String ds : devSnArr) { 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") @Async("hikvisionExecutor")
public void deletePersonAuthAsync(WorkerInfo workerInfo, String devSn, Date now) { public void deletePersonAuthAsync(WorkerInfo workerInfo, String devSn) {
try { try {
if (StringUtils.isBlank(devSn)) { if (StringUtils.isBlank(devSn)) {
return; return;
} }
ThreadLocalUtil.addInKey("now", now);
StringBuilder sucSb = new StringBuilder(); StringBuilder sucSb = new StringBuilder();
StringBuilder failSb = new StringBuilder(); StringBuilder failSb = new StringBuilder();
String[] devSnArr = StringUtils.split(devSn, ","); String[] devSnArr = StringUtils.split(devSn, ",");
@ -474,7 +473,7 @@ public class AsyncHikvision {
} else { } else {
noticeService.addUserNotice(SecurityUtils.getUser().getUserId(), e.getMessage(), "人员下发设备提醒", "1"); 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; return;
} }
@ -494,7 +493,7 @@ public class AsyncHikvision {
if (SecurityUtils.getUser() != null && SecurityUtils.getUser().getUserId() != null) { if (SecurityUtils.getUser() != null && SecurityUtils.getUser().getUserId() != null) {
noticeService.addUserNotice(SecurityUtils.getUser().getUserId(), StringUtils.substring(msg, 0, msg.length() - 1), title, type); 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) { } catch (Exception e) {
log.error("海康：", e); log.error("海康：", e);
} }

11
src/main/java/com/zhgd/xmgl/call/HikvisionCall.java
View File

@ -17,6 +17,7 @@ import com.zhgd.jeecg.common.api.vo.Result;
import com.zhgd.jeecg.common.execption.OpenPromptException; import com.zhgd.jeecg.common.execption.OpenPromptException;
import com.zhgd.redis.lock.RedisRepository; import com.zhgd.redis.lock.RedisRepository;
import com.zhgd.xmgl.async.AsyncAiAnalyse; import com.zhgd.xmgl.async.AsyncAiAnalyse;
import com.zhgd.xmgl.async.AsyncHikvision;
import com.zhgd.xmgl.base.*; import com.zhgd.xmgl.base.*;
import com.zhgd.xmgl.call.entity.ChargeDeletionParam; import com.zhgd.xmgl.call.entity.ChargeDeletionParam;
import com.zhgd.xmgl.constant.Cts; import com.zhgd.xmgl.constant.Cts;
@ -1061,9 +1062,9 @@ public class HikvisionCall {
} }
if (success) { 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 { } 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) { if (SecurityUtils.getUser() != null && SecurityUtils.getUser().getUserId() != null) {
noticeService.addUserNotice(SecurityUtils.getUser().getUserId(), msg, title, "24"); noticeService.addUserNotice(SecurityUtils.getUser().getUserId(), msg, title, "24");
@ -1156,9 +1157,9 @@ public class HikvisionCall {
} }
} }
if (success) { 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 { } 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) { if (SecurityUtils.getUser() != null && SecurityUtils.getUser().getUserId() != null) {
noticeService.addUserNotice(SecurityUtils.getUser().getUserId(), msg, title, noticeType); noticeService.addUserNotice(SecurityUtils.getUser().getUserId(), msg, title, noticeType);
@ -2510,7 +2511,7 @@ public class HikvisionCall {
} }
private void updateSucForUpdatePersonAuth(WorkerInfo workerInfo, String devSn, int i) { 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);
} }

2
src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java
View File

@ -456,7 +456,7 @@ public class WorkerInfoServiceImpl extends ServiceImpl<WorkerInfoMapper, WorkerI
} }
public void resetHkStatus(WorkerInfo workerInfo) { public void resetHkStatus(WorkerInfo workerInfo) {
hikvisionCall.updateTotalStatus(workerInfo.getProjectSn(), workerInfo.getId(), 1, AsyncHikvision.getSyncLotNowOrSetIfNull()); hikvisionCall.updateTotalStatus(workerInfo.getProjectSn(), workerInfo.getId(), 1, AsyncHikvision.getSyncTime());
} }
/** /**

3
src/main/java/com/zhgd/xmgl/modules/xz/entity/XzHikvisionSync.java
View File

@ -85,7 +85,8 @@ public class XzHikvisionSync implements Serializable {
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss.SSS") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss.SSS")
@ApiModelProperty(value = "更新时间") @ApiModelProperty(value = "更新时间")
private java.util.Date updateDate; private java.util.Date updateDate;
@ApiModelProperty(value = "1人员2车辆")
private java.lang.Integer bigType;
@TableField(exist = false) @TableField(exist = false)
@ApiModelProperty(value = "详情") @ApiModelProperty(value = "详情")
private java.lang.String detail; private java.lang.String detail;