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

修改bug

Browse Source
This commit is contained in:
guoshengxiong 2024-06-11 15:26:26 +08:00
parent 4281929c0a
commit 2e43ee55a4
2 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzHikvisionCompareDataServiceImpl.java
View File

@ -523,8 +523,8 @@ public class XzHikvisionCompareDataServiceImpl extends ServiceImpl<XzHikvisionCo
@Async("syncXzHikvisionCompareData") @Async("syncXzHikvisionCompareData")
public void manualCompareDataAsync(Map<String, Object> param, String projectSn) throws Exception { public void manualCompareDataAsync(Map<String, Object> param, String projectSn) throws Exception {
Integer type = MapUtils.getInteger(param, "type");
try { try {
Integer type = MapUtils.getInteger(param, "type");
ProjectInfoExtVo projectInfoBySn = projectService.getProjectInfoBySn(projectSn); ProjectInfoExtVo projectInfoBySn = projectService.getProjectInfoBySn(projectSn);
if (Objects.equals(type, 1)) { if (Objects.equals(type, 1)) {
//人员 //人员
@ -546,7 +546,11 @@ public class XzHikvisionCompareDataServiceImpl extends ServiceImpl<XzHikvisionCo
addExceptionShowIfNull(projectSn); addExceptionShowIfNull(projectSn);
} finally { } finally {
// 手动执行比对数据完成 // 手动执行比对数据完成
noticeService.addUserNotice(SecurityUtils.getUser().getUserId(), "手动校验数据完成", "手动校验数据完成", "1"); if (Objects.equals(type, 1)) {
noticeService.addUserNotice(SecurityUtils.getUser().getUserId(), "人员手动校验数据完成", "人员手动校验数据完成", "1");
} else if (Objects.equals(type, 2)) {
noticeService.addUserNotice(SecurityUtils.getUser().getUserId(), "车辆手动校验数据完成", "车辆手动校验数据完成", "1");
}
} }
} }

26
src/main/java/com/zhgd/xmgl/task/HikvisionTask.java
View File

@ -193,7 +193,7 @@ public class HikvisionTask {
if (CollUtil.isEmpty(listJa)) { if (CollUtil.isEmpty(listJa)) {
for (EnterpriseInfo enterpriseInfo : enterpriseInfos) { for (EnterpriseInfo enterpriseInfo : enterpriseInfos) {
xzHikvisionCompareDataService.addCompareDataForEnterprise(project, enterpriseInfo.getEnterpriseName(), 0, 1, String.valueOf(enterpriseInfo.getId())); xzHikvisionCompareDataService.addCompareDataForEnterprise(project, enterpriseInfo.getEnterpriseName(), 0, 1, String.valueOf(enterpriseInfo.getId()));
compareHikvisionForDepartmentAndTeamEtc(project, String.valueOf(enterpriseInfo.getId())); compareHikvisionForDepartmentAndTeamEtc(project, String.valueOf(enterpriseInfo.getId()), String.valueOf(enterpriseInfo.getId()));
} }
} else { } else {
//isc存在，平台也存在 //isc存在，平台也存在
@ -204,30 +204,34 @@ public class HikvisionTask {
Map<String, EnterpriseInfo> myMap = enterpriseInfos.stream().collect(Collectors.toMap(EnterpriseInfo::getEnterpriseName, Function.identity(), (o, o2) -> o2)); Map<String, EnterpriseInfo> myMap = enterpriseInfos.stream().collect(Collectors.toMap(EnterpriseInfo::getEnterpriseName, Function.identity(), (o, o2) -> o2));
for (String name : nameSet) { for (String name : nameSet) {
String orgIndex = null; String orgIndex = null;
String enterpriseId = null;
if (myMap.containsKey(name) && !iscMap.containsKey(name)) { if (myMap.containsKey(name) && !iscMap.containsKey(name)) {
orgIndex = String.valueOf(myMap.get(name).getId()); orgIndex = String.valueOf(myMap.get(name).getId());
enterpriseId = orgIndex;
xzHikvisionCompareDataService.addCompareDataForEnterprise(project, name, 0, 1, orgIndex); xzHikvisionCompareDataService.addCompareDataForEnterprise(project, name, 0, 1, orgIndex);
} else if (!myMap.containsKey(name) && iscMap.containsKey(name)) { } else if (!myMap.containsKey(name) && iscMap.containsKey(name)) {
orgIndex = iscMap.get(name).getString("orgIndexCode"); orgIndex = iscMap.get(name).getString("orgIndexCode");
enterpriseId = orgIndex;
xzHikvisionCompareDataService.addCompareDataForEnterprise(project, name, 1, 0, orgIndex); xzHikvisionCompareDataService.addCompareDataForEnterprise(project, name, 1, 0, orgIndex);
} else { } else {
orgIndex = String.valueOf(myMap.get(name).getId()); enterpriseId = String.valueOf(myMap.get(name).getId());
orgIndex = iscMap.get(name).getString("orgIndexCode");
} }
compareHikvisionForDepartmentAndTeamEtc(project, orgIndex); compareHikvisionForDepartmentAndTeamEtc(project, orgIndex, enterpriseId);
} }
} }
xzHikvisionCompareDataService.addSuccessShow(project.getProjectSn(), "1"); xzHikvisionCompareDataService.addSuccessShow(project.getProjectSn(), "1");
} }
private void compareHikvisionForDepartmentAndTeamEtc(Project project, String orgIndex) throws Exception { private void compareHikvisionForDepartmentAndTeamEtc(Project project, String orgIndex, String enterpriseId) throws Exception {
JSONObject param = new JSONObject(); JSONObject param = new JSONObject();
HikvisionUtil.addPageParamIfAbsent(param); HikvisionUtil.addPageParamIfAbsent(param);
param.put("parentOrgIndexCode", orgIndex); param.put("parentOrgIndexCode", orgIndex);
JSONObject rtJo = HikvisionUtil.getSubOrgListByParentOrg(project, param); JSONObject rtJo = HikvisionUtil.getSubOrgListByParentOrg(project, param);
List<TeamInfo> teamList = teamInfoService.getProjectTeamList(new MapBuilder<String, Object>() List<TeamInfo> teamList = teamInfoService.getProjectTeamList(new MapBuilder<String, Object>()
.put(Cts.PROJECT_SN, project.getProjectSn()).put(Cts.ENTERPRISE_ID, orgIndex).build()); .put(Cts.PROJECT_SN, project.getProjectSn()).put(Cts.ENTERPRISE_ID, enterpriseId).build());
List<DepartmentInfo> departmentInfoList = departmentInfoMapper.getDepartmentInfoList(new MapBuilder<String, Object>() List<DepartmentInfo> departmentInfoList = departmentInfoMapper.getDepartmentInfoList(new MapBuilder<String, Object>()
.put(Cts.PROJECT_SN, project.getProjectSn()).put(Cts.ENTERPRISE_ID, orgIndex).build()); .put(Cts.PROJECT_SN, project.getProjectSn()).put(Cts.ENTERPRISE_ID, enterpriseId).build());
JSONObject dataJo = HikvisionUtil.getJSONObjectData(rtJo); JSONObject dataJo = HikvisionUtil.getJSONObjectData(rtJo);
JSONArray listJa = dataJo.getJSONArray("list"); JSONArray listJa = dataJo.getJSONArray("list");
if (CollUtil.isEmpty(listJa)) { if (CollUtil.isEmpty(listJa)) {
@ -313,10 +317,16 @@ public class HikvisionTask {
for (String idCard : idCardSet) { for (String idCard : idCardSet) {
if (myMap.containsKey(idCard) && !iscMap.containsKey(idCard)) { if (myMap.containsKey(idCard) && !iscMap.containsKey(idCard)) {
xzHikvisionCompareDataService.addCompareDataForWorker(project, myMap.get(idCard).getWorkerName(), 0, 1, String.valueOf(myMap.get(idCard).getId()), idCard); xzHikvisionCompareDataService.addCompareDataForWorker(project, myMap.get(idCard).getWorkerName(), 0, 1, String.valueOf(myMap.get(idCard).getId()), idCard);
xzHikvisionCompareDataService.addCompareDataForFace(project, myMap.get(idCard).getWorkerName(), 0, 1, String.valueOf(myMap.get(idCard).getId()), idCard); WorkerInfo wi = myMap.get(idCard);
if (StrUtil.isNotBlank(wi.getFieldAcquisitionUrl())) {
xzHikvisionCompareDataService.addCompareDataForFace(project, myMap.get(idCard).getWorkerName(), 0, 1, String.valueOf(myMap.get(idCard).getId()), idCard);
}
} else if (!myMap.containsKey(idCard) && iscMap.containsKey(idCard)) { } else if (!myMap.containsKey(idCard) && iscMap.containsKey(idCard)) {
xzHikvisionCompareDataService.addCompareDataForWorker(project, iscMap.get(idCard).getString("personName"), 1, 0, iscMap.get(idCard).getString("personId"), idCard); xzHikvisionCompareDataService.addCompareDataForWorker(project, iscMap.get(idCard).getString("personName"), 1, 0, iscMap.get(idCard).getString("personId"), idCard);
xzHikvisionCompareDataService.addCompareDataForFace(project, iscMap.get(idCard).getString("personName"), 1, 0, iscMap.get(idCard).getString("personId"), idCard); JSONArray ppJa = iscMap.get(idCard).getJSONArray("personPhoto");
if (CollUtil.isNotEmpty(ppJa)) {
xzHikvisionCompareDataService.addCompareDataForFace(project, iscMap.get(idCard).getString("personName"), 1, 0, iscMap.get(idCard).getString("personId"), idCard);
}
} else { } else {
//isc存在，平台也存在该人员 //isc存在，平台也存在该人员
boolean myHave = StrUtil.isNotBlank(myMap.get(idCard).getFieldAcquisitionUrl()); boolean myHave = StrUtil.isNotBlank(myMap.get(idCard).getFieldAcquisitionUrl());