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 81a14adbe..a1b2b12ee 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 @@ -23,6 +23,7 @@ import com.zhgd.exception.CustomException; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.execption.OpenAlertException; import com.zhgd.jeecg.common.mybatis.EntityMap; +import com.zhgd.jeecg.common.util.SpringContextUtils; import com.zhgd.xmgl.async.AsyncHikvision; import com.zhgd.xmgl.async.AsyncJiLianDa; import com.zhgd.xmgl.async.AsyncWorker; @@ -2324,7 +2325,7 @@ public class WorkerInfoServiceImpl extends ServiceImpl() + .eq(XzHikvisionSync::getBigType, 1) + .eq(XzHikvisionSync::getWhoId, workerInfo.getId()) + ); this.addHkSyncRecordIf(workerInfo, 2); projectUfaceConfigService.editHkSyncRecordAndResetStatusForDev(workerInfo); asyncHikvision.editWorkerAndAuthAsync(workerInfo, true, true); diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzHikvisionSyncMapper.xml b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzHikvisionSyncMapper.xml index 70914a2d6..a963b6c90 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzHikvisionSyncMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzHikvisionSyncMapper.xml @@ -20,5 +20,6 @@ ) t2 on t1.create_date=t2.create_date and t1.who_id=t2.who_id left join uface_dev ud on t1.device_sn = ud.dev_sn + order by t1.id diff --git a/src/main/java/com/zhgd/xmgl/task/HikvisionTask.java b/src/main/java/com/zhgd/xmgl/task/HikvisionTask.java index 5a89280eb..3b26303ce 100644 --- a/src/main/java/com/zhgd/xmgl/task/HikvisionTask.java +++ b/src/main/java/com/zhgd/xmgl/task/HikvisionTask.java @@ -155,6 +155,7 @@ public class HikvisionTask { @Scheduled(cron = "0 0 3 * * ?") @RequestMapping("compareData") public void compareData() throws Exception { + log.info("数据校验同步任务开始"); List projects = projectMapper.selectList(new LambdaQueryWrapper().eq(Project::getSyncHikvision, 1)); for (Project project : projects) { try {