From c4d949d801ef6261741567ddbd7594631503ef82 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 15 十月 2024 14:34:40 +0800
Subject: [PATCH] 抓拍量加权
---
ycl-server/src/main/java/com/ycl/calculate/CarSnapshopDataCalculation.java | 74 +++++++++++++++++++-----
ycl-common/src/main/java/constant/CheckConstants.java | 14 ++--
ycl-server/src/main/java/com/ycl/task/HKTask.java | 6 +
ycl-server/src/main/java/com/ycl/calculate/FaceSnapshotDataCalculation.java | 76 +++++++++++++++++++-----
ycl-server/src/main/java/com/ycl/calculate/IndexCalculationUtils.java | 6 +-
ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java | 2
6 files changed, 133 insertions(+), 45 deletions(-)
diff --git a/ycl-common/src/main/java/constant/CheckConstants.java b/ycl-common/src/main/java/constant/CheckConstants.java
index ff9e13a..465c0fb 100644
--- a/ycl-common/src/main/java/constant/CheckConstants.java
+++ b/ycl-common/src/main/java/constant/CheckConstants.java
@@ -28,13 +28,15 @@
public static final String Status_Stop = "1";
/**
- * 杞﹁締鍚屾湡鎶撴媿閲忓瓧鍏歌〃
+ * 杞﹁締銆佷汉鑴稿悓鏈熸姄鎷嶉噺瀛楀吀琛�
*/
- public final static String DICT_CAR_SNAP = "check_car_snap";
- /**
- * 浜鸿劯鍚屾湡鎶撴媿閲忓瓧鍏歌〃
- */
- public final static String DICT_FACE_SNAP = "check_face_snap";
+ public final static String DICT_LAST_SNAP = "check_last_snap";
+ /** 鎶撴媿閲忔爣绛惧父閲� */
+ public final static String SNAP_PROVINCE_CAR ="PROVINCE_CAR";
+ public final static String SNAP_PROVINCE_FACE ="PROVINCE_FACE";
+ public final static String SNAP_COUNTY_CAR ="COUNTY_CAR";
+ public final static String SNAP_COUNTY_FACE ="COUNTY_FACE";
+
/**
* 2022鎶撴媿鏁拌绠楀�嶇巼
*/
diff --git a/ycl-server/src/main/java/com/ycl/calculate/CarSnapshopDataCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/CarSnapshopDataCalculation.java
index 3f449b5..4b9b085 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/CarSnapshopDataCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/CarSnapshopDataCalculation.java
@@ -41,16 +41,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, CarSnapshopDataCalculation.AreaStats> areaStatsMap = getAreaStatsMap(list,Boolean.FALSE);
+ Map<String, CarSnapshopDataCalculation.AreaStats> areaStatsMap = getAreaStatsMap(list, Boolean.FALSE);
if (areaStatsMap == null) return;
// 鑾峰彇褰撳墠鏃ユ湡
@@ -63,13 +66,15 @@
redisTemplate.delete(RedisConstant.Check_Car_ViewConnect);
}
//浠庡瓧鍏歌幏鍙栧悓鏈熸姄鎷嶉噺
- List<SysDictData> carSnap = dictDataMapper.selectDictDataByType(CheckConstants.DICT_CAR_SNAP);
+ List<SysDictData> lastSnap = dictDataMapper.selectDictDataByType(CheckConstants.DICT_LAST_SNAP);
+ //鏍规嵁鍚勪釜鍖哄幙鐐逛綅鏁版嵁瀵瑰悓鏈熸姄鎷嶉噺鍋氬姞鏉冨鐞�
+ fillLastSnap(areaStatsMap, lastSnap);
// 鏌ヨ鏄惁index琛ㄥ凡缁忓瓨鍦ㄤ粖鏃ユ暟鎹�
List<CheckIndexCar> checkIndexCarList = checkIndexCarMapper.selectToday(DateUtils.getDate());
List<CheckIndexCar> checkIndexCars = new ArrayList<>();
areaStatsMap.forEach((key, stats) -> {
if (stats.totalSites > 0) {
- CheckIndexCar checkIndexCar = createOrUpdateCheckIndexCar(key, stats, checkIndexCarList,carSnap);
+ CheckIndexCar checkIndexCar = createOrUpdateCheckIndexCar(key, stats, checkIndexCarList);
if (checkIndexCar != null) {
checkIndexCars.add(checkIndexCar);
}
@@ -77,6 +82,49 @@
});
checkIndexCarService.saveOrUpdateBatch(checkIndexCars);
+ }
+
+ //鏍规嵁鐐逛綅鏁伴噺瀵瑰悓鏈熸姄鎷嶉噺浣滃姞鏉冨鐞�
+ private void fillLastSnap(Map<String, AreaStats> areaStatsMap, List<SysDictData> lastSnap) {
+ //鐪佸巺鎬荤偣浣嶆暟
+ int provinceTotalSites = 0;
+ //鍖哄幙鎬荤偣浣嶆暟
+ int countyTotalSites = 0;
+ //浠庡瓧鍏搁噷绛涢�夌渷鍘呭��
+ int lastProvinceSnap = Integer.parseInt(lastSnap.stream().filter(sysDictData -> CheckConstants.SNAP_PROVINCE_CAR.equals(sysDictData.getDictLabel())).findFirst().get().getDictValue());
+ //浠庡瓧鍏搁噷绛涢�夊尯鍘垮��
+ int lastCountySnap = Integer.parseInt(lastSnap.stream().filter(sysDictData -> CheckConstants.SNAP_COUNTY_CAR.equals(sysDictData.getDictLabel())).findFirst().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 {
+ value.lastSnapCount = (value.totalSites / provinceTotalSites) * lastProvinceSnap;
+ }
+ } else {
+ //鍖哄幙
+ if (value.totalSites == 0) {
+ value.lastSnapCount = 0;
+ } else {
+ value.lastSnapCount = (value.totalSites / countyTotalSites) * lastCountySnap;
+ }
+ }
+ }
}
/**
@@ -97,7 +145,7 @@
/**
* 杞﹁締瑙嗗浘搴撳鎺ョǔ瀹氭��
*/
- private CheckIndexCar createOrUpdateCheckIndexCar(String key, AreaStats stats, List<CheckIndexCar> checkIndexCarList,List<SysDictData> carSnap) {
+ private CheckIndexCar createOrUpdateCheckIndexCar(String key, AreaStats stats, List<CheckIndexCar> checkIndexCarList) {
CheckIndexCar checkIndexCar = getCheckIndex(key, checkIndexCarList, CheckIndexCar.class);
if (checkIndexCar == null) {
return null;
@@ -113,18 +161,12 @@
Double deductScore = 0.1 * noDateCount;
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 = carSnap.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);
- checkIndexCar.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);
+ checkIndexCar.setViewConnectStability(viewConnectStability);
} else {
noDateCount++;
}
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 84425c9..dceb4c8 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,Boolean.FALSE);
+ 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,50 @@
});
checkIndexFaceService.saveOrUpdateBatch(checkIndexFaces);
+ }
+
+ //鏍规嵁鐐逛綅鏁伴噺瀵瑰悓鏈熸姄鎷嶉噺浣滃姞鏉冨鐞�
+ private void fillLastSnap(Map<String, AreaStats> areaStatsMap, List<SysDictData> lastSnap) {
+ //鐪佸巺鎬荤偣浣嶆暟
+ int provinceTotalSites = 0;
+ //鍖哄幙鎬荤偣浣嶆暟
+ int countyTotalSites = 0;
+ //浠庡瓧鍏搁噷绛涢�夌渷鍘呭��
+ int lastProvinceSnap = Integer.parseInt(lastSnap.stream().filter(sysDictData -> CheckConstants.SNAP_PROVINCE_FACE.equals(sysDictData.getDictLabel())).findFirst().get().getDictValue());
+ //浠庡瓧鍏搁噷绛涢�夊尯鍘垮��
+ int lastCountySnap = Integer.parseInt(lastSnap.stream().filter(sysDictData -> CheckConstants.SNAP_COUNTY_FACE.equals(sysDictData.getDictLabel())).findFirst().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 {
+ value.lastSnapCount = (value.totalSites / provinceTotalSites) * lastProvinceSnap;
+ }
+ } else {
+ //鍖哄幙
+ if (value.totalSites == 0) {
+ value.lastSnapCount = 0;
+ } else {
+ value.lastSnapCount = (value.totalSites / countyTotalSites) * lastCountySnap;
+ }
+ }
+ }
}
//绱鎬荤偣浣嶆暟銆佺绾挎暟銆佹�绘姄鎷嶉噺
@@ -103,7 +152,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 +165,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++;
}
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 03d5fc0..09164a1 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java
@@ -48,7 +48,7 @@
String provinceKey = ApiConstants.Province + deptId;
updateAreaStats(areaStatsMap, provinceKey, result);
}
- // 澶勭悊鍏畨閮ㄨ�冩牳鏁版嵁
+ // 澶勭悊鍏畨閮ㄨ�冩牳鏁版嵁(鍏畨閮ㄦ暟鎹彧鏈夎棰戞墠鏈夛紝鎵�浠ヨ繖閲屽畾涔変簡needDept鏉ュ喅瀹氭槸鍚﹂渶瑕佸鐞嗛儴绾ф暟鎹�)
if (needDept) {
if (result.getDeptTag() != null && result.getDeptTag()) {
String deptKey = ApiConstants.Dept + deptId;
diff --git a/ycl-server/src/main/java/com/ycl/calculate/IndexCalculationUtils.java b/ycl-server/src/main/java/com/ycl/calculate/IndexCalculationUtils.java
index 8cc3fb2..95bc918 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/IndexCalculationUtils.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/IndexCalculationUtils.java
@@ -109,9 +109,9 @@
//瑙嗗浘搴撳鎺ョǔ瀹氭��
public BigDecimal viewConnectStability(Map<String, Object> param) {
BigDecimal totalDataSum = new BigDecimal((Integer) param.get("totalDataSum"));
- BigDecimal avgCount = (BigDecimal) param.get("avgCount");
- log.info("瑙嗗浘搴撳鎺ョǔ瀹氭�э紝totalDataSum锛歿}锛宎vgCount锛歿}",totalDataSum,avgCount);
- return BigDecimal.ZERO.compareTo(totalDataSum) == 0 ? BigDecimal.ZERO : avgCount.divide(totalDataSum, 4, RoundingMode.HALF_UP);
+ BigDecimal lastCount = (BigDecimal) param.get("lastCount");
+ log.info("瑙嗗浘搴撳鎺ョǔ瀹氭�э紝totalDataSum锛歿}锛宭astCount锛歿}",totalDataSum,lastCount);
+ return totalDataSum.divide(lastCount, 4, RoundingMode.HALF_UP);
}
//鏍囨敞姝ｇ‘鐜�
diff --git a/ycl-server/src/main/java/com/ycl/task/HKTask.java b/ycl-server/src/main/java/com/ycl/task/HKTask.java
index a6c17ff..829671b 100644
--- a/ycl-server/src/main/java/com/ycl/task/HKTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/HKTask.java
@@ -123,7 +123,8 @@
//瀛樻斁鍦╩ongo涓�
carList.forEach(item -> item.setDataType(ApiConstants.HK_DataType_CAR));
mongoTemplate.insertAll(carList);
- //TODO:鏇存柊point琛ㄥ湪绾跨姸鎬�
+ //TODO:鏇存柊point琛ㄥ湪绾跨姸鎬侊紙鏈夋姄鎷嶉噺瑙嗕綔鍦ㄧ嚎锛�
+ //宸ュ崟
}
/** 浜鸿劯鏁版嵁 */
@@ -149,7 +150,8 @@
//瀛樻斁鍦╩ongo涓�
faceList.forEach(item -> item.setDataType(ApiConstants.HK_DataType_FACE));
mongoTemplate.insertAll(faceList);
- //TODO:鏇存柊point琛ㄥ湪绾跨姸鎬�
+ //TODO:鏇存柊point琛ㄥ湪绾跨姸鎬侊紙鏈夋姄鎷嶉噺瑙嗕綔鍦ㄧ嚎锛�
+ //宸ュ崟
}
log.info("缁撴潫鎶撴媿鏁版嵁閲忔娴嬬粨鏋滄暟鎹悓姝�");
--
Gitblit v1.8.0