Commit b54a9af4 authored by Carit Zhu's avatar Carit Zhu 🎱

Add null pointer judgement for resultAlarmVo in getWarehouseData function.

parent 302eb8c9
Pipeline #379 passed with stage
in 0 seconds
......@@ -1321,15 +1321,15 @@ public class WarehouseController {
WarehouseTDLDetailVo warehouseTDLDetailVo=new WarehouseTDLDetailVo();
warehouseTDLDetailVo.setDescription("temperature");
warehouseTDLDetailVo.setTimeAndValuesVos(historyDataLists);
warehouseTDLDetailVo.setMax(resultAlarmVo.getTemMax());
warehouseTDLDetailVo.setMin(resultAlarmVo.getTemMin());
warehouseTDLDetailVo.setMax(resultAlarmVo != null ? resultAlarmVo.getTemMax() : null);
warehouseTDLDetailVo.setMin(resultAlarmVo != null ? resultAlarmVo.getTemMin() : null);
warehouseTDLDetailVoList.add(warehouseTDLDetailVo);
WarehouseTDLDetailVo warehouseTDLDetailVos=new WarehouseTDLDetailVo();
warehouseTDLDetailVos.setDescription("humidity");
warehouseTDLDetailVos.setTimeAndValuesVos(historyDataList);
warehouseTDLDetailVos.setMax(resultAlarmVo.getHumidityMax());
warehouseTDLDetailVos.setMin(resultAlarmVo.getHumidityMin());
warehouseTDLDetailVos.setMax(resultAlarmVo != null ? resultAlarmVo.getHumidityMax() : null);
warehouseTDLDetailVos.setMin(resultAlarmVo != null ? resultAlarmVo.getHumidityMin() : null);
warehouseTDLDetailVoList.add(warehouseTDLDetailVos);
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