diff --git a/kicc-common/kicc-common-seata/README.md b/kicc-common/kicc-common-seata/README.md index 49153052..e26b7cdc 100644 --- a/kicc-common/kicc-common-seata/README.md +++ b/kicc-common/kicc-common-seata/README.md @@ -253,4 +253,4 @@ } ``` -- 未发现用feign拦截器进行request插入参数 XID的配置；对于请求的XID如何传递，暂时未看到源码。 \ No newline at end of file +- 未发现用feign拦截器进行request插入参数 XID的配置；对于请求的XID如何传递，暂时未看到源码。 diff --git a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/File.java b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/OssFile.java similarity index 96% rename from kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/File.java rename to kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/OssFile.java index 1ad95f56..8e788bcd 100644 --- a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/File.java +++ b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/OssFile.java @@ -19,7 +19,7 @@ import lombok.experimental.Accessors; @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) @TableName(value = "sys_file", excludeProperty = { "remarks" }) -public class File extends CommonEntity { +public class OssFile extends CommonEntity { private static final long serialVersionUID = 1L; diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/FileController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/FileController.java index 23cd5334..49fe8364 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/FileController.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/FileController.java @@ -10,7 +10,7 @@ import com.cloud.kicc.common.core.api.R; import com.cloud.kicc.common.core.constant.AppConstants; import com.cloud.kicc.common.log.annotation.SysLog; import com.cloud.kicc.common.security.annotation.Inner; -import com.cloud.kicc.system.api.entity.File; +import com.cloud.kicc.system.api.entity.OssFile; import com.cloud.kicc.system.api.entity.Role; import com.cloud.kicc.system.service.FileService; import io.swagger.annotations.Api; @@ -41,23 +41,23 @@ public class FileController { private final FileService fileService; - private LambdaQueryWrapper getQueryWrapper(File file) { - return new LambdaQueryWrapper() - .like(StrUtil.isNotBlank(file.getFileName()), File::getFileName, file.getFileName()) - .orderByDesc(File::getCreateTime); + private LambdaQueryWrapper getQueryWrapper(OssFile ossFile) { + return new LambdaQueryWrapper() + .like(StrUtil.isNotBlank(ossFile.getFileName()), OssFile::getFileName, ossFile.getFileName()) + .orderByDesc(OssFile::getCreateTime); } @GetMapping("/list") @ApiOperation(value = "分页查询", notes = "分页查询") - public R list(Page page, File file) { - IPage fileIPage = fileService.page(page, getQueryWrapper(file)); + public R list(Page page, OssFile ossFile) { + IPage fileIPage = fileService.page(page, getQueryWrapper(ossFile)); return R.ok(fileIPage.getRecords(), fileIPage.getTotal()); } @PostMapping("/upload") - public File upload(@RequestPart("file") MultipartFile file, - @RequestParam(value = "ossFile", required=false) String ossFile) { - return fileService.uploadFile(file, Optional.ofNullable(ossFile).map(item -> JSONUtil.parseObj(ossFile).toBean(File.class)).orElse(null)); + public OssFile upload(@RequestPart("file") MultipartFile file, + @RequestParam(value = "ossFile", required=false) String ossFile) { + return fileService.uploadFile(file, Optional.ofNullable(ossFile).map(item -> JSONUtil.parseObj(ossFile).toBean(OssFile.class)).orElse(null)); } diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/FileMapper.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/FileMapper.java index af1ae624..3e0e1e09 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/FileMapper.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/FileMapper.java @@ -1,7 +1,7 @@ package com.cloud.kicc.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cloud.kicc.system.api.entity.File; +import com.cloud.kicc.system.api.entity.OssFile; /** *

@@ -11,6 +11,6 @@ import com.cloud.kicc.system.api.entity.File; * @Author: wangxiang4 * @Date: 2022/2/24 */ -public interface FileMapper extends BaseMapper { +public interface FileMapper extends BaseMapper { } diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/FileService.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/FileService.java index d2f62604..1f976957 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/FileService.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/FileService.java @@ -1,12 +1,10 @@ package com.cloud.kicc.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.cloud.kicc.system.api.entity.File; -import com.cloud.kicc.common.core.api.R; +import com.cloud.kicc.system.api.entity.OssFile; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; -import java.util.Map; /** *

@@ -16,14 +14,14 @@ import java.util.Map; * @Author: wangxiang4 * @Date: 2022/2/24 */ -public interface FileService extends IService { +public interface FileService extends IService { /** * 上传文件 * @param file * @return */ - File uploadFile(MultipartFile file, File ossFile); + OssFile uploadFile(MultipartFile file, OssFile ossFile); /** * 读取文件 diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/FileServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/FileServiceImpl.java index 89cc04cc..ca64b190 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/FileServiceImpl.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/FileServiceImpl.java @@ -10,10 +10,9 @@ import cn.hutool.core.util.StrUtil; import com.amazonaws.services.s3.model.S3Object; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.cloud.kicc.common.core.exception.CheckedException; -import com.cloud.kicc.system.api.entity.File; +import com.cloud.kicc.system.api.entity.OssFile; import com.cloud.kicc.system.mapper.FileMapper; import com.cloud.kicc.system.service.FileService; -import com.cloud.kicc.common.core.api.R; import com.pig4cloud.plugin.oss.OssProperties; import com.pig4cloud.plugin.oss.service.OssTemplate; import lombok.AllArgsConstructor; @@ -24,8 +23,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; -import java.util.HashMap; -import java.util.Map; + /** *

* 文件管理 @@ -37,30 +35,30 @@ import java.util.Map; @Slf4j @Service @AllArgsConstructor -public class FileServiceImpl extends ServiceImpl implements FileService { +public class FileServiceImpl extends ServiceImpl implements FileService { private final OssProperties ossProperties; private final OssTemplate ossTemplate; @Override - public File uploadFile(MultipartFile file, File ossFile) { + public OssFile uploadFile(MultipartFile file, OssFile ossFile) { String fileName = IdUtil.simpleUUID() + StrUtil.DOT + FileUtil.extName(file.getOriginalFilename()); - File defaultOssFile = new File().setFileName(fileName) + OssFile defaultOssOssFile = new OssFile().setFileName(fileName) .setBucketName(ossProperties.getBucketName()) .setOriginal(file.getOriginalFilename()) .setType(FileUtil.extName(file.getOriginalFilename())) .setFileSize(file.getSize()) .setAvailablePath(String.format("/system_proxy/system/file/getFile/%s/%s", ossProperties.getBucketName(), fileName)) .setMimeType(file.getContentType()); - if(ObjectUtil.isNotEmpty(ossFile)) BeanUtil.copyProperties(ossFile, defaultOssFile, CopyOptions.create().ignoreNullValue().ignoreError()); + if(ObjectUtil.isNotEmpty(ossFile)) BeanUtil.copyProperties(ossFile, defaultOssOssFile, CopyOptions.create().ignoreNullValue().ignoreError()); try { ossTemplate.putObject(ossProperties.getBucketName(), fileName, file.getContentType(), file.getInputStream()); // 文件管理数据记录,收集管理追踪文件 - this.save(defaultOssFile); + this.save(defaultOssOssFile); } catch (Exception e) { throw new CheckedException("上传失败"); } - return defaultOssFile; + return defaultOssOssFile; } @Override @@ -77,9 +75,9 @@ public class FileServiceImpl extends ServiceImpl implements Fi @SneakyThrows @Transactional(rollbackFor = Exception.class) public void deleteFile(String id) { - File file = this.getById(id); - if (ObjectUtil.isNotEmpty(file)) { - ossTemplate.removeObject(ossProperties.getBucketName(), file.getFileName()); + OssFile ossFile = this.getById(id); + if (ObjectUtil.isNotEmpty(ossFile)) { + ossTemplate.removeObject(ossProperties.getBucketName(), ossFile.getFileName()); this.removeById(id); } } diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/ImContentServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/ImContentServiceImpl.java index 640baec8..b34bcded 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/ImContentServiceImpl.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/ImContentServiceImpl.java @@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.cloud.kicc.common.core.exception.CheckedException; import com.cloud.kicc.common.security.util.SecurityUtils; import com.cloud.kicc.system.api.entity.ImContent; +import com.cloud.kicc.system.api.entity.OssFile; import com.cloud.kicc.system.api.enums.ImMessageTypeEnum; import com.cloud.kicc.system.mapper.ImContentMapper; import com.cloud.kicc.system.service.FileService; @@ -76,7 +77,7 @@ public class ImContentServiceImpl extends ServiceImpl