微调
This commit is contained in:
@@ -1621,7 +1621,17 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<TerminalBaseVO> getDeviceByIdOnOrOff(List<String> devIds, DeviceType deviceType, Integer comFlag) {
|
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;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user