Skip to content

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

修改数据查询bug

parent 093f696e
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 17 deletions
src/main/java/com/example/tdl/web/WarehouseController.java
View file @ db872313
......@@ -82,14 +82,9 @@ public class WarehouseController {
@Autowired
private TDLLogService tdlLogService;
@Autowired
private WarehouseAlarmLogService warehouseAlarmLogService;
DecimalFormat df = new DecimalFormat("#.0");
@Value("${spring.influxdb.database}")
private String database ;
//查询所有仓库信息
@ApiOperation(value = "查询所有仓库信息",notes = "查询所有仓库信息,返回值说明：" +
" warehouseName:仓库名," +
......@@ -367,9 +362,9 @@ public class WarehouseController {
QueryResult queryResults = influxDBTemplate.query(new Query(sqls, database));
if (queryResults.getResults().get(0).getSeries() != null) {
tdlDeviceDetailVo.setTime(parseTime(queryResults.getResults().get(0).getSeries().get(0).getValues().get(0).get(0).toString()));
tdlDeviceDetailVo.setPressure(df.format(queryResults.getResults().get(0).getSeries().get(0).getValues().get(0).get(1).toString()));
tdlDeviceDetailVo.setTemperature(df.format(queryResults.getResults().get(0).getSeries().get(0).getValues().get(0).get(2).toString()));
tdlDeviceDetailVo.setHumidity(df.format(queryResults.getResults().get(0).getSeries().get(0).getValues().get(0).get(3).toString()));
tdlDeviceDetailVo.setPressure(queryResults.getResults().get(0).getSeries().get(0).getValues().get(0).get(1).toString());
tdlDeviceDetailVo.setTemperature(queryResults.getResults().get(0).getSeries().get(0).getValues().get(0).get(2).toString());
tdlDeviceDetailVo.setHumidity(queryResults.getResults().get(0).getSeries().get(0).getValues().get(0).get(3).toString());
}else{
tdlDeviceDetailVo.setTime("NA");
tdlDeviceDetailVo.setPressure("NA");
......@@ -1053,8 +1048,8 @@ public class WarehouseController {
if (queryResults.getResults().get(0).getSeries() != null) {
warehouseDataVo.setTime(UTCToCST(queryResults.getResults().get(0).getSeries().get(0).getValues().get(0).get(0).toString(),warehouseVo.getOffset()==null ? "+8" : warehouseVo.getOffset()));
warehouseDataVo.setBatteryVoltage(queryResults.getResults().get(0).getSeries().get(0).getValues().get(0).get(2).toString());
warehouseDataVo.setTemperature(df.format(queryResults.getResults().get(0).getSeries().get(0).getValues().get(0).get(3).toString()));
warehouseDataVo.setHumidity(df.format(queryResults.getResults().get(0).getSeries().get(0).getValues().get(0).get(4).toString()));
warehouseDataVo.setTemperature(queryResults.getResults().get(0).getSeries().get(0).getValues().get(0).get(3).toString());
warehouseDataVo.setHumidity(queryResults.getResults().get(0).getSeries().get(0).getValues().get(0).get(4).toString());
}else{
warehouseDataVo.setTime("NA");
warehouseDataVo.setBatteryVoltage("NA");
......@@ -1268,8 +1263,8 @@ public class WarehouseController {
warehouseDataVo.setTime(UTCToCST(queryResults.getResults().get(0).getSeries().get(0).getValues().get(0).get(0).toString(),downloadForWarehouseVo.getOffset()==null ? "+8" : downloadForWarehouseVo.getOffset()));
warehouseDataVo.setBatteryVoltage(queryResults.getResults().get(0).getSeries().get(0).getValues().get(0).get(2).toString());
warehouseDataVo.setTemperature(df.format(queryResults.getResults().get(0).getSeries().get(0).getValues().get(0).get(3).toString()));
warehouseDataVo.setHumidity(df.format(queryResults.getResults().get(0).getSeries().get(0).getValues().get(0).get(4).toString()));
warehouseDataVo.setTemperature(queryResults.getResults().get(0).getSeries().get(0).getValues().get(0).get(3).toString());
warehouseDataVo.setHumidity(queryResults.getResults().get(0).getSeries().get(0).getValues().get(0).get(4).toString());
}else{
warehouseDataVo.setTime("NA");
warehouseDataVo.setBatteryVoltage("NA");
......@@ -1311,12 +1306,12 @@ public class WarehouseController {
String time = UTCToCST(value.get(0).toString(),offset);
WarehouseTimeAndDataVo warehouseTimeAndDataVo = new WarehouseTimeAndDataVo();
warehouseTimeAndDataVo.setTime(time);
warehouseTimeAndDataVo.setValue(value.get(3)==null ? "" :df.format(value.get(3).toString()));
warehouseTimeAndDataVo.setValue(value.get(3)==null ? "" :value.get(3).toString());
historyDataList.add(warehouseTimeAndDataVo);
WarehouseTimeAndDataVo warehouseTimeAndDataVos = new WarehouseTimeAndDataVo();
warehouseTimeAndDataVos.setTime(time);
warehouseTimeAndDataVos.setValue(value.get(2)==null ? "" :df.format(value.get(2).toString()));
warehouseTimeAndDataVos.setValue(value.get(2)==null ? "" :value.get(2).toString());
historyDataLists.add(warehouseTimeAndDataVos);
}
WarehouseTDLDetailVo warehouseTDLDetailVo=new WarehouseTDLDetailVo();
......@@ -1342,7 +1337,7 @@ public class WarehouseController {
for(List<Object> value:values){
WarehouseTimeAndDataVo warehouseTimeAndDataVo = new WarehouseTimeAndDataVo();
warehouseTimeAndDataVo.setTime(UTCToCST(value.get(0).toString(),offset));
warehouseTimeAndDataVo.setValue(value.get(3)==null ? "" :df.format(value.get(3).toString()));
warehouseTimeAndDataVo.setValue(value.get(3)==null ? "" :value.get(3).toString());
historyDataList.add(warehouseTimeAndDataVo);
}
return historyDataList;
......@@ -1356,7 +1351,7 @@ public class WarehouseController {
for(List<Object> value:values){
WarehouseTimeAndDataVo warehouseTimeAndDataVo = new WarehouseTimeAndDataVo();
warehouseTimeAndDataVo.setTime(UTCToCST(value.get(0).toString(),offset));
warehouseTimeAndDataVo.setValue(value.get(4)==null ? "" :df.format(value.get(4).toString()));
warehouseTimeAndDataVo.setValue(value.get(4)==null ? "" :value.get(4).toString());
historyDataList.add(warehouseTimeAndDataVo);
}
return historyDataList;
......
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