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 | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 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 0724007..09164a1 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java
@@ -19,14 +19,14 @@
*/
@Component
@Slf4j
-public abstract class IndexCalculationServe <T extends BaseResult, S> extends IndexCalculationUtils {
+public abstract class IndexCalculationServe<T extends BaseResult, S> extends IndexCalculationUtils {
@Autowired
private TMonitorMapper monitorMapper;
//鎶借薄鏂规硶锛岀敱瀛愮被缂栧啓鍏蜂綋閫昏緫绠楁硶
protected abstract void updateAreaStats(Map<String, S> areaStatsMap, String key, T result);
- protected Map<String, S> getAreaStatsMap(List<T> list){
+ protected Map<String, S> getAreaStatsMap(List<T> list, Boolean needDept) {
if (CollectionUtils.isEmpty(list)) {
log.info("鏁版嵁涓虹┖");
return null;
@@ -43,15 +43,17 @@
String deptId = monitor.getDeptId().toString();
updateAreaStats(areaStatsMap, deptId, result);
- // 澶勭悊鐪佸巺鏁版嵁
- if (result.getProvinceTag()!=null && result.getProvinceTag()) {
+ // 澶勭悊鐪佸巺鑰冩牳鏁版嵁
+ if (result.getProvinceTag() != null && result.getProvinceTag()) {
String provinceKey = ApiConstants.Province + deptId;
updateAreaStats(areaStatsMap, provinceKey, result);
}
- // 澶勭悊鍏畨閮ㄦ暟鎹�
- if (result.getDeptTag()!=null && result.getDeptTag()) {
- String deptKey = ApiConstants.Dept + deptId;
- updateAreaStats(areaStatsMap, deptKey, result);
+ // 澶勭悊鍏畨閮ㄨ�冩牳鏁版嵁(鍏畨閮ㄦ暟鎹彧鏈夎棰戞墠鏈夛紝鎵�浠ヨ繖閲屽畾涔変簡needDept鏉ュ喅瀹氭槸鍚﹂渶瑕佸鐞嗛儴绾ф暟鎹�)
+ if (needDept) {
+ if (result.getDeptTag() != null && result.getDeptTag()) {
+ String deptKey = ApiConstants.Dept + deptId;
+ updateAreaStats(areaStatsMap, deptKey, result);
+ }
}
}
return areaStatsMap;
--
Gitblit v1.8.0