From 45233e402e61db50584f881e854c895e1f77f151 Mon Sep 17 00:00:00 2001
From: guo <guo@guo>
Date: Mon, 25 Mar 2024 17:57:35 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/zhgd/xmgl/base/entity/vo/TrendOneVo.java      | 2 +-
 .../mapper/xml/PitchMixStationProdDataMapper.xml                | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/zhgd/xmgl/base/entity/vo/TrendOneVo.java b/src/main/java/com/zhgd/xmgl/base/entity/vo/TrendOneVo.java
index e406af7d3..5979b875d 100644
--- a/src/main/java/com/zhgd/xmgl/base/entity/vo/TrendOneVo.java
+++ b/src/main/java/com/zhgd/xmgl/base/entity/vo/TrendOneVo.java
@@ -31,7 +31,7 @@ public class TrendOneVo {
      * @return
      */
     public static List<TrendOneVo> fillTrendVos(List<TrendOneVo> list, List<String> days, String format) {
-        Map<String, TrendOneVo> voMap = list.stream().collect(Collectors.toMap(TrendOneVo::getX, Function.identity()));
+        Map<String, TrendOneVo> voMap = list.stream().collect(Collectors.toMap(TrendOneVo::getX, Function.identity(), (trendOneVo, trendOneVo2) -> trendOneVo));
         List<TrendOneVo> rtList = new ArrayList<>();
         for (String day : days) {
             TrendOneVo vo = voMap.get(day);
diff --git a/src/main/java/com/zhgd/xmgl/modules/pitchmixstation/mapper/xml/PitchMixStationProdDataMapper.xml b/src/main/java/com/zhgd/xmgl/modules/pitchmixstation/mapper/xml/PitchMixStationProdDataMapper.xml
index 2b2227458..3438f6255 100644
--- a/src/main/java/com/zhgd/xmgl/modules/pitchmixstation/mapper/xml/PitchMixStationProdDataMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/pitchmixstation/mapper/xml/PitchMixStationProdDataMapper.xml
@@ -18,6 +18,7 @@
         where project_sn = #{projectSn}
         <if test="type == '1'.toString()">
             and discharge_time > current_date
+            and discharge_time &lt; date_add(current_date, interval 1 day)
             group by dev_sn, date_format(discharge_time, '%Y-%m-%d %H:00')
         </if>
         <if test="type == '2'.toString()">