From 872845de23cea8e76568a2df5901d8d36c900c7b 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: Sat, 20 Jul 2024 17:21:01 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=EF=BC=8C=E5=88=A4=E6=96=AD=E8=AF=84=E8=AE=BA?= =?UTF-8?q?=E3=80=81=E6=96=87=E7=AB=A0=E6=98=AF=E5=90=A6=E8=A2=AB=E7=82=B9?= =?UTF-8?q?=E8=B5=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SchisandraAuthUserController.java | 11 ++++++ .../SchisandraAuthUserDomainServiceImpl.java | 3 +- ...SchisandraShareCommentReplyController.java | 12 +++---- .../SchisandraShareDetailController.java | 4 +-- .../SchisandraUserFavoritesController.java | 9 ----- .../dto/SchisandraShareCommentReplyDTO.java | 4 +-- .../dto/SchisandraShareDetailDTO.java | 2 ++ .../pom.xml | 5 +++ .../bo/SchisandraShareCommentReplyBO.java | 4 +-- .../domain/bo/SchisandraShareDetailBO.java | 2 ++ ...isandraShareCommentReplyDomainService.java | 10 +++--- .../SchisandraShareDetailDomainService.java | 2 +- ...draShareCommentReplyDomainServiceImpl.java | 35 +++++++++++++++---- ...chisandraShareDetailDomainServiceImpl.java | 9 ++++- .../SchisandraUserLikesCommentService.java | 2 +- ...SchisandraUserLikesCommentServiceImpl.java | 11 ++++++ 16 files changed, 86 insertions(+), 39 deletions(-) diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/controller/SchisandraAuthUserController.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/controller/SchisandraAuthUserController.java index a387354..715ad78 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/controller/SchisandraAuthUserController.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/controller/SchisandraAuthUserController.java @@ -418,5 +418,16 @@ public class SchisandraAuthUserController { return Result.ok(schisandraAuthUserDTOList); } + /** + * 用户设置安全信息 + * @param schisandraAuthUserDTO + * @return + */ + @PostMapping("update") + public Result update(@RequestBody SchisandraAuthUserDTO schisandraAuthUserDTO){ + SchisandraAuthUserBO schisandraAuthUserBO = SchisandraAuthUserDTOConverter.INSTANCE.convertDTOToBO(schisandraAuthUserDTO); + return Result.ok(schisandraAuthUserDomainService.update(schisandraAuthUserBO)); + } + } diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/impl/SchisandraAuthUserDomainServiceImpl.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/impl/SchisandraAuthUserDomainServiceImpl.java index 37b4049..2c391b8 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/impl/SchisandraAuthUserDomainServiceImpl.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/impl/SchisandraAuthUserDomainServiceImpl.java @@ -168,7 +168,7 @@ public class SchisandraAuthUserDomainServiceImpl implements SchisandraAuthUserDo * @date 2024/3/21 23:14 */ @Override - public Object update(SchisandraAuthUserBO schisandraAuthUserBO) { + public Boolean update(SchisandraAuthUserBO schisandraAuthUserBO) { SchisandraAuthUser schisandraAuthUser = SchisandraAuthUserBOConverter.INSTANCE.convertBOToEntity(schisandraAuthUserBO); Integer count = schisandraAuthUserService.update(schisandraAuthUser); return count > 0; @@ -529,5 +529,4 @@ public class SchisandraAuthUserDomainServiceImpl implements SchisandraAuthUserDo String permissionKey = redisUtil.buildKey(AUTH_PERMISSION_PREFIX, String.valueOf(authUserId)); redisUtil.set(permissionKey, new Gson().toJson(permissionList)); } - } 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 b7ca817..877c9d7 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 @@ -117,9 +117,9 @@ public class SchisandraShareCommentReplyController { * @return */ @GetMapping(value = "listreply") - public Result listReply(@RequestParam String commentId) { + public Result listReply(@RequestParam String commentId,@RequestParam String userId) { try { - List result = schisandraShareCommentReplyDomainService.listReply(commentId); + List result = schisandraShareCommentReplyDomainService.listReply(commentId,userId); if (log.isInfoEnabled()) { log.info("获取评论回复{}", JSON.toJSONString(result)); } @@ -137,14 +137,14 @@ public class SchisandraShareCommentReplyController { * 查询该动态下的评论 */ @GetMapping(value = "listcomment") - public Result> listComment(@RequestParam String detailId) { + public Result> listComment(@RequestParam String detailId,@RequestParam String userId) { try { List result = (List) caffeineUtil .caffeineBuild().getIfPresent("listcomment" + detailId); if (result != null) { return Result.ok(result); } - result = schisandraShareCommentReplyDomainService.listComment(detailId); + result = schisandraShareCommentReplyDomainService.listComment(detailId,userId); caffeineUtil.caffeineBuild().put("listcomment" + detailId, result); if (log.isInfoEnabled()) { log.info("获取当前文章评论内容{}", JSON.toJSONString(result)); @@ -163,14 +163,14 @@ public class SchisandraShareCommentReplyController { * 查询该动态下的评论(最热) */ @GetMapping(value = "listcommenthot") - public Result> listCommentHot(@RequestParam String detailId) { + public Result> listCommentHot(@RequestParam String detailId,@RequestParam String userId) { try { List result = (List) caffeineUtil .caffeineBuild().getIfPresent("listcomment" + detailId); if (result != null) { return Result.ok(result); } - result = schisandraShareCommentReplyDomainService.listCommenthot(detailId); + result = schisandraShareCommentReplyDomainService.listCommenthot(detailId,userId); caffeineUtil.caffeineBuild().put("listcommenthot" + detailId, result); if (log.isInfoEnabled()) { log.info("获取当前文章评论内容{}", JSON.toJSONString(result)); 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 d3af656..a228440 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 @@ -212,11 +212,11 @@ public class SchisandraShareDetailController { * @date: 2024/7/15 下午7:09 */ @PostMapping("list") - public Result> selectCircleList(@RequestParam("circleId") String circleId) { + public Result> selectCircleList(@RequestParam("circleId") String circleId,String userId) { List result = (List) caffeineUtil .caffeineBuild().getIfPresent("list" + circleId); if (result == null) { - result = schisandraShareDetailDomainService.list(circleId); + result = schisandraShareDetailDomainService.list(circleId,userId); caffeineUtil.caffeineBuild().put("list" + circleId, result); return Result.ok(SchisandraShareDetailDTOConverter.INSTANCE.convertBOToDTOList(result)); } 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/SchisandraUserFavoritesController.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/SchisandraUserFavoritesController.java index f4c21ac..adbcd6f 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/SchisandraUserFavoritesController.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/SchisandraUserFavoritesController.java @@ -120,15 +120,6 @@ public class SchisandraUserFavoritesController { log.info("SchisandraUserFavoritesController.delete.dto:{}", JSON.toJSONString(schisandraUserFavoritesDTO)); } Preconditions.checkNotNull(schisandraUserFavoritesDTO.getId(), "不能为空"); - Preconditions.checkNotNull(schisandraUserFavoritesDTO.getUserId(), "不能为空"); - Preconditions.checkNotNull(schisandraUserFavoritesDTO.getDetailId(), "不能为空"); - Preconditions.checkNotNull(schisandraUserFavoritesDTO.getCircleId(), "不能为空"); - Preconditions.checkNotNull(schisandraUserFavoritesDTO.getExtJson(), "不能为空"); - Preconditions.checkNotNull(schisandraUserFavoritesDTO.getCreatedBy(), "创建人不能为空"); - Preconditions.checkNotNull(schisandraUserFavoritesDTO.getCreatedTime(), "创建时间不能为空"); - Preconditions.checkNotNull(schisandraUserFavoritesDTO.getUpdateBy(), "更新人不能为空"); - Preconditions.checkNotNull(schisandraUserFavoritesDTO.getUpdateTime(), "更新时间不能为空"); - Preconditions.checkNotNull(schisandraUserFavoritesDTO.getIsDeleted(), "不能为空"); SchisandraUserFavoritesBO schisandraUserFavoritesBO = SchisandraUserFavoritesDTOConverter.INSTANCE.convertDTOToBO(schisandraUserFavoritesDTO); return Result.ok(schisandraUserFavoritesDomainService.delete(schisandraUserFavoritesBO)); } catch (Exception e) { 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 28ccc2a..a67cea1 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 @@ -118,8 +118,6 @@ public class SchisandraShareCommentReplyDTO implements Serializable { private String avatar; - private Boolean isShowReply = false; - - private Boolean isShow = false; + private Boolean isLike; } 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/SchisandraShareDetailDTO.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/SchisandraShareDetailDTO.java index 267f90f..79afc84 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/SchisandraShareDetailDTO.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/SchisandraShareDetailDTO.java @@ -104,6 +104,8 @@ public class SchisandraShareDetailDTO implements Serializable { private String avatar; + private Boolean isLike; + List tags; List urls; diff --git a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/pom.xml b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/pom.xml index d69f3d1..4b82e31 100644 --- a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/pom.xml +++ b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/pom.xml @@ -60,6 +60,11 @@ + + com.jd.platform + schisandra-cloud-storage-asyncTool + 1.4.1-SNAPSHOT + com.schisandra.share schisandra-cloud-storage-share-infra 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 b38331f..4cca212 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 @@ -114,8 +114,6 @@ public class SchisandraShareCommentReplyBO implements Serializable { private String avatar; - private Boolean isShowReply = false; - - private Boolean isShow = false; + private Boolean isLike; } diff --git a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/bo/SchisandraShareDetailBO.java b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/bo/SchisandraShareDetailBO.java index ab3b352..44ae93e 100644 --- a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/bo/SchisandraShareDetailBO.java +++ b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/bo/SchisandraShareDetailBO.java @@ -103,5 +103,7 @@ public class SchisandraShareDetailBO implements Serializable { List urls; + private Boolean isLike; + } 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 f98b025..cc48242 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; /** @@ -31,14 +32,15 @@ public interface SchisandraShareCommentReplyDomainService { */ Boolean delete(SchisandraShareCommentReplyBO schisandraShareCommentReplyBO); - List listComment(String detailId); + List listComment(String detailId, String userId); - List listCommenthot(String detailId); + List listCommenthot(String detailId, String userId); - List listReply(String commentId); + List listReply(String commentId,String userId); Long returnLike(String Id); - Boolean updateCommentsLikes(String Id,Boolean isLike); + Boolean updateCommentsLikes(String Id, Boolean isLike); + Long returnCount(String detailId); } diff --git a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/service/SchisandraShareDetailDomainService.java b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/service/SchisandraShareDetailDomainService.java index 299478e..5d516fa 100644 --- a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/service/SchisandraShareDetailDomainService.java +++ b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/service/SchisandraShareDetailDomainService.java @@ -27,7 +27,7 @@ public interface SchisandraShareDetailDomainService { */ Boolean delete(SchisandraShareDetailBO schisandraShareDetailBO); - List list(String circleId); + List list(String circleId,String userId); SchisandraShareDetailBO getDetailsById(String Id); 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 0b0a1c5..1082ab5 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 @@ -1,11 +1,14 @@ package com.schisandra.share.domain.service.impl; +import com.jd.platform.async.wrapper.WorkerWrapper; import com.schisandra.share.common.enums.IsDeletedFlagEnum; import com.schisandra.share.domain.convert.SchisandraShareCommentReplyBOConverter; 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.entity.SchisandraUserLikesComment; import com.schisandra.share.infra.basic.service.SchisandraShareCommentReplyService; +import com.schisandra.share.infra.basic.service.SchisandraUserLikesCommentService; import com.schisandra.share.infra.entity.AuthUserInfoEntity; import com.schisandra.share.infra.rpc.UserRpc; import lombok.extern.slf4j.Slf4j; @@ -13,6 +16,7 @@ import org.springframework.stereotype.Service; import org.springframework.util.Assert; import javax.annotation.Resource; +import java.util.ArrayList; import java.util.List; /** @@ -29,6 +33,8 @@ public class SchisandraShareCommentReplyDomainServiceImpl implements SchisandraS private SchisandraShareCommentReplyService schisandraShareCommentReplyService; @Resource UserRpc userRpc; + @Resource + private SchisandraUserLikesCommentService schisandraUserLikesCommentService; @Override public Boolean addComment(SchisandraShareCommentReplyBO schisandraShareCommentReplyBO) { @@ -81,10 +87,15 @@ public class SchisandraShareCommentReplyDomainServiceImpl implements SchisandraS } @Override - public List listComment(String detailId) { + public List listComment(String detailId, String userId) { List schisandraShareComments = schisandraShareCommentReplyService.listComment(detailId); List schisandraShareCommentBOS = SchisandraShareCommentReplyBOConverter.INSTANCE.convertEntityToBOList(schisandraShareComments); schisandraShareCommentBOS.forEach(schisandraShareCommentReplyBO -> { + SchisandraUserLikesComment schisandraUserLikesComment = + schisandraUserLikesCommentService.queryByuserIdAndDetailId(schisandraShareCommentReplyBO.getId(), userId); + if(schisandraUserLikesComment!=null){ + schisandraShareCommentReplyBO.setIsLike(true); + } AuthUserInfoEntity userInfo = userRpc.getUserInfo(schisandraShareCommentReplyBO.getUserId()); schisandraShareCommentReplyBO.setNick(userInfo.getNickName()); schisandraShareCommentReplyBO.setAvatar(userInfo.getAvatar()); @@ -93,10 +104,15 @@ public class SchisandraShareCommentReplyDomainServiceImpl implements SchisandraS } @Override - public List listCommenthot(String detailId) { + public List listCommenthot(String detailId,String userId) { List schisandraShareComments = schisandraShareCommentReplyService.listCommenthot(detailId); List schisandraShareCommentBOS = SchisandraShareCommentReplyBOConverter.INSTANCE.convertEntityToBOList(schisandraShareComments); schisandraShareCommentBOS.forEach(schisandraShareCommentReplyBO -> { + SchisandraUserLikesComment schisandraUserLikesComment = + schisandraUserLikesCommentService.queryByuserIdAndDetailId(schisandraShareCommentReplyBO.getId(), userId); + if(schisandraUserLikesComment!=null){ + schisandraShareCommentReplyBO.setIsLike(true); + } AuthUserInfoEntity userInfo = userRpc.getUserInfo(schisandraShareCommentReplyBO.getUserId()); schisandraShareCommentReplyBO.setNick(userInfo.getNickName()); schisandraShareCommentReplyBO.setAvatar(userInfo.getAvatar()); @@ -105,13 +121,18 @@ public class SchisandraShareCommentReplyDomainServiceImpl implements SchisandraS } @Override - public List listReply(String commentId) { + public List listReply(String commentId,String userId) { List schisandraShareReplies = schisandraShareCommentReplyService.listReply(commentId); List schisandraShareRepliesBO = SchisandraShareCommentReplyBOConverter.INSTANCE.convertEntityToBOList(schisandraShareReplies); schisandraShareRepliesBO.forEach(schisandraShareReplyBO -> { + SchisandraUserLikesComment schisandraUserLikesComment = + schisandraUserLikesCommentService.queryByuserIdAndDetailId(schisandraShareReplyBO.getId(), userId); + if(schisandraUserLikesComment!=null){ + schisandraShareReplyBO.setIsLike(true); + } AuthUserInfoEntity userInfo = userRpc.getUserInfo(schisandraShareReplyBO.getUserId()); - if(schisandraShareReplyBO.getReplyUser()!=null){ + if (schisandraShareReplyBO.getReplyUser() != null) { AuthUserInfoEntity userInfo2 = userRpc.getUserInfo(schisandraShareReplyBO.getReplyUser()); schisandraShareReplyBO.setNickto(userInfo2.getNickName()); } @@ -131,9 +152,9 @@ public class SchisandraShareCommentReplyDomainServiceImpl implements SchisandraS @Override public Boolean updateCommentsLikes(String Id, Boolean isLike) { if (isLike) { - return schisandraShareCommentReplyService.addLike(Id)>0; - }else { - return schisandraShareCommentReplyService.delLike(Id)>0; + return schisandraShareCommentReplyService.addLike(Id) > 0; + } else { + return schisandraShareCommentReplyService.delLike(Id) > 0; } } 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 bdfcf38..bc5c6ab 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 @@ -40,6 +40,8 @@ public class SchisandraShareDetailDomainServiceImpl implements SchisandraShareDe private SchisandraShareUrlDetailService schisandraShareUrlDetailService; @Resource private SchisandraShareUrlService schisandraShareUrlService; + @Resource + SchisandraUserLikesCommentService schisandraUserLikesCommentService; @Override public Boolean add(SchisandraShareDetailBO schisandraShareDetailBO) { @@ -64,13 +66,18 @@ public class SchisandraShareDetailDomainServiceImpl implements SchisandraShareDe @Transactional @Override - public List list(String circleId) { + public List list(String circleId,String userId) { List schisandraShareDetails = schisandraShareDetailService.queryByCircleId(circleId); List shareDetailBOList = SchisandraShareDetailBOConverter.INSTANCE.convertEntityToBOList(schisandraShareDetails); LinkedList resultList = new LinkedList<>(); shareDetailBOList.forEach(shareDetailBO -> { AuthUserInfoEntity userInfo = userRpc.getUserInfo(shareDetailBO.getUserId()); SchisandraShareDetailBO schisandraShareDetailBO = new SchisandraShareDetailBO(); + SchisandraUserLikesComment schisandraUserLikesComment = + schisandraUserLikesCommentService.queryByuserIdAndDetailId(shareDetailBO.getId(), userId); + if(schisandraUserLikesComment!=null){ + schisandraShareDetailBO.setIsLike(true); + } schisandraShareDetailBO.setCircleId(shareDetailBO.getCircleId()); schisandraShareDetailBO.setIcon(shareDetailBO.getIcon()); schisandraShareDetailBO.setDescription(shareDetailBO.getDescription()); diff --git a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/SchisandraUserLikesCommentService.java b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/SchisandraUserLikesCommentService.java index 9d79834..7cf906f 100644 --- a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/SchisandraUserLikesCommentService.java +++ b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/SchisandraUserLikesCommentService.java @@ -42,5 +42,5 @@ public interface SchisandraUserLikesCommentService { */ boolean deleteById(Long id); - + SchisandraUserLikesComment queryByuserIdAndDetailId(String commentId, String userId); } diff --git a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/impl/SchisandraUserLikesCommentServiceImpl.java b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/impl/SchisandraUserLikesCommentServiceImpl.java index 26feb33..8e85ce2 100644 --- a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/impl/SchisandraUserLikesCommentServiceImpl.java +++ b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/impl/SchisandraUserLikesCommentServiceImpl.java @@ -1,7 +1,9 @@ package com.schisandra.share.infra.basic.service.impl; +import com.mybatisflex.core.query.QueryWrapper; import com.schisandra.share.infra.basic.entity.SchisandraUserLikesComment; import com.schisandra.share.infra.basic.dao.SchisandraUserLikesCommentDao; +import com.schisandra.share.infra.basic.entity.table.SchisandraUserLikesCommentTableDef; import com.schisandra.share.infra.basic.service.SchisandraUserLikesCommentService; import org.springframework.stereotype.Service; @@ -63,5 +65,14 @@ public class SchisandraUserLikesCommentServiceImpl implements SchisandraUserLike return this.schisandraUserLikesCommentDao.deleteById(id) > 0; } + @Override + public SchisandraUserLikesComment queryByuserIdAndDetailId(String commentId, String userId) { + QueryWrapper queryWrapper = QueryWrapper.create() + .select(SchisandraUserLikesCommentTableDef.SCHISANDRA_USER_LIKES_COMMENT.ID) + .where(SchisandraUserLikesCommentTableDef.SCHISANDRA_USER_LIKES_COMMENT.COMMENT_ID.eq(commentId)) + .where(SchisandraUserLikesCommentTableDef.SCHISANDRA_USER_LIKES_COMMENT.USER_ID.eq(userId)); + return this.schisandraUserLikesCommentDao.selectOneByQuery(queryWrapper); + } + }