feign错误

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/EpmetHeartOpenFeignClient.java

@@ -1,6 +1,7 @@
 package com.epmet.feign;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.dto.result.OptionResultDTO;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.ActInfoDTO;
 import com.epmet.dto.VolunteerInfoDTO;
@@ -103,4 +104,7 @@ public interface EpmetHeartOpenFeignClient {
      */
     @GetMapping("/heart/serviceitem/initCustomer/{customerId}")
     Result customerInit(@PathVariable(value = "customerId") String customerId);
+
+    @PostMapping("/heart/icresidemanddict/demandoption")
+    Result<List<OptionResultDTO>> getDemandOptions();
 }

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/fallback/EpmetHeartOpenFeignClientFallback.java

@@ -1,6 +1,7 @@
 package com.epmet.feign.fallback;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.dto.result.OptionResultDTO;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.ActInfoDTO;
@@ -102,4 +103,9 @@ public class EpmetHeartOpenFeignClientFallback implements EpmetHeartOpenFeignCli
     public Result customerInit(String customerId) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_HEART_SERVER, "customerInit", customerId);
     }
+
+    @Override
+    public Result<List<OptionResultDTO>> getDemandOptions() {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_HEART_SERVER, "getDemandOptions", null);
+    }
 }

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

@@ -2,7 +2,6 @@ package com.epmet.feign;
 
 
 import com.epmet.commons.tools.constant.ServiceConstant;
-import com.epmet.commons.tools.dto.result.OptionResultDTO;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.*;
@@ -649,9 +648,6 @@ public interface EpmetUserOpenFeignClient {
     @GetMapping(value = "/epmetuser/user/queryUserClient/{userId}")
     Result<UserDTO> queryUserClient(@PathVariable("userId") String userId);
 
-    @PostMapping("/epmetuser/icresidemanddict/demandoption")
-    Result<List<OptionResultDTO>> getDemandOptions();
-
     @PostMapping("/epmetuser/icresiuser/categorycount")
     Result<Map<String, Map<String, String>>> getHomeUserCategoryCount(@RequestBody IcResiUserDTO formDTO);
 

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

@@ -1,7 +1,6 @@
 package com.epmet.feign.fallback;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
-import com.epmet.commons.tools.dto.result.OptionResultDTO;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
@@ -466,11 +465,6 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "queryUserClient", userId);
     }
 
-    @Override
-    public Result<List<OptionResultDTO>> getDemandOptions() {
-        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getDemandOptions", null);
-    }
-
     @Override
     public Result<Map<String, Map<String, String>>> getHomeUserCategoryCount(IcResiUserDTO formDTO) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getHomeUserCategoryCount", formDTO);

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java

@@ -123,34 +123,26 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
 
     @Autowired
     private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
-
+    @Autowired
+    private EpmetHeartOpenFeignClient epmetHeartOpenFeignClient;
     @Autowired
     private EpmetAdminOpenFeignClient adminOpenFeignClient;
-
     @Autowired
     private GovOrgOpenFeignClient govOrgOpenFeignClient;
-
     @Autowired
     private IcResiUserDao icResiUserDao;
-
     @Autowired
     private OperCustomizeOpenFeignClient operCustomizeOpenFeignClient;
-
     @Autowired
     private IcUserChangeRecordDao icUserChangeRecordDao;
-
     @Autowired
     private IcUserChangeDetailedDao icUserChangeDetailedDao;
-
     @Autowired
     private IcUserTransferRecordDao icUserTransferRecordDao;
-
     @Autowired
     private UserService userService;
-
     @Autowired
     private RedisUtils redisUtils;
-
     @Autowired
     private EpmetCommonServiceOpenFeignClient commonServiceOpenFeignClient;
     @Autowired
@@ -1184,10 +1176,6 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
 
         List<OptionResultDTO> options = null;
         switch (pureUri) {
-            case "/epmetuser/icresidemanddict/demandoption":
-                options = getResultDataOrThrowsException(epmetUserOpenFeignClient.getDemandOptions(), ServiceConstant.EPMET_USER_SERVER,
-                        EpmetErrorCode.SERVER_ERROR.getCode(), null, null);
-                break;
             case "/gov/org/customergrid/gridoption":
                 GridOptionFormDTO form = new GridOptionFormDTO();
                 form.setAgencyId(currUserAgencyId);
@@ -1294,7 +1282,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
         List<OptionResultDTO> options = null;
         switch (pureUri) {
             case "/heart/icresidemanddict/demandoption":
-                options = getResultDataOrThrowsException(epmetUserOpenFeignClient.getDemandOptions(), ServiceConstant.EPMET_USER_SERVER,
+                options = getResultDataOrThrowsException(epmetHeartOpenFeignClient.getDemandOptions(), ServiceConstant.EPMET_USER_SERVER,
                         EpmetErrorCode.SERVER_ERROR.getCode(), null, null);
                 break;
         }