From 3b0516a2959e25576e4f3fda697a3b025d06c8c9 Mon Sep 17 00:00:00 2001 From: zxl <763096477@qq.com> Date: 星期二, 24 六月 2025 14:09:07 +0800 Subject: [PATCH] 每日录像可用指标添加日志,修改大屏为查看当前月平均 --- ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java | 241 ++++++------------------------------------------ 1 files changed, 31 insertions(+), 210 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 6b3f80d..09164a1 100644 --- a/ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java +++ b/ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java @@ -1,240 +1,61 @@ package com.ycl.calculate; -import com.ycl.platform.base.CheckIndex; -import com.ycl.platform.domain.entity.TMonitor; -import com.ycl.platform.domain.entity.YwPoint; -import com.ycl.platform.domain.result.UY.MonitorQualifyResult; +import com.ycl.platform.domain.result.BaseResult; import com.ycl.platform.domain.vo.TMonitorVO; import com.ycl.platform.mapper.TMonitorMapper; -import com.ycl.platform.mapper.YwPointMapper; -import com.ycl.utils.DateUtils; import constant.ApiConstants; -import constant.CheckConstants; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.mongodb.core.MongoTemplate; -import org.springframework.data.mongodb.core.query.Criteria; -import org.springframework.data.mongodb.core.query.Query; import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; -import java.math.BigDecimal; -import java.math.RoundingMode; import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; /** - * 璁$畻鍏紡 + * 鎶藉嚭鍚勫尯鍩熺粺璁℃暟閲忔柟娉� */ @Component @Slf4j -public class IndexCalculationServe { - @Autowired - private YwPointMapper pointMapper; - +public abstract class IndexCalculationServe<T extends BaseResult, S> extends IndexCalculationUtils { @Autowired private TMonitorMapper monitorMapper; - @Autowired - private MongoTemplate mongoTemplate; + //鎶借薄鏂规硶锛岀敱瀛愮被缂栧啓鍏蜂綋閫昏緫绠楁硶 + protected abstract void updateAreaStats(Map<String, S> areaStatsMap, String key, T result); - //涓�鏈轰竴妗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); - } - - //涓�鏈轰竴妗f敞鍐岀巼鐜� - public BigDecimal monitorRegistration(Map<String, Object> param) { - //鏂�+姝e湪鐢ㄧ殑妗f鏁� - BigDecimal totalSites = new BigDecimal((Integer) param.get("totalSites")); - //姝e湪鐢ㄧ殑妗f鏁� - BigDecimal useSites = new BigDecimal((Integer) param.get("totalSites") - (Integer) param.get("newSites")); - return useSites.divide(totalSites, 4, RoundingMode.HALF_UP); - } - - //妗f鑰冩牳姣� - public BigDecimal archivesRate(Map<String, Object> param) { - BigDecimal allFiles = new BigDecimal((Integer) param.get("allFiles")); - BigDecimal todayFiles = new BigDecimal((Integer) param.get("todayFiles")); - return todayFiles.divide(allFiles, 4, RoundingMode.HALF_UP); - } - - //鐐逛綅鍦ㄧ嚎鐜� - public BigDecimal siteOnline(Map<String, Object> param) { - BigDecimal totalSites = new BigDecimal((Integer) param.get("totalSites")); - BigDecimal onlineSites = new BigDecimal((Integer) param.get("onlineSites")); - return onlineSites.divide(totalSites, 4, RoundingMode.HALF_UP); - } - - //瑙嗛Osd鍑嗙‘鐜� - public BigDecimal osdAccuracy(Map<String, Object> param) { - BigDecimal totalSites = new BigDecimal((Integer) param.get("totalSites")); - BigDecimal osdAccuracySites = new BigDecimal((Integer) param.get("osdAccuracySites")); - return osdAccuracySites.divide(totalSites, 4, RoundingMode.HALF_UP); - } - - //瑙嗛鏃堕棿鍚堟牸鐜� - public BigDecimal osdTimeAccuracy(Map<String, Object> param) { - BigDecimal totalSites = new BigDecimal((Integer) param.get("totalSites")); - BigDecimal timeAccuracySites = new BigDecimal((Integer) param.get("timeAccuracySites")); - return timeAccuracySites.divide(totalSites, 4, RoundingMode.HALF_UP); - } - - //鐩綍涓�鑷寸巼锛屾瘡瓒呰繃鐧惧垎涔�1鎵�10% - public BigDecimal directoryConstant(Map<String, Object> param) { - BigDecimal totalSites = new BigDecimal((Integer) param.get("totalSites")); - BigDecimal newSites = new BigDecimal((Integer) param.get("newSites")); - // 璁$畻newSites鍗爐otalSites鐨勭櫨鍒嗘瘮鍊嶆暟 - BigDecimal percentage = newSites.divide(totalSites, 2, RoundingMode.DOWN).multiply(BigDecimal.valueOf(100)); - BigDecimal result = BigDecimal.ONE; - if (BigDecimal.ONE.compareTo(percentage) <= 0) { - result = result.subtract(percentage.multiply(new BigDecimal("0.1"))); + protected Map<String, S> getAreaStatsMap(List<T> list, Boolean needDept) { + if (CollectionUtils.isEmpty(list)) { + log.info("鏁版嵁涓虹┖"); + return null; } - return result.max(BigDecimal.ZERO); - } + //杩斿洖浠ュ浗鏍囩爜涓簁ey鐨勮澶噈ap + Map<String, TMonitorVO> monitorMap = monitorMapper.selectListByIds(list.stream().map(BaseResult::getNo).collect(Collectors.toList())) + .stream().collect(Collectors.toMap(TMonitorVO::getSerialNumber, Function.identity())); + Map<String, S> areaStatsMap = new HashMap<>(); - //瑙嗗浘搴撳鎺ョǔ瀹氭�� - public BigDecimal viewConnectStability(Map<String, Object> param) { - BigDecimal totalDataSum = new BigDecimal((Integer) param.get("totalDataSum")); - BigDecimal avgCount = new BigDecimal((Integer) param.get("avgCount")); - return avgCount.divide(totalDataSum, 4, RoundingMode.HALF_UP); - } + for (T result : list) { + //鑾峰彇璁惧鎵�灞為儴闂� + TMonitorVO monitor = monitorMap.get(result.getNo()); + if (monitor == null) continue; + String deptId = monitor.getDeptId().toString(); + updateAreaStats(areaStatsMap, deptId, result); - //鏍囨敞姝g‘鐜� - public BigDecimal infoAccuracy(Map<String, Object> param) { - BigDecimal totalSitesCount = new BigDecimal((Integer) param.get("totalSites")); - BigDecimal qualifySiteCount = new BigDecimal((Integer) param.get("qualifySite")); - return qualifySiteCount.divide(totalSitesCount, 4, RoundingMode.HALF_UP); - } - - //鏁版嵁涓婁紶鍙婃椂鎬� - public BigDecimal snapshopDelay(Map<String, Object> param) { - BigDecimal totalCount = new BigDecimal((Integer) param.get("totalCount")); - BigDecimal delayCount1 = new BigDecimal((Integer) param.get("delayCount1")); - BigDecimal delayCount2 = new BigDecimal((Integer) param.get("delayCount2")); - BigDecimal delayCount3 = new BigDecimal((Integer) param.get("delayCount3")); - - BigDecimal result = delayCount1.divide(totalCount, 10, RoundingMode.HALF_UP).multiply(BigDecimal.ONE) - .add(delayCount2.divide(totalCount, 10, RoundingMode.HALF_UP).multiply(new BigDecimal("0.8"))) - .add(delayCount3.divide(totalCount, 10, RoundingMode.HALF_UP).multiply(new BigDecimal("0.6"))); - return result.setScale(4, RoundingMode.HALF_UP); - } - - //杞﹁締鏁版嵁瀹屾暣鎬� - public BigDecimal dataIntegrity(Map<String, Object> param) { - BigDecimal totalSites = new BigDecimal((Integer) param.get("totalSites")); - BigDecimal importantTotalSites = new BigDecimal((Integer) param.get("importantTotalSites")); - BigDecimal integritySites = new BigDecimal((Integer) param.get("integritySites")); - BigDecimal importantIntegritySites = new BigDecimal((Integer) param.get("importantIntegritySites")); - BigDecimal result = integritySites.divide(totalSites, 10, RoundingMode.HALF_UP) - .add(importantIntegritySites.divide(importantTotalSites, 10, RoundingMode.HALF_UP)); - return result.setScale(4, RoundingMode.HALF_UP); - } - - //杞﹁締鏁版嵁瀹屾暣鎬� - public BigDecimal dataAccuracy(Map<String, Object> param) { - BigDecimal totalSites = new BigDecimal((Integer) param.get("totalSites")); - BigDecimal importantTotalSites = new BigDecimal((Integer) param.get("importantTotalSites")); - BigDecimal accuracySites = new BigDecimal((Integer) param.get("accuracySites")); - BigDecimal importantAccuracySites = new BigDecimal((Integer) param.get("importantAccuracySites")); - BigDecimal result = accuracySites.divide(totalSites, 10, RoundingMode.HALF_UP) - .add(importantAccuracySites.divide(importantTotalSites, 10, RoundingMode.HALF_UP)); - return result.setScale(4, RoundingMode.HALF_UP); - } - - //鏃堕挓鍑嗙‘鎬� - public BigDecimal clockAccuracy(Map<String, Object> param) { - BigDecimal totalSitesCount = new BigDecimal((Integer) param.get("totalSites")); - BigDecimal accuracySites = new BigDecimal((Integer) param.get("accuracySites")); - 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() { - List<YwPoint> province = pointMapper.selectByTag(null, Boolean.TRUE, null); - return CollectionUtils.isEmpty(province) ? new ArrayList<>() : province.stream().map(YwPoint::getSerialNumber).collect(Collectors.toList()); - } - - //杩斿洖閲嶇偣鐐逛綅闆嗗悎 - public List<String> getImportant() { - List<YwPoint> important = pointMapper.selectByTag(Boolean.TRUE, null, null); - return CollectionUtils.isEmpty(important) ? new ArrayList<>() : important.stream().map(YwPoint::getSerialNumber).collect(Collectors.toList()); - } - - //杩斿洖閲嶇偣鎸囨尌鍥惧儚闆嗗悎 - public List<String> getCommandImage() { - List<YwPoint> commandImages = pointMapper.selectByTag(null, null, Boolean.TRUE); - return CollectionUtils.isEmpty(commandImages) ? new ArrayList<>() : commandImages.stream().map(YwPoint::getSerialNumber).collect(Collectors.toList()); - } - - //杩斿洖monitor - //TODO:鏃堕棿鍐欐浜� - public List<String> getMonitorFromMongo() { - Date date = DateUtils.getDay(2024, 7, 13); - Query query = new Query(Criteria.where("mongoCreateTime").gte(DateUtils.getDayStart(date)).lt(DateUtils.getDayEnd(date))); -// Query query = new Query(Criteria.where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date()))); - List<MonitorQualifyResult> oneMachineFileResults = mongoTemplate.find(query, MonitorQualifyResult.class); - - return CollectionUtils.isEmpty(oneMachineFileResults) ? new ArrayList<>() : oneMachineFileResults.stream().map(result -> result.getSerialNumber().getValue()).collect(Collectors.toList()); - } - - //妫�鏌ユ槸鍚﹀瓨鍦ㄥ綋鏃ユ暟鎹� - public <T extends CheckIndex> T getCheckIndex(String key, List<T> checkIndexList, Class<T> clazz) { - T checkIndex; - - // 妫�鏌ユ槸鍚﹀凡瀛樺湪浠婃棩鏁版嵁 - Optional<T> existingIndex = checkIndexList.stream() - .filter(index -> key.startsWith(ApiConstants.Province) ? - CheckConstants.Examine_Tag_Province.equals(index.getExamineTag()) && key.split("_")[1].equals(index.getDeptId().toString()) - : CheckConstants.Examine_Tag_County.equals(index.getExamineTag()) && key.equals(index.getDeptId().toString())) - .findFirst(); - - if (existingIndex.isPresent()) { - checkIndex = existingIndex.get(); - } else { - try { - checkIndex = clazz.getDeclaredConstructor().newInstance(); - 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; - log.error("鏃犳硶鍒涘缓 checkIndex 瀹炰緥", e); + // 澶勭悊鐪佸巺鑰冩牳鏁版嵁 + if (result.getProvinceTag() != null && result.getProvinceTag()) { + String provinceKey = ApiConstants.Province + deptId; + updateAreaStats(areaStatsMap, provinceKey, result); + } + // 澶勭悊鍏畨閮ㄨ�冩牳鏁版嵁(鍏畨閮ㄦ暟鎹彧鏈夎棰戞墠鏈夛紝鎵�浠ヨ繖閲屽畾涔変簡needDept鏉ュ喅瀹氭槸鍚﹂渶瑕佸鐞嗛儴绾ф暟鎹�) + if (needDept) { + if (result.getDeptTag() != null && result.getDeptTag()) { + String deptKey = ApiConstants.Dept + deptId; + updateAreaStats(areaStatsMap, deptKey, result); + } } } - return checkIndex; + return areaStatsMap; } - } -- Gitblit v1.8.0