diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/feign/GovVoiceFeignClient.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/feign/GovVoiceFeignClient.java deleted file mode 100644 index 6a03cbafbc..0000000000 --- a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/feign/GovVoiceFeignClient.java +++ /dev/null @@ -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> resiTagList(@RequestBody ResiTagListFormDTO formDto); - - /** - * @Description 标签级联查询——居民端 - * @param formDto - * @author zxc - */ - @PostMapping("/gov/voice/tag/tagcascadelist") - Result> tagCascadeList(@RequestBody TagCascadeListFormDTO formDto); -} diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/feign/fallback/GovVoiceFeignClientFallBack.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/feign/fallback/GovVoiceFeignClientFallBack.java deleted file mode 100644 index 9e2c1eebba..0000000000 --- a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/feign/fallback/GovVoiceFeignClientFallBack.java +++ /dev/null @@ -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> resiTagList(ResiTagListFormDTO formDto) { - return ModuleUtils.feignConError(ServiceConstant.GOV_VOICE_SERVER, "resiTagList", formDto); - } - - @Override - public Result> tagCascadeList(TagCascadeListFormDTO formDto) { - return ModuleUtils.feignConError(ServiceConstant.GOV_VOICE_SERVER, "tagCascadeList", formDto); - } -} diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/feign/GovVoiceOpenFeignClient.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/feign/GovVoiceOpenFeignClient.java index eb9cf4c240..3bbc14112f 100644 --- a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/feign/GovVoiceOpenFeignClient.java +++ b/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> resiTagList(@RequestBody ResiTagListFormDTO formDto); + + /** + * @Description 标签级联查询——居民端 + * @param formDto + * @author zxc + */ + @PostMapping("/gov/voice/tag/tagcascadelist") + Result> tagCascadeList(@RequestBody TagCascadeListFormDTO formDto); + /** * @Description 根据网格Id查找置顶文章的相关信息列表 用处:居民端首页轮播 * @param commonArticleListFormDTO :: getGridId :: getNum diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/feign/GovVoiceOpenFeignClientFallback.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/feign/fallback/GovVoiceOpenFeignClientFallback.java similarity index 71% rename from epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/feign/GovVoiceOpenFeignClientFallback.java rename to epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/feign/fallback/GovVoiceOpenFeignClientFallback.java index 16b020b732..9ed332730a 100644 --- a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/feign/GovVoiceOpenFeignClientFallback.java +++ b/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; @@ -21,7 +17,16 @@ import java.util.List; * @date 2020/6/4 16:01 */ @Component -public class GovVoiceOpenFeignClientFallback implements GovVoiceOpenFeignClient{ +public class GovVoiceOpenFeignClientFallback implements GovVoiceOpenFeignClient { + @Override + public Result> resiTagList(ResiTagListFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.GOV_VOICE_SERVER, "resiTagList", formDto); + } + + @Override + public Result> tagCascadeList(TagCascadeListFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.GOV_VOICE_SERVER, "tagCascadeList", formDto); + } @Override public Result> resiTopArticleList(CommonArticleListFormDTO commonArticleListFormDTO) { diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java index fd551fbe25..bb1013913f 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java +++ b/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; diff --git a/epmet-module/resi-voice/resi-voice-server/src/main/java/com/epmet/controller/ArticleController.java b/epmet-module/resi-voice/resi-voice-server/src/main/java/com/epmet/controller/ArticleController.java index 346549afd2..4db3c1162b 100644 --- a/epmet-module/resi-voice/resi-voice-server/src/main/java/com/epmet/controller/ArticleController.java +++ b/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; diff --git a/epmet-module/resi-voice/resi-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java b/epmet-module/resi-voice/resi-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java index dad9543720..565e6bfda3 100644 --- a/epmet-module/resi-voice/resi-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java +++ b/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 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 tagCascadeList(TokenDto tokenDto, TagCascadeListFormDTO formDto) { // formDto.setCustomerId(tokenDto.getCustomerId()); - return govVoiceFeignClient.tagCascadeList(formDto).getData(); + return govVoiceOpenFeignClient.tagCascadeList(formDto).getData(); } /**