From cf1f643ed3f4c85e455da725c42fa686f665a259 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期二, 25 六月 2024 17:09:34 +0800
Subject: [PATCH] 设备详细信息接口更新
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java
index 9f89aff..ad9d45f 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java
@@ -369,13 +369,16 @@
String saveTableName = mdcEquipmentDetailedDto.getSaveTableName();
Map<String, Object> mapData = equipmentWorkLineService.getDataList(saveTableName);
if (mapData != null) {
- Map<String, Object> runData = new LinkedHashMap<>();
+// Map<String, Object> runData = new LinkedHashMap<>();
+ List<Map<String, Object>> runData = new ArrayList<>();
//鑾峰彇 MDC 椹卞姩瀵瑰簲鐨勫睍绀哄弬鏁� 骞舵牴鎹甼ey 鎷艰浠� workData 鏌ヨ鐨勬暟鎹�
List<MdcDriveTypeParamConfig> mdcDriveTypeParamList = mdcDriveTypeParamConfigService.getShowDriveParam(mdcEquipmentDetailedDto.getDriveType());
if (mdcDriveTypeParamList != null && !mdcDriveTypeParamList.isEmpty()) {
for (MdcDriveTypeParamConfig mdcDriveTypeParamConfig : mdcDriveTypeParamList) {
+ Map<String, Object> map = new LinkedHashMap<>();
String englishName = mdcDriveTypeParamConfig.getEnglishName();
String chineseName = mdcDriveTypeParamConfig.getChineseName();
+ map.put("key", chineseName);
if (mapData.containsKey(englishName)) {
Object object = mapData.get(englishName);
String value = "";
@@ -433,7 +436,8 @@
} else {
value = object == null ? "" : object.toString();
}
- runData.put(chineseName, value);
+ map.put("value", value);
+ runData.add(map);
if ("spindlebeilv".equals(englishName)) {
result.put("spindlebeilv", value);
}
--
Gitblit v1.9.3