From 2437c6d25218ab554c86e20d0a9cf44ccca44a0a Mon Sep 17 00:00:00 2001 From: wangchao Date: Tue, 31 Mar 2020 15:34:27 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E8=AF=9D=E9=A2=98=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=EF=BC=8C=E5=B0=86=E8=AF=84=E8=AE=BA=E4=B9=9F=E6=94=BE=E8=BF=9B?= =?UTF-8?q?=E8=AF=9D=E9=A2=98=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../topic/form/ResiTopicPublishFormDTO.java | 22 +++++--- .../entity/ResiTopicCommentEntity.java | 56 +++++++++++++++++++ .../modules/exception/ModuleErrorCode.java | 2 + .../service/impl/ResiGroupServiceImpl.java | 2 + .../topic/controller/ResiTopicController.java | 38 +++++++++++++ .../topic/service/ResiTopicService.java | 13 +++++ .../service/impl/ResiTopicServiceImpl.java | 43 +++++++++++++- .../epmet/modules/utils/ModuleConstant.java | 5 ++ .../mapper/topic/ResiTopicCommentDao.xml | 13 +---- .../com/epmet/feign/EpmetUserFeignClient.java | 2 +- .../com/epmet/feign/GovOrgFeignClient.java | 2 +- 11 files changed, 175 insertions(+), 23 deletions(-) create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/comment/entity/ResiTopicCommentEntity.java create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/ResiTopicPublishFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/ResiTopicPublishFormDTO.java index d6cfe4dd5d..f1a449462a 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/ResiTopicPublishFormDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/ResiTopicPublishFormDTO.java @@ -2,6 +2,7 @@ package com.epmet.resi.group.dto.topic.form; import lombok.Data; +import javax.validation.constraints.NotBlank; import java.io.Serializable; import java.util.List; @@ -19,45 +20,50 @@ public class ResiTopicPublishFormDTO implements Serializable { /** * 小组Id * */ + @NotBlank(message = "小组Id不能为空") private String groupId; /** - * + * 话题内容 * */ + @NotBlank(message = "话题内容不能为空") private String topicContent; /** - * + * 经度 * */ + @NotBlank(message = "缺失经纬度信息") private String longitude; /** - * + * 纬度 * */ + @NotBlank(message = "缺失经纬度信息") private String dimension; /** - * + * 地址 * */ + @NotBlank(message = "地址信息不能为空") private String address; /** - * + * 省份 * */ private String province; /** - * + * 城市 * */ private String city; /** - * + * 地区 * */ private String area; /** - * + * 附件上传url列表 * */ private List attachmentList; diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/comment/entity/ResiTopicCommentEntity.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/comment/entity/ResiTopicCommentEntity.java new file mode 100644 index 0000000000..040f966e2d --- /dev/null +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/comment/entity/ResiTopicCommentEntity.java @@ -0,0 +1,56 @@ +/** + * 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.epmet.modules.comment.entity; + +import com.baomidou.mybatisplus.annotation.TableName; + +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 话题评论表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-03-31 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("resi_topic_comment") +public class ResiTopicCommentEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 评论内容 + */ + private String commentContent; + + /** + * 话题Id，来自resi_topic + */ + private String topicId; + + /** + * 评论状态 + */ + private String status; + +} diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/exception/ModuleErrorCode.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/exception/ModuleErrorCode.java index 4daeeb6450..8197c307f4 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/exception/ModuleErrorCode.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/exception/ModuleErrorCode.java @@ -22,4 +22,6 @@ import com.epmet.commons.tools.exception.ErrorCode; */ public interface ModuleErrorCode extends ErrorCode { + + } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java index 90b0ece47b..8d34a45b92 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java @@ -38,6 +38,7 @@ import com.epmet.modules.group.dao.ResiGroupOperationDao; import com.epmet.modules.group.entity.ResiGroupEntity; import com.epmet.modules.group.service.ResiGroupOperationService; import com.epmet.modules.group.service.ResiGroupService; + import com.epmet.modules.group.service.ResiGroupStatisticalService; import com.epmet.modules.member.dao.GroupMemeberOperationDao; import com.epmet.modules.member.dao.ResiGroupMemberDao; @@ -52,6 +53,7 @@ import com.epmet.resi.group.constant.MemberStateConstant; import com.epmet.resi.group.dto.UserRoleDTO; import com.epmet.resi.group.dto.group.ResiGroupDTO; import com.epmet.resi.group.dto.group.ResiGroupOperationDTO; + import com.epmet.resi.group.dto.group.ResiGroupStatisticalDTO; import com.epmet.resi.group.dto.group.form.*; import com.epmet.resi.group.dto.group.result.CreatedResultDTO; diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java new file mode 100644 index 0000000000..b9677d62a5 --- /dev/null +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java @@ -0,0 +1,38 @@ +package com.epmet.modules.topic.controller; + +import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.security.dto.TokenDto; +import com.epmet.commons.tools.utils.Result; +import com.epmet.resi.group.dto.topic.form.ResiTopicPublishFormDTO; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @Description + * @ClassName ResiTopicController + * @Author wangc + * @date 2020.03.31 13:03 + */ + +@RestController +@RequestMapping("topic") +public class ResiTopicController { + + /** + * @Description 组内成员创建话题(身份校验 + 创建话题 + 增加话题记录) + * @Param TokenDto.class + * @Param ResiTopicPublishFormDTO.class + * @return Result + * @Author wangc + * @Date 2020.03.31 13:15 + **/ + @RequestMapping("createtopic") + public Result createTopic(@LoginUser TokenDto tokenDto, @RequestBody ResiTopicPublishFormDTO topicPublishFormDTO){ + + + + return new Result(); + } + +} diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java index d0407fa3ca..7aced0022d 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java @@ -19,8 +19,11 @@ package com.epmet.modules.topic.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.security.dto.TokenDto; +import com.epmet.commons.tools.utils.Result; import com.epmet.modules.topic.entity.ResiTopicEntity; import com.epmet.resi.group.dto.topic.ResiTopicDTO; +import com.epmet.resi.group.dto.topic.form.ResiTopicPublishFormDTO; import java.util.List; @@ -93,4 +96,14 @@ public interface ResiTopicService extends BaseService { * @date 2020-03-31 */ void delete(String[] ids); + + /** + * @Description 创建话题接口，具体逻辑包括：1.身份校验 2.创建话题 3.话题操作记录 + * @Param tokenDto + * @Param resiTopicPublishFormDTO + * @return Result + * @Author wangc + * @Date 2020.03.31 13:19 + **/ + Result createTopic(TokenDto tokenDto, ResiTopicPublishFormDTO resiTopicPublishFormDTO); } \ No newline at end of file diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java index 43173e112a..8732634516 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java @@ -21,15 +21,22 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.utils.Result; +import com.epmet.modules.member.service.ResiGroupMemberService; import com.epmet.modules.topic.dao.ResiTopicDao; import com.epmet.modules.topic.entity.ResiTopicEntity; import com.epmet.modules.topic.service.ResiTopicService; +import com.epmet.resi.group.constant.MemberStateConstant; +import com.epmet.resi.group.dto.member.ResiGroupMemberDTO; import com.epmet.resi.group.dto.topic.ResiTopicDTO; +import com.epmet.resi.group.dto.topic.form.ResiTopicPublishFormDTO; 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,7 +53,8 @@ import java.util.Map; @Service public class ResiTopicServiceImpl extends BaseServiceImpl implements ResiTopicService { - + @Autowired + private ResiGroupMemberService resiGroupMemberService; @Override public PageData page(Map params) { @@ -100,4 +108,37 @@ public class ResiTopicServiceImpl extends BaseServiceImpl - - - - - - - - - - - - + \ No newline at end of file diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java index 84d0a19912..68b5e665a9 100644 --- a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java +++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java @@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RequestBody; * @Description 居民端陌生人导览 调用epmet-user服务 * @Author sun */ -@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserFeignClientFallBack.class) +@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserFeignClientFallBack.class, url = "http://localhost:8087") public interface EpmetUserFeignClient { /** diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java index 8f39fc6cc5..246542a747 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java @@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.PostMapping; * @Author sun * @Date 2020/3/16 */ -@FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovOrgFeignClientFallBack.class ) +@FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovOrgFeignClientFallBack.class, url = "http://localhost:8092") public interface GovOrgFeignClient { /** From 3b406709a5fa0d1487d3e534975316d04ed8f63b Mon Sep 17 00:00:00 2001 From: wangchao Date: Wed, 1 Apr 2020 10:21:03 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E8=AF=9D=E9=A2=98=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resi/group/constant/TopicConstant.java | 27 ++++ .../dto/topic/ResiTopicAttachmentDTO.java | 2 +- .../dto/topic/form/ResiCommentFormDTO.java | 16 +- .../dto/topic/form/ResiTopicPageFormDTO.java | 41 ++++++ .../topic/result/ResiTopicInfoResultDTO.java | 61 +++++++- .../modules/exception/ModuleErrorCode.java | 1 - .../topic/dao/ResiTopicAttachmentDao.java | 10 +- .../epmet/modules/topic/dao/ResiTopicDao.java | 24 ++- .../entity/ResiTopicAttachmentEntity.java | 2 +- .../service/ResiTopicAttachmentService.java | 7 +- .../topic/service/ResiTopicService.java | 25 ++++ .../impl/ResiTopicAttachmentServiceImpl.java | 14 +- .../service/impl/ResiTopicServiceImpl.java | 139 +++++++++++++++++- .../epmet/modules/utils/ModuleConstant.java | 5 + .../mapper/topic/ResiTopicAttachmentDao.xml | 51 +++++-- .../resources/mapper/topic/ResiTopicDao.xml | 101 +++++++++++++ 16 files changed, 486 insertions(+), 40 deletions(-) create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/ResiTopicPageFormDTO.java diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/constant/TopicConstant.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/constant/TopicConstant.java index 6ca07bc342..572e22d7ec 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/constant/TopicConstant.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/constant/TopicConstant.java @@ -7,4 +7,31 @@ package com.epmet.resi.group.constant; * @date 2020.03.31 17:18 */ public interface TopicConstant { + + /** + * 话题最大字数 + * */ + int MAX_NUMBER_OF_CONTENT = 3000; + + /** + * 评论最大字数 + * */ + int MAX_NUMBER_OF_COMMENT = 300; + + /** + * 发布话题 + * */ + String PUBLISHMENT = "discussing"; + + /** + * 取消屏蔽 + * */ + String CANCEL_HIDDEN = "hidden_cancelled"; + + /** + * 关闭话题 + * */ + String CLOSED = "CLOSED"; + + } diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/ResiTopicAttachmentDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/ResiTopicAttachmentDTO.java index c40f013a9c..2a6afb9d90 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/ResiTopicAttachmentDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/ResiTopicAttachmentDTO.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.epmet.dto; +package com.epmet.resi.group.dto.topic; import java.io.Serializable; import java.util.Date; diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/ResiCommentFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/ResiCommentFormDTO.java index 6d9ff8667d..5acbc61765 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/ResiCommentFormDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/ResiCommentFormDTO.java @@ -1,10 +1,24 @@ package com.epmet.resi.group.dto.topic.form; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + /** * @Description * @ClassName ResiCommentFormDTO * @Author wangc * @date 2020.03.31 17:32 */ -public class ResiCommentFormDTO { +@Data +public class ResiCommentFormDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + @NotBlank(message = "话题Id不能为空") + private String topicId; + + @NotBlank(message = "评论内容不能为空") + private String commentContent; } diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/ResiTopicPageFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/ResiTopicPageFormDTO.java new file mode 100644 index 0000000000..fba7d2fcfa --- /dev/null +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/ResiTopicPageFormDTO.java @@ -0,0 +1,41 @@ +package com.epmet.resi.group.dto.topic.form; + +import lombok.Data; + +import javax.validation.constraints.Min; +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Description + * @ClassName ResiTopicPageFormDTO + * @Author wangc + * @date 2020.04.01 10:09 + */ +@Data +public class ResiTopicPageFormDTO implements Serializable{ + + private static final long serialVersionUID = 1L; + + /** + * 组Id + * */ + @NotBlank(message = "组Id不能为空") + private String groupId; + + /** + * 请求页码 + * */ + @Min(value = 1) + private int pageNo; + + /** + * 每页多少条数据 + * */ + private int pageSize = 20; + + /** + * 搜索时可以带状态的查询，也可以不带 + * */ + private String status; +} diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicInfoResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicInfoResultDTO.java index fbb6347918..6f413f5fc1 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicInfoResultDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicInfoResultDTO.java @@ -1,10 +1,67 @@ package com.epmet.resi.group.dto.topic.result; +import lombok.Data; + +import java.io.Serializable; + /** - * @Description + * @Description 查看历史话题返回对象 * @ClassName ResiTopicInfoResultDTO * @Author wangc * @date 2020.04.01 08:46 */ -public class ResiTopicInfoResultDTO { +@Data +public class ResiTopicInfoResultDTO implements Serializable{ + + private static final long serialVersionUID = 1L; + + /** + * 话题Id + * */ + private String topicId; + + /** + * 用户Id + * */ + private String userId; + + /** + * 发布人名称 + * */ + private String releaseUserName; + + /** + * 发布人头像 + * */ + private String releaseUserHeadPhoto; + + /** + * 发布时间 yyyy-MM-dd HH:mm:ss + * */ + private String releaseTime; + + /** + * 话题内容 + * */ + private String topicContent; + + /** + * 话题状态 讨论中 已关闭 + * */ + private String status; + + /** + * 网格名称 + * */ + private String gridName; + + /** + * 是否本人 0不是 1是 + * */ + private String releaseUserFlag; + + /** + * 第一张图片 + * */ + private String firstPhoto; } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/exception/ModuleErrorCode.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/exception/ModuleErrorCode.java index 8197c307f4..481935dd64 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/exception/ModuleErrorCode.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/exception/ModuleErrorCode.java @@ -23,5 +23,4 @@ import com.epmet.commons.tools.exception.ErrorCode; public interface ModuleErrorCode extends ErrorCode { - } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/ResiTopicAttachmentDao.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/ResiTopicAttachmentDao.java index 606e965024..c68f3d87dd 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/ResiTopicAttachmentDao.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/ResiTopicAttachmentDao.java @@ -15,12 +15,15 @@ * along with this program. If not, see . */ -package com.epmet.dao; +package com.epmet.modules.topic.dao; + import com.epmet.commons.mybatis.dao.BaseDao; -import com.epmet.entity.ResiTopicAttachmentEntity; +import com.epmet.modules.topic.entity.ResiTopicAttachmentEntity; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 话题附件表 * @@ -29,5 +32,6 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface ResiTopicAttachmentDao extends BaseDao { - + + void insertBatch(List list); } \ No newline at end of file diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/ResiTopicDao.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/ResiTopicDao.java index a85c32adc6..58524d80ae 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/ResiTopicDao.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/ResiTopicDao.java @@ -20,7 +20,11 @@ package com.epmet.modules.topic.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.modules.topic.entity.ResiTopicEntity; +import com.epmet.resi.group.dto.topic.result.ResiTopicInfoResultDTO; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 话题信息表 @@ -30,5 +34,23 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface ResiTopicDao extends BaseDao { - + + /** + * @Description 自定义新增语句 + * @Param ResiTopicEntity.class + * @return int + * @Author wangc + * @Date 2020.04.01 09:39 + **/ + @Override + int insert(ResiTopicEntity resiTopic); + + /** + * @Description 查询该组内最近十条话题信息 + * @Param groupId + * @return List + * @Author wangc + * @Date 2020.04.01 09:40 + **/ + List getLatestTenTopics(@Param("groupId")String groupId); } \ No newline at end of file diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/ResiTopicAttachmentEntity.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/ResiTopicAttachmentEntity.java index 6f81cdbf5f..0585e594d6 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/ResiTopicAttachmentEntity.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/ResiTopicAttachmentEntity.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.epmet.entity; +package com.epmet.modules.topic.entity; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicAttachmentService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicAttachmentService.java index cdf4e64c25..e8c06b0851 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicAttachmentService.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicAttachmentService.java @@ -15,12 +15,13 @@ * along with this program. If not, see . */ -package com.epmet.service; +package com.epmet.modules.topic.service; + import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; -import com.epmet.dto.ResiTopicAttachmentDTO; -import com.epmet.entity.ResiTopicAttachmentEntity; +import com.epmet.modules.topic.entity.ResiTopicAttachmentEntity; +import com.epmet.resi.group.dto.topic.ResiTopicAttachmentDTO; import java.util.List; import java.util.Map; diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java index 7aced0022d..2ad4de0fa1 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java @@ -23,7 +23,10 @@ import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.modules.topic.entity.ResiTopicEntity; import com.epmet.resi.group.dto.topic.ResiTopicDTO; +import com.epmet.resi.group.dto.topic.form.ResiCommentFormDTO; +import com.epmet.resi.group.dto.topic.form.ResiTopicPageFormDTO; import com.epmet.resi.group.dto.topic.form.ResiTopicPublishFormDTO; +import com.epmet.resi.group.dto.topic.result.ResiTopicInfoResultDTO; import java.util.List; @@ -106,4 +109,26 @@ public interface ResiTopicService extends BaseService { * @Date 2020.03.31 13:19 **/ Result createTopic(TokenDto tokenDto, ResiTopicPublishFormDTO resiTopicPublishFormDTO); + + /** + * @Description 评论话题 + * @Param tokenDto + * @Param resiCommentFormDTO + * @return Result + * @Author wangc + * @Date 2020.03.31 17:36 + **/ + Result commentTopic(TokenDto tokenDto, ResiCommentFormDTO resiCommentFormDTO); + + /** + * @Description 查看组内最近十条话题 + * @Param tokenDto + * @Param groupId + * @return Result> + * @Author wangc + * @Date 2020.04.01 08:59 + **/ + Result> getLatestTenTopics(TokenDto tokenDto,String groupId); + + Result> getPastTopicList(TokenDto tokenDto, ResiTopicPageFormDTO topicPageFormDTO); } \ No newline at end of file diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicAttachmentServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicAttachmentServiceImpl.java index 20ffb7b3e2..238682e191 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicAttachmentServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicAttachmentServiceImpl.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.epmet.service.impl; +package com.epmet.modules.topic.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -23,13 +23,11 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.constant.FieldConstant; -import com.epmet.dao.ResiTopicAttachmentDao; -import com.epmet.dto.ResiTopicAttachmentDTO; -import com.epmet.entity.ResiTopicAttachmentEntity; -import com.epmet.redis.ResiTopicAttachmentRedis; -import com.epmet.service.ResiTopicAttachmentService; +import com.epmet.modules.topic.dao.ResiTopicAttachmentDao; +import com.epmet.modules.topic.entity.ResiTopicAttachmentEntity; +import com.epmet.modules.topic.service.ResiTopicAttachmentService; +import com.epmet.resi.group.dto.topic.ResiTopicAttachmentDTO; 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,8 +44,6 @@ import java.util.Map; @Service public class ResiTopicAttachmentServiceImpl extends BaseServiceImpl implements ResiTopicAttachmentService { - @Autowired - private ResiTopicAttachmentRedis resiTopicAttachmentRedis; @Override public PageData page(Map params) { diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java index 8732634516..8de33ed343 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java @@ -24,17 +24,30 @@ import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.constant.FieldConstant; - import com.epmet.commons.tools.utils.Result; +import com.epmet.modules.feign.EpmetUserFeignClient; +import com.epmet.modules.group.dao.ResiGroupDao; +import com.epmet.modules.group.entity.ResiGroupEntity; import com.epmet.modules.member.service.ResiGroupMemberService; +import com.epmet.modules.topic.dao.ResiTopicAttachmentDao; +import com.epmet.modules.topic.dao.ResiTopicCommentDao; import com.epmet.modules.topic.dao.ResiTopicDao; +import com.epmet.modules.topic.dao.ResiTopicOperationDao; +import com.epmet.modules.topic.entity.ResiTopicAttachmentEntity; +import com.epmet.modules.topic.entity.ResiTopicCommentEntity; import com.epmet.modules.topic.entity.ResiTopicEntity; +import com.epmet.modules.topic.entity.ResiTopicOperationEntity; import com.epmet.modules.topic.service.ResiTopicService; +import com.epmet.modules.utils.ModuleConstant; import com.epmet.resi.group.constant.MemberStateConstant; +import com.epmet.resi.group.constant.TopicConstant; import com.epmet.resi.group.dto.member.ResiGroupMemberDTO; import com.epmet.resi.group.dto.topic.ResiTopicDTO; +import com.epmet.resi.group.dto.topic.form.ResiCommentFormDTO; +import com.epmet.resi.group.dto.topic.form.ResiTopicPageFormDTO; import com.epmet.resi.group.dto.topic.form.ResiTopicPublishFormDTO; +import com.epmet.resi.group.dto.topic.result.ResiTopicInfoResultDTO; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -56,6 +69,21 @@ public class ResiTopicServiceImpl extends BaseServiceImpl page(Map params) { IPage page = baseDao.selectPage( @@ -126,14 +154,112 @@ public class ResiTopicServiceImpl extends BaseServiceImpl TopicConstant.MAX_NUMBER_OF_CONTENT){ + //内容超过最大限制 + return new Result().error(); + } + ResiTopicEntity topic = ConvertUtils.sourceToTarget(resiTopicPublishFormDTO,ResiTopicEntity.class); + topic.setCreatedBy(tokenDto.getUserId()); + baseDao.insert(topic); + if(StringUtils.isBlank(topic.getId())){ + //没有返回主键 + return new Result().error(); + } + if(null != resiTopicPublishFormDTO.getAttachmentList() && resiTopicPublishFormDTO.getAttachmentList().size() > 0){ + ResiTopicAttachmentEntity attachment = new ResiTopicAttachmentEntity(); + for(String url : resiTopicPublishFormDTO.getAttachmentList()){ + attachment.setAttachmentUrl(url); + attachment.setTopicId(topic.getId()); + attachment.setCreatedBy(tokenDto.getUnionId()); + resiTopicAttachmentDao.insert(attachment); + } + } + + //3.话题操作记录 + ResiTopicOperationEntity operation = new ResiTopicOperationEntity(); + operation.setTopicId(topic.getId()); + operation.setOperationType(TopicConstant.PUBLISHMENT); + resiTopicOperationDao.insert(operation); + + return new Result(); + } + + /** + * @Description 评论话题 + * @Param tokenDto + * @Param resiCommentFormDTO + * @return Result + * @Author wangc + * @Date 2020.03.31 17:36 + **/ + @Override + public Result commentTopic(TokenDto tokenDto, ResiCommentFormDTO resiCommentFormDTO) { + + //1.判断当前用户是否被禁言 + ResiTopicDTO topic = get(resiCommentFormDTO.getTopicId()); + if(null == topic){ + + return new Result().error(); + } + ResiGroupMemberDTO resiGroupMemberDTO = + resiGroupMemberService.getResiGroupMember(tokenDto.getUserId() , topic.getGroupId()); + + if(null != resiGroupMemberDTO){ + if(MemberStateConstant.SILENT.equals(resiGroupMemberDTO.getStatus())){ + //当前用户被禁言 + return new Result().error(); + }else if(MemberStateConstant.REMOVED.equals(resiGroupMemberDTO.getStatus())){ + //当前用户已被移出群 + return new Result().error(); + } }else{ //当前用户非组内成员 + return new Result().error(); + } + if(resiCommentFormDTO.getCommentContent().length() > TopicConstant.MAX_NUMBER_OF_COMMENT){ + + return new Result().error(); + } + ResiTopicCommentEntity comment = ConvertUtils.sourceToTarget(resiCommentFormDTO,ResiTopicCommentEntity.class); + comment.setStatus(TopicConstant.PUBLISHMENT); + resiTopicCommentDao.insert(comment); + + return new Result(); + } + + /** + * @Description 查看组内最近十条话题 + * @Param tokenDto + * @Param groupId + * @return Result> + * @Author wangc + * @Date 2020.04.01 08:59 + **/ + @Override + public Result> getLatestTenTopics(TokenDto tokenDto, String groupId) { + + //1.查询话题列表 + List lastestTenTopics = + baseDao.getLatestTenTopics(groupId); + + //2.遍历放用户信息与网格信息 + ResiGroupEntity group = resiGroupDao.selectById(groupId); + if(null != group && ModuleConstant.DEL_FLAG.equals(group.getDelFlag())){ } @@ -141,4 +267,11 @@ public class ResiTopicServiceImpl extends BaseServiceImpl> getPastTopicList(TokenDto tokenDto, ResiTopicPageFormDTO topicPageFormDTO) { + + return null; + } + + } \ No newline at end of file diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java index af5054075c..c1217d2932 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java @@ -72,4 +72,9 @@ public interface ModuleConstant extends Constant { * 当前用户并非改组组员 * */ String NOT_BELONG_TO_CURRENT_GROUP="当前用户并非改组组员"; + + /** + * 逻辑删除标识 未删除 + * */ + String DEL_FLAG = "0"; } diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicAttachmentDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicAttachmentDao.xml index e1aab9685c..c7cbed2093 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicAttachmentDao.xml +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicAttachmentDao.xml @@ -1,22 +1,43 @@ - + - - - - - - - - - - - - - - + + + + insert into user + ( + id, + topic_id, + attachment_name, + attachment_format, + attachment_type, + attachment_url, + del_flag, + revision, + created_by, + created_time, + updated_by, + updated_time + ) values + + ( + (SELECT REPLACE(UUID(), '-', '') AS id), + #{item.topicId}, + #{item.attachmentName}, + #{item.attachmentFormat}, + #{item.attachmentType}, + #{item.attachmentUrl}, + #{item.delFlag}, + #{item.revision}, + #{item.createdBy}, + #{item.createdTime}, + #{item.updatedBy}, + #{item.updatedTime} + ) + + \ No newline at end of file diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml index 02a033f947..c1992e9b06 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml @@ -4,5 +4,106 @@ + + + + select replace(uuid(),'-','') AS APPROVAL_ID + + + INSERT INTO resi_topic + + + group_id, + + + topic_content, + + + status, + + + province, + + + city, + + + area, + + + address, + + + longitude, + + + dimension, + + + created_by, + + updated_by, + delFlag, + revision, + created_time, + updated_time + + + + + #{groupId}, + + + #{topicContent}, + + + #{status}, + + + #{province}, + + + #{city}, + + + #{area}, + + + #{address}, + + + #{longitude}, + + + #{dimension}, + + + #{createdBy}, + + 'APP_USER', + '0', + '0', + now(), + now() + + + + From 95bb02bb2389dc4fa62d565560b614c8265eabf8 Mon Sep 17 00:00:00 2001 From: wangchao Date: Wed, 1 Apr 2020 10:43:24 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E8=AF=9D=E9=A2=98=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E4=BB=A3=E7=A0=812?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resi/group/constant/TopicConstant.java | 8 ++++++++ .../topic/result/ResiTopicInfoResultDTO.java | 2 +- .../topic/service/ResiTopicService.java | 8 ++++++++ .../service/impl/ResiTopicServiceImpl.java | 19 +++++++++++++++++-- 4 files changed, 34 insertions(+), 3 deletions(-) diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/constant/TopicConstant.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/constant/TopicConstant.java index 572e22d7ec..6b88d61742 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/constant/TopicConstant.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/constant/TopicConstant.java @@ -33,5 +33,13 @@ public interface TopicConstant { * */ String CLOSED = "CLOSED"; + /** + * 本人发布 + * */ + String PUBLISHED_BY_MYSELF = "me"; + /** + * 他人发布 + * */ + String PUBLISHED_BY_OTHER = "other"; } diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicInfoResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicInfoResultDTO.java index 6f413f5fc1..09b2cd4e85 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicInfoResultDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicInfoResultDTO.java @@ -56,7 +56,7 @@ public class ResiTopicInfoResultDTO implements Serializable{ private String gridName; /** - * 是否本人 0不是 1是 + * 是否本人 me other * */ private String releaseUserFlag; diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java index 2ad4de0fa1..89e9136b62 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java @@ -130,5 +130,13 @@ public interface ResiTopicService extends BaseService { **/ Result> getLatestTenTopics(TokenDto tokenDto,String groupId); + /** + * @Description 查看历史话题(分页,允许状态筛选) + * @Param tokenDto + * @Param ResiTopicPageFormDTO.class + * @return Result> + * @Author wangc + * @Date 2020.04.01 10:36 + **/ Result> getPastTopicList(TokenDto tokenDto, ResiTopicPageFormDTO topicPageFormDTO); } \ No newline at end of file diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java index 8de33ed343..aaafafb722 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java @@ -257,16 +257,31 @@ public class ResiTopicServiceImpl extends BaseServiceImpl lastestTenTopics = baseDao.getLatestTenTopics(groupId); - //2.遍历放用户信息与网格信息 + //2.遍历放用户信息 ResiGroupEntity group = resiGroupDao.selectById(groupId); if(null != group && ModuleConstant.DEL_FLAG.equals(group.getDelFlag())){ } + for(ResiTopicInfoResultDTO obj:lastestTenTopics){ + if(StringUtils.equals(tokenDto.getUserId(),obj.getUserId())){ + obj.setReleaseUserFlag(TopicConstant.PUBLISHED_BY_MYSELF); + }else{ + obj.setReleaseUserFlag(TopicConstant.PUBLISHED_BY_OTHER); + } + } - return null; + return new Result>().ok(lastestTenTopics); } + /** + * @Description 查看历史话题(分页,允许状态筛选) + * @Param tokenDto + * @Param ResiTopicPageFormDTO.class + * @return Result> + * @Author wangc + * @Date 2020.04.01 10:36 + **/ @Override public Result> getPastTopicList(TokenDto tokenDto, ResiTopicPageFormDTO topicPageFormDTO) { From 9396b33186a038376f167f8f01e71aeeec8926c7 Mon Sep 17 00:00:00 2001 From: yinzuomei <57602893@qq.com> Date: Wed, 1 Apr 2020 16:56:51 +0800 Subject: [PATCH 4/7] =?UTF-8?q?oss=E6=A8=A1=E5=9D=97=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-module/epmet-oss/epmet-oss-server/pom.xml | 4 ++-- .../src/main/java/com/epmet/controller/OssController.java | 2 +- .../src/main/java/com/epmet/dao/OssDao.java | 1 + .../src/main/java/com/epmet/service/OssService.java | 2 ++ .../main/java/com/epmet/service/impl/OssServiceImpl.java | 5 +++++ .../src/main/resources/mapper/SysOssDao.xml | 8 +++++++- 6 files changed, 18 insertions(+), 4 deletions(-) diff --git a/epmet-module/epmet-oss/epmet-oss-server/pom.xml b/epmet-module/epmet-oss/epmet-oss-server/pom.xml index ea11cf21ef..2d154e0fe3 100644 --- a/epmet-module/epmet-oss/epmet-oss-server/pom.xml +++ b/epmet-module/epmet-oss/epmet-oss-server/pom.xml @@ -131,7 +131,7 @@ - + epmet elink@833066 @@ -161,7 +161,7 @@ - + epmet elink@833066 diff --git a/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/OssController.java b/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/OssController.java index 1630b63225..dd7256c27b 100644 --- a/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/OssController.java +++ b/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/OssController.java @@ -107,7 +107,7 @@ public class OssController { OssEntity ossEntity = new OssEntity(); ossEntity.setUrl(url); ossEntity.setCreateDate(new Date()); - ossService.insert(ossEntity); + ossService.insertOssEntity(ossEntity); //文件信息 UploadDTO dto = new UploadDTO(); diff --git a/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/dao/OssDao.java b/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/dao/OssDao.java index 79f8b14823..3d57a9424e 100644 --- a/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/dao/OssDao.java +++ b/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/dao/OssDao.java @@ -20,4 +20,5 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface OssDao extends BaseDao { + int insertOssEntity(String url); } diff --git a/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/service/OssService.java b/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/service/OssService.java index d1100a686b..b688001b02 100644 --- a/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/service/OssService.java +++ b/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/service/OssService.java @@ -22,4 +22,6 @@ import java.util.Map; public interface OssService extends BaseService { PageData page(Map params); + + int insertOssEntity(OssEntity ossEntity); } diff --git a/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/service/impl/OssServiceImpl.java b/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/service/impl/OssServiceImpl.java index 60ad3a91fe..b235163e81 100644 --- a/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/service/impl/OssServiceImpl.java +++ b/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/service/impl/OssServiceImpl.java @@ -31,4 +31,9 @@ public class OssServiceImpl extends BaseServiceImpl implement ); return getPageData(page, OssEntity.class); } + + @Override + public int insertOssEntity(OssEntity ossEntity) { + return baseDao.insertOssEntity(ossEntity.getUrl()); + } } diff --git a/epmet-module/epmet-oss/epmet-oss-server/src/main/resources/mapper/SysOssDao.xml b/epmet-module/epmet-oss/epmet-oss-server/src/main/resources/mapper/SysOssDao.xml index 4e15504edb..57994ca119 100644 --- a/epmet-module/epmet-oss/epmet-oss-server/src/main/resources/mapper/SysOssDao.xml +++ b/epmet-module/epmet-oss/epmet-oss-server/src/main/resources/mapper/SysOssDao.xml @@ -3,5 +3,11 @@ - + + INSERT INTO `sys_oss` ( `url`, `creator`, `create_date` ) + VALUES + ( #{url}, + "1", + now( ) ) + From 8fce3b0a30a13d4a0e03874c7ad92951509fe672 Mon Sep 17 00:00:00 2001 From: hosinokamui Date: Wed, 1 Apr 2020 18:16:15 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=88=90=E5=8A=9F?= =?UTF-8?q?=E5=90=8E=E6=B7=BB=E5=8A=A0=E8=A7=92=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/exception/EpmetErrorCode.java | 8 +- .../resi-partymember-server/pom.xml | 6 + .../modules/feign/EpmetUserFeignClient.java | 10 ++ .../EpmetUserFeignClientFallBack.java | 6 + .../impl/PartyMemberConfirmServiceImpl.java | 27 ++-- .../main/java/com/epmet/dto/UserRoleDTO.java | 8 +- .../java/com/epmet/constant/UserConstant.java | 62 ++++--- .../epmet/controller/UserRoleController.java | 134 +++++++++------- .../src/main/java/com/epmet/dao/RoleDao.java | 12 +- .../java/com/epmet/service/RoleService.java | 7 + .../com/epmet/service/UserRoleService.java | 134 ++++++++-------- .../epmet/service/impl/RoleServiceImpl.java | 6 + .../service/impl/UserResiInfoServiceImpl.java | 27 ++-- .../service/impl/UserRoleServiceImpl.java | 151 ++++++++++-------- .../src/main/resources/mapper/RoleDao.xml | 12 ++ 15 files changed, 367 insertions(+), 243 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java index 9321d14e60..5bf5f2404a 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java @@ -11,7 +11,13 @@ public enum EpmetErrorCode { GROUP_ALREADY_EXISTED(8003,"您的组名已存在，请重新修改"), ALREADY_APPLIED_GROUP(8004,"该群已申请过，请耐心等待审核"), ONLY_LEADER_CAN_INVITE(8005,"抱歉，只有群主才可以邀请新成员"), - LOSE_EFFICACY(8006,"链接已失效"); + LOSE_EFFICACY(8006,"链接已失效"), + + MOBILE_HAS_BEEN_USED(8101, "该手机已被使用，请更换手机或使用原绑定的微信用户登录"), + MOBILE_CODE_ERROR(8102, "手机验证码错误"), + AUTO_CONFIRM_FAILED(8103, "自动认证失败"); + + private int value; private String name; diff --git a/epmet-module/resi-partymember/resi-partymember-server/pom.xml b/epmet-module/resi-partymember/resi-partymember-server/pom.xml index 460f436997..c86652bf6b 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/pom.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/pom.xml @@ -81,6 +81,12 @@ RELEASE compile + + com.epmet + epmet-user-server + 2.0.0 + compile + diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java index 167118e581..69c93422a7 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java @@ -3,6 +3,7 @@ package com.epmet.modules.feign; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.UserResiInfoDTO; +import com.epmet.dto.UserRoleDTO; import com.epmet.dto.form.UserResiInfoFormDTO; import com.epmet.modules.feign.fallback.EpmetUserFeignClientFallBack; import org.springframework.cloud.openfeign.FeignClient; @@ -33,4 +34,13 @@ public interface EpmetUserFeignClient { @PostMapping("/epmetuser/userresiinfo/saveResiInfo") Result saveResiInfo (@RequestBody UserResiInfoDTO userResiInfoDTO); + /** + * 添加用户角色关系 + * + * @param userRoleDTO 参数 + * @return Result + */ + @PostMapping("/epmetuser/userrole/saveUserRole") + Result saveUserRole(@RequestBody UserRoleDTO userRoleDTO); + } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/fallback/EpmetUserFeignClientFallBack.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/fallback/EpmetUserFeignClientFallBack.java index 77735f4aad..257bbb295e 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/fallback/EpmetUserFeignClientFallBack.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/fallback/EpmetUserFeignClientFallBack.java @@ -4,6 +4,7 @@ import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.utils.ModuleUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.UserResiInfoDTO; +import com.epmet.dto.UserRoleDTO; import com.epmet.dto.form.UserResiInfoFormDTO; import com.epmet.modules.feign.EpmetUserFeignClient; import org.springframework.stereotype.Component; @@ -24,4 +25,9 @@ public class EpmetUserFeignClientFallBack implements EpmetUserFeignClient { public Result saveResiInfo(UserResiInfoDTO userResiInfoDTO) { return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "saveResiInfo", userResiInfoDTO); } + + @Override + public Result saveUserRole(UserRoleDTO userRoleDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "saveUserRole", userRoleDTO); + } } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java index 85b2c67d3b..ab94cf8369 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java @@ -1,9 +1,12 @@ package com.epmet.modules.partymember.service.impl; +import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.constant.PartyMemberConstant; +import com.epmet.constant.UserConstant; import com.epmet.dto.UserResiInfoDTO; +import com.epmet.dto.UserRoleDTO; import com.epmet.dto.form.UserResiInfoFormDTO; import com.epmet.modules.feign.EpmetUserFeignClient; import com.epmet.modules.partymember.entity.*; @@ -93,8 +96,8 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService PartymemberInfoDTO partyMemberInfoResult = partymemberInfoService.getPartyMemberInfoByMobile(partyMemberInfoParam); if (null != partyMemberInfoResult) { //TODO code待定 - result.setCode(0); - result.setMsg("该手机已被使用，请更换手机或使用原绑定的微信用户登录"); + result.setCode(EpmetErrorCode.MOBILE_HAS_BEEN_USED.getValue()); + result.setMsg(EpmetErrorCode.MOBILE_HAS_BEEN_USED.getName()); return result; } @@ -123,8 +126,9 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService saveOrUpdateVisit(partyMemberInfoDTO.getPartymemberVisitId(), null, PartyMemberConstant.OPERATE_AUTO_FAILED); //TODO code待定 - result.setCode(0); - result.setMsg("验证码错误"); + result.setCode(EpmetErrorCode.MOBILE_CODE_ERROR.getValue()); + result.setMsg(EpmetErrorCode.MOBILE_CODE_ERROR.getName()); + return result; } //获取党员基本信息 @@ -142,18 +146,22 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService //将访问记录更新到热心居民申请行为记录表 saveOrUpdateVisit(partyMemberInfoDTO.getPartymemberVisitId(), null, PartyMemberConstant.OPERATE_AUTO_FAILED); //TODO code待定 - result.setCode(0); - result.setMsg("认证失败"); + result.setCode(EpmetErrorCode.AUTO_CONFIRM_FAILED.getValue()); + result.setMsg(EpmetErrorCode.AUTO_CONFIRM_FAILED.getName()); } else { //自动认证成功 partyMemberInfoEntity.setConfirmResult("0"); partymemberInfoService.insert(partyMemberInfoEntity); //将访问记录更新到热心居民申请行为记录表 saveOrUpdateVisit(partyMemberInfoDTO.getPartymemberVisitId(), null, PartyMemberConstant.OPERATE_AUTO_SUCCESS); + //添加用户党员角色关系 + UserRoleDTO userRole = new UserRoleDTO(); + userRole.setUserId(partyMemberInfoDTO.getUserId()); + userRole.setRoleKey(UserConstant.ROLE_PARTYMEMBER); + epmetUserFeignClient.saveUserRole(userRole); //存入党员注册关系表 用于统计客户网格的认证党员数 saveRegisterRelation(partyMemberInfoDTO); } - ; //将自动认证结果存入党员认证自动审核表 if (confirmAutoDTO != null) { @@ -162,7 +170,7 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService PartymemberConfirmAutoEntity.class)); } - //TODO 判断是否已注册居民，如果没有则注册居民 + //判断是否已注册居民，如果没有则注册居民 isResiRegister(partyMemberInfoDTO); return result; @@ -201,11 +209,10 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService userResiInfoFormDTO.setUserId(partyMemberInfoDTO.getUserId()); Result userResiInfoResult = epmetUserFeignClient.getUserResiInfoDTO(userResiInfoFormDTO); if (null == userResiInfoResult.getData()) { - //TODO 判断手机号是否可用 UserResiInfoDTO userResiInfoDTO = ConvertUtils.sourceToTarget(partyMemberInfoDTO, UserResiInfoDTO.class); userResiInfoDTO.setRegMobile(partyMemberInfoDTO.getMobile()); + userResiInfoDTO.setResiVisitId(partyMemberInfoDTO.getPartymemberVisitId()); epmetUserFeignClient.saveResiInfo(userResiInfoDTO); - //TODO 注册居民 } } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserRoleDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserRoleDTO.java index 12c4579ecb..f25d0ec9f6 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserRoleDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserRoleDTO.java @@ -17,9 +17,10 @@ package com.epmet.dto; +import lombok.Data; + import java.io.Serializable; import java.util.Date; -import lombok.Data; /** @@ -53,6 +54,11 @@ public class UserRoleDTO implements Serializable { */ private String roleId; + /** + * 角色Key值 + */ + private String roleKey; + /** * 删除标识：0.未删除 1.已删除 */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/UserConstant.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/UserConstant.java index 8e1f9e5389..7c6d91c882 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/UserConstant.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/UserConstant.java @@ -8,29 +8,43 @@ package com.epmet.constant; */ public interface UserConstant { - /** - * 政府端 - * */ - String APP_GOV = "gov"; - - /** - * 居民端 - * */ - String APP_RESI = "resi"; - - /** - * 运营端 - * */ - String APP_OPER = "oper"; - - /** - * PC端 - * */ - String CLIENT_WEB = "web"; - - /** - * 微信端 - * */ - String CLIENT_WX = "wxmp"; + /** + * 政府端 + */ + String APP_GOV = "gov"; + /** + * 居民端 + */ + String APP_RESI = "resi"; + + /** + * 运营端 + */ + String APP_OPER = "oper"; + + /** + * PC端 + */ + String CLIENT_WEB = "web"; + + /** + * 微信端 + */ + String CLIENT_WX = "wxmp"; + + /** + * 居民角色 + */ + String ROLE_RESI = "registered_resi"; + + /** + * 热心居民角色 + */ + String ROLE_WARMHEARTED = "warmhearted"; + + /** + * 党员角色 + */ + String ROLE_PARTYMEMBER = "partymember"; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserRoleController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserRoleController.java index 9ad160716a..f442da6e7f 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserRoleController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserRoleController.java @@ -39,7 +39,7 @@ import java.util.Map; /** - * 用户角色关系表 + * 用户角色关系表 * * @author generator generator@elink-cn.com * @since v1.0.0 2020-03-30 @@ -47,65 +47,77 @@ import java.util.Map; @RestController @RequestMapping("userrole") public class UserRoleController { - - @Autowired - private UserRoleService userRoleService; - - @GetMapping("page") - public Result> page(@RequestParam Map params){ - PageData page = userRoleService.page(params); - return new Result>().ok(page); - } - - @GetMapping("{id}") - public Result get(@PathVariable("id") String id){ - UserRoleDTO data = userRoleService.get(id); - return new Result().ok(data); - } - - @PostMapping - public Result save(@RequestBody UserRoleDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - userRoleService.save(dto); - return new Result(); - } - - @PutMapping - public Result update(@RequestBody UserRoleDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - userRoleService.update(dto); - return new Result(); - } - - @DeleteMapping - public Result delete(@RequestBody String[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - userRoleService.delete(ids); - return new Result(); - } - - @GetMapping("export") - public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { - List list = userRoleService.list(params); - ExcelUtils.exportExcelToTarget(response, null, list, UserRoleExcel.class); - } - - /** - * @Description 根据用户Id、来源app、客户Id查询用户角色 - * @Param userRoleFormDTO - * @return UserRoleResultDTO - * @Author wangc - * @Date 2020.03.30 15:35 - **/ - @PostMapping("getuserroleinfo") - public Result> getUserRoleInfo(@RequestBody UserRoleFormDTO userRoleFormDTO){ - - ValidatorUtils.validateEntity(userRoleFormDTO); - - return userRoleService.getUserRoleInfo(userRoleFormDTO); - } + + @Autowired + private UserRoleService userRoleService; + + @GetMapping("page") + public Result> page(@RequestParam Map params) { + PageData page = userRoleService.page(params); + return new Result>().ok(page); + } + + @GetMapping("{id}") + public Result get(@PathVariable("id") String id) { + UserRoleDTO data = userRoleService.get(id); + return new Result().ok(data); + } + + @PostMapping + public Result save(@RequestBody UserRoleDTO dto) { + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + userRoleService.save(dto); + return new Result(); + } + + @PutMapping + public Result update(@RequestBody UserRoleDTO dto) { + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + userRoleService.update(dto); + return new Result(); + } + + @DeleteMapping + public Result delete(@RequestBody String[] ids) { + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + userRoleService.delete(ids); + return new Result(); + } + + @GetMapping("export") + public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { + List list = userRoleService.list(params); + ExcelUtils.exportExcelToTarget(response, null, list, UserRoleExcel.class); + } + + /** + * @return UserRoleResultDTO + * @Description 根据用户Id、来源app、客户Id查询用户角色 + * @Param userRoleFormDTO + * @Author wangc + * @Date 2020.03.30 15:35 + **/ + @PostMapping("getuserroleinfo") + public Result> getUserRoleInfo(@RequestBody UserRoleFormDTO userRoleFormDTO) { + + ValidatorUtils.validateEntity(userRoleFormDTO); + + return userRoleService.getUserRoleInfo(userRoleFormDTO); + } + + /** + * 添加用户角色关系 + * + * @param userRoleDTO 参数 + * @return Result + */ + @PostMapping("saveUserRole") + public Result saveUserRole(@RequestBody UserRoleDTO userRoleDTO) { + return userRoleService.saveUserRole(userRoleDTO); + } + } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/RoleDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/RoleDao.java index c6a70243e7..9acbe1fd88 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/RoleDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/RoleDao.java @@ -22,12 +22,20 @@ import com.epmet.entity.RoleEntity; import org.apache.ibatis.annotations.Mapper; /** - * 角色表 + * 角色表 * * @author generator generator@elink-cn.com * @since v1.0.0 2020-03-30 */ @Mapper public interface RoleDao extends BaseDao { - + + /** + * 根据key值获取权限信息 + * + * @param param 参数 + * @return RoleEntity + */ + RoleEntity selectRoleByKey(RoleEntity param); + } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/RoleService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/RoleService.java index b68154234c..72e055c4b1 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/RoleService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/RoleService.java @@ -92,4 +92,11 @@ public interface RoleService extends BaseService { * @date 2020-03-30 */ void delete(String[] ids); + + /** + * 根据key获取role信息 + * @param role + * @return RoleDTO + */ + RoleDTO getRoleByKey(RoleDTO role); } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserRoleService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserRoleService.java index 525eda15a3..a22191edb0 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserRoleService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserRoleService.java @@ -29,80 +29,88 @@ import java.util.List; import java.util.Map; /** - * 用户角色关系表 + * 用户角色关系表 * * @author generator generator@elink-cn.com * @since v1.0.0 2020-03-30 */ public interface UserRoleService extends BaseService { - /** - * 默认分页 - * - * @param params - * @return PageData - * @author generator - * @date 2020-03-30 - */ - PageData page(Map params); + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2020-03-30 + */ + PageData page(Map params); - /** - * 默认查询 - * - * @param params - * @return java.util.List - * @author generator - * @date 2020-03-30 - */ - List list(Map params); + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2020-03-30 + */ + List list(Map params); - /** - * 单条查询 - * - * @param id - * @return UserRoleDTO - * @author generator - * @date 2020-03-30 - */ - UserRoleDTO get(String id); + /** + * 单条查询 + * + * @param id + * @return UserRoleDTO + * @author generator + * @date 2020-03-30 + */ + UserRoleDTO get(String id); - /** - * 默认保存 - * - * @param dto - * @return void - * @author generator - * @date 2020-03-30 - */ - void save(UserRoleDTO dto); + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2020-03-30 + */ + void save(UserRoleDTO dto); - /** - * 默认更新 - * - * @param dto - * @return void - * @author generator - * @date 2020-03-30 - */ - void update(UserRoleDTO dto); + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2020-03-30 + */ + void update(UserRoleDTO dto); - /** - * 批量删除 - * - * @param ids - * @return void - * @author generator - * @date 2020-03-30 - */ - void delete(String[] ids); + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2020-03-30 + */ + void delete(String[] ids); - /** - * @Description 根据用户Id、来源app、客户Id查询用户角色 - * @Param userRoleFormDTO - * @return UserRoleResultDTO - * @Author wangc - * @Date 2020.03.30 15:35 - **/ - Result> getUserRoleInfo(UserRoleFormDTO userRoleFormDTO); + /** + * @return UserRoleResultDTO + * @Description 根据用户Id、来源app、客户Id查询用户角色 + * @Param userRoleFormDTO + * @Author wangc + * @Date 2020.03.30 15:35 + **/ + Result> getUserRoleInfo(UserRoleFormDTO userRoleFormDTO); + + /** + * 添加用户角色关系 + * + * @param userRoleDTO 参数 + * @return Result + */ + Result saveUserRole(UserRoleDTO userRoleDTO); } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RoleServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RoleServiceImpl.java index ad9366c4e9..24914ad22e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RoleServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RoleServiceImpl.java @@ -101,4 +101,10 @@ public class RoleServiceImpl extends BaseServiceImpl implem baseDao.deleteBatchIds(Arrays.asList(ids)); } + @Override + public RoleDTO getRoleByKey(RoleDTO role) { + RoleEntity entity = baseDao.selectRoleByKey(ConvertUtils.sourceToTarget(role, RoleEntity.class)); + return ConvertUtils.sourceToTarget(entity, RoleDTO.class); + } + } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java index 57e95af9ae..715dd1a58d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java @@ -26,17 +26,19 @@ import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; +import com.epmet.constant.UserConstant; import com.epmet.constant.UserResiRegisterConstant; import com.epmet.dao.UserResiInfoDao; import com.epmet.dto.UserResiInfoDTO; +import com.epmet.dto.UserRoleDTO; import com.epmet.dto.form.UserResiInfoFormDTO; import com.epmet.dto.form.VerificationCodeFormDTO; import com.epmet.entity.UserResiInfoEntity; -import com.epmet.entity.UserResiRegisterVisitEntity; import com.epmet.redis.UserResiInfoRedis; import com.epmet.service.RegisterRelationService; import com.epmet.service.UserResiInfoService; import com.epmet.service.UserResiRegisterVisitService; +import com.epmet.service.UserRoleService; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -67,6 +69,8 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl page(Map params) { @@ -205,20 +209,15 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl implements UserRoleService { - @Autowired - private UserRoleRedis userRoleRedis; - - @Override - public PageData page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, UserRoleDTO.class); - } - - @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); - - return ConvertUtils.sourceToTarget(entityList, UserRoleDTO.class); - } - - private QueryWrapper getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); - - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); - - return wrapper; - } - - @Override - public UserRoleDTO get(String id) { - UserRoleEntity entity = baseDao.selectById(id); - return ConvertUtils.sourceToTarget(entity, UserRoleDTO.class); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void save(UserRoleDTO dto) { - UserRoleEntity entity = ConvertUtils.sourceToTarget(dto, UserRoleEntity.class); - insert(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(UserRoleDTO dto) { - UserRoleEntity entity = ConvertUtils.sourceToTarget(dto, UserRoleEntity.class); - updateById(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void delete(String[] ids) { - // 逻辑删除（@TableLogic 注解） - baseDao.deleteBatchIds(Arrays.asList(ids)); - } - - /** - * @Description 根据用户Id、来源app、客户Id查询用户角色 - * @Param userRoleFormDTO - * @return UserRoleResultDTO - * @Author wangc - * @Date 2020.03.30 15:35 - **/ - @Override - public Result> getUserRoleInfo(UserRoleFormDTO userRoleFormDTO) { - return new Result>().ok(baseDao.getUserRoleInfo(userRoleFormDTO)); - } + @Autowired + private UserRoleRedis userRoleRedis; + @Autowired + private RoleService roleService; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, UserRoleDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, UserRoleDTO.class); + } + + private QueryWrapper getWrapper(Map params) { + String id = (String) params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public UserRoleDTO get(String id) { + UserRoleEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, UserRoleDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(UserRoleDTO dto) { + UserRoleEntity entity = ConvertUtils.sourceToTarget(dto, UserRoleEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(UserRoleDTO dto) { + UserRoleEntity entity = ConvertUtils.sourceToTarget(dto, UserRoleEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + + /** + * @return UserRoleResultDTO + * @Description 根据用户Id、来源app、客户Id查询用户角色 + * @Param userRoleFormDTO + * @Author wangc + * @Date 2020.03.30 15:35 + **/ + @Override + public Result> getUserRoleInfo(UserRoleFormDTO userRoleFormDTO) { + return new Result>().ok(baseDao.getUserRoleInfo(userRoleFormDTO)); + } + + @Override + public Result saveUserRole(UserRoleDTO userRoleDTO) { + //获取角色ID + RoleDTO roleDTO = new RoleDTO(); + roleDTO.setApp(UserConstant.APP_RESI); + roleDTO.setRoleKey(userRoleDTO.getRoleKey()); + RoleDTO role = roleService.getRoleByKey(roleDTO); + userRoleDTO.setRoleId(role.getId()); + baseDao.insert(ConvertUtils.sourceToTarget(userRoleDTO, UserRoleEntity.class)); + return new Result(); + } } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/RoleDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/RoleDao.xml index 7dc2a737a2..01a93dd9d9 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/RoleDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/RoleDao.xml @@ -15,6 +15,18 @@ + \ No newline at end of file From 0c1b47f4ae166d25f8632e8c6fd4e533c84ff4b2 Mon Sep 17 00:00:00 2001 From: yinzuomei <57602893@qq.com> Date: Wed, 1 Apr 2020 22:37:30 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E5=8F=91=E9=80=81=E7=9F=AD=E4=BF=A1?= =?UTF-8?q?=E4=B8=B4=E6=97=B6insertsql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dao/SysSmsDao.java | 6 +++++ .../epmet/service/impl/SysSmsServiceImpl.java | 11 ++++++++-- .../src/main/resources/mapper/SysSmsDao.xml | 22 +++++++++++++++++++ 3 files changed, 37 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/SysSmsDao.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/SysSmsDao.java index c99b3cf3e4..f56eb832eb 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/SysSmsDao.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/SysSmsDao.java @@ -11,6 +11,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.entity.SysSmsEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; /** * 短信 @@ -20,4 +21,9 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface SysSmsDao extends BaseDao { + + int tempInsert(@Param("platform") Integer platform, @Param("mobile") String mobile, + @Param("params1") String params1, @Param("params2") String params2, + @Param("params3") String params3, @Param("params4") String params4, + @Param("status") Integer status); } diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SysSmsServiceImpl.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SysSmsServiceImpl.java index 506d301f0f..0131b235c0 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SysSmsServiceImpl.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SysSmsServiceImpl.java @@ -26,6 +26,7 @@ import com.epmet.sms.SmsFactory; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; +import java.util.Date; import java.util.LinkedHashMap; import java.util.Map; @@ -95,7 +96,13 @@ public class SysSmsServiceImpl extends BaseServiceImpl } sms.setStatus(status); - - this.insert(sms); + sms.setCreateDate(new Date()); + baseDao.tempInsert(sms.getPlatform(), + sms.getMobile(), + sms.getParams1(), + sms.getParams2(), + sms.getParams3(), + sms.getParams4(), + sms.getStatus()); } } diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/SysSmsDao.xml b/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/SysSmsDao.xml index 09959e9196..44524eceea 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/SysSmsDao.xml +++ b/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/SysSmsDao.xml @@ -3,5 +3,27 @@ + + INSERT INTO `sys_sms` ( + `platform`, + `mobile`, + `params_1`, + `params_2`, + `params_3`, + `params_4`, + `status`, + `creator`, + `create_date`) + VALUES + ( #{platform}, + #{mobile}, + #{params1}, + #{params2}, + #{params3}, + #{params4}, + #{status}, + "1", + now()) + From fe4394a204526e53905fa02e350a0b30869ca577 Mon Sep 17 00:00:00 2001 From: wangchao Date: Thu, 2 Apr 2020 09:46:25 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E8=AF=9D=E9=A2=98=E3=80=81=E8=AF=84?= =?UTF-8?q?=E8=AE=BA=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/feign/EpmetUserFeignClient.java | 2 +- .../resi/group/constant/TopicConstant.java | 22 +- .../comment/form/ResiQueryCommentFormDTO.java | 30 +- .../comment/result/ResiCommentResultDTO.java | 44 ++- .../topic/form/ResiPublishCommentFormDTO.java | 4 +- .../topic/form/ResiTopicOperationFormDTO.java | 22 +- .../dto/topic/form/ResiTopicPageFormDTO.java | 5 + .../result/ResiTopicDetailResultDTO.java | 41 ++- .../topic/result/ResiTopicInfoResultDTO.java | 2 +- .../controller/ResiCommentController.java | 47 +++ .../modules/feign/EpmetUserFeignClient.java | 2 +- .../topic/controller/ResiTopicController.java | 108 +++++- .../topic/dao/ResiTopicAttachmentDao.java | 19 +- .../topic/dao/ResiTopicCommentDao.java | 25 +- .../epmet/modules/topic/dao/ResiTopicDao.java | 45 ++- .../topic/dao/ResiTopicOperationDao.java | 11 +- .../entity/ResiTopicOperationEntity.java | 4 + .../service/ResiTopicCommentService.java | 28 +- .../topic/service/ResiTopicService.java | 64 +++- .../impl/ResiTopicCommentServiceImpl.java | 79 ++++- .../service/impl/ResiTopicServiceImpl.java | 331 ++++++++++++++---- .../mapper/topic/ResiTopicAttachmentDao.xml | 59 ++++ .../mapper/topic/ResiTopicCommentDao.xml | 62 +++- .../resources/mapper/topic/ResiTopicDao.xml | 117 ++++++- .../mapper/topic/ResiTopicOperationDao.xml | 47 +++ .../com/epmet/feign/EpmetUserFeignClient.java | 2 +- .../service/impl/UserAccessServiceImpl.java | 6 + .../com/epmet/dto/form/VisitedFormDTO.java | 5 + .../com/epmet/feign/GovOrgFeignClient.java | 2 +- .../service/impl/GridVisitedServiceImpl.java | 2 +- .../impl/RegisterRelationServiceImpl.java | 14 +- 31 files changed, 1138 insertions(+), 113 deletions(-) diff --git a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java index 3fe7b82bca..c3f44bbc57 100644 --- a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java +++ b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java @@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.*; * @dscription * @date 2020/3/19 9:32 */ -@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, path="/epmetuser", fallback = EpmetUserFeignClientFallback.class,url = "http://localhost:8087") +@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, path="/epmetuser", fallback = EpmetUserFeignClientFallback.class) public interface EpmetUserFeignClient { /** diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/constant/TopicConstant.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/constant/TopicConstant.java index 6b88d61742..4910c2281b 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/constant/TopicConstant.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/constant/TopicConstant.java @@ -31,7 +31,12 @@ public interface TopicConstant { /** * 关闭话题 * */ - String CLOSED = "CLOSED"; + String CLOSED = "closed"; + + /** + * 屏蔽话题 + * */ + String HIDDEN = "hidden"; /** * 本人发布 @@ -42,4 +47,19 @@ public interface TopicConstant { * 他人发布 * */ String PUBLISHED_BY_OTHER = "other"; + + /** + * 构造queryWrapper 话题Id列名 + * */ + String TOPIC_ID = "TOPIC_ID"; + + /** + * 构造queryWrapper 创建日期列名 + * */ + String CREATED_DATE = "CREATED_DATE"; + + /** + * 构造queryWrapper 逻辑删除标识列名 + * */ + String DEL_FLAG = "DEL_FLAG"; } diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/comment/form/ResiQueryCommentFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/comment/form/ResiQueryCommentFormDTO.java index b761f8c4fe..bed1a75b87 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/comment/form/ResiQueryCommentFormDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/comment/form/ResiQueryCommentFormDTO.java @@ -1,10 +1,36 @@ package com.epmet.resi.group.dto.comment.form; +import lombok.Data; + +import javax.validation.constraints.Min; +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + /** * @Description - * @ClassName ResiCommentFormDTO + * @ClassName ResiQueryCommentFormDTO * @Author wangc * @date 2020.04.01 17:14 */ -public class ResiCommentFormDTO { +@Data +public class ResiQueryCommentFormDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 组Id + * */ + @NotBlank(message = "话题Id不能为空") + private String topicId; + + /** + * 请求页码 + * */ + @Min(1) + private int pageNo; + + /** + * 每页多少条数据 + * */ + private int pageSize = 20; } diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/comment/result/ResiCommentResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/comment/result/ResiCommentResultDTO.java index dc37f30728..ce6ed8f1c2 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/comment/result/ResiCommentResultDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/comment/result/ResiCommentResultDTO.java @@ -1,10 +1,52 @@ package com.epmet.resi.group.dto.comment.result; +import lombok.Data; + +import java.io.Serializable; + /** * @Description * @ClassName ResiCommentResultDTO * @Author wangc * @date 2020.04.01 17:07 */ -public class ResiCommentResultDTO { +@Data +public class ResiCommentResultDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 评论Id + * */ + private String commentId; + + /** + * 评论内容 + * */ + private String commentContent; + + /** + * 评论者头像 + * */ + private String commentUserHeadPhoto; + + /** + * 评论者姓名 + * */ + private String commentUserName; + + /** + * 用户Id 评论者Id + * */ + private String userId; + + /** + * 评论时间 yyyy-MM-dd HH:mm:ss + * */ + private String commentTime; + + /** + * 评论状态 + * */ + private String commentStatus; } diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/ResiPublishCommentFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/ResiPublishCommentFormDTO.java index 5acbc61765..894364fe16 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/ResiPublishCommentFormDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/ResiPublishCommentFormDTO.java @@ -7,12 +7,12 @@ import java.io.Serializable; /** * @Description - * @ClassName ResiCommentFormDTO + * @ClassName ResiPublishCommentFormDTO * @Author wangc * @date 2020.03.31 17:32 */ @Data -public class ResiCommentFormDTO implements Serializable { +public class ResiPublishCommentFormDTO implements Serializable { private static final long serialVersionUID = 1L; diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/ResiTopicOperationFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/ResiTopicOperationFormDTO.java index b3bf01b5d9..58853940ce 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/ResiTopicOperationFormDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/ResiTopicOperationFormDTO.java @@ -1,10 +1,30 @@ package com.epmet.resi.group.dto.topic.form; +import lombok.Data; + +import java.io.Serializable; + /** * @Description * @ClassName ResiTopicOperationFormDTO * @Author wangc * @date 2020.04.01 15:32 */ -public class ResiTopicOperationFormDTO { +@Data +public class ResiTopicOperationFormDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 话题Id + */ + private String topicId; + + /** + * 屏蔽原因 + */ + private String operateReason; + + + } diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/ResiTopicPageFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/ResiTopicPageFormDTO.java index fba7d2fcfa..13b1904122 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/ResiTopicPageFormDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/ResiTopicPageFormDTO.java @@ -38,4 +38,9 @@ public class ResiTopicPageFormDTO implements Serializable{ * 搜索时可以带状态的查询，也可以不带 * */ private String status; + + /** + * 用户Id + * */ + private String userId; } diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicDetailResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicDetailResultDTO.java index 547448bdb8..6080016569 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicDetailResultDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicDetailResultDTO.java @@ -1,10 +1,49 @@ package com.epmet.resi.group.dto.topic.result; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + /** * @Description * @ClassName ResiTopicDetailResultDTO * @Author wangc * @date 2020.04.01 16:03 */ -public class ResiTopicDetailResultDTO { +@Data +public class ResiTopicDetailResultDTO implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * 话题Id + * */ + private String topicId; + + + /** + * 发布人名称 + * */ + private String releaseUserName; + + /** + * 发布人头像 + * */ + private String releaseUserHeadPhoto; + + /** + * 发布时间 yyyy-MM-dd HH:mm:ss + * */ + private String releaseTime; + + /** + * 话题内容 + * */ + private String topicContent; + + /** + * 图片访问地址 + * */ + private List topicImgs; + } diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicInfoResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicInfoResultDTO.java index 09b2cd4e85..2f0eda3b7b 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicInfoResultDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicInfoResultDTO.java @@ -21,7 +21,7 @@ public class ResiTopicInfoResultDTO implements Serializable{ private String topicId; /** - * 用户Id + * 用户Id 话题发布人 * */ private String userId; diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/comment/controller/ResiCommentController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/comment/controller/ResiCommentController.java index 533b67db56..ae4c96d67c 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/comment/controller/ResiCommentController.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/comment/controller/ResiCommentController.java @@ -1,10 +1,57 @@ package com.epmet.modules.comment.controller; +import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.security.dto.TokenDto; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.modules.topic.service.ResiTopicCommentService; +import com.epmet.resi.group.dto.comment.form.ResiQueryCommentFormDTO; +import com.epmet.resi.group.dto.comment.result.ResiCommentResultDTO; +import com.epmet.resi.group.dto.topic.form.ResiPublishCommentFormDTO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + /** * @Description * @ClassName ResiCommentController * @Author wangc * @date 2020.04.01 18:00 */ +@RequestMapping("comment") +@RestController public class ResiCommentController { + + @Autowired + private ResiTopicCommentService commentService; + + /** + * @Description 对话题发表评论 + * @Param tokenDto + * @Param ResiPublishCommentFormDTO + * @return Result + * @Author wangc + * @Date 2020.04.01 18:06 + **/ + @RequestMapping("commenttopic") + public Result commentTopic(@LoginUser TokenDto tokenDto, ResiPublishCommentFormDTO publishCommentFormDTO){ + ValidatorUtils.validateEntity(publishCommentFormDTO); + return commentService.commentTopic(tokenDto,publishCommentFormDTO); + } + + /** + * @Description 获取某个话题的评论列表 + * @Param tokenDto + * @Param ResiQueryCommentFormDTO + * @return Result> + * @Author wangc + * @Date 2020.04.01 23:49 + **/ + @RequestMapping("getcommentlistoftopic") + public Result> getCommentListOfTopic(@LoginUser TokenDto tokenDto, ResiQueryCommentFormDTO queryCommentFormDTO){ + ValidatorUtils.validateEntity(queryCommentFormDTO); + return commentService.getCommentList(tokenDto,queryCommentFormDTO); + } } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java index 56cd57c171..4ae87fce2f 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java @@ -18,7 +18,7 @@ import java.util.List; * @Author yinzuomei * @Date 2020/3/16 14:48 */ -@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserFeignClientFallback.class ) +@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserFeignClientFallback.class) public interface EpmetUserFeignClient { /** diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java index b9677d62a5..e40cda746f 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java @@ -3,11 +3,21 @@ package com.epmet.modules.topic.controller; import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.modules.topic.service.ResiTopicService; +import com.epmet.resi.group.dto.topic.form.ResiTopicOperationFormDTO; +import com.epmet.resi.group.dto.topic.form.ResiTopicPageFormDTO; import com.epmet.resi.group.dto.topic.form.ResiTopicPublishFormDTO; +import com.epmet.resi.group.dto.topic.result.ResiTopicDetailResultDTO; +import com.epmet.resi.group.dto.topic.result.ResiTopicInfoResultDTO; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + /** * @Description * @ClassName ResiTopicController @@ -19,6 +29,9 @@ import org.springframework.web.bind.annotation.RestController; @RequestMapping("topic") public class ResiTopicController { + @Autowired + ResiTopicService topicService; + /** * @Description 组内成员创建话题(身份校验 + 创建话题 + 增加话题记录) * @Param TokenDto.class @@ -30,9 +43,102 @@ public class ResiTopicController { @RequestMapping("createtopic") public Result createTopic(@LoginUser TokenDto tokenDto, @RequestBody ResiTopicPublishFormDTO topicPublishFormDTO){ + ValidatorUtils.validateEntity(topicPublishFormDTO); + return topicService.createTopic(tokenDto,topicPublishFormDTO); + } + + /** + * @Description 获取话题详情 + * @Param tokenDto + * @Param String + * @return Result + * @Author wangc + * @Date 2020.04.01 23:48 + **/ + @RequestMapping("gettopicdetail") + public Result getTopicDetail(@LoginUser TokenDto tokenDto, @RequestParam("topicId")String topicId ){ + return topicService.getTopicDetail(tokenDto,topicId); + } + + /** + * @Description 查看历史话题(分页,允许状态筛选) + * @Param tokenDto + * @Param ResiTopicPageFormDTO.class + * @return Result> + * @Author wangc + * @Date 2020.04.01 10:36 + **/ + @RequestMapping("getpasttopiclist") + public Result> getPastTopicList(@LoginUser TokenDto tokenDto, @RequestBody ResiTopicPageFormDTO topicPageFormDTO){ + ValidatorUtils.validateEntity(topicPageFormDTO); + return topicService.getPastTopicList(tokenDto,topicPageFormDTO); + } + + /** + * @Description 查看组内最近十条话题 + * @Param tokenDto + * @Param groupId + * @return Result> + * @Author wangc + * @Date 2020.04.02 00:01 + **/ + @RequestMapping("getlatesttentopic") + Result> getLatestTenTopics(TokenDto tokenDto,String groupId){ + return topicService.getLatestTenTopics(tokenDto,groupId); + } + + /** + * @Description 屏蔽话题 + * @Param tokenDto + * @Param ResiTopicHiddenFormDTO.class + * @return Result + * @Author wangc + * @Date 2020.04.01 12:38 + **/ + @RequestMapping("hidetopic") + Result hideTopic(TokenDto tokenDto,ResiTopicOperationFormDTO hiddenFormDTO){ + ValidatorUtils.validateEntity(hiddenFormDTO); + return topicService.hideTopic(tokenDto,hiddenFormDTO); + } + /** + * @Description 屏蔽话题列表查询 + * @Param tokenDto + * @Param ResiTopicPageFormDTO.class + * @return List + * @Author wangc + * @Date 2020.04.01 16:45 + **/ + @RequestMapping("gethiddentopic") + Result> getHiddenTopic(TokenDto tokenDto,ResiTopicPageFormDTO topicPageFormDTO){ + ValidatorUtils.validateEntity(topicPageFormDTO); + return topicService.getHiddenTopics(tokenDto,topicPageFormDTO); + } - return new Result(); + /** + * @Description 批量取消屏蔽 + * @Param tokenDto + * @Param topicIds + * @return Result + * @Author wangc + * @Date 2020.04.01 14:17 + **/ + @RequestMapping("cancelhiddentopics") + Result cancelHiddenTopics(TokenDto tokenDto,List topicIds){ + return topicService.cancelHiddenTopics(tokenDto,topicIds); } + /** + * @Description 关闭话题 + * @Param tokenDto + * @Param ResiTopicOperationFormDTO.class + * @return Result.class + * @Author wangc + * @Date 2020.04.01 15:37 + **/ + @RequestMapping("closetopic") + Result closeTopic(TokenDto tokenDto,ResiTopicOperationFormDTO closeFormDTO){ + ValidatorUtils.validateEntity(closeFormDTO); + return topicService.closeTopic(tokenDto,closeFormDTO); + } } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/ResiTopicAttachmentDao.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/ResiTopicAttachmentDao.java index c68f3d87dd..c58c7e59db 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/ResiTopicAttachmentDao.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/ResiTopicAttachmentDao.java @@ -33,5 +33,22 @@ import java.util.List; @Mapper public interface ResiTopicAttachmentDao extends BaseDao { - void insertBatch(List list); + /** + * @Description 批量插入 + * @Param + * @return + * @Author wangc + * @Date 2020.04.01 13:39 + **/ + int insertBatch(List list); + + /** + * @Description 重写Insert方法，不需要传CreatedDate UpdatedBy UpdatedDate DelFlag Revision + * @Param attachmentEntity + * @return int 受影响的行数 + * @Author wangc + * @Date 2020.04.01 13:40 + **/ + + int insertOne(ResiTopicAttachmentEntity attachmentEntity); } \ No newline at end of file diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/ResiTopicCommentDao.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/ResiTopicCommentDao.java index 2d72e71723..76ecd5dafd 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/ResiTopicCommentDao.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/ResiTopicCommentDao.java @@ -19,9 +19,13 @@ package com.epmet.modules.topic.dao; import com.epmet.commons.mybatis.dao.BaseDao; -import com.epmet.modules.topic.entity.ResiTopicCommentEntity; +import com.epmet.modules.comment.entity.ResiTopicCommentEntity; +import com.epmet.resi.group.dto.comment.form.ResiQueryCommentFormDTO; +import com.epmet.resi.group.dto.comment.result.ResiCommentResultDTO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 话题评论表 * @@ -30,5 +34,22 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface ResiTopicCommentDao extends BaseDao { - + + /** + * @Description 重写Insert方法，不需要传CreatedDate UpdatedBy UpdatedDate DelFlag Revision + * @Param commentEntity + * @return int + * @Author wangc + * @Date 2020.04.01 17:40 + **/ + int insertOne(ResiTopicCommentEntity commentEntity); + + /** + * @Description 得到某个话题的评论列表 分页 + * @Param ResiQueryCommentFormDTO + * @return Result> + * @Author wangc + * @Date 2020.04.01 17:15 + **/ + List getCommentList(ResiQueryCommentFormDTO queryCommentFormDTO); } \ No newline at end of file diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/ResiTopicDao.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/ResiTopicDao.java index 58524d80ae..bfb32a90ec 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/ResiTopicDao.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/ResiTopicDao.java @@ -20,6 +20,7 @@ package com.epmet.modules.topic.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.modules.topic.entity.ResiTopicEntity; +import com.epmet.resi.group.dto.topic.form.ResiTopicPageFormDTO; import com.epmet.resi.group.dto.topic.result.ResiTopicInfoResultDTO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -36,14 +37,13 @@ import java.util.List; public interface ResiTopicDao extends BaseDao { /** - * @Description 自定义新增语句 + * @Description 重写Insert方法，不需要传CreatedDate UpdatedBy UpdatedDate DelFlag Revision * @Param ResiTopicEntity.class * @return int * @Author wangc * @Date 2020.04.01 09:39 **/ - @Override - int insert(ResiTopicEntity resiTopic); + int insertOne(ResiTopicEntity resiTopic); /** * @Description 查询该组内最近十条话题信息 @@ -52,5 +52,42 @@ public interface ResiTopicDao extends BaseDao { * @Author wangc * @Date 2020.04.01 09:40 **/ - List getLatestTenTopics(@Param("groupId")String groupId); + List getLatestTenTopics(@Param("groupId")String groupId,@Param("userId")String userId); + + /** + * @Description 查看历史话题(分页,允许状态筛选) + * @Param topicPageFormDTO + * @return List + * @Author wangc + * @Date 2020.04.01 11:08 + **/ + List getPastTopics(ResiTopicPageFormDTO topicPageFormDTO); + + /** + * @Description 修改话题 + * @Param ResiTopicEntity.class + * @return Result.class + * @Author wangc + * @Date 2020.04.01 13:08 + **/ + int update(ResiTopicEntity topicEntity); + + /** + * @Description 批量取消屏蔽操作 + * @Param List + * @Param updatedBy + * @return int + * @Author wangc + * @Date 2020.04.01 15:20 + **/ + int cancelHiddenOrCloseBatch(@Param("list")List ids,@Param("updatedBy")String updatedBy,@Param("status")String status); + + /** + * @Description 批量更新 + * @Param List + * @return int + * @Author wangc + * @Date 2020.04.01 15:21 + **/ + int updateBatch(List list); } \ No newline at end of file diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/ResiTopicOperationDao.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/ResiTopicOperationDao.java index 570f1c4b55..8c4b186b03 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/ResiTopicOperationDao.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/ResiTopicOperationDao.java @@ -30,5 +30,14 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface ResiTopicOperationDao extends BaseDao { - + + /** + * @Description 重写Insert方法，不需要传CreatedDate UpdatedBy UpdatedDate DelFlag Revision + * @Param topicOperationEntity + * @return int 受影响的行数 + * @Author wangc + * @Date 2020.04.01 13:45 + **/ + int insertOne(ResiTopicOperationEntity topicOperationEntity); + } \ No newline at end of file diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/ResiTopicOperationEntity.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/ResiTopicOperationEntity.java index eac71fc663..8a9cb25de9 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/ResiTopicOperationEntity.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/ResiTopicOperationEntity.java @@ -48,4 +48,8 @@ public class ResiTopicOperationEntity extends BaseEpmetEntity { */ private String operationType; + /** + * 屏蔽理由（非必填） + * */ + private String operationReason; } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicCommentService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicCommentService.java index f9058408cd..f0656d3d93 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicCommentService.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicCommentService.java @@ -19,8 +19,13 @@ package com.epmet.modules.topic.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; -import com.epmet.modules.topic.entity.ResiTopicCommentEntity; +import com.epmet.commons.tools.security.dto.TokenDto; +import com.epmet.commons.tools.utils.Result; +import com.epmet.modules.comment.entity.ResiTopicCommentEntity; +import com.epmet.resi.group.dto.comment.form.ResiQueryCommentFormDTO; +import com.epmet.resi.group.dto.comment.result.ResiCommentResultDTO; import com.epmet.resi.group.dto.topic.ResiTopicCommentDTO; +import com.epmet.resi.group.dto.topic.form.ResiPublishCommentFormDTO; import java.util.List; @@ -93,4 +98,25 @@ public interface ResiTopicCommentService extends BaseService> + * @Author wangc + * @Date 2020.04.01 17:15 + **/ + Result> getCommentList(TokenDto tokenDto,ResiQueryCommentFormDTO commentFormDTO); + } \ No newline at end of file diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java index 89e9136b62..6784cab2e3 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java @@ -23,9 +23,11 @@ import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.modules.topic.entity.ResiTopicEntity; import com.epmet.resi.group.dto.topic.ResiTopicDTO; -import com.epmet.resi.group.dto.topic.form.ResiCommentFormDTO; + +import com.epmet.resi.group.dto.topic.form.ResiTopicOperationFormDTO; import com.epmet.resi.group.dto.topic.form.ResiTopicPageFormDTO; import com.epmet.resi.group.dto.topic.form.ResiTopicPublishFormDTO; +import com.epmet.resi.group.dto.topic.result.ResiTopicDetailResultDTO; import com.epmet.resi.group.dto.topic.result.ResiTopicInfoResultDTO; @@ -110,16 +112,6 @@ public interface ResiTopicService extends BaseService { **/ Result createTopic(TokenDto tokenDto, ResiTopicPublishFormDTO resiTopicPublishFormDTO); - /** - * @Description 评论话题 - * @Param tokenDto - * @Param resiCommentFormDTO - * @return Result - * @Author wangc - * @Date 2020.03.31 17:36 - **/ - Result commentTopic(TokenDto tokenDto, ResiCommentFormDTO resiCommentFormDTO); - /** * @Description 查看组内最近十条话题 * @Param tokenDto @@ -139,4 +131,54 @@ public interface ResiTopicService extends BaseService { * @Date 2020.04.01 10:36 **/ Result> getPastTopicList(TokenDto tokenDto, ResiTopicPageFormDTO topicPageFormDTO); + + /** + * @Description 屏蔽话题 + * @Param tokenDto + * @Param ResiTopicHiddenFormDTO.class + * @return Result + * @Author wangc + * @Date 2020.04.01 12:38 + **/ + Result hideTopic(TokenDto tokenDto,ResiTopicOperationFormDTO hiddenFormDTO); + + /** + * @Description 批量取消屏蔽 + * @Param tokenDto + * @Param topicIds + * @return Result + * @Author wangc + * @Date 2020.04.01 14:17 + **/ + Result cancelHiddenTopics(TokenDto tokenDto,List topicIds); + + /** + * @Description 关闭话题 + * @Param tokenDto + * @Param ResiTopicOperationFormDTO.class + * @return Result.class + * @Author wangc + * @Date 2020.04.01 15:37 + **/ + Result closeTopic(TokenDto tokenDto,ResiTopicOperationFormDTO closeFormDTO); + + /** + * @Description 查看话题详情 + * @Param tokenDto + * @Param topicId + * @return ResiTopicDetailResultDTO + * @Author wangc + * @Date 2020.04.01 15:56 + **/ + Result getTopicDetail(TokenDto tokenDto, String topicId); + + /** + * @Description 屏蔽话题列表查询 + * @Param tokenDto + * @Param ResiTopicPageFormDTO.class + * @return List + * @Author wangc + * @Date 2020.04.01 16:45 + **/ + Result> getHiddenTopics(TokenDto tokenDto,ResiTopicPageFormDTO topicPageFormDTO); } \ No newline at end of file diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java index aefdc798a0..1ec3799550 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java @@ -20,15 +20,28 @@ package com.epmet.modules.topic.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.utils.Result; +import com.epmet.modules.comment.entity.ResiTopicCommentEntity; +import com.epmet.modules.member.service.ResiGroupMemberService; import com.epmet.modules.topic.dao.ResiTopicCommentDao; -import com.epmet.modules.topic.entity.ResiTopicCommentEntity; import com.epmet.modules.topic.service.ResiTopicCommentService; +import com.epmet.modules.topic.service.ResiTopicService; +import com.epmet.resi.group.constant.MemberStateConstant; +import com.epmet.resi.group.constant.TopicConstant; +import com.epmet.resi.group.dto.comment.form.ResiQueryCommentFormDTO; +import com.epmet.resi.group.dto.comment.result.ResiCommentResultDTO; +import com.epmet.resi.group.dto.member.ResiGroupMemberDTO; import com.epmet.resi.group.dto.topic.ResiTopicCommentDTO; +import com.epmet.resi.group.dto.topic.ResiTopicDTO; +import com.epmet.resi.group.dto.topic.form.ResiPublishCommentFormDTO; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -45,7 +58,11 @@ import java.util.Map; @Service public class ResiTopicCommentServiceImpl extends BaseServiceImpl implements ResiTopicCommentService { + @Autowired + ResiTopicService resiTopicService; + @Autowired + ResiGroupMemberService resiGroupMemberService; @Override public PageData page(Map params) { @@ -99,4 +116,64 @@ public class ResiTopicCommentServiceImpl extends BaseServiceImpl TopicConstant.MAX_NUMBER_OF_COMMENT){ + + return new Result().error(); + } + ResiTopicCommentEntity comment = ConvertUtils.sourceToTarget(resiCommentFormDTO,ResiTopicCommentEntity.class); + comment.setStatus(TopicConstant.PUBLISHMENT); + baseDao.insertOne(comment); + + return new Result(); + } + + /** + * @Description 得到某个话题的评论列表 分页 + * @Param tokenDto + * @Param ResiQueryCommentFormDTO + * @return Result> + * @Author wangc + * @Date 2020.04.01 17:15 + **/ + @Override + public Result> getCommentList(TokenDto tokenDto, ResiQueryCommentFormDTO commentFormDTO) { + commentFormDTO.setPageNo((commentFormDTO.getPageNo() - NumConstant.ONE) * commentFormDTO.getPageSize()); + return new Result>().ok(baseDao.getCommentList(commentFormDTO)); + + } + + } \ No newline at end of file diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java index aaafafb722..516f722bb2 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java @@ -20,21 +20,24 @@ package com.epmet.modules.topic.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.UserResiInfoDTO; +import com.epmet.dto.form.UserResiInfoFormDTO; import com.epmet.modules.feign.EpmetUserFeignClient; import com.epmet.modules.group.dao.ResiGroupDao; import com.epmet.modules.group.entity.ResiGroupEntity; +import com.epmet.modules.member.dao.ResiGroupMemberDao; import com.epmet.modules.member.service.ResiGroupMemberService; import com.epmet.modules.topic.dao.ResiTopicAttachmentDao; import com.epmet.modules.topic.dao.ResiTopicCommentDao; import com.epmet.modules.topic.dao.ResiTopicDao; import com.epmet.modules.topic.dao.ResiTopicOperationDao; import com.epmet.modules.topic.entity.ResiTopicAttachmentEntity; -import com.epmet.modules.topic.entity.ResiTopicCommentEntity; import com.epmet.modules.topic.entity.ResiTopicEntity; import com.epmet.modules.topic.entity.ResiTopicOperationEntity; import com.epmet.modules.topic.service.ResiTopicService; @@ -44,15 +47,18 @@ import com.epmet.resi.group.constant.TopicConstant; import com.epmet.resi.group.dto.member.ResiGroupMemberDTO; import com.epmet.resi.group.dto.topic.ResiTopicDTO; -import com.epmet.resi.group.dto.topic.form.ResiCommentFormDTO; +import com.epmet.resi.group.dto.topic.form.ResiTopicOperationFormDTO; import com.epmet.resi.group.dto.topic.form.ResiTopicPageFormDTO; import com.epmet.resi.group.dto.topic.form.ResiTopicPublishFormDTO; +import com.epmet.resi.group.dto.topic.result.ResiTopicDetailResultDTO; import com.epmet.resi.group.dto.topic.result.ResiTopicInfoResultDTO; 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.text.SimpleDateFormat; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map; @@ -84,6 +90,9 @@ public class ResiTopicServiceImpl extends BaseServiceImpl page(Map params) { IPage page = baseDao.selectPage( @@ -153,17 +162,9 @@ public class ResiTopicServiceImpl extends BaseServiceImpl> + * @Author wangc + * @Date 2020.04.01 08:59 + **/ + @Override + public Result> getLatestTenTopics(TokenDto tokenDto, String groupId) { + + if(StringUtils.isBlank(groupId)){ + return new Result>().error(); + } + + //1.查询话题列表 + List lastestTenTopics = + baseDao.getLatestTenTopics(groupId,tokenDto.getUserId()); + + //2.遍历存储用户信息 + ResiGroupEntity group = resiGroupDao.selectById(groupId); + if(null != group && ModuleConstant.DEL_FLAG.equals(group.getDelFlag())){ + + } + + + return new Result>().ok(lastestTenTopics); + } + + /** + * @Description 查看历史话题(分页,允许状态筛选) * @Param tokenDto - * @Param resiCommentFormDTO + * @Param ResiTopicPageFormDTO.class + * @return Result> + * @Author wangc + * @Date 2020.04.01 10:36 + **/ + @Override + public Result> getPastTopicList(TokenDto tokenDto, ResiTopicPageFormDTO topicPageFormDTO) { + + //1.查询历史话题列表 + + topicPageFormDTO.setUserId(tokenDto.getUserId()); + + topicPageFormDTO.setPageNo((topicPageFormDTO.getPageNo() - NumConstant.ONE) * topicPageFormDTO.getPageSize()); + + List pastTopics = + baseDao.getPastTopics(topicPageFormDTO); + + //2.遍历用户信息 + + + return new Result>().ok(pastTopics); + } + + /** + * @Description 屏蔽话题 + * @Param tokenDto + * @Param ResiTopicHiddenFormDTO.class * @return Result * @Author wangc - * @Date 2020.03.31 17:36 + * @Date 2020.04.01 12:38 **/ @Override - public Result commentTopic(TokenDto tokenDto, ResiCommentFormDTO resiCommentFormDTO) { + public Result hideTopic(TokenDto tokenDto, ResiTopicOperationFormDTO hiddenFormDTO) { - //1.判断当前用户是否被禁言 - ResiTopicDTO topic = get(resiCommentFormDTO.getTopicId()); - if(null == topic){ - return new Result().error(); + //1.1拿到组Id + ResiTopicEntity topic = baseDao.selectById(hiddenFormDTO.getTopicId()); + //1.2校验身份，是否是该话题所属群组的组长 + Result verifyError = verifyLeader(topic,tokenDto.getUserId()); + if(!verifyError.success()) { + return verifyError; } - ResiGroupMemberDTO resiGroupMemberDTO = - resiGroupMemberService.getResiGroupMember(tokenDto.getUserId() , topic.getGroupId()); + //2.屏蔽话题 + ResiTopicEntity topicForUpdate = new ResiTopicEntity(); + topicForUpdate.setId(hiddenFormDTO.getTopicId()); + topicForUpdate.setUpdatedBy(tokenDto.getUserId()); + topicForUpdate.setStatus(TopicConstant.HIDDEN); + baseDao.update(topicForUpdate); + //3.话题操作记录 + ResiTopicOperationEntity operationRecord = new ResiTopicOperationEntity(); + operationRecord.setTopicId(hiddenFormDTO.getTopicId()); + operationRecord.setOperationReason(hiddenFormDTO.getOperateReason()); + operationRecord.setOperationType(TopicConstant.HIDDEN); + operationRecord.setCreatedBy(tokenDto.getUserId()); + resiTopicOperationDao.insertOne(operationRecord); - if(null != resiGroupMemberDTO){ - if(MemberStateConstant.SILENT.equals(resiGroupMemberDTO.getStatus())){ - //当前用户被禁言 - return new Result().error(); - }else if(MemberStateConstant.REMOVED.equals(resiGroupMemberDTO.getStatus())){ - //当前用户已被移出群 - return new Result().error(); - } - }else{ - //当前用户非组内成员 - return new Result().error(); + return new Result(); + } + + /** + * @Description 批量取消屏蔽 + * @Param tokenDto + * @Param topicIds + * @return Result + * @Author wangc + * @Date 2020.04.01 14:17 + **/ + @Override + public Result cancelHiddenTopics(TokenDto tokenDto, List topicIds) { + + + //1.1拿到组Id + ResiTopicEntity topic = baseDao.selectById(topicIds.get(0)); + + //1.2校验身份，是否是该话题所属群组的组长 + Result verifyError = verifyLeader(topic,tokenDto.getUserId()); + if(!verifyError.success()) { + return verifyError; } - if(resiCommentFormDTO.getCommentContent().length() > TopicConstant.MAX_NUMBER_OF_COMMENT){ + //2.批量取消屏蔽 + baseDao.cancelHiddenOrCloseBatch(topicIds,tokenDto.getUserId(),TopicConstant.PUBLISHMENT); - return new Result().error(); + //3.记录话题操作日志 + for(String id : topicIds){ + ResiTopicOperationEntity operation = new ResiTopicOperationEntity(); + operation.setTopicId(id); + operation.setOperationType(TopicConstant.CANCEL_HIDDEN); + operation.setCreatedBy(tokenDto.getUserId()); + resiTopicOperationDao.insertOne(operation); } - ResiTopicCommentEntity comment = ConvertUtils.sourceToTarget(resiCommentFormDTO,ResiTopicCommentEntity.class); - comment.setStatus(TopicConstant.PUBLISHMENT); - resiTopicCommentDao.insert(comment); return new Result(); } /** - * @Description 查看组内最近十条话题 + * @Description 关闭话题 * @Param tokenDto - * @Param groupId - * @return Result> + * @Param ResiTopicOperationFormDTO.class + * @return Result.class * @Author wangc - * @Date 2020.04.01 08:59 + * @Date 2020.04.01 15:37 **/ @Override - public Result> getLatestTenTopics(TokenDto tokenDto, String groupId) { + public Result closeTopic(TokenDto tokenDto, ResiTopicOperationFormDTO closeFormDTO) { - //1.查询话题列表 - List lastestTenTopics = - baseDao.getLatestTenTopics(groupId); + //1.1拿到组Id + ResiTopicEntity topic = baseDao.selectById(tokenDto.getUserId()); - //2.遍历放用户信息 - ResiGroupEntity group = resiGroupDao.selectById(groupId); - if(null != group && ModuleConstant.DEL_FLAG.equals(group.getDelFlag())){ + //1.2校验身份，是否是该话题所属群组的组长 + Result verifyError = verifyLeader(topic,tokenDto.getUserId()); + if(!verifyError.success()) { + return verifyError; + } + + //2.关闭操作 + List id = new ArrayList<>(); + id.add(closeFormDTO.getTopicId()); + baseDao.cancelHiddenOrCloseBatch(id,tokenDto.getUserId(),TopicConstant.CLOSED); + + //3.记录话题操作日志 + ResiTopicOperationEntity operation = new ResiTopicOperationEntity(); + operation.setTopicId(id.get(0)); + operation.setOperationReason(closeFormDTO.getOperateReason()); + operation.setCreatedBy(tokenDto.getUserId()); + operation.setOperationType(TopicConstant.CLOSED); + resiTopicOperationDao.insertOne(operation); + + return new Result(); + } + + /** + * @Description 查看话题详情 + * @Param tokenDto + * @Param topicId + * @return ResiTopicDetailResultDTO + * @Author wangc + * @Date 2020.04.01 15:56 + **/ + @Override + public Result getTopicDetail(TokenDto tokenDto, String topicId) { + if(StringUtils.isBlank(topicId)){ + return new Result().error(); } - for(ResiTopicInfoResultDTO obj:lastestTenTopics){ - if(StringUtils.equals(tokenDto.getUserId(),obj.getUserId())){ - obj.setReleaseUserFlag(TopicConstant.PUBLISHED_BY_MYSELF); - }else{ - obj.setReleaseUserFlag(TopicConstant.PUBLISHED_BY_OTHER); - } + //1.获取话题基本信息 + ResiTopicEntity topicDetail = baseDao.selectById(topicId); + ResiTopicDetailResultDTO resultDTO = new ResiTopicDetailResultDTO(); + + //2.查询话题附件 + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(TopicConstant.TOPIC_ID,topicId); + wrapper.eq(TopicConstant.DEL_FLAG,NumConstant.ZERO_STR); + wrapper.orderByDesc(TopicConstant.CREATED_DATE); + List attachments = resiTopicAttachmentDao.selectList(wrapper); + List attachmentUrls = new ArrayList<>(); + for(ResiTopicAttachmentEntity attachment : attachments){ + attachmentUrls.add(attachment.getAttachmentUrl()); } - return new Result>().ok(lastestTenTopics); + resultDTO.setTopicImgs(attachmentUrls); + resultDTO.setReleaseTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(topicDetail.getCreatedTime())); + resultDTO.setTopicContent(topicDetail.getTopicContent()); + + //3.拿取用户信息 + ResiTopicDTO topic = get(topicId); + ResiGroupEntity group = resiGroupDao.selectById(topic.getGroupId()); + UserResiInfoFormDTO userParam = new UserResiInfoFormDTO(); + userParam.setUserId(tokenDto.getUserId()); + userParam.setCustomerId(group.getCustomerId()); + Result userInfo = + epmetUserFeignClient.getUserResiInfoDTO(userParam); + if(userInfo.success()){ + resultDTO.setReleaseUserName(userInfo.getData().getSurname() + userInfo.getData().getName()); + + //TODO 调用EpmetUserFeign的查询用户微信信息的方法拉取头像信息 + resultDTO.setReleaseUserHeadPhoto(""); + } + + + + return new Result().ok(resultDTO); } /** - * @Description 查看历史话题(分页,允许状态筛选) + * @Description 屏蔽话题列表查询 * @Param tokenDto * @Param ResiTopicPageFormDTO.class - * @return Result> + * @return List * @Author wangc - * @Date 2020.04.01 10:36 + * @Date 2020.04.01 16:45 **/ @Override - public Result> getPastTopicList(TokenDto tokenDto, ResiTopicPageFormDTO topicPageFormDTO) { + public Result> getHiddenTopics(TokenDto tokenDto, ResiTopicPageFormDTO topicPageFormDTO) { + //1.查询屏蔽话题列表 + topicPageFormDTO.setUserId(tokenDto.getUserId()); + topicPageFormDTO.setPageNo((topicPageFormDTO.getPageNo() - NumConstant.ONE) * topicPageFormDTO.getPageSize()); + topicPageFormDTO.setStatus(TopicConstant.HIDDEN); + + List hiddenTopics = + baseDao.getPastTopics(topicPageFormDTO); + + //2.遍历用户信息 - return null; + + return new Result>().ok(hiddenTopics); } + /** + * @Description 查询当前组员在组内是否被禁言或已被移除 + * @Param resiGroupMemberDTO + * @return Result.class + * @Author wangc + * @Date 2020.04.01 15:00 + **/ + private Result verifySilentOrRemoved(ResiGroupMemberDTO resiGroupMemberDTO){ + if(null != resiGroupMemberDTO){ + if(MemberStateConstant.SILENT.equals(resiGroupMemberDTO.getStatus())){ + //当前用户被禁言 + return new Result().error(); + }else if(MemberStateConstant.REMOVED.equals(resiGroupMemberDTO.getStatus())){ + //当前用户已被移出群 + return new Result().error(); + }else{ + return new Result(); + } + }else{ + //当前用户非组内成员 + return new Result().error(); + } + } + + /** + * @Description 校验当前用户是否是该小组组长 + * @Param + * @return + * @Author wangc + * @Date 2020.04.01 14:55 + **/ + private Result verifyLeader(ResiTopicEntity topic,String userId){ + if(null != topic){ + ResiGroupMemberDTO leaderVerify = resiGroupMemberDao.selectLeaderMember(topic.getGroupId()); + if(null != leaderVerify){ + //1.2判断是否是组长 + if(!StringUtils.equals(leaderVerify.getId(),userId)){ + //非组长，无权限进行操作 + return new Result().error(); + }else{ + return new Result(); + } + }else{ + return new Result().error(); + } + }else{ + return new Result().error(); + } + } } \ No newline at end of file diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicAttachmentDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicAttachmentDao.xml index c7cbed2093..4f64d97e42 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicAttachmentDao.xml +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicAttachmentDao.xml @@ -3,7 +3,66 @@ + + + select replace(uuid(),'-','') AS APPROVAL_ID + + + INSERT INTO resi_topic_attachment + + + topic_id, + + + attachment_name, + + + attachment_format, + + + attachment_type, + + + attachment_url, + + + created_by, + + del_flag, + revision, + created_time, + updated_by, + updated_time + + + + #{topicId}, + + + #{attachmentName}, + + + #{attachmentFormat}, + + + #{attachmentType}, + + + #{attachmentUrl}, + + + #{createdBy}, + + '0', + '0', + now(), + 'APP_USER', + now() + + + + insert into user diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicCommentDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicCommentDao.xml index 17c0eecd82..a7bd739c48 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicCommentDao.xml +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicCommentDao.xml @@ -3,7 +3,67 @@ + + + + select replace(uuid(),'-','') AS APPROVAL_ID + - + INSERT INTO resi_topic_operation + + + topic_id, + + + comment_content, + + + status, + + + created_by, + + del_flag, + revision, + created_time, + updated_by, + updated_time + + + + #{topicId}, + + + #{commentContent}, + + + #{status}, + + + #{createdBy}, + + '0', + '0', + now(), + 'APP_USER', + now() + + + + diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml index c1992e9b06..9ced62fb55 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml @@ -3,8 +3,8 @@ - - + + select replace(uuid(),'-','') AS APPROVAL_ID @@ -88,13 +88,16 @@ + + + + + + + + UPDATE + RESI_TOPIC + + + STATUS = #{status} , + + + DEL_FLAG = #{delFlag} , + + + UPDATED_BY = #{updatedBy} , + + + TOPIC_CONTENT = #{topicContent} , + + UPDATED_DATE = NOW() + + WHERE + ID = #{id} + AND DEL_FLAG = '0' + + + + + UPDATE + RESI_TOPIC + SET + STATUS = #{status}, + UPDATED_DATE = NOW(), + UPDATED_BY = #{updatedBy} + WHERE + ID + + ${item} + + AND + DEL_FLAG = '0' + AND + STATUS = 'hidden' + + + + + update RESI_TOPIC + + + + + when id=#{i.id} then #{i.topicContent} + + + + + + + when id=#{i.id} then #{i.status} + + + + + + + + when id=#{i.id} then #{i.updatedBy} + + + + + updated_date = now() + where + + id=#{i.id} + + + diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicOperationDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicOperationDao.xml index 7262beca3a..6254bb021a 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicOperationDao.xml +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicOperationDao.xml @@ -3,6 +3,53 @@ + + + + + select replace(uuid(),'-','') AS APPROVAL_ID + + + INSERT INTO resi_topic_operation + + + topic_id, + + + operation_type, + + + operation_reason, + + + created_by, + + del_flag, + revision, + created_time, + updated_by, + updated_time + + + + #{topicId}, + + + #{operationType}, + + + #{operationReason}, + + + #{createdBy}, + + '0', + '0', + now(), + 'APP_USER', + now() + + diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java index 68b5e665a9..84d0a19912 100644 --- a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java +++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java @@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RequestBody; * @Description 居民端陌生人导览 调用epmet-user服务 * @Author sun */ -@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserFeignClientFallBack.class, url = "http://localhost:8087") +@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserFeignClientFallBack.class) public interface EpmetUserFeignClient { /** diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/UserAccessServiceImpl.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/UserAccessServiceImpl.java index e2e629e79e..25a13a456b 100644 --- a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/UserAccessServiceImpl.java +++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/UserAccessServiceImpl.java @@ -1,5 +1,6 @@ package com.epmet.service.impl; +import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.constant.StrangerResiGuideConstant; @@ -44,6 +45,11 @@ public class UserAccessServiceImpl implements UserAccessService { visitedFormDTO.setGridId(userInfoParams.getGridId()); visitedFormDTO.setCustomerId(userInfoParams.getCustomerId()); visitedFormDTO.setUserId(userInfoParams.getUserId()); + if(null != userInfoResult.getData().getUserRoleList() && userInfoResult.getData().getUserRoleList().size() > 0){ + visitedFormDTO.setIsReg(NumConstant.ONE_STR); + }else{ + visitedFormDTO.setIsReg(NumConstant.ZERO_STR); + } Result re = epmetUserFeignClient.saveVisitedRecord(visitedFormDTO); if (!re.success()) { log.warn(StrangerResiGuideConstant.EPMET_USER_EXCEPTION); diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VisitedFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VisitedFormDTO.java index c8bacca5f9..8accba700c 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VisitedFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VisitedFormDTO.java @@ -48,5 +48,10 @@ public class VisitedFormDTO implements Serializable { @NotBlank(message = "用户ID不能为空") private String userId; + /** + * 是否注册居民 1:是 0：否 + * */ + private String isReg; + } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java index 246542a747..acbb5833f7 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java @@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.PostMapping; * @Author sun * @Date 2020/3/16 */ -@FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovOrgFeignClientFallBack.class, url = "http://localhost:8092") +@FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovOrgFeignClientFallBack.class) public interface GovOrgFeignClient { /** diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridVisitedServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridVisitedServiceImpl.java index 58aeea85cf..dcb4d7d174 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridVisitedServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridVisitedServiceImpl.java @@ -158,7 +158,7 @@ public class GridVisitedServiceImpl extends BaseServiceImpl UserResiRegisterVisitRecord = userResiRegisterVisitDao.selectUserResiRegisterVisit(userResiRegisterVisitDTO);