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 5b39938..12e009e 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 @@ -49,6 +49,26 @@ public class TemAndHumReportController extends BaseController { return prefix + "/TemAndHumLQXHS"; } + /** + * 振动实时曲线 + * @return + */ + @GetMapping("/VibrationThreeRealTimeCurve") + public String VibrationThreeRealTimeCurveHtml() + { + return prefix + "/VibrationThreeRealTimeCurve"; + } + + /** + * 振动数据单曲线 + * @return + */ + @GetMapping("/SingleVibrationDataCurve") + public String SingleVibrationDataCurveHtml() + { + return prefix + "/SingleVibrationDataCurve"; + } + /** * 振动数据曲线 * @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 ccd0488..d1b8807 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 @@ -139,7 +139,8 @@ public class TVibrationsensorDataController extends BaseController { } /** - * 振动数据曲线 + * 振动数据曲线接口 + * 单一、多条 * @param tVibrationsensorData * @return */ @@ -150,4 +151,16 @@ public class TVibrationsensorDataController extends BaseController { return AjaxResult.success(list); } + /** + * 振动实时曲线 + * @param tVibrationsensorData + * @return + */ + @PostMapping("/realTimeCurveList") + @ResponseBody + public AjaxResult realTimeCurveList(TVibrationsensorData tVibrationsensorData) { + List list = tVibrationsensorDataService.selectTVibrationsensorRealTimeCurveList(tVibrationsensorData); + return AjaxResult.success(list); + } + } diff --git a/ruoyi-admin/src/main/resources/templates/report/VibrationDataCurve20251203.html b/ruoyi-admin/src/main/resources/templates/report/SingleVibrationDataCurve.html similarity index 100% rename from ruoyi-admin/src/main/resources/templates/report/VibrationDataCurve20251203.html rename to ruoyi-admin/src/main/resources/templates/report/SingleVibrationDataCurve.html diff --git a/ruoyi-admin/src/main/resources/templates/report/VibrationDataCurve.html b/ruoyi-admin/src/main/resources/templates/report/VibrationDataCurve.html index 3e450db..3cf0e16 100644 --- a/ruoyi-admin/src/main/resources/templates/report/VibrationDataCurve.html +++ b/ruoyi-admin/src/main/resources/templates/report/VibrationDataCurve.html @@ -1,7 +1,7 @@ - + diff --git a/ruoyi-admin/src/main/resources/templates/report/VibrationRealTimeCurve.html b/ruoyi-admin/src/main/resources/templates/report/VibrationRealTimeCurve.html index a6bf787..fadcb5b 100644 --- a/ruoyi-admin/src/main/resources/templates/report/VibrationRealTimeCurve.html +++ b/ruoyi-admin/src/main/resources/templates/report/VibrationRealTimeCurve.html @@ -1,7 +1,7 @@ - + diff --git a/ruoyi-admin/src/main/resources/templates/report/VibrationThreeRealTimeCurve.html b/ruoyi-admin/src/main/resources/templates/report/VibrationThreeRealTimeCurve.html new file mode 100644 index 0000000..2450581 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/report/VibrationThreeRealTimeCurve.html @@ -0,0 +1,350 @@ + + + + + + + + + + + +
+
+
+
+ 测控点信息 +
+
+ + + + +
+
+
+
+
+
+
+ +
+
+
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+ + + + + + + + + + diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ITVibrationsensorDataService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ITVibrationsensorDataService.java index ddf497e..6f0a5c5 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ITVibrationsensorDataService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ITVibrationsensorDataService.java @@ -73,4 +73,11 @@ public interface ITVibrationsensorDataService */ List selectTVibrationsensorDataListCurve(TVibrationsensorData tVibrationsensorData); + /** + * 振动实时曲线 + * @param tVibrationsensorData + * @return + */ + List selectTVibrationsensorRealTimeCurveList(TVibrationsensorData tVibrationsensorData); + } 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 8dc9938..2062282 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 @@ -1,7 +1,10 @@ package com.ruoyi.system.service.impl; -import java.util.List; +import java.util.*; +import java.text.SimpleDateFormat; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.system.mapper.TVibrationsensorDataMapper; @@ -93,6 +96,7 @@ public class TVibrationsensorDataServiceImpl implements ITVibrationsensorDataSer /** * 振动数据正向查询 + * * @param tVibrationsensorData * @return */ @@ -100,4 +104,27 @@ public class TVibrationsensorDataServiceImpl implements ITVibrationsensorDataSer public List selectTVibrationsensorDataListCurve(TVibrationsensorData tVibrationsensorData) { return tVibrationsensorDataMapper.selectTVibrationsensorDataListCurve(tVibrationsensorData); } + + /** + * 振动实时曲线 + * 查询近30分钟的数据 + * + * @param tVibrationsensorData + * @return + */ + @Override + public List selectTVibrationsensorRealTimeCurveList(TVibrationsensorData tVibrationsensorData) { + if (StringUtils.isEmpty(tVibrationsensorData.getSensorId())) { + return new ArrayList<>(); + } + Calendar calendar = Calendar.getInstance(); + calendar.setTime(new Date()); + calendar.add(Calendar.MINUTE, -30); + Date oldTime = calendar.getTime(); + Map timeMap = new HashMap<>(); + timeMap.put("beginCollectTime", DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, oldTime)); + timeMap.put("endCollectTime", DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, new Date())); + tVibrationsensorData.setParams(timeMap); + return tVibrationsensorDataMapper.selectTVibrationsensorDataListCurve(tVibrationsensorData); + } }