From b04753affc29f1042d0eb75b0af87824a0f4a8aa Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期五, 09 八月 2024 15:41:48 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java | 30 +++++++++++++++++------------- 1 files changed, 17 insertions(+), 13 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 6bdf620..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,24 +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.entity.YwPoint; -import com.ycl.platform.domain.result.HK.SnapshotDataMonitorResult; import com.ycl.platform.mapper.YwPointMapper; -import com.ycl.platform.service.ITMonitorService; +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; /** @@ -29,6 +26,13 @@ public class IndexCalculationServe { @Autowired private YwPointMapper pointMapper; + + //涓�鏈轰竴妗e悎鏍肩巼 + 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) { @@ -123,13 +127,13 @@ //杩斿洖鐪佸巺鍥芥爣鐮侀泦鍚� public List<String> getProvince() { - List<YwPoint> province = pointMapper.selectByTag(null, "province"); + List<YwPoint> province = pointMapper.selectByTag(null, Boolean.TRUE); return province.stream().map(YwPoint::getSerialNumber).collect(Collectors.toList()); } //杩斿洖閲嶇偣鐐逛綅闆嗗悎 public List<String> getImportant() { - List<YwPoint> important = pointMapper.selectByTag("important", null); + List<YwPoint> important = pointMapper.selectByTag(Boolean.TRUE, null); return important.stream().map(YwPoint::getSerialNumber).collect(Collectors.toList()); } @@ -140,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(); @@ -149,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