epmetuser模块统一使用EpmetUserOpenFeignClient

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java

@@ -36,7 +36,6 @@ import com.epmet.entity.CustomerAgencyEntity;
 import com.epmet.entity.CustomerGridEntity;
 import com.epmet.feign.EpmetUserFeignClient;
 import com.epmet.feign.EpmetUserOpenFeignClient;
-import com.epmet.feign.EpmetUserSelfFeignClient;
 import com.epmet.feign.OperCrmFeignClient;
 import com.epmet.redis.CustomerAgencyRedis;
 import com.epmet.service.CustomerAgencyService;

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserClientFeignClient.java

@@ -1,23 +0,0 @@
-package com.epmet.feign;
-
-import com.epmet.commons.tools.constant.ServiceConstant;
-import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.form.LoginUserDetailsFormDTO;
-import com.epmet.dto.result.LoginUserDetailsResultDTO;
-import com.epmet.feign.fallback.EpmetUserClientFeignClientFallback;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserClientFeignClientFallback.class)
-//@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserClientFeignClientFallback.class, url = "localhost:8087")
-public interface EpmetUserClientFeignClient {
-
-    /**
-     * 从缓存中查询已登录用户的基本信息以及角色等相关信息
-     * @return
-     */
-    @PostMapping("/epmetuser/user/loginuserdetails")
-    Result<LoginUserDetailsResultDTO> getLoginUserDetails(@RequestBody LoginUserDetailsFormDTO dto);
-
-}

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java

@@ -1,16 +1,17 @@
 package com.epmet.feign;
 
+import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.CustomerStaffDTO;
 import com.epmet.dto.form.CustomerStaffRoleListFormDTO;
 import com.epmet.dto.form.LoginUserDetailsFormDTO;
+import com.epmet.dto.form.TagCustomerFormDTO;
 import com.epmet.dto.result.CustomerStaffRoleListResultDTO;
 import com.epmet.dto.result.CustomerStaffRoleResultDTO;
 import com.epmet.dto.result.LoginUserDetailsResultDTO;
-import org.springframework.cloud.openfeign.FeignClient;
+import com.epmet.dto.result.TagCustomerResultDTO;
-
-import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.feign.fallback.EpmetUserOpenFeignClientFallback;
+import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -63,4 +64,12 @@ public interface EpmetUserOpenFeignClient {
     @PostMapping("/epmetuser/customerstaff/getcustomerstaff/{staffId}")
     Result<CustomerStaffDTO> getCustomerStaff(@PathVariable("staffId") String staffId);
 
+    /**
+     * @param formDTO
+     * @Description 根据userId获取customerId
+     * @author zxc
+     */
+    @PostMapping("/epmetuser/user/getcustomeridbyuserid")
+    Result<TagCustomerResultDTO> getCustomerIdByUserId(@RequestBody TagCustomerFormDTO formDTO);
+
 }

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserSelfFeignClient.java

@@ -1,55 +0,0 @@
-package com.epmet.feign;
-
-import com.epmet.commons.tools.constant.ServiceConstant;
-import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.CustomerStaffDTO;
-import com.epmet.dto.form.CustomerStaffRoleListFormDTO;
-import com.epmet.dto.form.LoginUserDetailsFormDTO;
-import com.epmet.dto.form.TagCustomerFormDTO;
-import com.epmet.dto.result.CustomerStaffRoleListResultDTO;
-import com.epmet.dto.result.CustomerStaffRoleResultDTO;
-import com.epmet.dto.result.LoginUserDetailsResultDTO;
-import com.epmet.dto.result.TagCustomerResultDTO;
-import com.epmet.feign.fallback.EpmetUserSelfFeignClientFallBack;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import java.util.List;
-
-/**
- * @author sun
- * @dscription epmet-user服务
- */
-@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserSelfFeignClientFallBack.class)
-public interface EpmetUserSelfFeignClient {
-
-	/**
-	 * 从缓存中查询已登录用户的基本信息以及角色等相关信息
-	 *
-	 * @return
-	 */
-	@PostMapping("/epmetuser/user/loginuserdetails")
-	Result<LoginUserDetailsResultDTO> getLoginUserDetails(@RequestBody LoginUserDetailsFormDTO dto);
-
-	/**
-	 * @param formDTO
-	 * @Description 根据userId获取customerId
-	 * @author zxc
-	 */
-	@PostMapping("/epmetuser/user/getcustomeridbyuserid")
-	Result<TagCustomerResultDTO> getCustomerIdByUserId(@RequestBody TagCustomerFormDTO formDTO);
-
-	/**
-	 * 根据staffId查询人员拥有的所有角色信息
-	 *
-	 * @param staffId
-	 * @return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.dto.result.CustomerStaffRoleResultDTO>>
-	 * @author zhaoqifeng
-	 * @date 2020/6/2 16:11
-	 */
-	@PostMapping("/epmetuser/staffrole/staffroles/{staffId}")
-	Result<List<CustomerStaffRoleResultDTO>> getStaffRoles(@PathVariable String staffId);
-
-}

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserClientFeignClientFallback.java

