From 11f50e0c67ac531116baa599a365f9f13568a333 Mon Sep 17 00:00:00 2001
From: GUO <1923636941@qq.com>
Date: Thu, 23 May 2024 00:32:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=A3=E5=88=86=E4=B8=8B=E5=8F=91=E7=9A=84?=
 =?UTF-8?q?=E8=A7=84=E5=88=99=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xmgl/modules/worker/entity/WorkerInfo.java |  1 -
 .../service/impl/WorkerInfoServiceImpl.java    | 18 ++++++++++++++----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/entity/WorkerInfo.java b/src/main/java/com/zhgd/xmgl/modules/worker/entity/WorkerInfo.java
index a3f841673..ffb11455c 100644
--- a/src/main/java/com/zhgd/xmgl/modules/worker/entity/WorkerInfo.java
+++ b/src/main/java/com/zhgd/xmgl/modules/worker/entity/WorkerInfo.java
@@ -344,7 +344,6 @@ public class WorkerInfo implements Serializable {
     @TableField(exist = false)
     @ApiModelProperty(value = "人脸分数")
     private java.lang.Integer faceScore;
-
     @TableField(exist = false)
     @ApiModelProperty(value = "登记方式，1PC录入，2手机端录入")
     private java.lang.Integer registerType;
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 5c2c77bc5..613362e01 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
@@ -24,7 +24,6 @@ import com.zhgd.jeecg.common.mybatis.EntityMap;
 import com.zhgd.xmgl.async.AsyncHikvision;
 import com.zhgd.xmgl.async.AsyncJiLianDa;
 import com.zhgd.xmgl.async.AsyncWorker;
-import com.zhgd.xmgl.base.entity.vo.SectorVo;
 import com.zhgd.xmgl.base.entity.vo.TrendOneVo;
 import com.zhgd.xmgl.call.HikvisionCall;
 import com.zhgd.xmgl.modules.basicdata.entity.Company;
@@ -197,7 +196,7 @@ public class WorkerInfoServiceImpl extends ServiceImpl<WorkerInfoMapper, WorkerI
             list = workerInfoMapper.selectWorkerInfoList(page, map);
         }
         if (list.size() > 0) {
-            if(MapUtils.getInteger(map, "certificateType") != null) {
+            if (MapUtils.getInteger(map, "certificateType") != null) {
                 List<Long> workerIds = list.stream().map(l -> l.getId()).collect(Collectors.toList());
                 List<WorkerCertificate> workerCertificate = workerCertificateService.list(Wrappers.<WorkerCertificate>lambdaQuery()
                         .in(WorkerCertificate::getWorkerId, workerIds)
@@ -2166,12 +2165,23 @@ public class WorkerInfoServiceImpl extends ServiceImpl<WorkerInfoMapper, WorkerI
 
     @Override
     public void updateScoreSendAuth(HashMap<String, Object> map) {
-        workerInfoMapper.updateScore(map);
         String id = MapUtils.getString(map, "id");
+        WorkerInfo old = baseMapper.selectById(id);
+        workerInfoMapper.updateScore(map);
         WorkerInfo workerInfo = baseMapper.selectById(id);
+        if (notNeedSend(old, workerInfo)) return;
         projectUfaceConfigService.updateWorkerInfo(workerInfo, workerInfo);
     }
 
+    private boolean notNeedSend(WorkerInfo old, WorkerInfo newWi) {
+        boolean bothRed = NumberUtils.lt(old.getSafeScore(), 80D) && NumberUtils.lt(newWi.getSafeScore(), 80D);
+        boolean bothNotRed = !NumberUtils.lt(old.getSafeScore(), 80D) && !NumberUtils.lt(newWi.getSafeScore(), 80D);
+        if ((bothRed || bothNotRed) && Objects.equals(old.getSendSuccessStatus(), 1)) {
+            return true;
+        }
+        return false;
+    }
+
     @Override
     public void updateWorkerById(WorkerInfo workerInfo) {
         WorkerInfo old = baseMapper.selectById(workerInfo.getId());
@@ -2179,7 +2189,7 @@ public class WorkerInfoServiceImpl extends ServiceImpl<WorkerInfoMapper, WorkerI
             throw new OpenAlertException("未找到该记录");
         }
         updateById(workerInfo);
-        if (NumberUtils.eq(workerInfo.getSafeScore(), 100D)) {
+        if (!notNeedSend(old, workerInfo)) {
             projectUfaceConfigService.updateWorkerInfo(workerInfo, workerInfo);
         }
     }