From 8ccfae47d3fe6bae05ea4b8f614216f4ccc191a2 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期六, 03 八月 2024 14:39:05 +0800
Subject: [PATCH] 查重点点位和省厅点位

---
 ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java |   30 ++++++++++++++++++++++--------
 1 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java b/ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java
index 1005050..6bdf620 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java
@@ -5,7 +5,9 @@
 import com.ycl.platform.base.CheckIndex;
 import com.ycl.platform.domain.entity.CheckIndexCar;
 import com.ycl.platform.domain.entity.TMonitor;
+import com.ycl.platform.domain.entity.YwPoint;
 import com.ycl.platform.domain.result.HK.SnapshotDataMonitorResult;
+import com.ycl.platform.mapper.YwPointMapper;
 import com.ycl.platform.service.ITMonitorService;
 import constant.CheckConstants;
 import lombok.extern.slf4j.Slf4j;
@@ -25,12 +27,13 @@
 @Component
 @Slf4j
 public class IndexCalculationServe {
+    @Autowired
+    private YwPointMapper pointMapper;
 
     //鐐逛綅鍦ㄧ嚎鐜�
     public BigDecimal siteOnline(Map<String, Object> param) {
         BigDecimal totalSites = new BigDecimal((Integer) param.get("totalSites"));
-        BigDecimal offlineSites = new BigDecimal((Integer) param.get("offlineSites"));
-        BigDecimal onlineSites = totalSites.subtract(offlineSites);
+        BigDecimal onlineSites = new BigDecimal((Integer) param.get("onlineSites"));
         return onlineSites.divide(totalSites, 4, RoundingMode.HALF_UP);
     }
 
@@ -104,19 +107,30 @@
         return picUsabilitySites.divide(totalSitesCount, 4, RoundingMode.HALF_UP);
     }
 
+    //鍥剧墖鍚堟牸鐜�
+    public BigDecimal dataQualify(Map<String, Object> param) {
+        BigDecimal totalSitesCount = new BigDecimal((Integer) param.get("totalSites"));
+        BigDecimal picQualifySites = new BigDecimal((Integer) param.get("picQualifySites"));
+        return picQualifySites.divide(totalSitesCount, 4, RoundingMode.HALF_UP);
+    }
+
+    //褰曞儚鍙敤鐜�
+    public BigDecimal videoUsability(Map<String, Object> param) {
+        BigDecimal totalSites = new BigDecimal((Integer) param.get("totalSites"));
+        BigDecimal usabilitySites = new BigDecimal((Integer) param.get("usabilitySites"));
+        return usabilitySites.divide(totalSites, 4, RoundingMode.HALF_UP);
+    }
 
     //杩斿洖鐪佸巺鍥芥爣鐮侀泦鍚�
     public List<String> getProvince() {
-        // TODO: 鍒嗙渷鍘呭競灞� 闇�瑕佽ˉ鍏呴泦鍚堟暟鎹�
-        List<String> list = new ArrayList<>();
-        return list;
+        List<YwPoint> province = pointMapper.selectByTag(null, "province");
+        return province.stream().map(YwPoint::getSerialNumber).collect(Collectors.toList());
     }
 
     //杩斿洖閲嶇偣鐐逛綅闆嗗悎
     public List<String> getImportant() {
-        // TODO: 閲嶇偣鐐逛綅 闇�瑕佽ˉ鍏呴泦鍚堟暟鎹�
-        List<String> list = new ArrayList<>();
-        return list;
+        List<YwPoint> important = pointMapper.selectByTag("important", null);
+        return important.stream().map(YwPoint::getSerialNumber).collect(Collectors.toList());
     }
 
     //妫�鏌ユ槸鍚﹀瓨鍦ㄥ綋鏃ユ暟鎹�

--
Gitblit v1.8.0