Commit 9418b702 authored by zhuangzhuang's avatar zhuangzhuang

修复仓库文件下载失败的bug

parent 17e6b7ad
...@@ -379,7 +379,6 @@ public class DataController { ...@@ -379,7 +379,6 @@ public class DataController {
for (int i = 0; i < devList.size(); i++) { for (int i = 0; i < devList.size(); i++) {
AltitudeResultDataVo historyDataVo = new AltitudeResultDataVo(); AltitudeResultDataVo historyDataVo = new AltitudeResultDataVo();
String TDLSN = devList.get(i).replace("TDL-", "").trim(); String TDLSN = devList.get(i).replace("TDL-", "").trim();
String sqls = ""; String sqls = "";
if (resultCircuitVo.getEndTime() != null && resultCircuitVo.getEndTime() != 0) { if (resultCircuitVo.getEndTime() != null && resultCircuitVo.getEndTime() != 0) {
sqls = "SELECT count(\"p\") FROM \"tdl_policy\".\"" + device + "\" WHERE \"event\" = 'Regular measurement' and \"tdl\"='" + devList.get(i) + "' and time>=" + startTime + " and time <=" + resultCircuitVo.getEndTime() * 1000000l; sqls = "SELECT count(\"p\") FROM \"tdl_policy\".\"" + device + "\" WHERE \"event\" = 'Regular measurement' and \"tdl\"='" + devList.get(i) + "' and time>=" + startTime + " and time <=" + resultCircuitVo.getEndTime() * 1000000l;
...@@ -511,6 +510,10 @@ public class DataController { ...@@ -511,6 +510,10 @@ public class DataController {
sqls = "SELECT \"tdl\",\"p\",\"T\",\"h\",\"a0\",\"a1\",\"ta\",\"bdlng\",\"bdlat\" FROM \"tdl_policy\".\""+device+"\" WHERE time >=" +startTime +" and time <=" +System.currentTimeMillis() * 1000000l+" ORDER BY time "; sqls = "SELECT \"tdl\",\"p\",\"T\",\"h\",\"a0\",\"a1\",\"ta\",\"bdlng\",\"bdlat\" FROM \"tdl_policy\".\""+device+"\" WHERE time >=" +startTime +" and time <=" +System.currentTimeMillis() * 1000000l+" ORDER BY time ";
} }
QueryResult queryResult = influxDBTemplate.query(new Query(sqls, database)); QueryResult queryResult = influxDBTemplate.query(new Query(sqls, database));
File myPath = new File( "./export/" );
if ( !myPath.exists()){//若此目录不存在,则创建之
myPath.mkdir();
}
File[] srcFiles = new File[devList.size()]; File[] srcFiles = new File[devList.size()];
File zipFile = new File("./export/" +transportationNo.getTransportationNo()+i18n.getMessage(request,"data")+".zip"); File zipFile = new File("./export/" +transportationNo.getTransportationNo()+i18n.getMessage(request,"data")+".zip");
if (queryResult.getResults().get(0).getSeries().get(0) != null) { if (queryResult.getResults().get(0).getSeries().get(0) != null) {
...@@ -649,6 +652,10 @@ public class DataController { ...@@ -649,6 +652,10 @@ public class DataController {
} }
QueryResult queryResult = influxDBTemplate.query(new Query(sqls, database)); QueryResult queryResult = influxDBTemplate.query(new Query(sqls, database));
File[] srcFiles = new File[devList.size()]; File[] srcFiles = new File[devList.size()];
File myPath = new File( "./export/" );
if ( !myPath.exists()){//若此目录不存在,则创建之
myPath.mkdir();
}
File zipFile = new File("./export/" +transportationNo.getTransportationNo()+i18n.getMessage(request,"data")+".zip"); File zipFile = new File("./export/" +transportationNo.getTransportationNo()+i18n.getMessage(request,"data")+".zip");
if (queryResult.getResults().get(0).getSeries().get(0) != null) { if (queryResult.getResults().get(0).getSeries().get(0) != null) {
for(int i = 0;i<devList.size();i++){ for(int i = 0;i<devList.size();i++){
......
...@@ -122,6 +122,10 @@ public class DownloadController { ...@@ -122,6 +122,10 @@ public class DownloadController {
continue; continue;
} }
String fileName =downloadForWarehouseVo.getWarehouseNo() + i18n.getMessage(request, "warehousedata")+"-"+resultWarehouseNoAndTDLSNAndTimeVo.getTDLSN(); String fileName =downloadForWarehouseVo.getWarehouseNo() + i18n.getMessage(request, "warehousedata")+"-"+resultWarehouseNoAndTDLSNAndTimeVo.getTDLSN();
File myPath = new File( "./export/" );
if ( !myPath.exists()){//若此目录不存在,则创建之
myPath.mkdir();
}
srcFiles[a] = new File("./export/"+fileName+".xls") ; srcFiles[a] = new File("./export/"+fileName+".xls") ;
List<DownloadWarehouseVo> downloadWarehouseVos = getWarehouseData(queryResults,downloadForWarehouseVo.getOffset()); List<DownloadWarehouseVo> downloadWarehouseVos = getWarehouseData(queryResults,downloadForWarehouseVo.getOffset());
for (int i = 0; i < downloadWarehouseVos.size(); i++) { for (int i = 0; i < downloadWarehouseVos.size(); i++) {
...@@ -150,7 +154,7 @@ public class DownloadController { ...@@ -150,7 +154,7 @@ public class DownloadController {
e.printStackTrace(); e.printStackTrace();
logger.info(e.toString()); logger.info(e.toString());
fb.setCode(0); fb.setCode(0);
fb.setMessage(i18n.getMessage(request,"fileUpload")); fb.setMessage(i18n.getMessage(request,"downloadfail"));
return gson.toJson(fb); return gson.toJson(fb);
} }
} }
......
...@@ -379,4 +379,6 @@ SensorAssignment=Sensor Assignment ...@@ -379,4 +379,6 @@ SensorAssignment=Sensor Assignment
AlarmAnalysis=Alarm Analysis AlarmAnalysis=Alarm Analysis
AlarmAnalysisDetail=Alarm Analysis Detail AlarmAnalysisDetail=Alarm Analysis Detail
AlarmAnalysisQuery=Alarm Analysis Query AlarmAnalysisQuery=Alarm Analysis Query
usedgateway=The gateway has been used. usedgateway=The gateway has been used.
\ No newline at end of file fileUpload=File upload failed
downloadfail=File download failed
\ No newline at end of file
...@@ -220,3 +220,5 @@ RegionManagement=Region Management ...@@ -220,3 +220,5 @@ RegionManagement=Region Management
VehicleManagement=Vehicle Management VehicleManagement=Vehicle Management
GatewayManagement=Gateway Management GatewayManagement=Gateway Management
SensorManagement=Sensor Management SensorManagement=Sensor Management
fileUpload=\u30D5\u30A1\u30A4\u30EB\u306E\u30A2\u30C3\u30D7\u30ED\u30FC\u30C9\u304C\u5931\u6557\u3059\u308B
downloadfail=\u30D5\u30A1\u30A4\u30EB\u306E\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9\u5931\u6557
...@@ -275,6 +275,7 @@ downloadEndTime=\u67E5\u8BE2\u7ED3\u675F\u65F6\u95F4\u4E0D\u80FD\u4E3A\u7A7A ...@@ -275,6 +275,7 @@ downloadEndTime=\u67E5\u8BE2\u7ED3\u675F\u65F6\u95F4\u4E0D\u80FD\u4E3A\u7A7A
downLoad=\u5F00\u59CB\u65F6\u95F4\u4E0D\u80FD\u5927\u4E8E\u7ED3\u675F\u65F6\u95F4 downLoad=\u5F00\u59CB\u65F6\u95F4\u4E0D\u80FD\u5927\u4E8E\u7ED3\u675F\u65F6\u95F4
noData = \u8FD9\u6BB5\u65F6\u95F4\u6CA1\u6709\u6570\u636E noData = \u8FD9\u6BB5\u65F6\u95F4\u6CA1\u6709\u6570\u636E
fileUpload = \u6587\u4EF6\u4E0A\u4F20\u5931\u8D25 fileUpload = \u6587\u4EF6\u4E0A\u4F20\u5931\u8D25
downloadfail = \u6587\u4EF6\u4E0B\u8F7D\u5931\u8D25
#\u4F20\u611F\u5668 #\u4F20\u611F\u5668
TDL =\u4F20\u611F\u5668\u7F16\u53F7\u4E0D\u80FD\u4E3A\u7A7A TDL =\u4F20\u611F\u5668\u7F16\u53F7\u4E0D\u80FD\u4E3A\u7A7A
#\u56FE\u7247 #\u56FE\u7247
......
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