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

src/main/java/com/example/tdl/common/WarehouseExcel.java

@@ -45,8 +45,8 @@ public class WarehouseExcel {
     }
 
     /*
-                * 导出数据
-                * */
+     * 导出数据
+     * */
     public HSSFWorkbook downloadExcel() throws Exception {
         // 创建工作簿对象
         HSSFWorkbook workbook = new HSSFWorkbook();
@@ -55,8 +55,8 @@ public class WarehouseExcel {
             HSSFCellStyle style = getStyle(workbook);
 
             /*
-            * 创建第一行(标题行)
-            * */
+             * 创建第一行(标题行)
+             * */
             HSSFRow row1 = sheet.createRow((short) 0);
             HSSFCell cell1 = null;
             //设置单元格格式
@@ -67,7 +67,13 @@ public class WarehouseExcel {
                 //设置列的格式
                 cell1.setCellStyle(rowStyle1);
                 //将标题添加到列中
-                cell1.setCellValue(new HSSFRichTextString(resultWarehouseNoAndTDLSNAndTimeVo.getWarehouseNo()+"仓库温湿度观测记录表-"+resultWarehouseNoAndTDLSNAndTimeVo.getTDLSN()));
+                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()));
+                }
             }
             //设置行高
             row1.setHeight((short) (30 * 20));
@@ -76,8 +82,8 @@ public class WarehouseExcel {
 
             int rowCount=1;
             /*
-            * 创建第二行
-            * */
+             * 创建第二行
+             * */
             HSSFRow row2 = sheet.createRow((short) rowCount);
             HSSFCell cell2 = null;
             HSSFCellStyle rowStyle2 = getStyle(workbook);
@@ -106,8 +112,8 @@ public class WarehouseExcel {
             row2.setHeight((short) (26 * 20));
 
             /*
-            * 创建第三行
-            * */
+             * 创建第三行
+             * */
             rowCount=rowCount+1;
             HSSFRow row3 = sheet.createRow((short) rowCount);
             HSSFCell cell3 = null;
@@ -239,8 +245,8 @@ public class WarehouseExcel {
     }
 
     /*
-   * 标题单元格样式
-   */
+     * 标题单元格样式
+     */
     public static HSSFCellStyle getTitleStyle(HSSFWorkbook workbook) {
         HSSFFont font = workbook.createFont();
         font.setFontHeightInPoints((short)18);

src/main/java/com/example/tdl/util/AliyunOSSClientUtil.java

@@ -390,7 +390,7 @@ public class AliyunOSSClientUtil {
                 putResult = ossClient.putObject(BACKET_NAME, FOLDER3+ fileName, is, metadata);
             } else if(fileName.contains("CHN")){
                 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);
             } else if(fileName.contains("报警日志数据")){
                 putResult = ossClient.putObject(BACKET_NAME, FOLDER7+ fileName, is, metadata);

src/main/resources/i18n/messages_en.properties

@@ -276,8 +276,8 @@ wrongThemeColors=The format of the theme color is incorrect
 comPictureDimension=Width*Height150*200
 warePictureDimension=Width*Height150*120
 truckPictureDimension=Width*Height90*60
-data=Transport data
-warehousedata=Warehouse temperature and humidity historic data
+data=TransportData
+warehousedata=WarehouseData
 temMaxLimit=The upper temperature limit is 85\u2103
 temMinLimit=The lower temperature limit is -25\u2103
 humidityMaxLimit=The upper humidity limit is 100%