Browse Source

最热议题、最新议题列表查询

dev
尹作梅 6 years ago
parent
commit
53e8a8676d
  1. 64
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueResultDTO.java
  2. 25
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemResultDTO.java
  3. 27
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/topic/result/TopicResultDTO.java
  4. 52
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/IssueController.java
  5. 52
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/issue/dao/IssueDao.java
  6. 31
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/issue/service/IssueService.java
  7. 59
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java
  8. 4
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
  9. 7
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/topic/service/impl/TopicServiceImpl.java
  10. 106
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/issue/IssueDao.xml
  11. 10
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/item/ItemDao.xml
  12. 22
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/topic/TopicDao.xml

64
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;
}

25
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;
/**
* 发布人用户昵称
*/

27
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;
/**
* 发布时间

52
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<PageData<IssueResultDTO>> pageHottestIssue(@RequestParam Map<String, Object> params) {
PageData<IssueResultDTO> page = issueService.listHottestIssue(params);
return new Result<PageData<IssueResultDTO>>().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<PageData<IssueResultDTO>> pageLatestIssue(@RequestParam Map<String, Object> params) {
PageData<IssueResultDTO> page = issueService.listLatestIssue(params);
return new Result<PageData<IssueResultDTO>>().ok(page);
}
}

52
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
* <p>
* 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.
* <p>
* 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.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
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<IssueResultDTO> {
/**
* @param params
* @return java.util.List<com.elink.esua.epdc.dto.issue.result.IssueResultDTO>
* @Author yinzuomei
* @Description 最热议题列表
* @Date 2020/2/10 16:19
**/
List<IssueResultDTO> selectListHottestIssue(Map<String, Object> params);
/**
* @param params
* @return java.util.List<com.elink.esua.epdc.dto.issue.result.IssueResultDTO>
* @Author yinzuomei
* @Description 最新议题列表
* @Date 2020/2/10 16:19
**/
List<IssueResultDTO> selectListLatestIssue(Map<String, Object> params);
}

31
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<com.elink.esua.epdc.dto.issue.result.IssueResultDTO>
* @Author yinzuomei
* @Description 最热议题列表
* @Date 2020/2/10 16:16
**/
PageData<IssueResultDTO> listHottestIssue(Map<String, Object> params);
/**
* @param params
* @return com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.issue.result.IssueResultDTO>
* @Author yinzuomei
* @Description 最新议题列表
* @Date 2020/2/10 16:16
**/
PageData<IssueResultDTO> listLatestIssue(Map<String, Object> params);
}

59
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<IssueDao, IssueResultDTO> implements IssueService {
/**
* @param params
* @return com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.issue.result.IssueResultDTO>
* @Author yinzuomei
* @Description 最热议题列表
* @Date 2020/2/10 16:17
**/
@DataSource(name = DataSourceNames.FOURTH)
@Override
public PageData<IssueResultDTO> listHottestIssue(Map<String, Object> params) {
UserDetail userDetail= SecurityUser.getUser();
params.put("deptIdList",userDetail.getDeptIdList());
IPage<IssueResultDTO> page = getPage(params);
List<IssueResultDTO> list = baseDao.selectListHottestIssue(params);
return new PageData<>(list, page.getTotal());
}
/**
* @param params
* @return com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.issue.result.IssueResultDTO>
* @Author yinzuomei
* @Description 最新议题列表
* @Date 2020/2/10 16:17
**/
@DataSource(name = DataSourceNames.FOURTH)
@Override
public PageData<IssueResultDTO> listLatestIssue(Map<String, Object> params) {
UserDetail userDetail= SecurityUser.getUser();
params.put("deptIdList",userDetail.getDeptIdList());
IPage<IssueResultDTO> page = getPage(params);
List<IssueResultDTO> list = baseDao.selectListLatestIssue(params);
return new PageData<>(list, page.getTotal());
}
}

