lin 2 лет назад
Родитель
Сommit
09c5eb6b65
2 измененных файлов: 4 добавлений и 3 удалений
  1. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/basic/TtMerchantPoiController.java
  2. +3
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/mem/AsyncTask.java

+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/basic/TtMerchantPoiController.java Просмотреть файл

@@ -304,7 +304,7 @@ public class TtMerchantPoiController extends DouyinBaseController {
final MallUserInfo user = getUser(); final MallUserInfo user = getUser();
String userId = "" + user.getId(); String userId = "" + user.getId();
String importKey = Constant.importPoiMerchantPrev + userId; String importKey = Constant.importPoiMerchantPrev + userId;
File lFile = handlerImportFile(mFile,null,"poiMerchantInit");
File lFile = handlerImportFile(mFile,importKey,"poiMerchantInit");
asyncTask.importMerchantInit(lFile, user, importKey,request,response); asyncTask.importMerchantInit(lFile, user, importKey,request,response);
} }
} catch (Exception e) { } catch (Exception e) {


+ 3
- 2
mallinkAdmin/src/main/java/com/iformall/controller/mem/AsyncTask.java Просмотреть файл

@@ -414,7 +414,6 @@ public class AsyncTask {
response.addHeader("Pargam", "no-cache"); response.addHeader("Pargam", "no-cache");
response.addHeader("Cache-Control", "no-cache"); response.addHeader("Cache-Control", "no-cache");
OutputStream out = response.getOutputStream(); OutputStream out = response.getOutputStream();
logger.info(">>>>>>>>> rrrrrrrrrrrrr:"+response.getStatus());
workBook.write(out); workBook.write(out);
out.flush(); out.flush();
out.close(); out.close();
@@ -551,7 +550,9 @@ public class AsyncTask {
} }
} }
stringRedisTemplate.expire(importKey,10, TimeUnit.SECONDS); 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) { } catch (Exception e) {
logger.error("导入模板失败:"+e.getMessage(),e); logger.error("导入模板失败:"+e.getMessage(),e);
stringRedisTemplate.expire(importKey,10, TimeUnit.SECONDS); stringRedisTemplate.expire(importKey,10, TimeUnit.SECONDS);


Загрузка…
Отмена
Сохранить