update - 振动传感器实时监控超过温度阈值逻辑校验并同步修改字体显示。

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)

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;
     }

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);
     }
 

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_SetMonitorThresholdValue ts on ts.monitorId = t.sensor_id
         WHERE t.rn = 1
         AND m.monitorId IS NOT NULL
         ORDER BY sensor_id