1.运输详情的数据接口中，增加温度、湿度的上上限和下下限; 2.仓库详情接口中，温度、湿度的上上限和下下限若为255.0，则设置为null

src/main/java/com/example/tdl/util/DataUtil.java

@@ -29,6 +29,8 @@ public class DataUtil {
 
     private static CommFeedback fb = new CommFeedback();
 
+    private static final String DEFAULT_VALUE = "255.0";
+
     public  static  String   getData(String transportationNo, HttpServletRequest request, I18nController i18n, String companyNo, CircuitService circuitService, TDLLogService tdlLogService, InfluxDBTemplate influxDBTemplate, String database, String field, String event, AlarmLogService alarmLogService,String classify){
         Long t1 = System.currentTimeMillis();
         ResultCircuitVo resultCircuitVo = circuitService.getByTransportationNo(transportationNo, companyNo);
@@ -67,11 +69,39 @@ public class DataUtil {
                 alarmList =  alarmLogService.getValue(transportationNo,TDLSN,classify);
             }
             historyDataVo.setAlarmList(alarmList);
-            if("\"T\"".equals(field) || "\"h\"".equals(field)){
+            if("\"T\"".equals(field)){
+                ResultAlarmVo resultAlarmVo = tdlLogService.getByTdl(transportationNo, TDLSN);
+                //根据tdl货物报警信息
+                String temUpper = null;
+                String temLower = null;
+                if (null != resultAlarmVo && null != resultAlarmVo.getTemUpper()
+                        && !DEFAULT_VALUE.equals(resultAlarmVo.getTemUpper().toString())) {
+                    temUpper = resultAlarmVo.getTemUpper().toString();
+                }
+
+                if (null != resultAlarmVo && null != resultAlarmVo.getTemLower()
+                        && !DEFAULT_VALUE.equals(resultAlarmVo.getTemLower().toString())) {
+                    temLower = resultAlarmVo.getTemLower().toString();
+                }
+                historyDataVo.setMax(temUpper);
+                historyDataVo.setMin(temLower);
+            }
+            if("\"h\"".equals(field)){
                 ResultAlarmVo resultAlarmVo = tdlLogService.getByTdl(transportationNo, TDLSN);
                 //根据tdl货物报警信息
-                historyDataVo.setMax(resultAlarmVo.getTemMax().toString());
-                historyDataVo.setMin(resultAlarmVo.getTemMin().toString());
+                String humidityUpper = null;
+                String humidityLower = null;
+                if (null != resultAlarmVo && null != resultAlarmVo.getHumidityUpper()
+                        && !DEFAULT_VALUE.equals(resultAlarmVo.getHumidityUpper().toString())) {
+                    humidityUpper = resultAlarmVo.getHumidityUpper().toString();
+                }
+
+                if (null != resultAlarmVo && null != resultAlarmVo.getHumidityLower()
+                        && !DEFAULT_VALUE.equals(resultAlarmVo.getHumidityLower().toString())) {
+                    humidityLower = resultAlarmVo.getHumidityLower().toString();
+                }
+                historyDataVo.setMax(humidityUpper);
+                historyDataVo.setMin(humidityLower);
             }
             List<HistoryData> historyData = new ArrayList<>();
             String sqls = "";

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

@@ -74,6 +74,8 @@ public class WarehouseController {
 
     DecimalFormat df = new DecimalFormat("0.0");
 
+    private static final String DEFAULT_VALUE = "255.0";
+
 
     //查询所有仓库信息
     @ApiOperation(value = "查询所有仓库信息",notes = "查询所有仓库信息,返回值说明：" +
@@ -1321,15 +1323,35 @@ public class WarehouseController {
         WarehouseTDLDetailVo warehouseTDLDetailVo=new WarehouseTDLDetailVo();
         warehouseTDLDetailVo.setDescription("temperature");
         warehouseTDLDetailVo.setTimeAndValuesVos(historyDataLists);
-        warehouseTDLDetailVo.setMax(resultAlarmVo != null ? resultAlarmVo.getTemUpper() : null);
-        warehouseTDLDetailVo.setMin(resultAlarmVo != null ? resultAlarmVo.getTemLower() : null);
+        Float temUpper = null;
+        Float temLower = null;
+        if (null != resultAlarmVo && null != resultAlarmVo.getTemUpper()
+                && !DEFAULT_VALUE.equals(resultAlarmVo.getTemUpper().toString())) {
+            temUpper = resultAlarmVo.getTemUpper();
+        }
+        if (null != resultAlarmVo && null != resultAlarmVo.getTemLower()
+                && !DEFAULT_VALUE.equals(resultAlarmVo.getTemLower().toString())) {
+            temLower = resultAlarmVo.getTemLower();
+        }
+        warehouseTDLDetailVo.setMax(temUpper);
+        warehouseTDLDetailVo.setMin(temLower);
         warehouseTDLDetailVoList.add(warehouseTDLDetailVo);
 
         WarehouseTDLDetailVo warehouseTDLDetailVos=new WarehouseTDLDetailVo();
         warehouseTDLDetailVos.setDescription("humidity");
         warehouseTDLDetailVos.setTimeAndValuesVos(historyDataList);
-        warehouseTDLDetailVos.setMax(resultAlarmVo != null ? resultAlarmVo.getHumidityUpper() : null);
-        warehouseTDLDetailVos.setMin(resultAlarmVo != null ? resultAlarmVo.getHumidityLower() : null);
+        Float humidityUpper = null;
+        Float humidityLower = null;
+        if (null != resultAlarmVo && null != resultAlarmVo.getHumidityUpper()
+                && !DEFAULT_VALUE.equals(resultAlarmVo.getHumidityUpper().toString())) {
+            humidityUpper = resultAlarmVo.getHumidityUpper();
+        }
+        if (null != resultAlarmVo && null != resultAlarmVo.getHumidityLower()
+                && !DEFAULT_VALUE.equals(resultAlarmVo.getHumidityLower().toString())) {
+            humidityLower = resultAlarmVo.getHumidityLower();
+        }
+        warehouseTDLDetailVos.setMax(humidityUpper);
+        warehouseTDLDetailVos.setMin(humidityLower);
         warehouseTDLDetailVoList.add(warehouseTDLDetailVos);
         return warehouseTDLDetailVoList;
     }

src/main/resources/mapper/TDLLogMapper.xml

@@ -35,7 +35,7 @@
     </select>
 
     <select id="getByTdl" parameterType="String" resultType="com.example.tdl.domain.vo.ResultAlarmVo">
-        select alarmType,temMax,temMin,humidityMax,humidityMin,tilt,shock,remark
+        select alarmType,temUpper,temMax,temMin,temLower,humidityUpper,humidityMax,humidityMin,humidityLower,tilt,shock,remark
         from  alarm a,tdl_gateway_log t
         where a.id = t.alarm_id
         and transportationNo = #{transportationNo,jdbcType=VARCHAR}