dev #2

Merged
dashixiong merged 349 commits from dev into main 2026-02-11 01:55:46 +00:00
374 changed files with 55297 additions and 1120 deletions
Showing only changes of commit e381ff86c8 - Show all commits

View File

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