Commit 0642f41b authored by zhuangzhuang's avatar zhuangzhuang

修复仓库历史数据一样的问题

parent 7b61d557
...@@ -1211,7 +1211,7 @@ public class WarehouseController { ...@@ -1211,7 +1211,7 @@ public class WarehouseController {
WarehouseTimeAndDataVo warehouseTimeAndDataVos = new WarehouseTimeAndDataVo(); WarehouseTimeAndDataVo warehouseTimeAndDataVos = new WarehouseTimeAndDataVo();
warehouseTimeAndDataVos.setTime(time); warehouseTimeAndDataVos.setTime(time);
warehouseTimeAndDataVos.setValue(value.get(2)==null ? "" :value.get(3).toString()); warehouseTimeAndDataVos.setValue(value.get(2)==null ? "" :value.get(2).toString());
historyDataLists.add(warehouseTimeAndDataVos); historyDataLists.add(warehouseTimeAndDataVos);
} }
if(!warehouseDataVo.getTemperature().equals("NA")){ if(!warehouseDataVo.getTemperature().equals("NA")){
...@@ -1228,8 +1228,8 @@ public class WarehouseController { ...@@ -1228,8 +1228,8 @@ public class WarehouseController {
WarehouseTDLDetailVo warehouseTDLDetailVos=new WarehouseTDLDetailVo(); WarehouseTDLDetailVo warehouseTDLDetailVos=new WarehouseTDLDetailVo();
warehouseTDLDetailVos.setDescription("humidity"); warehouseTDLDetailVos.setDescription("humidity");
warehouseTDLDetailVos.setTimeAndValuesVos(historyDataList); warehouseTDLDetailVos.setTimeAndValuesVos(historyDataList);
warehouseTDLDetailVos.setMax(resultAlarmVo.getTemMax()); warehouseTDLDetailVos.setMax(resultAlarmVo.getHumidityMax());
warehouseTDLDetailVos.setMin(resultAlarmVo.getTemMin()); warehouseTDLDetailVos.setMin(resultAlarmVo.getHumidityMin());
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