Merge branch 'dev'

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

@@ -1,5 +1,6 @@
 package com.epmet.commons.tools.feign;
 
+import com.alibaba.fastjson.JSON;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.exception.RenException;
@@ -13,6 +14,8 @@ import org.slf4j.LoggerFactory;
  */
 public interface ResultDataResolver {
 
+    Logger logger = LoggerFactory.getLogger(ResultDataResolver.class);
+
     /**
      * @Description 获取Result种的data，如果失败(返回result为null或者result.success为false)，那么返回null
      * @return data数据
@@ -20,7 +23,6 @@ public interface ResultDataResolver {
      * @date 2021.06.07 22:45
     */
     default <R> R getResultDataOrReturnNull(Result<R> result, String targetServiceName) {
-        Logger logger = LoggerFactory.getLogger(ResultDataResolver.class);
         if (result == null) {
             logger.error("调用{}服务发生错误，返回Result为null", targetServiceName);
             return null;
@@ -56,6 +58,8 @@ public interface ResultDataResolver {
         }*/
 
         if (!result.success()) {
+            String j = JSON.toJSONString(result);
+            logger.info("远程调用出错，返回结果:{}", j);
 
             // 如果不通过参数指定code，则默认使用8000服务器开小差
             Integer finalErrorCode = errorCode == null ? EpmetErrorCode.SERVER_ERROR.getCode() : errorCode;

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

@@ -221,15 +221,17 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
         String loginUserApp = loginUserUtil.getLoginUserApp();
         String loginUserClient = loginUserUtil.getLoginUserClient();
 
-        LoginUserDetailsFormDTO userForm = new LoginUserDetailsFormDTO();
-        userForm.setApp(loginUserApp);
-        userForm.setClient(loginUserClient);
-        userForm.setUserId(loginUserId);
+//        LoginUserDetailsFormDTO userForm = new LoginUserDetailsFormDTO();
+//        userForm.setApp(loginUserApp);
+//        userForm.setClient(loginUserClient);
+//        userForm.setUserId(loginUserId);
 
         String currUserAgencyId = userService.getLoginUserDetails(
-                loginUserUtil.getLoginUserApp(),
-                loginUserUtil.getLoginUserClient(),
-                loginUserUtil.getLoginUserId()).getAgencyId();
+                loginUserApp,
+                loginUserClient,
+                loginUserId).getAgencyId();
+
+        log.info("userId:{}, app:{}, client:{}, currUserAgencyId:{}", loginUserId, loginUserApp, loginUserClient, currUserAgencyId);
 
         CustomerAgencyDTO agencyInfo = getResultDataOrThrowsException(govOrgOpenFeignClient.getAgencyById(currUserAgencyId), ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), null, null);
         String customerId = agencyInfo.getCustomerId();
@@ -991,6 +993,8 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
 
         List<OptionResultDTO> options = null;
 
+        log.info("optionsUrl:{}, currUserAgencyId:{}", pureUri, currUserAgencyId);
+
         switch (pureUri) {
             case "/epmetuser/icresidemanddict/demandoption":
                 options = getResultDataOrThrowsException(epmetUserOpenFeignClient.getDemandOptions(), ServiceConstant.EPMET_USER_SERVER,