|
|
@ -449,7 +449,8 @@ public class IotThingSourceServiceImpl extends BaseServiceImpl<IotThingSourceMap |
|
|
// 根据 thingAttrName 和 thingAttrCode 去重 |
|
|
// 根据 thingAttrName 和 thingAttrCode 去重 |
|
|
Set<String> seen = new LinkedHashSet<>(); |
|
|
Set<String> seen = new LinkedHashSet<>(); |
|
|
return iotThingSourceDTOS.stream() |
|
|
return iotThingSourceDTOS.stream() |
|
|
.filter(dto -> seen.add(dto.getThingAttrName() + "-" + dto.getThingAttrCode())) |
|
|
|
|
|
|
|
|
.filter(dto -> StringUtils.equals(dto.getStartStatus(),"0") && |
|
|
|
|
|
seen.add(dto.getThingAttrName() + "-" + dto.getThingAttrCode())) |
|
|
.toList(); |
|
|
.toList(); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@ -588,7 +589,9 @@ public class IotThingSourceServiceImpl extends BaseServiceImpl<IotThingSourceMap |
|
|
// 根据 thingAttrGroup 去重 |
|
|
// 根据 thingAttrGroup 去重 |
|
|
Set<String> seen = new LinkedHashSet<>(); |
|
|
Set<String> seen = new LinkedHashSet<>(); |
|
|
return iotThingSourceDTOS.stream() |
|
|
return iotThingSourceDTOS.stream() |
|
|
.filter(dto -> StringUtils.isNotBlank(dto.getThingAttrGroup()) && seen.add(dto.getThingAttrGroup())) |
|
|
|
|
|
|
|
|
.filter(dto -> StringUtils.isNotBlank(dto.getThingAttrGroup()) |
|
|
|
|
|
&& StringUtils.equals(dto.getStartStatus(),"0") |
|
|
|
|
|
&& seen.add(dto.getThingAttrGroup())) |
|
|
.toList(); |
|
|
.toList(); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|