diff --git a/modules/qingyuan/src/main/java/com/thing/qingyuan/screen/service/impl/StationScreenServiceImpl.java b/modules/qingyuan/src/main/java/com/thing/qingyuan/screen/service/impl/StationScreenServiceImpl.java index 9e9b9a8..0c56b5d 100644 --- a/modules/qingyuan/src/main/java/com/thing/qingyuan/screen/service/impl/StationScreenServiceImpl.java +++ b/modules/qingyuan/src/main/java/com/thing/qingyuan/screen/service/impl/StationScreenServiceImpl.java @@ -22,7 +22,6 @@ import org.springframework.stereotype.Service; import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; -import java.util.stream.IntStream; /** * @author SiYang @@ -172,6 +171,9 @@ public class StationScreenServiceImpl implements StationScreenService { public List getScreenData() { List stationList = stationInfoService.getSimpleListWithGunStatus(); List stationIds = stationList.stream().map(StationSimpleDTO::getStationId).toList(); + + List entityDTOList = thingEntityService.findEntityAllByCode(stationIds, UserContext.getRealTenantCode(), true); + List tskvList = tsKvService.findTsKvByCodesAndAttrs( stationIds, @@ -180,6 +182,11 @@ public class StationScreenServiceImpl implements StationScreenService { System.currentTimeMillis(), true); List mapDataList = StationMapData.assemble(stationList, tskvList); - return mapDataList.stream().map(StationMapData::toScreenData).collect(Collectors.toList()); + List collect = mapDataList.stream().map(StationMapData::toScreenData).toList(); + for (ScreenData screenData : collect) { + IotThingEntityDTO entityDTO = entityDTOList.stream().filter(e -> e.getCode().equals(screenData.getId().toString())).findFirst().orElse(null); + screenData.setImg(entityDTO == null ? "" : entityDTO.getImg()); + } + return collect; } }