From feb86efc4e8a8d2da00e4832bcd81825726617bf Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 04 六月 2026 13:48:25 +0800
Subject: [PATCH] feat(iot): 物联设备接口新增存放位置字段
---
src/main/java/com/ruoyi/http/service/controller/JclyController.java | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/ruoyi/http/service/controller/JclyController.java b/src/main/java/com/ruoyi/http/service/controller/JclyController.java
index 00bbb74..409fda4 100644
--- a/src/main/java/com/ruoyi/http/service/controller/JclyController.java
+++ b/src/main/java/com/ruoyi/http/service/controller/JclyController.java
@@ -41,24 +41,29 @@
.isNotNull(DeviceLedger::getExternalCode)
.ne(DeviceLedger::getExternalCode, ""));
- Map<String, String> guidDeviceNameMap = iotDevices.stream()
+ Map<String, DeviceLedger> guidDeviceMap = iotDevices.stream()
.filter(item -> StringUtils.isNotEmpty(item.getExternalCode()))
.collect(Collectors.toMap(
item -> item.getExternalCode().trim(),
- item -> StringUtils.isNotEmpty(item.getDeviceName()) ? item.getDeviceName().trim() : "",
- (oldValue, newValue) -> StringUtils.isNotEmpty(oldValue) ? oldValue : newValue,
+ item -> item,
+ (oldValue, newValue) -> StringUtils.isNotEmpty(oldValue.getDeviceName()) ? oldValue : newValue,
LinkedHashMap::new
));
- List<String> guidList = new ArrayList<>(guidDeviceNameMap.keySet());
+ List<String> guidList = new ArrayList<>(guidDeviceMap.keySet());
List<Map<String, String>> maps = realTimeEnergyConsumptionService
.getRealData(guidList);
for (Map<String, String> item : maps) {
String guid = item.get("guid");
if (StringUtils.isNotEmpty(guid)) {
- String deviceName = guidDeviceNameMap.get(guid.trim());
- if (StringUtils.isNotEmpty(deviceName)) {
- item.put("deviceName", deviceName);
+ DeviceLedger device = guidDeviceMap.get(guid.trim());
+ if (device != null) {
+ if (StringUtils.isNotEmpty(device.getDeviceName())) {
+ item.put("deviceName", device.getDeviceName().trim());
+ }
+ if (StringUtils.isNotEmpty(device.getStorageLocation())) {
+ item.put("storageLocation", device.getStorageLocation().trim());
+ }
}
}
}
--
Gitblit v1.9.3