From eaf1d41ce021ed47388c114a8d27c7b6bb57030a Mon Sep 17 00:00:00 2001 From: songyunpeng Date: Fri, 5 Jun 2020 17:43:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=9A=E7=BE=A4=E7=AE=A1=E7=90=86=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=9D=83=E9=99=90bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ApiPartyGroupController.java | 19 +--- .../epdc/feign/PartyGroupFeignClient.java | 4 +- .../PartyGroupFeignClientFallback.java | 4 +- .../esua/epdc/service/PartyGroupService.java | 4 +- .../service/impl/PartyGroupServiceImpl.java | 8 +- .../esua/epdc/dto/result/CurrentUser.java | 47 ++++++++ .../esua/epdc/dto/result/OtherUsers.java | 48 ++++++++ .../epdc/dto/result/PartyTopicResultDTO.java | 69 +----------- .../dto/result/PartyUserGroupResultDTO.java | 32 +----- .../elink/esua/epdc/dto/result/TopicList.java | 106 ++++++++++++++++++ .../controller/AppPartyTopicController.java | 2 +- .../AppPartyUserGroupController.java | 15 +-- .../elink/esua/epdc/dao/PartyTopicDao.java | 4 +- .../esua/epdc/dao/PartyUserGroupDao.java | 9 +- .../esua/epdc/service/PartyTopicService.java | 2 +- .../epdc/service/PartyUserGroupService.java | 11 +- .../service/impl/PartyTopicServiceImpl.java | 26 ++++- .../impl/PartyUserGroupServiceImpl.java | 16 +-- .../main/resources/mapper/PartyTopicDao.xml | 2 +- .../resources/mapper/PartyUserGroupDao.xml | 8 +- 20 files changed, 274 insertions(+), 162 deletions(-) create mode 100644 esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/result/CurrentUser.java create mode 100644 esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/result/OtherUsers.java create mode 100644 esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/result/TopicList.java diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiPartyGroupController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiPartyGroupController.java index fe9490a7..cd585b33 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiPartyGroupController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiPartyGroupController.java @@ -73,7 +73,7 @@ public class ApiPartyGroupController { * @Param [formDto] **/ @GetMapping(value = "topic/list", consumes = MediaType.APPLICATION_JSON_VALUE) - Result> topicList(@LoginUser TokenDto userDetail, PartyTopicFormDTO formDto) { + Result topicList(@LoginUser TokenDto userDetail, PartyTopicFormDTO formDto) { return partyGroupService.topicList(userDetail, formDto); } @@ -108,25 +108,12 @@ public class ApiPartyGroupController { * @Param [formDto] **/ @GetMapping(value = "user/list", consumes = MediaType.APPLICATION_JSON_VALUE) - Result> userList(PartyUserGroupFormDTO formDto) { - return partyGroupService.userList(formDto); + Result userList(@LoginUser TokenDto userDetail,PartyUserGroupFormDTO formDto) { + return partyGroupService.userList(userDetail,formDto); } - /** - * @return com.elink.esua.epdc.commons.tools.utils.Result> - * @Description 当前用户在群里的信息 - * @Author songyunpeng - * @Date 2020/6/3 - * @Param [formDto] - **/ - @GetMapping(value = "user/currentUserInfo/{partyGroupId}", consumes = MediaType.APPLICATION_JSON_VALUE) - Result currentUserInfo(@PathVariable("partyGroupId") String partyGroupId) { - return partyGroupService.currentUserInfo(partyGroupId); - - } - /** * @return com.elink.esua.epdc.commons.tools.utils.Result * @Description 禁言 diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/PartyGroupFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/PartyGroupFeignClient.java index 7f61e665..91a5bf4f 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/PartyGroupFeignClient.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/PartyGroupFeignClient.java @@ -62,7 +62,7 @@ public interface PartyGroupFeignClient { * @return com.elink.esua.epdc.commons.tools.utils.Result> **/ @GetMapping(value = "partyGroup/topic/list", consumes = MediaType.APPLICATION_JSON_VALUE) - Result> list(PartyTopicFormDTO formDTO); + Result list(PartyTopicFormDTO formDTO); /** * @Description 发布话题 @@ -90,7 +90,7 @@ public interface PartyGroupFeignClient { * @return com.elink.esua.epdc.commons.tools.utils.Result> **/ @GetMapping(value = "partyGroup/user/list", consumes = MediaType.APPLICATION_JSON_VALUE) - Result> list(PartyUserGroupFormDTO formDTO); + Result list(PartyUserGroupFormDTO formDTO); /** diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/PartyGroupFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/PartyGroupFeignClientFallback.java index 2b15890d..6f949b9b 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/PartyGroupFeignClientFallback.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/PartyGroupFeignClientFallback.java @@ -37,7 +37,7 @@ public class PartyGroupFeignClientFallback implements PartyGroupFeignClient { } @Override - public Result> list(PartyTopicFormDTO formDTO) { + public Result list(PartyTopicFormDTO formDTO) { return ModuleUtils.feignConError(ServiceConstant.EPDC_PARTY_GROUP_SERVER, "list",formDTO); } @@ -52,7 +52,7 @@ public class PartyGroupFeignClientFallback implements PartyGroupFeignClient { } @Override - public Result> list(PartyUserGroupFormDTO formDTO) { + public Result list(PartyUserGroupFormDTO formDTO) { return ModuleUtils.feignConError(ServiceConstant.EPDC_PARTY_GROUP_SERVER, "list",formDTO); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/PartyGroupService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/PartyGroupService.java index 99184ba4..4b9651eb 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/PartyGroupService.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/PartyGroupService.java @@ -48,7 +48,7 @@ public interface PartyGroupService { * @Param [userDetail, formDto] * @return com.elink.esua.epdc.commons.tools.utils.Result> **/ - Result> topicList(TokenDto userDetail, PartyTopicFormDTO formDto); + Result topicList(TokenDto userDetail, PartyTopicFormDTO formDto); /** * @Description 发布话题 * @Author songyunpeng @@ -72,7 +72,7 @@ public interface PartyGroupService { * @Param [userDetail, formDto] * @return com.elink.esua.epdc.commons.tools.utils.Result> **/ - Result> userList( PartyUserGroupFormDTO formDto); + Result userList(TokenDto userDetail, PartyUserGroupFormDTO formDto); /** * @Description 当前用户在群里的信息 * @Author songyunpeng diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/PartyGroupServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/PartyGroupServiceImpl.java index 9c777686..cde25115 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/PartyGroupServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/PartyGroupServiceImpl.java @@ -55,7 +55,7 @@ public class PartyGroupServiceImpl implements PartyGroupService { } @Override - public Result> topicList(TokenDto userDetail, PartyTopicFormDTO formDto) { + public Result topicList(TokenDto userDetail, PartyTopicFormDTO formDto) { if(userDetail!=null){ formDto.setUserId(userDetail.getUserId()); } @@ -97,7 +97,11 @@ public class PartyGroupServiceImpl implements PartyGroupService { } @Override - public Result> userList( PartyUserGroupFormDTO formDto) { + public Result userList( TokenDto userDetail, PartyUserGroupFormDTO formDto) { + if(userDetail==null){ + return new Result().error("未登录"); + } + formDto.setUserId(userDetail.getUserId()); return partyGroupFeignClient.list(formDto); } diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/result/CurrentUser.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/result/CurrentUser.java new file mode 100644 index 00000000..db0fbccd --- /dev/null +++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/result/CurrentUser.java @@ -0,0 +1,47 @@ +package com.elink.esua.epdc.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @author songyunpeng 群成员列表 + * @Description + * @create 2020-06-05 + */ +@Data +public class CurrentUser implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String id; + + /** + * 用户ID + */ + private String userId; + + /** + * 昵称 + */ + private String nickname; + + /** + * 用户头像 + */ + private String userAvatar; + + + /** + * 身份标识 0:群员 1:群主 2:副群主 + */ + private String identityFlag; + + /** + * 禁言状态：0-未禁言，1-禁言1天，2-禁言1周，3-禁言一个月，4-永久禁言 + */ + private String bannedFlag; + +} diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/result/OtherUsers.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/result/OtherUsers.java new file mode 100644 index 00000000..568ed283 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/result/OtherUsers.java @@ -0,0 +1,48 @@ +package com.elink.esua.epdc.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @author songyunpeng 群成员列表 + * @Description + * @create 2020-06-05 + */ +@Data +public class OtherUsers implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String id; + + /** + * 用户ID + */ + private String userId; + + /** + * 昵称 + */ + private String nickname; + + /** + * 用户头像 + */ + private String userAvatar; + + + /** + * 身份标识 0:群员 1:群主 2:副群主 + */ + private String identityFlag; + + /** + * 禁言状态：0-未禁言，1-禁言1天，2-禁言1周，3-禁言一个月，4-永久禁言 + */ + private String bannedFlag; + + +} diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/result/PartyTopicResultDTO.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/result/PartyTopicResultDTO.java index f257845f..059c2d49 100644 --- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/result/PartyTopicResultDTO.java +++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/result/PartyTopicResultDTO.java @@ -20,7 +20,6 @@ package com.elink.esua.epdc.dto.result; import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -33,74 +32,14 @@ import java.util.List; public class PartyTopicResultDTO implements Serializable { private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - private String id; - - - /** - * 用户昵称 - */ - private String nickname; - - /** - * 用户头像 - */ - private String userFace; - - /** - * 党员表示 - */ - private String partyMember; - - - /** - * 话题内容 - */ - private String topicContent; - - /** - * 话题模块 0:事好儿鼓个掌 1:话对捧个场 - */ - private String topicModule; - - - /** - * 话题地址 - */ - private String topicAddress; - - /** - * 评论数 + * 用户是否被禁言 */ - private Integer commentNum; + String bannedFlag; - /** - * 点赞数 - */ - private Integer supportNum; /** - * 创建时间 + * 话题列表 */ - private Date createdTime; - - /** - * 图片 - */ - private List images; - - /** - * 是否点赞 - */ - private String likeFlag; - - /** - * 评论列表 - */ - private List comments; - + List topicList; } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/result/PartyUserGroupResultDTO.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/result/PartyUserGroupResultDTO.java index bd5619eb..36c93b93 100644 --- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/result/PartyUserGroupResultDTO.java +++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/result/PartyUserGroupResultDTO.java @@ -20,6 +20,7 @@ package com.elink.esua.epdc.dto.result; import lombok.Data; import java.io.Serializable; +import java.util.List; /** @@ -32,37 +33,14 @@ import java.io.Serializable; public class PartyUserGroupResultDTO implements Serializable { private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - private String id; - /** - * 用户ID + * 当前用户 */ - private String userId; - - /** - * 昵称 - */ - private String nickname; - - /** - * 用户头像 - */ - private String userAvatar; - - - /** - * 身份标识 0:群员 1:群主 2:副群主 - */ - private String identityFlag; - + CurrentUser currentUser; /** - * 禁言状态：0-未禁言，1-禁言1天，2-禁言1周，3-禁言一个月，4-永久禁言 + * 其他成员 */ - private String bannedFlag; + List otherUsers; } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/result/TopicList.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/result/TopicList.java new file mode 100644 index 00000000..c97dd724 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/result/TopicList.java @@ -0,0 +1,106 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * 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. + *

+ * 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. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.dto.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +/** + * 话题表 + * + * @author elink elink@elink-cn.com + * @since v1.0.0 2020-05-29 + */ +@Data +public class TopicList implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String id; + + + /** + * 用户昵称 + */ + private String nickname; + + /** + * 用户头像 + */ + private String userFace; + + /** + * 党员表示 + */ + private String partyMember; + + + /** + * 话题内容 + */ + private String topicContent; + + /** + * 话题模块 0:事好儿鼓个掌 1:话对捧个场 + */ + private String topicModule; + + + /** + * 话题地址 + */ + private String topicAddress; + + + /** + * 评论数 + */ + private Integer commentNum; + + /** + * 点赞数 + */ + private Integer supportNum; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 图片 + */ + private List images; + + /** + * 是否点赞 + */ + private String likeFlag; + + /** + * 评论列表 + */ + private List comments; + +} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/controller/AppPartyTopicController.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/controller/AppPartyTopicController.java index 214e5127..da311cb6 100644 --- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/controller/AppPartyTopicController.java +++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/controller/AppPartyTopicController.java @@ -50,7 +50,7 @@ public class AppPartyTopicController { * @return com.elink.esua.epdc.commons.tools.utils.Result> **/ @GetMapping("list") - public Result> list(@RequestBody PartyTopicFormDTO formDTO){ + public Result list(@RequestBody PartyTopicFormDTO formDTO){ ValidatorUtils.validateEntity(formDTO); return partyTopicService.getAllPartyTopicResultDTO(formDTO); } diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/controller/AppPartyUserGroupController.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/controller/AppPartyUserGroupController.java index f6f37520..b90eebdc 100644 --- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/controller/AppPartyUserGroupController.java +++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/controller/AppPartyUserGroupController.java @@ -11,8 +11,6 @@ import com.elink.esua.epdc.service.PartyUserGroupService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import java.util.List; - /** * @author songyunpeng * @Description @@ -34,22 +32,11 @@ public class AppPartyUserGroupController { * @return com.elink.esua.epdc.commons.tools.utils.Result> **/ @GetMapping("list") - public Result> list(@RequestBody PartyUserGroupFormDTO formDTO){ + public Result list(@RequestBody PartyUserGroupFormDTO formDTO){ ValidatorUtils.validateEntity(formDTO); return partyUserGroupService.getAllPartyUser(formDTO); } - /** - * @Description 当前用户在群里的信息 - * @Author songyunpeng - * @Date 2020/6/3 - * @Param [formDTO] - * @return com.elink.esua.epdc.commons.tools.utils.Result> - **/ - @GetMapping("currentUserInfo/{partyGroupId}") - public Result currentUserInfo(@PathVariable("partyGroupId") String partyGroupId){ - return partyUserGroupService.currentUserInfo(partyGroupId); - } /** * @Description 禁言 * @Author songyunpeng diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/dao/PartyTopicDao.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/dao/PartyTopicDao.java index c6daa249..d74ee452 100644 --- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/dao/PartyTopicDao.java +++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/dao/PartyTopicDao.java @@ -20,7 +20,7 @@ package com.elink.esua.epdc.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; import com.elink.esua.epdc.dto.PartyTopicDTO; import com.elink.esua.epdc.dto.form.PartyTopicFormDTO; -import com.elink.esua.epdc.dto.result.PartyTopicResultDTO; +import com.elink.esua.epdc.dto.result.TopicList; import com.elink.esua.epdc.entity.PartyTopicEntity; import org.apache.ibatis.annotations.Mapper; @@ -60,7 +60,7 @@ public interface PartyTopicDao extends BaseDao { * @Param [formDto] * @return java.util.List **/ - List selectListOfPartyTopic(PartyTopicFormDTO formDto); + List selectListOfPartyTopic(PartyTopicFormDTO formDto); /** * @Description 更新评论数 * @Author songyunpeng diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/dao/PartyUserGroupDao.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/dao/PartyUserGroupDao.java index a344f4df..8b42dbe6 100644 --- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/dao/PartyUserGroupDao.java +++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/dao/PartyUserGroupDao.java @@ -20,7 +20,8 @@ package com.elink.esua.epdc.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; import com.elink.esua.epdc.dto.PartyUserGroupDTO; import com.elink.esua.epdc.dto.form.PartyUserGroupFormDTO; -import com.elink.esua.epdc.dto.result.PartyUserGroupResultDTO; +import com.elink.esua.epdc.dto.result.CurrentUser; +import com.elink.esua.epdc.dto.result.OtherUsers; import com.elink.esua.epdc.entity.PartyUserGroupEntity; import org.apache.ibatis.annotations.Mapper; @@ -60,13 +61,13 @@ public interface PartyUserGroupDao extends BaseDao { **/ List getPartyUserGroupPageFromPC(Map params); /** - * @Description APP获取群成员 + * @Description APP获取其他群成员 * @Author songyunpeng * @Date 2020/6/3 * @Param [formDTO] * @return java.util.List **/ - List selectListOfPartyUserGroupWithoutCurrentUser(PartyUserGroupFormDTO formDTO); + List selectListOfPartyUserGroupWithoutCurrentUser(PartyUserGroupFormDTO formDTO); /** * @Description APP获取当前用户的成员信息 @@ -75,6 +76,6 @@ public interface PartyUserGroupDao extends BaseDao { * @Param [formDTO] * @return java.util.List **/ - PartyUserGroupResultDTO selectOneOfPartyUserGroup(String partyGroupId); + CurrentUser selectOneOfPartyUserGroup(PartyUserGroupFormDTO formDTO); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/PartyTopicService.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/PartyTopicService.java index 72a99809..a63451f2 100644 --- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/PartyTopicService.java +++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/PartyTopicService.java @@ -121,7 +121,7 @@ public interface PartyTopicService extends BaseService { * @Param [formDTO] * @return com.elink.esua.epdc.commons.tools.utils.Result> **/ - Result> getAllPartyTopicResultDTO(PartyTopicFormDTO formDTO); + Result getAllPartyTopicResultDTO(PartyTopicFormDTO formDTO); /** * @Description 发布话题 * @Author songyunpeng diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/PartyUserGroupService.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/PartyUserGroupService.java index 0d5cab05..42653390 100644 --- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/PartyUserGroupService.java +++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/PartyUserGroupService.java @@ -146,15 +146,8 @@ public interface PartyUserGroupService extends BaseService * @Param [formDTO] * @return com.elink.esua.epdc.commons.tools.utils.Result> **/ - Result> getAllPartyUser(PartyUserGroupFormDTO formDTO); - /** - * @Description 当前用户的在指定群的信息 - * @Author songyunpeng - * @Date 2020/6/3 - * @Param [formDTO] - * @return com.elink.esua.epdc.commons.tools.utils.Result> - **/ - Result currentUserInfo(String partyGroupId); + Result getAllPartyUser(PartyUserGroupFormDTO formDTO); + /** * @Description app禁言 * @Author songyunpeng diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/impl/PartyTopicServiceImpl.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/impl/PartyTopicServiceImpl.java index 1b79bd7d..6302a11b 100644 --- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/impl/PartyTopicServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/impl/PartyTopicServiceImpl.java @@ -29,22 +29,26 @@ import com.elink.esua.epdc.dao.PartyTopicDao; import com.elink.esua.epdc.dto.GroupTopicCloseFormDTO; import com.elink.esua.epdc.dto.PartyTopicDTO; import com.elink.esua.epdc.dto.PartyTopicUserAttitudeDTO; +import com.elink.esua.epdc.dto.PartyUserGroupDTO; import com.elink.esua.epdc.dto.form.PartyTopicFormDTO; import com.elink.esua.epdc.dto.form.PartyTopicSubmitFormDTO; import com.elink.esua.epdc.dto.form.TopicStatementFormDTO; import com.elink.esua.epdc.dto.result.PartyTopicResultDTO; +import com.elink.esua.epdc.dto.result.TopicList; import com.elink.esua.epdc.entity.PartyTopicEntity; import com.elink.esua.epdc.entity.PartyTopicUserAttitudeEntity; import com.elink.esua.epdc.redis.PartyTopicRedis; import com.elink.esua.epdc.service.PartyTopicImgService; import com.elink.esua.epdc.service.PartyTopicService; import com.elink.esua.epdc.service.PartyTopicUserAttitudeService; +import com.elink.esua.epdc.service.PartyUserGroupService; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.Arrays; +import java.util.Date; import java.util.List; import java.util.Map; @@ -66,6 +70,9 @@ public class PartyTopicServiceImpl extends BaseServiceImpl page(Map params) { IPage page = baseDao.selectPage( @@ -135,16 +142,29 @@ public class PartyTopicServiceImpl extends BaseServiceImpl> getAllPartyTopicResultDTO(PartyTopicFormDTO formDto) { + public Result getAllPartyTopicResultDTO(PartyTopicFormDTO formDto) { int pageIndex = (formDto.getPageIndex() - NumConstant.ONE) * formDto.getPageSize(); formDto.setPageIndex(pageIndex); - List data = baseDao.selectListOfPartyTopic(formDto); - return new Result>().ok(data); + List topicLists = baseDao.selectListOfPartyTopic(formDto); + PartyTopicResultDTO partyTopicResultDTO = new PartyTopicResultDTO(); + //获取当前用户在当前党群禁言状态 + PartyUserGroupDTO userByGroupIdAndUserId = partyUserGroupService.getUserByGroupIdAndUserId(formDto.getPartyGroupId(), formDto.getUserId()); + if(userByGroupIdAndUserId!=null && userByGroupIdAndUserId.getBannedEndTime()!=null && new Date().before(userByGroupIdAndUserId.getBannedEndTime())){ + partyTopicResultDTO.setBannedFlag("1"); + }else{ + partyTopicResultDTO.setBannedFlag("0"); + } + partyTopicResultDTO.setTopicList(topicLists); + return new Result().ok(partyTopicResultDTO); } @Override @Transactional(rollbackFor = Exception.class) public Result saveTopic(PartyTopicSubmitFormDTO formDto) { + PartyUserGroupDTO userByGroupIdAndUserId = partyUserGroupService.getUserByGroupIdAndUserId(formDto.getPartyGroupId(), formDto.getUserId()); + if(userByGroupIdAndUserId!=null && userByGroupIdAndUserId.getBannedEndTime()!=null && new Date().before(userByGroupIdAndUserId.getBannedEndTime())){ + return new Result().error("用户已被禁言"); + } PartyTopicEntity entity = ConvertUtils.sourceToTarget(formDto, PartyTopicEntity.class); entity.setTopicModule(formDto.getTopicType()); if(insert(entity)){ diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/impl/PartyUserGroupServiceImpl.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/impl/PartyUserGroupServiceImpl.java index 456944b3..aedd67f8 100644 --- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/impl/PartyUserGroupServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/impl/PartyUserGroupServiceImpl.java @@ -35,6 +35,8 @@ import com.elink.esua.epdc.dto.constant.PartyGroupConstant; import com.elink.esua.epdc.dto.form.PartyUserBannedFormDTO; import com.elink.esua.epdc.dto.form.PartyUserGroupFormDTO; import com.elink.esua.epdc.dto.form.PartyUserIdentityFormDTO; +import com.elink.esua.epdc.dto.result.CurrentUser; +import com.elink.esua.epdc.dto.result.OtherUsers; import com.elink.esua.epdc.dto.result.PartyUserGroupResultDTO; import com.elink.esua.epdc.entity.PartyUserGroupEntity; import com.elink.esua.epdc.enums.BannedEnum; @@ -169,17 +171,17 @@ public class PartyUserGroupServiceImpl extends BaseServiceImpl> getAllPartyUser(PartyUserGroupFormDTO formDTO) { + public Result getAllPartyUser(PartyUserGroupFormDTO formDTO) { int pageIndex = (formDTO.getPageIndex() - NumConstant.ONE) * formDTO.getPageSize(); formDTO.setPageIndex(pageIndex); - List data = baseDao.selectListOfPartyUserGroupWithoutCurrentUser(formDTO); - return new Result>().ok(data); + List otherUsers = baseDao.selectListOfPartyUserGroupWithoutCurrentUser(formDTO); + CurrentUser currentUser = baseDao.selectOneOfPartyUserGroup(formDTO); + PartyUserGroupResultDTO partyUserGroupResultDTO = new PartyUserGroupResultDTO(); + partyUserGroupResultDTO.setCurrentUser(currentUser); + partyUserGroupResultDTO.setOtherUsers(otherUsers); + return new Result().ok(partyUserGroupResultDTO); } - @Override - public Result currentUserInfo (String partyGroupId) { - return new Result().ok(baseDao.selectOneOfPartyUserGroup(partyGroupId)); - } @Override public Result banned(PartyUserBannedFormDTO formDto) { diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyTopicDao.xml b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyTopicDao.xml index 505984a5..532d28f9 100644 --- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyTopicDao.xml +++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyTopicDao.xml @@ -130,7 +130,7 @@ and t.ID = #{id} - + diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyUserGroupDao.xml b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyUserGroupDao.xml index 708252ec..fbfa8264 100644 --- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyUserGroupDao.xml +++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyUserGroupDao.xml @@ -143,7 +143,7 @@ order by CREATED_TIME desc - select ID, USER_ID, @@ -183,11 +183,11 @@ ALL_DEPT_IDS, GRID,DATEDIFF(BANNED_END_TIME,BANNED_START_TIME) as bannedTime from epdc_party_user_group)a where DEL_FLAG='0' - and PARTY_GROUP_ID = #{partyGroupId} + and PARTY_GROUP_ID = #{partyGroupId} and USER_ID != #{userId} order by IDENTITY_FLAG,CREATED_TIME desc LIMIT #{pageIndex},#{pageSize} - select ID, USER_ID, @@ -227,7 +227,7 @@ ALL_DEPT_IDS, GRID,DATEDIFF(BANNED_END_TIME,BANNED_START_TIME) as bannedTime from epdc_party_user_group)a where DEL_FLAG='0' - and id = #{partyGroupId} + and PARTY_GROUP_ID = #{partyGroupId} and USER_ID = #{userId} LIMIT 1 \ No newline at end of file