Schisandra-Cloud-Storage/schisandra-cloud-storage
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/dev'

Browse Source
This commit is contained in:
landaiqing
2024-07-20 17:36:33 +08:00
parent 67f0fb2b9a 872845de23
commit c85b345eaf
16 changed files with 86 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
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
View File

@@ -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));
}
}

3
schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/impl/SchisandraAuthUserDomainServiceImpl.java
View File

@@ -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));
}
}

12
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
View File

@@ -117,9 +117,9 @@ public class SchisandraShareCommentReplyController {
* @return
*/
@GetMapping(value = "listreply")
public Result<SchisandraShareCommentReplyDTO> listReply(@RequestParam String commentId) {
public Result<SchisandraShareCommentReplyDTO> listReply(@RequestParam String commentId,@RequestParam String userId) {
try {
List<SchisandraShareCommentReplyBO> result = schisandraShareCommentReplyDomainService.listReply(commentId);
List<SchisandraShareCommentReplyBO> 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<List<SchisandraShareCommentReplyDTO>> listComment(@RequestParam String detailId) {
public Result<List<SchisandraShareCommentReplyDTO>> listComment(@RequestParam String detailId,@RequestParam String userId) {
try {
List<SchisandraShareCommentReplyBO> result = (List<SchisandraShareCommentReplyBO>) 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<List<SchisandraShareCommentReplyDTO>> listCommentHot(@RequestParam String detailId) {
public Result<List<SchisandraShareCommentReplyDTO>> listCommentHot(@RequestParam String detailId,@RequestParam String userId) {
try {
List<SchisandraShareCommentReplyBO> result = (List<SchisandraShareCommentReplyBO>) 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));

4
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
View File

@@ -212,11 +212,11 @@ public class SchisandraShareDetailController {
* @date: 2024/7/15 下午7:09
*/
@PostMapping("list")
public Result<List<SchisandraShareDetailDTO>> selectCircleList(@RequestParam("circleId") String circleId) {
public Result<List<SchisandraShareDetailDTO>> selectCircleList(@RequestParam("circleId") String circleId,String userId) {
List<SchisandraShareDetailBO> result = (List<SchisandraShareDetailBO>) 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));
}

9
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
View File

@@ -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) {

4
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
View File

@@ -118,8 +118,6 @@ public class SchisandraShareCommentReplyDTO implements Serializable {
private String avatar;
private Boolean isShowReply = false;
private Boolean isShow = false;
private Boolean isLike;
}

2
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
View File

@@ -104,6 +104,8 @@ public class SchisandraShareDetailDTO implements Serializable {
private String avatar;
private Boolean isLike;
List<SchisandraShareTagsDTO> tags;
List<SchisandraShareUrlDTO> urls;

5
schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/pom.xml
View File

@@ -60,6 +60,11 @@
</properties>
<dependencies>
<dependency>
<groupId>com.jd.platform</groupId>
<artifactId>schisandra-cloud-storage-asyncTool</artifactId>
<version>1.4.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.schisandra.share</groupId>
<artifactId>schisandra-cloud-storage-share-infra</artifactId>

4
schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/bo/SchisandraShareCommentReplyBO.java
View File

@@ -114,8 +114,6 @@ public class SchisandraShareCommentReplyBO implements Serializable {
private String avatar;
private Boolean isShowReply = false;
private Boolean isShow = false;
private Boolean isLike;
}

2
schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/bo/SchisandraShareDetailBO.java
View File

@@ -103,5 +103,7 @@ public class SchisandraShareDetailBO implements Serializable {
List<SchisandraShareUrlBO> urls;
private Boolean isLike;
}

10
schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/service/SchisandraShareCommentReplyDomainService.java
View File

@@ -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<SchisandraShareCommentReplyBO> listComment(String detailId);
List<SchisandraShareCommentReplyBO> listComment(String detailId, String userId);
List<SchisandraShareCommentReplyBO> listCommenthot(String detailId);
List<SchisandraShareCommentReplyBO> listCommenthot(String detailId, String userId);
List<SchisandraShareCommentReplyBO> listReply(String commentId);
List<SchisandraShareCommentReplyBO> 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);
}

2
schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/service/SchisandraShareDetailDomainService.java
View File

@@ -27,7 +27,7 @@ public interface SchisandraShareDetailDomainService {
*/
Boolean delete(SchisandraShareDetailBO schisandraShareDetailBO);
List<SchisandraShareDetailBO> list(String circleId);
List<SchisandraShareDetailBO> list(String circleId,String userId);
SchisandraShareDetailBO getDetailsById(String Id);

35
schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/service/impl/SchisandraShareCommentReplyDomainServiceImpl.java
View File

@@ -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<SchisandraShareCommentReplyBO> listComment(String detailId) {
public List<SchisandraShareCommentReplyBO> listComment(String detailId, String userId) {
List<SchisandraShareCommentReply> schisandraShareComments = schisandraShareCommentReplyService.listComment(detailId);
List<SchisandraShareCommentReplyBO> 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<SchisandraShareCommentReplyBO> listCommenthot(String detailId) {
public List<SchisandraShareCommentReplyBO> listCommenthot(String detailId,String userId) {
List<SchisandraShareCommentReply> schisandraShareComments = schisandraShareCommentReplyService.listCommenthot(detailId);
List<SchisandraShareCommentReplyBO> 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<SchisandraShareCommentReplyBO> listReply(String commentId) {
public List<SchisandraShareCommentReplyBO> listReply(String commentId,String userId) {
List<SchisandraShareCommentReply> schisandraShareReplies = schisandraShareCommentReplyService.listReply(commentId);
List<SchisandraShareCommentReplyBO> 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;
}
}

9
schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/service/impl/SchisandraShareDetailDomainServiceImpl.java
View File

@@ -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<SchisandraShareDetailBO> list(String circleId) {
public List<SchisandraShareDetailBO> list(String circleId,String userId) {
List<SchisandraShareDetail> schisandraShareDetails = schisandraShareDetailService.queryByCircleId(circleId);
List<SchisandraShareDetailBO> shareDetailBOList = SchisandraShareDetailBOConverter.INSTANCE.convertEntityToBOList(schisandraShareDetails);
LinkedList<SchisandraShareDetailBO> 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());

2
schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/SchisandraUserLikesCommentService.java
View File

@@ -42,5 +42,5 @@ public interface SchisandraUserLikesCommentService {
*/
boolean deleteById(Long id);
SchisandraUserLikesComment queryByuserIdAndDetailId(String commentId, String userId);
}

11
schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/impl/SchisandraUserLikesCommentServiceImpl.java
View File

@@ -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);
}
}