From d4096551507885a7feb1c3133a47728c49034cb2 Mon Sep 17 00:00:00 2001
From: guoshengxiong <1923636941@qq.com>
Date: Wed, 15 Oct 2025 18:06:23 +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

---
 .../impl/CrawlerCraneCurrentDataServiceImpl.java      | 11 +++++++----
 .../impl/TruckCraneCurrentDataServiceImpl.java        | 11 +++++++----
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/CrawlerCraneCurrentDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/CrawlerCraneCurrentDataServiceImpl.java
index 08c49bad0..f62790a97 100644
--- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/CrawlerCraneCurrentDataServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/CrawlerCraneCurrentDataServiceImpl.java
@@ -36,7 +36,8 @@ public class CrawlerCraneCurrentDataServiceImpl extends ServiceImpl<CrawlerCrane
 
     @Override
     public List<Map<String, Object>> windSpeedTrend(Map<String, Object> map) {
-        if (MapUtils.getInteger(map, "selectType") == 1) {
+        Integer selectType = MapUtils.getInteger(map, "selectType");
+        if (selectType == 1) {
             map.put("reportTime_begin", DateUtil.formatDateTime(DateUtil.beginOfDay(new Date())));
             map.put("reportTime_end", DateUtil.formatDateTime(new Date()));
         }
@@ -44,9 +45,9 @@ public class CrawlerCraneCurrentDataServiceImpl extends ServiceImpl<CrawlerCrane
         List<CrawlerCraneCurrentData> list = this.list(queryWrapper);
         List<CrawlerCrane> crawlerCraneList = crawlerCraneService.list(Wrappers.<CrawlerCrane>lambdaQuery().eq(CrawlerCrane::getProjectSn, MapUtils.getString(map, "projectSn")));
         List<String> dayList;
-        if (MapUtils.getInteger(map, "selectType") == 1) {
+        if (selectType == 1) {
             dayList = DateUtils.getDateTimeStrList(100, "HH:mm");
-        } else if (MapUtils.getInteger(map, "selectType") == 2){
+        } else if (selectType == 2){
             dayList = DateUtils.getNowFewDaysAgoList(7);
         } else {
             dayList = DateUtils.getNowFewDaysAgoList(29);
@@ -56,7 +57,9 @@ public class CrawlerCraneCurrentDataServiceImpl extends ServiceImpl<CrawlerCrane
             Map<String, Object> deviceMap = new HashMap<>(16);
             List<Map<String, Object>> dataList = new ArrayList<>();
             for (String day : dayList) {
-                List<CrawlerCraneCurrentData> collect = list.stream().filter(l -> l.getDevSn().equals(crawlerCrane.getDevSn()) && DateUtil.formatDateTime(l.getReportTime()).contains(day)).collect(Collectors.toList());
+                List<CrawlerCraneCurrentData> collect = list.stream().filter(l -> l.getDevSn().equals(crawlerCrane.getDevSn())
+                        && ((selectType != 1 && DateUtil.formatDateTime(l.getReportTime()).contains(day))
+                        ||(selectType == 1 && DateUtil.format(l.getReportTime(),"HH:00").equals(day)))).collect(Collectors.toList());
                 Map<String, Object> result = new HashMap<>(16);
                 result.put("dayTitle", day);
                 result.put("windSpeed", collect.size() > 0 ? collect.get(0).getWindSpeed() : 0);
diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/TruckCraneCurrentDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/TruckCraneCurrentDataServiceImpl.java
index eb22c3535..7037e031a 100644
--- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/TruckCraneCurrentDataServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/TruckCraneCurrentDataServiceImpl.java
@@ -39,7 +39,8 @@ public class TruckCraneCurrentDataServiceImpl extends ServiceImpl<TruckCraneCurr
 
     @Override
     public List<Map<String, Object>> windSpeedTrend(Map<String, Object> map) {
-        if (MapUtils.getInteger(map, "selectType") == 1) {
+        Integer selectType = MapUtils.getInteger(map, "selectType");
+        if (selectType == 1) {
             map.put("reportTime_begin", DateUtil.formatDateTime(DateUtil.beginOfDay(new Date())));
             map.put("reportTime_end", DateUtil.formatDateTime(new Date()));
         }
@@ -47,9 +48,9 @@ public class TruckCraneCurrentDataServiceImpl extends ServiceImpl<TruckCraneCurr
         List<TruckCraneCurrentData> list = this.list(queryWrapper);
         List<TruckCrane> truckCraneList = truckCraneService.list(Wrappers.<TruckCrane>lambdaQuery().eq(TruckCrane::getProjectSn, MapUtils.getString(map, "projectSn")));
         List<String> dayList;
-        if (MapUtils.getInteger(map, "selectType") == 1) {
+        if (selectType == 1) {
             dayList = DateUtils.getDateTimeStrList(100, "HH:mm");
-        } else if (MapUtils.getInteger(map, "selectType") == 2){
+        } else if (selectType == 2){
             dayList = DateUtils.getNowFewDaysAgoList(7);
         } else {
             dayList = DateUtils.getNowFewDaysAgoList(29);
@@ -59,7 +60,9 @@ public class TruckCraneCurrentDataServiceImpl extends ServiceImpl<TruckCraneCurr
             Map<String, Object> deviceMap = new HashMap<>(16);
             List<Map<String, Object>> dataList = new ArrayList<>();
             for (String day : dayList) {
-                List<TruckCraneCurrentData> collect = list.stream().filter(l -> l.getDevSn().equals(truckCrane.getDevSn()) && DateUtil.formatDateTime(l.getReportTime()).contains(day)).collect(Collectors.toList());
+                List<TruckCraneCurrentData> collect = list.stream().filter(l -> l.getDevSn().equals(truckCrane.getDevSn())
+                        && ((selectType != 1 && DateUtil.formatDateTime(l.getReportTime()).contains(day))
+                        ||(selectType == 1 && DateUtil.format(l.getReportTime(),"HH:00").equals(day)))).collect(Collectors.toList());
                 Map<String, Object> result = new HashMap<>(16);
                 result.put("dayTitle", day);
                 result.put("windSpeed", collect.size() > 0 ? collect.get(0).getWindSpeed() : 0);