Merge remote-tracking branch 'origin/master'

purchase-admin/src/main/java/com/ozs/web/controller/common/CommonController.java

@@ -1,16 +1,14 @@
 package com.ozs.web.controller.common;
 
-import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.ozs.common.core.domain.R;
-import com.ozs.common.utils.uuid.UUID;
+import com.ozs.system.domain.SysFileInfo;
+import com.ozs.system.service.SysFileService;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -28,6 +26,8 @@ import com.ozs.common.utils.file.FileUploadUtils;
 import com.ozs.common.utils.file.FileUtils;
 import com.ozs.framework.config.ServerConfig;
 
+import static com.ozs.common.utils.SecurityUtils.getUserId;
+
 /**
  * 通用请求处理
  *
@@ -42,6 +42,9 @@ public class CommonController {
     @Autowired
     private ServerConfig serverConfig;
 
+    @Autowired
+    private SysFileService sysFileService;
+
     private static final String FILE_DELIMETER = ",";
 
     /**
@@ -74,6 +77,7 @@ public class CommonController {
      * 通用上传请求（单个）
      */
     @PostMapping("/upload")
+
     public AjaxResult uploadFile(MultipartFile file) throws Exception {
         try {
             // 上传文件路径
@@ -81,12 +85,18 @@ public class CommonController {
             // 上传并返回新文件名称
             String fileName = FileUploadUtils.upload(filePath, file);
             String url = serverConfig.getUrl() + fileName;
-            AjaxResult ajax = AjaxResult.success();
-            ajax.put("url", url);
-            ajax.put("fileName", fileName);
-            ajax.put("newFileName", FileUtils.getName(fileName));
-            ajax.put("originalFilename", file.getOriginalFilename());
-            return ajax;
+            SysFileInfo filedto = SysFileInfo.builder()
+                    .fileUrl(url)
+                    .fileName(file.getOriginalFilename())
+                    .fileMappingPath(fileName)
+                    .fileNewName(FileUtils.getName(fileName))
+                    .build();
+            filedto.setCreated(getUserId().toString());
+            filedto.setCreateTime(new Date());
+            filedto.setUpdated(filedto.getCreated());
+            filedto.setUpdateTime(filedto.getCreateTime());
+            boolean save = sysFileService.save(filedto);
+            return AjaxResult.success(filedto);
         } catch (Exception e) {
             return AjaxResult.error(e.getMessage());
         }
@@ -102,25 +112,25 @@ public class CommonController {
         try {
             // 上传文件路径
             String filePath = PurchaseConfig.getUploadPath();
-            List<String> urls = new ArrayList<String>();
-            List<String> fileNames = new ArrayList<String>();
-            List<String> newFileNames = new ArrayList<String>();
-            List<String> originalFilenames = new ArrayList<String>();
+           List<SysFileInfo> list = new ArrayList<>();
             for (MultipartFile file : files) {
-                // 上传并返回新文件名称
+//                // 上传并返回新文件名称
                 String fileName = FileUploadUtils.upload(filePath, file);
                 String url = serverConfig.getUrl() + fileName;
-                urls.add(url);
-                fileNames.add(fileName);
-                newFileNames.add(FileUtils.getName(fileName));
-                originalFilenames.add(file.getOriginalFilename());
+                SysFileInfo filedto = SysFileInfo.builder()
+                        .fileUrl(url)
+                        .fileName(file.getOriginalFilename())
+                        .fileMappingPath(fileName)
+                        .fileNewName(FileUtils.getName(fileName))
+                        .build();
+                filedto.setCreated(getUserId().toString());
+                filedto.setCreateTime(new Date());
+                filedto.setUpdated(filedto.getCreated());
+                filedto.setUpdateTime(filedto.getCreateTime());
+                boolean save = sysFileService.save(filedto);
+                list.add(filedto);
             }
-            AjaxResult ajax = AjaxResult.success();
-            ajax.put("urls", StringUtils.join(urls, FILE_DELIMETER));
-            ajax.put("fileNames", StringUtils.join(fileNames, FILE_DELIMETER));
-            ajax.put("newFileNames", StringUtils.join(newFileNames, FILE_DELIMETER));
-            ajax.put("originalFilenames", StringUtils.join(originalFilenames, FILE_DELIMETER));
-            return ajax;
+            return AjaxResult.success(list);
         } catch (Exception e) {
             return AjaxResult.error(e.getMessage());
         }

purchase-system/src/main/java/com/ozs/system/domain/SysFileInfo.java

@@ -0,0 +1,59 @@
+package com.ozs.system.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ozs.common.annotation.Excel;
+import com.ozs.common.vo.BaseDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * 文件模板管理对象 sys_file
+ *
+ * @author ruoyi
+ * @date 2023-01-14
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@ApiModel("文件实体")
+@TableName("sys_file")
+public class SysFileInfo extends BaseDto {
+
+
+    /** 主键id */
+    @ApiModelProperty("主键ID")
+    @TableId(type = IdType.AUTO)
+    private Long fileId;
+
+    /** 文件名称 */
+    @Excel(name = "文件名称")
+    @ApiModelProperty("文件名称")
+    @NotBlank(message = "文件名称不能为空")
+    private String fileName;
+
+    /** 文件新名称 */
+    @Excel(name = "文件新名称")
+    @ApiModelProperty("文件新名称")
+    private String fileNewName;
+
+    /** 文件映射路径 */
+    @Excel(name = "文件映射路径")
+    @ApiModelProperty("文件映射路径")
+    private String fileMappingPath;
+
+    /** 文件下载url */
+    @Excel(name = "文件下载url")
+    @ApiModelProperty("文件下载url")
+    private String fileUrl;
+
+
+}

purchase-system/src/main/java/com/ozs/system/mapper/SysFileMapper.java

@@ -0,0 +1,17 @@
+package com.ozs.system.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ozs.system.domain.SysFileInfo;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 文件Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-01-14
+ */
+@Mapper
+public interface SysFileMapper extends BaseMapper<SysFileInfo> {
+
+}

purchase-system/src/main/java/com/ozs/system/service/SysFileService.java

@@ -0,0 +1,10 @@
+package com.ozs.system.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ozs.system.domain.SysFileInfo;
+
+
+public interface SysFileService extends IService<SysFileInfo> {
+
+
+}

purchase-system/src/main/java/com/ozs/system/service/impl/SysFileServiceImpl.java

@@ -0,0 +1,14 @@
+package com.ozs.system.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ozs.system.domain.SysFileInfo;
+import com.ozs.system.mapper.SysFileMapper;
+import com.ozs.system.service.SysFileService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+@Slf4j
+@Service
+public class SysFileServiceImpl extends ServiceImpl<SysFileMapper, SysFileInfo> implements SysFileService {
+
+}