根据条件获取温湿度数据的取值改为取上上限，下下限

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

@@ -4,14 +4,22 @@ public class ResultAlarmVo{
 
     private String alarmType;
 
+    private Float temUpper;//温度上上限
+
     private Float temMax;//温度上限
 
     private Float temMin;//温度下限
 
+    private Float temLower;//温度下下限
+
+    private Float humidityUpper;//湿度上上限
+
     private Float humidityMax;//湿度上限
 
     private Float humidityMin;//湿度下限
 
+    private Float humidityLower;//湿度下下限
+
     private Float tilt;//倾斜度
 
     private Float shock;//震度
@@ -81,4 +89,36 @@ public class ResultAlarmVo{
     public void setRemark(String remark) {
         this.remark = remark;
     }
+
+    public Float getTemUpper() {
+        return temUpper;
+    }
+
+    public void setTemUpper(Float temUpper) {
+        this.temUpper = temUpper;
+    }
+
+    public Float getTemLower() {
+        return temLower;
+    }
+
+    public void setTemLower(Float temLower) {
+        this.temLower = temLower;
+    }
+
+    public Float getHumidityUpper() {
+        return humidityUpper;
+    }
+
+    public void setHumidityUpper(Float humidityUpper) {
+        this.humidityUpper = humidityUpper;
+    }
+
+    public Float getHumidityLower() {
+        return humidityLower;
+    }
+
+    public void setHumidityLower(Float humidityLower) {
+        this.humidityLower = humidityLower;
+    }
 }

src/main/java/com/example/tdl/mapper/AlarmMapper.java

@@ -4,9 +4,10 @@ package com.example.tdl.mapper;
 import com.example.tdl.domain.vo.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
 
 import java.util.List;
-
+@Repository
 @Mapper
 public interface AlarmMapper {
     List<ResultAlarmVo> getAll(String companyNo);

src/main/java/com/example/tdl/mapper/WarehouseMapper.java

@@ -2,11 +2,9 @@ package com.example.tdl.mapper;
 
 
 import com.example.tdl.domain.vo.*;
-import com.example.tdl.entity.Warehouse;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
-import org.springframework.web.bind.annotation.PostMapping;
 
 import java.util.List;
 import java.util.Map;

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

@@ -1321,15 +1321,15 @@ public class WarehouseController {
         WarehouseTDLDetailVo warehouseTDLDetailVo=new WarehouseTDLDetailVo();
         warehouseTDLDetailVo.setDescription("temperature");
         warehouseTDLDetailVo.setTimeAndValuesVos(historyDataLists);
-        warehouseTDLDetailVo.setMax(resultAlarmVo != null ? resultAlarmVo.getTemMax() : null);
-        warehouseTDLDetailVo.setMin(resultAlarmVo != null ? resultAlarmVo.getTemMin() : null);
+        warehouseTDLDetailVo.setMax(resultAlarmVo != null ? resultAlarmVo.getTemUpper() : null);
+        warehouseTDLDetailVo.setMin(resultAlarmVo != null ? resultAlarmVo.getTemLower() : null);
         warehouseTDLDetailVoList.add(warehouseTDLDetailVo);
 
         WarehouseTDLDetailVo warehouseTDLDetailVos=new WarehouseTDLDetailVo();
         warehouseTDLDetailVos.setDescription("humidity");
         warehouseTDLDetailVos.setTimeAndValuesVos(historyDataList);
-        warehouseTDLDetailVos.setMax(resultAlarmVo != null ? resultAlarmVo.getHumidityMax() : null);
-        warehouseTDLDetailVos.setMin(resultAlarmVo != null ? resultAlarmVo.getHumidityMin() : null);
+        warehouseTDLDetailVos.setMax(resultAlarmVo != null ? resultAlarmVo.getHumidityUpper() : null);
+        warehouseTDLDetailVos.setMin(resultAlarmVo != null ? resultAlarmVo.getHumidityLower() : null);
         warehouseTDLDetailVoList.add(warehouseTDLDetailVos);
         return warehouseTDLDetailVoList;
     }

src/main/resources/mapper/AlarmMapper.xml

@@ -61,7 +61,7 @@
     </select>
 
     <select id="getAlarmByWarehouseNo" parameterType="String" resultType="com.example.tdl.domain.vo.ResultAlarmVo">
-        SELECT  DISTINCT alarmType,temMax,temMin,humidityMax,humidityMin,tilt,shock,a.remark
+        SELECT  DISTINCT alarmType,temUpper,temMax,temMin,temLower,humidityUpper,humidityMax,humidityMin,humidityLower,tilt,shock,a.remark
         FROM tdl_gateway_log tgl INNER JOIN alarm a ON tgl.alarm_id=a.id
         where warehouseNo=#{warehouseNo,jdbcType=VARCHAR}
         AND gatewaySN=#{gatewaySN,jdbcType=VARCHAR}