From 34981c30a78e8bbd7791131059a9210f9928b62c Mon Sep 17 00:00:00 2001
From: 刘光辉 <347230014@qq.com>
Date: 星期四, 17 九月 2026 09:24:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master

---
 jnpf-file/jnpf-file-storage/src/main/java/jnpf/controller/DmsFileUploadController.java |   57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 57 insertions(+), 0 deletions(-)

diff --git a/jnpf-file/jnpf-file-storage/src/main/java/jnpf/controller/DmsFileUploadController.java b/jnpf-file/jnpf-file-storage/src/main/java/jnpf/controller/DmsFileUploadController.java
new file mode 100644
index 0000000..1d3cd0b
--- /dev/null
+++ b/jnpf-file/jnpf-file-storage/src/main/java/jnpf/controller/DmsFileUploadController.java
@@ -0,0 +1,57 @@
+package jnpf.controller;
+
+import jnpf.base.ActionResult;
+import jnpf.dmsEntity.storage.vo.DmsFileUploadVO;
+import jnpf.fileStorage.dms.DmsFileStorageService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.MediaType;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RequestPart;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.time.LocalDate;
+import java.util.UUID;
+
+@RestController
+@RequestMapping("/Dms")
+@RequiredArgsConstructor
+public class DmsFileUploadController {
+    private final DmsFileStorageService fileStorageService;
+
+    @PostMapping(value = "/Uploader", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    public ActionResult<DmsFileUploadVO> upload(@RequestParam("folderId") UUID folderId,
+                                                @RequestParam("sourceId") String sourceId,
+                                                @RequestParam("documentNo") String documentNo,
+                                                @RequestParam("documentName") String documentName,
+                                                @RequestParam("documentType") String documentType,
+                                                @RequestParam("responsibleDeptId") String responsibleDeptId,
+                                                @RequestParam("versionLabel") String versionLabel,
+                                                @RequestParam("preparedBy") String preparedBy,
+                                                @RequestParam("preparedOn")
+                                                @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
+                                                LocalDate preparedOn,
+                                                @RequestPart("file") MultipartFile file) {
+        return ActionResult.success(fileStorageService.upload(folderId, sourceId, documentNo,
+                documentName, documentType, responsibleDeptId, versionLabel, preparedBy,
+                preparedOn, file));
+    }
+
+    @PostMapping(value = "/Revisions", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    public ActionResult<DmsFileUploadVO> revise(
+            @RequestParam("documentId") UUID documentId,
+            @RequestParam("baseFileVersionId") UUID baseFileVersionId,
+            @RequestParam("sourceId") String sourceId,
+            @RequestParam("versionLabel") String versionLabel,
+            @RequestParam("preparedBy") String preparedBy,
+            @RequestParam("preparedOn")
+            @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate preparedOn,
+            @RequestParam("revisionReason") String revisionReason,
+            @RequestPart("file") MultipartFile file) {
+        return ActionResult.success(fileStorageService.revise(documentId, baseFileVersionId,
+                sourceId, versionLabel, preparedBy, preparedOn, revisionReason, file));
+    }
+}

--
Gitblit v1.8.0