From bf3b2ae9883651a6e3999209cd55cef8e5343691 Mon Sep 17 00:00:00 2001
From: lishuai <lishuai@qq.com>
Date: Tue, 25 Feb 2025 15:16:51 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A2=B3=E8=B5=84=E4=BA=A7=E5=88=86=E6=9E=90-?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=202025=E5=B9=B42=E6=9C=8825=E6=97=A513:28:23?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../screen/service/impl/StationScreenServiceImpl.java | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

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<ScreenData> getScreenData() {
         List<StationSimpleDTO> stationList = stationInfoService.getSimpleListWithGunStatus();
         List<String> stationIds = stationList.stream().map(StationSimpleDTO::getStationId).toList();
+
+        List<IotThingEntityDTO> entityDTOList = thingEntityService.findEntityAllByCode(stationIds, UserContext.getRealTenantCode(), true);
+
         List<TsKvDTO> tskvList =
                 tsKvService.findTsKvByCodesAndAttrs(
                         stationIds,
@@ -180,6 +182,11 @@ public class StationScreenServiceImpl implements StationScreenService {
                         System.currentTimeMillis(),
                         true);
         List<StationMapData> mapDataList = StationMapData.assemble(stationList, tskvList);
-        return mapDataList.stream().map(StationMapData::toScreenData).collect(Collectors.toList());
+        List<ScreenData> 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;
     }
 }