From b439cbe2c794f6159e5d2689785611a8cce63a00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BB=BA=E6=98=8E=20=E6=B2=88?= <2431685932@qq.com> Date: Thu, 18 Jul 2024 09:53:56 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E5=88=86=E4=BA=AB?= =?UTF-8?q?=E5=9C=88=E5=88=97=E8=A1=A8=E8=BF=94=E5=9B=9E=E7=BC=93=E5=AD=98?= =?UTF-8?q?=E3=80=82=E6=96=B0=E5=A2=9E=E8=AF=84=E8=AE=BA=E5=92=8C=E5=9B=9E?= =?UTF-8?q?=E5=A4=8D=EF=BC=8C=E8=AF=84=E8=AE=BA=E5=88=97=E8=A1=A8=E8=BF=94?= =?UTF-8?q?=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SchisandraShareCircleController.java | 2 + ...SchisandraShareCommentReplyController.java | 100 +++++++++++++----- .../SchisandraShareDetailController.java | 11 +- .../dto/SchisandraShareCommentReplyDTO.java | 8 ++ .../dto/SchisandraShareTagsDTO.java | 1 + .../dto/SchisandraShareUrlDTO.java | 1 + .../bo/SchisandraShareCommentReplyBO.java | 6 ++ .../domain/bo/SchisandraShareTagsBO.java | 1 + .../share/domain/bo/SchisandraShareUrlBO.java | 1 + ...chisandraShareCommentReplyBOConverter.java | 2 + ...isandraShareCommentReplyDomainService.java | 11 +- ...draShareCommentReplyDomainServiceImpl.java | 38 ++++++- ...chisandraShareDetailDomainServiceImpl.java | 4 +- .../entity/SchisandraShareCommentReply.java | 6 ++ .../basic/entity/SchisandraShareTags.java | 2 + .../basic/entity/SchisandraShareUrl.java | 2 + .../SchisandraShareCommentReplyService.java | 2 + ...chisandraShareCommentReplyServiceImpl.java | 13 +++ .../schisandra/share/ShareApplication.java | 2 + 19 files changed, 181 insertions(+), 32 deletions(-) diff --git a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-application/schisandra-cloud-storage-share-application-controller/src/main/java/com/schisandra/share/application/controller/SchisandraShareCircleController.java b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-application/schisandra-cloud-storage-share-application-controller/src/main/java/com/schisandra/share/application/controller/SchisandraShareCircleController.java index 54c25b9..737695b 100644 --- a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-application/schisandra-cloud-storage-share-application-controller/src/main/java/com/schisandra/share/application/controller/SchisandraShareCircleController.java +++ b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-application/schisandra-cloud-storage-share-application-controller/src/main/java/com/schisandra/share/application/controller/SchisandraShareCircleController.java @@ -8,6 +8,7 @@ import com.schisandra.share.common.entity.Result; import com.schisandra.share.domain.bo.SchisandraShareCircleBO; import com.schisandra.share.domain.service.SchisandraShareCircleDomainService; import lombok.extern.slf4j.Slf4j; +import org.springframework.cache.annotation.Cacheable; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -50,6 +51,7 @@ public class SchisandraShareCircleController { /** * 分享圈列表返回 */ + @Cacheable(value = "sharelist",key = "list") @GetMapping("sharelist") public Result> getShareList() { try { diff --git a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-application/schisandra-cloud-storage-share-application-controller/src/main/java/com/schisandra/share/application/controller/SchisandraShareCommentReplyController.java b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-application/schisandra-cloud-storage-share-application-controller/src/main/java/com/schisandra/share/application/controller/SchisandraShareCommentReplyController.java index f651358..c44e394 100644 --- a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-application/schisandra-cloud-storage-share-application-controller/src/main/java/com/schisandra/share/application/controller/SchisandraShareCommentReplyController.java +++ b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-application/schisandra-cloud-storage-share-application-controller/src/main/java/com/schisandra/share/application/controller/SchisandraShareCommentReplyController.java @@ -8,11 +8,10 @@ import com.schisandra.share.common.entity.Result; import com.schisandra.share.domain.bo.SchisandraShareCommentReplyBO; import com.schisandra.share.domain.service.SchisandraShareCommentReplyDomainService; import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.util.List; /** * 评论回复表 controller @@ -29,37 +28,88 @@ public class SchisandraShareCommentReplyController { private SchisandraShareCommentReplyDomainService schisandraShareCommentReplyDomainService; /** - * 新增评论回复表 + * 查询该动态下的评论 */ - @RequestMapping("add") - public Result add(@RequestBody SchisandraShareCommentReplyDTO schisandraShareCommentReplyDTO) { + @PostMapping(value = "listcommen") + public Result> list(@RequestParam String detailId) { + try { + List result = schisandraShareCommentReplyDomainService.listComment(detailId); + if (log.isInfoEnabled()) { + log.info("获取鸡圈评论内容{}", JSON.toJSONString(result)); + } + return Result.ok(SchisandraShareCommentReplyDTOConverter.INSTANCE.convertBOToDTOList(result)); + } catch (IllegalArgumentException e) { + log.error("参数异常！错误原因{}", e.getMessage(), e); + return Result.fail(e.getMessage()); + } catch (Exception e) { + log.error("获取鸡圈评论内容异常！错误原因{}", e.getMessage(), e); + return Result.fail("获取鸡圈评论内容异常！"); + } + } + + + @PostMapping("addreply") + public Result addReply(@RequestBody SchisandraShareCommentReplyDTO schisandraShareCommentReplyDTO) { + try { + if (log.isInfoEnabled()) { + log.info("SchisandraShareCommentReplyController.addComment.dto:{}", JSON.toJSONString(schisandraShareCommentReplyDTO)); + } + Preconditions.checkNotNull(schisandraShareCommentReplyDTO.getContent(), "内容不能为空"); + Preconditions.checkNotNull(schisandraShareCommentReplyDTO.getDetailId(), "分享文章id不能为空"); + Preconditions.checkNotNull(schisandraShareCommentReplyDTO.getUserId(), "发布人id不能为空"); + Preconditions.checkNotNull(schisandraShareCommentReplyDTO.getToId(), "评论目标id不能为空"); +// Preconditions.checkNotNull(schisandraShareCommentReplyDTO.getReplyType(), "回复类型 0评论 1回复不能为空"); +// Preconditions.checkNotNull(schisandraShareCommentReplyDTO.getToUser(), "评论人不能为空"); +// Preconditions.checkNotNull(schisandraShareCommentReplyDTO.getReplayAuthor(), "回复人是否作者 1=是 0=否不能为空"); +// Preconditions.checkNotNull(schisandraShareCommentReplyDTO.getPicUrls(), "图片内容不能为空"); +// Preconditions.checkNotNull(schisandraShareCommentReplyDTO.getLikes(), "点赞数不能为空"); +// Preconditions.checkNotNull(schisandraShareCommentReplyDTO.getExtJson(), "预留字段不能为空"); +// Preconditions.checkNotNull(schisandraShareCommentReplyDTO.getCreatedBy(), "创建人不能为空"); +// Preconditions.checkNotNull(schisandraShareCommentReplyDTO.getCreatedTime(), "创建时间不能为空"); +// Preconditions.checkNotNull(schisandraShareCommentReplyDTO.getUpdateBy(), "更新人不能为空"); +// Preconditions.checkNotNull(schisandraShareCommentReplyDTO.getUpdateTime(), "更新时间不能为空"); +// Preconditions.checkNotNull(schisandraShareCommentReplyDTO.getIsDeleted(), "不能为空"); + SchisandraShareCommentReplyBO SchisandraShareCommentReplyBO = SchisandraShareCommentReplyDTOConverter.INSTANCE.convertDTOToBO(schisandraShareCommentReplyDTO); + return Result.ok(schisandraShareCommentReplyDomainService.addReply(SchisandraShareCommentReplyBO)); + } catch (Exception e) { + log.error("SchisandraShareCommentReplyController.register.error:{}", e.getMessage(), e); + return Result.fail("新增评论失败"); + } + } + + + /** + * 新增评论 + */ + @PostMapping("addcomment") + public Result addComment(@RequestBody SchisandraShareCommentReplyDTO schisandraShareCommentReplyDTO) { try { if (log.isInfoEnabled()) { - log.info("SchisandraShareCommentReplyController.add.dto:{}", JSON.toJSONString(schisandraShareCommentReplyDTO)); + log.info("SchisandraShareCommentReplyController.addComment.dto:{}", JSON.toJSONString(schisandraShareCommentReplyDTO)); } - Preconditions.checkNotNull(schisandraShareCommentReplyDTO.getId(), "评论ID不能为空"); - Preconditions.checkNotNull(schisandraShareCommentReplyDTO.getDetailId(), "分享文章id不能为空"); - Preconditions.checkNotNull(schisandraShareCommentReplyDTO.getReplyType(), "回复类型 0评论 1回复不能为空"); - Preconditions.checkNotNull(schisandraShareCommentReplyDTO.getToId(), "评论目标id不能为空"); - Preconditions.checkNotNull(schisandraShareCommentReplyDTO.getToUser(), "评论人不能为空"); - Preconditions.checkNotNull(schisandraShareCommentReplyDTO.getReplyId(), "回复目标id不能为空"); - Preconditions.checkNotNull(schisandraShareCommentReplyDTO.getReplyUser(), "回复人不能为空"); - Preconditions.checkNotNull(schisandraShareCommentReplyDTO.getReplayAuthor(), "回复人是否作者 1=是 0=否不能为空"); Preconditions.checkNotNull(schisandraShareCommentReplyDTO.getContent(), "内容不能为空"); - Preconditions.checkNotNull(schisandraShareCommentReplyDTO.getPicUrls(), "图片内容不能为空"); - Preconditions.checkNotNull(schisandraShareCommentReplyDTO.getLikes(), "点赞数不能为空"); - Preconditions.checkNotNull(schisandraShareCommentReplyDTO.getExtJson(), "预留字段不能为空"); - Preconditions.checkNotNull(schisandraShareCommentReplyDTO.getCreatedBy(), "创建人不能为空"); - Preconditions.checkNotNull(schisandraShareCommentReplyDTO.getCreatedTime(), "创建时间不能为空"); - Preconditions.checkNotNull(schisandraShareCommentReplyDTO.getUpdateBy(), "更新人不能为空"); - Preconditions.checkNotNull(schisandraShareCommentReplyDTO.getUpdateTime(), "更新时间不能为空"); - Preconditions.checkNotNull(schisandraShareCommentReplyDTO.getIsDeleted(), "不能为空"); + Preconditions.checkNotNull(schisandraShareCommentReplyDTO.getDetailId(), "分享文章id不能为空"); + Preconditions.checkNotNull(schisandraShareCommentReplyDTO.getUserId(), "发布人id不能为空"); +// Preconditions.checkNotNull(schisandraShareCommentReplyDTO.getReplyType(), "回复类型 0评论 1回复不能为空"); +// Preconditions.checkNotNull(schisandraShareCommentReplyDTO.getToId(), "评论目标id不能为空"); +// Preconditions.checkNotNull(schisandraShareCommentReplyDTO.getToUser(), "评论人不能为空"); +// Preconditions.checkNotNull(schisandraShareCommentReplyDTO.getReplyId(), "回复目标id不能为空"); +// Preconditions.checkNotNull(schisandraShareCommentReplyDTO.getReplyUser(), "回复人不能为空"); +// Preconditions.checkNotNull(schisandraShareCommentReplyDTO.getReplayAuthor(), "回复人是否作者 1=是 0=否不能为空"); +// Preconditions.checkNotNull(schisandraShareCommentReplyDTO.getPicUrls(), "图片内容不能为空"); +// Preconditions.checkNotNull(schisandraShareCommentReplyDTO.getLikes(), "点赞数不能为空"); +// Preconditions.checkNotNull(schisandraShareCommentReplyDTO.getExtJson(), "预留字段不能为空"); +// Preconditions.checkNotNull(schisandraShareCommentReplyDTO.getCreatedBy(), "创建人不能为空"); +// Preconditions.checkNotNull(schisandraShareCommentReplyDTO.getCreatedTime(), "创建时间不能为空"); +// Preconditions.checkNotNull(schisandraShareCommentReplyDTO.getUpdateBy(), "更新人不能为空"); +// Preconditions.checkNotNull(schisandraShareCommentReplyDTO.getUpdateTime(), "更新时间不能为空"); +// Preconditions.checkNotNull(schisandraShareCommentReplyDTO.getIsDeleted(), "不能为空"); SchisandraShareCommentReplyBO SchisandraShareCommentReplyBO = SchisandraShareCommentReplyDTOConverter.INSTANCE.convertDTOToBO(schisandraShareCommentReplyDTO); - return Result.ok(schisandraShareCommentReplyDomainService.add(SchisandraShareCommentReplyBO)); + return Result.ok(schisandraShareCommentReplyDomainService.addComment(SchisandraShareCommentReplyBO)); } catch (Exception e) { log.error("SchisandraShareCommentReplyController.register.error:{}", e.getMessage(), e); - return Result.fail("新增评论回复表失败"); + return Result.fail("新增评论失败"); } } diff --git a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-application/schisandra-cloud-storage-share-application-controller/src/main/java/com/schisandra/share/application/controller/SchisandraShareDetailController.java b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-application/schisandra-cloud-storage-share-application-controller/src/main/java/com/schisandra/share/application/controller/SchisandraShareDetailController.java index 29ae902..9eb30bb 100644 --- a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-application/schisandra-cloud-storage-share-application-controller/src/main/java/com/schisandra/share/application/controller/SchisandraShareDetailController.java +++ b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-application/schisandra-cloud-storage-share-application-controller/src/main/java/com/schisandra/share/application/controller/SchisandraShareDetailController.java @@ -8,6 +8,7 @@ import com.schisandra.share.common.entity.Result; import com.schisandra.share.domain.bo.SchisandraShareDetailBO; import com.schisandra.share.domain.service.SchisandraShareDetailDomainService; import lombok.extern.slf4j.Slf4j; +import org.springframework.cache.annotation.Cacheable; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -46,10 +47,15 @@ public class SchisandraShareDetailController { /** * 查询分享详细信息 */ + @PostMapping("get_detail") public Result selectDetail(@RequestParam("Id") String Id){ - SchisandraShareDetailBO resultList = schisandraShareDetailDomainService.getDetailsById(Id); - return Result.ok(resultList); + try{ + SchisandraShareDetailBO resultList = schisandraShareDetailDomainService.getDetailsById(Id); + return Result.ok(resultList); + }catch (Exception e){ + return Result.fail(); + } } @@ -60,6 +66,7 @@ public class SchisandraShareDetailController { * @author: landaiqing * @date: 2024/7/15 下午7:09 */ + @Cacheable(value = "detaillist",key = "#circleId") @PostMapping("/list") public Result> selectCircleList(@RequestParam("circleId") String circleId) { List resultList = schisandraShareDetailDomainService.list(circleId); diff --git a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-application/schisandra-cloud-storage-share-application-controller/src/main/java/com/schisandra/share/application/dto/SchisandraShareCommentReplyDTO.java b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-application/schisandra-cloud-storage-share-application-controller/src/main/java/com/schisandra/share/application/dto/SchisandraShareCommentReplyDTO.java index 2723dd8..5371467 100644 --- a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-application/schisandra-cloud-storage-share-application-controller/src/main/java/com/schisandra/share/application/dto/SchisandraShareCommentReplyDTO.java +++ b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-application/schisandra-cloud-storage-share-application-controller/src/main/java/com/schisandra/share/application/dto/SchisandraShareCommentReplyDTO.java @@ -1,5 +1,6 @@ package com.schisandra.share.application.dto; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.io.Serializable; @@ -19,6 +20,11 @@ public class SchisandraShareCommentReplyDTO implements Serializable { */ private String id; + /** + * 发布者id + */ + private String userId; + /** * 分享文章id */ @@ -82,6 +88,7 @@ public class SchisandraShareCommentReplyDTO implements Serializable { /** * 创建时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00") private Date createdTime; /** @@ -92,6 +99,7 @@ public class SchisandraShareCommentReplyDTO implements Serializable { /** * 更新时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00") private Date updateTime; /** diff --git a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-application/schisandra-cloud-storage-share-application-controller/src/main/java/com/schisandra/share/application/dto/SchisandraShareTagsDTO.java b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-application/schisandra-cloud-storage-share-application-controller/src/main/java/com/schisandra/share/application/dto/SchisandraShareTagsDTO.java index e9a8cd8..9ff55bf 100644 --- a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-application/schisandra-cloud-storage-share-application-controller/src/main/java/com/schisandra/share/application/dto/SchisandraShareTagsDTO.java +++ b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-application/schisandra-cloud-storage-share-application-controller/src/main/java/com/schisandra/share/application/dto/SchisandraShareTagsDTO.java @@ -64,5 +64,6 @@ public class SchisandraShareTagsDTO implements Serializable { */ private Integer isDeleted; + private String color; } diff --git a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-application/schisandra-cloud-storage-share-application-controller/src/main/java/com/schisandra/share/application/dto/SchisandraShareUrlDTO.java b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-application/schisandra-cloud-storage-share-application-controller/src/main/java/com/schisandra/share/application/dto/SchisandraShareUrlDTO.java index 9caf001..74e575b 100644 --- a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-application/schisandra-cloud-storage-share-application-controller/src/main/java/com/schisandra/share/application/dto/SchisandraShareUrlDTO.java +++ b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-application/schisandra-cloud-storage-share-application-controller/src/main/java/com/schisandra/share/application/dto/SchisandraShareUrlDTO.java @@ -77,5 +77,6 @@ public class SchisandraShareUrlDTO implements Serializable { */ private Integer isDeleted; + private String typeName; } diff --git a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/bo/SchisandraShareCommentReplyBO.java b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/bo/SchisandraShareCommentReplyBO.java index accc7c9..33cae3b 100644 --- a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/bo/SchisandraShareCommentReplyBO.java +++ b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/bo/SchisandraShareCommentReplyBO.java @@ -18,6 +18,11 @@ public class SchisandraShareCommentReplyBO implements Serializable { */ private String id; + /** + * 发布者id + */ + private String userId; + /** * 分享文章id */ @@ -98,5 +103,6 @@ public class SchisandraShareCommentReplyBO implements Serializable { */ private Integer isDeleted; + private String nickName; } diff --git a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/bo/SchisandraShareTagsBO.java b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/bo/SchisandraShareTagsBO.java index d456a08..99b6815 100644 --- a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/bo/SchisandraShareTagsBO.java +++ b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/bo/SchisandraShareTagsBO.java @@ -58,5 +58,6 @@ public class SchisandraShareTagsBO implements Serializable { */ private Integer isDeleted; + private String color; } diff --git a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/bo/SchisandraShareUrlBO.java b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/bo/SchisandraShareUrlBO.java index f70444a..235df19 100644 --- a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/bo/SchisandraShareUrlBO.java +++ b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/bo/SchisandraShareUrlBO.java @@ -73,5 +73,6 @@ public class SchisandraShareUrlBO implements Serializable { */ private Integer isDeleted; + private String typeName; } diff --git a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/convert/SchisandraShareCommentReplyBOConverter.java b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/convert/SchisandraShareCommentReplyBOConverter.java index cb7573d..1acd392 100644 --- a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/convert/SchisandraShareCommentReplyBOConverter.java +++ b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/convert/SchisandraShareCommentReplyBOConverter.java @@ -4,6 +4,7 @@ import com.schisandra.share.domain.bo.SchisandraShareCommentReplyBO; import com.schisandra.share.infra.basic.entity.SchisandraShareCommentReply; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; +import java.util.List; /** * 评论回复表 bo转换器 @@ -19,4 +20,5 @@ public interface SchisandraShareCommentReplyBOConverter { SchisandraShareCommentReply convertBOToEntity(SchisandraShareCommentReplyBO schisandraShareCommentReplyBO); SchisandraShareCommentReplyBO convertEntityToBO(SchisandraShareCommentReply schisandraShareCommentReply); + List convertEntityToBOList(List schisandraShareCommentReplies); } diff --git a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/service/SchisandraShareCommentReplyDomainService.java b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/service/SchisandraShareCommentReplyDomainService.java index f2cb201..91bf600 100644 --- a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/service/SchisandraShareCommentReplyDomainService.java +++ b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/service/SchisandraShareCommentReplyDomainService.java @@ -1,6 +1,7 @@ package com.schisandra.share.domain.service; import com.schisandra.share.domain.bo.SchisandraShareCommentReplyBO; +import java.util.List; /** * 评论回复表 领域service @@ -11,9 +12,14 @@ import com.schisandra.share.domain.bo.SchisandraShareCommentReplyBO; public interface SchisandraShareCommentReplyDomainService { /** - * 添加 评论回复表 信息 + * 添加 评论 信息 */ - Boolean add(SchisandraShareCommentReplyBO schisandraShareCommentReplyBO); + Boolean addComment(SchisandraShareCommentReplyBO schisandraShareCommentReplyBO); + + /** + * 添加 回复 信息 + */ + Boolean addReply(SchisandraShareCommentReplyBO schisandraShareCommentReplyBO); /** * 更新 评论回复表 信息 @@ -25,4 +31,5 @@ public interface SchisandraShareCommentReplyDomainService { */ Boolean delete(SchisandraShareCommentReplyBO schisandraShareCommentReplyBO); + List listComment(String detailId); } diff --git a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/service/impl/SchisandraShareCommentReplyDomainServiceImpl.java b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/service/impl/SchisandraShareCommentReplyDomainServiceImpl.java index 2184c44..ac65898 100644 --- a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/service/impl/SchisandraShareCommentReplyDomainServiceImpl.java +++ b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/service/impl/SchisandraShareCommentReplyDomainServiceImpl.java @@ -6,10 +6,13 @@ import com.schisandra.share.domain.bo.SchisandraShareCommentReplyBO; import com.schisandra.share.domain.service.SchisandraShareCommentReplyDomainService; import com.schisandra.share.infra.basic.entity.SchisandraShareCommentReply; import com.schisandra.share.infra.basic.service.SchisandraShareCommentReplyService; +import com.schisandra.share.infra.entity.AuthUserInfoEntity; +import com.schisandra.share.infra.rpc.UserRpc; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.List; /** * 评论回复表 领域service实现了 @@ -23,11 +26,34 @@ public class SchisandraShareCommentReplyDomainServiceImpl implements SchisandraS @Resource private SchisandraShareCommentReplyService schisandraShareCommentReplyService; + @Resource + UserRpc userRpc; @Override - public Boolean add(SchisandraShareCommentReplyBO schisandraShareCommentReplyBO) { + public Boolean addComment(SchisandraShareCommentReplyBO schisandraShareCommentReplyBO) { SchisandraShareCommentReply schisandraShareCommentReply = SchisandraShareCommentReplyBOConverter.INSTANCE.convertBOToEntity(schisandraShareCommentReplyBO); schisandraShareCommentReply.setIsDeleted(IsDeletedFlagEnum.UN_DELETED.getCode()); + schisandraShareCommentReply.setReplyType(0); + schisandraShareCommentReply.setLikes(0L); + return schisandraShareCommentReplyService.insert(schisandraShareCommentReply) > 0; + } + + @Override + public Boolean addReply(SchisandraShareCommentReplyBO schisandraShareCommentReplyBO) { + SchisandraShareCommentReply schisandraShareCommentReply = SchisandraShareCommentReplyBOConverter.INSTANCE.convertBOToEntity(schisandraShareCommentReplyBO); + schisandraShareCommentReply.setIsDeleted(IsDeletedFlagEnum.UN_DELETED.getCode()); + schisandraShareCommentReply.setReplyType(1); + schisandraShareCommentReply.setLikes(0L); + if(schisandraShareCommentReply.getToId()!=null){ + //查询to_user + SchisandraShareCommentReply comment = schisandraShareCommentReplyService.queryById(schisandraShareCommentReply.getToId()); + schisandraShareCommentReply.setToUser(comment.getUserId()); + } + if(schisandraShareCommentReply.getReplyId()!=null){ + //查询reply_user + SchisandraShareCommentReply reply = schisandraShareCommentReplyService.queryById(schisandraShareCommentReply.getReplyId()); + schisandraShareCommentReply.setReplyUser(reply.getUserId()); + } return schisandraShareCommentReplyService.insert(schisandraShareCommentReply) > 0; } @@ -45,4 +71,14 @@ public class SchisandraShareCommentReplyDomainServiceImpl implements SchisandraS return schisandraShareCommentReplyService.update(schisandraShareCommentReply) > 0; } + @Override + public List listComment(String detailId) { + List schisandraShareCommentReplies = schisandraShareCommentReplyService.listComment(detailId); + List schisandraShareCommentReplyBOS = SchisandraShareCommentReplyBOConverter.INSTANCE.convertEntityToBOList(schisandraShareCommentReplies); + schisandraShareCommentReplyBOS.forEach(schisandraShareCommentReplyBO -> { + AuthUserInfoEntity userInfo = userRpc.getUserInfo(schisandraShareCommentReplyBO.getUserId()); + schisandraShareCommentReplyBO.setNickName(userInfo.getNickName()); + }); + return schisandraShareCommentReplyBOS; + } } diff --git a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/service/impl/SchisandraShareDetailDomainServiceImpl.java b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/service/impl/SchisandraShareDetailDomainServiceImpl.java index 1cb6609..b134ab3 100644 --- a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/service/impl/SchisandraShareDetailDomainServiceImpl.java +++ b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/service/impl/SchisandraShareDetailDomainServiceImpl.java @@ -11,10 +11,9 @@ import com.schisandra.share.infra.rpc.UserRpc; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.Assert; import javax.annotation.Resource; -import javax.print.DocFlavor; -import java.util.Collections; import java.util.LinkedList; import java.util.List; import java.util.stream.Collectors; @@ -106,6 +105,7 @@ public class SchisandraShareDetailDomainServiceImpl implements SchisandraShareDe List schisandraShareUrlDetailS = schisandraShareUrlDetailService.queryByDetailId(Id); List schisandraShareUrlDetailBOS = SchisandraShareUrlDetailBOConverter.INSTANCE.convertEntityToBOList(schisandraShareUrlDetailS); + Assert.notNull(schisandraShareUrlDetailBOS.stream().map(SchisandraShareUrlDetailBO::getUrlId).collect(Collectors.toList()),"分享链接为空"); List urlIds = schisandraShareUrlDetailBOS.stream().map(SchisandraShareUrlDetailBO::getUrlId).collect(Collectors.toList()); List schisandraShareUrlS = schisandraShareUrlService.queryByIds(urlIds); diff --git a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/entity/SchisandraShareCommentReply.java b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/entity/SchisandraShareCommentReply.java index dd2ea8b..1c0d3dd 100644 --- a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/entity/SchisandraShareCommentReply.java +++ b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/entity/SchisandraShareCommentReply.java @@ -26,6 +26,11 @@ public class SchisandraShareCommentReply implements Serializable { @Id(keyType=KeyType.Generator, value= KeyGenerators.flexId) private String id; + /** + * 发布者id + */ + private String userId; + /** * 分享文章id */ @@ -122,5 +127,6 @@ public class SchisandraShareCommentReply implements Serializable { @Column("is_deleted") private Integer isDeleted; + } diff --git a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/entity/SchisandraShareTags.java b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/entity/SchisandraShareTags.java index 4df1944..4a10a80 100644 --- a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/entity/SchisandraShareTags.java +++ b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/entity/SchisandraShareTags.java @@ -74,5 +74,7 @@ public class SchisandraShareTags implements Serializable { @Column("is_deleted") private Integer isDeleted; + @Column("color") + private String color; } diff --git a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/entity/SchisandraShareUrl.java b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/entity/SchisandraShareUrl.java index c0961dc..846244d 100644 --- a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/entity/SchisandraShareUrl.java +++ b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/entity/SchisandraShareUrl.java @@ -92,5 +92,7 @@ public class SchisandraShareUrl implements Serializable { @Column("is_deleted") private Integer isDeleted; + @Column("type_name") + private String typeName; } diff --git a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/SchisandraShareCommentReplyService.java b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/SchisandraShareCommentReplyService.java index c27ef1b..52eb4a1 100644 --- a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/SchisandraShareCommentReplyService.java +++ b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/SchisandraShareCommentReplyService.java @@ -2,6 +2,7 @@ package com.schisandra.share.infra.basic.service; import com.schisandra.share.infra.basic.entity.SchisandraShareCommentReply; +import java.util.List; /** * 评论回复表 表服务接口 * @@ -42,5 +43,6 @@ public interface SchisandraShareCommentReplyService { */ boolean deleteById(String id); + List listComment(String detailId); } diff --git a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/impl/SchisandraShareCommentReplyServiceImpl.java b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/impl/SchisandraShareCommentReplyServiceImpl.java index 875f9d0..da7fb74 100644 --- a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/impl/SchisandraShareCommentReplyServiceImpl.java +++ b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/impl/SchisandraShareCommentReplyServiceImpl.java @@ -1,11 +1,14 @@ package com.schisandra.share.infra.basic.service.impl; +import com.mybatisflex.core.query.QueryWrapper; import com.schisandra.share.infra.basic.entity.SchisandraShareCommentReply; import com.schisandra.share.infra.basic.dao.SchisandraShareCommentReplyDao; +import com.schisandra.share.infra.basic.entity.table.SchisandraShareCommentReplyTableDef; import com.schisandra.share.infra.basic.service.SchisandraShareCommentReplyService; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.List; /** * 评论回复表 表服务实现类 @@ -63,5 +66,15 @@ public class SchisandraShareCommentReplyServiceImpl implements SchisandraShareCo return this.schisandraShareCommentReplyDao.deleteById(id) > 0; } + @Override + public List listComment(String detailId) { + QueryWrapper wrapper = QueryWrapper.create() + .select(SchisandraShareCommentReplyTableDef.SCHISANDRA_SHARE_COMMENT_REPLY.ALL_COLUMNS) + .from(SchisandraShareCommentReplyTableDef.SCHISANDRA_SHARE_COMMENT_REPLY) + .where(SchisandraShareCommentReplyTableDef.SCHISANDRA_SHARE_COMMENT_REPLY.DETAIL_ID.eq(detailId)) + .orderBy(SchisandraShareCommentReplyTableDef.SCHISANDRA_SHARE_COMMENT_REPLY.CREATED_TIME,false); + return this.schisandraShareCommentReplyDao.selectListByQuery(wrapper); + } + } diff --git a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-starter/src/main/java/com/schisandra/share/ShareApplication.java b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-starter/src/main/java/com/schisandra/share/ShareApplication.java index 7044f79..be10f22 100644 --- a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-starter/src/main/java/com/schisandra/share/ShareApplication.java +++ b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-starter/src/main/java/com/schisandra/share/ShareApplication.java @@ -3,6 +3,7 @@ package com.schisandra.share; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cache.annotation.EnableCaching; import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.context.annotation.ComponentScan; import org.springframework.transaction.annotation.EnableTransactionManagement; @@ -18,6 +19,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement; @MapperScan("com.schisandra.**.dao") @EnableFeignClients(basePackages = "com.schisandra") @EnableTransactionManagement +@EnableCaching public class ShareApplication { public static void main(String[] args) { SpringApplication.run(ShareApplication.class);