浏览代码

导出Excel翻译

lyhzzz 1 年之前
父节点
当前提交
74ff1fa6b0

+ 8 - 1
src/main/java/com/fdkankan/tk/controller/DataCountController.java

@@ -13,11 +13,14 @@ import com.fdkankan.tk.response.UserMsgVo;
 import com.fdkankan.tk.service.DataCountService;
 import com.fdkankan.tk.service.IExcelService;
 import com.fdkankan.tk.service.IRoomService;
+import com.fdkankan.tk.util.ExportUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.List;
 
 @RestController
 public class DataCountController extends BaseController {
@@ -92,11 +95,15 @@ public class DataCountController extends BaseController {
         ExcelWriter excelWriter = null;
         try {
             if(getLang().equals("zh")){
+                List<RoomListDataVo> records = page.getRecords();
                 excelWriter = EasyExcel.write(response.getOutputStream(),RoomListDataVo.class).build();
+                excelService.commonExport(request,response,"房间数据",  records,excelWriter);
             }else {
+                List<RoomListDataVo> records = page.getRecords();
+                List<RoomListDataEnVo> recordEns = ExportUtil.RoomListDataToEn(records);
                 excelWriter = EasyExcel.write(response.getOutputStream(),RoomListDataEnVo.class).build();
+                excelService.commonExport(request,response,"房间数据",  recordEns,excelWriter);
             }
-            excelService.commonExport(request,response,"房间数据",  page.getRecords(),excelWriter);
 
         }catch (Exception e){
             e.printStackTrace();

+ 1 - 1
src/main/java/com/fdkankan/tk/response/UserMsgEnVo.java

@@ -16,7 +16,7 @@ public class UserMsgEnVo {
     @ExcelIgnore
     private String wxUserId;
 
-    @ExcelProperty("E-mail")
+    @ExcelIgnore
     private String phoneNumber;
 
     @ExcelIgnore

+ 1 - 1
src/main/java/com/fdkankan/tk/response/UserMsgVo.java

@@ -16,7 +16,7 @@ public class UserMsgVo {
     @ExcelIgnore
     private String wxUserId;
 
-    @ExcelProperty("手机号码")
+    @ExcelIgnore
     private String phoneNumber;
 
     @ExcelIgnore

+ 2 - 2
src/main/java/com/fdkankan/tk/service/impl/ExcelServiceImpl.java

@@ -32,7 +32,7 @@ public class ExcelServiceImpl implements IExcelService {
         fileName = URLEncoder.encode(fileName, "UTF-8");
         response.setHeader("Access-Control-Expose-Headers", "Content-Disposition");
         response.setHeader("Content-disposition", "attachment;filename=" + fileName);
-        WriteSheet writeSheet = EasyExcel.writerSheet(name).build();
+        WriteSheet writeSheet = EasyExcel.writerSheet().build();
         excelWriter.write(result, writeSheet);
     }
 
@@ -45,7 +45,7 @@ public class ExcelServiceImpl implements IExcelService {
         ExcelWriter excelWriter = null;
         try {
             excelWriter = EasyExcel.write(response.getOutputStream(), clazz).build();
-            WriteSheet writeSheet = EasyExcel.writerSheet(name).build();
+            WriteSheet writeSheet = EasyExcel.writerSheet().build();
             excelWriter.write(result, writeSheet);
         }catch (Exception e){
             e.printStackTrace();

+ 21 - 0
src/main/java/com/fdkankan/tk/util/ExportUtil.java

@@ -0,0 +1,21 @@
+package com.fdkankan.tk.util;
+
+import com.fdkankan.tk.response.RoomListDataEnVo;
+import com.fdkankan.tk.response.RoomListDataVo;
+import org.springframework.beans.BeanUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ExportUtil {
+
+    public static List<RoomListDataEnVo> RoomListDataToEn(List<RoomListDataVo> records) {
+        List<RoomListDataEnVo> voList = new ArrayList<>();
+        for (RoomListDataVo record : records) {
+            RoomListDataEnVo vo = new RoomListDataEnVo();
+            BeanUtils.copyProperties(record,vo);
+            voList.add(vo);
+        }
+        return voList;
+    }
+}