4
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<ItemDao, ItemResultDTO> imp
@DataSource(name = DataSourceNames.FOURTH)
@Override
public PageData<ItemResultDTO> listItemResultDTO(Map<String, Object> params) {
UserDetail userDetail = SecurityUser.getUser();
params.put("deptIdList", userDetail.getDeptIdList());
IPage<ItemResultDTO> page = getPage(params);
List<ItemResultDTO> list = baseDao.selectListHottestItemResultDTO(params);
return new PageData<>(list, page.getTotal());

7
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<TopicDao, TopicResultDTO>
@DataSource(name = DataSourceNames.FIFTH)
@Override
public PageData<TopicResultDTO> listHottestTopic(Map<String, Object> params) {
UserDetail userDetail = SecurityUser.getUser();
params.put("deptIdList", userDetail.getDeptIdList());
IPage<TopicResultDTO> page = getPage(params);
List<TopicResultDTO> list = baseDao.selectListHottestTopicDTO(params);
return new PageData<>(list, page.getTotal());
@ -47,6 +50,8 @@ public class TopicServiceImpl extends BaseServiceImpl<TopicDao, TopicResultDTO>
@DataSource(name = DataSourceNames.FIFTH)
@Override
public PageData<TopicResultDTO> listLatestTopic(Map<String, Object> params) {
UserDetail userDetail = SecurityUser.getUser();
params.put("deptIdList", userDetail.getDeptIdList());
IPage<TopicResultDTO> page = getPage(params);
List<TopicResultDTO> list = baseDao.selectListLatesttTopicDTO(params);
return new PageData<>(list, page.getTotal());

106
esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/issue/IssueDao.xml

@ -0,0 +1,106 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.elink.esua.epdc.modules.issue.dao.IssueDao">
<!-- 最热议题列表 -->
<select id="selectListHottestIssue" resultType="com.elink.esua.epdc.dto.issue.result.IssueResultDTO">
SELECT
ei.ID,
ei.ISSUE_CONTENT,
ei.ALL_DEPT_NAMES,
ei.NICK_NAME,
ei.CREATED_TIME,
ee.APPROVE_NUM,
ee.OPPOSE_NUM,
ee.COMMENT_NUM,
ee.BROWSE_NUM,
( ee.COMMENT_NUM + ee.BROWSE_NUM + ee.APPROVE_NUM + ee.OPPOSE_NUM ) AS expressAttitudeNum
FROM
esua_epdc_events.epdc_issue ei
LEFT JOIN esua_epdc_events.epdc_events ee ON ee.ID = ei.EVENT_ID
AND ee.DEL_FLAG = '0'
<if test="issueContent != null and issueContent != ''">
AND ei.ISSUE_CONTENT LIKE CONCAT('%',#{issueContent},'%')
</if>
<if test="streetId != null and streetId != ''">
AND (find_in_set(#{streetId},ei.PARENT_DEPT_IDS)
OR find_in_set(#{streetId},ei.ALL_DEPT_IDS))
</if>
<if test="communityId != null and communityId != ''">
AND (find_in_set(#{communityId},ei.PARENT_DEPT_IDS)
OR find_in_set(#{communityId},ei.ALL_DEPT_IDS))
</if>
<if test="gridId != null and gridId != ''">
AND (ei.GRID_ID = #{gridId}
OR find_in_set(#{gridId},ei.ALL_DEPT_IDS))
</if>
<if test="startTime != null and startTime != ''">
and DATE_FORMAT( ei.CREATED_TIME, '%Y-%m-%d' ) &gt;=#{startTime}
</if>
<if test="endTime != null and endTime != ''">
and DATE_FORMAT( ei.CREATED_TIME, '%Y-%m-%d' ) &lt;=#{endTime}
</if>
<if test="deptIdList!=null and deptIdList.size()>0">
and ei.GRID_ID in
<foreach collection="deptIdList" index="index" item="deptId" open="(" separator="," close=")">
#{deptId}
</foreach>
</if>
WHERE
ei.DEL_FLAG = '0'
AND ei.ISSUE_STATE IN ( 0, 2 )
ORDER BY
expressAttitudeNum DESC
</select>
<!-- 最新议题列表 -->
<select id="selectListLatestIssue" resultType="com.elink.esua.epdc.dto.issue.result.IssueResultDTO">
SELECT
ei.ID,
ei.ISSUE_CONTENT,
ei.ALL_DEPT_NAMES,
ei.NICK_NAME,
ei.CREATED_TIME,
ee.APPROVE_NUM,
ee.OPPOSE_NUM,
ee.COMMENT_NUM,
ee.BROWSE_NUM,
( ee.COMMENT_NUM + ee.BROWSE_NUM + ee.APPROVE_NUM + ee.OPPOSE_NUM ) AS expressAttitudeNum
FROM
esua_epdc_events.epdc_issue ei
LEFT JOIN esua_epdc_events.epdc_events ee ON ee.ID = ei.EVENT_ID
AND ee.DEL_FLAG = '0'
<if test="issueContent != null and issueContent != ''">
AND ei.ISSUE_CONTENT LIKE CONCAT('%',#{issueContent},'%')
</if>
<if test="streetId != null and streetId != ''">
AND (find_in_set(#{streetId},ei.PARENT_DEPT_IDS)
OR find_in_set(#{streetId},ei.ALL_DEPT_IDS))
</if>
<if test="communityId != null and communityId != ''">
AND (find_in_set(#{communityId},ei.PARENT_DEPT_IDS)
OR find_in_set(#{communityId},ei.ALL_DEPT_IDS))
</if>
<if test="gridId != null and gridId != ''">
AND (ei.GRID_ID = #{gridId}
OR find_in_set(#{gridId},ei.ALL_DEPT_IDS))
</if>
<if test="startTime != null and startTime != ''">
and DATE_FORMAT( ei.CREATED_TIME, '%Y-%m-%d' ) &gt;=#{startTime}
</if>
<if test="endTime != null and endTime != ''">
and DATE_FORMAT( ei.CREATED_TIME, '%Y-%m-%d' ) &lt;=#{endTime}
</if>
<if test="deptIdList!=null and deptIdList.size()>0">
and ei.GRID_ID in
<foreach collection="deptIdList" index="index" item="deptId" open="(" separator="," close=")">
#{deptId}
</foreach>
</if>
WHERE
ei.DEL_FLAG = '0'
AND ei.ISSUE_STATE IN ( 0, 2 )
ORDER BY
expressAttitudeNum DESC,CREATED_TIME desc
</select>
</mapper>

10
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 @@
<if test="endTime != null and endTime != ''">
and DATE_FORMAT( ei.CREATED_TIME, '%Y-%m-%d' ) &lt;=#{endTime}
</if>
<if test="deptIdList!=null and deptIdList.size()>0">
and ei.GRID_ID in
<foreach collection="deptIdList" index="index" item="deptId" open="(" separator="," close=")">
#{deptId}
</foreach>
</if>
ORDER BY expressAttitudeNum DESC
</select>
</mapper>

22
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'
<if test="topicContent != null and topicContent != ''">
and et.TOPIC_CONTENT like concat('%', #{topicContent}, '%')
</if>
@ -42,6 +39,12 @@
<if test="endTime != null and endTime != ''">
and DATE_FORMAT( et.CREATED_TIME, '%Y-%m-%d' ) &lt;=#{endTime}
</if>
<if test="deptIdList!=null and deptIdList.size()>0">
and et.GRID_ID in
<foreach collection="deptIdList" index="index" item="deptId" open="(" separator="," close=")">
#{deptId}
</foreach>
</if>
order by expressAttitudeNum desc
</select>
@ -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'
<if test="topicContent != null and topicContent != ''">
and et.TOPIC_CONTENT like concat('%', #{topicContent}, '%')
</if>
@ -85,6 +85,12 @@
<if test="endTime != null and endTime != ''">
and DATE_FORMAT( et.CREATED_TIME, '%Y-%m-%d' ) &lt;=#{endTime}
</if>
<if test="deptIdList!=null and deptIdList.size()>0">
and et.GRID_ID in
<foreach collection="deptIdList" index="index" item="deptId" open="(" separator="," close=")">
#{deptId}
</foreach>
</if>
order by expressAttitudeNum desc,releaseTime desc
</select>
</mapper>

Loading…
Cancel
Save