xzzn/emsback
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dev #2

Merged
dashixiong merged 349 commits from dev into main 2026-02-11 01:55:46 +00:00
Conversation 0 Commits 349 Files Changed 375 +55297 -1120
374 changed files with 55297 additions and 1120 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e381ff86c8 - Show all commits

6
ems-system/src/main/java/com/xzzn/ems/service/impl/SingleSiteServiceImpl.java
View File

@ -715,9 +715,9 @@ public class SingleSiteServiceImpl implements ISingleSiteService {
} }
for (Map<String, Object> ammeterDevice : ammeterIdList) { for (Map<String, Object> ammeterDevice : ammeterIdList) {
String ammeterId = ammeterDevice.get("id").toString(); String ammeterId = ammeterDevice.get("id").toString();
if (!ammeterDeviceIds.contains(ammeterId)) { // if (!ammeterDeviceIds.contains(ammeterId)) {
continue; // continue;
} // }
// 从redis取总表详细数据 // 从redis取总表详细数据
EmsAmmeterData ammeterData = redisCache.getCacheObject(RedisKeyConstants.AMMETER + siteId + "_" +ammeterId); EmsAmmeterData ammeterData = redisCache.getCacheObject(RedisKeyConstants.AMMETER + siteId + "_" +ammeterId);
// 告警设备点位个数 // 告警设备点位个数