From 059ad7abb4ff36abb56585ae38ceff12e93eb107 Mon Sep 17 00:00:00 2001 From: liuchuang Date: Mon, 21 Oct 2019 10:40:26 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A4=BE=E7=BE=A4=E5=AE=A1=E6=A0=B8=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=20init?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/group/GroupDetailDTO.java | 43 +++++++++++++++++++ .../dto/group/GroupSettingStateDTO.java | 7 ++- .../group/controller/GroupController.java | 18 +++++++- .../modules/group/dao/GroupDao.java | 12 ++++++ .../modules/group/service/GroupService.java | 12 ++++++ .../group/service/impl/GroupServiceImpl.java | 11 +++-- .../main/resources/mapper/group/GroupDao.xml | 17 ++++++++ 7 files changed, 114 insertions(+), 6 deletions(-) create mode 100644 esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/group/GroupDetailDTO.java diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/group/GroupDetailDTO.java b/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/group/GroupDetailDTO.java new file mode 100644 index 000000000..d5148ca1c --- /dev/null +++ b/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; +} diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/group/GroupSettingStateDTO.java b/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/group/GroupSettingStateDTO.java index fe58a24f8..ed725021f 100644 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/group/GroupSettingStateDTO.java +++ b/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; + } diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/controller/GroupController.java b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/controller/GroupController.java index b0f3d2f23..978de31df 100644 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/controller/GroupController.java +++ b/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 + * @author liuchuang + * @since 2019/10/21 10:32 + */ + @GetMapping("detail/{id}") + public Result detail(@PathVariable("id") String id){ + GroupDetailDTO data = groupService.getGroupDetail(id); + return new Result().ok(data); + } + + /** + * + * 审核、禁言、解禁、解散社群 * * @params [dto] * @return com.elink.esua.epdc.commons.tools.utils.Result diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/dao/GroupDao.java b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/dao/GroupDao.java index eabcda417..000732171 100644 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/dao/GroupDao.java +++ b/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 { * @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); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/GroupService.java b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/GroupService.java index 49e8ef764..7d75fab02 100644 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/GroupService.java +++ b/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 { */ 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); + /** * * 禁言、解禁、解散社群 diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/impl/GroupServiceImpl.java b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/impl/GroupServiceImpl.java index 7d0f325e3..2318ee237 100644 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/impl/GroupServiceImpl.java +++ b/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 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 imp GroupEntity groupEntity = new GroupEntity(); groupEntity.setId(dto.getId()); groupEntity.setState(dto.getState()); + groupEntity.setProcessingOpinions(dto.getProcessingOpinions()); baseDao.updateById(groupEntity); return new Result(); } diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/group/GroupDao.xml b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/group/GroupDao.xml index 3f46a39d8..3bc49613e 100644 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/group/GroupDao.xml +++ b/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} + + \ No newline at end of file