Merge remote-tracking branch 'origin/master'

# Conflicts:
#	target/classes/configSetting.json

src/main/java/com/example/fms/common/model/dto/FMSDeleteFileDTO.java

@@ -0,0 +1,23 @@
+package com.example.fms.common.model.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 调用FMS系统删除文件接口
+ * @Author xiexiang
+ * @Date 2023/8/14
+ */
+@Data
+public class FMSDeleteFileDTO {
+    /**
+     * 需删除的ids
+     */
+    private List<Integer> ids;
+
+    /**
+     * 删除类型
+     */
+    private Integer type;
+}

src/main/java/com/example/fms/common/model/vo/ConfigSettingVO.java

@@ -16,4 +16,5 @@ public class ConfigSettingVO {
     private Integer id;
     private String userName;
     private String password;
+    private String filePath;
 }

src/main/java/com/example/fms/controller/FileMangerController.java

@@ -1,6 +1,7 @@
 package com.example.fms.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.example.fms.common.model.dto.FMSDeleteFileDTO;
 import com.example.fms.common.utils.Response;
 import com.example.fms.domain.SystemFile;
 import com.example.fms.service.FileMangerService;
@@ -69,8 +70,8 @@ public class FileMangerController {
 
     @PostMapping("/deleteSystemFile")
     @Operation(summary = "删除文件")
-    public String delete(@RequestBody List<Integer> ids, Integer type){
-        fileManagerService.delete(ids, type);
+    public String delete(@RequestBody FMSDeleteFileDTO fMSDeleteFileDTO){
+        fileManagerService.delete(fMSDeleteFileDTO.getIds(), fMSDeleteFileDTO.getType());
         return Response.success("删除系统文件成功");
     }
 }

src/main/java/com/example/fms/service/FileFactoryService.java

@@ -63,7 +63,7 @@ public class FileFactoryService {
         for(MultipartFile file:files){
             try {
                 String directoryName = fileUtils.getDirectoryName();
-                SystemFileDTO systemFileDTO = SftpService.upload("/file/"+directoryName, file, configSettingVO);
+                SystemFileDTO systemFileDTO = SftpService.upload(configSettingVO.getFilePath() + directoryName, file, configSettingVO);
                 systemFileDTO.setPType(0);
                 systemFileDTO.setOriginalName(file.getOriginalFilename());
                 systemFileDTO.setFilePath("/file/" + directoryName + "/" + systemFileDTO.getFileName());

target/classes/configSetting.json

@@ -0,0 +1,20 @@
+[
+    {
+        "sourceId": "1",   
+        "sourceName": "FSS",
+        "name": "192.168.1.24",
+        "id": 1,
+        "userName": "root",
+        "passWord": "xiaoshi221101",
+        "filePath": "/file/"
+    },
+    {
+        "sourceId": "2",   
+        "sourceName": "OSS",
+        "name": "阿里云",
+        "id": 2,
+        "userName": "xiexiang",
+        "passWord": "xiexiang123456",
+        "filePath": "/file/"
+    }
+]