新增GovVoiceOpenFeignClient,删除原来的GovVoiceFeignClient

epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/feign/GovVoiceFeignClient.java

@@ -1,39 +0,0 @@
-package com.epmet.dto.feign;
-
-
-import com.epmet.commons.tools.constant.ServiceConstant;
-import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.feign.fallback.GovVoiceFeignClientFallBack;
-import com.epmet.dto.form.*;
-import com.epmet.dto.result.*;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import java.util.List;
-
-/**
- * @Author zxc
- * @CreateTime 2020/6/2 16:05
- * , url = "localhost:8105"
- */
-//@FeignClient(name = ServiceConstant.GOV_VOICE_SERVER, fallback = GovVoiceFeignClientFallBack.class,url = "localhost:8105")
-@FeignClient(name = ServiceConstant.GOV_VOICE_SERVER, fallback = GovVoiceFeignClientFallBack.class)
-public interface GovVoiceFeignClient {
-
-    /**
-     * @Description  已发布列表页的标签——居民端
-     * @param formDto
-     * @author zxc
-     */
-    @PostMapping("/gov/voice/tag/resitaglist")
-    Result<List<TagInfoResultDTO>> resiTagList(@RequestBody ResiTagListFormDTO formDto);
-
-    /**
-     * @Description  标签级联查询——居民端
-     * @param formDto
-     * @author zxc
-     */
-    @PostMapping("/gov/voice/tag/tagcascadelist")
-    Result<List<TagInfoResultDTO>> tagCascadeList(@RequestBody TagCascadeListFormDTO formDto);
-}

epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/feign/fallback/GovVoiceFeignClientFallBack.java

@@ -1,28 +0,0 @@
-package com.epmet.dto.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.feign.GovVoiceFeignClient;
-import com.epmet.dto.form.*;
-import com.epmet.dto.result.*;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-/**
- * @Author zxc
- * @CreateTime 2020/6/2 16:07
- */
-@Component
-public class GovVoiceFeignClientFallBack implements GovVoiceFeignClient {
-    @Override
-    public Result<List<TagInfoResultDTO>> resiTagList(ResiTagListFormDTO formDto) {
-        return ModuleUtils.feignConError(ServiceConstant.GOV_VOICE_SERVER, "resiTagList", formDto);
-    }
-
-    @Override
-    public Result<List<TagInfoResultDTO>> tagCascadeList(TagCascadeListFormDTO formDto) {
-        return ModuleUtils.feignConError(ServiceConstant.GOV_VOICE_SERVER, "tagCascadeList", formDto);
-    }
-}

epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/feign/GovVoiceOpenFeignClient.java

