From fbf32972bcc3f36a12e5fc6aec94946ed15c3357 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Fri, 3 Jul 2020 17:55:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B4=E8=B6=A3=E7=BE=A4=E8=AF=9D=E9=A2=98PC?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../topic/controller/TopicController.java     | 35 ++++++++++++-
 .../smile/topic/dao/GroupTopicDao.java        | 10 ++++
 .../smile/topic/service/TopicService.java     | 20 +++++++
 .../topic/service/impl/TopicServiceImpl.java  | 42 +++++++++------
 .../mapper/smile/topic/GroupTopicDao.xml      | 52 +++++++++++++++++++
 5 files changed, 142 insertions(+), 17 deletions(-)

diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/topic/controller/TopicController.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/topic/controller/TopicController.java
index fdc6f29..f47b9cc 100644
--- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/topic/controller/TopicController.java
+++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/topic/controller/TopicController.java
@@ -27,12 +27,12 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
 import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
+import com.elink.esua.epdc.modules.smile.topic.excel.TopicExcel;
+import com.elink.esua.epdc.modules.smile.topic.service.TopicService;
 import com.elink.esua.epdc.smile.dto.topic.TopicDTO;
 import com.elink.esua.epdc.smile.dto.topic.TopicDetailDTO;
 import com.elink.esua.epdc.smile.dto.topic.form.TopicCloseFormDTO;
 import com.elink.esua.epdc.smile.dto.topic.form.TopicReviewFormDTO;
-import com.elink.esua.epdc.modules.smile.topic.excel.TopicExcel;
-import com.elink.esua.epdc.modules.smile.topic.service.TopicService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -84,6 +84,21 @@ public class TopicController {
         return new Result<PageData<TopicDTO>>().ok(page);
     }
 
