5.29修改实时数据返回值加报警上下限2

src/main/java/com/example/tdl/domain/vo/WarehouseDataVo.java

@@ -6,48 +6,8 @@ public class WarehouseDataVo {
 
     private String TDLSN;
 
-    private Float temMax;
-
-    private Float temMin;
-
-    private Float humidityMax;
-
-    private Float humidityMin;
-
     private List<WarehouseTDLDetailVo> warehouseTDLDetailVos;
 
-    public Float getTemMax() {
-        return temMax;
-    }
-
-    public void setTemMax(Float temMax) {
-        this.temMax = temMax;
-    }
-
-    public Float getTemMin() {
-        return temMin;
-    }
-
-    public void setTemMin(Float temMin) {
-        this.temMin = temMin;
-    }
-
-    public Float getHumidityMax() {
-        return humidityMax;
-    }
-
-    public void setHumidityMax(Float humidityMax) {
-        this.humidityMax = humidityMax;
-    }
-
-    public Float getHumidityMin() {
-        return humidityMin;
-    }
-
-    public void setHumidityMin(Float humidityMin) {
-        this.humidityMin = humidityMin;
-    }
-
     public String getTDLSN() {
         return TDLSN;
     }

src/main/java/com/example/tdl/domain/vo/WarehouseTDLDetailVo.java

@@ -5,8 +5,28 @@ import java.util.List;
 public class WarehouseTDLDetailVo {
     private String description;
 
+    private Float max;
+
+    private Float min;
+
     private List<WarehouseTimeAndDataVo> timeAndValuesVos;
 
+    public Float getMax() {
+        return max;
+    }
+
+    public void setMax(Float max) {
+        this.max = max;
+    }
+
+    public Float getMin() {
+        return min;
+    }
+
+    public void setMin(Float min) {
+        this.min = min;
+    }
+
     public String getDescription() {
         return description;
     }

src/main/java/com/example/tdl/web/WarehouseController.java

@@ -870,19 +870,20 @@ public class WarehouseController {
                     warehouseTimeAndDataVos = getData(queryResults);
                     warehouseTDLDetailVo.setDescription("temperature");
                     warehouseTDLDetailVo.setTimeAndValuesVos(warehouseTimeAndDataVos);
+                    warehouseTDLDetailVo.setMax(resultAlarmVo.getTemMax());
+                    warehouseTDLDetailVo.setMin(resultAlarmVo.getTemMin());
+
                     warehouseTDLDetailVos.add(warehouseTDLDetailVo);
 
                     WarehouseTDLDetailVo warehouseTDLDetailVo1=new WarehouseTDLDetailVo();
                     warehouseTimeAndDataVos1 = getDatas(queryResults);
                     warehouseTDLDetailVo1.setDescription("humidity");
                     warehouseTDLDetailVo1.setTimeAndValuesVos(warehouseTimeAndDataVos1);
+                    warehouseTDLDetailVo1.setMax(resultAlarmVo.getHumidityMax());
+                    warehouseTDLDetailVo1.setMin(resultAlarmVo.getHumidityMin());
                     warehouseTDLDetailVos.add(warehouseTDLDetailVo1);
                 }
                 warehouseDataVo.setTDLSN(tdls.get(b));
-                warehouseDataVo.setTemMax(resultAlarmVo.getTemMax());
-                warehouseDataVo.setTemMin(resultAlarmVo.getTemMin());
-                warehouseDataVo.setHumidityMax(resultAlarmVo.getHumidityMax());
-                warehouseDataVo.setHumidityMin(resultAlarmVo.getHumidityMin());
                 warehouseDataVo.setWarehouseTDLDetailVos(warehouseTDLDetailVos);
                 warehouseDataVos.add(warehouseDataVo);
             }

src/main/resources/application.properties

@@ -7,7 +7,7 @@ spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 threadpool.corepoolsize = 30
 threadpool.maxpoolsize = 50
 
-server.port=8090
+server.port=8092
 management.security.enabled=false