From c373999a64b3ed8244e2f5ce2004c0d2ae4e99a1 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 08 八月 2024 20:52:41 +0800
Subject: [PATCH] page大写

---
 ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java |   40 ++++++++++++++++++++++------------------
 1 files changed, 22 insertions(+), 18 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 aa33b57..1b36b5b 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java
@@ -1,22 +1,20 @@
 package com.ycl.calculate;
 
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.result.HK.SnapshotDataMonitorResult;
-import com.ycl.platform.service.ITMonitorService;
+import com.ycl.platform.domain.entity.YwPoint;
+import com.ycl.platform.mapper.YwPointMapper;
 import constant.CheckConstants;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
-import java.util.*;
-import java.util.function.Function;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 /**
@@ -25,12 +23,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);
     }
 
@@ -111,18 +110,23 @@
         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());
     }
 
     //妫�鏌ユ槸鍚﹀瓨鍦ㄥ綋鏃ユ暟鎹�
@@ -132,7 +136,7 @@
         // 妫�鏌ユ槸鍚﹀凡瀛樺湪浠婃棩鏁版嵁
         Optional<T> existingIndex = checkIndexList.stream()
                 .filter(index -> key.equals(index.getDeptId().toString()) &&
-                        (key.startsWith("Province_") ? CheckConstants.Examine_Tag_City.equals(index.getExamineTag())
+                        (key.startsWith("Province_") ? CheckConstants.Examine_Tag_Province.equals(index.getExamineTag())
                                 : CheckConstants.Examine_Tag_County.equals(index.getExamineTag())))
                 .findFirst();
 
@@ -142,7 +146,7 @@
             try {
                 checkIndex = clazz.getDeclaredConstructor().newInstance();
                 checkIndex.setDeptId(key.startsWith("Province_") ? Long.parseLong(key.split("_")[1]) : Long.parseLong(key));
-                checkIndex.setExamineTag(key.startsWith("Province_") ? CheckConstants.Examine_Tag_City : CheckConstants.Examine_Tag_County);
+                checkIndex.setExamineTag(key.startsWith("Province_") ? CheckConstants.Examine_Tag_Province : CheckConstants.Examine_Tag_County);
                 checkIndex.setCreateTime(new Date());
             } catch (Exception e) {
                 checkIndex = null;

--
Gitblit v1.8.0