diff --git a/src/main/java/com/zhgd/xmgl/async/AsyncHikvision.java b/src/main/java/com/zhgd/xmgl/async/AsyncHikvision.java index 91c0509b9..e4f09066c 100644 --- a/src/main/java/com/zhgd/xmgl/async/AsyncHikvision.java +++ b/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); - hikvisionCall.updateSuccessStatus(projectSn, Long.valueOf(personId), 3, 1, dev.getDevSn()); + 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("[{}]下发到[{}]{}", diff --git a/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java b/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java index c7589ff9c..cc14ebf65 100644 --- a/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java +++ b/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java @@ -1204,12 +1204,7 @@ public class HikvisionCall { queryWrapper.ne(XzHikvisionSync::getOperate, 3); } } - List xzHikvisionSyncs = xzHikvisionSyncMapper.selectList(queryWrapper); - if (CollUtil.isEmpty(xzHikvisionSyncs)) { - return; - } - xzHikvisionSyncs.stream().sorted((o1, o2) -> o2.getCreateDate().compareTo(o1.getCreateDate())); - XzHikvisionSync xzHikvisionSync = xzHikvisionSyncs.get(0); + XzHikvisionSync xzHikvisionSync = xzHikvisionSyncMapper.selectOne(queryWrapper); 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 { diff --git a/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProjectUfaceConfigServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProjectUfaceConfigServiceImpl.java index fe7416b39..f47b68637 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProjectUfaceConfigServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProjectUfaceConfigServiceImpl.java @@ -495,9 +495,7 @@ public class ProjectUfaceConfigServiceImpl extends ServiceImpl() .eq(XzHikvisionSync::getBigType, 1) .eq(XzHikvisionSync::getWhoId, workerInfo.getId()) - .eq(XzHikvisionSync::getType, 3) ); this.addHkSyncRecordsAndUpdateWorkerStatus(workerInfo, devSns); List devSnList = StrUtil.split(devSns, ","); 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 132b4e1ed..81a14adbe 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 @@ -1759,6 +1759,7 @@ public class WorkerInfoServiceImpl extends ServiceImpl