diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/report/TemAndHumReportController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/report/TemAndHumReportController.java index ab04518..5b39938 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/report/TemAndHumReportController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/report/TemAndHumReportController.java @@ -59,6 +59,16 @@ public class TemAndHumReportController extends BaseController { return prefix + "/VibrationDataCurve"; } + /** + * 振动数据实时曲线监控 + * @return + */ + @GetMapping("/VibrationRealTimeCurve") + public String VibrationRealTimeCurveHtml() + { + return prefix + "/VibrationRealTimeCurve"; + } + /** * 温度阵列传感器曲线 * @return diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TVibrationsensorDataController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TVibrationsensorDataController.java index 63fc78b..ccd0488 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TVibrationsensorDataController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TVibrationsensorDataController.java @@ -134,12 +134,10 @@ public class TVibrationsensorDataController extends BaseController { @PostMapping("/realTimeMonitor") @ResponseBody public AjaxResult realTimeMonitor(TVibrationsensorData tVibrationsensorData) { - List tVibrationsensorData1 = tVibrationsensorDataService.selectRealTimeMonitor(tVibrationsensorData); - return AjaxResult.success(tVibrationsensorData1); + List list = tVibrationsensorDataService.selectRealTimeMonitor(tVibrationsensorData); + return AjaxResult.success(list); } - - /** * 振动数据曲线 * @param tVibrationsensorData diff --git a/ruoyi-admin/src/main/resources/templates/report/VibrationDataCurve20251203.html b/ruoyi-admin/src/main/resources/templates/report/VibrationDataCurve20251203.html new file mode 100644 index 0000000..a6bf787 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/report/VibrationDataCurve20251203.html @@ -0,0 +1,424 @@ + + + + + + + + + + + +
+
+
+
+ 测控点信息 +
+
+ + + + +
+
+
+
+
+
+
+ +
+
+
+
+
+ +
+
    +
  • + + - + +
    • +
  • + + + +
    • + +
+
+
+
+
+
+
+
+
+
+
+
+
+ + + + + + + + + + diff --git a/ruoyi-admin/src/main/resources/templates/report/VibrationRealTimeCurve.html b/ruoyi-admin/src/main/resources/templates/report/VibrationRealTimeCurve.html new file mode 100644 index 0000000..a6bf787 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/report/VibrationRealTimeCurve.html @@ -0,0 +1,424 @@ + + + + + + + + + + + +
+
+
+
+ 测控点信息 +
+
+ + + + +
+
+
+
+
+
+
+ +
+
+
+
+
+ +
+
    +
  • + + - + +
    • +
  • + + + +
    • + +
+
+
+
+
+
+
+
+
+
+
+
+
+ + + + + + + + + + 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 ffe31ec..0ef9e6d 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 @@ -25,7 +25,7 @@ public class TVibrationsensorData extends BaseEntity { /** * 采集时间 */ - @Excel(name = "采集时间", width = 30, dateFormat = "yyyy-MM-dd") + @Excel(name = "采集时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date collectTime; /** @@ -61,7 +61,7 @@ public class TVibrationsensorData extends BaseEntity { /** * 记录时间 */ - @Excel(name = "记录时间", width = 30, dateFormat = "yyyy-MM-dd") + @Excel(name = "记录时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date recodeTime; private String monitorName; diff --git a/ruoyi-system/src/main/resources/mapper/system/TVibrationsensorDataMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TVibrationsensorDataMapper.xml index de975de..d4afb7b 100644 --- a/ruoyi-system/src/main/resources/mapper/system/TVibrationsensorDataMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/TVibrationsensorDataMapper.xml @@ -114,7 +114,9 @@ FROM T_VibrationSensor_Data WHERE 1=1 -- AND collectTime > (GETDATE() - 1) - and sensor_id like concat(#{sensorId}, '%') + + and sensor_id in (select monitorId from T_Monitor where monitorId like concat(#{sensorId}, '%')) + ) SELECT m.monitorName, t.* FROM RankedData t @@ -123,6 +125,7 @@ AND m.monitorId IS NOT NULL ORDER BY sensor_id +