Merge branches 'master' and 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud

epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcResiImportDynamicExcelListener.java

@@ -122,12 +122,18 @@ public class IcResiImportDynamicExcelListener extends AnalysisEventListener<Map<
         // 合并多级表头到一个list中，key为列序号
         Map<Integer, List<String>> headers = icResiUserImportService.mergeMultiLevelHeadLabels(headList);
 
+        icResiUserImportService.printLog("invokeHeadMap_1_" + isPrimary);
+
         // 清洗表头数据,通过items剔除，并且得到options
         abandonedHeaders = icResiUserImportService.removeAndGetOptionsFromHeaders(headers, formItemList);
 
+        icResiUserImportService.printLog("invokeHeadMap_2_" + isPrimary);
+
         // 交换表头信息，以label连起来的string作为key，列号的列表作为value
         HashMap<String, List<Integer>> combinedHeaders = icResiUserImportService.exchangeKeyAndValueOfHeaders(headers);
 
+        icResiUserImportService.printLog("invokeHeadMap_3_" + isPrimary);
+
         // 得到客户配置item数据。<"兴趣爱好:兴趣特长", item对象>
         Map<String, FormItemResult> customizedLabelCompbinedItemsMap = formItemList.stream().collect(
                 Collectors.toMap(formItem -> {
@@ -141,7 +147,11 @@ public class IcResiImportDynamicExcelListener extends AnalysisEventListener<Map<
                 }, formItem -> formItem)
         );
 
+        icResiUserImportService.printLog("invokeHeadMap_4_" + isPrimary);
+
         itemIdAndColumnWrapper = icResiUserImportService.convertExcelHeaders2DBColumnWrappers(customizedLabelCompbinedItemsMap, combinedHeaders);
+
+        icResiUserImportService.printLog("invokeHeadMap_5_" + isPrimary);
     }
 
     /**
@@ -172,6 +182,7 @@ public class IcResiImportDynamicExcelListener extends AnalysisEventListener<Map<
         if (dataList.size() != 0) {
             execPersistant();
         }
+        icResiUserImportService.printLog("invokeHeadMap_doAfterAllAnalysed_" + isPrimary);
     }
 
     /**

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

@@ -567,7 +567,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
         String loginUserClient = loginUserUtil.getLoginUserClient();
         String loginUserCustomerId = loginUserUtil.getLoginUserCustomerId();
 
-        log.info("persistIcResiBaseInfo:: userId:{}, app:{}, client:{}, customerId:{}", loginUserId, loginUserApp, loginUserClient, loginUserCustomerId);
+        log.info("persistIcResiExtraInfo:: userId:{}, app:{}, client:{}, customerId:{}", loginUserId, loginUserApp, loginUserClient, loginUserCustomerId);
 
         // 遍历每一行，将行内容转化为
         for (Map<Integer, String> row : dataRows) {
@@ -1838,4 +1838,13 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
                     importTaskId, processStatus, operatorId, resultDesc, resultDescPath);
         }
     }
+
+    public void printLog(String positionPrefix) {
+        String loginUserId = loginUserUtil.getLoginUserId();
+        String loginUserApp = loginUserUtil.getLoginUserApp();
+        String loginUserClient = loginUserUtil.getLoginUserClient();
+        String loginUserCustomerId = loginUserUtil.getLoginUserCustomerId();
+
+        log.info("{}:: userId:{}, app:{}, client:{}, customerId:{}", positionPrefix, loginUserId, loginUserApp, loginUserClient, loginUserCustomerId);
+    }
 }