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:
@@ -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表所有数据
|
||||
*
|
||||
|
||||
@@ -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表所有数据
|
||||
*
|
||||
|
||||
@@ -32,4 +32,6 @@ public interface SchisandraOssAliDomainService {
|
||||
SchisandraOssAliBO getAliOssConfig(Long userId);
|
||||
|
||||
List<SchisandraOssAliBO> selectAll();
|
||||
|
||||
List<SchisandraOssAliBO> selectAllPresent(Long userId);
|
||||
}
|
||||
|
||||
@@ -35,4 +35,6 @@ public interface SchisandraOssMinioDomainService {
|
||||
List<SchisandraOssMinioBO> getAllMinioInfo();
|
||||
|
||||
List<SchisandraOssMinioBO> selectAll();
|
||||
|
||||
List<SchisandraOssMinioBO> selectAllPresent(Long userId);
|
||||
}
|
||||
|
||||
@@ -36,4 +36,6 @@ public interface SchisandraOssTencentDomainService {
|
||||
SchisandraOssTencentBO getTencentOssConfig(String id);
|
||||
|
||||
List<SchisandraOssTencentBO> selectAll();
|
||||
|
||||
List<SchisandraOssTencentBO> selectAllPresent(Long userId);
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -49,4 +49,6 @@ public interface SchisandraOssAliService {
|
||||
SchisandraOssAli getAliOssConfig(Long userId);
|
||||
|
||||
List<SchisandraOssAli> selectAll();
|
||||
|
||||
List<SchisandraOssAli> selectAllPresent(Long userId);
|
||||
}
|
||||
|
||||
@@ -52,4 +52,6 @@ public interface SchisandraOssMinioService {
|
||||
List<SchisandraOssMinio> getAllMinioInfo();
|
||||
|
||||
List<SchisandraOssMinio> selectAll();
|
||||
|
||||
List<SchisandraOssMinio> selectAllPresent(Long userId);
|
||||
}
|
||||
|
||||
@@ -58,4 +58,6 @@ public interface SchisandraOssQiniuService {
|
||||
|
||||
|
||||
List<SchisandraOssQiniu> selectAll();
|
||||
|
||||
List<SchisandraOssQiniu> selectAllPresent(Long userId);
|
||||
}
|
||||
|
||||
@@ -54,4 +54,6 @@ public interface SchisandraOssTencentService {
|
||||
SchisandraOssTencent getTencentOssConfig(String userId);
|
||||
|
||||
List<SchisandraOssTencent> selectAll();
|
||||
|
||||
List<SchisandraOssTencent> selectAllPresent(Long userId);
|
||||
}
|
||||
|
||||
@@ -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));
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
|
||||
@@ -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));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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));}
|
||||
}
|
||||
|
||||
@@ -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));
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user