+    /**
+     * PC端 - 兴趣群话题管理 - 列表分页
+     *
+     * @param params
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData < com.elink.esua.epdc.smile.dto.topic.TopicDTO>>
+     * @author work@yujt.net.cn
+     * @date 2020/7/3 17:32
+     */
+    @GetMapping("interestpage")
+    @DataFilter(tableAlias = "temp", deptId = "grid_id", prefix = "AND", isPendingCreator = false)
+    public Result<PageData<TopicDTO>> interestPage(@RequestParam Map<String, Object> params) {
+        PageData<TopicDTO> page = topicService.listInterestTopic(params);
+        return new Result<PageData<TopicDTO>>().ok(page);
+    }
+
     @GetMapping("{id}")
     public Result<TopicDTO> get(@PathVariable("id") String id) {
         TopicDTO data = topicService.get(id);
@@ -146,6 +161,22 @@ public class TopicController {
         ExcelUtils.exportExcelToTarget(response, null, list, TopicExcel.class);
     }
 
+    /**
+     * PC端 - 兴趣群话题管理 - 导出
+     *
+     * @param params
+     * @param response
+     * @return void
+     * @author
+     * @date 2020/7/3 17:33
+     */
+    @GetMapping("interestexport")
+    @DataFilter(tableAlias = "temp", deptId = "grid_id", prefix = "AND", isPendingCreator = false)
+    public void exportInterest(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<TopicDTO> list = topicService.listInterest(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, TopicExcel.class);
+    }
+
     /**
      * 关闭话题
      *
diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/topic/dao/GroupTopicDao.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/topic/dao/GroupTopicDao.java
index 5593327..7b54525 100644
--- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/topic/dao/GroupTopicDao.java
+++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/topic/dao/GroupTopicDao.java
@@ -95,6 +95,16 @@ public interface GroupTopicDao extends BaseDao<TopicEntity> {
      */
     List<TopicDTO> selectPoliceListTopic(Map<String, Object> params);
 
+    /**
+     * 兴趣群话题列表
+     *
+     * @return java.util.List<com.elink.esua.epdc.smile.dto.topic.TopicDTO>
+     * @params [params]
+     * @author liuchuang
+     * @since 2019/11/12 9:45
+     */
+    List<TopicDTO> selectInterestListTopic(Map<String, Object> params);
+
     /**
      * 话题详情
      *
diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/topic/service/TopicService.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/topic/service/TopicService.java
index 2fda9ab..573e446 100644
--- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/topic/service/TopicService.java
+++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/topic/service/TopicService.java
@@ -71,6 +71,16 @@ public interface TopicService extends BaseService<TopicEntity> {
      */
     PageData<TopicDTO> listPoliceTopic(Map<String, Object> params);
 
+    /**
+     * 兴趣群话题列表
+     *
+     * @return com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.smile.dto.topic.TopicDTO>
+     * @params [params]
+     * @author liuchuang
+     * @since 2019/11/12 9:43
+     */
+    PageData<TopicDTO> listInterestTopic(Map<String, Object> params);
+
     /**
      * 默认查询
      *
@@ -91,6 +101,16 @@ public interface TopicService extends BaseService<TopicEntity> {
      */
     List<TopicDTO> listPolice(Map<String, Object> params);
 
+    /**
+     * 兴趣默认查询
+     *
+     * @param params
+     * @return java.util.List<TopicDTO>
+     * @author generator
+     * @date 2019-10-10
+     */
+    List<TopicDTO> listInterest(Map<String, Object> params);
+
     /**
      * 移动端-话题列表
      *
diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/topic/service/impl/TopicServiceImpl.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/topic/service/impl/TopicServiceImpl.java
index 6120834..000ff31 100644
--- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/topic/service/impl/TopicServiceImpl.java
+++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/topic/service/impl/TopicServiceImpl.java
@@ -27,6 +27,21 @@ import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.utils.DateUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO;
+import com.elink.esua.epdc.modules.smile.async.NewsTask;
+import com.elink.esua.epdc.modules.smile.async.TopicChangeToIssueTask;
+import com.elink.esua.epdc.modules.smile.comment.service.TopicCommentService;
+import com.elink.esua.epdc.modules.smile.feign.EventFeignClient;
+import com.elink.esua.epdc.modules.smile.group.service.GroupService;
+import com.elink.esua.epdc.modules.smile.group.service.UserGroupService;
+import com.elink.esua.epdc.modules.smile.rocketmq.dto.OrganizationModifyDTO;
+import com.elink.esua.epdc.modules.smile.topic.dao.GroupTopicDao;
+import com.elink.esua.epdc.modules.smile.topic.entity.GroupTopicUserReadEntity;
+import com.elink.esua.epdc.modules.smile.topic.entity.TopicAuditRecordEntity;
+import com.elink.esua.epdc.modules.smile.topic.entity.TopicEntity;
+import com.elink.esua.epdc.modules.smile.topic.service.GroupTopicUserReadService;
+import com.elink.esua.epdc.modules.smile.topic.service.TopicAuditRecordService;
+import com.elink.esua.epdc.modules.smile.topic.service.TopicImgService;
+import com.elink.esua.epdc.modules.smile.topic.service.TopicService;
 import com.elink.esua.epdc.smile.dto.comment.EpdcCommentsAndAttitudeFromTopicFormDTO;
 import com.elink.esua.epdc.smile.dto.comment.EventCommentDTO;
 import com.elink.esua.epdc.smile.dto.comment.EventCommentUserAttitudeDTO;
@@ -47,21 +62,6 @@ import com.elink.esua.epdc.smile.dto.topic.TopicDetailDTO;
 import com.elink.esua.epdc.smile.dto.topic.form.*;
 import com.elink.esua.epdc.smile.dto.topic.result.TopicDetailResultDTO;
 import com.elink.esua.epdc.smile.dto.topic.result.TopicListResultDTO;
-import com.elink.esua.epdc.modules.smile.async.NewsTask;
-import com.elink.esua.epdc.modules.smile.async.TopicChangeToIssueTask;
-import com.elink.esua.epdc.modules.smile.comment.service.TopicCommentService;
-import com.elink.esua.epdc.modules.smile.feign.EventFeignClient;
-import com.elink.esua.epdc.modules.smile.group.service.GroupService;
-import com.elink.esua.epdc.modules.smile.group.service.UserGroupService;
-import com.elink.esua.epdc.modules.smile.rocketmq.dto.OrganizationModifyDTO;
-import com.elink.esua.epdc.modules.smile.topic.dao.GroupTopicDao;
-import com.elink.esua.epdc.modules.smile.topic.entity.GroupTopicUserReadEntity;
-import com.elink.esua.epdc.modules.smile.topic.entity.TopicAuditRecordEntity;
-import com.elink.esua.epdc.modules.smile.topic.entity.TopicEntity;
-import com.elink.esua.epdc.modules.smile.topic.service.GroupTopicUserReadService;
-import com.elink.esua.epdc.modules.smile.topic.service.TopicAuditRecordService;
-import com.elink.esua.epdc.modules.smile.topic.service.TopicImgService;
-import com.elink.esua.epdc.modules.smile.topic.service.TopicService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -128,6 +128,13 @@ public class TopicServiceImpl extends BaseServiceImpl<GroupTopicDao, TopicEntity
         return new PageData<>(list, page.getTotal());
     }
 
+    @Override
+    public PageData<TopicDTO> listInterestTopic(Map<String, Object> params) {
+        IPage<TopicDTO> page = getPage(params);
+        List<TopicDTO> list = baseDao.selectInterestListTopic(params);
+        return new PageData<>(list, page.getTotal());
+    }
+
     @Override
     public List<TopicDTO> list(Map<String, Object> params) {
         return baseDao.selectListTopic(params);
@@ -138,6 +145,11 @@ public class TopicServiceImpl extends BaseServiceImpl<GroupTopicDao, TopicEntity
         return baseDao.selectPoliceListTopic(params);
     }
 
+    @Override
+    public List<TopicDTO> listInterest(Map<String, Object> params) {
+        return baseDao.selectInterestListTopic(params);
+    }
+
     private QueryWrapper<TopicEntity> getWrapper(Map<String, Object> params) {
         String id = (String) params.get(FieldConstant.ID_HUMP);
 
diff --git a/epdc-cloud-property/src/main/resources/mapper/smile/topic/GroupTopicDao.xml b/epdc-cloud-property/src/main/resources/mapper/smile/topic/GroupTopicDao.xml
index fbb883c..e36faaf 100644
--- a/epdc-cloud-property/src/main/resources/mapper/smile/topic/GroupTopicDao.xml
+++ b/epdc-cloud-property/src/main/resources/mapper/smile/topic/GroupTopicDao.xml
@@ -289,6 +289,58 @@
         </if>
     </select>
 
+    <select id="selectInterestListTopic" resultType="com.elink.esua.epdc.smile.dto.topic.TopicDTO">
+        SELECT
+        temp.ID,
+        temp.NICKNAME,
+        temp.CREATED_TIME,
+        temp.TOPIC_CONTENT,
+        temp.COMMENT_NUM,
+        temp.BROWSE_NUM,
+        ( temp.BROWSE_NUM + temp.COMMENT_NUM ) AS participantsNum,
+        temp.STATE
+        FROM
+        epdc_topic temp
+        WHERE
+        temp.DEL_FLAG = '0'
+        AND temp.STATE IN ( 0, 5, 20)
+        AND temp.SECTION_CODE = 'interest_group'
+        <if test="associatedType != null and associatedType != ''">
+            AND temp.STATE in (0,5,10,15)
+        </if>
+        <if test="streetId != null and streetId != ''">
+            AND (find_in_set(#{streetId},temp.PARENT_DEPT_IDS)
+            OR find_in_set(#{streetId},temp.ALL_DEPT_IDS))
+        </if>
+        <if test="communityId != null and communityId != ''">
+            AND (find_in_set(#{communityId},temp.PARENT_DEPT_IDS)
+            OR find_in_set(#{communityId},temp.ALL_DEPT_IDS))
+        </if>
+        <if test="gridId != null and gridId != ''">
+            AND (temp.GRID_ID = #{gridId}
+            OR find_in_set(#{gridId},temp.ALL_DEPT_IDS))
+        </if>
+        <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+            AND DATE_FORMAT( temp.CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
+        </if>
+        <if test="groupId != null and groupId != ''">
+            AND temp.GROUP_ID = #{groupId}
+        </if>
+        <if test="keyword != null and keyword != ''">
+            AND temp.TOPIC_CONTENT like concat('%', trim(#{keyword}), '%')
+        </if>
+        ORDER BY
+        <if test="orderType == 0">
+            temp.CREATED_TIME DESC
+        </if>
+        <if test="orderType == 1">
+            temp.BROWSE_NUM DESC
+        </if>
+        <if test="orderType == 2">
+            temp.COMMENT_NUM DESC
+        </if>
+    </select>
+
     <resultMap id="topicDetail" type="com.elink.esua.epdc.smile.dto.topic.TopicDetailDTO">
         <result property="nickname" column="NICKNAME"/>
         <result property="createdTime" column="CREATED_TIME"/>