1
0
Переглянути джерело

fix:文件导出了乱码

wangzaijun 7 місяців тому
батько
коміт
ed1cff367b

+ 9 - 3
service-manage/src/main/java/com/simuwang/manage/api/deletion/DeletionController.java

@@ -115,15 +115,21 @@ public class DeletionController {
         values.put(sheetName,dataList);
         HSSFWorkbook wb = ExcelUtil.getHSSFWorkbook(sheetName,head,values,null);
         try {
-            response.setContentType("application/x-xls");
-            response.setCharacterEncoding("gbk");
-            response.addHeader("Content-Disposition", "attachment;filename=" + EncodeUtil.encodeUTF8("缺失明细.xls"));
+            response.setContentType("application/vnd.ms-excel");
+            response.setCharacterEncoding("GBK");
+            response.addHeader("Content-Disposition", "attachment;filename=" + EncodeUtil.encodeUTF8("缺失明细.xlsx"));
             ServletOutputStream outputStream = response.getOutputStream();
             wb.write(outputStream);
             outputStream.flush();
             outputStream.close();
         } catch (Exception e) {
             logger.error(e.getMessage(),e);
+        } finally {
+            try {
+                wb.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
         }
     }
 }

+ 11 - 0
service-manage/src/main/java/com/simuwang/manage/dto/MenuTreeDTO.java

@@ -3,6 +3,7 @@ package com.simuwang.manage.dto;
 import cn.hutool.core.collection.ListUtil;
 import com.simuwang.base.pojo.dos.sys.SysMenuDO;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -67,6 +68,7 @@ public class MenuTreeDTO {
      * 启用状态,1-启用,0-禁用
      */
     private Integer status;
+    private Date createTime;
     /**
      * 子菜单
      */
@@ -99,6 +101,7 @@ public class MenuTreeDTO {
         this.visible = menuDO.getVisible();
         this.icon = menuDO.getIcon();
         this.status = menuDO.getStatus();
+        this.createTime = menuDO.getCreateTime();
     }
 
     public Integer getId() {
@@ -220,4 +223,12 @@ public class MenuTreeDTO {
     public void setStatus(Integer status) {
         this.status = status;
     }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
 }