Merge branch 'dev'

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

@@ -88,6 +88,7 @@ import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutorService;
 import java.util.stream.Collectors;
 
 
@@ -130,6 +131,8 @@ public class IcResiUserController implements ResultDataResolver {
     private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient;
     @Autowired
     private LoginUserUtil loginUserUtil;
+    @Autowired
+    private ExecutorService executorService;
 
     /**
      * 模板枚举
@@ -466,7 +469,8 @@ public class IcResiUserController implements ResultDataResolver {
         HashMap<String, String> headers = getHeadersFromRequest(request);
 
         // 三.异步执行导入
-        CompletableFuture.runAsync(() -> {
+
+        executorService.execute(() -> {
 
             try {
                 // 睡眠2秒钟，等待主线程先结束，主线程会清空request对象的headers，等他执行了清空之后，我们这边再手动setHeader进去

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java

@@ -220,8 +220,9 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
         String loginUserId = loginUserUtil.getLoginUserId();
         String loginUserApp = loginUserUtil.getLoginUserApp();
         String loginUserClient = loginUserUtil.getLoginUserClient();
+        String loginUserCustomerId = loginUserUtil.getLoginUserCustomerId();
 
-        log.info("userId:{}, app:{}, client:{}", loginUserId, loginUserApp, loginUserClient);
+        log.info("userId:{}, app:{}, client:{}, customerId:{}", loginUserId, loginUserApp, loginUserClient, loginUserCustomerId);
 
         //        LoginUserDetailsFormDTO userForm = new LoginUserDetailsFormDTO();
 //        userForm.setApp(loginUserApp);
@@ -420,6 +421,13 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
                                        String currUserAgencyId, Map<Integer, String> checkBoxOptionColumnIdxAndLabel,
                                        String currUserAgencyPids, String currentUserId, String tableName) {
 
+        String loginUserId = loginUserUtil.getLoginUserId();
+        String loginUserApp = loginUserUtil.getLoginUserApp();
+        String loginUserClient = loginUserUtil.getLoginUserClient();
+        String loginUserCustomerId = loginUserUtil.getLoginUserCustomerId();
+
+        log.info("persistIcResiBaseInfo:: userId:{}, app:{}, client:{}, customerId:{}", loginUserId, loginUserApp, loginUserClient, loginUserCustomerId);
+
         // 遍历每一行，将行内容转化为
         for (Map<Integer, String> row : dataRows) {
 
@@ -475,7 +483,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
 
                 columnAndValues.put("AGENCY_ID", currUserAgencyId);
                 columnAndValues.put("PIDS", currUserAgencyPids);
-                columnAndValues.put("CUSTOMER_ID", loginUserUtil.getLoginUserCustomerId());
+                columnAndValues.put("CUSTOMER_ID", loginUserCustomerId);
 
                 columnAndValues.put("UPDATED_BY", currentUserId);