From 9e11e94f8a92a62695657bb2b3b59a1cf47058a5 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期五, 17 十月 2025 13:38:11 +0800
Subject: [PATCH] 大屏显示问题以及报备导出
---
ycl-server/src/main/java/com/ycl/calculate/FaceSnapshotDataCalculation.java | 138 +++++++++++++++++++++++++--------------------
1 files changed, 76 insertions(+), 62 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/calculate/FaceSnapshotDataCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/FaceSnapshotDataCalculation.java
index 743c65a..209fc63 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/FaceSnapshotDataCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/FaceSnapshotDataCalculation.java
@@ -31,7 +31,7 @@
import java.util.stream.Collectors;
/**
- * 璁＄畻浜鸿劯鐐逛綅鍦ㄧ嚎鐜囥�佽鍥惧簱瀵规帴绋冲畾鎬�
+ * 璁＄畻瑙嗗浘搴撳鎺ョǔ瀹氭��
* 鎶撴媿鏁版嵁閲忕洃娴嬬粨鏋滄帴鍙ｆ暟鎹�
* 鑾峰彇鍒嗙渷鍘呫�佸尯鍩熺殑map<k,v> k涓篸eptId鎴栬�匬rovince_deptId
* 寰幆map璁＄畻鐐逛綅鍦ㄧ嚎鐜�
@@ -39,7 +39,7 @@
*/
@Component
@Slf4j
-public class FaceSnapshotDataCalculation extends IndexCalculationServe implements CalculationStrategy<SnapshotDataMonitorResult> {
+public class FaceSnapshotDataCalculation extends IndexCalculationServe<SnapshotDataMonitorResult, FaceSnapshotDataCalculation.AreaStats> implements CalculationStrategy<SnapshotDataMonitorResult> {
@Autowired
private CheckIndexFaceMapper checkIndexFaceMapper;
@Autowired
@@ -52,26 +52,21 @@
private RedisTemplate redisTemplate;
@Autowired
private SysDictDataMapper dictDataMapper;
+
//鍖哄煙浜鸿劯鐐逛綅鍦ㄧ嚎鎸囨爣鐨勫唴閮ㄧ被
- private static class AreaStats {
+ protected static class AreaStats {
int totalSites = 0;
- int onlineSites = 0;
int totalDataSum = 0;
+ //鍔犳潈鍚庣殑鍚屾湡鎶撴媿閲�
+ int lastSnapCount = 0;
}
@Override
public void calculate(List<SnapshotDataMonitorResult> list) {
- if (CollectionUtils.isEmpty(list)) {
- log.info("鏁版嵁涓虹┖");
- return;
- }
- //杩斿洖浠ュ浗鏍囩爜涓簁ey鐨勮澶噈ap
- Map<String, TMonitorVO> monitorMap = monitorMapper.selectListByIds(list.stream().map(SnapshotDataMonitorResult::getExternalIndexCode).collect(Collectors.toList()))
- .stream().collect(Collectors.toMap(TMonitorVO::getSerialNumber, Function.identity()));
- //鑾峰彇鐪佸巺鍥芥爣鐮侀泦鍚�
- List<String> provinceIds = getProvince();
+ //鑾峰彇鍒嗗尯鍩熺殑鎸囨爣鏁伴噺
+ Map<String, FaceSnapshotDataCalculation.AreaStats> areaStatsMap = getAreaStatsMap(list, Boolean.FALSE);
+ if (areaStatsMap == null) return;
- Map<String, AreaStats> areaStatsMap = new HashMap<>();
// 鑾峰彇褰撳墠鏃ユ湡
LocalDate today = LocalDate.now();
// 鑾峰彇鏈湀鐨勭涓�澶�
@@ -81,31 +76,16 @@
// 濡傛灉鏄紝鍒欐竻闄edis涓褰曚腑鏂鏁扮殑鏁版嵁
redisTemplate.delete(RedisConstant.Check_Face_ViewConnect);
}
- for (SnapshotDataMonitorResult result : list) {
- TMonitorVO 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 = ApiConstants.Province + deptId;
- updateAreaStats(areaStatsMap, provinceKey, result);
- }
- }
-
-// //鑾峰彇2022鍚屾湡鎶撴媿骞冲潎鍊� 鐪佸巺銆佸競灞�
-// BigDecimal cityCountAvg = getAverageCount(CheckSnapCountConstants.Face_City);
-// BigDecimal countyCountAvg = getAverageCount(CheckSnapCountConstants.Face_County);
//浠庡瓧鍏歌幏鍙栧悓鏈熸姄鎷嶉噺
- List<SysDictData> faceSnap = dictDataMapper.selectDictDataByType(CheckConstants.DICT_FACE_SNAP);
+ List<SysDictData> lastSnap = dictDataMapper.selectDictDataByType(CheckConstants.DICT_LAST_SNAP);
+ //鏍规嵁鍚勪釜鍖哄幙鐐逛綅鏁版嵁瀵瑰悓鏈熸姄鎷嶉噺鍋氬姞鏉冨鐞�
+ fillLastSnap(areaStatsMap, lastSnap);
// 鏌ヨ浠婃棩鏁版嵁
List<CheckIndexFace> checkIndexFaceList = checkIndexFaceMapper.selectToday(DateUtils.getDate());
List<CheckIndexFace> checkIndexFaces = new ArrayList<>();
areaStatsMap.forEach((deptId, stats) -> {
if (stats.totalSites > 0) {
- CheckIndexFace checkIndexFace = createOrUpdateCheckIndexFace(deptId, stats, checkIndexFaceList,faceSnap);
+ CheckIndexFace checkIndexFace = createOrUpdateCheckIndexFace(deptId, stats, checkIndexFaceList, lastSnap);
if (checkIndexFace != null) {
checkIndexFaces.add(checkIndexFace);
}
@@ -115,41 +95,81 @@
checkIndexFaceService.saveOrUpdateBatch(checkIndexFaces);
}
+ //鏍规嵁鐐逛綅鏁伴噺瀵瑰悓鏈熸姄鎷嶉噺浣滃姞鏉冨鐞�
+ private void fillLastSnap(Map<String, AreaStats> areaStatsMap, List<SysDictData> lastSnap) {
+ //鐪佸巺鎬荤偣浣嶆暟
+ int provinceTotalSites = 0;
+ //鍖哄幙鎬荤偣浣嶆暟
+ int countyTotalSites = 0;
+ //鍚屾湡鐪佸巺鎶撴媿閲�
+ int lastProvinceSnap = 0;
+ //鍚屾湡鍖哄幙鎶撴媿閲�
+ int lastCountySnap = 0;
+ //浠庡瓧鍏搁噷绛涢�夌渷鍘呭��
+ Optional<SysDictData> first = lastSnap.stream().filter(sysDictData -> CheckConstants.SNAP_PROVINCE_FACE.equals(sysDictData.getDictLabel())).findFirst();
+ if (first.isPresent()) {
+ lastProvinceSnap = Integer.parseInt(first.get().getDictValue());
+ }
+ //浠庡瓧鍏搁噷绛涢�夊尯鍘垮��
+ Optional<SysDictData> first2 = lastSnap.stream().filter(sysDictData -> CheckConstants.SNAP_COUNTY_FACE.equals(sysDictData.getDictLabel())).findFirst();
+ if (first2.isPresent()) {
+ lastCountySnap = Integer.parseInt(first2.get().getDictValue());
+ }
+ //璁＄畻鎬绘暟
+ for (Map.Entry<String, AreaStats> entry : areaStatsMap.entrySet()) {
+ String key = entry.getKey();
+ AreaStats value = entry.getValue();
+ if (key.startsWith(ApiConstants.Province)) {
+ provinceTotalSites += value.totalSites;
+ } else {
+ countyTotalSites += value.totalSites;
+ }
+ }
+ //鍔犳潈鎿嶄綔,琛ュ厖鍚屾湡鎶撴媿閲�
+ for (Map.Entry<String, AreaStats> entry : areaStatsMap.entrySet()) {
+ String key = entry.getKey();
+ AreaStats value = entry.getValue();
+ //鐪佸巺
+ if (key.startsWith(ApiConstants.Province)) {
+ if (value.totalSites == 0) {
+ value.lastSnapCount = 0;
+ } else {
+ BigDecimal result = new BigDecimal(value.totalSites)
+ .divide(new BigDecimal(provinceTotalSites), 2, RoundingMode.HALF_UP)
+ .multiply(new BigDecimal(lastProvinceSnap));
+ value.lastSnapCount = result.setScale(0, RoundingMode.HALF_UP).intValue();
+ }
+ } else {
+ //鍖哄幙
+ if (value.totalSites == 0) {
+ value.lastSnapCount = 0;
+ } else {
+ BigDecimal result = new BigDecimal(value.totalSites)
+ .divide(new BigDecimal(countyTotalSites), 2, RoundingMode.HALF_UP)
+ .multiply(new BigDecimal(lastCountySnap));
+ value.lastSnapCount = result.setScale(0, RoundingMode.HALF_UP).intValue();
+ }
+ }
+ }
+ }
+
//绱鎬荤偣浣嶆暟銆佺绾挎暟銆佹�绘姄鎷嶉噺
- private void updateAreaStats(Map<String, AreaStats> areaStatsMap, String key, SnapshotDataMonitorResult result) {
+ @Override
+ public 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.onlineSites++;
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), 10, RoundingMode.HALF_UP)
-// .divide(new BigDecimal(LocalDate.now().getDayOfMonth()), 0, RoundingMode.HALF_UP);
-// }
- //杞﹁締鐐逛綅鍦ㄧ嚎鐜囧拰瑙嗗浘搴撳鎺ョǔ瀹氭��
- private CheckIndexFace createOrUpdateCheckIndexFace(String key, AreaStats stats, List<CheckIndexFace> checkIndexFaceList,List<SysDictData> faceSnap) {
+ //浜鸿劯瑙嗗浘搴撳鎺ョǔ瀹氭��
+ private CheckIndexFace createOrUpdateCheckIndexFace(String key, AreaStats stats, List<CheckIndexFace> checkIndexFaceList, List<SysDictData> faceSnap) {
CheckIndexFace checkIndexFace = getCheckIndex(key, checkIndexFaceList, CheckIndexFace.class);
if (checkIndexFace == null) {
return null;
- }
- //璋冪敤鐐逛綅鍦ㄧ嚎璁＄畻鏂规硶
- if (stats.totalSites >= CheckThreadConstants.Check_Face_SiteOnline) {
- Map<String, Object> siteOnlineParam = new HashMap<>();
- siteOnlineParam.put("totalSites", stats.totalSites);
- siteOnlineParam.put("onlineSites", stats.onlineSites);
- BigDecimal siteOnline = siteOnline(siteOnlineParam);
- checkIndexFace.setSiteOnline(siteOnline);
- } else {
- checkIndexFace.setSiteOnline(BigDecimal.ZERO);
}
//瑙嗗浘搴撳鎺ョǔ瀹氭��
//Redis璁板綍璇ュ尯鍘垮綋鏈堟棤鏁版嵁涓婁紶娆℃暟
@@ -159,16 +179,10 @@
noDateCount = 0;
}
Double deductScore = 0.1 * noDateCount;
- log.info("鎬婚噺锛歿}",stats.totalDataSum);
if (stats.totalDataSum != 0) {
- Integer deptId = key.startsWith(ApiConstants.Province) ? Integer.parseInt(key.split("_")[1]) : Integer.parseInt(key);
- String dictKey = key.startsWith(ApiConstants.Province) ? ApiConstants.Province+ AreaDeptEnum.fromDept(deptId).getCode() : ApiConstants.County+AreaDeptEnum.fromDept(deptId).getCode();
- String value = faceSnap.stream().filter(sysDictData -> sysDictData.getDictLabel().equals(dictKey)).findFirst().get().getDictValue();
-
-
Map<String, Object> viewConnectParam = new HashMap<>();
viewConnectParam.put("totalDataSum", stats.totalDataSum);
- viewConnectParam.put("avgCount", new BigDecimal(value).multiply(new BigDecimal(CheckConstants.MultiplyNum)).divide(new BigDecimal(LocalDate.now().getDayOfMonth()), 0, RoundingMode.HALF_UP));
+ viewConnectParam.put("lastCount", new BigDecimal(stats.lastSnapCount).multiply(new BigDecimal(CheckConstants.MultiplyNum)).divide(new BigDecimal(LocalDate.now().getDayOfMonth()), 0, RoundingMode.HALF_UP));
BigDecimal viewConnectStability = viewConnectStability(viewConnectParam);
viewConnectStability = viewConnectStability.subtract(new BigDecimal(deductScore)).max(BigDecimal.ZERO).min(BigDecimal.ONE);
checkIndexFace.setViewConnectStability(viewConnectStability);
--
Gitblit v1.8.0