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 d5d522137..1d78ed6a4 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 @@ -2478,7 +2478,7 @@ public class WorkerInfoServiceImpl extends ServiceImpl() .eq(XzHikvisionSync::getBigType, 1) .eq(XzHikvisionSync::getWhoId, workerInfo.getId()) diff --git a/src/main/java/com/zhgd/xmgl/task/HikvisionTask.java b/src/main/java/com/zhgd/xmgl/task/HikvisionTask.java index e83990503..e8517ea6b 100644 --- a/src/main/java/com/zhgd/xmgl/task/HikvisionTask.java +++ b/src/main/java/com/zhgd/xmgl/task/HikvisionTask.java @@ -175,6 +175,12 @@ public class HikvisionTask { } } + /** + * 对比车 + * + * @param project + * @throws Exception + */ public void compareHikvisionForCar(Project project) throws Exception { compareHikvisionForFixCar(project); compareHikvisionForReservationCar(project); @@ -182,6 +188,12 @@ public class HikvisionTask { xzHikvisionCompareDataService.addSuccessShow(project.getProjectSn(), "4"); } + /** + * 对比企业 + * + * @param project + * @throws Exception + */ public void compareHikvisionForEnterpriseEtc(Project project) throws Exception { //对比企业 JSONObject param = new JSONObject(); @@ -224,6 +236,14 @@ public class HikvisionTask { xzHikvisionCompareDataService.addSuccessShow(project.getProjectSn(), "1"); } + /** + * 对比班组和部门 + * + * @param project + * @param orgIndex + * @param enterpriseId + * @throws Exception + */ private void compareHikvisionForDepartmentAndTeamEtc(Project project, String orgIndex, String enterpriseId) throws Exception { JSONObject param = new JSONObject(); HikvisionUtil.addPageParamIfAbsent(param); @@ -285,6 +305,8 @@ public class HikvisionTask { } /** + * 对比人员 + * * @param project * @param orgIndex * @param type 1班组 2部门 @@ -344,6 +366,12 @@ public class HikvisionTask { xzHikvisionCompareDataService.addSuccessShow(project.getProjectSn(), "3"); } + /** + * 对比固定车 + * + * @param project + * @throws Exception + */ public void compareHikvisionForFixCar(Project project) throws Exception { JSONObject param = new JSONObject(); HikvisionUtil.addPageParamIfAbsent(param); @@ -358,6 +386,12 @@ public class HikvisionTask { compareAndAddData(project, listJa, carInfoList, 1); } + /** + * 对比临时车 + * + * @param project + * @throws Exception + */ public void compareHikvisionForReservationCar(Project project) throws Exception { JSONObject param = new JSONObject(); HikvisionUtil.addPageParamIfAbsent(param); @@ -370,6 +404,12 @@ public class HikvisionTask { compareAndAddData(project, listJa, carInfoList, 2); } + /** + * 对边黑名单车 + * + * @param project + * @throws Exception + */ public void compareHikvisionForBlackCar(Project project) throws Exception { JSONObject param = new JSONObject(); HikvisionUtil.addPageParamIfAbsent(param); @@ -386,6 +426,14 @@ public class HikvisionTask { compareAndAddData(project, listJa, carInfoList, 3); } + /** + * 对比和添加车辆数据 + * + * @param project + * @param listJa + * @param carInfoList + * @param carIscExistType + */ private void compareAndAddData(Project project, JSONArray listJa, List carInfoList, int carIscExistType) { if (CollUtil.isEmpty(listJa)) { for (CarInfo carInfo : carInfoList) {