From 73cc6f6ee33d735d26d8616f26568fec05d9fb4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BD=98=E8=8D=A3=E6=99=9F?=
 <9691125+pan-rongsheng@user.noreply.gitee.com>
Date: Fri, 26 Sep 2025 11:12:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E7=89=88=E7=BC=96=E5=88=B6=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E5=AE=9E=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/admin/templtp/TemplateInstanceController.java  | 2 +-
 .../onlyoffice/controller/OnlyOfficeCallbackController.java   | 2 +-
 .../onlyoffice/service/OnlyOfficeCallbackServiceImpl.java     | 3 ++-
 .../base/service/tmpltp/TemplateInstanceServiceImpl.java      | 4 +++-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/TemplateInstanceController.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/TemplateInstanceController.java
index e3cd0f9..b7bc88c 100644
--- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/TemplateInstanceController.java
+++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/TemplateInstanceController.java
@@ -166,7 +166,7 @@ public class TemplateInstanceController extends AbstractFileUploadController {
     //根据id获取实例版本号
     @GetMapping("/get-version")
     @Operation(summary = "根据id获取实例版本号")
-    public CommonResult<Map<String,Object>> getVersion(@RequestParam("id") String id) {
+    public CommonResult<Map<String,Object>> getVersion(@Valid @NotEmpty(message = "模版实例id不能为空") @RequestParam("id") String id) {
         return success(templateInstanceService.getVersion(id));
     }
 
diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/onlyoffice/controller/OnlyOfficeCallbackController.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/onlyoffice/controller/OnlyOfficeCallbackController.java
index 4847677..f33e0f2 100644
--- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/onlyoffice/controller/OnlyOfficeCallbackController.java
+++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/onlyoffice/controller/OnlyOfficeCallbackController.java
@@ -6,6 +6,7 @@ import com.zt.plat.module.base.controller.admin.templtp.onlyoffice.pojo.OnlyOffi
 import com.zt.plat.module.base.controller.admin.templtp.onlyoffice.service.OnlyOfficeCallbackService;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.annotation.security.PermitAll;
+import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
@@ -33,7 +34,6 @@ public class OnlyOfficeCallbackController {
     public ResponseEntity<Map<String, Integer>> handleCallback(@RequestBody OnlyOfficeCallback callback, @PathVariable String id) {
         // 处理回调逻辑
         callbackService.processCallback(callback,id);
-
         // 返回必须的响应，否则OnlyOffice会显示错误
         Map<String, Integer> response = new HashMap<>();
         response.put("error", 0);
diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/onlyoffice/service/OnlyOfficeCallbackServiceImpl.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/onlyoffice/service/OnlyOfficeCallbackServiceImpl.java
index 7395de3..1e9b04b 100644
--- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/onlyoffice/service/OnlyOfficeCallbackServiceImpl.java
+++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/onlyoffice/service/OnlyOfficeCallbackServiceImpl.java
@@ -143,7 +143,7 @@ public class OnlyOfficeCallbackServiceImpl implements OnlyOfficeCallbackService
             // 2. 获取并验证文件名
             String fileName = file.getOriginalFilename();
 
-            String directory = "template-instance";
+            String directory = "模版实例";
             FileCreateReqDTO fileCreateReqDTO = new FileCreateReqDTO();
             fileCreateReqDTO.setName(fileName);
             fileCreateReqDTO.setContent(file.getBytes());
@@ -152,6 +152,7 @@ public class OnlyOfficeCallbackServiceImpl implements OnlyOfficeCallbackService
 
             // 7. 调用文件服务创建文件
             CommonResult<String> result = fileApi.createFile(fileCreateReqDTO);
+            log.info("文件创建结果：{}", result);
         } catch (IOException e) {
             throw new RuntimeException(e);
         }
diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TemplateInstanceServiceImpl.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TemplateInstanceServiceImpl.java
index ac9b337..8721c16 100644
--- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TemplateInstanceServiceImpl.java
+++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TemplateInstanceServiceImpl.java
@@ -359,7 +359,9 @@ private String incrementVersion(String currentVersion) {
     @Override
     public Map<String, Object> getVersion(String id) {
         validateTemplateInstanceExists(Long.valueOf(id));
-        return Map.of("version", templateInstanceMapper.selectById(id).getVer());
+        String ver = templateInstanceMapper.selectById(id).getVer();
+        String newVer = incrementVersion(ver);
+        return Map.of("version",ver,"newVersion",newVer);
     }
 
     @Override