Skip to content

T
TDLCloud
Commit 9a44dad1 authored by zhuangzhuang's avatar zhuangzhuang
Browse files
Options

注释历史数据最后一条.java

parent 0642f41b
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
src/main/java/com/example/tdl/web/WarehouseController.java
View file @ 9a44dad1
...@@ -5,7 +5,7 @@ import com.alibaba.fastjson.JSON; ...@@ -5,7 +5,7 @@ import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.example.tdl.domain.dto.CommFeedback; import com.example.tdl.domain.dto.CommFeedback;
import com.example.tdl.domain.vo.*; import com.example.tdl.domain.vo.*;
import com.example.tdl.entity.Alarm; import com.example.tdl.entity.Alarm;。
import com.example.tdl.entity.Gateway; import com.example.tdl.entity.Gateway;
import com.example.tdl.service.*; import com.example.tdl.service.*;
import com.example.tdl.service.redis.InfoRedisService; import com.example.tdl.service.redis.InfoRedisService;
...@@ -1214,10 +1214,10 @@ public class WarehouseController { ...@@ -1214,10 +1214,10 @@ public class WarehouseController {
warehouseTimeAndDataVos.setValue(value.get(2)==null ? "" :value.get(2).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")){
historyDataLists.add(new WarehouseTimeAndDataVo(warehouseDataVo.getTime(),warehouseDataVo.getTemperature())); // historyDataLists.add(new WarehouseTimeAndDataVo(warehouseDataVo.getTime(),warehouseDataVo.getTemperature()));
historyDataList.add(new WarehouseTimeAndDataVo(warehouseDataVo.getTime(),warehouseDataVo.getHumidity())); // historyDataList.add(new WarehouseTimeAndDataVo(warehouseDataVo.getTime(),warehouseDataVo.getHumidity()));
} // }
WarehouseTDLDetailVo warehouseTDLDetailVo=new WarehouseTDLDetailVo(); WarehouseTDLDetailVo warehouseTDLDetailVo=new WarehouseTDLDetailVo();
warehouseTDLDetailVo.setDescription("temperature"); warehouseTDLDetailVo.setDescription("temperature");
warehouseTDLDetailVo.setTimeAndValuesVos(historyDataLists); warehouseTDLDetailVo.setTimeAndValuesVos(historyDataLists);
......
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