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() + + + +