From 23cf70adb1efc54363fb0fd7b91ac593e0ff1cd5 Mon Sep 17 00:00:00 2001
From: guoshengxiong <1923636941@qq.com>
Date: Fri, 12 Jul 2024 18:27:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=81=A2=E5=A4=8D=E4=BF=AE=E6=94=B9=E6=88=96?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BA=BA=E5=91=98=E6=97=B6=E5=80=99=E4=B8=8B?=
 =?UTF-8?q?=E5=8F=91=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/WorkerInfoServiceImpl.java   | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

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 4d2f96fdb..46a5eb757 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
@@ -458,8 +458,13 @@ public class WorkerInfoServiceImpl extends ServiceImpl<WorkerInfoMapper, WorkerI
         workerInfo.setInserviceType(1);
         workerInfoMapper.insert(workerInfo);
         ThreadLocalUtil.addInKey("now", new Date());
-        //同步海康
-        this.addWorkerAndAuthForHikvision(workerInfo);
+        boolean hikvisionConfig = projectUfaceConfigService.isHikvisionConfig(workerInfo.getProjectSn());
+        if (hikvisionConfig) {
+            //同步海康
+            this.addWorkerAndAuthForHikvision(workerInfo);
+        } else {
+            projectUfaceConfigService.addWorkerInfo(workerInfo);
+        }
         //上传住建
         asyncWorker.sendWorkerInfoById(workerInfo);
         asyncWorker.sendAndOrEditWorkerInfo(workerInfo);
@@ -529,8 +534,13 @@ public class WorkerInfoServiceImpl extends ServiceImpl<WorkerInfoMapper, WorkerI
             workerInfo.setSafeScore(oldWorkerInfo.getExitSafeScore());
         }
         workerInfoMapper.updateById(workerInfo);
-        //同步海康
-        this.editWorkerAndAuthForHikvision(workerInfo, oldWorkerInfo);
+        boolean hikvisionConfig = projectUfaceConfigService.isHikvisionConfig(workerInfo.getProjectSn());
+        if (hikvisionConfig) {
+            //同步海康
+            this.editWorkerAndAuthForHikvision(workerInfo, oldWorkerInfo);
+        } else {
+            projectUfaceConfigService.updateWorkerInfo(workerInfo, oldWorkerInfo);
+        }
 
         //上传住建
         //housingDataCall.sendUpdateWork(workerInfo.getProjectSn(),workerInfo.getId());
@@ -2578,10 +2588,6 @@ 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())