Skip to content

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

修改仓库空值判断

parent 8be8021a
Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 31 deletions
src/main/java/com/example/tdl/web/WarehouseController.java
View file @ a63e2821
...@@ -85,11 +85,11 @@ public class WarehouseController { ...@@ -85,11 +85,11 @@ public class WarehouseController {
@Autowired @Autowired
private WarehouseAlarmLogService warehouseAlarmLogService; private WarehouseAlarmLogService warehouseAlarmLogService;
DecimalFormat df = new DecimalFormat("#.0");
@Value("${spring.influxdb.database}") @Value("${spring.influxdb.database}")
private String database ; private String database ;
//查询所有仓库信息 //查询所有仓库信息
@ApiOperation(value = "查询所有仓库信息",notes = "查询所有仓库信息,返回值说明：" + @ApiOperation(value = "查询所有仓库信息",notes = "查询所有仓库信息,返回值说明：" +
" warehouseName:仓库名," + " warehouseName:仓库名," +
...@@ -242,7 +242,6 @@ public class WarehouseController { ...@@ -242,7 +242,6 @@ public class WarehouseController {
continue; continue;
} }
String tdl = list.get(j).getTdl().replace(",","\' or \"tdl\" = \'"); String tdl = list.get(j).getTdl().replace(",","\' or \"tdl\" = \'");
// sql = "SELECT \"T\",\"h\" FROM \"tdl_policy\".\"WTD93LG_17110194\" where \"tdl\" = \'TDL-1706190193608\' or \"tdl\" = \'TDL-1701110082608\' GROUP BY \"tdl\" order by time desc limit 1";
sql = "SELECT \"T\",\"h\" FROM \"tdl_policy\".\""+list.get(j).getDevice()+"\" where \"tdl\" = \'"+ tdl +"\' and time >="+ list.get(j).getStartTime() +" GROUP BY \"tdl\" order by time desc limit 1"; sql = "SELECT \"T\",\"h\" FROM \"tdl_policy\".\""+list.get(j).getDevice()+"\" where \"tdl\" = \'"+ tdl +"\' and time >="+ list.get(j).getStartTime() +" GROUP BY \"tdl\" order by time desc limit 1";
} }
if(StringUtils.isEmpty(sql)){ if(StringUtils.isEmpty(sql)){
...@@ -368,9 +367,9 @@ public class WarehouseController { ...@@ -368,9 +367,9 @@ public class WarehouseController {
QueryResult queryResults = influxDBTemplate.query(new Query(sqls, database)); QueryResult queryResults = influxDBTemplate.query(new Query(sqls, database));
if (queryResults.getResults().get(0).getSeries() != null) { if (queryResults.getResults().get(0).getSeries() != null) {
tdlDeviceDetailVo.setTime(parseTime(queryResults.getResults().get(0).getSeries().get(0).getValues().get(0).get(0).toString())); tdlDeviceDetailVo.setTime(parseTime(queryResults.getResults().get(0).getSeries().get(0).getValues().get(0).get(0).toString()));
tdlDeviceDetailVo.setPressure(queryResults.getResults().get(0).getSeries().get(0).getValues().get(0).get(1).toString()); tdlDeviceDetailVo.setPressure(df.format(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.setTemperature(df.format(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()); tdlDeviceDetailVo.setHumidity(df.format(queryResults.getResults().get(0).getSeries().get(0).getValues().get(0).get(3).toString()));
}else{ }else{
tdlDeviceDetailVo.setTime("NA"); tdlDeviceDetailVo.setTime("NA");
tdlDeviceDetailVo.setPressure("NA"); tdlDeviceDetailVo.setPressure("NA");
...@@ -604,7 +603,7 @@ public class WarehouseController { ...@@ -604,7 +603,7 @@ public class WarehouseController {
map.put("regionName",addWarehouseVo.getRegionName()); map.put("regionName",addWarehouseVo.getRegionName());
map.put("property",addWarehouseVo.getProperty()); map.put("property",addWarehouseVo.getProperty());
map.put("type",addWarehouseVo.getType()); map.put("type",addWarehouseVo.getType());
map.put("hardwareLevel",addWarehouseVo.getHardwareLevel()); map.put("hardwareLevel",addWarehouseVo.getHardwareLevel() == null ?"" :addWarehouseVo.getHardwareLevel());
map.put("areaIndoor",addWarehouseVo.getAreaIndoor()); map.put("areaIndoor",addWarehouseVo.getAreaIndoor());
map.put("areaRack",addWarehouseVo.getAreaRack()); map.put("areaRack",addWarehouseVo.getAreaRack());
map.put("areaOutdoor",addWarehouseVo.getAreaOutdoor()); map.put("areaOutdoor",addWarehouseVo.getAreaOutdoor());
...@@ -719,7 +718,6 @@ public class WarehouseController { ...@@ -719,7 +718,6 @@ public class WarehouseController {
fb.setMessage(i18n.getMessage(request,"property")); fb.setMessage(i18n.getMessage(request,"property"));
return gson.toJson(fb); return gson.toJson(fb);
} }
if (!updateWarehouseVo.getProperty().equals(i18n.getMessage(request,"warehouseProperty1")) if (!updateWarehouseVo.getProperty().equals(i18n.getMessage(request,"warehouseProperty1"))
&&!updateWarehouseVo.getProperty().equals(i18n.getMessage(request,"warehouseProperty2")) &&!updateWarehouseVo.getProperty().equals(i18n.getMessage(request,"warehouseProperty2"))
&& !updateWarehouseVo.getProperty().equals(i18n.getMessage(request,"warehouseProperty3"))){ && !updateWarehouseVo.getProperty().equals(i18n.getMessage(request,"warehouseProperty3"))){
...@@ -738,19 +736,19 @@ public class WarehouseController { ...@@ -738,19 +736,19 @@ public class WarehouseController {
fb.setMessage(i18n.getMessage(request,"wrongWarehouseType")); fb.setMessage(i18n.getMessage(request,"wrongWarehouseType"));
return gson.toJson(fb); return gson.toJson(fb);
} }
if (StringUtils.isEmpty(updateWarehouseVo.getHardwareLevel())){ // if (StringUtils.isEmpty(updateWarehouseVo.getHardwareLevel())){
fb.setCode(0); // fb.setCode(0);
fb.setMessage(i18n.getMessage(request,"hardwareLevel")); // fb.setMessage(i18n.getMessage(request,"hardwareLevel"));
return gson.toJson(fb); // return gson.toJson(fb);
} // }
if (!updateWarehouseVo.getHardwareLevel().equals(i18n.getMessage(request,"warehouseHardwareLevel1")) // if (!updateWarehouseVo.getHardwareLevel().equals(i18n.getMessage(request,"warehouseHardwareLevel1"))
&&!updateWarehouseVo.getHardwareLevel().equals(i18n.getMessage(request,"warehouseHardwareLevel2")) // &&!updateWarehouseVo.getHardwareLevel().equals(i18n.getMessage(request,"warehouseHardwareLevel2"))
&& !updateWarehouseVo.getHardwareLevel().equals(i18n.getMessage(request,"warehouseHardwareLevel3")) // && !updateWarehouseVo.getHardwareLevel().equals(i18n.getMessage(request,"warehouseHardwareLevel3"))
&&!updateWarehouseVo.getHardwareLevel().equals(i18n.getMessage(request,"warehouseHardwareLevel4"))){ // &&!updateWarehouseVo.getHardwareLevel().equals(i18n.getMessage(request,"warehouseHardwareLevel4"))){
fb.setCode(0); // fb.setCode(0);
fb.setMessage(i18n.getMessage(request,"wrongHardwareLevel")); // fb.setMessage(i18n.getMessage(request,"wrongHardwareLevel"));
return gson.toJson(fb); // return gson.toJson(fb);
} // }
if (updateWarehouseVo.getAreaIndoor() == null){ if (updateWarehouseVo.getAreaIndoor() == null){
fb.setCode(0); fb.setCode(0);
fb.setMessage(i18n.getMessage(request,"areaIndoor")); fb.setMessage(i18n.getMessage(request,"areaIndoor"));
...@@ -798,7 +796,7 @@ public class WarehouseController { ...@@ -798,7 +796,7 @@ public class WarehouseController {
map.put("regionName",updateWarehouseVo.getRegionName()); map.put("regionName",updateWarehouseVo.getRegionName());
map.put("property",updateWarehouseVo.getProperty()); map.put("property",updateWarehouseVo.getProperty());
map.put("type",updateWarehouseVo.getType()); map.put("type",updateWarehouseVo.getType());
map.put("hardwareLevel",updateWarehouseVo.getHardwareLevel()); map.put("hardwareLevel",updateWarehouseVo.getHardwareLevel()== null ?"" :updateWarehouseVo.getHardwareLevel());
map.put("areaIndoor",updateWarehouseVo.getAreaIndoor()); map.put("areaIndoor",updateWarehouseVo.getAreaIndoor());
map.put("areaRack",updateWarehouseVo.getAreaRack()); map.put("areaRack",updateWarehouseVo.getAreaRack());
map.put("areaOutdoor",updateWarehouseVo.getAreaOutdoor()); map.put("areaOutdoor",updateWarehouseVo.getAreaOutdoor());
...@@ -1055,8 +1053,8 @@ public class WarehouseController { ...@@ -1055,8 +1053,8 @@ public class WarehouseController {
if (queryResults.getResults().get(0).getSeries() != null) { 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.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.setBatteryVoltage(queryResults.getResults().get(0).getSeries().get(0).getValues().get(0).get(2).toString());
warehouseDataVo.setTemperature(queryResults.getResults().get(0).getSeries().get(0).getValues().get(0).get(3).toString()); warehouseDataVo.setTemperature(df.format(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()); warehouseDataVo.setHumidity(df.format(queryResults.getResults().get(0).getSeries().get(0).getValues().get(0).get(4).toString()));
}else{ }else{
warehouseDataVo.setTime("NA"); warehouseDataVo.setTime("NA");
warehouseDataVo.setBatteryVoltage("NA"); warehouseDataVo.setBatteryVoltage("NA");
...@@ -1269,8 +1267,9 @@ public class WarehouseController { ...@@ -1269,8 +1267,9 @@ public class WarehouseController {
if (queryResults.getResults().get(0).getSeries() != null) { if (queryResults.getResults().get(0).getSeries() != null) {
warehouseDataVo.setTime(UTCToCST(queryResults.getResults().get(0).getSeries().get(0).getValues().get(0).get(0).toString(),downloadForWarehouseVo.getOffset()==null ? "+8" : downloadForWarehouseVo.getOffset())); 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.setBatteryVoltage(queryResults.getResults().get(0).getSeries().get(0).getValues().get(0).get(2).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()); 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()));
}else{ }else{
warehouseDataVo.setTime("NA"); warehouseDataVo.setTime("NA");
warehouseDataVo.setBatteryVoltage("NA"); warehouseDataVo.setBatteryVoltage("NA");
...@@ -1312,12 +1311,12 @@ public class WarehouseController { ...@@ -1312,12 +1311,12 @@ public class WarehouseController {
String time = UTCToCST(value.get(0).toString(),offset); String time = UTCToCST(value.get(0).toString(),offset);
WarehouseTimeAndDataVo warehouseTimeAndDataVo = new WarehouseTimeAndDataVo(); WarehouseTimeAndDataVo warehouseTimeAndDataVo = new WarehouseTimeAndDataVo();
warehouseTimeAndDataVo.setTime(time); warehouseTimeAndDataVo.setTime(time);
warehouseTimeAndDataVo.setValue(value.get(3)==null ? "" :value.get(3).toString()); warehouseTimeAndDataVo.setValue(value.get(3)==null ? "" :df.format(value.get(3).toString()));
historyDataList.add(warehouseTimeAndDataVo); historyDataList.add(warehouseTimeAndDataVo);
WarehouseTimeAndDataVo warehouseTimeAndDataVos = new WarehouseTimeAndDataVo(); WarehouseTimeAndDataVo warehouseTimeAndDataVos = new WarehouseTimeAndDataVo();
warehouseTimeAndDataVos.setTime(time); warehouseTimeAndDataVos.setTime(time);
warehouseTimeAndDataVos.setValue(value.get(2)==null ? "" :value.get(2).toString()); warehouseTimeAndDataVos.setValue(value.get(2)==null ? "" :df.format(value.get(2).toString()));
historyDataLists.add(warehouseTimeAndDataVos); historyDataLists.add(warehouseTimeAndDataVos);
} }
WarehouseTDLDetailVo warehouseTDLDetailVo=new WarehouseTDLDetailVo(); WarehouseTDLDetailVo warehouseTDLDetailVo=new WarehouseTDLDetailVo();
...@@ -1343,7 +1342,7 @@ public class WarehouseController { ...@@ -1343,7 +1342,7 @@ public class WarehouseController {
for(List<Object> value:values){ for(List<Object> value:values){
WarehouseTimeAndDataVo warehouseTimeAndDataVo = new WarehouseTimeAndDataVo(); WarehouseTimeAndDataVo warehouseTimeAndDataVo = new WarehouseTimeAndDataVo();
warehouseTimeAndDataVo.setTime(UTCToCST(value.get(0).toString(),offset)); warehouseTimeAndDataVo.setTime(UTCToCST(value.get(0).toString(),offset));
warehouseTimeAndDataVo.setValue(value.get(3)==null ? "" :value.get(3).toString()); warehouseTimeAndDataVo.setValue(value.get(3)==null ? "" :df.format(value.get(3).toString()));
historyDataList.add(warehouseTimeAndDataVo); historyDataList.add(warehouseTimeAndDataVo);
} }
return historyDataList; return historyDataList;
...@@ -1357,7 +1356,7 @@ public class WarehouseController { ...@@ -1357,7 +1356,7 @@ public class WarehouseController {
for(List<Object> value:values){ for(List<Object> value:values){
WarehouseTimeAndDataVo warehouseTimeAndDataVo = new WarehouseTimeAndDataVo(); WarehouseTimeAndDataVo warehouseTimeAndDataVo = new WarehouseTimeAndDataVo();
warehouseTimeAndDataVo.setTime(UTCToCST(value.get(0).toString(),offset)); warehouseTimeAndDataVo.setTime(UTCToCST(value.get(0).toString(),offset));
warehouseTimeAndDataVo.setValue(value.get(4)==null ? "" :value.get(4).toString()); warehouseTimeAndDataVo.setValue(value.get(4)==null ? "" :df.format(value.get(4).toString()));
historyDataList.add(warehouseTimeAndDataVo); historyDataList.add(warehouseTimeAndDataVo);
} }
return historyDataList; 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