From 9cecb9b534a18ffe4fc4119fdfc443c7526d5eca Mon Sep 17 00:00:00 2001 From: YUJT Date: Wed, 7 Jul 2021 18:46:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=96=AB=E8=8B=97=E6=8E=A5?= =?UTF-8?q?=E7=A7=8D=E6=9F=A5=E8=AF=A2=E7=9A=84=E6=8E=A5=E5=8F=A3=E8=B0=83?= =?UTF-8?q?=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../elink/esua/epdc/feign/AdminFeignClient.java | 11 ----------- .../esua/epdc/feign/CustomFeignClient.java | 17 +++++++++++++---- .../fallback/AdminFeignClientFallback.java | 4 ---- .../fallback/CustomFeignClientFallback.java | 5 +++++ .../epdc/service/impl/AdminServiceImpl.java | 6 +++++- 5 files changed, 23 insertions(+), 20 deletions(-) diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java index f560107..d4e475c 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java @@ -146,15 +146,4 @@ public interface AdminFeignClient { @GetMapping("sys/dept/party/getDeptTree") Result getAllDeptTree(); - /** - * 查询用户疫苗接种信息 - * - * @param userName 人员姓名 - * @param idCard 身份证号 - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @author work@yujt.net.cn - * @date 2021/5/8 15:29 - */ - @GetMapping("sys/vaccinationinfo/epdc-app/query") - Result getUserVimInfo(@RequestParam("userName") String userName, @RequestParam("idCard") String idCard); } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/CustomFeignClient.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/CustomFeignClient.java index 80cb042..66d5228 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/CustomFeignClient.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/CustomFeignClient.java @@ -13,10 +13,7 @@ import com.elink.esua.epdc.dto.form.EpiDemicReportFormDTO; import com.elink.esua.epdc.feign.fallback.CustomFeignClientFallback; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.http.MediaType; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -119,4 +116,16 @@ public interface CustomFeignClient { */ @GetMapping(value = "custom/majorfunctionconf/checkState", consumes = MediaType.APPLICATION_JSON_VALUE) Result> getCheckState(); + + /** + * 查询用户疫苗接种信息 + * + * @param userName 人员姓名 + * @param idCard 身份证号 + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author work@yujt.net.cn + * @date 2021/5/8 15:29 + */ + @GetMapping("custom/vaccinationinfo/epdc-app/query") + Result getUserVimInfo(@RequestParam("userName") String userName, @RequestParam("idCard") String idCard); } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java index 43fe324..6000de8 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java @@ -78,8 +78,4 @@ public class AdminFeignClientFallback implements AdminFeignClient { return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getDeptTree"); } - @Override - public Result getUserVimInfo(String userName, String idCard) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getUserVimInfo", userName, idCard); - } } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/CustomFeignClientFallback.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/CustomFeignClientFallback.java index fb82983..3806567 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/CustomFeignClientFallback.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/CustomFeignClientFallback.java @@ -68,4 +68,9 @@ public class CustomFeignClientFallback implements CustomFeignClient { public Result> getCheckState() { return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "checkState"); } + + @Override + public Result getUserVimInfo(String userName, String idCard) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getUserVimInfo", userName, idCard); + } } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java index a5df275..d74687b 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java @@ -13,6 +13,7 @@ import com.elink.esua.epdc.dto.result.EpdcAppWorkLogUserResult; import com.elink.esua.epdc.dto.result.EpdcWorkLogUserDetailDTO; import com.elink.esua.epdc.feign.AdminFeignClient; import com.elink.esua.epdc.feign.AnalysisFeignClient; +import com.elink.esua.epdc.feign.CustomFeignClient; import com.elink.esua.epdc.service.AdminService; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -33,6 +34,9 @@ public class AdminServiceImpl implements AdminService { @Autowired private AnalysisFeignClient analysisFeignClient; + @Autowired + private CustomFeignClient customFeignClient; + @Override public Result getCompleteDeptName(Long gridId) { Result adminResult = adminFeignClient.getCompleteDept(gridId); @@ -117,6 +121,6 @@ public class AdminServiceImpl implements AdminService { userName = ModuleUtils.replaceIllegalCharacter(userName); idCard = ModuleUtils.replaceIllegalCharacter(idCard); - return adminFeignClient.getUserVimInfo(userName, idCard); + return customFeignClient.getUserVimInfo(userName, idCard); } }