From 3e9a6da99aae968123ee7bca352fc08becd7f1f2 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 29 八月 2024 17:29:21 +0800
Subject: [PATCH] 工单过程图接口更换

---
 ycl-server/src/main/java/com/ycl/calculate/FaceDeviceSampleCalculation.java |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/ycl-server/src/main/java/com/ycl/calculate/FaceDeviceSampleCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/FaceDeviceSampleCalculation.java
index 0e2fa5b..d598f12 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/FaceDeviceSampleCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/FaceDeviceSampleCalculation.java
@@ -7,6 +7,7 @@
 import com.ycl.platform.mapper.TMonitorMapper;
 import com.ycl.platform.service.ICheckIndexFaceService;
 import constant.ApiConstants;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
@@ -27,6 +28,7 @@
  * 鏇存柊鎴栨柊澧�
  */
 @Component
+@Slf4j
 public class FaceDeviceSampleCalculation extends IndexCalculationServe implements CalculationStrategy<FaceDeviceSamplingResult> {
     @Autowired
     private CheckIndexFaceMapper checkIndexFaceMapper;
@@ -47,6 +49,7 @@
     @Override
     public void calculate(List<FaceDeviceSamplingResult> list) {
         if (CollectionUtils.isEmpty(list)) {
+            log.info("鏁版嵁涓虹┖");
             return;
         }
         //杩斿洖浠ュ浗鏍囩爜涓簁ey鐨勮澶噈ap
@@ -90,15 +93,19 @@
         //杩斿洖瀵硅薄鐨勫紩鐢紝濡傛灉涓嶅瓨鍦ㄤ細鏀惧叆鏂扮殑key,value
         AreaStats stats = areaStatsMap.computeIfAbsent(key, k -> new AreaStats());
         FaceDeviceSamplingResult.BigUsefulness bigUseful = result.getBigUseful();
-        FaceDeviceSamplingResult.FaceEligibility faceElig = result.getFaceElig();
+        FaceDeviceSamplingResult.FaceEligibility faceElig = result.getFaceEligibility();
         stats.totalSites++;
         //90%鍙婁互涓婃暟鎹悎鏍煎垯姝や汉鑴歌澶囪瑙嗕负鍥剧墖鍚堟牸
-        if (faceElig.getFaceEligPercent() >= 0.9) {
-            stats.picQualifySites++;
+        if (faceElig != null) {
+            if (faceElig.getFaceEligPercent() >= 0.9) {
+                stats.picQualifySites++;
+            }
         }
         //澶у浘鍙敤鐜囧ぇ浜�90%瑙嗕负鍚堟牸
-        if (bigUseful.getBigUsefulPercent() >= 0.9) {
-            stats.picUsabilitySites++;
+        if (bigUseful != null) {
+            if (bigUseful.getBigUsefulPercent() >= 0.9) {
+                stats.picUsabilitySites++;
+            }
         }
     }
 

--
Gitblit v1.8.0