diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/UfaceDevServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/UfaceDevServiceImpl.java index a97f40aa0..9bcb233cb 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/UfaceDevServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/UfaceDevServiceImpl.java @@ -212,7 +212,7 @@ public class UfaceDevServiceImpl extends ServiceImpl i QueryWrapper qw = new QueryWrapper<>(); qw.lambda().eq(UfaceDev::getProjectSn, MapUtils.getString(map, "projectSn")); if (StringUtils.isNotBlank(ufaceDevId)) { - qw.lambda().in(UfaceDev::getDeviceId, Arrays.asList(ufaceDevId.split(","))); + qw.lambda().in(UfaceDev::getId, Arrays.asList(ufaceDevId.split(","))); } List list = ufaceDevMapper.selectList(qw); if (list == null || list.size() == 0) { diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzHikvisionSyncServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzHikvisionSyncServiceImpl.java index 1aeb81df9..3a96cc8cd 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzHikvisionSyncServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzHikvisionSyncServiceImpl.java @@ -30,6 +30,7 @@ import com.zhgd.xmgl.modules.worker.entity.UfaceDev; import com.zhgd.xmgl.modules.worker.entity.WorkerInfo; import com.zhgd.xmgl.modules.worker.mapper.UfaceDevMapper; import com.zhgd.xmgl.modules.worker.mapper.WorkerInfoMapper; +import com.zhgd.xmgl.modules.worker.service.IWorkerInfoService; import com.zhgd.xmgl.modules.xz.entity.XzHikvisionSync; import com.zhgd.xmgl.modules.xz.enums.XzHikvisionSyncOperateEnum; import com.zhgd.xmgl.modules.xz.enums.XzHikvisionSyncTypeEnum; @@ -44,6 +45,7 @@ import org.apache.commons.lang3.tuple.Pair; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.context.annotation.Lazy; +import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; @@ -354,6 +356,7 @@ public class XzHikvisionSyncServiceImpl extends ServiceImpl syncList = new ArrayList<>(); @@ -364,6 +367,7 @@ public class XzHikvisionSyncServiceImpl extends ServiceImpl 0) { this.saveBatch(syncList); } + hikvisionCall.updateTotalStatus(workerInfo.getProjectSn(), workerInfo.getId(), 1); } private void build(List syncList, WorkerInfo workerInfo, String deviceSn, Integer isSuccess) {