Merge remote-tracking branch 'origin/dev_data_sync_user_org_for_yt' into dev_data_sync_user_org_for_yt

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/ThirdOpenFeignClient.java

@@ -8,6 +8,7 @@ import com.epmet.feign.fallback.ThirdOpenFeignClientFallbackFactory;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
 
@@ -69,4 +70,23 @@ public interface ThirdOpenFeignClient {
      */
     @PostMapping("/third/blockchain/project/process")
     Result blockChainProcessProject(@RequestBody BlockChainProcessProjectFormDTO input);
+
+    /**
+     * Desc: 从统一认证中心 拉取组织信息
+     * @param orgId
+     * @author zxc
+     * @date 2022/10/18 16:50
+     */
+    @PostMapping("/third/dataSync/yanTai/sync/org")
+    Result<Boolean> getYanTaiOrgInfo(@RequestParam("orgId") String orgId);
+
+    /**
+     * Desc: 从统一认证中心 拉取用户信息
+     * @param orgId
+     * @author zxc
+     * @date 2022/10/18 16:50
+     */
+    @PostMapping("/third/dataSync/yanTai/sync/user")
+    Result<Boolean> getYanTaiUserInfo(@RequestParam("orgId") String orgId);
+
 }

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/fallback/ThirdOpenFeignClientFallback.java

@@ -40,4 +40,14 @@ public class ThirdOpenFeignClientFallback implements ThirdOpenFeignClient {
     public Result blockChainProcessProject(BlockChainProcessProjectFormDTO input) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_THIRD_SERVER, "blockChainProcessProject", input);
     }
+
+    @Override
+    public Result<Boolean> getYanTaiOrgInfo(String orgId) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_THIRD_SERVER, "getYanTaiOrgInfo", orgId);
+    }
+
+    @Override
+    public Result<Boolean> getYanTaiUserInfo(String orgId) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_THIRD_SERVER, "getYanTaiUserInfo", orgId);
+    }
 }

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgController.java

@@ -9,10 +9,7 @@ import com.epmet.dto.form.yantai.YtUserPageFormDTO;
 import com.epmet.dto.result.yantai.DataSyncOrgDataDTO;
 import com.epmet.dto.result.yantai.YtUserPageResDTO;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -33,8 +30,8 @@ public class DataSyncUserAndOrgController {
 	 * desc:从统一认证中心 拉取用户信息
 	 * @return
 	 */
-	@PostMapping("yantai/sync/user")
-	public Result<Boolean> templateList(String orgId) {
+	@PostMapping("yanTai/sync/user")
+	public Result<Boolean> getYanTaiUserInfo(@RequestParam("orgId")String orgId) {
 		Boolean flag = dataSyncUserAndOrgService.yanTaiSyncUser(orgId);
 		return new Result<Boolean>().ok(flag);
 	}
@@ -43,8 +40,8 @@ public class DataSyncUserAndOrgController {
 	 * desc:从统一认证中心 拉取组织信息
 	 * @return
 	 */
-	@PostMapping("yantai/sync/org")
-	public Result<Boolean> getExtJson(String orgId) {
+	@PostMapping("yanTai/sync/org")
+	public Result<Boolean> getYanTaiOrgInfo(@RequestParam("orgId")String orgId) {
 		Boolean extJson = dataSyncUserAndOrgService.yanTaiSyncOrg(orgId);
 		return new Result<Boolean>().ok(extJson);
 	}