|
|
|
|
@ -1078,7 +1078,7 @@ public class DeviceServiceImpl implements DeviceService {
|
|
|
|
|
if(CollUtil.isNotEmpty(deviceModelAttributeDOPageResult)){
|
|
|
|
|
List<String> typeNames = deviceModelAttributeDOPageResult.stream().map(DeviceContactModelDO::getTypeName).distinct().collect(Collectors.toList());
|
|
|
|
|
List<String> codes = deviceModelAttributeDOPageResult.stream().map(DeviceContactModelDO::getAttributeCode).distinct().collect(Collectors.toList());
|
|
|
|
|
Map<String, List<DeviceContactModelDO>> resultMap = deviceModelAttributeDOPageResult.stream().collect(Collectors.groupingBy(DeviceContactModelDO::getTypeName));
|
|
|
|
|
Map<String, List<DeviceContactModelDO>> resultMap = deviceModelAttributeDOPageResult.stream().filter(d -> d.getTypeName() != null).collect(Collectors.groupingBy(DeviceContactModelDO::getTypeName));
|
|
|
|
|
resultMap.forEach((key, value) -> {
|
|
|
|
|
HashMap<String, Object> objectObjectHashMap = new HashMap<>();
|
|
|
|
|
objectObjectHashMap.put("group", key);
|
|
|
|
|
|