From 41f40e898a7ebdbefc8a02b472d58d4689b3e88e Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 08 八月 2024 19:05:05 +0800
Subject: [PATCH] BaseResult替换localDate
---
ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java | 62 ++++++++++++++++++++++--------
1 files changed, 45 insertions(+), 17 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 58ff734..f372bb3 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java
@@ -1,34 +1,35 @@
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;
/**
* 璁＄畻鍏紡
*/
@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);
}
@@ -88,18 +89,44 @@
return accuracySites.divide(totalSitesCount, 4, RoundingMode.HALF_UP);
}
+ //url鍙敤鎬�
+ public BigDecimal urlUsability(Map<String, Object> param) {
+ BigDecimal totalSitesCount = new BigDecimal((Integer) param.get("totalSites"));
+ BigDecimal urlQualifySites = new BigDecimal((Integer) param.get("urlQualifySites"));
+ return urlQualifySites.divide(totalSitesCount, 4, RoundingMode.HALF_UP);
+ }
+
+ //澶у浘鍙敤鎬�
+ public BigDecimal picUsability(Map<String, Object> param) {
+ BigDecimal totalSitesCount = new BigDecimal((Integer) param.get("totalSites"));
+ BigDecimal picUsabilitySites = new BigDecimal((Integer) param.get("picUsabilitySites"));
+ 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());
}
//妫�鏌ユ槸鍚﹀瓨鍦ㄥ綋鏃ユ暟鎹�
@@ -122,7 +149,8 @@
checkIndex.setExamineTag(key.startsWith("Province_") ? CheckConstants.Examine_Tag_City : CheckConstants.Examine_Tag_County);
checkIndex.setCreateTime(new Date());
} catch (Exception e) {
- throw new RuntimeException("鏃犳硶鍒涘缓 CheckIndexCar 瀹炰緥", e);
+ checkIndex = null;
+ log.error("鏃犳硶鍒涘缓 checkIndex 瀹炰緥", e);
}
}
return checkIndex;
--
Gitblit v1.8.0