From c3a981e80973ac52b5988aca62b87409976c6fb1 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 18 六月 2026 13:09:28 +0800
Subject: [PATCH] 1.计量器具台账上传附件报错 2.质量拉的数据不对（未明确） 3.计量器具台账逾期的做标红提醒 4.设备保养定时任务和记录要加上具体的保养内容 5.质量要区分质检规则抽检还是全检，抽检的话是抽多少百分比 6.供应商管理东西太少了，没有资质文件啊这些东西（是不是可以参考pro） 7.采购审批把人从李莹莹改成龙红星
---
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