From 7a9c620a83f58d69e5436778f6dc0ce526d3d301 Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Mon, 16 Jun 2025 10:46:03 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20=E6=B8=A9=E5=BA=A6=E9=98=B5?=
 =?UTF-8?q?=E5=88=97=E6=9B=B2=E7=BA=BF=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TArraytemperaturedataServiceImpl.java     | 23 ++++++++++++++++---
 .../system/TArraytemperaturedataMapper.xml    |  4 ++--
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TArraytemperaturedataServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TArraytemperaturedataServiceImpl.java
index 2eea6a8..81bb970 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TArraytemperaturedataServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TArraytemperaturedataServiceImpl.java
@@ -1,10 +1,11 @@
 package com.ruoyi.system.service.impl;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
 import java.util.stream.Collectors;
 
+import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.system.domain.T_Monitor;
 import com.ruoyi.system.mapper.T_MonitorMapper;
@@ -131,6 +132,22 @@ public class TArraytemperaturedataServiceImpl implements ITArraytemperaturedataS
      */
     @Override
     public List<HashMap<String, Object>> getHighestPointTemperature(TArraytemperaturedata tArraytemperaturedata) {
+        Map<String, Object> params = tArraytemperaturedata.getParams();
+        if (params.containsKey("beginCollectTime") && params.containsKey("endCollectTime")){
+            String beginCollectTime = (String) params.get("beginCollectTime");
+            String endCollectTime = (String) params.get("endCollectTime");
+            LocalDateTime now = LocalDateTime.now();
+            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+            String nowTime = now.format(formatter);
+            LocalDateTime tenMinutesAgo = now.minusMinutes(10);
+            String formattedDateTime = tenMinutesAgo.format(formatter);
+            if (beginCollectTime.isEmpty()){
+                params.put("beginCollectTime", formattedDateTime);
+            }
+            if (endCollectTime.isEmpty()){
+                params.put("endCollectTime", nowTime);
+            }
+        }
         return tArraytemperaturedataMapper.getHighestPointTemperature(tArraytemperaturedata);
     }
 
diff --git a/ruoyi-system/src/main/resources/mapper/system/TArraytemperaturedataMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TArraytemperaturedataMapper.xml
index ea6f4ec..46ae74b 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TArraytemperaturedataMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TArraytemperaturedataMapper.xml
@@ -1596,7 +1596,7 @@
         SELECT *,
         ROW_NUMBER() OVER (PARTITION BY monitorId ORDER BY collectTime DESC) AS rn
         FROM T_ArrayTemperatureData
-        WHERE collectTime > (GETDATE() - 1)
+        WHERE collectTime > DATEADD(HOUR, -1, GETDATE())
         <!--        <if test="monitorId != null and monitorId != ''">and monitorId like concat(#{monitorId}, '%')</if>-->
         <if test="monitorList != null  and monitorList.size > 0">
             and monitorId IN
@@ -4781,7 +4781,7 @@
             SELECT *,
                    ROW_NUMBER() OVER (PARTITION BY monitorId ORDER BY collectTime DESC) AS rn
             FROM T_ArrayTemperatureData
-        where 1=1
+        WHERE collectTime > DATEADD(HOUR, -1, GETDATE())
         <if test="monitorList != null  and monitorList.size > 0">
             and monitorId IN
             <foreach item="monitorId" collection="monitorList" open="(" separator="," close=")">