社群审核接口 init

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

@@ -0,0 +1,43 @@
+package com.elink.esua.epdc.dto.group;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ *
+ * 社群审核详情DTO
+ *
+ * @Author：liuchuang
+ * @Date：2019/10/21 10:24
+ */
+@Data
+public class GroupDetailDTO implements Serializable {
+    private static final long serialVersionUID = -7520759616474298301L;
+
+    /**
+     * 社群ID
+     */
+    private String id;
+
+    /**
+     * 社群名称
+     */
+    private String groupName;
+
+    /**
+     * 社群介绍
+     */
+    private String groupIntroduction;
+
+    /**
+     * 创建时间
+     */
+    private Date createdTime;
+
+    /**
+     * 群主
+     */
+    private String nickname;
+}

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

@@ -24,9 +24,14 @@ public class GroupSettingStateDTO implements Serializable {
     private String id;
 
     /**
-     * 状态 10：解禁，15：禁言，20：解散
+     * 状态 5：审核不通过，10：审核通过/解禁，15：禁言，20：解散
      */
     @NotNull(message = "社群状态不能为空")
     private Integer state;
 
+    /**
+     * 处理意见
+     */
+    private String processingOpinions;
+
 }

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

@@ -27,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.GroupDetailDTO;
 import com.elink.esua.epdc.dto.group.GroupManagementDTO;
 import com.elink.esua.epdc.dto.group.GroupSettingStateDTO;
 import com.elink.esua.epdc.modules.group.excel.GroupExcel;
@@ -106,7 +107,22 @@ public class GroupController {
 
     /**
      *
-     * 禁言、解禁、解散社群
+     * 社群审核详情信息
+     *
+     * @params [id]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.group.GroupDetailDTO>
+     * @author liuchuang
+     * @since 2019/10/21 10:32
+     */
+    @GetMapping("detail/{id}")
+    public Result<GroupDetailDTO> detail(@PathVariable("id") String id){
+        GroupDetailDTO data = groupService.getGroupDetail(id);
+        return new Result<GroupDetailDTO>().ok(data);
+    }
+
+    /**
+     *
+     * 审核、禁言、解禁、解散社群
      *
      * @params [dto]
      * @return com.elink.esua.epdc.commons.tools.utils.Result

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

@@ -18,6 +18,7 @@
 package com.elink.esua.epdc.modules.group.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.dto.group.GroupDetailDTO;
 import com.elink.esua.epdc.dto.group.GroupManagementDTO;
 import com.elink.esua.epdc.modules.group.entity.GroupEntity;
 import org.apache.ibatis.annotations.Mapper;
@@ -55,5 +56,16 @@ public interface GroupDao extends BaseDao<GroupEntity> {
      * @since 2019/10/17 16:38
      */
     Long selectListOfRepeatGroupName(Long gridId, String groupName);
+
+    /**
+     *
+     * 社群审核详情信息
+     *
+     * @params [id]
+     * @return com.elink.esua.epdc.dto.group.GroupDetailDTO
+     * @author liuchuang
+     * @since 2019/10/21 10:32
+     */
+    GroupDetailDTO selectOneOfGroupDetail(String id);
 	
 }

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

@@ -21,6 +21,7 @@ import com.elink.esua.epdc.commons.mybatis.service.BaseService;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.group.GroupDTO;
+import com.elink.esua.epdc.dto.group.GroupDetailDTO;
 import com.elink.esua.epdc.dto.group.GroupManagementDTO;
 import com.elink.esua.epdc.dto.group.GroupSettingStateDTO;
 import com.elink.esua.epdc.dto.group.form.GroupCreateFormDTO;
@@ -108,6 +109,17 @@ public interface GroupService extends BaseService<GroupEntity> {
      */
     Result saveGroup(GroupCreateFormDTO formDto);
 
+    /**
+     *
+     * 社群审核详情信息
+     *
+     * @params [id]
+     * @return com.elink.esua.epdc.dto.group.GroupDetailDTO
+     * @author liuchuang
+     * @since 2019/10/21 10:32
+     */
+    GroupDetailDTO getGroupDetail(String id);
+
     /**
      *
      * 禁言、解禁、解散社群

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

@@ -24,10 +24,7 @@ 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.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.group.GroupDTO;
-import com.elink.esua.epdc.dto.group.GroupManagementDTO;
-import com.elink.esua.epdc.dto.group.GroupSettingStateDTO;
-import com.elink.esua.epdc.dto.group.UserGroupDTO;
+import com.elink.esua.epdc.dto.group.*;
 import com.elink.esua.epdc.dto.group.enums.GroupStateEnum;
 import com.elink.esua.epdc.dto.group.form.GroupCreateFormDTO;
 import com.elink.esua.epdc.modules.group.dao.GroupDao;
@@ -124,6 +121,11 @@ public class GroupServiceImpl extends BaseServiceImpl<GroupDao, GroupEntity> imp
         return new Result();
     }
 
+    @Override
+    public GroupDetailDTO getGroupDetail(String id) {
+        return baseDao.selectOneOfGroupDetail(id);
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Result modifyGroupState(GroupSettingStateDTO dto) {
@@ -139,6 +141,7 @@ public class GroupServiceImpl extends BaseServiceImpl<GroupDao, GroupEntity> imp
                 GroupEntity groupEntity = new GroupEntity();
                 groupEntity.setId(dto.getId());
                 groupEntity.setState(dto.getState());
+                groupEntity.setProcessingOpinions(dto.getProcessingOpinions());
                 baseDao.updateById(groupEntity);
                 return new Result();
             }

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

@@ -38,5 +38,22 @@
         SELECT COUNT(ID) amount FROM epdc_group WHERE DEL_FLAG = '0' AND GRID_ID = #{gridId} AND GROUP_NAME = #{groupName}
     </select>
 
+    <select id="selectOneOfGroupDetail" resultType="com.elink.esua.epdc.dto.group.GroupDetailDTO">
+        SELECT
+            gp.ID,
+            gp.GROUP_NAME,
+            gp.GROUP_INTRODUCTION,
+            gp.CREATED_TIME,
+            ugp.NICKNAME
+        FROM
+            epdc_group gp
+            LEFT JOIN epdc_user_group ugp ON gp.ID = ugp.GROUP_ID
+            AND ugp.DEL_FLAG = '0'
+            AND ugp.LORD_FLAG = '1'
+        WHERE
+            gp.DEL_FLAG = '1'
+            AND gp.ID = #{id}
+    </select>
+
 
 </mapper>