From df815750a44dfe64719e098af9d07ebb5ecc32bf Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Wed, 25 Mar 2026 15:46:31 +0800
Subject: [PATCH] =?UTF-8?q?update=20-=20=E6=8C=AF=E5=8A=A8=E4=BC=A0?=
 =?UTF-8?q?=E6=84=9F=E5=99=A8=E5=AE=9E=E6=97=B6=E7=9B=91=E6=8E=A7=E8=B6=85?=
 =?UTF-8?q?=E8=BF=87=E6=B8=A9=E5=BA=A6=E9=98=88=E5=80=BC=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E5=B9=B6=E5=90=8C=E6=AD=A5=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=AD=97=E4=BD=93=E6=98=BE=E7=A4=BA=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TVibrationsensorData/RealTimeMonitor.html      |  6 ++++--
 .../ruoyi/system/domain/TVibrationsensorData.java  | 14 ++++++++++++++
 .../impl/TVibrationsensorDataServiceImpl.java      |  1 +
 .../mapper/system/TVibrationsensorDataMapper.xml   |  9 +++++++--
 4 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/system/TVibrationsensorData/RealTimeMonitor.html b/ruoyi-admin/src/main/resources/templates/system/TVibrationsensorData/RealTimeMonitor.html
index fd28617..e489f1c 100644
--- a/ruoyi-admin/src/main/resources/templates/system/TVibrationsensorData/RealTimeMonitor.html
+++ b/ruoyi-admin/src/main/resources/templates/system/TVibrationsensorData/RealTimeMonitor.html
@@ -158,14 +158,16 @@
                     // let data = [{}, {}, {}]
                     $("#chartDivs").html('')
                     data.forEach((v, k) => {
+                        var isOver = (v.isThreshold === 1 || v.isThreshold === '1');
+                        var redStyle = isOver ? 'color:#d9534f;font-weight:700;' : '';
                         let html = `
           <div class="chartDiv border" id="chartDiv">
-          <div class="title" style="font-size: 1.4vw">${v.monitorName}</div>
+          <div class="title" style="font-size: 1.4vw;${redStyle}">${v.monitorName}</div>
           <div class="time" style="font-size: 1vw">${v.collectTime}</div>
 
           <div class="text1">速度：${v.speed}mm/s</div>
           <div class="text1">位移：${v.displacement}um</div>
-          <div class="text1">温度：${v.temperature}℃</div>
+          <div class="text1" style="${redStyle}">温度：${v.temperature}℃</div>
           </div>
           `
                         $("#chartDivs").append(html)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TVibrationsensorData.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TVibrationsensorData.java
index 0ef9e6d..2c3a9fe 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TVibrationsensorData.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TVibrationsensorData.java
@@ -66,6 +66,20 @@ public class TVibrationsensorData extends BaseEntity {
 
     private String monitorName;
 
+    /**
+     * 是否超过温度最大值：1是 ，0否
+     */
+    private Integer isThreshold;
+
+
+    public Integer getIsThreshold() {
+        return isThreshold;
+    }
+
+    public void setIsThreshold(Integer isThreshold) {
+        this.isThreshold = isThreshold;
+    }
+
     public String getMonitorName() {
         return monitorName;
     }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TVibrationsensorDataServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TVibrationsensorDataServiceImpl.java
index 8c715b0..65a7455 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TVibrationsensorDataServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TVibrationsensorDataServiceImpl.java
@@ -100,6 +100,7 @@ public class TVibrationsensorDataServiceImpl implements ITVibrationsensorDataSer
                     .collect(Collectors.toList());
             tVibrationsensorData.getParams().put("sensorIdList", sensorIdList);
         }
+
         return tVibrationsensorDataMapper.selectRealTimeMonitor(tVibrationsensorData);
     }
 
diff --git a/ruoyi-system/src/main/resources/mapper/system/TVibrationsensorDataMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TVibrationsensorDataMapper.xml
index bff6f53..8559078 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TVibrationsensorDataMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TVibrationsensorDataMapper.xml
@@ -121,9 +121,14 @@
             </foreach>
         </if>
         )
-        SELECT m.monitorName, t.*
+        SELECT m.monitorName, t.*,
+        CASE
+        WHEN ts.temperatureMax IS NULL THEN 0
+        WHEN t.temperature > ISNULL(ts.temperatureMax, 0) THEN 1
+        ELSE 0 END isThreshold
         FROM RankedData t
-                 left join T_Monitor m on m.monitorId = t.sensor_id
+        left join T_Monitor m on m.monitorId = t.sensor_id
+        left join T_SetMonitorThresholdValue ts on ts.monitorId = t.sensor_id
         WHERE t.rn = 1
         AND m.monitorId IS NOT NULL
         ORDER BY sensor_id