From b58f128d1af590f3084d03ae056d083af3e2c04c 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: Tue, 16 Jul 2024 16:37:32 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E5=88=86?= =?UTF-8?q?=E4=BA=AB=E8=AF=A6=E7=BB=86=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SchisandraShareCircleController.java | 6 ++-- .../SchisandraShareDetailController.java | 20 +++++++++++-- .../dto/SchisandraShareDetailDTO.java | 11 +++++-- .../dto/SchisandraShareTagsDTO.java | 5 ++++ .../dto/SchisandraShareUrlDTO.java | 3 ++ .../SchisandraShareTagsBOConverter.java | 1 + .../SchisandraShareUrlBOConverter.java | 4 +++ .../SchisandraShareDetailDomainService.java | 2 ++ ...chisandraShareCircleDomainServiceImpl.java | 4 +-- ...chisandraShareDetailDomainServiceImpl.java | 29 +++++++++++++++++++ .../basic/entity/SchisandraShareCircle.java | 3 ++ .../service/SchisandraShareTagsService.java | 2 ++ .../service/SchisandraShareUrlService.java | 2 ++ .../impl/SchisandraShareTagsServiceImpl.java | 6 +++- .../impl/SchisandraShareUrlServiceImpl.java | 7 +++++ 15 files changed, 94 insertions(+), 11 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 d190414..54c25b9 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 @@ -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) { 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 04b36e1..10d1b27 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 @@ -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); 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 428021d..3b0f037 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 @@ -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 tags; - private String nickname; private String avatar; + List tags; + + List urls; + } 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 feddf60..96af7be 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 @@ -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; /** 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 c0b0f5d..73b8dac 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 @@ -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; /** diff --git a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/convert/SchisandraShareTagsBOConverter.java b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/convert/SchisandraShareTagsBOConverter.java index 1d2500d..af63c4b 100644 --- a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/convert/SchisandraShareTagsBOConverter.java +++ b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/convert/SchisandraShareTagsBOConverter.java @@ -22,4 +22,5 @@ public interface SchisandraShareTagsBOConverter { SchisandraShareTagsBO convertEntityToBO(SchisandraShareTags schisandraShareTags); List convertEntityToBOList(List schisandraShareTagList); + List convertBOToEntityList(List tagsList); } diff --git a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/convert/SchisandraShareUrlBOConverter.java b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/convert/SchisandraShareUrlBOConverter.java index f4c40c7..865493e 100644 --- a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/convert/SchisandraShareUrlBOConverter.java +++ b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/convert/SchisandraShareUrlBOConverter.java @@ -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 convertEntityToBOList(List schisandraShareUrlS); + + List convertBOToEntityList(List urlsList); } 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 0029698..76e9947 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 @@ -30,4 +30,6 @@ public interface SchisandraShareDetailDomainService { List list(Long circleId); SchisandraShareDetailBO getDetailsById(Long Id); + + Boolean addDetail(SchisandraShareDetailBO schisandraShareDetailBO); } diff --git a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/service/impl/SchisandraShareCircleDomainServiceImpl.java b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/service/impl/SchisandraShareCircleDomainServiceImpl.java index a315e58..8851d54 100644 --- a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/service/impl/SchisandraShareCircleDomainServiceImpl.java +++ b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/service/impl/SchisandraShareCircleDomainServiceImpl.java @@ -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 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()); 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 18887b4..2a453da 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 @@ -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 tags_list = schisandraShareDetailBO.getTags(); + List 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 urls_list = schisandraShareDetailBO.getUrls(); + List 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; + } + } diff --git a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/entity/SchisandraShareCircle.java b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/entity/SchisandraShareCircle.java index dd05433..13b544a 100644 --- a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/entity/SchisandraShareCircle.java +++ b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/entity/SchisandraShareCircle.java @@ -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; /** diff --git a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/SchisandraShareTagsService.java b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/SchisandraShareTagsService.java index 007fd5e..d70b220 100644 --- a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/SchisandraShareTagsService.java +++ b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/SchisandraShareTagsService.java @@ -46,4 +46,6 @@ public interface SchisandraShareTagsService { List queryByIds(List tagIds); + + int insertBatch(List schisandraShareTags); } diff --git a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/SchisandraShareUrlService.java b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/SchisandraShareUrlService.java index 4656c0f..ad362cd 100644 --- a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/SchisandraShareUrlService.java +++ b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/SchisandraShareUrlService.java @@ -46,4 +46,6 @@ public interface SchisandraShareUrlService { List queryByIds(List Ids); + + int insertBatch(List schisandraShareUrls); } diff --git a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/impl/SchisandraShareTagsServiceImpl.java b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/impl/SchisandraShareTagsServiceImpl.java index 2a4f7f8..9fa5904 100644 --- a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/impl/SchisandraShareTagsServiceImpl.java +++ b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/impl/SchisandraShareTagsServiceImpl.java @@ -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) { + return this.schisandraShareTagsDao.insertBatch(schisandraShareTags); + } + } diff --git a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/impl/SchisandraShareUrlServiceImpl.java b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/impl/SchisandraShareUrlServiceImpl.java index a253597..ff3c0e5 100644 --- a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/impl/SchisandraShareUrlServiceImpl.java +++ b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/impl/SchisandraShareUrlServiceImpl.java @@ -69,4 +69,11 @@ public class SchisandraShareUrlServiceImpl implements SchisandraShareUrlService public List queryByIds(List Ids) { return this.schisandraShareUrlDao.selectListByIds(Ids); } + + @Override + public int insertBatch(List schisandraShareUrls) { + return this.schisandraShareUrlDao.insertBatch(schisandraShareUrls); + } + + } From 6e4bbc4d51404f46cf2af849232ba0dcc8ea46d8 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: Tue, 16 Jul 2024 17:09:50 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E5=BD=93?= =?UTF-8?q?=E5=89=8D=E7=94=A8=E6=88=B7=E8=AF=A5=E5=8E=82=E5=95=86=E6=89=80?= =?UTF-8?q?=E6=9C=89=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SchisandraOssAliController.java | 16 +++++++++++++++ .../SchisandraOssMinioController.java | 19 ++++++++++++++---- .../SchisandraOssQiniuController.java | 17 ++++++++++++++++ .../SchisandraOssTencentController.java | 20 ++++++++++++++----- .../SchisandraOssAliDomainService.java | 2 ++ .../SchisandraOssMinioDomainService.java | 2 ++ .../SchisandraOssQiniuDomainService.java | 2 ++ .../SchisandraOssTencentDomainService.java | 2 ++ .../SchisandraOssAliDomainServiceImpl.java | 8 ++++++++ .../SchisandraOssMinioDomainServiceImpl.java | 8 +++++++- .../SchisandraOssQiniuDomainServiceImpl.java | 6 ++++++ ...SchisandraOssTencentDomainServiceImpl.java | 7 +++++++ .../service/SchisandraOssAliService.java | 2 ++ .../service/SchisandraOssMinioService.java | 2 ++ .../service/SchisandraOssQiniuService.java | 2 ++ .../service/SchisandraOssTencentService.java | 2 ++ .../impl/SchisandraOssAliServiceImpl.java | 8 +++++++- .../impl/SchisandraOssMinioServiceImpl.java | 4 ++++ .../impl/SchisandraOssQiniuServiceImpl.java | 2 ++ .../impl/SchisandraOssTencentServiceImpl.java | 4 ++++ 20 files changed, 124 insertions(+), 11 deletions(-) diff --git a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/controller/SchisandraOssAliController.java b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/controller/SchisandraOssAliController.java index cd50479..f3c265b 100644 --- a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/controller/SchisandraOssAliController.java +++ b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/controller/SchisandraOssAliController.java @@ -59,6 +59,22 @@ public class SchisandraOssAliController { @Resource RedisUtil redisUtil; + + /** + * 返回当前用户ali表所有数据 + * @param userId + * @return + */ + @GetMapping("return_online") + public Result returnOnline(Long userId) { + List list = schisandraOssAliDomainService.selectAllPresent(userId); + if(list.isEmpty()){ + return Result.fail(); + } + return Result.ok(SchisandraOssAliDTOConverter.INSTANCE.convertBOToDTOList(list)); + } + + /** * 返回ali表所有数据 * diff --git a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/controller/SchisandraOssMinioController.java b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/controller/SchisandraOssMinioController.java index 2c68e7c..8ceebb4 100644 --- a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/controller/SchisandraOssMinioController.java +++ b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/controller/SchisandraOssMinioController.java @@ -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 list = schisandraOssMinioDomainService.selectAllPresent(userId); + if(list.isEmpty()){ + return Result.fail(); + } + return Result.ok(SchisandraOssMinioDTOConverter.INSTANCE.convertBOToDTOList(list)); + } + + /** * 返回minio表所有数据 * diff --git a/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 b/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 index 9166a2c..c39302c 100644 --- a/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 +++ b/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 @@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSON; import com.google.common.base.Preconditions; import com.schisandra.oss.application.convert.SchisandraOssQiniuDTOConverter; import com.schisandra.oss.application.convert.SchisandraOssSftpDTOConverter; +import com.schisandra.oss.application.convert.SchisandraOssTencentDTOConverter; import com.schisandra.oss.application.dto.SchisandraOssQiniuDTO; import com.schisandra.oss.application.oss.constant.OssConstant; import com.schisandra.oss.application.oss.core.qiniu.QiNiuOssClient; @@ -15,6 +16,7 @@ import com.schisandra.oss.common.entity.Result; import com.schisandra.oss.domain.bo.SchisandraOssMinioBO; import com.schisandra.oss.domain.bo.SchisandraOssQiniuBO; import com.schisandra.oss.domain.bo.SchisandraOssSftpBO; +import com.schisandra.oss.domain.bo.SchisandraOssTencentBO; import com.schisandra.oss.domain.redis.RedisUtil; import com.schisandra.oss.domain.service.SchisandraOssQiniuDomainService; import lombok.SneakyThrows; @@ -52,6 +54,21 @@ public class SchisandraOssQiniuController { @Resource RedisUtil redisUtil; + /** + * 返回当前用户qiniu表所有数据 + * @param userId + * @return + */ + @GetMapping("return_online") + public Result returnOnline(Long userId) { + List list = schisandraOssQiniuDomainService.selectAllPresent(userId); + if(list.isEmpty()){ + return Result.fail(); + } + return Result.ok(SchisandraOssQiniuDTOConverter.INSTANCE.convertBOToDTOList(list)); + } + + /** * 返回七牛表所有数据 * diff --git a/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 b/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 index e0b5b75..c4c37ba 100644 --- a/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 +++ b/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 @@ -8,18 +8,13 @@ import com.qcloud.cos.model.CopyResult; import com.qcloud.cos.model.DeleteObjectsRequest; import com.qcloud.cos.model.DeleteObjectsResult; import com.schisandra.oss.application.convert.SchisandraOssTencentDTOConverter; -import com.schisandra.oss.application.convert.SchisandraOssUpDTOConverter; import com.schisandra.oss.application.dto.SchisandraOssTencentDTO; -import com.schisandra.oss.application.dto.SchisandraOssUpDTO; import com.schisandra.oss.application.oss.constant.OssConstant; -import com.schisandra.oss.application.oss.core.minio.MinioOssClient; import com.schisandra.oss.application.oss.core.tencent.TencentOssClient; import com.schisandra.oss.application.oss.core.tencent.TencentOssConfiguration; import com.schisandra.oss.common.entity.Result; -import com.schisandra.oss.domain.bo.SchisandraOssAliBO; import com.schisandra.oss.domain.bo.SchisandraOssTencentBO; -import com.schisandra.oss.domain.bo.SchisandraOssUpBO; import com.schisandra.oss.domain.redis.RedisUtil; import com.schisandra.oss.domain.service.SchisandraOssTencentDomainService; import io.minio.errors.*; @@ -58,6 +53,21 @@ public class SchisandraOssTencentController { @Resource private SchisandraOssTencentDomainService schisandraOssTencentDomainService; + /** + * 返回当前用户tencent表所有数据 + * @param userId + * @return + */ + @GetMapping("return_online") + public Result returnOnline(Long userId) { + List list = schisandraOssTencentDomainService.selectAllPresent(userId); + if(list.isEmpty()){ + return Result.fail(); + } + return Result.ok(SchisandraOssTencentDTOConverter.INSTANCE.convertBOToDTOList(list)); + } + + /** * 返回tencent表所有数据 * diff --git a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-domain/src/main/java/com/schisandra/oss/domain/service/SchisandraOssAliDomainService.java b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-domain/src/main/java/com/schisandra/oss/domain/service/SchisandraOssAliDomainService.java index ffaedf5..2f50d01 100644 --- a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-domain/src/main/java/com/schisandra/oss/domain/service/SchisandraOssAliDomainService.java +++ b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-domain/src/main/java/com/schisandra/oss/domain/service/SchisandraOssAliDomainService.java @@ -32,4 +32,6 @@ public interface SchisandraOssAliDomainService { SchisandraOssAliBO getAliOssConfig(Long userId); List selectAll(); + + List selectAllPresent(Long userId); } diff --git a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-domain/src/main/java/com/schisandra/oss/domain/service/SchisandraOssMinioDomainService.java b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-domain/src/main/java/com/schisandra/oss/domain/service/SchisandraOssMinioDomainService.java index f0cca08..51ef94a 100644 --- a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-domain/src/main/java/com/schisandra/oss/domain/service/SchisandraOssMinioDomainService.java +++ b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-domain/src/main/java/com/schisandra/oss/domain/service/SchisandraOssMinioDomainService.java @@ -35,4 +35,6 @@ public interface SchisandraOssMinioDomainService { List getAllMinioInfo(); List selectAll(); + + List selectAllPresent(Long userId); } diff --git a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-domain/src/main/java/com/schisandra/oss/domain/service/SchisandraOssQiniuDomainService.java b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-domain/src/main/java/com/schisandra/oss/domain/service/SchisandraOssQiniuDomainService.java index f4613e6..fe5a6d3 100644 --- a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-domain/src/main/java/com/schisandra/oss/domain/service/SchisandraOssQiniuDomainService.java +++ b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-domain/src/main/java/com/schisandra/oss/domain/service/SchisandraOssQiniuDomainService.java @@ -36,4 +36,6 @@ public interface SchisandraOssQiniuDomainService { SchisandraOssQiniuBO getQiniuOssConfig(String userId); List selectAll(); + + List selectAllPresent(Long userId); } diff --git a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-domain/src/main/java/com/schisandra/oss/domain/service/SchisandraOssTencentDomainService.java b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-domain/src/main/java/com/schisandra/oss/domain/service/SchisandraOssTencentDomainService.java index 1b74b34..754ca6f 100644 --- a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-domain/src/main/java/com/schisandra/oss/domain/service/SchisandraOssTencentDomainService.java +++ b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-domain/src/main/java/com/schisandra/oss/domain/service/SchisandraOssTencentDomainService.java @@ -36,4 +36,6 @@ public interface SchisandraOssTencentDomainService { SchisandraOssTencentBO getTencentOssConfig(String id); List selectAll(); + + List selectAllPresent(Long userId); } diff --git a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-domain/src/main/java/com/schisandra/oss/domain/service/impl/SchisandraOssAliDomainServiceImpl.java b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-domain/src/main/java/com/schisandra/oss/domain/service/impl/SchisandraOssAliDomainServiceImpl.java index 9e5f5ef..c1d5ff9 100644 --- a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-domain/src/main/java/com/schisandra/oss/domain/service/impl/SchisandraOssAliDomainServiceImpl.java +++ b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-domain/src/main/java/com/schisandra/oss/domain/service/impl/SchisandraOssAliDomainServiceImpl.java @@ -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 list = schisandraOssAliService.selectAll(); return SchisandraOssAliBOConverter.INSTANCE.convertEntityToBOList(list); } + + @Override + public List selectAllPresent(Long userId) { + List schisandraOssAlis = schisandraOssAliService.selectAllPresent(userId); + return SchisandraOssAliBOConverter.INSTANCE.convertEntityToBOList(schisandraOssAlis); + } + } diff --git a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-domain/src/main/java/com/schisandra/oss/domain/service/impl/SchisandraOssMinioDomainServiceImpl.java b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-domain/src/main/java/com/schisandra/oss/domain/service/impl/SchisandraOssMinioDomainServiceImpl.java index 6d522ab..5a9d3e2 100644 --- a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-domain/src/main/java/com/schisandra/oss/domain/service/impl/SchisandraOssMinioDomainServiceImpl.java +++ b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-domain/src/main/java/com/schisandra/oss/domain/service/impl/SchisandraOssMinioDomainServiceImpl.java @@ -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 selectAllPresent(Long userId) { + List list = schisandraOssMinioService.selectAllPresent(userId); + return SchisandraOssMinioBOConverter.INSTANCE.convertEntityToBOList(list); + } + + } diff --git a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-domain/src/main/java/com/schisandra/oss/domain/service/impl/SchisandraOssQiniuDomainServiceImpl.java b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-domain/src/main/java/com/schisandra/oss/domain/service/impl/SchisandraOssQiniuDomainServiceImpl.java index a328a71..10bc774 100644 --- a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-domain/src/main/java/com/schisandra/oss/domain/service/impl/SchisandraOssQiniuDomainServiceImpl.java +++ b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-domain/src/main/java/com/schisandra/oss/domain/service/impl/SchisandraOssQiniuDomainServiceImpl.java @@ -87,4 +87,10 @@ public class SchisandraOssQiniuDomainServiceImpl implements SchisandraOssQiniuDo List list = schisandraOssQiniuService.selectAll(); return SchisandraOssQiniuBOConverter.INSTANCE.convertEntityToBOList(list); } + + @Override + public List selectAllPresent(Long userId){ + List list = schisandraOssQiniuService.selectAllPresent(userId); + return SchisandraOssQiniuBOConverter.INSTANCE.convertEntityToBOList(list); + } } diff --git a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-domain/src/main/java/com/schisandra/oss/domain/service/impl/SchisandraOssTencentDomainServiceImpl.java b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-domain/src/main/java/com/schisandra/oss/domain/service/impl/SchisandraOssTencentDomainServiceImpl.java index faee0aa..610ef6d 100644 --- a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-domain/src/main/java/com/schisandra/oss/domain/service/impl/SchisandraOssTencentDomainServiceImpl.java +++ b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-domain/src/main/java/com/schisandra/oss/domain/service/impl/SchisandraOssTencentDomainServiceImpl.java @@ -86,4 +86,11 @@ public class SchisandraOssTencentDomainServiceImpl implements SchisandraOssTence List list = schisandraOssTencentService.selectAll(); return SchisandraOssTencentBOConverter.INSTANCE.convertEntityToBOList(list); } + + @Override + public List selectAllPresent(Long userId){ + List list = schisandraOssTencentService.selectAllPresent(userId); + return SchisandraOssTencentBOConverter.INSTANCE.convertEntityToBOList(list); + } + } diff --git a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-infra/src/main/java/com/schisandra/oss/infra/basic/service/SchisandraOssAliService.java b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-infra/src/main/java/com/schisandra/oss/infra/basic/service/SchisandraOssAliService.java index 131222f..afb8d8b 100644 --- a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-infra/src/main/java/com/schisandra/oss/infra/basic/service/SchisandraOssAliService.java +++ b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-infra/src/main/java/com/schisandra/oss/infra/basic/service/SchisandraOssAliService.java @@ -49,4 +49,6 @@ public interface SchisandraOssAliService { SchisandraOssAli getAliOssConfig(Long userId); List selectAll(); + + List selectAllPresent(Long userId); } diff --git a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-infra/src/main/java/com/schisandra/oss/infra/basic/service/SchisandraOssMinioService.java b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-infra/src/main/java/com/schisandra/oss/infra/basic/service/SchisandraOssMinioService.java index 067249d..9ceb4b7 100644 --- a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-infra/src/main/java/com/schisandra/oss/infra/basic/service/SchisandraOssMinioService.java +++ b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-infra/src/main/java/com/schisandra/oss/infra/basic/service/SchisandraOssMinioService.java @@ -52,4 +52,6 @@ public interface SchisandraOssMinioService { List getAllMinioInfo(); List selectAll(); + + List selectAllPresent(Long userId); } diff --git a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-infra/src/main/java/com/schisandra/oss/infra/basic/service/SchisandraOssQiniuService.java b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-infra/src/main/java/com/schisandra/oss/infra/basic/service/SchisandraOssQiniuService.java index 2ab6684..9aad490 100644 --- a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-infra/src/main/java/com/schisandra/oss/infra/basic/service/SchisandraOssQiniuService.java +++ b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-infra/src/main/java/com/schisandra/oss/infra/basic/service/SchisandraOssQiniuService.java @@ -56,4 +56,6 @@ public interface SchisandraOssQiniuService { List selectAll(); + + List selectAllPresent(Long userId); } diff --git a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-infra/src/main/java/com/schisandra/oss/infra/basic/service/SchisandraOssTencentService.java b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-infra/src/main/java/com/schisandra/oss/infra/basic/service/SchisandraOssTencentService.java index 1b68f1f..7fef6de 100644 --- a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-infra/src/main/java/com/schisandra/oss/infra/basic/service/SchisandraOssTencentService.java +++ b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-infra/src/main/java/com/schisandra/oss/infra/basic/service/SchisandraOssTencentService.java @@ -54,4 +54,6 @@ public interface SchisandraOssTencentService { SchisandraOssTencent getTencentOssConfig(String userId); List selectAll(); + + List selectAllPresent(Long userId); } diff --git a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-infra/src/main/java/com/schisandra/oss/infra/basic/service/impl/SchisandraOssAliServiceImpl.java b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-infra/src/main/java/com/schisandra/oss/infra/basic/service/impl/SchisandraOssAliServiceImpl.java index aec69c5..aa17557 100644 --- a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-infra/src/main/java/com/schisandra/oss/infra/basic/service/impl/SchisandraOssAliServiceImpl.java +++ b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-infra/src/main/java/com/schisandra/oss/infra/basic/service/impl/SchisandraOssAliServiceImpl.java @@ -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 selectAll(){return schisandraOssAliDao.selectAll();} + public List selectAll(){return this.schisandraOssAliDao.selectAll();} + + @Override + public List selectAllPresent(Long userId) { + return this.schisandraOssAliDao.selectListByCondition(SchisandraOssAliTableDef.SCHISANDRA_OSS_ALI.USER_ID.eq(userId)); + } /** diff --git a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-infra/src/main/java/com/schisandra/oss/infra/basic/service/impl/SchisandraOssMinioServiceImpl.java b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-infra/src/main/java/com/schisandra/oss/infra/basic/service/impl/SchisandraOssMinioServiceImpl.java index b1ce840..718324a 100644 --- a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-infra/src/main/java/com/schisandra/oss/infra/basic/service/impl/SchisandraOssMinioServiceImpl.java +++ b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-infra/src/main/java/com/schisandra/oss/infra/basic/service/impl/SchisandraOssMinioServiceImpl.java @@ -93,4 +93,8 @@ public class SchisandraOssMinioServiceImpl implements SchisandraOssMinioService @Override public List selectAll(){return schisandraOssMinioDao.selectAll();} + + public List selectAllPresent(Long userId){ + return schisandraOssMinioDao.selectListByCondition(SchisandraOssMinioTableDef.SCHISANDRA_OSS_MINIO.USER_ID.eq(userId)); + } } diff --git a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-infra/src/main/java/com/schisandra/oss/infra/basic/service/impl/SchisandraOssQiniuServiceImpl.java b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-infra/src/main/java/com/schisandra/oss/infra/basic/service/impl/SchisandraOssQiniuServiceImpl.java index 2014e4a..7c3d905 100644 --- a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-infra/src/main/java/com/schisandra/oss/infra/basic/service/impl/SchisandraOssQiniuServiceImpl.java +++ b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-infra/src/main/java/com/schisandra/oss/infra/basic/service/impl/SchisandraOssQiniuServiceImpl.java @@ -72,4 +72,6 @@ public class SchisandraOssQiniuServiceImpl implements SchisandraOssQiniuService @Override public List selectAll() {return this.schisandraOssQiniuDao.selectAll();} + + public List selectAllPresent(Long userId) {return this.schisandraOssQiniuDao.selectListByCondition(SchisandraOssQiniuTableDef.SCHISANDRA_OSS_QINIU.USER_ID.eq(userId));} } diff --git a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-infra/src/main/java/com/schisandra/oss/infra/basic/service/impl/SchisandraOssTencentServiceImpl.java b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-infra/src/main/java/com/schisandra/oss/infra/basic/service/impl/SchisandraOssTencentServiceImpl.java index f365216..96e0c8a 100644 --- a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-infra/src/main/java/com/schisandra/oss/infra/basic/service/impl/SchisandraOssTencentServiceImpl.java +++ b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-infra/src/main/java/com/schisandra/oss/infra/basic/service/impl/SchisandraOssTencentServiceImpl.java @@ -73,4 +73,8 @@ public class SchisandraOssTencentServiceImpl implements SchisandraOssTencentServ @Override public List selectAll(){return this.schisandraOssTencentDao.selectAll();} + + public List selectAllPresent(Long userId){ + return this.schisandraOssTencentDao.selectListByCondition(SchisandraOssTencentTableDef.SCHISANDRA_OSS_TENCENT.USER_ID.eq(userId)); + } }