From eaf9e4771f04f01687487aa38e6d1f28ff413509 Mon Sep 17 00:00:00 2001 From: liuchuang Date: Mon, 16 Dec 2019 19:56:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc-admin/epdc-admin-server/pom.xml | 4 +- .../epdc-api/epdc-api-server/pom.xml | 4 +- .../epdc/controller/ApiGroupController.java | 4 +- .../epdc/controller/ApiTopicController.java | 4 +- .../esua/epdc/feign/TopicFeignClient.java | 9 +-- .../fallback/TopicFeignClientFallback.java | 9 +-- .../elink/esua/epdc/service/GroupService.java | 2 +- .../elink/esua/epdc/service/TopicService.java | 2 +- .../epdc/service/impl/GroupServiceImpl.java | 6 +- .../epdc/service/impl/TopicServiceImpl.java | 12 +++- .../epdc/dto/comment/EventCommentDTO.java | 3 +- .../events/form/EpdcEventSubmitFormDTO.java | 3 + .../epdc-events/epdc-events-server/pom.xml | 4 +- .../controller/EpdcAppEventsController.java | 2 +- .../issue/service/impl/IssueServiceImpl.java | 3 +- .../dto/group/GroupSettingStateDTO.java | 5 ++ .../dto/group/UserReviewDto.java | 5 ++ .../topic/form/TopicChangeToIssueFormDTO.java | 10 +++ .../dto/topic/form/TopicDetailFormDTO.java | 23 +++++++ .../topic/result/TopicDetailResultDTO.java | 21 +++--- .../TopicCommentUserAttitudeServiceImpl.java | 1 + .../group/service/impl/GroupServiceImpl.java | 6 +- .../service/impl/UserGroupServiceImpl.java | 12 ++-- .../topic/controller/AppTopicController.java | 11 ++- .../modules/topic/service/TopicService.java | 8 +-- .../topic/service/impl/TopicServiceImpl.java | 30 ++++---- .../src/main/resources/logback-spring.xml | 2 +- .../mapper/comment/TopicCommentDao.xml | 5 +- .../main/resources/mapper/group/GroupDao.xml | 16 +++-- .../main/resources/mapper/topic/TopicDao.xml | 69 +++++++++---------- 30 files changed, 175 insertions(+), 120 deletions(-) create mode 100644 esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/topic/form/TopicDetailFormDTO.java diff --git a/esua-epdc/epdc-admin/epdc-admin-server/pom.xml b/esua-epdc/epdc-admin/epdc-admin-server/pom.xml index be017d484..452668612 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/pom.xml +++ b/esua-epdc/epdc-admin/epdc-admin-server/pom.xml @@ -174,8 +174,8 @@ wxdd8530c5f4926766 5bf4fb813145431b3493a10aa7e041e9 - wx29b074840ef4bfd9 - 4adb1afccc69f205cdf5b521d74e2aca + wx9f20a46906ab2c3e + dc13065f79429979d9f687d249eb5c4e diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml b/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml index 435c0a1c5..24ffc2c20 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml @@ -236,8 +236,8 @@ wxdd8530c5f4926766 5bf4fb813145431b3493a10aa7e041e9 - wx29b074840ef4bfd9 - 4adb1afccc69f205cdf5b521d74e2aca + wx9f20a46906ab2c3e + dc13065f79429979d9f687d249eb5c4e diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiGroupController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiGroupController.java index 0812ae11c..bdd74dce4 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiGroupController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiGroupController.java @@ -53,8 +53,8 @@ public class ApiGroupController { * @since 2019/10/21 9:51 */ @PostMapping("disband") - public Result disbandGroup(@RequestBody GroupSettingStateDTO formDto) { - return groupService.disbandGroup(formDto); + public Result disbandGroup(@LoginUser TokenDto userDetail, @RequestBody GroupSettingStateDTO formDto) { + return groupService.disbandGroup(userDetail, formDto); } /** diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiTopicController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiTopicController.java index 538abda7f..5ded8ce1a 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiTopicController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiTopicController.java @@ -87,8 +87,8 @@ public class ApiTopicController { * @since 2019/11/7 15:37 */ @GetMapping("detail/{id}") - public Result detail(@PathVariable("id") String id) { - return topicService.getTopicDetailById(id); + public Result detail(@LoginUser TokenDto userDetail, @PathVariable("id") String id) { + return topicService.getTopicDetailById(userDetail, id); } /** diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/TopicFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/TopicFeignClient.java index 2054ceb43..a7d5382ac 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/TopicFeignClient.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/TopicFeignClient.java @@ -3,10 +3,7 @@ package com.elink.esua.epdc.feign; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.group.result.TopicAuditRecordResultDTO; -import com.elink.esua.epdc.dto.topic.form.TopicChangeToIssueFormDTO; -import com.elink.esua.epdc.dto.topic.form.TopicListFormDTO; -import com.elink.esua.epdc.dto.topic.form.TopicCloseFormDTO; -import com.elink.esua.epdc.dto.topic.form.TopicSubmitFormDTO; +import com.elink.esua.epdc.dto.topic.form.*; import com.elink.esua.epdc.dto.topic.result.TopicDetailResultDTO; import com.elink.esua.epdc.dto.topic.result.TopicListResultDTO; import com.elink.esua.epdc.feign.fallback.TopicFeignClientFallback; @@ -49,8 +46,8 @@ public interface TopicFeignClient { * @author liuchuang * @since 2019/11/7 15:37 */ - @GetMapping(value = "group/epdc-app/topic/detail/{id}", consumes = MediaType.APPLICATION_JSON_VALUE) - Result detail(@PathVariable("id") String id); + @GetMapping(value = "group/epdc-app/topic/detail", consumes = MediaType.APPLICATION_JSON_VALUE) + Result detail(TopicDetailFormDTO formDto); /** * diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/TopicFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/TopicFeignClientFallback.java index 2c332b2e1..cecf8b1e4 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/TopicFeignClientFallback.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/TopicFeignClientFallback.java @@ -4,10 +4,7 @@ import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.group.result.TopicAuditRecordResultDTO; -import com.elink.esua.epdc.dto.topic.form.TopicChangeToIssueFormDTO; -import com.elink.esua.epdc.dto.topic.form.TopicListFormDTO; -import com.elink.esua.epdc.dto.topic.form.TopicCloseFormDTO; -import com.elink.esua.epdc.dto.topic.form.TopicSubmitFormDTO; +import com.elink.esua.epdc.dto.topic.form.*; import com.elink.esua.epdc.dto.topic.result.TopicDetailResultDTO; import com.elink.esua.epdc.dto.topic.result.TopicListResultDTO; import com.elink.esua.epdc.feign.TopicFeignClient; @@ -29,8 +26,8 @@ public class TopicFeignClientFallback implements TopicFeignClient { } @Override - public Result detail(String id) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_GROUP_SERVER, "detail", id); + public Result detail(TopicDetailFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_GROUP_SERVER, "detail", formDto); } @Override diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/GroupService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/GroupService.java index 902678854..3298a794f 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/GroupService.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/GroupService.java @@ -39,7 +39,7 @@ public interface GroupService { * @author liuchuang * @since 2019/10/21 9:51 */ - Result disbandGroup(GroupSettingStateDTO dto); + Result disbandGroup(TokenDto userDetail, GroupSettingStateDTO dto); /** * diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/TopicService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/TopicService.java index b3176552c..1ac17170b 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/TopicService.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/TopicService.java @@ -42,7 +42,7 @@ public interface TopicService { * @author liuchuang * @since 2019/11/7 15:34 */ - Result getTopicDetailById(String id); + Result getTopicDetailById(TokenDto userDetail, String id); /** * diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/GroupServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/GroupServiceImpl.java index f4ad892b2..294ed172a 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/GroupServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/GroupServiceImpl.java @@ -75,8 +75,12 @@ public class GroupServiceImpl implements GroupService { } @Override - public Result disbandGroup(GroupSettingStateDTO dto) { + public Result disbandGroup(TokenDto userDetail, GroupSettingStateDTO dto) { + if (null == userDetail) { + return new Result().error("获取用户信息失败"); + } dto.setState(GroupStateEnum.GROUP_STATE_DISBANDED.getValue()); + dto.setUserId(userDetail.getUserId()); return groupFeignClient.disbandGroup(dto); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/TopicServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/TopicServiceImpl.java index 4f12718e2..1ca2ad161 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/TopicServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/TopicServiceImpl.java @@ -66,8 +66,14 @@ public class TopicServiceImpl implements TopicService { } @Override - public Result getTopicDetailById(String id) { - return topicFeignClient.detail(id); + public Result getTopicDetailById(TokenDto userDetail, String id) { + if (null == userDetail) { + return new Result().error("获取用户信息失败"); + } + TopicDetailFormDTO formDto = new TopicDetailFormDTO(); + formDto.setId(id); + formDto.setUserId(userDetail.getUserId()); + return topicFeignClient.detail(formDto); } @Override @@ -109,6 +115,8 @@ public class TopicServiceImpl implements TopicService { return new Result().error("获取用户信息失败"); } formDto.setUserId(userDetail.getUserId()); + formDto.setNickname(userDetail.getNickname()); + formDto.setMobile(userDetail.getMobile()); return topicFeignClient.changeToIssue(formDto); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/comment/EventCommentDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/comment/EventCommentDTO.java index d8f1a3556..cb6576d01 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/comment/EventCommentDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/comment/EventCommentDTO.java @@ -144,7 +144,8 @@ public class EventCommentDTO implements Serializable { private Date updatedTime; /** - * PARTY_FLAG 党员标识（0-否，1-是） + * 党员标识 0-否，1-是 */ private String partyFlag; + } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EpdcEventSubmitFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EpdcEventSubmitFormDTO.java index eb269d6a3..3fe1cb2c8 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EpdcEventSubmitFormDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EpdcEventSubmitFormDTO.java @@ -4,6 +4,7 @@ import lombok.Data; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; import java.io.Serializable; import java.util.List; @@ -19,11 +20,13 @@ public class EpdcEventSubmitFormDTO implements Serializable { * 事件内容 */ @NotBlank(message = "事件内容不能为空") + @Size(min = 1, max = 500, message = "事件内容不能为空且在500个字以内") private String eventContent; /** * 事件地址 */ @NotBlank(message = "地址信息不能为空") + @Size(min = 1, max = 100, message = "地址信息不能为空且在100个字以内") private String issueAddress; /** * 经度 diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml index b72d9b0c1..6a2876035 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml @@ -216,8 +216,8 @@ wxdd8530c5f4926766 5bf4fb813145431b3493a10aa7e041e9 - wx29b074840ef4bfd9 - 4adb1afccc69f205cdf5b521d74e2aca + wx9f20a46906ab2c3e + dc13065f79429979d9f687d249eb5c4e diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/EpdcAppEventsController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/EpdcAppEventsController.java index a66b1d386..3ac7a984f 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/EpdcAppEventsController.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/EpdcAppEventsController.java @@ -32,7 +32,7 @@ public class EpdcAppEventsController { @PostMapping("submit") public Result submitEvent(@RequestBody EpdcEventSubmitFormDTO formDto) { //效验数据 - ValidatorUtils.validateEntity(formDto, AddGroup.class, DefaultGroup.class); + ValidatorUtils.validateEntity(formDto); epdcEventsService.saveEvent(formDto); return new Result(); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java index c7b035ef3..061c28c54 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java @@ -242,8 +242,9 @@ public class IssueServiceImpl extends BaseServiceImpl imp if (StringUtils.isNotEmpty(entity.getGroupId())) { // 更新话题状态 Map map = new HashMap<>(); - map.put("topicId", entity.getTopicId()); + map.put("id", entity.getTopicId()); map.put("state", "15"); + map.put("itemId", itemEntity.getId()); groupFeignClient.modifyTopicState(map); } // 发送菜单消息-待处理项目 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 ed725021f..d6bfd00a2 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 @@ -34,4 +34,9 @@ public class GroupSettingStateDTO implements Serializable { */ private String processingOpinions; + /** + * 操作用户ID + */ + private String userId; + } diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/group/UserReviewDto.java b/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/group/UserReviewDto.java index f712861dc..001a01e59 100644 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/group/UserReviewDto.java +++ b/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/group/UserReviewDto.java @@ -25,4 +25,9 @@ public class UserReviewDto implements Serializable { * 审核意见 */ private String auditOpinion; + + /** + * 用户ID + */ + private String userId; } diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/topic/form/TopicChangeToIssueFormDTO.java b/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/topic/form/TopicChangeToIssueFormDTO.java index 9d51d7122..a22882965 100644 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/topic/form/TopicChangeToIssueFormDTO.java +++ b/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/topic/form/TopicChangeToIssueFormDTO.java @@ -37,4 +37,14 @@ public class TopicChangeToIssueFormDTO implements Serializable { * 操作人ID */ private String userId; + + /** + * 操作人 + */ + private String nickname; + + /** + * 操作人手机号 + */ + private String mobile; } diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/topic/form/TopicDetailFormDTO.java b/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/topic/form/TopicDetailFormDTO.java new file mode 100644 index 000000000..d5cb5a8d8 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/topic/form/TopicDetailFormDTO.java @@ -0,0 +1,23 @@ +package com.elink.esua.epdc.dto.topic.form; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author：liuchuang + * @Date：2019/12/16 11:59 + */ +@Data +public class TopicDetailFormDTO implements Serializable { + private static final long serialVersionUID = -5491908221321780309L; + /** + * 话题ID + */ + private String id; + + /** + * 用户ID + */ + private String userId; +} diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/topic/result/TopicDetailResultDTO.java b/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/topic/result/TopicDetailResultDTO.java index 7ae17a005..f66813769 100644 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/topic/result/TopicDetailResultDTO.java +++ b/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/topic/result/TopicDetailResultDTO.java @@ -58,22 +58,27 @@ public class TopicDetailResultDTO implements Serializable { private Integer browseNum; /** - * 是否可操作（true 可评、赞等） + * 社群状态（ 0：待审核，5：审核不通过，10：审核通过，15：禁言，20：已解散） */ - private Boolean operationalFlag; + private Integer groupState; /** - * 是否可关闭（true 可以） + * 话题状态（0：讨论中，10：已转议题，15：已转项目，20：已关闭） */ - private Boolean closeFlag; + private Integer topicState; /** - * 是否可转议题（true 可以） + * 图片 */ - private Boolean changeFlag; + private List images; /** - * 图片 + * 社群ID */ - private List images; + private String groupId; + + /** + * 群主标识 0-否，1-是 + */ + private String lordFlag; } diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/comment/service/impl/TopicCommentUserAttitudeServiceImpl.java b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/comment/service/impl/TopicCommentUserAttitudeServiceImpl.java index 10f97d91d..f53999cb2 100755 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/comment/service/impl/TopicCommentUserAttitudeServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/comment/service/impl/TopicCommentUserAttitudeServiceImpl.java @@ -125,6 +125,7 @@ public class TopicCommentUserAttitudeServiceImpl extends BaseServiceImpl imp List userListResultDTOS = userGroupService.listOfUserGroup(dto.getId(), GroupUserStateEnum.GROUP_USER_STATE_EXAMINATION_PASSED.getValue()); for (GroupUserListResultDTO usersDTO: userListResultDTOS) { - informationFormDTO.setUserId(usersDTO.getUserId()); - newsTask.insertUserInformation(informationFormDTO); + if (!usersDTO.getUserId().equals(dto.getUserId())) { + informationFormDTO.setUserId(usersDTO.getUserId()); + newsTask.insertUserInformation(informationFormDTO); + } } } diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/impl/UserGroupServiceImpl.java b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/impl/UserGroupServiceImpl.java index 57092270c..90eefd7f0 100644 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/impl/UserGroupServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/impl/UserGroupServiceImpl.java @@ -213,17 +213,17 @@ public class UserGroupServiceImpl extends BaseServiceImpl detail(@PathVariable("id") String id) { - TopicDetailResultDTO data = topicService.getTopicDetailById(id); + @GetMapping("detail") + public Result detail(@RequestBody TopicDetailFormDTO formDto) { + TopicDetailResultDTO data = topicService.getTopicDetailById(formDto); return new Result().ok(data); } diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/service/TopicService.java b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/service/TopicService.java index 64a5bba20..e8fc58120 100644 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/service/TopicService.java +++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/service/TopicService.java @@ -23,11 +23,7 @@ import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.group.result.TopicAuditRecordResultDTO; import com.elink.esua.epdc.dto.topic.TopicDTO; import com.elink.esua.epdc.dto.topic.TopicDetailDTO; -import com.elink.esua.epdc.dto.topic.form.TopicChangeToIssueFormDTO; -import com.elink.esua.epdc.dto.topic.form.TopicListFormDTO; -import com.elink.esua.epdc.dto.topic.form.TopicCloseFormDTO; -import com.elink.esua.epdc.dto.topic.form.TopicReviewFormDTO; -import com.elink.esua.epdc.dto.topic.form.TopicSubmitFormDTO; +import com.elink.esua.epdc.dto.topic.form.*; import com.elink.esua.epdc.dto.topic.result.TopicDetailResultDTO; import com.elink.esua.epdc.dto.topic.result.TopicListResultDTO; import com.elink.esua.epdc.modules.topic.entity.TopicEntity; @@ -151,7 +147,7 @@ public interface TopicService extends BaseService { * @author liuchuang * @since 2019/11/7 15:34 */ - TopicDetailResultDTO getTopicDetailById(String id); + TopicDetailResultDTO getTopicDetailById(TopicDetailFormDTO formDto); /** * diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/service/impl/TopicServiceImpl.java b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/service/impl/TopicServiceImpl.java index 9b92b6dd8..2ecf53b3e 100644 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/service/impl/TopicServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/service/impl/TopicServiceImpl.java @@ -46,11 +46,7 @@ import com.elink.esua.epdc.dto.issue.IssueDTO; import com.elink.esua.epdc.dto.topic.GroupTopicUserReadDTO; import com.elink.esua.epdc.dto.topic.TopicDTO; import com.elink.esua.epdc.dto.topic.TopicDetailDTO; -import com.elink.esua.epdc.dto.topic.form.TopicListFormDTO; -import com.elink.esua.epdc.dto.topic.form.TopicChangeToIssueFormDTO; -import com.elink.esua.epdc.dto.topic.form.TopicCloseFormDTO; -import com.elink.esua.epdc.dto.topic.form.TopicReviewFormDTO; -import com.elink.esua.epdc.dto.topic.form.TopicSubmitFormDTO; +import com.elink.esua.epdc.dto.topic.form.*; import com.elink.esua.epdc.dto.topic.result.TopicDetailResultDTO; import com.elink.esua.epdc.dto.topic.result.TopicListResultDTO; import com.elink.esua.epdc.modules.async.NewsTask; @@ -206,15 +202,24 @@ public class TopicServiceImpl extends BaseServiceImpl imp } @Override - public TopicDetailResultDTO getTopicDetailById(String id) { - TopicDetailResultDTO resultDto = baseDao.selectOneOfTopicDetailById(id); + public TopicDetailResultDTO getTopicDetailById(TopicDetailFormDTO formDto) { + TopicDetailResultDTO resultDto = baseDao.selectOneOfTopicDetailById(formDto.getId()); if (null != resultDto) { // 更新浏览次数 TopicEntity entity = new TopicEntity(); - entity.setId(id); + entity.setId(formDto.getId()); entity.setBrowseNum(resultDto.getBrowseNum() + 1); this.updateById(entity); + + // 获取群主信息 + UserGroupDTO userGroupDto = userGroupService.getLordInfoByGroupId(resultDto.getGroupId()); + if (formDto.getUserId().equals(userGroupDto.getUserId())) { + resultDto.setLordFlag(NumConstant.ONE_STR); + } else { + resultDto.setLordFlag(NumConstant.ZERO_STR); + } } + return resultDto; } @@ -300,12 +305,9 @@ public class TopicServiceImpl extends BaseServiceImpl imp EpdcEventSubmitFormDTO eventSubmitFormDto = baseDao.selectOneOfTopicForChangeToIssue(formDto.getId()); eventSubmitFormDto.setCategoryId(formDto.getCategoryId()); eventSubmitFormDto.setAdvice(formDto.getAdvice()); - UserDetail user = SecurityUser.getUser(); - if (null != user) { - eventSubmitFormDto.setChangeUserId(user.getId()); - eventSubmitFormDto.setChangeUsername(user.getUsername()); - eventSubmitFormDto.setChangeUserMobile(user.getMobile()); - } + eventSubmitFormDto.setChangeUserId(null); + eventSubmitFormDto.setChangeUsername(formDto.getNickname()); + eventSubmitFormDto.setChangeUserMobile(formDto.getMobile()); Result eventResult = eventFeignClient.submitEvent(eventSubmitFormDto); if (!eventResult.success()) { return eventResult; diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/logback-spring.xml b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/logback-spring.xml index 3375c4c54..84ba2a867 100644 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/logback-spring.xml +++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/logback-spring.xml @@ -133,7 +133,7 @@ - + diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/comment/TopicCommentDao.xml b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/comment/TopicCommentDao.xml index cece690c9..7ce8b0f18 100755 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/comment/TopicCommentDao.xml +++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/comment/TopicCommentDao.xml @@ -148,7 +148,9 @@ WHERE t1.DEL_FLAG = '0' AND t1.SHIELD_FLAG = '0' - #{timestamp} + + #{timestamp} + AND t1.TOPIC_ID = #{topicId} ORDER BY @@ -244,6 +246,7 @@ CREATED_TIME, UPDATED_BY, UPDATED_TIME, + PARTY_FLAG, '0' AS SENSITIVE_FLAG FROM epdc_topic_comment 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 30196af13..a14bcfdd0 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 @@ -111,22 +111,24 @@ gp.ID, gp.GROUP_NAME, gp.GROUP_AVATAR, - COUNT( ugp1.ID ) AS totalNum, - CASE - WHEN SUM( ugp1.PARTY_MEMBER = '1' ) IS NULL THEN - 0 ELSE SUM( ugp1.PARTY_MEMBER = '1' ) - END AS partyMemberNum + COUNT( DISTINCT ugp1.ID ) AS totalNum, + COUNT( DISTINCT ugp2.ID ) AS partyMemberNum FROM epdc_group gp LEFT JOIN epdc_user_group ugp1 ON gp.ID = ugp1.GROUP_ID AND ugp1.DEL_FLAG = '0' AND ugp1.STATE = 10 + LEFT JOIN epdc_user_group ugp2 ON gp.ID = ugp2.GROUP_ID + AND ugp2.DEL_FLAG = '0' + AND ugp2.STATE = 10 + AND ugp2.PARTY_MEMBER = '1' LEFT JOIN epdc_topic tp ON gp.ID = tp.GROUP_ID AND tp.DEL_FLAG = '0' WHERE gp.DEL_FLAG = '0' AND gp.STATE IN ( 10, 15 ) AND gp.GRID_ID = #{gridId} + AND gp.GROUP_CATEGORY = '1' AND gp.ID NOT IN ( SELECT ugp.GROUP_ID FROM epdc_user_group ugp WHERE ugp.USER_ID = #{userId} AND ugp.DEL_FLAG = '0' AND ugp.STATE = 10 ) GROUP BY gp.ID @@ -146,8 +148,8 @@ ugp2.LORD_FLAG, COUNT( DISTINCT tp.ID ) AS topicNum, CASE - WHEN SUM( tp.STATE = 15 OR tp.STATE = 20 ) IS NULL THEN - 0 ELSE SUM( tp.STATE = 15 OR tp.STATE = 20 ) + WHEN SUM( tp.STATE = 10 OR tp.STATE = 15 ) IS NULL THEN + 0 ELSE SUM( tp.STATE = 10 OR tp.STATE = 15 ) END AS changeToIssueNum FROM epdc_group gp diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/topic/TopicDao.xml b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/topic/TopicDao.xml index 43977bd78..813f84bd3 100644 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/topic/TopicDao.xml +++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/topic/TopicDao.xml @@ -17,50 +17,38 @@ - - - + + + @@ -108,6 +96,8 @@ tp.ALL_DEPT_NAMES, tp.PARENT_DEPT_IDS, tp.PARENT_DEPT_NAMES, + tp.COMMENT_NUM, + tp.BROWSE_NUM, img.IMG_URL FROM epdc_topic tp @@ -168,13 +158,16 @@ t1.DEL_FLAG = '0' and t1.USER_ID = #{userId} + and t1.STATE IN (0, 20) AND t1.STATE ]]> 20 AND t1.GROUP_ID = #{groupId} AND t1.GRID_ID = #{gridId} + + #{timestamp} + = ]]> #{someMonthsAgo} - #{timestamp} ORDER BY t1.CREATED_TIME DESC