From 09c5eb6b65dcdef6f55be03b622fb8af022c3805 Mon Sep 17 00:00:00 2001 From: lin <642018748@qq.com> Date: Fri, 14 Jul 2023 20:49:01 +0800 Subject: [PATCH] fix bug --- .../iformall/controller/basic/TtMerchantPoiController.java | 2 +- .../src/main/java/com/iformall/controller/mem/AsyncTask.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/TtMerchantPoiController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/TtMerchantPoiController.java index 5ef040cdb..0f0efebda 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/TtMerchantPoiController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/TtMerchantPoiController.java @@ -304,7 +304,7 @@ public class TtMerchantPoiController extends DouyinBaseController { final MallUserInfo user = getUser(); String userId = "" + user.getId(); String importKey = Constant.importPoiMerchantPrev + userId; - File lFile = handlerImportFile(mFile,null,"poiMerchantInit"); + File lFile = handlerImportFile(mFile,importKey,"poiMerchantInit"); asyncTask.importMerchantInit(lFile, user, importKey,request,response); } } catch (Exception e) { diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/AsyncTask.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/AsyncTask.java index 5ca9a4a42..76f061fc2 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/AsyncTask.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/AsyncTask.java @@ -414,7 +414,6 @@ public class AsyncTask { response.addHeader("Pargam", "no-cache"); response.addHeader("Cache-Control", "no-cache"); OutputStream out = response.getOutputStream(); - logger.info(">>>>>>>>> rrrrrrrrrrrrr:"+response.getStatus()); workBook.write(out); out.flush(); out.close(); @@ -551,7 +550,9 @@ public class AsyncTask { } } stringRedisTemplate.expire(importKey,10, TimeUnit.SECONDS); - exportExcel(request, response, successList,MerchantPoiTNew.class, "POI初始化商户.xlsx"); + //exportExcel(request, response, successList,MerchantPoiTNew.class, "POI初始化商户.xlsx"); + String url = uploadErrorExcel(successList, MerchantPoiTNew.class, "POI初始化商户.xlsx"); + logger.info(">>>>>>> url :"+url); } catch (Exception e) { logger.error("导入模板失败:"+e.getMessage(),e); stringRedisTemplate.expire(importKey,10, TimeUnit.SECONDS);