From 0c1cbd9a7e55b5efad0630e24612158f0d9165e5 Mon Sep 17 00:00:00 2001
From: wr <1754607820@qq.com>
Date: Mon, 21 Apr 2025 10:59:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pq/service/impl/TerminalBaseServiceImpl.java     | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java
index 0ce1b55ee..8020e15b3 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java
@@ -1621,7 +1621,17 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
 
     @Override
     public List<TerminalBaseVO> getDeviceByIdOnOrOff(List<String> devIds, DeviceType deviceType, Integer comFlag) {
-        return this.baseMapper.getDeviceByIdOnOrOff(devIds, deviceType, comFlag);
+        List<TerminalBaseVO> deviceByIdOnOrOff = this.baseMapper.getDeviceByIdOnOrOff(devIds, deviceType, comFlag);
+        if(CollUtil.isNotEmpty(deviceByIdOnOrOff)){
+            List<DictData> devTypeDic = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.DEV_TYPE.getCode()).getData();
+            Map<String, String> devTypeDicMap = devTypeDic.stream().collect(Collectors.toMap(DictData::getId, DictData::getName));
+            for (TerminalBaseVO terminalBaseVO : deviceByIdOnOrOff) {
+                if(devTypeDicMap.containsKey(terminalBaseVO.getDevType())){
+                    terminalBaseVO.setDevType(devTypeDicMap.get(terminalBaseVO.getDevType()));
+                }
+            }
+        }
+        return deviceByIdOnOrOff;
     }