From 2ec8aa8a6dbcea0d3e382c85d15b2eff247f3a7a Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Thu, 16 May 2024 08:57:20 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20=E6=8C=AF=E5=8A=A8=E4=BC=A0?=
 =?UTF-8?q?=E6=84=9F=E5=99=A8=E7=BB=B4=E6=8A=A4=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ArrayTemperatureData.html                 | 11 +++++-----
 .../system/domain/TArraytemperaturedata.java  | 21 +++++++++++++------
 .../system/TArraytemperaturedataMapper.xml    |  5 +++--
 3 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/system/ArrayTemperatureData/ArrayTemperatureData.html b/ruoyi-admin/src/main/resources/templates/system/ArrayTemperatureData/ArrayTemperatureData.html
index f75ceec..ebda2b0 100644
--- a/ruoyi-admin/src/main/resources/templates/system/ArrayTemperatureData/ArrayTemperatureData.html
+++ b/ruoyi-admin/src/main/resources/templates/system/ArrayTemperatureData/ArrayTemperatureData.html
@@ -52,9 +52,9 @@
   var removeFlag = [[${@permission.hasPermi('system:ArrayTemperatureData:remove')}]];
   var prefix = ctx + "system/ArrayTemperatureData";
 
-
 </script>
 <script>
+  var monitorId = null;
   $(() => {
     var panehHidden = false;
     if ($(this).width() < 769) {
@@ -117,9 +117,9 @@
       // 返回格式化的CSS颜色字符串
       return `rgb(${rgb.r}, ${rgb.g}, ${rgb.b})`;
     }
-
     const getData = () => {
-      $.post(prefix + '/newDataStreak', (e) => {
+      console.log(222,monitorId)
+      $.post(prefix + '/newDataStreak', {monitorId}, (e) => {
         $('#temInfo').html(`<span style="color:#ff0000">最高温度：${e.rows[0].maxTemperature}℃</span> <span style="color:#0b05f7">最低温度：${e.rows[0].minTemperature}℃</span> <span style="color:#0066e4">平均温度:${e.rows[0].avgTemperature}℃</span>`)
         $('#timeInfo').html(`<span style="color:#0b05f7">采集时间：${e.rows[0].collectTime}</span> `)
         let colors = []
@@ -203,9 +203,8 @@
     $.tree.init(options);
 
     function zOnClick(event, treeId, treeNode) {
-      $("#sensorId").val(treeNode.id);
-      /*alert(treeNode.id)*/
-      $.table.search();
+      monitorId = treeNode.id;
+      console.log(111,monitorId)
     }
   }
 
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TArraytemperaturedata.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TArraytemperaturedata.java
index f0a4c0d..fa0a9be 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TArraytemperaturedata.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TArraytemperaturedata.java
@@ -57,18 +57,18 @@ public class TArraytemperaturedata extends BaseEntity {
     @Excel(name = "记录时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date recodeTime;
 
-    /**
-     * 位置1
-     */
-    @Excel(name = "位置1")
-    private BigDecimal Site1;
-
     /**
      * 测控点编号
      */
     @Excel(name = "测控点编号")
     private String monitorId;
 
+    /**
+     * 位置1
+     */
+    @Excel(name = "位置1")
+    private BigDecimal Site1;
+
     /**
      * 位置2
      */
@@ -4671,6 +4671,15 @@ public class TArraytemperaturedata extends BaseEntity {
     @Excel(name = "位置768")
     private BigDecimal Site768;
 
+
+    public String getMonitorId() {
+        return monitorId;
+    }
+
+    public void setMonitorId(String monitorId) {
+        this.monitorId = monitorId;
+    }
+
     public Long getObjId() {
         return objId;
     }
diff --git a/ruoyi-system/src/main/resources/mapper/system/TArraytemperaturedataMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TArraytemperaturedataMapper.xml
index 57ea1c4..af26fdc 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TArraytemperaturedataMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TArraytemperaturedataMapper.xml
@@ -1569,7 +1569,7 @@
         <where>
             <if test="probeAddress != null ">and probeAddress = #{probeAddress}</if>
             <if test="maxTemperature != null ">and maxTemperature = #{maxTemperature}</if>
-            <if test="monitorId != null ">and monitorId = #{monitorId}</if>
+            <if test="monitorId != null monitorId != ''">and monitorId = #{monitorId}</if>
             <if test="minTemperature != null ">and minTemperature = #{minTemperature}</if>
             <if test="avgTemperature != null ">and avgTemperature = #{avgTemperature}</if>
             <if test="collectTime != null ">and collectTime = #{collectTime}</if>
@@ -1586,7 +1586,8 @@
             resultMap="TArraytemperaturedataResult">
         SELECT TOP 1 *
         FROM T_ArrayTemperatureData
-        <if test="monitorId != null ">and monitorId = #{monitorId}</if>
+        where 1=1
+        <if test="monitorId != null and monitorId != ''">and monitorId = #{monitorId}</if>
         ORDER BY collectTime DESC
     </select>