Commit 0ae36a61 authored by zhuangzhuang's avatar zhuangzhuang

注释仓库等级判断

parent 9f5dd064
...@@ -530,19 +530,19 @@ public class WarehouseController { ...@@ -530,19 +530,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(addWarehouseVo.getHardwareLevel())){ // if (StringUtils.isEmpty(addWarehouseVo.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 (!addWarehouseVo.getHardwareLevel().equals(i18n.getMessage(request,"warehouseHardwareLevel1")) // if (!addWarehouseVo.getHardwareLevel().equals(i18n.getMessage(request,"warehouseHardwareLevel1"))
&&!addWarehouseVo.getHardwareLevel().equals(i18n.getMessage(request,"warehouseHardwareLevel2")) // &&!addWarehouseVo.getHardwareLevel().equals(i18n.getMessage(request,"warehouseHardwareLevel2"))
&& !addWarehouseVo.getHardwareLevel().equals(i18n.getMessage(request,"warehouseHardwareLevel3")) // && !addWarehouseVo.getHardwareLevel().equals(i18n.getMessage(request,"warehouseHardwareLevel3"))
&&!addWarehouseVo.getHardwareLevel().equals(i18n.getMessage(request,"warehouseHardwareLevel4"))){ // &&!addWarehouseVo.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 (addWarehouseVo.getAreaIndoor()==null){ if (addWarehouseVo.getAreaIndoor()==null){
fb.setCode(0); fb.setCode(0);
fb.setMessage(i18n.getMessage(request,"areaIndoor")); fb.setMessage(i18n.getMessage(request,"areaIndoor"));
...@@ -1151,7 +1151,6 @@ public class WarehouseController { ...@@ -1151,7 +1151,6 @@ public class WarehouseController {
List<TdlDataVo.HistoryDataVo> historyDataList = new ArrayList<>(); List<TdlDataVo.HistoryDataVo> historyDataList = new ArrayList<>();
//获取TDL数据 //获取TDL数据
String sql = "SELECT \"T\",\"h\" FROM \"tdl_policy\".\""+deviceMessageVo.getType()+"_"+deviceMessageVo.getSN()+"\" where \"tdl\" = \'TDL-"+searchTdlVo.getTDLSN()+"\' order by time "; String sql = "SELECT \"T\",\"h\" FROM \"tdl_policy\".\""+deviceMessageVo.getType()+"_"+deviceMessageVo.getSN()+"\" where \"tdl\" = \'TDL-"+searchTdlVo.getTDLSN()+"\' order by time ";
// String sql = "SELECT \"T\",\"h\" FROM \"tdl_policy\".\"WTD93LG_17110194\" where \"tdl\" = \'TDL-1706190193608\' order by time ";
QueryResult queryResult = influxDBTemplate.query(new Query(sql,database)); QueryResult queryResult = influxDBTemplate.query(new Query(sql,database));
if(queryResult.getResults().get(0).getSeries()== null){ if(queryResult.getResults().get(0).getSeries()== null){
tdlDataVo.setGraphicDataList(graphicDataList); tdlDataVo.setGraphicDataList(graphicDataList);
......
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