From 984e955bbabce4da67e4700a3dacb533d5bab90c Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Wed, 11 Jun 2025 15:47:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B9=BF=E5=91=8A=E5=A4=A7=E5=B1=8F=E8=AF=BB?= =?UTF-8?q?=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/report/datascreen/mapper/DatascreenMapper.java | 2 ++ .../datascreen/service/impl/DatascreenServiceImpl.java | 6 ++++++ .../core/report/datascreen/vo/CurrentMealtimeVO.java | 3 +++ .../src/main/resources/mapper/report/DatascreenMapper.xml | 4 ++++ 4 files changed, 15 insertions(+) diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/datascreen/mapper/DatascreenMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/datascreen/mapper/DatascreenMapper.java index 2cf94be5..a71d628b 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/datascreen/mapper/DatascreenMapper.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/datascreen/mapper/DatascreenMapper.java @@ -10,6 +10,8 @@ import java.util.List; @Mapper public interface DatascreenMapper { + + List getDashboardPictures(Long dashboardId); Integer getDishesNum(@Param("content") DatascreenBaseDTO content, @Param("canteenList") List canteenList); List getIntervalDishNum(@Param("content") DatascreenBaseDTO content, @Param("canteenList") List canteenList); diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/datascreen/service/impl/DatascreenServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/datascreen/service/impl/DatascreenServiceImpl.java index ef8d1f25..6c68ab7d 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/datascreen/service/impl/DatascreenServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/datascreen/service/impl/DatascreenServiceImpl.java @@ -82,6 +82,12 @@ public class DatascreenServiceImpl implements DatascreenService { mealtimeVO.setBit(BigDecimal.valueOf(presentNum).divide(BigDecimal.valueOf(capacity), 3, BigDecimal.ROUND_FLOOR)); } } + List pictures = datascreenMapper.getDashboardPictures(666L); + List newPictures = new ArrayList<>(); + for (String picture : pictures) { + newPictures.add(picture.replace("https://10.138.55.103:8888/lnyst", "http://sgwpdm.ah.sgcc.com.cn/canteen/lnyst")); + } + mealtimeVO.setPictures(newPictures); list.add(mealtimeVO); }); return list; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/datascreen/vo/CurrentMealtimeVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/datascreen/vo/CurrentMealtimeVO.java index 5f156d09..b2a11102 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/datascreen/vo/CurrentMealtimeVO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/datascreen/vo/CurrentMealtimeVO.java @@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; +import java.util.List; @Data public class CurrentMealtimeVO { @@ -25,4 +26,6 @@ public class CurrentMealtimeVO { @ApiModelProperty(value = "是否在餐次时段 1-是 2-否") private Integer ifInMealTime; + + private List pictures; } diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/report/DatascreenMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/report/DatascreenMapper.xml index 236a5750..cc804ae3 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/report/DatascreenMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/report/DatascreenMapper.xml @@ -3,6 +3,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + +