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 5ac5d3c..7a33567 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("/TemperatureArraySensorCurves") + public String TemperatureArraySensorCurves() + { + return prefix + "/TemperatureArraySensorCurves"; + } + /** * 获取第一个点位 * @return diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TArraytemperaturedataController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TArraytemperaturedataController.java index e8f8908..39b45ad 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TArraytemperaturedataController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TArraytemperaturedataController.java @@ -1,5 +1,6 @@ package com.ruoyi.web.controller.system; +import java.util.HashMap; import java.util.List; import org.apache.shiro.authz.annotation.RequiresPermissions; @@ -127,4 +128,18 @@ public class TArraytemperaturedataController extends BaseController { public AjaxResult remove(String ids) { return toAjax(tArraytemperaturedataService.deleteTArraytemperaturedataByIds(ids)); } + + + /** + * 获取阵列传感器最高点温度 + * @param tArraytemperaturedata + * @return + */ + @PostMapping("/getHighestPointTemperature") + @ResponseBody + public AjaxResult getHighestPointTemperature(TArraytemperaturedata tArraytemperaturedata) { + List> list = tArraytemperaturedataService.getHighestPointTemperature(tArraytemperaturedata); + return AjaxResult.success(list); + } + } diff --git a/ruoyi-admin/src/main/resources/templates/report/TemperatureArraySensorCurves.html b/ruoyi-admin/src/main/resources/templates/report/TemperatureArraySensorCurves.html new file mode 100644 index 0000000..7e52aab --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/report/TemperatureArraySensorCurves.html @@ -0,0 +1,246 @@ + + + + + + + + + + +
+
+
+
+ 测控点信息 +
+
+ + + + +
+
+
+
+
+
+
+ +
+
+
+
+
+ +
+
    +
  • + + - + +
    • +
  • +
    • + +
+
+
+
+
+
+
+ + + +
+
+
+ + + + + + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/report/VibrationDataCurve.html b/ruoyi-admin/src/main/resources/templates/report/VibrationDataCurve.html index 3dd19d8..a6bf787 100644 --- a/ruoyi-admin/src/main/resources/templates/report/VibrationDataCurve.html +++ b/ruoyi-admin/src/main/resources/templates/report/VibrationDataCurve.html @@ -210,11 +210,9 @@ function getdata(monitorId) { var formData = new FormData(); - formData.append("monitorId", monitorId); + formData.append("sensorId", monitorId); formData.append("params[beginCollectTime]", $("#laydate-demo-3").val()); formData.append("params[endCollectTime]",$("#laydate-demo-4").val()); - // formData.append("startTime", $("#laydate-demo-3").val()); - // formData.append("endTime", $("#laydate-demo-4").val()); $.ajax({ url: ctx + "system/TVibrationsensorData/sensorList", type: 'post', diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TArraytemperaturedataMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TArraytemperaturedataMapper.java index 9a239e2..ea11df9 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TArraytemperaturedataMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TArraytemperaturedataMapper.java @@ -1,5 +1,6 @@ package com.ruoyi.system.mapper; +import java.util.HashMap; import java.util.List; import com.ruoyi.system.domain.TArraytemperaturedata; @@ -65,4 +66,11 @@ public interface TArraytemperaturedataMapper * @return */ List selectNewDataStreak(TArraytemperaturedata tArraytemperaturedata); + + /** + * 获取阵列传感器最高点温度 + * @param tArraytemperaturedata + * @return + */ + List> getHighestPointTemperature(TArraytemperaturedata tArraytemperaturedata); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ITArraytemperaturedataService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ITArraytemperaturedataService.java index ccbf983..d15d1b1 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ITArraytemperaturedataService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ITArraytemperaturedataService.java @@ -1,5 +1,6 @@ package com.ruoyi.system.service; +import java.util.HashMap; import java.util.List; import com.ruoyi.system.domain.TArraytemperaturedata; @@ -65,4 +66,11 @@ public interface ITArraytemperaturedataService { * @return */ List selectNewDataStreak(TArraytemperaturedata tArraytemperaturedata); + + /** + * 获取阵列传感器最高点温度 + * @param tArraytemperaturedata + * @return + */ + List> getHighestPointTemperature(TArraytemperaturedata tArraytemperaturedata); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TArraytemperaturedataServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TArraytemperaturedataServiceImpl.java index d691c06..911abbc 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TArraytemperaturedataServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TArraytemperaturedataServiceImpl.java @@ -1,5 +1,6 @@ package com.ruoyi.system.service.impl; +import java.util.HashMap; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -101,4 +102,14 @@ public class TArraytemperaturedataServiceImpl implements ITArraytemperaturedataS public List selectNewDataStreak(TArraytemperaturedata tArraytemperaturedata) { return tArraytemperaturedataMapper.selectNewDataStreak(tArraytemperaturedata); } + + /** + * 获取阵列传感器最高点温度 + * @param tArraytemperaturedata + * @return + */ + @Override + public List> getHighestPointTemperature(TArraytemperaturedata tArraytemperaturedata) { + return tArraytemperaturedataMapper.getHighestPointTemperature(tArraytemperaturedata); + } } diff --git a/ruoyi-system/src/main/resources/mapper/system/TArraytemperaturedataMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TArraytemperaturedataMapper.xml index af39f1c..4b60ce4 100644 --- a/ruoyi-system/src/main/resources/mapper/system/TArraytemperaturedataMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/TArraytemperaturedataMapper.xml @@ -1601,6 +1601,7 @@ ORDER BY monitorId + insert into T_ArrayTemperatureData @@ -3953,4 +3954,98 @@ + diff --git a/ruoyi-system/src/main/resources/mapper/system/TVibrationsensorDataMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TVibrationsensorDataMapper.xml index e736a24..ea9353b 100644 --- a/ruoyi-system/src/main/resources/mapper/system/TVibrationsensorDataMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/TVibrationsensorDataMapper.xml @@ -120,6 +120,7 @@ FROM RankedData t left join T_Monitor m on m.monitorId = t.sensor_id WHERE t.rn = 1 + AND m.monitorId IS NOT NULL ORDER BY sensor_id