Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

微调

Browse Source
This commit is contained in:
wr
2025-04-21 10:59:57 +08:00
parent b2000dc51e
commit 0c1cbd9a7e
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java
View File

@@ -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;
}