社群管理列表数据 init

esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/group/GroupManagementDTO.java

@@ -0,0 +1,46 @@
+package com.elink.esua.epdc.dto.group;
+
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ *
+ * 社群管理DTO
+ *
+ * @Author：liuchuang
+ * @Date：2019/10/15 15:05
+ */
+@Data
+public class GroupManagementDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    private String id;
+
+    /**
+     * 社群名称
+     */
+    private String groupName;
+
+
+    /**
+     * 社群类别 0：党员群，1：自建群
+     */
+    private String groupCategory;
+
+    /**
+     * 状态 0：待审核，5：审核不通过，10：审核通过，15：禁言，20：已解散
+     */
+    private Integer state;
+
+    /**
+     * 创建时间
+     */
+    private Date createdTime;
+
+}

esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/controller/GroupController.java

@@ -17,6 +17,7 @@
 
 package com.elink.esua.epdc.modules.group.controller;
 
+import com.elink.esua.epdc.commons.mybatis.annotation.DataFilter;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
@@ -26,6 +27,7 @@ import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
 import com.elink.esua.epdc.dto.group.GroupDTO;
+import com.elink.esua.epdc.dto.group.GroupManagementDTO;
 import com.elink.esua.epdc.modules.group.excel.GroupExcel;
 import com.elink.esua.epdc.modules.group.service.GroupService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -49,10 +51,20 @@ public class GroupController {
     @Autowired
     private GroupService groupService;
 
+    /**
+     *
+     * 社群列表 状态state 0：待审核，5：审核不通过，10：审核通过，15：禁言，20：已解散
+     *
+     * @params [params]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.group.GroupDTO>>
+     * @author liuchuang
+     * @since 2019/10/11 14:53
+     */
     @GetMapping("page")
-    public Result<PageData<GroupDTO>> page(@RequestParam Map<String, Object> params){
+    @DataFilter(tableAlias = "gp", deptId = "grid_id", prefix = "AND", isPendingCreator = false)
-        PageData<GroupDTO> page = groupService.page(params);
+    public Result<PageData<GroupManagementDTO>> page(@RequestParam Map<String, Object> params){
-        return new Result<PageData<GroupDTO>>().ok(page);
+        PageData<GroupManagementDTO> page = groupService.page(params);
+        return new Result<PageData<GroupManagementDTO>>().ok(page);
     }
 
     @GetMapping("{id}")

esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/dao/GroupDao.java

@@ -18,9 +18,13 @@
 package com.elink.esua.epdc.modules.group.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.dto.group.GroupManagementDTO;
 import com.elink.esua.epdc.modules.group.entity.GroupEntity;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 社群表 社群表
  *
@@ -29,5 +33,16 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface GroupDao extends BaseDao<GroupEntity> {
+
+    /**
+     *
+     * 社群列表
+     *
+     * @params [params]
+     * @return java.util.List<com.elink.esua.epdc.dto.group.GroupDTO>
+     * @author liuchuang
+     * @since 2019/10/11 14:54
+     */
+    List<GroupManagementDTO> selectListOfGroups(Map<String, Object> params);
 	
 }

esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/GroupService.java

@@ -20,6 +20,7 @@ package com.elink.esua.epdc.modules.group.service;
 import com.elink.esua.epdc.commons.mybatis.service.BaseService;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.dto.group.GroupDTO;
+import com.elink.esua.epdc.dto.group.GroupManagementDTO;
 import com.elink.esua.epdc.modules.group.entity.GroupEntity;
 
 import java.util.List;
@@ -34,14 +35,14 @@ import java.util.Map;
 public interface GroupService extends BaseService<GroupEntity> {
 
     /**
-     * 默认分页
+     * 默认分页 社群列表
      *
      * @param params
      * @return PageData<GroupDTO>
      * @author generator
      * @date 2019-10-10
      */
-    PageData<GroupDTO> page(Map<String, Object> params);
+    PageData<GroupManagementDTO> page(Map<String, Object> params);
 
     /**
      * 默认查询

esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/impl/GroupServiceImpl.java

@@ -24,12 +24,11 @@ import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.dto.group.GroupDTO;
+import com.elink.esua.epdc.dto.group.GroupManagementDTO;
 import com.elink.esua.epdc.modules.group.dao.GroupDao;
 import com.elink.esua.epdc.modules.group.entity.GroupEntity;
-import com.elink.esua.epdc.modules.group.redis.GroupRedis;
 import com.elink.esua.epdc.modules.group.service.GroupService;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -46,16 +45,11 @@ import java.util.Map;
 @Service
 public class GroupServiceImpl extends BaseServiceImpl<GroupDao, GroupEntity> implements GroupService {
 
-    @Autowired
-    private GroupRedis groupRedis;
-
     @Override
-    public PageData<GroupDTO> page(Map<String, Object> params) {
+    public PageData<GroupManagementDTO> page(Map<String, Object> params) {
-        IPage<GroupEntity> page = baseDao.selectPage(
+        IPage<GroupManagementDTO> page = getPage(params);
-                getPage(params, FieldConstant.CREATED_TIME, false),
+        List<GroupManagementDTO> list = baseDao.selectListOfGroups(params);
-                getWrapper(params)
+        return new PageData<>(list, page.getTotal());
-        );
-        return getPageData(page, GroupDTO.class);
     }
 
     @Override

esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/group/GroupDao.xml

@@ -1,7 +1,36 @@
 <?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.group.GroupDao">
+<mapper namespace="com.elink.esua.epdc.modules.group.dao.GroupDao">
+
+    <select id="selectListOfGroups" resultType="com.elink.esua.epdc.dto.group.GroupManagementDTO">
+        SELECT
+            gp.ID,
+            gp.GROUP_NAME,
+            gp.GROUP_CATEGORY,
+            gp.CREATED_TIME,
+            ugp.NICKNAME,
+            gp.STATE
+        FROM
+            epdc_group gp
+            LEFT JOIN epdc_user_group ugp ON ugp.GROUP_ID = gp.ID
+            AND ugp.DEL_FLAG = '0'
+            AND ugp.LORD_FLAG = '1'
+        WHERE
+            gp.DEL_FLAG = '0'
+            AND gp.STATE = #{state}
+            <if test="gridId != null and gridId != ''">
+                AND gp.GRID_ID = #{gridId}
+            </if>
+            <if test="streetId != null and streetId != ''">
+                AND gp.STREET_ID = #{streetId}
+            </if>
+            <if test="communityId != null and communityId != ''">
+                AND gp.COMMUNITY_ID = #{communityId}
+            </if>
+        ORDER BY
+            gp.GROUP_CATEGORY, gp.CREATED_TIME DESC
+    </select>
 
 
 </mapper>