Merge remote-tracking branch 'refs/remotes/origin/dev'
This commit is contained in:
@@ -5,6 +5,7 @@ import cn.hutool.extra.spring.SpringUtil;
|
||||
import com.alibaba.fastjson.JSON;
|
||||
import com.google.common.base.Preconditions;
|
||||
import com.schisandra.oss.application.convert.SchisandraOssQiniuDTOConverter;
|
||||
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;
|
||||
@@ -13,6 +14,7 @@ import com.schisandra.oss.application.oss.exception.OssException;
|
||||
import com.schisandra.oss.application.oss.model.OssInfo;
|
||||
import com.schisandra.oss.common.entity.Result;
|
||||
import com.schisandra.oss.domain.bo.SchisandraOssQiniuBO;
|
||||
import com.schisandra.oss.domain.bo.SchisandraOssTencentBO;
|
||||
import com.schisandra.oss.domain.redis.RedisUtil;
|
||||
import com.schisandra.oss.domain.service.SchisandraOssQiniuDomainService;
|
||||
import lombok.SneakyThrows;
|
||||
@@ -54,6 +56,21 @@ public class SchisandraOssQiniuController {
|
||||
@Resource
|
||||
private QiNiuOssConfiguration qiNiuOssConfiguration;
|
||||
|
||||
/**
|
||||
* 返回当前用户tencent表所有数据
|
||||
* @param userId
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("return_online")
|
||||
public Result returnOnline(Long userId) {
|
||||
List<SchisandraOssQiniuBO> list = schisandraOssQiniuDomainService.selectAllPresent(userId);
|
||||
if(list.isEmpty()){
|
||||
return Result.fail();
|
||||
}
|
||||
return Result.ok(SchisandraOssQiniuDTOConverter.INSTANCE.convertBOToDTOList(list));
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 返回七牛表所有数据
|
||||
*
|
||||
|
@@ -39,5 +39,6 @@ public interface SchisandraOssQiniuDomainService {
|
||||
|
||||
SchisandraOssQiniuBO getEndpointByuserIdAndBucket(Long id,String bucket);
|
||||
|
||||
List<SchisandraOssQiniuBO> selectAllPresent(Long userId);
|
||||
|
||||
}
|
||||
|
@@ -94,4 +94,11 @@ public class SchisandraOssQiniuDomainServiceImpl implements SchisandraOssQiniuDo
|
||||
SchisandraOssQiniuBO schisandraOssQiniuBO = SchisandraOssQiniuBOConverter.INSTANCE.convertEntityToBO(schisandraOssQiniu);
|
||||
return schisandraOssQiniuBO;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public List<SchisandraOssQiniuBO> selectAllPresent(Long useId){
|
||||
List<SchisandraOssQiniu> list = schisandraOssQiniuService.selectAllPresent(useId);
|
||||
return SchisandraOssQiniuBOConverter.INSTANCE.convertEntityToBOList(list);
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user