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 new file mode 100644 index 000000000..3d67ba27f --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/topic/form/NewHotTopicFormDTO.java @@ -0,0 +1,41 @@ +package com.elink.esua.epdc.dto.topic.form; + +import lombok.Data; + +import javax.validation.constraints.Min; +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Description 最新发布话题接口入参DTO + * @Author wgf + * @Date 2020/2/11 10:31 + */ +@Data +public class NewHotTopicFormDTO implements Serializable { + private static final long serialVersionUID = -1938141144074477454L; + + /** + * 页码，从1开始 + */ + @Min(value = 1, message = "页码必须大于0") + private int pageIndex; + + /** + * 页容量，默认10页 + */ + @Min(value = 1, message = "每页条数必须大于必须大于0") + private int pageSize = 10; + + /** + * 第一页查询发起时的时间 + */ + @NotBlank(message = "时间戳不能为空") + private String timestamp; + + /** + * 数据时间类型（1:最近1个月，2:最近3个月，3:最近半年，4:最近一年）,默认1 + */ + @NotBlank(message = "数据时间类型不能为空") + private int someMonthsType = 1; +} 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 new file mode 100644 index 000000000..75ae82644 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/topic/result/NewHotTopicResultDTO.java @@ -0,0 +1,43 @@ +package com.elink.esua.epdc.dto.topic.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description 话题列表DTO + * @Author yinzuomei + * @Date 2020/2/10 11:31 + */ +@Data +public class NewHotTopicResultDTO 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-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 0de037bbc..ad72a6290 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 @@ -19,6 +19,7 @@ package com.elink.esua.epdc.modules.topic.controller; import com.elink.esua.epdc.commons.tools.utils.Result; 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; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -53,4 +54,17 @@ public class AppTopicAnalysisController { return result; } + /** + * @param newHotTopicFormDTO + * @return com.elink.esua.epdc.dto.result.TopicResultDTO + * @Author wanggongfeng + * @Description 最新发布话题接口 + * @Date 2020/2/11 11:12 + **/ + @GetMapping("getNewTopicList") + public Result getNewTopicList(@RequestBody NewHotTopicFormDTO newHotTopicFormDTO) { + Result result = topicAnalysisService.getNewTopicList(newHotTopicFormDTO); + return result; + } + } 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 9a1e6ec5b..bd1bad955 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 @@ -19,9 +19,12 @@ package com.elink.esua.epdc.modules.topic.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.elink.esua.epdc.dto.topic.form.HotTopicFormDTO; +import com.elink.esua.epdc.dto.topic.form.NewHotTopicFormDTO; 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; @@ -58,5 +61,12 @@ public interface TopicAnalysisDao extends BaseMapper { * @param hotTopicFormDTO * @return */ - List getHotTopicList(HotTopicFormDTO hotTopicFormDTO,List deptIdList); + List selectHotTopicList(@Param("hotTopicFormDTO")HotTopicFormDTO hotTopicFormDTO,@Param("deptIdList")List deptIdList); + + /** + * 最新发布话题接口 + * @param newHotTopicFormDTO + * @return + */ + List selectNewHotTopicList(@Param("newHotTopicFormDTO")NewHotTopicFormDTO newHotTopicFormDTO, @Param("deptIdList")List deptIdList); } diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/topic/service/TopicAnalysisService.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/topic/service/TopicAnalysisService.java index d9ac672dc..7f41226a5 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/topic/service/TopicAnalysisService.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/topic/service/TopicAnalysisService.java @@ -20,6 +20,7 @@ package com.elink.esua.epdc.modules.topic.service; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.topic.form.HotTopicFormDTO; +import com.elink.esua.epdc.dto.topic.form.NewHotTopicFormDTO; import com.elink.esua.epdc.dto.topic.result.TopicResultDTO; import java.util.Map; @@ -55,4 +56,11 @@ public interface TopicAnalysisService { * @return */ Result getHotTopicList(HotTopicFormDTO hotTopicFormDTO); + + /** + * 最新发布话题接口 + * @param newHotTopicFormDTO + * @return + */ + Result getNewTopicList(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 4248ecad3..2808c295f 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 @@ -9,7 +9,9 @@ import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.datasources.DataSourceNames; import com.elink.esua.epdc.datasources.annotation.DataSource; import com.elink.esua.epdc.dto.topic.form.HotTopicFormDTO; +import com.elink.esua.epdc.dto.topic.form.NewHotTopicFormDTO; 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 com.elink.esua.epdc.modules.topic.dao.TopicAnalysisDao; import com.elink.esua.epdc.modules.topic.service.TopicAnalysisService; @@ -66,9 +68,33 @@ public class TopicAnalysisServiceImpl extends BaseServiceImpl(list, page.getTotal()); } + /** + * 最热话题接口 + * @param hotTopicFormDTO + * @Author wanggongfeng + * @return + */ @Override public Result getHotTopicList(HotTopicFormDTO hotTopicFormDTO){ - List list = baseDao.getHotTopicList(hotTopicFormDTO,SecurityUser.getUser().getDeptIdList()); + List list = baseDao.selectHotTopicList(hotTopicFormDTO,SecurityUser.getUser().getDeptIdList()); + return new Result().ok(list); + } + + /** + * 最新发布话题接口 + * @param newHotTopicFormDTO + * @Author wanggongfeng + * @return + */ + @Override + public Result getNewTopicList(NewHotTopicFormDTO newHotTopicFormDTO){ + //List 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()); return new Result().ok(list); } 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 9d7d2bc7f..7dd7e0157 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 @@ -89,7 +89,7 @@ - SELECT et.ID, et.TOPIC_CONTENT content, @@ -99,17 +99,55 @@ WHERE et.DEL_FLAG = '0' AND et.STATE = 0 - AND DATE_SUB( CURDATE( ), INTERVAL #{someMonthsType} MONTH ) <= et.CREATED_TIME + AND DATE_SUB( CURDATE( ), INTERVAL #{hotTopicFormDTO.someMonthsType} MONTH ) <= et.CREATED_TIME AND et.GRID_ID IN #{deptIdItem} - - #{timestamp} + + #{hotTopicFormDTO.timestamp} ORDER BY statementNum DESC - LIMIT #{pageIndex},#{pageSize} + LIMIT #{hotTopicFormDTO.pageIndex},#{hotTopicFormDTO.pageSize} + + + + + + + + + + + + + + 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 a6dee654d..778cf2c41 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 @@ -4,6 +4,7 @@ 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.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; @@ -44,7 +45,19 @@ public class ApiAnalysisTopicController { * @Date: 2020/02/11 09:45 */ @GetMapping("getHotTopicList") - public Result getHotTopicList(@LoginUser TokenDto tokenDto, @RequestBody HotTopicFormDTO hotTopicFormDTO) { + public Result getHotTopicList(@RequestBody HotTopicFormDTO hotTopicFormDTO) { return analysisTopicService.getHotTopicList(hotTopicFormDTO); } + + /** + * 最新发布话题接口 + + * @Return: com.elink.esua.epdc.commons.tools.utils.Result<> + * @Author: wgf + * @Date: 2020/02/11 09:45 + */ + @GetMapping("getNewTopicList") + public Result getNewTopicList(@RequestBody 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/AnalysisTopicFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AnalysisTopicFeignClient.java index 1689963f7..58ba012f1 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AnalysisTopicFeignClient.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AnalysisTopicFeignClient.java @@ -4,6 +4,7 @@ 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.topic.form.HotTopicFormDTO; +import com.elink.esua.epdc.dto.topic.form.NewHotTopicFormDTO; import com.elink.esua.epdc.feign.fallback.AnalysisTopicFeignClientFallback; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.http.MediaType; @@ -31,6 +32,9 @@ public interface AnalysisTopicFeignClient { @GetMapping(value = "analysis/apptopic/getHotTopicList", consumes = MediaType.APPLICATION_JSON_VALUE) Result getHotTopicList(HotTopicFormDTO hotTopicFormDTO); + @GetMapping(value = "analysis/apptopic/getNewTopicList", consumes = MediaType.APPLICATION_JSON_VALUE) + Result getNewTopicList(NewHotTopicFormDTO newHotTopicFormDTO); + } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisTopicFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisTopicFeignClientFallback.java index 043480430..6f445ece5 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisTopicFeignClientFallback.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisTopicFeignClientFallback.java @@ -4,6 +4,7 @@ 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.topic.form.HotTopicFormDTO; +import com.elink.esua.epdc.dto.topic.form.NewHotTopicFormDTO; import com.elink.esua.epdc.feign.AnalysisTopicFeignClient; import org.springframework.stereotype.Component; @@ -25,4 +26,9 @@ public class AnalysisTopicFeignClientFallback implements AnalysisTopicFeignClien return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "getHotTopicList"); } + @Override + public Result getNewTopicList(NewHotTopicFormDTO newHotTopicFormDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "getNewTopicList"); + } + } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AnalysisTopicService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AnalysisTopicService.java index dd61d6c88..b4c3545a7 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AnalysisTopicService.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AnalysisTopicService.java @@ -2,6 +2,7 @@ package com.elink.esua.epdc.service; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.topic.form.HotTopicFormDTO; +import com.elink.esua.epdc.dto.topic.form.NewHotTopicFormDTO; /** * 项目模块-数据分析移动端 @@ -27,5 +28,13 @@ public interface AnalysisTopicService { */ Result getHotTopicList(HotTopicFormDTO hotTopicFormDTO); + /** + * 最新发布话题接口 + * @Return: com.elink.esua.epdc.commons.tools.utils.Result<> + * @Author: wanggongfeng + * @return + */ + Result getNewTopicList(NewHotTopicFormDTO newHotTopicFormDTO); + } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AnalysisTopicServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AnalysisTopicServiceImpl.java index 896ecafec..7363ff295 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AnalysisTopicServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AnalysisTopicServiceImpl.java @@ -3,6 +3,7 @@ package com.elink.esua.epdc.service.impl; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.topic.form.HotTopicFormDTO; +import com.elink.esua.epdc.dto.topic.form.NewHotTopicFormDTO; import com.elink.esua.epdc.feign.AnalysisTopicFeignClient; import com.elink.esua.epdc.service.AnalysisTopicService; import org.springframework.beans.factory.annotation.Autowired; @@ -30,4 +31,9 @@ public class AnalysisTopicServiceImpl implements AnalysisTopicService { public Result getHotTopicList(HotTopicFormDTO hotTopicFormDTO) { return analysisTopicFeignClient.getHotTopicList(hotTopicFormDTO); } + + @Override + public Result getNewTopicList(NewHotTopicFormDTO newHotTopicFormDTO) { + return analysisTopicFeignClient.getNewTopicList(newHotTopicFormDTO); + } }