兼容老模板

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java

@@ -21,6 +21,7 @@ import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.ExcelWriter;
 import com.alibaba.excel.write.metadata.WriteSheet;
 import com.alibaba.excel.write.metadata.fill.FillWrapper;
+import com.alibaba.fastjson.JSON;
 import com.epmet.commons.rocketmq.messages.IcResiUserAddMQMsg;
 import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.annotation.MaskResponse;
@@ -310,9 +311,9 @@ public class IcResiUserController implements ResultDataResolver {
      */
     @NoRepeatSubmit
     @RequestMapping(value = "/exportExcel")
-    public void exportExcelByEasyExcel(@RequestHeader String customerId,@LoginUser TokenDto tokenDto, @RequestBody IcResiUserPageFormDTO pageFormDTO, HttpServletResponse response) throws Exception {
+    public void exportExcelByEasyExcel(@LoginUser TokenDto tokenDto, @RequestBody IcResiUserPageFormDTO pageFormDTO, HttpServletResponse response) throws Exception {
-        //tokenDto.setUserId("9e37adcce6472152e6508a19d3683e02");
         long startM = System.currentTimeMillis();
+        String customerId = tokenDto.getCustomerId();
         CustomerStaffInfoCacheResult staffInfoCacheResult = CustomerStaffRedis.getStaffInfo(customerId, tokenDto.getUserId());
         String staffOrgPath = null;
         if (StringUtils.isNotBlank(staffInfoCacheResult.getAgencyPIds()) && !NumConstant.ZERO_STR.equals(staffInfoCacheResult.getAgencyPIds())) {
@@ -413,10 +414,15 @@ public class IcResiUserController implements ResultDataResolver {
      */
     @NoRepeatSubmit
     @RequestMapping(value = "/exportExcelCustom")
-    public void exportExcelCustom(@LoginUser TokenDto tokenDto, @RequestBody ExportResiUserFormDTO pageFormDTO, HttpServletResponse response) {
+    public void exportExcelCustom(@LoginUser TokenDto tokenDto, @RequestBody ExportResiUserFormDTO pageFormDTO, HttpServletResponse response) throws Exception {
         //获取导出配置
-        icResiUserExportService.exportIcResiUser(tokenDto,pageFormDTO,response);
+        String aDefault = tokenDto.getCustomerId().concat(StrConstant.UNDER_LINE).concat("default");
-
+        if (pageFormDTO.getTemplateId().equals(aDefault)){
+            log.info("通过原来的模板下载,tokenDto:{}", JSON.toJSONString(tokenDto));
+            this.exportExcelByEasyExcel(tokenDto,pageFormDTO.getSearchForm(),response);
+        }else{
+            icResiUserExportService.exportIcResiUser(tokenDto,pageFormDTO,response);
+        }
     }
     /**
      * desc:根据客户id 先从oss下载模版,如果有没有则使用系统默认模板 如果不存在则返回null