修改oss-file代码

sckw-modules/sckw-file/src/main/java/com/sckw/file/controller/FileApiController.java

@@ -36,8 +36,13 @@ public class FileApiController {
      */
     @RequestMapping(value = "/fileUpload", method = RequestMethod.POST)
     public HttpResult fileUpload(@RequestParam("file") MultipartFile file) {
-        //获取上传文件
-        return fileService.uploadFile(file);
+        try {
+            //获取上传文件
+            return fileService.uploadFile(file);
+        } catch (Exception e) {
+            log.error("文件上传失败:{}",e.getMessage(),e);
+            throw new RuntimeException(e);
+        }
 
     }
 

sckw-modules/sckw-file/src/main/java/com/sckw/file/model/FileInfo.java

@@ -1,11 +1,9 @@
 package com.sckw.file.model;
 
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
+import com.sckw.core.model.base.BaseModel;
+import lombok.Data;
 
 import java.math.BigDecimal;
-import java.time.LocalDateTime;
 
 /**
  * @author lfdc
@@ -15,11 +13,9 @@ import java.time.LocalDateTime;
  * @company sckw
  * @date 2023-06-08 15:06:24
  */
-@Getter
-@Setter
-@ToString
-//@Data
-public class FileInfo /**extends BaseModel*/ {
+
+@Data
+public class FileInfo extends BaseModel {
 
     private static final long serialVersionUID = 8295075842951977226L;
 
@@ -64,26 +60,26 @@ public class FileInfo /**extends BaseModel*/ {
     /**
      * 状态:0正常/1锁定
      */
-    private String status = "0";
+//    private String status = "0";
     /**
      * 创建人
      */
-    private String createBy;
+//    private String createBy;
     /**
      * 创建时间
      */
-    private LocalDateTime createTime;
+//    private LocalDateTime createTime;
     /**
      * 更新人
      */
-    private String updateBy;
+//    private String updateBy;
     /**
      * 更新时间
      */
-    private LocalDateTime updateTime;
+//    private LocalDateTime updateTime;
     /**
      * 删除标识(0正常/1删除)
      */
-    private Integer delFlag = 0;
+//    private Integer delFlag = 0;
 
 }

sckw-modules/sckw-file/src/main/java/com/sckw/file/service/FileService.java

@@ -22,7 +22,6 @@ import org.springframework.web.context.request.ServletRequestAttributes;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.math.BigDecimal;
-import java.time.LocalDateTime;
 import java.util.*;
 
 
@@ -54,7 +53,7 @@ public class FileService {
         boolean isEmpty = file.isEmpty();
         if (isEmpty) {
             result.setCode(HttpStatus.GLOBAL_EXCEPTION_CODE);
-            result.setMsg("上传请选择文件");
+            result.setMsg("上传请不要选择空文件");
             return result;
         }
         //获取文件类型
@@ -69,22 +68,29 @@ public class FileService {
         fileInfo.setFileSuffix(FilenameUtils.getExtension(oFileName));
         fileInfo.setFileSize(StringUtils.isBlank(fileSize) ? new BigDecimal("0") : fileSize);
         Map<String, String> infoMap = FileUtils.uploadFileByInfo(file, FileEnum.DOCUMENT_ADDRESS);
-        FileInfo infoDo = new FileInfo();
-        infoDo.setId(new IdWorker(1).nextId());
-        infoDo.setType(FileEnum.FILE_STORE_TYPE_OSS.getFileType());
-        infoDo.setFileName(infoMap.get("fileName"));
-        infoDo.setMd5(infoMap.get("fileMd5"));
-        infoDo.setFilePath(infoMap.get("filePath"));
-        infoDo.setCreateTime(LocalDateTime.now());
-        infoDo.setUpdateTime(LocalDateTime.now());
-//        int insert = fileInfoDao.insert(infoDo);
+//        Map<String, String> infoMap=new HashMap<>();
+//        infoMap.put("fileName","fileName");
+//        infoMap.put("fileMd5","fileMd5");
+//        infoMap.put("filePath","filePath");
+//        infoMap.put("fileKey","fileKey");
+        fileInfo.setId(new IdWorker(1).nextId());
+        fileInfo.setType(FileEnum.FILE_STORE_TYPE_OSS.getFileType());
+        fileInfo.setFileName(infoMap.get("fileName"));
+        fileInfo.setMd5(infoMap.get("fileMd5"));
+        fileInfo.setFilePath(infoMap.get("filePath"));
+        fileInfo.setCreateTime(new Date());
+        fileInfo.setUpdateTime(new Date());
+        fileInfo.setStatus(0);
+        fileInfo.setDelFlag(0);
+        fileInfo.setCreateBy(1L);
+        fileInfo.setUpdateBy(1L);
+        fileInfoDao.insert(fileInfo);
         //上传至oss文件地址
         if (StringUtils.isNotBlank(infoMap.get("filePath"))) {
-            String oosUrl = infoMap.get("filePath");
             result.setCode(HttpStatus.SUCCESS_CODE);
             result.setMsg("上传成功");
             Map<String, Object> map = new HashMap<>(NumberConstant.SIXTEEN);
-            map.put("fileKey", infoMap.get("filePath"));
+            map.put("fileKey", infoMap.get("fileMd5"));
             map.put("fileName", infoMap.get("fileName"));
             resultList.add(map);
             result.setData(resultList);

sckw-modules/sckw-file/src/main/java/com/sckw/file/utils/FileUtils.java

@@ -128,7 +128,7 @@ public class FileUtils {
             String fileSuffix = FileUtils.getFileSuffix(file.getOriginalFilename());
             //不带后缀
             infoMap.put("fileMd5", fileName);
-            infoMap.put("fileName", fileName+fileSuffix);
+            infoMap.put("fileName", fileName + fileSuffix);
             //按照当前日期，创建文件夹，上传到创建文件夹里面
             //2021/02/02/01.jpg
             String timeUrl = new DateTime().toString("yyyyMMdd");

sckw-modules/sckw-file/src/main/resources/mapper/KwsFileInfoDao.xml

@@ -36,7 +36,7 @@
     </select>
 
     <insert id="insert" parameterType="com.sckw.file.model.FileInfo">
-        insert into kwf_file_info
+        insert into sckw_file.kwf_file_info
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">
                 id,
@@ -92,22 +92,22 @@
                 #{type,jdbcType=INTEGER},
             </if>
             <if test="originalName != null">
-                #{original_name,jdbcType=VARCHAR},
+                #{originalName,jdbcType=VARCHAR},
             </if>
             <if test="fileName != null">
-                #{file_name,jdbcType=VARCHAR},
+                #{fileName,jdbcType=VARCHAR},
             </if>
             <if test="md5 != null">
                 #{md5,jdbcType=VARCHAR},
             </if>
             <if test="fileSuffix != null">
-                #{file_suffix,jdbcType=VARCHAR},
+                #{fileSuffix,jdbcType=VARCHAR},
             </if>
             <if test="fileSize != null">
-                #{file_size,jdbcType=DECIMAL},
+                #{fileSize,jdbcType=DECIMAL},
             </if>
             <if test="filePath != null">
-                #{file_path,jdbcType=VARCHAR},
+                #{filePath,jdbcType=VARCHAR},
             </if>
             <if test="remark != null">
                 #{remark,jdbcType=VARCHAR},