修改疫苗接种查询的接口调用

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<DeptOption> getAllDeptTree();
 
-    /**
-     * 查询用户疫苗接种信息
-     *
-     * @param userName 人员姓名
-     * @param idCard   身份证号
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.lang.Object>
-     * @author work@yujt.net.cn
-     * @date 2021/5/8 15:29
-     */
-    @GetMapping("sys/vaccinationinfo/epdc-app/query")
-    Result<Object> getUserVimInfo(@RequestParam("userName") String userName, @RequestParam("idCard") String idCard);
 }

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<List<CheckStateResultDTO>> getCheckState();
+
+    /**
+     * 查询用户疫苗接种信息
+     *
+     * @param userName 人员姓名
+     * @param idCard   身份证号
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.lang.Object>
+     * @author work@yujt.net.cn
+     * @date 2021/5/8 15:29
+     */
+    @GetMapping("custom/vaccinationinfo/epdc-app/query")
+    Result<Object> getUserVimInfo(@RequestParam("userName") String userName, @RequestParam("idCard") String idCard);
 }

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<Object> getUserVimInfo(String userName, String idCard) {
-        return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getUserVimInfo", userName, idCard);
-    }
 }

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<List<CheckStateResultDTO>> getCheckState() {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "checkState");
     }
+
+    @Override
+    public Result<Object> getUserVimInfo(String userName, String idCard) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getUserVimInfo", userName, idCard);
+    }
 }

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<String> getCompleteDeptName(Long gridId) {
         Result<CompleteDeptDTO> 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);
     }
 }