@@ -3,13 +3,9 @@ package com.epmet.feign;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.form.ArticlePageFormDTO;
-import com.epmet.dto.form.CommonArticleListFormDTO;
-import com.epmet.dto.form.ResiArticleDetailFormDTO;
-import com.epmet.dto.result.ArticleBannerResultDTO;
-import com.epmet.dto.result.ArticleDetailResultDTO;
-import com.epmet.dto.result.ArticleLatestResultDTO;
-import com.epmet.dto.result.ArticleListResultDTO;
+import com.epmet.dto.form.*;
+import com.epmet.dto.result.*;
+import com.epmet.feign.fallback.GovVoiceOpenFeignClientFallback;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -25,6 +21,22 @@ import java.util.List;
 @FeignClient(name = ServiceConstant.GOV_VOICE_SERVER, fallback = GovVoiceOpenFeignClientFallback.class)
 public interface GovVoiceOpenFeignClient {
 
+    /**
+     * @Description  已发布列表页的标签——居民端
+     * @param formDto
+     * @author zxc
+     */
+    @PostMapping("/gov/voice/tag/resitaglist")
+    Result<List<TagInfoResultDTO>> resiTagList(@RequestBody ResiTagListFormDTO formDto);
+
+    /**
+     * @Description  标签级联查询——居民端
+     * @param formDto
+     * @author zxc
+     */
+    @PostMapping("/gov/voice/tag/tagcascadelist")
+    Result<List<TagInfoResultDTO>> tagCascadeList(@RequestBody TagCascadeListFormDTO formDto);
+
     /**
      * @Description 根据网格Id查找置顶文章的相关信息列表 用处:居民端首页轮播
      * @param commonArticleListFormDTO :: getGridId :: getNum

epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/feign/GovVoiceOpenFeignClientFallback.java → epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/feign/fallback/GovVoiceOpenFeignClientFallback.java

@@ -1,15 +1,11 @@
-package com.epmet.feign;
+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.ArticlePageFormDTO;
-import com.epmet.dto.form.CommonArticleListFormDTO;
-import com.epmet.dto.form.ResiArticleDetailFormDTO;
-import com.epmet.dto.result.ArticleBannerResultDTO;
-import com.epmet.dto.result.ArticleDetailResultDTO;
-import com.epmet.dto.result.ArticleLatestResultDTO;
-import com.epmet.dto.result.ArticleListResultDTO;
+import com.epmet.dto.form.*;
+import com.epmet.dto.result.*;
+import com.epmet.feign.GovVoiceOpenFeignClient;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -22,6 +18,15 @@ import java.util.List;
  */
 @Component
 public class GovVoiceOpenFeignClientFallback implements GovVoiceOpenFeignClient {
+    @Override
+    public Result<List<TagInfoResultDTO>> resiTagList(ResiTagListFormDTO formDto) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_VOICE_SERVER, "resiTagList", formDto);
+    }
+
+    @Override
+    public Result<List<TagInfoResultDTO>> tagCascadeList(TagCascadeListFormDTO formDto) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_VOICE_SERVER, "tagCascadeList", formDto);
+    }
 
     @Override
     public Result<List<ArticleBannerResultDTO>> resiTopArticleList(CommonArticleListFormDTO commonArticleListFormDTO) {

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java

@@ -32,11 +32,6 @@ import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.ArticleDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
-import com.epmet.dto.form.ArticlePageFormDTO;
-import com.epmet.dto.form.CommonArticleListFormDTO;
-import com.epmet.dto.result.ArticleBannerResultDTO;
-import com.epmet.dto.result.ArticleLatestResultDTO;
-import com.epmet.dto.result.ArticleWithTagsResultDTO;
 import com.epmet.excel.ArticleExcel;
 import com.epmet.service.ArticleOperateRecordService;
 import com.epmet.service.ArticleService;

epmet-module/resi-voice/resi-voice-server/src/main/java/com/epmet/controller/ArticleController.java

@@ -4,9 +4,13 @@ import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
-import com.epmet.dto.feign.GovVoiceFeignClient;
-import com.epmet.dto.form.*;
-import com.epmet.dto.result.*;
+import com.epmet.dto.form.ArticlePageFormDTO;
+import com.epmet.dto.form.ResiArticleDetailFormDTO;
+import com.epmet.dto.form.ResiTagListFormDTO;
+import com.epmet.dto.form.TagCascadeListFormDTO;
+import com.epmet.dto.result.ArticleDetailResultDTO;
+import com.epmet.dto.result.ArticleWithTagsResultDTO;
+import com.epmet.dto.result.TagInfoResultDTO;
 import com.epmet.feign.GovVoiceOpenFeignClient;
 import com.epmet.service.ArticleService;
 import org.springframework.beans.factory.annotation.Autowired;

epmet-module/resi-voice/resi-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java

@@ -5,7 +5,6 @@ import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.feign.GovVoiceFeignClient;
 import com.epmet.dto.form.ArticlePageFormDTO;
 import com.epmet.dto.form.ResiTagListFormDTO;
 import com.epmet.dto.form.TagCascadeListFormDTO;
@@ -22,7 +21,6 @@ import org.springframework.stereotype.Service;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 import java.util.stream.Collectors;
 
 
@@ -33,8 +31,6 @@ import java.util.stream.Collectors;
 @Service
 public class ArticleServiceImpl implements ArticleService {
 
-    @Autowired
-    private GovVoiceFeignClient govVoiceFeignClient;
     @Autowired
     private GovVoiceOpenFeignClient govVoiceOpenFeignClient;
 
@@ -47,7 +43,7 @@ public class ArticleServiceImpl implements ArticleService {
     public List<TagInfoResultDTO> resiTagList(TokenDto tokenDto, ResiTagListFormDTO formDto) {
 //        formDto.setCustomerId(tokenDto.getCustomerId());
         formDto.setUserId(tokenDto.getUserId());
-        return govVoiceFeignClient.resiTagList(formDto).getData();
+        return govVoiceOpenFeignClient.resiTagList(formDto).getData();
     }
 
     /**
@@ -58,7 +54,7 @@ public class ArticleServiceImpl implements ArticleService {
     @Override
     public List<TagInfoResultDTO> tagCascadeList(TokenDto tokenDto, TagCascadeListFormDTO formDto) {
 //        formDto.setCustomerId(tokenDto.getCustomerId());
-        return govVoiceFeignClient.tagCascadeList(formDto).getData();
+        return govVoiceOpenFeignClient.tagCascadeList(formDto).getData();
     }
 
     /**