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 0) { - if(MapUtils.getInteger(map, "certificateType") != null) { + if (MapUtils.getInteger(map, "certificateType") != null) { List workerIds = list.stream().map(l -> l.getId()).collect(Collectors.toList()); List workerCertificate = workerCertificateService.list(Wrappers.lambdaQuery() .in(WorkerCertificate::getWorkerId, workerIds) @@ -2166,12 +2165,23 @@ public class WorkerInfoServiceImpl extends ServiceImpl 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