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 | 90 ++++++++++++++++++++++++++++++++++++--------
1 files changed, 73 insertions(+), 17 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 ed3b42b..209fc63 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/FaceSnapshotDataCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/FaceSnapshotDataCalculation.java
@@ -52,16 +52,19 @@
private RedisTemplate redisTemplate;
@Autowired
private SysDictDataMapper dictDataMapper;
+
//鍖哄煙浜鸿劯鐐逛綅鍦ㄧ嚎鎸囨爣鐨勫唴閮ㄧ被
protected static class AreaStats {
int totalSites = 0;
int totalDataSum = 0;
+ //鍔犳潈鍚庣殑鍚屾湡鎶撴媿閲�
+ int lastSnapCount = 0;
}
@Override
public void calculate(List<SnapshotDataMonitorResult> list) {
//鑾峰彇鍒嗗尯鍩熺殑鎸囨爣鏁伴噺
- Map<String, FaceSnapshotDataCalculation.AreaStats> areaStatsMap = getAreaStatsMap(list);
+ Map<String, FaceSnapshotDataCalculation.AreaStats> areaStatsMap = getAreaStatsMap(list, Boolean.FALSE);
if (areaStatsMap == null) return;
// 鑾峰彇褰撳墠鏃ユ湡
@@ -74,13 +77,15 @@
redisTemplate.delete(RedisConstant.Check_Face_ViewConnect);
}
//浠庡瓧鍏歌幏鍙栧悓鏈熸姄鎷嶉噺
- 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);
}
@@ -88,6 +93,64 @@
});
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();
+ }
+ }
+ }
}
//绱鎬荤偣浣嶆暟銆佺绾挎暟銆佹�绘姄鎷嶉噺
@@ -103,7 +166,7 @@
//浜鸿劯瑙嗗浘搴撳鎺ョǔ瀹氭��
- 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;
@@ -116,20 +179,13 @@
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();
- Optional<SysDictData> first = faceSnap.stream().filter(sysDictData -> sysDictData.getDictLabel().equals(dictKey)).findFirst();
- if(first.isPresent()) {
- String value = first.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));
- BigDecimal viewConnectStability = viewConnectStability(viewConnectParam);
- viewConnectStability = viewConnectStability.subtract(new BigDecimal(deductScore)).max(BigDecimal.ZERO).min(BigDecimal.ONE);
- checkIndexFace.setViewConnectStability(viewConnectStability);
- }
+ Map<String, Object> viewConnectParam = new HashMap<>();
+ viewConnectParam.put("totalDataSum", stats.totalDataSum);
+ 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);
} else {
noDateCount++;
}
--
Gitblit v1.8.0