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

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

@@ -451,7 +451,7 @@ public class AsyncTask {
return null;
}
@Async
//@Async
public void importExcelPoiDataForNew(File file, MallUserInfo user, String importKey,HttpServletRequest request, HttpServletResponse response) {
// 需要验证
String[] needFields = new String[]{"门店ID","富茂系统商户ID","富茂系统省份", "富茂系统城市", "富茂系统地址","富茂系统经度", "富茂系统纬度"};
@@ -479,7 +479,6 @@ public class AsyncTask {
}
}
@Async
public void importMerchantInit(File file, MallUserInfo user, String importKey,HttpServletRequest request, HttpServletResponse response) {
// 需要验证
String[] needFields = new String[]{"门店名称", "门店ID", "城市", "详细地址"};
@@ -550,9 +549,9 @@ public class AsyncTask {
}
}
stringRedisTemplate.expire(importKey,10, TimeUnit.SECONDS);
//exportExcel(request, response, successList,MerchantPoiTNew.class, "POI初始化商户.xlsx");
String url = uploadErrorExcel(successList, MerchantPoiTNew.class, "POI初始化商户.xlsx");
logger.info(">>>>>>> url :"+url);
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);


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