From cf330c6a6c2ae7ec86d20de465d5af27a4684cf6 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 03 十一月 2026 19:16:58 +0800
Subject: [PATCH] 巡检任务频次增加“每年”支持
---
src/main/java/com/ruoyi/device/service/impl/DeviceAreaServiceImpl.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/service/impl/DeviceAreaServiceImpl.java b/src/main/java/com/ruoyi/device/service/impl/DeviceAreaServiceImpl.java
index 06340f6..6b1794a 100644
--- a/src/main/java/com/ruoyi/device/service/impl/DeviceAreaServiceImpl.java
+++ b/src/main/java/com/ruoyi/device/service/impl/DeviceAreaServiceImpl.java
@@ -17,6 +17,7 @@
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@@ -51,8 +52,9 @@
.collect(Collectors.toMap(DeviceArea::getId, a -> a));
// 閫掑綊姹囨�绘瘡涓妭鐐圭殑璁惧鏁伴噺锛堝惈鎵�鏈夊瓙绾э級
- Map<Long, Long> countMap = directCountMap.entrySet().stream()
- .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
+ // 蹇呴』浠庣┖ map 寮�濮嬶細姣忎釜鍖哄煙鐨勮嚜韬洿鎸傛暟鍙湪 accumulate 涓疮鍔犱竴娆★紝
+ // 鍚﹀垯浼氫笌鈥滃垵濮嬪嵆鍚嚜韬洿鎸傛暟鈥濆彔鍔狅紝瀵艰嚧姣忎釜鍖哄煙鑷韩璁惧鏁拌璁′袱娆★紙鍙屽�嶏級
+ Map<Long, Long> countMap = new HashMap<>();
for (DeviceArea area : all) {
accumulate(area.getId(), directCountMap.getOrDefault(area.getId(), 0L), countMap, areaMap);
}
--
Gitblit v1.9.3