Skip to content

T
TDLCloud
Commit b54a9af4 authored by Carit Zhu's avatar Carit Zhu 🎱
Browse files
Options

Add null pointer judgement for resultAlarmVo in getWarehouseData function.

parent 302eb8c9
Pipeline #379 passed with stage
    in 0 seconds
    Show whitespace changes
    Inline Side-by-side
    Showing with 4 additions and 4 deletions
    src/main/java/com/example/tdl/web/WarehouseController.java
    View file @ b54a9af4
    ...@@ -1321,15 +1321,15 @@ public class WarehouseController { ...@@ -1321,15 +1321,15 @@ public class WarehouseController {
    WarehouseTDLDetailVo warehouseTDLDetailVo=new WarehouseTDLDetailVo(); WarehouseTDLDetailVo warehouseTDLDetailVo=new WarehouseTDLDetailVo();
    warehouseTDLDetailVo.setDescription("temperature"); warehouseTDLDetailVo.setDescription("temperature");
    warehouseTDLDetailVo.setTimeAndValuesVos(historyDataLists); warehouseTDLDetailVo.setTimeAndValuesVos(historyDataLists);
    warehouseTDLDetailVo.setMax(resultAlarmVo.getTemMax()); warehouseTDLDetailVo.setMax(resultAlarmVo != null ? resultAlarmVo.getTemMax() : null);
    warehouseTDLDetailVo.setMin(resultAlarmVo.getTemMin()); warehouseTDLDetailVo.setMin(resultAlarmVo != null ? resultAlarmVo.getTemMin() : null);
    warehouseTDLDetailVoList.add(warehouseTDLDetailVo); warehouseTDLDetailVoList.add(warehouseTDLDetailVo);
    WarehouseTDLDetailVo warehouseTDLDetailVos=new WarehouseTDLDetailVo(); WarehouseTDLDetailVo warehouseTDLDetailVos=new WarehouseTDLDetailVo();
    warehouseTDLDetailVos.setDescription("humidity"); warehouseTDLDetailVos.setDescription("humidity");
    warehouseTDLDetailVos.setTimeAndValuesVos(historyDataList); warehouseTDLDetailVos.setTimeAndValuesVos(historyDataList);
    warehouseTDLDetailVos.setMax(resultAlarmVo.getHumidityMax()); warehouseTDLDetailVos.setMax(resultAlarmVo != null ? resultAlarmVo.getHumidityMax() : null);
    warehouseTDLDetailVos.setMin(resultAlarmVo.getHumidityMin()); warehouseTDLDetailVos.setMin(resultAlarmVo != null ? resultAlarmVo.getHumidityMin() : null);
    warehouseTDLDetailVoList.add(warehouseTDLDetailVos); warehouseTDLDetailVoList.add(warehouseTDLDetailVos);
    return warehouseTDLDetailVoList; return warehouseTDLDetailVoList;
    } }
    ......
    Markdown is supported
    0% or
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment