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 99c18be..63fc78b 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 @@ -148,7 +148,7 @@ public class TVibrationsensorDataController extends BaseController { @PostMapping("/sensorList") @ResponseBody public AjaxResult sensorList(TVibrationsensorData tVibrationsensorData) { - List list = tVibrationsensorDataService.selectTVibrationsensorDataList(tVibrationsensorData); + List list = tVibrationsensorDataService.selectTVibrationsensorDataListCurve(tVibrationsensorData); return AjaxResult.success(list); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TVibrationsensorDataMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TVibrationsensorDataMapper.java index 60aafba..a857752 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TVibrationsensorDataMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TVibrationsensorDataMapper.java @@ -61,4 +61,10 @@ public interface TVibrationsensorDataMapper { List selectRealTimeMonitor(TVibrationsensorData tVibrationsensorData); + /** + * 振动数据正向查询 + * @param tVibrationsensorData + * @return + */ + List selectTVibrationsensorDataListCurve(TVibrationsensorData tVibrationsensorData); } 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 1a1808c..ddf497e 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 @@ -66,4 +66,11 @@ public interface ITVibrationsensorDataService */ public List selectRealTimeMonitor(TVibrationsensorData tVibrationsensorData); + /** + * 振动数据曲线 + * @param tVibrationsensorData + * @return + */ + List selectTVibrationsensorDataListCurve(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 36024a7..8dc9938 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 @@ -90,4 +90,14 @@ public class TVibrationsensorDataServiceImpl implements ITVibrationsensorDataSer public List selectRealTimeMonitor(TVibrationsensorData tVibrationsensorData) { return tVibrationsensorDataMapper.selectRealTimeMonitor(tVibrationsensorData); } + + /** + * 振动数据正向查询 + * @param tVibrationsensorData + * @return + */ + @Override + public List selectTVibrationsensorDataListCurve(TVibrationsensorData tVibrationsensorData) { + return tVibrationsensorDataMapper.selectTVibrationsensorDataListCurve(tVibrationsensorData); + } } diff --git a/ruoyi-system/src/main/resources/mapper/system/TArraytemperaturedataMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TArraytemperaturedataMapper.xml index 102e065..05a0bfc 100644 --- a/ruoyi-system/src/main/resources/mapper/system/TArraytemperaturedataMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/TArraytemperaturedataMapper.xml @@ -1588,15 +1588,15 @@ @@ -3955,101 +3955,113 @@ - delete from T_ArrayTemperatureData where DATEADD(DAY, #{objId}, GETDATE()) > collectTime + delete + from T_ArrayTemperatureData + where DATEADD(DAY, #{objId}, GETDATE()) > collectTime + + diff --git a/ruoyi-system/src/main/resources/mapper/system/TVibrationsensorDataMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TVibrationsensorDataMapper.xml index ea9353b..de975de 100644 --- a/ruoyi-system/src/main/resources/mapper/system/TVibrationsensorDataMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/TVibrationsensorDataMapper.xml @@ -123,5 +123,17 @@ AND m.monitorId IS NOT NULL ORDER BY sensor_id +