Merge branch 'dev' into 'test'

模版编制相关实现

See merge request jygk/dsc-base!5

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/onlyoffice/controller/OnlyOfficeCallbackController.java

@@ -31,9 +31,9 @@ public class OnlyOfficeCallbackController {
     @PostMapping("/callback/{id}")
     @PermitAll
     @TenantIgnore
-    public ResponseEntity<Map<String, Integer>> handleCallback(@RequestBody OnlyOfficeCallback callback, @PathVariable String id) {
+    public ResponseEntity<Map<String, Integer>> handleCallback(@RequestBody OnlyOfficeCallback callback, @PathVariable String id,@RequestParam("fileName") String fileName) {
         // 处理回调逻辑
-        callbackService.processCallback(callback,id);
+        callbackService.processCallback(callback,id,fileName);
         // 返回必须的响应，否则OnlyOffice会显示错误
         Map<String, Integer> response = new HashMap<>();
         response.put("error", 0);

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/onlyoffice/service/OnlyOfficeCallbackService.java

@@ -8,5 +8,5 @@ public interface OnlyOfficeCallbackService {
      * 处理OnlyOffice回调
      * @param callback 回调数据
      */
-    void processCallback(OnlyOfficeCallback callback,String id);
+    void processCallback(OnlyOfficeCallback callback,String id,String fileName);
 }