调试

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/EpmetBaseRequestInterceptor.java

@@ -3,6 +3,8 @@ package com.epmet.commons.tools.feign;
 import com.epmet.commons.tools.constant.ThreadLocalConstant;
 import feign.RequestInterceptor;
 import feign.RequestTemplate;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.web.context.request.RequestAttributes;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
@@ -15,12 +17,16 @@ import java.util.Map;
 
 public class EpmetBaseRequestInterceptor implements RequestInterceptor {
 
+    private static final Logger log = LoggerFactory.getLogger(EpmetBaseRequestInterceptor.class);
+
     @Override
     public void apply(RequestTemplate template) {
         // 自定义追加的request header，可被子线程继承拷贝
         Map<String, String> inheritableAdditionalHeaders = ThreadLocalConstant.inheritableAdditionalHeaders.get();
         Map<String, String> requestHeaders = getHeadersFromRequest();
 
+        log.info("EpmetBaseRequestInterceptor#apply#inheritableAdditionalHeaders:{}", inheritableAdditionalHeaders.toString());
+
         if (requestHeaders != null && requestHeaders.size() > 0) {
             for (Map.Entry<String, String> kv : requestHeaders.entrySet()) {
                 template.header(kv.getKey(), kv.getValue());

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/ResultDataResolver.java

@@ -51,24 +51,24 @@ public interface ResultDataResolver {
 
         // 考虑到：上游服务抛出的异常代码和错误消息并不一定适用于当前服务，并且上有服务的错误消息弹出之后可能给用户造成困扰，
         //      因此，当前服务抛出异常的时候，不再继承上游服务返回的错误码和错误消息
-        /*if (!result.success()) {
+        if (!result.success()) {
             Integer finalErrorCode = errorCode == null ? result.getCode() : errorCode;
             String finalErrorInternalMsg = StringUtils.isBlank(errorInternalMsg) ? result.getInternalMsg() : errorInternalMsg;
             throw new RenException(finalErrorCode, finalErrorInternalMsg, showMsg, RenException.MessageMode.CODE_INTERNAL_EXTERNAL);
-        }*/
-
-        if (!result.success()) {
-            String j = JSON.toJSONString(result);
-            logger.info("远程调用出错，返回结果:{}", j);
-
-            // 如果不通过参数指定code，则默认使用8000服务器开小差
-            Integer finalErrorCode = errorCode == null ? EpmetErrorCode.SERVER_ERROR.getCode() : errorCode;
-            String finalErrorInternalMsg = StringUtils.isBlank(errorInternalMsg) ? "" : errorInternalMsg;
-            String finalShowMsg = StringUtils.isBlank(showMsg) ? "" : showMsg;
-
-            throw new EpmetException(finalErrorCode, finalErrorInternalMsg, finalShowMsg);
         }
 
+//        if (!result.success()) {
+//            String j = JSON.toJSONString(result);
+//            logger.info("远程调用出错，返回结果:{}", j);
+//
+//            // 如果不通过参数指定code，则默认使用8000服务器开小差
+//            Integer finalErrorCode = errorCode == null ? EpmetErrorCode.SERVER_ERROR.getCode() : errorCode;
+//            String finalErrorInternalMsg = StringUtils.isBlank(errorInternalMsg) ? "" : errorInternalMsg;
+//            String finalShowMsg = StringUtils.isBlank(showMsg) ? "" : showMsg;
+//
+//            throw new EpmetException(finalErrorCode, finalErrorInternalMsg, finalShowMsg);
+//        }
+
         return result.getData();
     }
 

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

@@ -415,12 +415,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
                                        String currUserAgencyId, Map<Integer, String> checkBoxOptionColumnIdxAndLabel,
                                        String currUserAgencyPids, String currentUserId, String tableName) {
 
-        String loginUserApp =  ThreadLocalConstant.inheritableAdditionalHeaders.get().get(AppClientConstant.APP);
+        this.printLog("persistIcResiBaseInfo");
-        String loginUserClient = ThreadLocalConstant.inheritableAdditionalHeaders.get().get(AppClientConstant.CLIENT);
-        String loginUserId = ThreadLocalConstant.inheritableAdditionalHeaders.get().get(AppClientConstant.USER_ID.toLowerCase());
-        String loginUserCustomerId = ThreadLocalConstant.inheritableAdditionalHeaders.get().get(AppClientConstant.USER_ID.toLowerCase());
-
-        log.info("persistIcResiBaseInfo:: userId:{}, app:{}, client:{}, customerId:{}", loginUserId, loginUserApp, loginUserClient, loginUserCustomerId);
 
         // 遍历每一行，将行内容转化为
         for (Map<Integer, String> row : dataRows) {
@@ -477,7 +472,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
 
                 columnAndValues.put("AGENCY_ID", currUserAgencyId);
                 columnAndValues.put("PIDS", currUserAgencyPids);
-                columnAndValues.put("CUSTOMER_ID", loginUserCustomerId);
+                columnAndValues.put("CUSTOMER_ID", ThreadLocalConstant.inheritableAdditionalHeaders.get().get(AppClientConstant.CUSTOMER_ID.toLowerCase()));
 
                 columnAndValues.put("UPDATED_BY", currentUserId);
 
@@ -1005,7 +1000,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
         List<OptionResultDTO> options = null;
 
         log.info("optionsUrl:{}, currUserAgencyId:{}", pureUri, currUserAgencyId);
-
+        this.printLog("listRemoteOptions");
         switch (pureUri) {
             case "/epmetuser/icresidemanddict/demandoption":
                 options = getResultDataOrThrowsException(epmetUserOpenFeignClient.getDemandOptions(), ServiceConstant.EPMET_USER_SERVER,
@@ -1045,6 +1040,10 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
                     nform.setAgencyId(currUserAgencyId);
                 }
                 nform.setGridId(gridId);
+
+                this.printLog("listRemoteOptions#neighborhoodoption");
+                log.info("neighborhoodoption:{},{}", currUserAgencyId, gridId);
+
                 options = getResultDataOrThrowsException(govOrgOpenFeignClient.getNeighborHoodOptions(nform), ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), null, null);
                 break;
             case "/sys/dict/data/education":