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 imple @Override public List getDeviceByIdOnOrOff(List devIds, DeviceType deviceType, Integer comFlag) { - return this.baseMapper.getDeviceByIdOnOrOff(devIds, deviceType, comFlag); + List deviceByIdOnOrOff = this.baseMapper.getDeviceByIdOnOrOff(devIds, deviceType, comFlag); + if(CollUtil.isNotEmpty(deviceByIdOnOrOff)){ + List devTypeDic = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.DEV_TYPE.getCode()).getData(); + Map 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; }