Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/controller/SchisandraOssQiniuController.java
#	schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/controller/SchisandraOssTencentController.java
#	schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-domain/src/main/java/com/schisandra/oss/domain/service/SchisandraOssQiniuDomainService.java
#	schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-domain/src/main/java/com/schisandra/oss/domain/service/impl/SchisandraOssQiniuDomainServiceImpl.java
This commit is contained in:
zlg
2024-07-16 18:56:42 +08:00
31 changed files with 178 additions and 17 deletions

View File

@@ -59,6 +59,22 @@ public class SchisandraOssAliController {
@Resource
RedisUtil redisUtil;
/**
* 返回当前用户ali表所有数据
* @param userId
* @return
*/
@GetMapping("return_online")
public Result returnOnline(Long userId) {
List<SchisandraOssAliBO> list = schisandraOssAliDomainService.selectAllPresent(userId);
if(list.isEmpty()){
return Result.fail();
}
return Result.ok(SchisandraOssAliDTOConverter.INSTANCE.convertBOToDTOList(list));
}
/**
* 返回ali表所有数据
*

View File

@@ -9,7 +9,6 @@ import com.schisandra.oss.application.dto.SchisandraOssMinioDTO;
import com.schisandra.oss.application.oss.constant.OssConstant;
import com.schisandra.oss.application.oss.core.minio.MinioOssClient;
import com.schisandra.oss.application.oss.core.minio.MinioOssConfiguration;
import com.schisandra.oss.application.oss.model.OssInfo;
import com.schisandra.oss.common.entity.Result;
import com.schisandra.oss.domain.bo.SchisandraOssMinioBO;
import com.schisandra.oss.domain.redis.RedisUtil;
@@ -17,7 +16,6 @@ import com.schisandra.oss.domain.service.SchisandraOssMinioDomainService;
import io.minio.errors.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.cache.annotation.CacheEvict;
import org.springframework.cache.annotation.CachePut;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.cache.annotation.Caching;
import org.springframework.util.StreamUtils;
@@ -27,8 +25,6 @@ import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
import java.io.BufferedInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.net.URLEncoder;
@@ -63,6 +59,21 @@ public class SchisandraOssMinioController {
RedisUtil redisUtil;
/**
* 返回当前用户minio表所有数据
* @param userId
* @return
*/
@GetMapping("return_online")
public Result returnOnline(Long userId) {
List<SchisandraOssMinioBO> list = schisandraOssMinioDomainService.selectAllPresent(userId);
if(list.isEmpty()){
return Result.fail();
}
return Result.ok(SchisandraOssMinioDTOConverter.INSTANCE.convertBOToDTOList(list));
}
/**
* 返回minio表所有数据
*

View File

@@ -32,4 +32,6 @@ public interface SchisandraOssAliDomainService {
SchisandraOssAliBO getAliOssConfig(Long userId);
List<SchisandraOssAliBO> selectAll();
List<SchisandraOssAliBO> selectAllPresent(Long userId);
}

View File

@@ -35,4 +35,6 @@ public interface SchisandraOssMinioDomainService {
List<SchisandraOssMinioBO> getAllMinioInfo();
List<SchisandraOssMinioBO> selectAll();
List<SchisandraOssMinioBO> selectAllPresent(Long userId);
}

View File

@@ -36,4 +36,6 @@ public interface SchisandraOssTencentDomainService {
SchisandraOssTencentBO getTencentOssConfig(String id);
List<SchisandraOssTencentBO> selectAll();
List<SchisandraOssTencentBO> selectAllPresent(Long userId);
}

View File

@@ -18,6 +18,7 @@ import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
import java.util.List;
@@ -84,4 +85,11 @@ public class SchisandraOssAliDomainServiceImpl implements SchisandraOssAliDomain
List<SchisandraOssAli> list = schisandraOssAliService.selectAll();
return SchisandraOssAliBOConverter.INSTANCE.convertEntityToBOList(list);
}
@Override
public List<SchisandraOssAliBO> selectAllPresent(Long userId) {
List<SchisandraOssAli> schisandraOssAlis = schisandraOssAliService.selectAllPresent(userId);
return SchisandraOssAliBOConverter.INSTANCE.convertEntityToBOList(schisandraOssAlis);
}
}

View File

@@ -18,7 +18,6 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -99,4 +98,11 @@ public class SchisandraOssMinioDomainServiceImpl implements SchisandraOssMinioDo
return SchisandraOssMinioBOConverter.INSTANCE.convertEntityToBOList(list);
}
@Override
public List<SchisandraOssMinioBO> selectAllPresent(Long userId) {
List<SchisandraOssMinio> list = schisandraOssMinioService.selectAllPresent(userId);
return SchisandraOssMinioBOConverter.INSTANCE.convertEntityToBOList(list);
}
}

View File

@@ -86,4 +86,11 @@ public class SchisandraOssTencentDomainServiceImpl implements SchisandraOssTence
List<SchisandraOssTencent> list = schisandraOssTencentService.selectAll();
return SchisandraOssTencentBOConverter.INSTANCE.convertEntityToBOList(list);
}
@Override
public List<SchisandraOssTencentBO> selectAllPresent(Long userId){
List<SchisandraOssTencent> list = schisandraOssTencentService.selectAllPresent(userId);
return SchisandraOssTencentBOConverter.INSTANCE.convertEntityToBOList(list);
}
}

View File

@@ -49,4 +49,6 @@ public interface SchisandraOssAliService {
SchisandraOssAli getAliOssConfig(Long userId);
List<SchisandraOssAli> selectAll();
List<SchisandraOssAli> selectAllPresent(Long userId);
}

View File

@@ -52,4 +52,6 @@ public interface SchisandraOssMinioService {
List<SchisandraOssMinio> getAllMinioInfo();
List<SchisandraOssMinio> selectAll();
List<SchisandraOssMinio> selectAllPresent(Long userId);
}

View File

@@ -58,4 +58,6 @@ public interface SchisandraOssQiniuService {
List<SchisandraOssQiniu> selectAll();
List<SchisandraOssQiniu> selectAllPresent(Long userId);
}

View File

@@ -54,4 +54,6 @@ public interface SchisandraOssTencentService {
SchisandraOssTencent getTencentOssConfig(String userId);
List<SchisandraOssTencent> selectAll();
List<SchisandraOssTencent> selectAllPresent(Long userId);
}

View File

@@ -7,6 +7,7 @@ import com.schisandra.oss.infra.basic.service.SchisandraOssAliService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.Collections;
import java.util.List;
/**
@@ -26,7 +27,12 @@ public class SchisandraOssAliServiceImpl implements SchisandraOssAliService {
* @return
*/
@Override
public List<SchisandraOssAli> selectAll(){return schisandraOssAliDao.selectAll();}
public List<SchisandraOssAli> selectAll(){return this.schisandraOssAliDao.selectAll();}
@Override
public List<SchisandraOssAli> selectAllPresent(Long userId) {
return this.schisandraOssAliDao.selectListByCondition(SchisandraOssAliTableDef.SCHISANDRA_OSS_ALI.USER_ID.eq(userId));
}
/**

View File

@@ -93,4 +93,8 @@ public class SchisandraOssMinioServiceImpl implements SchisandraOssMinioService
@Override
public List<SchisandraOssMinio> selectAll(){return schisandraOssMinioDao.selectAll();}
public List<SchisandraOssMinio> selectAllPresent(Long userId){
return schisandraOssMinioDao.selectListByCondition(SchisandraOssMinioTableDef.SCHISANDRA_OSS_MINIO.USER_ID.eq(userId));
}
}

View File

@@ -77,4 +77,6 @@ public class SchisandraOssQiniuServiceImpl implements SchisandraOssQiniuService
@Override
public List<SchisandraOssQiniu> selectAll() {return this.schisandraOssQiniuDao.selectAll();}
public List<SchisandraOssQiniu> selectAllPresent(Long userId) {return this.schisandraOssQiniuDao.selectListByCondition(SchisandraOssQiniuTableDef.SCHISANDRA_OSS_QINIU.USER_ID.eq(userId));}
}

View File

@@ -73,4 +73,8 @@ public class SchisandraOssTencentServiceImpl implements SchisandraOssTencentServ
@Override
public List<SchisandraOssTencent> selectAll(){return this.schisandraOssTencentDao.selectAll();}
public List<SchisandraOssTencent> selectAllPresent(Long userId){
return this.schisandraOssTencentDao.selectListByCondition(SchisandraOssTencentTableDef.SCHISANDRA_OSS_TENCENT.USER_ID.eq(userId));
}
}

View File

@@ -35,9 +35,9 @@ public class SchisandraShareCircleController {
if (log.isInfoEnabled()) {
log.info("SchisandraShareCircleController.add.dto:{}", JSON.toJSONString(schisandraShareCircleDTO));
}
Preconditions.checkNotNull(schisandraShareCircleDTO.getName(), "不能为空");
Preconditions.checkNotNull(schisandraShareCircleDTO.getIcon(), "不能为空");
Preconditions.checkNotNull(schisandraShareCircleDTO.getDescription(), "不能为空");
Preconditions.checkNotNull(schisandraShareCircleDTO.getName(), "名称不能为空");
Preconditions.checkNotNull(schisandraShareCircleDTO.getIcon(), "图标不能为空");
Preconditions.checkNotNull(schisandraShareCircleDTO.getDescription(), "描述不能为空");
SchisandraShareCircleBO SchisandraShareCircleBO = SchisandraShareCircleDTOConverter.INSTANCE.convertDTOToBO(schisandraShareCircleDTO);
return Result.ok(schisandraShareCircleDomainService.add(SchisandraShareCircleBO));
} catch (Exception e) {

View File

@@ -27,11 +27,25 @@ public class SchisandraShareDetailController {
@Resource
private SchisandraShareDetailDomainService schisandraShareDetailDomainService;
/**
*查询详细信息
* 新增分享详细信息
* @param schisandraShareDetailDTO
* @return
*/
@PostMapping("add_detail")
public Result addDetail(@RequestBody SchisandraShareDetailDTO schisandraShareDetailDTO) {
Preconditions.checkNotNull(schisandraShareDetailDTO.getTitle(),"标题不能为空");
Preconditions.checkNotNull(schisandraShareDetailDTO.getIcon(),"图标不能为空");
Preconditions.checkNotNull(schisandraShareDetailDTO.getDescription(),"摘要不能为空");
SchisandraShareDetailBO schisandraShareDetailBO = SchisandraShareDetailDTOConverter.INSTANCE.convertDTOToBO(schisandraShareDetailDTO);
return Result.ok(schisandraShareDetailDomainService.addDetail(schisandraShareDetailBO));
}
/**
* 查询分享详细信息
*/
@PostMapping("get_detail")
public Result selectDetail(@RequestParam("Id") Long Id){
SchisandraShareDetailBO resultList = schisandraShareDetailDomainService.getDetailsById(Id);

View File

@@ -1,5 +1,7 @@
package com.schisandra.share.application.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.schisandra.share.domain.bo.SchisandraShareUrlBO;
import lombok.Data;
import java.io.Serializable;
@@ -78,6 +80,8 @@ public class SchisandraShareDetailDTO implements Serializable {
/**
* 创建时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
private Date createdTime;
/**
@@ -88,6 +92,7 @@ public class SchisandraShareDetailDTO implements Serializable {
/**
* 更新时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
private Date updateTime;
/**
@@ -95,11 +100,13 @@ public class SchisandraShareDetailDTO implements Serializable {
*/
private Integer isDeleted;
List<SchisandraShareTagsDTO> tags;
private String nickname;
private String avatar;
List<SchisandraShareTagsDTO> tags;
List<SchisandraShareUrlDTO> urls;
}

View File

@@ -1,5 +1,6 @@
package com.schisandra.share.application.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.io.Serializable;
@@ -42,6 +43,8 @@ public class SchisandraShareTagsDTO implements Serializable {
/**
* 创建时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
private Date createdTime;
/**
@@ -52,6 +55,8 @@ public class SchisandraShareTagsDTO implements Serializable {
/**
* 更新时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
private Date updateTime;
/**

View File

@@ -1,5 +1,6 @@
package com.schisandra.share.application.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.io.Serializable;
@@ -57,6 +58,7 @@ public class SchisandraShareUrlDTO implements Serializable {
/**
* 创建时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
private Date createdTime;
/**
@@ -67,6 +69,7 @@ public class SchisandraShareUrlDTO implements Serializable {
/**
* 更新时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
private Date updateTime;
/**

View File

@@ -22,4 +22,5 @@ public interface SchisandraShareTagsBOConverter {
SchisandraShareTagsBO convertEntityToBO(SchisandraShareTags schisandraShareTags);
List<SchisandraShareTagsBO> convertEntityToBOList(List<SchisandraShareTags> schisandraShareTagList);
List<SchisandraShareTags> convertBOToEntityList(List<SchisandraShareTagsBO> tagsList);
}

View File

@@ -1,6 +1,8 @@
package com.schisandra.share.domain.convert;
import com.schisandra.share.domain.bo.SchisandraShareTagsBO;
import com.schisandra.share.domain.bo.SchisandraShareUrlBO;
import com.schisandra.share.infra.basic.entity.SchisandraShareTags;
import com.schisandra.share.infra.basic.entity.SchisandraShareUrl;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;
@@ -22,4 +24,6 @@ public interface SchisandraShareUrlBOConverter {
SchisandraShareUrlBO convertEntityToBO(SchisandraShareUrl schisandraShareUrl);
List<SchisandraShareUrlBO> convertEntityToBOList(List<SchisandraShareUrl> schisandraShareUrlS);
List<SchisandraShareUrl> convertBOToEntityList(List<SchisandraShareUrlBO> urlsList);
}

View File

@@ -30,4 +30,6 @@ public interface SchisandraShareDetailDomainService {
List<SchisandraShareDetailBO> list(Long circleId);
SchisandraShareDetailBO getDetailsById(Long Id);
Boolean addDetail(SchisandraShareDetailBO schisandraShareDetailBO);
}

View File

@@ -29,7 +29,7 @@ public class SchisandraShareCircleDomainServiceImpl implements SchisandraShareCi
private SchisandraShareCircleService schisandraShareCircleService;
@Resource
UserRpc userInfoRpc;
UserRpc userRpc;
@Override
public Boolean add(SchisandraShareCircleBO schisandraShareCircleBO) {
@@ -63,7 +63,7 @@ public class SchisandraShareCircleDomainServiceImpl implements SchisandraShareCi
ArrayList<SchisandraShareCircleBO> arrayList = new ArrayList<>();
for (SchisandraShareCircleBO schisandraShareCircleBO : schisandraShareCircleBO_list) {
SchisandraShareCircleBO shareCircleBO = new SchisandraShareCircleBO();
AuthUserInfoEntity info = userInfoRpc.getUserInfo(schisandraShareCircleBO.getUserId());
AuthUserInfoEntity info = userRpc.getUserInfo(schisandraShareCircleBO.getUserId());
shareCircleBO.setUserId(schisandraShareCircleBO.getUserId());
shareCircleBO.setParentId(schisandraShareCircleBO.getParentId());
shareCircleBO.setId(schisandraShareCircleBO.getId());

View File

@@ -121,4 +121,33 @@ public class SchisandraShareDetailDomainServiceImpl implements SchisandraShareDe
return schisandraShareDetailBO;
}
@Override
public Boolean addDetail(SchisandraShareDetailBO schisandraShareDetailBO) {
SchisandraShareDetail schisandraShareDetail = SchisandraShareDetailBOConverter.INSTANCE.convertBOToEntity(schisandraShareDetailBO);
int insert = schisandraShareDetailService.insert(schisandraShareDetail);
List<SchisandraShareTagsBO> tags_list = schisandraShareDetailBO.getTags();
List<SchisandraShareTags> tags = SchisandraShareTagsBOConverter.INSTANCE.convertBOToEntityList(tags_list);
schisandraShareTagsService.insertBatch(tags);
for (SchisandraShareTags tag : tags) {
SchisandraShareDetailTag schisandraShareDetailTag = new SchisandraShareDetailTag();
schisandraShareDetailTag.setTagId(tag.getId());
schisandraShareDetailTag.setDetailId(schisandraShareDetail.getId());
schisandraShareDetailTagService.insert(schisandraShareDetailTag);
}
List<SchisandraShareUrlBO> urls_list = schisandraShareDetailBO.getUrls();
List<SchisandraShareUrl> urls = SchisandraShareUrlBOConverter.INSTANCE.convertBOToEntityList(urls_list);
schisandraShareUrlService.insertBatch(urls);
for (SchisandraShareUrl url : urls) {
SchisandraShareUrlDetail schisandraShareUrlDetail = new SchisandraShareUrlDetail();
schisandraShareUrlDetail.setUrlId(url.getId());
schisandraShareUrlDetail.setDetailId(schisandraShareDetail.getId());
schisandraShareUrlDetailService.insert(schisandraShareUrlDetail);
}
return insert>0;
}
}

View File

@@ -1,5 +1,6 @@
package com.schisandra.share.infra.basic.entity;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.mybatisflex.annotation.Column;
import com.mybatisflex.annotation.Id;
import com.mybatisflex.annotation.KeyType;
@@ -84,6 +85,7 @@ public class SchisandraShareCircle implements Serializable {
* 创建时间
*/
@Column("created_time")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
private Date createdTime;
/**
@@ -96,6 +98,7 @@ public class SchisandraShareCircle implements Serializable {
* 更新时间
*/
@Column("update_time")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
private Date updateTime;
/**

View File

@@ -46,4 +46,6 @@ public interface SchisandraShareTagsService {
List<SchisandraShareTags> queryByIds(List<Long> tagIds);
int insertBatch(List<SchisandraShareTags> schisandraShareTags);
}

View File

@@ -46,4 +46,6 @@ public interface SchisandraShareUrlService {
List<SchisandraShareUrl> queryByIds(List<Long> Ids);
int insertBatch(List<SchisandraShareUrl> schisandraShareUrls);
}

View File

@@ -16,7 +16,6 @@ import java.util.List;
*/
@Service("SchisandraShareTagsService")
public class SchisandraShareTagsServiceImpl implements SchisandraShareTagsService {
@Resource
private SchisandraShareTagsDao schisandraShareTagsDao;
@@ -69,5 +68,10 @@ public class SchisandraShareTagsServiceImpl implements SchisandraShareTagsServic
return this.schisandraShareTagsDao.selectListByIds(tagIds);
}
@Override
public int insertBatch(List<SchisandraShareTags> schisandraShareTags) {
return this.schisandraShareTagsDao.insertBatch(schisandraShareTags);
}
}

View File

@@ -69,4 +69,11 @@ public class SchisandraShareUrlServiceImpl implements SchisandraShareUrlService
public List<SchisandraShareUrl> queryByIds(List<Long> Ids) {
return this.schisandraShareUrlDao.selectListByIds(Ids);
}
@Override
public int insertBatch(List<SchisandraShareUrl> schisandraShareUrls) {
return this.schisandraShareUrlDao.insertBatch(schisandraShareUrls);
}
}