海康下发人员修复

src/main/java/com/zhgd/xmgl/async/AsyncHikvision.java

@@ -639,7 +639,11 @@ public class AsyncHikvision {
         //4：未配置
         Integer faceStatus = jo.getInteger("faceStatus");
         UfaceDev dev = devSnMap.get(devSn);
+        if (Objects.equals(faceStatus, 3)) {
             hikvisionCall.updateSuccessStatus(projectSn, Long.valueOf(personId), 3, 1, dev.getDevSn());
+        } else {
+            hikvisionCall.updateFailStatus(projectSn, Long.valueOf(personId), 3, 1, dev.getDevSn());
+        }
         if (ThreadLocalUtil.getByKey(Cts.TL_AUTH_USER, UserInfo.class) != null) {
             noticeService.addUserNotice(ThreadLocalUtil.getByKey(Cts.TL_AUTH_USER, UserInfo.class).getUserId(),
                     StrUtil.format("[{}]下发到[{}]{}",

src/main/java/com/zhgd/xmgl/call/HikvisionCall.java

@@ -1204,12 +1204,7 @@ public class HikvisionCall {
                 queryWrapper.ne(XzHikvisionSync::getOperate, 3);
             }
         }
-        List<XzHikvisionSync> xzHikvisionSyncs = xzHikvisionSyncMapper.selectList(queryWrapper);
+        XzHikvisionSync xzHikvisionSync = xzHikvisionSyncMapper.selectOne(queryWrapper);
-        if (CollUtil.isEmpty(xzHikvisionSyncs)) {
-            return;
-        }
-        xzHikvisionSyncs.stream().sorted((o1, o2) -> o2.getCreateDate().compareTo(o1.getCreateDate()));
-        XzHikvisionSync xzHikvisionSync = xzHikvisionSyncs.get(0);
         xzHikvisionSync.setIsSuccess(isSuccess ? 1 : 0);
         xzHikvisionSyncMapper.updateById(xzHikvisionSync);
 
@@ -1230,12 +1225,10 @@ public class HikvisionCall {
                 .eq(XzHikvisionSync::getBigType, bigType)
         );
         Integer sendSuccessStatus = null;
-        if (CollUtil.isEmpty(xzHikvisionSyncs)) {
+        if (CollUtil.isEmpty(xzHikvisionSyncs) || xzHikvisionSyncs.stream().allMatch(xzHikvisionSync1 -> xzHikvisionSync1.getIsSuccess() == null)) {
             sendSuccessStatus = null;
         } else if (xzHikvisionSyncs.stream().allMatch(xzHikvisionSync1 -> Objects.equals(xzHikvisionSync1.getIsSuccess(), 1))) {
             sendSuccessStatus = 1;
-        } else if (xzHikvisionSyncs.stream().allMatch(xzHikvisionSync1 -> xzHikvisionSync1.getIsSuccess() == null)) {
-            sendSuccessStatus = null;
         } else if (xzHikvisionSyncs.stream().allMatch(xzHikvisionSync1 -> xzHikvisionSync1.getIsSuccess() == null || Objects.equals(xzHikvisionSync1.getIsSuccess(), 0))) {
             sendSuccessStatus = 2;
         } else {

src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProjectUfaceConfigServiceImpl.java

@@ -495,9 +495,7 @@ public class ProjectUfaceConfigServiceImpl extends ServiceImpl<ProjectUfaceConfi
      */
     @Override
     public void addHkSyncRecordsAndUpdateWorkerStatus(WorkerInfo workerInfo, String devSns) {
-        getSyncTimeWithInitIfAbsent(1, workerInfo.getId());
+        for (String ds : StrUtil.split(devSns, ",")) {
-        String[] devSnArr = StringUtils.split(devSns, ",");
-        for (String ds : devSnArr) {
             xzHikvisionSyncMapper.insert(new XzHikvisionSync().setProjectSn(workerInfo.getProjectSn()).setType(3).setOperate(1).setWhoId(workerInfo.getId()).setDeviceSn(ds).setBigType(1).setCreateDate(getSyncTimeWithInitIfAbsent(1, workerInfo.getId())));
         }
         workerInfoService.updateWorkerHkStatus(workerInfo);
@@ -528,7 +526,6 @@ public class ProjectUfaceConfigServiceImpl extends ServiceImpl<ProjectUfaceConfi
                 xzHikvisionSyncMapper.delete(new LambdaQueryWrapper<XzHikvisionSync>()
                         .eq(XzHikvisionSync::getBigType, 1)
                         .eq(XzHikvisionSync::getWhoId, workerInfo.getId())
-                        .eq(XzHikvisionSync::getType, 3)
                 );
                 this.addHkSyncRecordsAndUpdateWorkerStatus(workerInfo, devSns);
                 List<String> devSnList = StrUtil.split(devSns, ",");

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

@@ -1759,6 +1759,7 @@ public class WorkerInfoServiceImpl extends ServiceImpl<WorkerInfoMapper, WorkerI
                     if (oldWorkerInfo.toExistString().equals(workerInfo.toExistString())) {
                         existName.append(workerInfo.getWorkerName());
                         existName.append("、");
+                        log.info("忽略批量导入已存在完全一样劳务人员：{}", oldWorkerInfo.getWorkerName());
                         continue;
                     }
                     workerInfo.setId(oldWorkerInfo.getId());
@@ -2398,7 +2399,9 @@ public class WorkerInfoServiceImpl extends ServiceImpl<WorkerInfoMapper, WorkerI
             return false;
         }
         xzHikvisionSyncMapper.insert(new XzHikvisionSync().setProjectSn(workerInfo.getProjectSn()).setType(1).setOperate(operate).setWhoId(workerInfo.getId()).setBigType(1).setCreateDate(getSyncTimeWithInitIfAbsent(1, workerInfo.getId())));
+        if (StrUtil.isNotBlank(workerInfo.getFieldAcquisitionUrl())) {
             xzHikvisionSyncMapper.insert(new XzHikvisionSync().setProjectSn(workerInfo.getProjectSn()).setType(2).setOperate(operate).setWhoId(workerInfo.getId()).setBigType(1).setCreateDate(getSyncTimeWithInitIfAbsent(1, workerInfo.getId())));
+        }
         return true;
     }