From 81d2b62f58e755f94b6c2dc80303730e839a984d Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Wed, 12 Feb 2020 09:32:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=80=E7=83=AD=E8=AE=AE=E9=A2=98=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/dto/issue/form/HotIssueFormDTO.java | 48 +++++++++++++++++++ .../dto/issue/result/HotIssueResultDTO.java | 32 +++++++++++++ .../dto/topic/result/HotTopicResultDTO.java | 6 +-- .../AppIssueAnalysisController.java | 20 ++++++++ .../modules/issue/dao/IssueAnalysisDao.java | 13 +++-- .../issue/service/IssueAnalysisService.java | 15 ++++-- .../impl/IssueAnalysisServiceImpl.java | 14 ++++-- .../AppTopicAnalysisController.java | 5 ++ .../mapper/issue/IssueAnalysisDao.xml | 37 ++++++++++++++ .../ApiAnalysisIssueController.java | 22 +++++++-- .../ApiAnalysisTopicController.java | 10 +--- .../epdc/feign/AnalysisIssueFeignClient.java | 10 ++++ .../AnalysisIssueFeignClientFallback.java | 7 +++ .../epdc/service/AnalysisIssueService.java | 9 ++++ .../impl/AnalysisIssueServiceImpl.java | 7 +++ 15 files changed, 227 insertions(+), 28 deletions(-) create mode 100644 esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/issue/form/HotIssueFormDTO.java create mode 100644 esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/issue/result/HotIssueResultDTO.java diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/issue/form/HotIssueFormDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/issue/form/HotIssueFormDTO.java new file mode 100644 index 000000000..2a9e87eb0 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/issue/form/HotIssueFormDTO.java @@ -0,0 +1,48 @@ +package com.elink.esua.epdc.dto.issue.form; + +import lombok.Data; + +import javax.validation.constraints.Min; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + * @Description 最热议题接口入参DTO + * @Author wgf + * @Date 2020/2/12 8:31 + */ +@Data +public class HotIssueFormDTO implements Serializable { + private static final long serialVersionUID = -1938141144074477454L; + + /** + * 页码，从1开始 + */ + @Min(value = 1, message = "页码必须大于0") + private Integer pageIndex; + + /** + * 页容量，默认10页 + */ + @Min(value = 1, message = "每页条数必须大于必须大于0") + private Integer pageSize = 10; + + /** + * 第一页查询发起时的时间 + */ + @NotBlank(message = "时间戳不能为空") + private String timestamp; + + /** + * 数据时间类型（1:最近1个月，2:最近3个月，3:最近半年，4:最近一年）,默认1 + */ + @NotNull(message = "数据时间类型不能为空") + private Integer someMonthsType = 1; + + /** + * 部门ID列表 + */ + List deptIdList; +} diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/issue/result/HotIssueResultDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/issue/result/HotIssueResultDTO.java new file mode 100644 index 000000000..881ad9bad --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/issue/result/HotIssueResultDTO.java @@ -0,0 +1,32 @@ +package com.elink.esua.epdc.dto.issue.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description 最热议题接口DTO + * @Author wgf + * @Date 2020/2/12 8:31 + */ +@Data +public class HotIssueResultDTO implements Serializable { + private static final long serialVersionUID = -1938141144074477454L; + + /** + * 话题Id（TopicId） + */ + private String id; + + /** + * 内容 + */ + private String content; + + /** + * 表态数 + */ + private String statementNum; + + +} diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/topic/result/HotTopicResultDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/topic/result/HotTopicResultDTO.java index 7bb84bc1f..71fba9e14 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/topic/result/HotTopicResultDTO.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/topic/result/HotTopicResultDTO.java @@ -5,9 +5,9 @@ import lombok.Data; import java.io.Serializable; /** - * @Description 话题列表DTO - * @Author yinzuomei - * @Date 2020/2/10 11:31 + * @Description 最热话题接口DTO + * @Author wgf + * @Date 2020/2/11 11:31 */ @Data public class HotTopicResultDTO implements Serializable { diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/AppIssueAnalysisController.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/AppIssueAnalysisController.java index b356b884d..c4f78da57 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/AppIssueAnalysisController.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/AppIssueAnalysisController.java @@ -1,8 +1,11 @@ package com.elink.esua.epdc.modules.issue.controller; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; +import com.elink.esua.epdc.dto.issue.form.HotIssueFormDTO; import com.elink.esua.epdc.dto.issue.form.IssueStatisticsInfoFormDTO; import com.elink.esua.epdc.dto.issue.form.NewIssueFormDTO; +import com.elink.esua.epdc.dto.issue.result.HotIssueResultDTO; import com.elink.esua.epdc.dto.issue.result.IssueStatisticsInfoResultDTO; import com.elink.esua.epdc.dto.issue.result.NewIssueResultDTO; import com.elink.esua.epdc.modules.issue.service.IssueAnalysisService; @@ -47,7 +50,24 @@ public class AppIssueAnalysisController { */ @GetMapping("getNewIssueList") public Result> getNewIssueList(@RequestBody NewIssueFormDTO formDTO) { + //效验数据 + ValidatorUtils.validateEntity(formDTO); List list = issueAnalysisService.getNewIssueList(formDTO); return new Result>().ok(list); } + + /** + * @Description: 最热议题接口 + * @Param: [tokenDto, formDto] + * @return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Author: wgf + * @Date: 2020-02-12 + */ + @GetMapping("getHotIssueList") + public Result> getHotIssueList(@RequestBody HotIssueFormDTO formDTO) { + //效验数据 + ValidatorUtils.validateEntity(formDTO); + List list = issueAnalysisService.getHotIssueList(formDTO); + return new Result>().ok(list); + } } diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/issue/dao/IssueAnalysisDao.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/issue/dao/IssueAnalysisDao.java index b7e650777..f111278e0 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/issue/dao/IssueAnalysisDao.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/issue/dao/IssueAnalysisDao.java @@ -18,12 +18,10 @@ package com.elink.esua.epdc.modules.issue.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; +import com.elink.esua.epdc.dto.issue.form.HotIssueFormDTO; import com.elink.esua.epdc.dto.issue.form.IssueStatisticsInfoFormDTO; import com.elink.esua.epdc.dto.issue.form.NewIssueFormDTO; -import com.elink.esua.epdc.dto.issue.result.IssueClassifiedStatisticDTO; -import com.elink.esua.epdc.dto.issue.result.IssueResultDTO; -import com.elink.esua.epdc.dto.issue.result.IssueStatisticsInfoResultDTO; -import com.elink.esua.epdc.dto.issue.result.NewIssueResultDTO; +import com.elink.esua.epdc.dto.issue.result.*; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -115,4 +113,11 @@ public interface IssueAnalysisDao extends BaseDao { * @return */ List selectNewIssueList(NewIssueFormDTO formDto); + + /** + * 最热议题接口 + * @param formDto + * @return + */ + List selectHotIssueList(HotIssueFormDTO formDto); } diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/issue/service/IssueAnalysisService.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/issue/service/IssueAnalysisService.java index 3fa5203dd..491159b85 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/issue/service/IssueAnalysisService.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/issue/service/IssueAnalysisService.java @@ -1,12 +1,10 @@ package com.elink.esua.epdc.modules.issue.service; import com.elink.esua.epdc.commons.tools.page.PageData; +import com.elink.esua.epdc.dto.issue.form.HotIssueFormDTO; import com.elink.esua.epdc.dto.issue.form.IssueStatisticsInfoFormDTO; import com.elink.esua.epdc.dto.issue.form.NewIssueFormDTO; -import com.elink.esua.epdc.dto.issue.result.IssueClassifiedStatisticDTO; -import com.elink.esua.epdc.dto.issue.result.IssueResultDTO; -import com.elink.esua.epdc.dto.issue.result.IssueStatisticsInfoResultDTO; -import com.elink.esua.epdc.dto.issue.result.NewIssueResultDTO; +import com.elink.esua.epdc.dto.issue.result.*; import java.util.List; import java.util.Map; @@ -61,4 +59,13 @@ public interface IssueAnalysisService { * @Date: 2020-02-11 */ List getNewIssueList(NewIssueFormDTO formDto); + + /** + * @Description: 最热议题接口 + * @Param: [formDto] + * @return: java.util.List + * @Author: wgf + * @Date: 2020-02-12 + */ + List getHotIssueList(HotIssueFormDTO formDto); } diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueAnalysisServiceImpl.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueAnalysisServiceImpl.java index 8d5078b18..79f3a454f 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueAnalysisServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueAnalysisServiceImpl.java @@ -8,12 +8,10 @@ import com.elink.esua.epdc.commons.tools.security.user.SecurityUser; import com.elink.esua.epdc.commons.tools.security.user.UserDetail; import com.elink.esua.epdc.datasources.DataSourceNames; import com.elink.esua.epdc.datasources.annotation.DataSource; +import com.elink.esua.epdc.dto.issue.form.HotIssueFormDTO; import com.elink.esua.epdc.dto.issue.form.IssueStatisticsInfoFormDTO; import com.elink.esua.epdc.dto.issue.form.NewIssueFormDTO; -import com.elink.esua.epdc.dto.issue.result.IssueClassifiedStatisticDTO; -import com.elink.esua.epdc.dto.issue.result.IssueResultDTO; -import com.elink.esua.epdc.dto.issue.result.IssueStatisticsInfoResultDTO; -import com.elink.esua.epdc.dto.issue.result.NewIssueResultDTO; +import com.elink.esua.epdc.dto.issue.result.*; import com.elink.esua.epdc.modules.issue.dao.IssueAnalysisDao; import com.elink.esua.epdc.modules.issue.service.IssueAnalysisService; import org.apache.commons.lang3.StringUtils; @@ -124,4 +122,12 @@ public class IssueAnalysisServiceImpl extends BaseServiceImpl list = baseDao.selectNewIssueList(formDto); return list; } + + @Override + public List getHotIssueList(HotIssueFormDTO formDto) { + int pageIndex = (formDto.getPageIndex() - NumConstant.ONE) * formDto.getPageSize(); + formDto.setPageIndex(pageIndex); + List list = baseDao.selectHotIssueList(formDto); + return list; + } } diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/topic/controller/AppTopicAnalysisController.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/topic/controller/AppTopicAnalysisController.java index ad72a6290..1085894a4 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/topic/controller/AppTopicAnalysisController.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/topic/controller/AppTopicAnalysisController.java @@ -18,6 +18,7 @@ package com.elink.esua.epdc.modules.topic.controller; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.dto.topic.form.HotTopicFormDTO; import com.elink.esua.epdc.dto.topic.form.NewHotTopicFormDTO; import com.elink.esua.epdc.modules.topic.service.TopicAnalysisService; @@ -50,6 +51,8 @@ public class AppTopicAnalysisController { **/ @GetMapping("getHotTopicList") public Result getHotTopicList(@RequestBody HotTopicFormDTO hotTopicFormDTO) { + //效验数据 + ValidatorUtils.validateEntity(hotTopicFormDTO); Result result = topicAnalysisService.getHotTopicList(hotTopicFormDTO); return result; } @@ -63,6 +66,8 @@ public class AppTopicAnalysisController { **/ @GetMapping("getNewTopicList") public Result getNewTopicList(@RequestBody NewHotTopicFormDTO newHotTopicFormDTO) { + //效验数据 + ValidatorUtils.validateEntity(newHotTopicFormDTO); Result result = topicAnalysisService.getNewTopicList(newHotTopicFormDTO); return result; } diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/issue/IssueAnalysisDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/issue/IssueAnalysisDao.xml index 97d15118f..5ea1fbccc 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/issue/IssueAnalysisDao.xml +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/issue/IssueAnalysisDao.xml @@ -306,4 +306,41 @@ eimg.IMG_URL + + + diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAnalysisIssueController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAnalysisIssueController.java index 483dc5b73..fd5e1a060 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAnalysisIssueController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAnalysisIssueController.java @@ -5,14 +5,15 @@ import com.elink.esua.epdc.commons.tools.annotation.LoginUser; import com.elink.esua.epdc.commons.tools.security.user.SecurityUser; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; +import com.elink.esua.epdc.dto.issue.form.HotIssueFormDTO; import com.elink.esua.epdc.dto.issue.form.IssueStatisticsInfoFormDTO; import com.elink.esua.epdc.dto.issue.form.NewIssueFormDTO; +import com.elink.esua.epdc.dto.issue.result.HotIssueResultDTO; import com.elink.esua.epdc.dto.issue.result.IssueStatisticsInfoResultDTO; import com.elink.esua.epdc.dto.issue.result.NewIssueResultDTO; import com.elink.esua.epdc.service.AnalysisIssueService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -51,7 +52,7 @@ public class ApiAnalysisIssueController { * @Date: 2020-02-11 */ @GetMapping("getStatisticsByCategory") - public Result> getStatisticsByCategory(@RequestBody IssueStatisticsInfoFormDTO formDto) { + public Result> getStatisticsByCategory(IssueStatisticsInfoFormDTO formDto) { //效验数据 ValidatorUtils.validateEntity(formDto); formDto.setDeptIdList(SecurityUser.getUser().getDeptIdList()); @@ -66,10 +67,21 @@ public class ApiAnalysisIssueController { * @Date: 2020-02-11 */ @GetMapping("getNewIssueList") - public Result> getNewIssueList(@RequestBody NewIssueFormDTO formDto) { - //效验数据 - ValidatorUtils.validateEntity(formDto); + public Result> getNewIssueList(NewIssueFormDTO formDto) { formDto.setDeptIdList(SecurityUser.getUser().getDeptIdList()); return analysisIssueService.getNewIssueList(formDto); } + + /** + * @Description: 最热议题接口 + * @Param: [formDto] + * @return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Author: wgf + * @Date: 2020-02-11 + */ + @GetMapping("getHotIssueList") + public Result> getHotIssueList(HotIssueFormDTO formDto) { + formDto.setDeptIdList(SecurityUser.getUser().getDeptIdList()); + return analysisIssueService.getHotIssueList(formDto); + } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAnalysisTopicController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAnalysisTopicController.java index ac8fe6782..0bcf9e6a1 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAnalysisTopicController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAnalysisTopicController.java @@ -3,13 +3,11 @@ package com.elink.esua.epdc.controller; import com.elink.esua.epdc.common.token.dto.TokenDto; import com.elink.esua.epdc.commons.tools.annotation.LoginUser; import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.dto.topic.form.HotTopicFormDTO; import com.elink.esua.epdc.dto.topic.form.NewHotTopicFormDTO; import com.elink.esua.epdc.service.AnalysisTopicService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -46,9 +44,7 @@ public class ApiAnalysisTopicController { * @Date: 2020/02/11 09:45 */ @GetMapping("getHotTopicList") - public Result getHotTopicList(@RequestBody HotTopicFormDTO hotTopicFormDTO) { - //效验数据 - ValidatorUtils.validateEntity(hotTopicFormDTO); + public Result getHotTopicList(HotTopicFormDTO hotTopicFormDTO) { return analysisTopicService.getHotTopicList(hotTopicFormDTO); } @@ -60,9 +56,7 @@ public class ApiAnalysisTopicController { * @Date: 2020/02/11 09:45 */ @GetMapping("getNewTopicList") - public Result getNewTopicList(@RequestBody NewHotTopicFormDTO newHotTopicFormDTO) { - //效验数据 - ValidatorUtils.validateEntity(newHotTopicFormDTO); + public Result getNewTopicList(NewHotTopicFormDTO newHotTopicFormDTO) { return analysisTopicService.getNewTopicList(newHotTopicFormDTO); } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AnalysisIssueFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AnalysisIssueFeignClient.java index 03f6865fa..fcca38a77 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AnalysisIssueFeignClient.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AnalysisIssueFeignClient.java @@ -3,8 +3,10 @@ package com.elink.esua.epdc.feign; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.config.FeignRequestInterceptor; +import com.elink.esua.epdc.dto.issue.form.HotIssueFormDTO; import com.elink.esua.epdc.dto.issue.form.IssueStatisticsInfoFormDTO; import com.elink.esua.epdc.dto.issue.form.NewIssueFormDTO; +import com.elink.esua.epdc.dto.issue.result.HotIssueResultDTO; import com.elink.esua.epdc.dto.issue.result.IssueStatisticsInfoResultDTO; import com.elink.esua.epdc.dto.issue.result.NewIssueResultDTO; import com.elink.esua.epdc.feign.fallback.AnalysisIssueFeignClientFallback; @@ -50,4 +52,12 @@ public interface AnalysisIssueFeignClient { */ @GetMapping(value = "analysis/appissue/getNewIssueList") Result> getNewIssueList(NewIssueFormDTO formDto); + + /** + * 最热议题接口 + * @param formDto + * @return + */ + @GetMapping(value = "analysis/appissue/getHotIssueList") + Result> getHotIssueList(HotIssueFormDTO formDto); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisIssueFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisIssueFeignClientFallback.java index edf210cd1..65f8ce3f0 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisIssueFeignClientFallback.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisIssueFeignClientFallback.java @@ -3,8 +3,10 @@ package com.elink.esua.epdc.feign.fallback; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.issue.form.HotIssueFormDTO; import com.elink.esua.epdc.dto.issue.form.IssueStatisticsInfoFormDTO; import com.elink.esua.epdc.dto.issue.form.NewIssueFormDTO; +import com.elink.esua.epdc.dto.issue.result.HotIssueResultDTO; import com.elink.esua.epdc.dto.issue.result.IssueStatisticsInfoResultDTO; import com.elink.esua.epdc.dto.issue.result.NewIssueResultDTO; import com.elink.esua.epdc.feign.AnalysisIssueFeignClient; @@ -35,4 +37,9 @@ public class AnalysisIssueFeignClientFallback implements AnalysisIssueFeignClien return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "getNewIssueList", formDto); } + @Override + public Result> getHotIssueList(HotIssueFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "getHotIssueList", formDto); + } + } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AnalysisIssueService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AnalysisIssueService.java index 0433327fb..f9e325ebc 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AnalysisIssueService.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AnalysisIssueService.java @@ -1,8 +1,10 @@ package com.elink.esua.epdc.service; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.issue.form.HotIssueFormDTO; import com.elink.esua.epdc.dto.issue.form.IssueStatisticsInfoFormDTO; import com.elink.esua.epdc.dto.issue.form.NewIssueFormDTO; +import com.elink.esua.epdc.dto.issue.result.HotIssueResultDTO; import com.elink.esua.epdc.dto.issue.result.IssueStatisticsInfoResultDTO; import com.elink.esua.epdc.dto.issue.result.NewIssueResultDTO; @@ -39,4 +41,11 @@ public interface AnalysisIssueService { * @return */ Result> getNewIssueList(NewIssueFormDTO formDto); + + /** + * 最热议题接口 + * @param formDto + * @return + */ + Result> getHotIssueList(HotIssueFormDTO formDto); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AnalysisIssueServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AnalysisIssueServiceImpl.java index 514c5ffe2..3840f3206 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AnalysisIssueServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AnalysisIssueServiceImpl.java @@ -2,8 +2,10 @@ package com.elink.esua.epdc.service.impl; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.issue.form.HotIssueFormDTO; import com.elink.esua.epdc.dto.issue.form.IssueStatisticsInfoFormDTO; import com.elink.esua.epdc.dto.issue.form.NewIssueFormDTO; +import com.elink.esua.epdc.dto.issue.result.HotIssueResultDTO; import com.elink.esua.epdc.dto.issue.result.IssueStatisticsInfoResultDTO; import com.elink.esua.epdc.dto.issue.result.NewIssueResultDTO; import com.elink.esua.epdc.feign.AnalysisIssueFeignClient; @@ -40,4 +42,9 @@ public class AnalysisIssueServiceImpl implements AnalysisIssueService { public Result> getNewIssueList(NewIssueFormDTO formDto) { return analysisIssueFeignClient.getNewIssueList(formDto); } + + @Override + public Result> getHotIssueList(HotIssueFormDTO formDto) { + return analysisIssueFeignClient.getHotIssueList(formDto); + } }