From 3b0516a2959e25576e4f3fda697a3b025d06c8c9 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 24 六月 2025 14:09:07 +0800
Subject: [PATCH] 每日录像可用指标添加日志,修改大屏为查看当前月平均

---
 ycl-server/src/main/java/com/ycl/calculate/FaceDeviceSampleCalculation.java |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 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 3019c8c..62007de 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/FaceDeviceSampleCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/FaceDeviceSampleCalculation.java
@@ -33,8 +33,6 @@
     @Autowired
     private CheckIndexFaceMapper checkIndexFaceMapper;
     @Autowired
-    private TMonitorMapper monitorMapper;
-    @Autowired
     private ICheckIndexFaceService checkIndexFaceService;
 
     //鍖哄煙杞﹁締鎶芥鎸囨爣
@@ -44,12 +42,14 @@
         int picQualifySites = 0;
         //鍥剧墖鍙敤鐨勭偣浣嶆暟
         int picUsabilitySites = 0;
+        //鍥剧墖鎬荤偣浣嶆暟
+        int picSites = 0;
     }
 
     @Override
     public void calculate(List<FaceDeviceSamplingResult> list) {
         //鑾峰彇鍒嗗尯鍩熺殑鎸囨爣鏁伴噺
-        Map<String, FaceDeviceSampleCalculation.AreaStats> areaStatsMap = getAreaStatsMap(list);
+        Map<String, FaceDeviceSampleCalculation.AreaStats> areaStatsMap = getAreaStatsMap(list,Boolean.FALSE);
         if (areaStatsMap == null) return;
 
         // 鏌ヨ鏄惁index琛ㄥ凡缁忓瓨鍦ㄤ粖鏃ユ暟鎹�
@@ -83,8 +83,10 @@
                 stats.picQualifySites++;
             }
         }
-        //澶у浘鍙敤鐜囧ぇ浜�90%瑙嗕负鍚堟牸
-        if (bigUseful != null) {
+        //鍙绠楁娊妫�鐨�
+        if(bigUseful.getSampleCount() !=0){
+            stats.picSites++;
+            //澶у浘鍙敤鐜囧ぇ浜�90%瑙嗕负鍚堟牸,
             if (bigUseful.getBigUsefulPercent() >= 0.9) {
                 stats.picUsabilitySites++;
             }
@@ -107,7 +109,7 @@
         checkIndexFace.setFacePictureQualification(dataQualify);
         //璋冪敤澶у浘鍙敤鎬ц绠楁柟娉�
         Map<String, Object> usabilityParam = new HashMap<>();
-        usabilityParam.put("totalSites", stats.totalSites);
+        usabilityParam.put("totalSites", stats.picSites);
         usabilityParam.put("picUsabilitySites", stats.picUsabilitySites);
         BigDecimal picUsability = picUsability(usabilityParam);
         checkIndexFace.setFacePictureAvailability(picUsability);

--
Gitblit v1.8.0