diff --git a/modules/qingyuan/src/main/java/com/thing/qingyuan/screen/StationDailyInfo.java b/modules/qingyuan/src/main/java/com/thing/qingyuan/screen/StationDailyInfo.java index c12b7af..1f5aad9 100644 --- a/modules/qingyuan/src/main/java/com/thing/qingyuan/screen/StationDailyInfo.java +++ b/modules/qingyuan/src/main/java/com/thing/qingyuan/screen/StationDailyInfo.java @@ -34,6 +34,9 @@ public class StationDailyInfo { @Schema(description = "充电站地址") private String address; + @Schema(description = "充电站图片") + private String url; + @Schema(description = "充电桩数量") private Integer equipmentNum = 0; 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 72b16fa..9e9b9a8 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 @@ -12,6 +12,9 @@ import com.thing.qingyuan.chargeStation.service.EquipmentInfoService; import com.thing.qingyuan.chargeStation.service.StationInfoService; import com.thing.qingyuan.screen.*; import com.thing.qingyuan.screen.service.StationScreenService; +import com.thing.sys.security.context.UserContext; +import com.thing.thing.entity.dto.IotThingEntityDTO; +import com.thing.thing.entity.service.IotThingEntityService; import lombok.RequiredArgsConstructor; import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Service; @@ -30,6 +33,7 @@ import java.util.stream.IntStream; @RequiredArgsConstructor public class StationScreenServiceImpl implements StationScreenService { private final TsKvService tsKvService; + private final IotThingEntityService thingEntityService; private final StationInfoService stationInfoService; private final EquipmentInfoService equipmentInfoService; private final ConnectorInfoService connectorInfoService; @@ -74,6 +78,7 @@ public class StationScreenServiceImpl implements StationScreenService { @Override public StationDailyInfo getDailyInfo(String thingCode) { StationInfoEntity station = stationInfoService.getById(thingCode); + Optional entityByCode = thingEntityService.findEntityByCode(thingCode, UserContext.getRealTenantCode(), true); List pileList = equipmentInfoService.getByStationId(thingCode); EquipmentInfoDTO summedPile = pileList.stream().reduce(EquipmentInfoDTO::add).orElse(null); List tskvList = @@ -84,6 +89,7 @@ public class StationScreenServiceImpl implements StationScreenService { System.currentTimeMillis(), true); StationDailyInfo stationDailyInfo = StationDailyInfo.assemble(station, summedPile, tskvList); + entityByCode.ifPresent(entityDTO -> stationDailyInfo.setUrl(entityDTO.getImg())); return stationDailyInfo.setEquipmentNum(CollectionUtils.size(pileList)); }