From b34b4f6fd69a4e1875d897c0b1044dc2eb6c62dc Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Tue, 16 Nov 2021 17:47:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8C=89=E7=85=A7=E6=9E=9A=E4=B8=BE=20?=
 =?UTF-8?q?=E5=9B=BA=E5=AE=9A=E5=86=99=E5=85=A5=20=E9=98=B2=E6=AD=A2=20?=
 =?UTF-8?q?=E9=A1=BA=E5=BA=8F=E8=B0=83=E6=95=B4=E5=90=8E=20=E5=86=99?=
 =?UTF-8?q?=E5=85=A5=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/controller/IcResiUserController.java  | 17 +++++++++++------
 .../service/impl/IcResiUserServiceImpl.java     |  4 ++--
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
index 6d109d837e..2c5336d0f7 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
@@ -42,6 +42,7 @@ import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.IcResiUserDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
+import com.epmet.enums.IcResiUserTableEnums;
 import com.epmet.feign.OperCustomizeOpenFeignClient;
 import com.epmet.service.IcResiUserImportService;
 import com.epmet.service.IcResiUserService;
@@ -230,8 +231,8 @@ public class IcResiUserController {
     }
 
     @RequestMapping(value = "/exportExcel")
-    public void exportExcelByEasyExcel(@RequestHeader String customerId,/*@LoginUser*/ TokenDto tokenDto, @RequestBody IcResiUserPageFormDTO pageFormDTO, HttpServletResponse response) throws Exception {
-        tokenDto.setUserId("9e37adcce6472152e6508a19d3683e02");
+    public void exportExcelByEasyExcel(@RequestHeader String customerId,@LoginUser TokenDto tokenDto, @RequestBody IcResiUserPageFormDTO pageFormDTO, HttpServletResponse response) throws Exception {
+        //tokenDto.setUserId("9e37adcce6472152e6508a19d3683e02");
         CustomerStaffInfoCacheResult staffInfoCacheResult = CustomerStaffRedis.getStaffInfo(customerId, tokenDto.getUserId());
         String staffOrgPath = null;
         if (StringUtils.isNotBlank(staffInfoCacheResult.getAgencyPIds()) && !NumConstant.ZERO_STR.equals(staffInfoCacheResult.getAgencyPIds())) {
@@ -253,7 +254,8 @@ public class IcResiUserController {
         String fileName = "居民基本信息.xlsx";
         ExcelWriter excelWriter = EasyExcel.write(getOutputStream(fileName, response)).withTemplate(inputStream).build();
         FillConfig fillConfig = FillConfig.builder().direction(WriteDirectionEnum.VERTICAL).build();
-        WriteSheet fistSheet = EasyExcel.writerSheet(NumConstant.ZERO).build();
+        IcResiUserTableEnums tableEnums = IcResiUserTableEnums.getObjectByTableName(BASE_TABLE_NAME);
+        WriteSheet fistSheet = EasyExcel.writerSheet(tableEnums.getSheetNo()).build();
 
         pageFormDTO.setPageSize(4);
         pageFormDTO.setPageNo(NumConstant.ONE);
@@ -300,15 +302,18 @@ public class IcResiUserController {
                     stopSearchSet.add(tableName);
                 }
                 System.out.println("===resiChildMap===" + tableName + "  " + JSON.toJSONString(resiChildMap.values()));
-
+                tableEnums = IcResiUserTableEnums.getObjectByTableName(tableName);
+                if (tableEnums == null){
+                    continue;
+                }
                 //构建新的sheet
                 WriteSheet childWriteSheet = childTableWriteSheetMap.get(tableName);
                 if (childWriteSheet == null) {
-                    childWriteSheet = EasyExcel.writerSheet(n.incrementAndGet()).build();
+                    childWriteSheet = EasyExcel.writerSheet(tableEnums.getSheetNo()).build();
                 }
                 childTableWriteSheetMap.put(tableName, childWriteSheet);
                 //写入数据
-                excelWriter.fill(new FillWrapper("t" + (n.get() + NumConstant.ONE), resiChildMap.values()), childWriteSheet);
+                excelWriter.fill(new FillWrapper("t" + (tableEnums.getSheetNo() + NumConstant.ONE), resiChildMap.values()), childWriteSheet);
                 pageFormDTO.setPageNo(pageFormDTO.getPageNo() + NumConstant.ONE);
                 //重置数据
                 resiChildMap.clear();
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
index febefe4b52..3e7ad6bc17 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
@@ -713,7 +713,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
 
             }
             if (!"ic_resi_user".equals(baseTableName)) {
-                Map<String,Object> o = (Map<String, Object>) redisUtils.get(RedisKeys.getExportResiBaseInfoKey(resiId));
+                Map<String,Object> o = redisUtils.hGetAll(RedisKeys.getExportResiBaseInfoKey(resiId));
                 if (o != null){
                     map.putAll(o);
                 }
@@ -742,7 +742,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                 }
             }
             //把人放入缓存
-            redisUtils.set(RedisKeys.getExportResiBaseInfoKey(resiId),map,RedisUtils.MINUTE_THIRTY_EXPIRE);
+            redisUtils.hMSet(RedisKeys.getExportResiBaseInfoKey(resiId),map,RedisUtils.MINUTE_THIRTY_EXPIRE);
         });
         return result;
     }