@@ -1,18 +0,0 @@
-package com.epmet.feign.fallback;
-
-import com.epmet.commons.tools.constant.ServiceConstant;
-import com.epmet.commons.tools.utils.ModuleUtils;
-import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.form.LoginUserDetailsFormDTO;
-import com.epmet.dto.result.LoginUserDetailsResultDTO;
-import com.epmet.feign.EpmetUserClientFeignClient;
-import org.springframework.stereotype.Component;
-
-@Component
-public class EpmetUserClientFeignClientFallback implements EpmetUserClientFeignClient {
-
-    @Override
-    public Result<LoginUserDetailsResultDTO> getLoginUserDetails(LoginUserDetailsFormDTO dto) {
-        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getLoginUserDetails", dto);
-    }
-}

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java

@@ -6,9 +6,11 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.CustomerStaffDTO;
 import com.epmet.dto.form.CustomerStaffRoleListFormDTO;
 import com.epmet.dto.form.LoginUserDetailsFormDTO;
+import com.epmet.dto.form.TagCustomerFormDTO;
 import com.epmet.dto.result.CustomerStaffRoleListResultDTO;
 import com.epmet.dto.result.CustomerStaffRoleResultDTO;
 import com.epmet.dto.result.LoginUserDetailsResultDTO;
+import com.epmet.dto.result.TagCustomerResultDTO;
 import com.epmet.feign.EpmetUserOpenFeignClient;
 import org.springframework.stereotype.Component;
 
@@ -42,4 +44,10 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien
     public Result<CustomerStaffDTO> getCustomerStaff(String staffId) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getCustomerStaff", staffId);
     }
+
+    @Override
+    public Result<TagCustomerResultDTO> getCustomerIdByUserId(TagCustomerFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getCustomerIdByUserId", formDTO);
+    }
+
 }

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserSelfFeignClientFallBack.java

@@ -1,40 +0,0 @@
-package com.epmet.feign.fallback;
-
-import com.epmet.commons.tools.constant.ServiceConstant;
-import com.epmet.commons.tools.utils.ModuleUtils;
-import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.CustomerStaffDTO;
-import com.epmet.dto.form.CustomerStaffRoleListFormDTO;
-import com.epmet.dto.form.LoginUserDetailsFormDTO;
-import com.epmet.dto.form.TagCustomerFormDTO;
-import com.epmet.dto.result.CustomerStaffRoleListResultDTO;
-import com.epmet.dto.result.CustomerStaffRoleResultDTO;
-import com.epmet.dto.result.LoginUserDetailsResultDTO;
-import com.epmet.dto.result.TagCustomerResultDTO;
-import com.epmet.feign.EpmetUserSelfFeignClient;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-/**
- * @dscription epmet-user服务
- * @author sun
- */
-@Component
-public class EpmetUserSelfFeignClientFallBack implements EpmetUserSelfFeignClient {
-
-    @Override
-    public Result<LoginUserDetailsResultDTO> getLoginUserDetails(LoginUserDetailsFormDTO dto) {
-        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getLoginUserDetails", dto);
-    }
-
-    @Override
-    public Result<TagCustomerResultDTO> getCustomerIdByUserId(TagCustomerFormDTO formDTO) {
-        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getCustomerIdByUserId", formDTO);
-    }
-
-    @Override
-    public Result<List<CustomerStaffRoleResultDTO>> getStaffRoles(String staffId) {
-        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getStaffRoles", staffId);
-    }
-}