diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/issue/form/NewIssueFormDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/issue/form/NewIssueFormDTO.java new file mode 100644 index 000000000..414571a36 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/issue/form/NewIssueFormDTO.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/11 10:31 + */ +@Data +public class NewIssueFormDTO 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/NewIssueResultDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/issue/result/NewIssueResultDTO.java new file mode 100644 index 000000000..94c11fef1 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/issue/result/NewIssueResultDTO.java @@ -0,0 +1,43 @@ +package com.elink.esua.epdc.dto.issue.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description 最新发布议题接口DTO + * @Author wgf + * @Date 2020/2/10 11:31 + */ +@Data +public class NewIssueResultDTO implements Serializable { + private static final long serialVersionUID = -1938141144074477454L; + + /** + * 话题Id(TopicId) + */ + private String id; + + /** + * 内容 + */ + private String content; + + /** + * 图片 + */ + private List images; + + /** + * 部门名称 + */ + private String deptName; + + /** + * 创建时间 + */ + private String createdTime; + + +} diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/topic/form/HotTopicFormDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/topic/form/HotTopicFormDTO.java index 28e619c38..63d809452 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/topic/form/HotTopicFormDTO.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/topic/form/HotTopicFormDTO.java @@ -5,6 +5,7 @@ import lombok.Data; import javax.validation.constraints.Min; import javax.validation.constraints.NotBlank; import java.io.Serializable; +import java.util.List; /** * @Description 最热话题接口入参DTO @@ -38,4 +39,9 @@ public class HotTopicFormDTO implements Serializable { */ @NotBlank(message = "数据时间类型不能为空") private int someMonthsType = 1; + + /** + * 部门ID列表 + */ + List gridIds; } diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/topic/form/NewHotTopicFormDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/topic/form/NewHotTopicFormDTO.java index 3d67ba27f..c285a0887 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/topic/form/NewHotTopicFormDTO.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/topic/form/NewHotTopicFormDTO.java @@ -5,6 +5,7 @@ import lombok.Data; import javax.validation.constraints.Min; import javax.validation.constraints.NotBlank; import java.io.Serializable; +import java.util.List; /** * @Description 最新发布话题接口入参DTO @@ -38,4 +39,9 @@ public class NewHotTopicFormDTO implements Serializable { */ @NotBlank(message = "数据时间类型不能为空") private int someMonthsType = 1; + + /** + * 部门ID列表 + */ + List gridIds; } diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/topic/result/NewHotTopicResultDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/topic/result/NewHotTopicResultDTO.java index 75ae82644..90107f277 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/topic/result/NewHotTopicResultDTO.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/topic/result/NewHotTopicResultDTO.java @@ -6,8 +6,8 @@ import java.io.Serializable; import java.util.List; /** - * @Description 话题列表DTO - * @Author yinzuomei + * @Description 最新发布话题接口DTO + * @Author wgf * @Date 2020/2/10 11:31 */ @Data 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 new file mode 100644 index 000000000..b356b884d --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/AppIssueAnalysisController.java @@ -0,0 +1,53 @@ +package com.elink.esua.epdc.modules.issue.controller; + +import com.elink.esua.epdc.commons.tools.utils.Result; +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.IssueStatisticsInfoResultDTO; +import com.elink.esua.epdc.dto.issue.result.NewIssueResultDTO; +import com.elink.esua.epdc.modules.issue.service.IssueAnalysisService; +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; + +import java.util.List; + +/** + * @Description 议题App + * @Author wgf + * @Date 2020/2/10 16:06 + */ +@RestController +@RequestMapping("appissue") +public class AppIssueAnalysisController { + @Autowired + private IssueAnalysisService issueAnalysisService; + + /** + * @Description: 议题项目数量类目分析 + * @Param: [tokenDto, formDto] + * @return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Author: zy + * @Date: 2020-02-11 + */ + @GetMapping("getStatisticsByCategory") + public Result> getStatisticsByCategory(@RequestBody IssueStatisticsInfoFormDTO formDTO) { + List list = issueAnalysisService.listStatisticsByCategoryList(formDTO); + return new Result>().ok(list); + } + + /** + * @Description: 最新发布议题接口 + * @Param: [tokenDto, formDto] + * @return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Author: wgf + * @Date: 2020-02-11 + */ + @GetMapping("getNewIssueList") + public Result> getNewIssueList(@RequestBody NewIssueFormDTO formDTO) { + List list = issueAnalysisService.getNewIssueList(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/controller/IssueAnalysisController.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/IssueAnalysisController.java index c5db2b5cd..b24a2cc2f 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/IssueAnalysisController.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/IssueAnalysisController.java @@ -2,15 +2,15 @@ package com.elink.esua.epdc.modules.issue.controller; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.issue.form.IssueStatisticsInfoFormDTO; 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.modules.issue.service.IssueAnalysisService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; -import java.util.List; import java.util.Map; /** @@ -63,16 +63,5 @@ public class IssueAnalysisController { return new Result>().ok(page); } - /** - * @Description: 议题项目数量类目分析 - * @Param: [tokenDto, formDto] - * @return: com.elink.esua.epdc.commons.tools.utils.Result> - * @Author: zy - * @Date: 2020-02-11 - */ - @GetMapping("getStatisticsByCategory") - public Result> getStatisticsByCategory(@RequestBody IssueStatisticsInfoFormDTO formDTO) { - List list = issueAnalysisService.listStatisticsByCategoryList(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 34c32f373..b7e650777 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 @@ -19,9 +19,11 @@ 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.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 org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -106,4 +108,11 @@ public interface IssueAnalysisDao extends BaseDao { * @Date: 2020-02-11 */ List selectListStatisticsByThreeCategory(IssueStatisticsInfoFormDTO formDto); + + /** + * 最新发布议题接口 + * @param formDto + * @return + */ + List selectNewIssueList(NewIssueFormDTO 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 270b98d09..3fa5203dd 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 @@ -2,9 +2,11 @@ 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.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 java.util.List; import java.util.Map; @@ -50,4 +52,13 @@ public interface IssueAnalysisService { * @Date: 2020-02-11 */ List listStatisticsByCategoryList(IssueStatisticsInfoFormDTO formDto); + + /** + * @Description: 最新发布议题接口 + * @Param: [formDto] + * @return: java.util.List + * @Author: wgf + * @Date: 2020-02-11 + */ + List getNewIssueList(NewIssueFormDTO 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 a2d801b36..0f822b263 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 @@ -9,9 +9,11 @@ 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.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.modules.issue.dao.IssueAnalysisDao; import com.elink.esua.epdc.modules.issue.service.IssueAnalysisService; import org.apache.commons.lang3.StringUtils; @@ -112,4 +114,10 @@ public class IssueAnalysisServiceImpl extends BaseServiceImpl getNewIssueList(NewIssueFormDTO formDto) { + List list = baseDao.selectNewIssueList(formDto); + return list; + } } diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/topic/dao/TopicAnalysisDao.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/topic/dao/TopicAnalysisDao.java index bd1bad955..a9d94d663 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/topic/dao/TopicAnalysisDao.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/topic/dao/TopicAnalysisDao.java @@ -24,7 +24,6 @@ import com.elink.esua.epdc.dto.topic.result.HotTopicResultDTO; import com.elink.esua.epdc.dto.topic.result.NewHotTopicResultDTO; import com.elink.esua.epdc.dto.topic.result.TopicResultDTO; import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; @@ -61,12 +60,12 @@ public interface TopicAnalysisDao extends BaseMapper { * @param hotTopicFormDTO * @return */ - List selectHotTopicList(@Param("hotTopicFormDTO")HotTopicFormDTO hotTopicFormDTO,@Param("deptIdList")List deptIdList); + List selectHotTopicList(HotTopicFormDTO hotTopicFormDTO); /** * 最新发布话题接口 * @param newHotTopicFormDTO * @return */ - List selectNewHotTopicList(@Param("newHotTopicFormDTO")NewHotTopicFormDTO newHotTopicFormDTO, @Param("deptIdList")List deptIdList); + List selectNewHotTopicList(NewHotTopicFormDTO newHotTopicFormDTO); } diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/topic/service/impl/TopicAnalysisServiceImpl.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/topic/service/impl/TopicAnalysisServiceImpl.java index 2808c295f..73d05dc5d 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/topic/service/impl/TopicAnalysisServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/topic/service/impl/TopicAnalysisServiceImpl.java @@ -76,7 +76,8 @@ public class TopicAnalysisServiceImpl extends BaseServiceImpl list = baseDao.selectHotTopicList(hotTopicFormDTO,SecurityUser.getUser().getDeptIdList()); + hotTopicFormDTO.setGridIds(SecurityUser.getUser().getDeptIdList()); + List list = baseDao.selectHotTopicList(hotTopicFormDTO); return new Result().ok(list); } @@ -88,13 +89,10 @@ public class TopicAnalysisServiceImpl extends BaseServiceImpl aaa = SecurityUser.getUser().getDeptIdList(); /*Long long1 = 1169158285790900226L; - Long long2 = 1169158285790900226L; - List list2 = new ArrayList(); - list2.add(long1); - list2.add(long2);*/ - List list = baseDao.selectNewHotTopicList(newHotTopicFormDTO,SecurityUser.getUser().getDeptIdList()); + Long long2 = 1169158285790900226L;*/ + newHotTopicFormDTO.setGridIds(SecurityUser.getUser().getDeptIdList()); + List list = baseDao.selectNewHotTopicList(newHotTopicFormDTO); return new Result().ok(list); } 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 420af45b1..44ecf71de 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 @@ -251,4 +251,56 @@ cotegoryName DESC LIMIT 5; + + + + + + + + + + + + + diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/topic/TopicAnalysisDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/topic/TopicAnalysisDao.xml index 7dd7e0157..a61214ce0 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/topic/TopicAnalysisDao.xml +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/topic/TopicAnalysisDao.xml @@ -92,24 +92,35 @@ @@ -125,29 +136,43 @@ 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 d06e1ea2f..41a03c180 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 @@ -6,7 +6,9 @@ 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.IssueStatisticsInfoFormDTO; +import com.elink.esua.epdc.dto.issue.form.NewIssueFormDTO; 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; @@ -56,4 +58,26 @@ public class ApiAnalysisIssueController { formDto.setGridIds(SecurityUser.getUser().getDeptIdList()); return analysisIssueService.listStatisticsByCategory(formDto); } + + /** + * @Description: 最新发布议题接口 + * @Param: [formDto] + * @return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Author: wgf + * @Date: 2020-02-11 + */ + @GetMapping("getNewIssueList") + public Result> getNewIssueList(@RequestBody NewIssueFormDTO formDto) { + //效验数据 + ValidatorUtils.validateEntity(formDto); + Long long1 = 1169158285790900226L; + Long long2 = 1169158285790900226L; + List ll = new ArrayList(); + ll.add(long1); + ll.add(long2); + formDto.setDeptIdList(ll); + //List aa = SecurityUser.getUser().getDeptIdList(); + //formDto.setGridIds(SecurityUser.getUser().getDeptIdList()); + return analysisIssueService.getNewIssueList(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 778cf2c41..ac8fe6782 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,6 +3,7 @@ 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; @@ -46,6 +47,8 @@ public class ApiAnalysisTopicController { */ @GetMapping("getHotTopicList") public Result getHotTopicList(@RequestBody HotTopicFormDTO hotTopicFormDTO) { + //效验数据 + ValidatorUtils.validateEntity(hotTopicFormDTO); return analysisTopicService.getHotTopicList(hotTopicFormDTO); } @@ -58,6 +61,8 @@ public class ApiAnalysisTopicController { */ @GetMapping("getNewTopicList") public Result getNewTopicList(@RequestBody NewHotTopicFormDTO newHotTopicFormDTO) { + //效验数据 + ValidatorUtils.validateEntity(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 e357137f8..03f6865fa 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 @@ -4,7 +4,9 @@ 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.IssueStatisticsInfoFormDTO; +import com.elink.esua.epdc.dto.issue.form.NewIssueFormDTO; 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; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.http.MediaType; @@ -38,6 +40,14 @@ public interface AnalysisIssueFeignClient { * @Author: zy * @Date: 2020-02-11 */ - @GetMapping(value = "analysis/issue/getStatisticsByCategory") + @GetMapping(value = "analysis/appissue/getStatisticsByCategory") Result> getStatisticsByCategory(IssueStatisticsInfoFormDTO formDto); + + /** + * 最新发布议题接口 + * @param formDto + * @return + */ + @GetMapping(value = "analysis/appissue/getNewIssueList") + Result> getNewIssueList(NewIssueFormDTO 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 fdd7d72aa..edf210cd1 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 @@ -4,9 +4,10 @@ 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.IssueStatisticsInfoFormDTO; +import com.elink.esua.epdc.dto.issue.form.NewIssueFormDTO; 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; - import org.springframework.stereotype.Component; import java.util.List; @@ -29,4 +30,9 @@ public class AnalysisIssueFeignClientFallback implements AnalysisIssueFeignClien return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "getStatisticsByCategory", formDto); } + @Override + public Result> getNewIssueList(NewIssueFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "getNewIssueList", 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 dcdb6171c..0433327fb 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 @@ -2,7 +2,9 @@ package com.elink.esua.epdc.service; import com.elink.esua.epdc.commons.tools.utils.Result; 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.IssueStatisticsInfoResultDTO; +import com.elink.esua.epdc.dto.issue.result.NewIssueResultDTO; import java.util.List; @@ -30,4 +32,11 @@ public interface AnalysisIssueService { * @Date: 2020-02-11 */ Result> listStatisticsByCategory(IssueStatisticsInfoFormDTO formDto); + + /** + * 最新发布议题接口 + * @param formDto + * @return + */ + Result> getNewIssueList(NewIssueFormDTO 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 7fa108002..514c5ffe2 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 @@ -3,10 +3,11 @@ package com.elink.esua.epdc.service.impl; import com.elink.esua.epdc.commons.tools.utils.Result; 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.IssueStatisticsInfoResultDTO; +import com.elink.esua.epdc.dto.issue.result.NewIssueResultDTO; import com.elink.esua.epdc.feign.AnalysisIssueFeignClient; import com.elink.esua.epdc.service.AnalysisIssueService; -import com.elink.esua.epdc.service.AnalysisItemService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -34,4 +35,9 @@ public class AnalysisIssueServiceImpl implements AnalysisIssueService { public Result> listStatisticsByCategory(IssueStatisticsInfoFormDTO formDto) { return analysisIssueFeignClient.getStatisticsByCategory(formDto); } + + @Override + public Result> getNewIssueList(NewIssueFormDTO formDto) { + return analysisIssueFeignClient.getNewIssueList(formDto); + } }