From 0571c03740d9069cf761695d0dcadd4d6bc9af0d Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期四, 19 六月 2025 08:54:19 +0800
Subject: [PATCH] refactor(model): 优化模型相关功能和查询
---
zhitan-system/src/main/java/com/zhitan/model/service/impl/ModelInfoServiceImpl.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/zhitan-system/src/main/java/com/zhitan/model/service/impl/ModelInfoServiceImpl.java b/zhitan-system/src/main/java/com/zhitan/model/service/impl/ModelInfoServiceImpl.java
index 6661e6a..4f6dbef 100644
--- a/zhitan-system/src/main/java/com/zhitan/model/service/impl/ModelInfoServiceImpl.java
+++ b/zhitan-system/src/main/java/com/zhitan/model/service/impl/ModelInfoServiceImpl.java
@@ -137,6 +137,7 @@
List<EnergyIndex> energyIndexList = energyIndexService.getEnergyIndexByIds(indexIds);
// 鏍规嵁indexid鏌ヨ瀵瑰簲璁￠噺鍣ㄥ叿淇℃伅
List<String> meterIds = energyIndexList.stream().map(EnergyIndex::getMeterId).collect(Collectors.toList());
+ if (CollectionUtils.isEmpty(meterIds)) return voList;
Map<String, List<MeterImplement>> meterImplementMap = meterImplementService.listMeterImplementByIds(meterIds).stream()
.filter(li -> StringUtils.isNotEmpty(li.getInstallactionLocation()))
.collect(Collectors.groupingBy(MeterImplement::getId));
@@ -148,10 +149,11 @@
if (CollectionUtils.isNotEmpty(meterImplements)) {
MeterImplement infor = meterImplements.get(0);
indexName = infor.getInstallactionLocation() + "_" + infor.getMeterName() + "_" + indexName;
+ pointData.setIndexName(indexName);
+ pointData.setIndexId(indexInfo.getIndexId());
+ voList.add(pointData);
}
- pointData.setIndexName(indexName);
- pointData.setIndexId(indexInfo.getIndexId());
- voList.add(pointData);
+
}
return voList;
}
--
Gitblit v1.9.3