diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueResultDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueResultDTO.java new file mode 100644 index 000000000..b3b38979d --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueResultDTO.java @@ -0,0 +1,64 @@ +package com.elink.esua.epdc.dto.issue.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * @Description 议题列表DTO + * @Author yinzuomei + * @Date 2020/2/10 15:58 + */ +@Data +public class IssueResultDTO implements Serializable { + /** + * epdc_issue主键 + */ + private String id; + + /** + * 议题内容 + */ + private String issueContent; + + /** + * 来源网格-所有部门 + */ + private String allDeptNames; + + /** + * 用户昵称 + */ + private String nickName; + + /** + * 发布时间 + */ + private Date createdTime; + + /** + * 支持-点赞次数 + */ + private Integer approveNum; + + /** + * 反对-踩次数 + */ + private Integer opposeNum; + + /** + * 评论数 + */ + private Integer commentNum; + + /** + * 浏览数 + */ + private Integer browseNum; + + /** + * 表达态度（评论+回复+浏览） + */ + private Integer expressAttitudeNum; +} diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemResultDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemResultDTO.java index aa9fe5c60..6e938d00e 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemResultDTO.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemResultDTO.java @@ -22,36 +22,11 @@ public class ItemResultDTO implements Serializable { */ private String itemContent; - /** - * 父所有部门ID - */ - private String parentDeptIds; - - /** - * 父所有部门 - */ - private String parentDeptNames; - - /** - * 所有部门ID - */ - private String allDeptIds; - /** * 所有部门 */ private String allDeptNames; - /** - * 网格 - */ - private String grid; - - /** - * 网格ID - */ - private Long gridId; - /** * 发布人用户昵称 */ diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/topic/result/TopicResultDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/topic/result/TopicResultDTO.java index 270dcb88a..17c9f46a6 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/topic/result/TopicResultDTO.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/topic/result/TopicResultDTO.java @@ -24,36 +24,11 @@ public class TopicResultDTO implements Serializable { */ private String topicContent; - /** - * 父所有部门ID - */ - private String parentDeptIds; - - /** - * 父所有部门 - */ - private String parentDeptNames; - - /** - * 所有部门ID - */ - private String allDeptIds; - /** * 所有部门 */ private String allDeptNames; - /** - * 网格 - */ - private String grid; - - /** - * 网格ID - */ - private Long gridId; - /** * 网格来源群名称 */ @@ -62,7 +37,7 @@ public class TopicResultDTO implements Serializable { /** * 话题发布人姓名 */ - private String nickname; + private String nickName; /** * 发布时间 diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/IssueController.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/IssueController.java new file mode 100644 index 000000000..29d382050 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/IssueController.java @@ -0,0 +1,52 @@ +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.result.IssueResultDTO; +import com.elink.esua.epdc.modules.issue.service.IssueService; +import org.springframework.beans.factory.annotation.Autowired; +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.Map; + +/** + * @Description 议题相关 + * @Author yinzuomei + * @Date 2020/2/10 16:06 + */ +@RestController +@RequestMapping("issue") +public class IssueController { + @Autowired + private IssueService issueService; + + /** + * @param params + * @return com.elink.esua.epdc.dto.issue.result.IssueResultDTO + * @Author yinzuomei + * @Description 最热议题列表 + * @Date 2020/2/10 16:15 + **/ + @GetMapping("pageHottestIssue") + public Result> pageHottestIssue(@RequestParam Map params) { + PageData page = issueService.listHottestIssue(params); + return new Result>().ok(page); + } + + /** + * @param params + * @return com.elink.esua.epdc.dto.issue.result.IssueResultDTO + * @Author yinzuomei + * @Description 最新议题列表 + * @Date 2020/2/10 16:15 + **/ + @GetMapping("pageLatestIssue") + public Result> pageLatestIssue(@RequestParam Map params) { + PageData page = issueService.listLatestIssue(params); + return new Result>().ok(page); + } + +} diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/issue/dao/IssueDao.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/issue/dao/IssueDao.java new file mode 100644 index 000000000..60bbdb98c --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/issue/dao/IssueDao.java @@ -0,0 +1,52 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.modules.issue.dao; + +import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; +import com.elink.esua.epdc.dto.issue.result.IssueResultDTO; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; + + +/** + * @Description 议题相关 + * @Author yinzuomei + * @Date 2020/2/10 16:06 + */ +@Mapper +public interface IssueDao extends BaseDao { + /** + * @param params + * @return java.util.List + * @Author yinzuomei + * @Description 最热议题列表 + * @Date 2020/2/10 16:19 + **/ + List selectListHottestIssue(Map params); + + /** + * @param params + * @return java.util.List + * @Author yinzuomei + * @Description 最新议题列表 + * @Date 2020/2/10 16:19 + **/ + List selectListLatestIssue(Map params); +} diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/issue/service/IssueService.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/issue/service/IssueService.java new file mode 100644 index 000000000..d4c316cab --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/issue/service/IssueService.java @@ -0,0 +1,31 @@ +package com.elink.esua.epdc.modules.issue.service; + +import com.elink.esua.epdc.commons.tools.page.PageData; +import com.elink.esua.epdc.dto.issue.result.IssueResultDTO; + +import java.util.Map; + +/** + * @Description 议题相关 + * @Author yinzuomei + * @Date 2020/2/10 16:06 + */ +public interface IssueService { + /** + * @param params + * @return com.elink.esua.epdc.commons.tools.page.PageData + * @Author yinzuomei + * @Description 最热议题列表 + * @Date 2020/2/10 16:16 + **/ + PageData listHottestIssue(Map params); + + /** + * @param params + * @return com.elink.esua.epdc.commons.tools.page.PageData + * @Author yinzuomei + * @Description 最新议题列表 + * @Date 2020/2/10 16:16 + **/ + PageData listLatestIssue(Map params); +} diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java new file mode 100644 index 000000000..f7ce97cc9 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java @@ -0,0 +1,59 @@ +package com.elink.esua.epdc.modules.issue.service.impl; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; +import com.elink.esua.epdc.commons.tools.page.PageData; +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.result.IssueResultDTO; +import com.elink.esua.epdc.modules.issue.dao.IssueDao; +import com.elink.esua.epdc.modules.issue.service.IssueService; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Map; + +/** + * @Description 议题相关 + * @Author yinzuomei + * @Date 2020/2/10 16:06 + */ +@Service +public class IssueServiceImpl extends BaseServiceImpl implements IssueService { + + /** + * @param params + * @return com.elink.esua.epdc.commons.tools.page.PageData + * @Author yinzuomei + * @Description 最热议题列表 + * @Date 2020/2/10 16:17 + **/ + @DataSource(name = DataSourceNames.FOURTH) + @Override + public PageData listHottestIssue(Map params) { + UserDetail userDetail= SecurityUser.getUser(); + params.put("deptIdList",userDetail.getDeptIdList()); + IPage page = getPage(params); + List list = baseDao.selectListHottestIssue(params); + return new PageData<>(list, page.getTotal()); + } + + /** + * @param params + * @return com.elink.esua.epdc.commons.tools.page.PageData + * @Author yinzuomei + * @Description 最新议题列表 + * @Date 2020/2/10 16:17 + **/ + @DataSource(name = DataSourceNames.FOURTH) + @Override + public PageData listLatestIssue(Map params) { + UserDetail userDetail= SecurityUser.getUser(); + params.put("deptIdList",userDetail.getDeptIdList()); + IPage page = getPage(params); + List list = baseDao.selectListLatestIssue(params); + return new PageData<>(list, page.getTotal()); + } +} diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index 26360c7f5..c6a499082 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java @@ -3,6 +3,8 @@ package com.elink.esua.epdc.modules.item.service.impl; import com.baomidou.mybatisplus.core.metadata.IPage; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; import com.elink.esua.epdc.commons.tools.page.PageData; +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.item.result.ItemResultDTO; @@ -30,6 +32,8 @@ public class ItemServiceImpl extends BaseServiceImpl imp @DataSource(name = DataSourceNames.FOURTH) @Override public PageData listItemResultDTO(Map params) { + UserDetail userDetail = SecurityUser.getUser(); + params.put("deptIdList", userDetail.getDeptIdList()); IPage page = getPage(params); List list = baseDao.selectListHottestItemResultDTO(params); return new PageData<>(list, page.getTotal()); diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/topic/service/impl/TopicServiceImpl.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/topic/service/impl/TopicServiceImpl.java index fc53e5d42..e3f31c2fe 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/topic/service/impl/TopicServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/topic/service/impl/TopicServiceImpl.java @@ -3,6 +3,8 @@ package com.elink.esua.epdc.modules.topic.service.impl; import com.baomidou.mybatisplus.core.metadata.IPage; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; import com.elink.esua.epdc.commons.tools.page.PageData; +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.topic.result.TopicResultDTO; @@ -31,7 +33,8 @@ public class TopicServiceImpl extends BaseServiceImpl @DataSource(name = DataSourceNames.FIFTH) @Override public PageData listHottestTopic(Map params) { - + UserDetail userDetail = SecurityUser.getUser(); + params.put("deptIdList", userDetail.getDeptIdList()); IPage page = getPage(params); List list = baseDao.selectListHottestTopicDTO(params); return new PageData<>(list, page.getTotal()); @@ -47,6 +50,8 @@ public class TopicServiceImpl extends BaseServiceImpl @DataSource(name = DataSourceNames.FIFTH) @Override public PageData listLatestTopic(Map params) { + UserDetail userDetail = SecurityUser.getUser(); + params.put("deptIdList", userDetail.getDeptIdList()); IPage page = getPage(params); List list = baseDao.selectListLatesttTopicDTO(params); return new PageData<>(list, page.getTotal()); diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/issue/IssueDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/issue/IssueDao.xml new file mode 100644 index 000000000..b97d7f438 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/issue/IssueDao.xml @@ -0,0 +1,106 @@ + + + + + + + + + + diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/item/ItemDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/item/ItemDao.xml index 4cba6a36c..d2dca2d1d 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/item/ItemDao.xml +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/item/ItemDao.xml @@ -6,11 +6,7 @@ SELECT ei.id, ei.ITEM_CONTENT, - ei.PARENT_DEPT_IDS, - ei.PARENT_DEPT_NAMES, - ei.ALL_DEPT_IDS, ei.ALL_DEPT_NAMES, - ei.GRID_ID, ei.GRID, ei.NICK_NAME, ei.CREATED_TIME AS releaseTime, @@ -46,6 +42,12 @@ and DATE_FORMAT( ei.CREATED_TIME, '%Y-%m-%d' ) <=#{endTime} + + and ei.GRID_ID in + + #{deptId} + + ORDER BY expressAttitudeNum DESC diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/topic/TopicDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/topic/TopicDao.xml index 4984cae3a..a21b690ba 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/topic/TopicDao.xml +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/topic/TopicDao.xml @@ -7,11 +7,7 @@ select et.ID, et.TOPIC_CONTENT, - et.PARENT_DEPT_IDS, - et.PARENT_DEPT_NAMES, - et.ALL_DEPT_IDS, et.ALL_DEPT_NAMES, - et.GRID_ID, et.GRID, et.GROUP_NAME, et.NICKNAME, @@ -21,6 +17,7 @@ et.COMMENT_NUM+et.BROWSE_NUM as expressAttitudeNum from epdc_topic et where et.DEL_FLAG='0' + and et.STATE='0' and et.TOPIC_CONTENT like concat('%', #{topicContent}, '%') @@ -42,6 +39,12 @@ and DATE_FORMAT( et.CREATED_TIME, '%Y-%m-%d' ) <=#{endTime} + + and et.GRID_ID in + + #{deptId} + + order by expressAttitudeNum desc @@ -50,11 +53,7 @@ select et.ID, et.TOPIC_CONTENT, - et.PARENT_DEPT_IDS, - et.PARENT_DEPT_NAMES, - et.ALL_DEPT_IDS, et.ALL_DEPT_NAMES, - et.GRID_ID, et.GRID, et.GROUP_NAME, et.NICKNAME, @@ -64,6 +63,7 @@ et.COMMENT_NUM+et.BROWSE_NUM as expressAttitudeNum from epdc_topic et where et.DEL_FLAG='0' + and et.STATE='0' and et.TOPIC_CONTENT like concat('%', #{topicContent}, '%') @@ -85,6 +85,12 @@ and DATE_FORMAT( et.CREATED_TIME, '%Y-%m-%d' ) <=#{endTime} + + and et.GRID_ID in + + #{deptId} + + order by expressAttitudeNum desc,releaseTime desc