From c5d01f8f7aa947baa726296b58677c2b1074ec1d Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期二, 30 七月 2024 11:41:14 +0800 Subject: [PATCH] 考核方法重构为策略+工厂 --- ycl-server/src/main/java/com/ycl/platform/service/impl/CheckIndexCarServiceImpl.java | 130 ------------------------------------------- 1 files changed, 1 insertions(+), 129 deletions(-) diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckIndexCarServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckIndexCarServiceImpl.java index bbc61e8..45313ed 100644 --- a/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckIndexCarServiceImpl.java +++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckIndexCarServiceImpl.java @@ -1,34 +1,19 @@ package com.ycl.platform.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.ycl.platform.domain.entity.CalculateReport; +import com.ycl.calculate.IndexCalculationUtils; 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.mapper.CalculateReportMapper; import com.ycl.platform.mapper.CheckIndexCarMapper; import com.ycl.platform.service.ICheckIndexCarService; import com.ycl.platform.service.ITMonitorService; -import com.ycl.system.domain.SysConfig; -import com.ycl.system.entity.SysDept; import com.ycl.system.mapper.SysConfigMapper; import com.ycl.system.mapper.SysDeptMapper; -import constant.ApiConstants; -import constant.CheckConstants; -import constant.CheckSnapCountConstants; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; import utils.DateUtils; -import java.math.BigDecimal; -import java.math.RoundingMode; -import java.text.SimpleDateFormat; import java.util.*; -import java.util.function.Function; -import java.util.stream.Collectors; /** * 杞﹁締鎸囨爣姒傜巼鏁版嵁Service涓氬姟灞傚鐞� @@ -47,7 +32,6 @@ private ITMonitorService monitorService; @Autowired private SysDeptMapper deptMapper; - /** * 鏌ヨ杞﹁締鎸囨爣姒傜巼鏁版嵁 * @@ -114,116 +98,4 @@ public int deleteCheckIndexCarById(Long id) { return checkIndexCarMapper.deleteCheckIndexCarById(id); } - - /** - * 璁$畻杞﹁締鐐逛綅鍦ㄧ嚎鐜囥�佽鍥惧簱瀵规帴绋冲畾鎬� - * 鑾峰彇鍒嗙渷鍘呫�佸尯鍩熺殑map<k,v> k涓篸eptId鎴栬�匬rovince_deptId - * 寰幆map璁$畻鐐逛綅鍦ㄧ嚎鐜� - * 鏇存柊鎴栨柊澧� - * - * @param list - */ - //TODO锛氫换鍔¢『搴忛渶瑕佹帓鍦ㄤ竴鏈轰竴妗d箣鍚� - @Override - public void siteOnline(List<SnapshotDataMonitorResult> list) { - if (CollectionUtils.isEmpty(list)) { - return; - } - - Map<String, AreaStats> areaStatsMap = new HashMap<>(); - Map<String, TMonitor> monitorMap = monitorService.list(new QueryWrapper<TMonitor>() - .in("serial_number", list.stream().map(SnapshotDataMonitorResult::getExternalIndexCode).collect(Collectors.toList()))) - .stream().collect(Collectors.toMap(TMonitor::getSerialNumber, Function.identity())); - - // TODO: 鍒嗙渷鍘呭競灞� 闇�瑕佽ˉ鍏呴泦鍚堟暟鎹� - List<String> provinceIds = new ArrayList<>(); // 杩欓噷闇�瑕佹牴鎹偣浣嶈ˉ鍏� - - for (SnapshotDataMonitorResult result : list) { - TMonitor monitor = monitorMap.get(result.getExternalIndexCode()); - if (monitor == null) continue; - - String deptId = monitor.getDeptId().toString(); - updateAreaStats(areaStatsMap, deptId, result); - - // 澶勭悊鐪佸巺鏁版嵁 - if (!CollectionUtils.isEmpty(provinceIds) && provinceIds.contains(monitor.getSerialNumber())) { - String provinceKey = "Province_" + deptId; - updateAreaStats(areaStatsMap, provinceKey, result); - } - } - - //鑾峰彇2022鍚屾湡鎶撴媿骞冲潎鍊� 鐪佸巺銆佸競灞� - BigDecimal cityCountAvg = getAverageCount(CheckSnapCountConstants.City); - BigDecimal countyCountAvg = getAverageCount(CheckSnapCountConstants.County); - - // 鏌ヨ浠婃棩鏁版嵁 - List<CheckIndexCar> checkIndexCarList = checkIndexCarMapper.selectToday(DateUtils.getDate()); - List<CheckIndexCar> checkIndexCars = new ArrayList<>(); - areaStatsMap.forEach((deptId, stats) -> { - if (stats.totalSites > 0) { - CheckIndexCar checkIndexCar = createOrUpdateCheckIndexCar(deptId, stats, cityCountAvg, countyCountAvg, checkIndexCarList); - checkIndexCars.add(checkIndexCar); - } - }); - - saveOrUpdateBatch(checkIndexCars); - } - - //绱鎬荤偣浣嶆暟銆佺绾挎暟銆佹�绘姄鎷嶉噺 - private void updateAreaStats(Map<String, AreaStats> areaStatsMap, String key, SnapshotDataMonitorResult result) { - //杩斿洖瀵硅薄鐨勫紩鐢紝濡傛灉涓嶅瓨鍦ㄤ細鏀惧叆鏂扮殑key,value - AreaStats stats = areaStatsMap.computeIfAbsent(key, k -> new AreaStats()); - stats.totalSites++; - if (ApiConstants.HK_SnapCount_ResultType_Null == result.getResultType()) { - stats.offlineSites++; - } else { - stats.totalDataSum += result.getDataCount(); - } - } - - //鑾峰彇2022鍚屾湡鎶撴媿骞冲潎鍊� - private BigDecimal getAverageCount(String configKey) { - String count = sysConfigMapper.checkConfigKeyUnique(configKey).getConfigValue(); - return new BigDecimal(count).multiply(new BigDecimal(CheckSnapCountConstants.Multiply)) - .divide(new BigDecimal(CheckSnapCountConstants.CountyNum), 0, RoundingMode.HALF_UP); - } - //杞﹁締鐐逛綅鍦ㄧ嚎鐜囧拰瑙嗗浘搴撳鎺ョǔ瀹氭�� - private CheckIndexCar createOrUpdateCheckIndexCar(String key, AreaStats stats, BigDecimal cityCountAvg, BigDecimal countyCountAvg, List<CheckIndexCar> checkIndexCarList) { - CheckIndexCar checkIndexCar; - - // 妫�鏌ユ槸鍚﹀凡瀛樺湪浠婃棩鏁版嵁 - Optional<CheckIndexCar> existingCar = checkIndexCarList.stream() - .filter(car -> key.equals(car.getDeptId().toString()) && - (key.startsWith("Province_") ? CheckConstants.Examine_Tag_City.equals(car.getExamineTag()) - : CheckConstants.Examine_Tag_County.equals(car.getExamineTag()))) - .findFirst(); - - if (existingCar.isPresent()) { - checkIndexCar = existingCar.get(); - } else { - checkIndexCar = new CheckIndexCar(); - checkIndexCar.setDeptId(key.startsWith("Province_") ? Long.parseLong(key.split("_")[1]) : Long.parseLong(key)); - checkIndexCar.setExamineTag(key.startsWith("Province_") ? CheckConstants.Examine_Tag_City : CheckConstants.Examine_Tag_County); - checkIndexCar.setCreateTime(new Date()); - } - - // 鐐逛綅鍦ㄧ嚎鐜� - BigDecimal totalSitesBd = new BigDecimal(stats.totalSites); - BigDecimal offlineSitesBd = new BigDecimal(stats.offlineSites); - BigDecimal onlineSitesBd = totalSitesBd.subtract(offlineSitesBd); - checkIndexCar.setSiteOnline(onlineSitesBd.divide(totalSitesBd, 4, RoundingMode.HALF_UP)); - //瑙嗗浘搴撳鎺ョǔ瀹氭�� - BigDecimal avgCount = key.startsWith("Province_") ? cityCountAvg : countyCountAvg; - checkIndexCar.setViewConnectStability(new BigDecimal(stats.totalDataSum).divide(avgCount, 4, RoundingMode.HALF_UP)); - - return checkIndexCar; - } - - //鍖哄煙杞﹁締鐐逛綅鍦ㄧ嚎鎸囨爣鐨勫唴閮ㄧ被 - private static class AreaStats { - int totalSites = 0; - int offlineSites = 0; - int totalDataSum = 0; - } - } -- Gitblit v1.8.0