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

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

@@ -6,9 +6,48 @@ 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/WarehouseGatewayDateVo.java

@@ -7,45 +7,7 @@ public class WarehouseGatewayDateVo {
 
     private String type;
 
-    private Float temMax;
 
-    private Float temMin;
-
-    private Float humidityMax;
-
-    private Float humidityMin;
-
-    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;
-    }
 
     private List<WarehouseDataVo> warehouseDataVos;
 

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

@@ -851,10 +851,7 @@ public class WarehouseController {
             WarehouseGatewayDateVo warehouseGatewayDateVo=new WarehouseGatewayDateVo();
             warehouseGatewayDateVo.setgSN(gatewayOnLineVos.get(a).getSN());
             warehouseGatewayDateVo.setType(gatewayOnLineVos.get(a).getType());
-            warehouseGatewayDateVo.setTemMax(resultAlarmVo.getTemMax());
-            warehouseGatewayDateVo.setTemMin(resultAlarmVo.getTemMin());
-            warehouseGatewayDateVo.setHumidityMax(resultAlarmVo.getHumidityMax());
-            warehouseGatewayDateVo.setHumidityMin(resultAlarmVo.getHumidityMin());
+
             String device = gatewayOnLineVos.get(a).getType() + "_" + gatewayOnLineVos.get(a).getSN();
             List<String> tdls=tdlDeviceService.getByGatewaySN(gatewayOnLineVos.get(a).getSN(),gatewayOnLineVos.get(a).getType());
             List<WarehouseDataVo> warehouseDataVos=new ArrayList<>();
@@ -863,8 +860,8 @@ public class WarehouseController {
                 String sqls ="SELECT \"tdl\",\"T\", \"h\" FROM \"tdl_policy\".\"WTD93LG_17110194\" WHERE (\"tdl\" = 'TDL-1701110082608') ORDER BY time DESC ";
                 QueryResult queryResults = influxDBTemplate.query(new Query(sqls, database));
                 WarehouseDataVo warehouseDataVo=new WarehouseDataVo();
-                List<WarehouseTDLDetailVo> warehouseTDLDetailVos=new ArrayList<>();
 
+                List<WarehouseTDLDetailVo> warehouseTDLDetailVos=new ArrayList<>();
                 List<WarehouseTimeAndDataVo>  warehouseTimeAndDataVos = new ArrayList<>();
                 List<WarehouseTimeAndDataVo>  warehouseTimeAndDataVos1 = new ArrayList<>();
                 if(queryResults.getResults().get(0).getSeries() != null){
@@ -882,6 +879,10 @@ public class WarehouseController {
                     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=8092
+server.port=8090
 management.security.enabled=false