From 666ea6fa6bd846605127c9e258b23be48b69adbc Mon Sep 17 00:00:00 2001
From: wangxianzhang <ZHANGYUGE6666>
Date: Sat, 5 Nov 2022 23:41:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9:=E5=B1=B1=E4=B8=9C=E9=80=9Au?=
 =?UTF-8?q?rl=E5=AE=9A=E4=B9=89=E5=B8=B8=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fallback/ThirdOpenFeignClientFallback.java  | 17 +++++++++++++++++
 .../main/java/com/epmet/service/SdtService.java | 10 ++++++++++
 .../com/epmet/service/impl/SdtServiceImpl.java  |  4 ++--
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/fallback/ThirdOpenFeignClientFallback.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/fallback/ThirdOpenFeignClientFallback.java
index 006122b075..82b5ff571a 100644
--- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/fallback/ThirdOpenFeignClientFallback.java
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/fallback/ThirdOpenFeignClientFallback.java
@@ -6,6 +6,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.ThirdplatformResultDTO;
 import com.epmet.feign.ThirdOpenFeignClient;
+import com.epmet.sdt.SdtStaffDetailResult;
+import com.epmet.sdt.SdtStaffInfoResult;
 
 import java.util.List;
 
@@ -50,4 +52,19 @@ public class ThirdOpenFeignClientFallback implements ThirdOpenFeignClient {
     public Result<Boolean> getYanTaiUserInfo(String orgId) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_THIRD_SERVER, "getYanTaiUserInfo", orgId);
     }
+
+    @Override
+    public Result<String> getSdtCachedAccessToken(String customerId) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_THIRD_SERVER, "getSdtCachedAccessToken", customerId);
+    }
+
+    @Override
+    public Result<SdtStaffInfoResult> getUserInfoByAuthCode(String authCode, String customerId) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_THIRD_SERVER, "getUserInfoByAuthCode", authCode, customerId);
+    }
+
+    @Override
+    public Result<SdtStaffDetailResult> getUserDetailByUserId(String userId, String customerId) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_THIRD_SERVER, "getSdtgetUserDetailByUserIdCachedAccessToken", userId, customerId);
+    }
 }
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/SdtService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/SdtService.java
index aab3480dd6..aca8bc8a83 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/SdtService.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/SdtService.java
@@ -19,6 +19,16 @@ public interface SdtService {
      */
     String API_GET_ACCESS_TOKEN_URL = "/cgi-bin/gettoken";
 
+    /**
+     * 用户基础信息
+     */
+    String API_GET_USER_INFO_URL = "/cgi-bin/user/getuserinfo";
+
+    /**
+     * 用户详细信息
+     */
+    String API_GET_USER_DETAIL_URL = "/cgi-bin/user/get";
+
     /**
      * 刷新token
      * @author wxz
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/SdtServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/SdtServiceImpl.java
index c5397776eb..b7de7d7bd5 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/SdtServiceImpl.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/SdtServiceImpl.java
@@ -163,7 +163,7 @@ public class SdtServiceImpl implements SdtService {
         HashMap<String, Object> params = new HashMap<>();
         params.put("access_token", getCachedAccessToken(customerId));
         params.put("code", authCode);
-        Result<String> sdtResult = HttpClientManager.getInstance().sendGet("/cgi-bin/user/getuserinfo", params);
+        Result<String> sdtResult = HttpClientManager.getInstance().sendGet(API_GET_USER_INFO_URL, params);
         if (!sdtResult.success()) {
             // http状态判断
             log.error("【山东通登录】查询用户编码-http错误:{}", sdtResult.getMsg());
@@ -185,7 +185,7 @@ public class SdtServiceImpl implements SdtService {
         HashMap<String, Object> userDetailParams = new HashMap<>();
         userDetailParams.put("access_token", getCachedAccessToken(customerId));
         userDetailParams.put("userid", userId);
-        Result<String> userDetailResult = HttpClientManager.getInstance().sendGet("/cgi-bin/user/get", userDetailParams);
+        Result<String> userDetailResult = HttpClientManager.getInstance().sendGet(API_GET_USER_DETAIL_URL, userDetailParams);
         if (!userDetailResult.success()) {
             // http状态判断
             log.error("【山东通登录】查询用户详细信息-http错误:{}", userDetailResult.getMsg());