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 = `
-
${v.monitorName}
+
${v.monitorName}
${v.collectTime}
速度:${v.speed}mm/s
位移:${v.displacement}um
-
温度:${v.temperature}℃
+
温度:${v.temperature}℃
` $("#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 @@ ) - 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