From 00b00aea6474fc0a4db971c894b2a0dafe25176d Mon Sep 17 00:00:00 2001
From: guoshengxiong <1923636941@qq.com>
Date: Sat, 29 Jun 2024 10:18:47 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/WorkerInfoServiceImpl.java   |  6 ++-
 .../com/zhgd/xmgl/task/HikvisionTask.java     | 48 +++++++++++++++++++
 2 files changed, 53 insertions(+), 1 deletion(-)

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<WorkerInfoMapper, WorkerI
     }
 
     public void addWorkerAndAuthForHikvision(WorkerInfo workerInfo) {
-        this.addHkSyncRecordIf(workerInfo, 1);
+        if (!addHkSyncRecordIf(workerInfo, 1)) return;
         projectUfaceConfigService.addHkSyncRecordAndResetStatusForAddAuth(workerInfo);
         asyncHikvision.addWorkerAndAuthAsync(workerInfo, true, true);
     }
@@ -2538,6 +2538,10 @@ public class WorkerInfoServiceImpl extends ServiceImpl<WorkerInfoMapper, WorkerI
 
     @Override
     public void editWorkerAndAuthForHikvision(WorkerInfo workerInfo, WorkerInfo oldWorkerInfo) {
+        boolean hikvisionConfig = projectUfaceConfigService.isHikvisionConfig(workerInfo.getProjectSn());
+        if (!hikvisionConfig) {
+            return;
+        }
         SpringContextUtils.getBean(XzHikvisionSyncMapper.class).delete(new LambdaQueryWrapper<XzHikvisionSync>()
                 .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<CarInfo> carInfoList, int carIscExistType) {
         if (CollUtil.isEmpty(listJa)) {
             for (CarInfo carInfo : carInfoList) {