Commit c955318d authored by zhuangzhuang's avatar zhuangzhuang

修复firefox英文状态下的下载失败的问题

parent 9418b702
...@@ -67,8 +67,14 @@ public class WarehouseExcel { ...@@ -67,8 +67,14 @@ public class WarehouseExcel {
//设置列的格式 //设置列的格式
cell1.setCellStyle(rowStyle1); cell1.setCellStyle(rowStyle1);
//将标题添加到列中 //将标题添加到列中
if(request.getHeader("AccountLanguage").equals("en")){
cell1.setCellValue(new HSSFRichTextString(resultWarehouseNoAndTDLSNAndTimeVo.getWarehouseNo()+"Warehouse temperature and humidity historic data -"+resultWarehouseNoAndTDLSNAndTimeVo.getTDLSN()));
}else if (request.getHeader("AccountLanguage ").equals("jp")){
cell1.setCellValue(new HSSFRichTextString(resultWarehouseNoAndTDLSNAndTimeVo.getWarehouseNo()+"倉庫の温度および湿度の観測記録-"+resultWarehouseNoAndTDLSNAndTimeVo.getTDLSN()));
}else{
cell1.setCellValue(new HSSFRichTextString(resultWarehouseNoAndTDLSNAndTimeVo.getWarehouseNo()+"仓库温湿度观测记录表-"+resultWarehouseNoAndTDLSNAndTimeVo.getTDLSN())); cell1.setCellValue(new HSSFRichTextString(resultWarehouseNoAndTDLSNAndTimeVo.getWarehouseNo()+"仓库温湿度观测记录表-"+resultWarehouseNoAndTDLSNAndTimeVo.getTDLSN()));
} }
}
//设置行高 //设置行高
row1.setHeight((short) (30 * 20)); row1.setHeight((short) (30 * 20));
//合并单元格(参数1:起始行,参数2:截至行,参数3:起始列,参数4:截至列) //合并单元格(参数1:起始行,参数2:截至行,参数3:起始列,参数4:截至列)
......
...@@ -390,7 +390,7 @@ public class AliyunOSSClientUtil { ...@@ -390,7 +390,7 @@ public class AliyunOSSClientUtil {
putResult = ossClient.putObject(BACKET_NAME, FOLDER3+ fileName, is, metadata); putResult = ossClient.putObject(BACKET_NAME, FOLDER3+ fileName, is, metadata);
} else if(fileName.contains("CHN")){ } else if(fileName.contains("CHN")){
putResult = ossClient.putObject(BACKET_NAME, FOLDER6+ fileName, is, metadata); putResult = ossClient.putObject(BACKET_NAME, FOLDER6+ fileName, is, metadata);
} else if(fileName.contains("仓库温湿度观测记录") || fileName.contains("Warehouse temperature and humidity historic data")|| fileName.contains("倉庫の温度および湿度の観測記録")){ } else if(fileName.contains("仓库温湿度观测记录") || fileName.contains("WarehouseData")|| fileName.contains("倉庫の温度および湿度の観測記録")){
putResult = ossClient.putObject(BACKET_NAME, FOLDER5+ fileName, is, metadata); putResult = ossClient.putObject(BACKET_NAME, FOLDER5+ fileName, is, metadata);
} else if(fileName.contains("报警日志数据")){ } else if(fileName.contains("报警日志数据")){
putResult = ossClient.putObject(BACKET_NAME, FOLDER7+ fileName, is, metadata); putResult = ossClient.putObject(BACKET_NAME, FOLDER7+ fileName, is, metadata);
......
...@@ -276,8 +276,8 @@ wrongThemeColors=The format of the theme color is incorrect ...@@ -276,8 +276,8 @@ wrongThemeColors=The format of the theme color is incorrect
comPictureDimension=Width*Height150*200 comPictureDimension=Width*Height150*200
warePictureDimension=Width*Height150*120 warePictureDimension=Width*Height150*120
truckPictureDimension=Width*Height90*60 truckPictureDimension=Width*Height90*60
data=Transport data data=TransportData
warehousedata=Warehouse temperature and humidity historic data warehousedata=WarehouseData
temMaxLimit=The upper temperature limit is 85\u2103 temMaxLimit=The upper temperature limit is 85\u2103
temMinLimit=The lower temperature limit is -25\u2103 temMinLimit=The lower temperature limit is -25\u2103
humidityMaxLimit=The upper humidity limit is 100% humidityMaxLimit=The upper humidity limit is 100%
......
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