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

海康下发人员修复

Browse Source
This commit is contained in:
guoshengxiong 2024-06-14 11:36:19 +08:00
parent c59aa46e91
commit e2b9281d7b
4 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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("[{}]下发到[{}]{}",

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

@ -1204,12 +1204,7 @@ public class HikvisionCall {
queryWrapper.ne(XzHikvisionSync::getOperate, 3);
}
}
List<XzHikvisionSync> 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 {

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

@ -495,9 +495,7 @@ public class ProjectUfaceConfigServiceImpl extends ServiceImpl<ProjectUfaceConfi
*/
@Override
public void addHkSyncRecordsAndUpdateWorkerStatus(WorkerInfo workerInfo, String devSns) {
getSyncTimeWithInitIfAbsent(1, workerInfo.getId());
String[] devSnArr = StringUtils.split(devSns, ",");
for (String ds : devSnArr) {
for (String ds : StrUtil.split(devSns, ",")) {
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, ",");

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

@ -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())));
xzHikvisionSyncMapper.insert(new XzHikvisionSync().setProjectSn(workerInfo.getProjectSn()).setType(2).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;
}