From c3c574a6f391cec82435266d4e53f24a6c24ee1f Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 09 八月 2024 17:05:51 +0800
Subject: [PATCH] 考核模板任务insert空指针bug
---
ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java | 56 +++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 37 insertions(+), 19 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..637ef58 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,21 @@
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.ApiConstants;
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 +24,20 @@
@Component
@Slf4j
public class IndexCalculationServe {
+ @Autowired
+ private YwPointMapper pointMapper;
+
+ //涓�鏈轰竴妗ｅ悎鏍肩巼
+ public BigDecimal monitorQualify(Map<String, Object> param) {
+ BigDecimal totalMonitors = new BigDecimal((Integer) param.get("totalMonitors"));
+ BigDecimal qualifyMonitor = new BigDecimal((Integer) param.get("qualifyMonitor"));
+ return qualifyMonitor.divide(totalMonitors, 4, RoundingMode.HALF_UP);
+ }
//鐐逛綅鍦ㄧ嚎鐜�
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 +111,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, Boolean.TRUE);
+ 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(Boolean.TRUE, null);
+ return important.stream().map(YwPoint::getSerialNumber).collect(Collectors.toList());
}
//妫�鏌ユ槸鍚﹀瓨鍦ㄥ綋鏃ユ暟鎹�
@@ -126,7 +144,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(ApiConstants.Province) ? CheckConstants.Examine_Tag_Province.equals(index.getExamineTag())
: CheckConstants.Examine_Tag_County.equals(index.getExamineTag())))
.findFirst();
@@ -135,8 +153,8 @@
} else {
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.setDeptId(key.startsWith(ApiConstants.Province ) ? Long.parseLong(key.split("_")[1]) : Long.parseLong(key));
+ checkIndex.setExamineTag(key.startsWith(ApiConstants.Province ) ? CheckConstants.Examine_Tag_Province : CheckConstants.Examine_Tag_County);
checkIndex.setCreateTime(new Date());
} catch (Exception e) {
checkIndex = null;
--
Gitblit v1.8.0