Merge remote-tracking branch 'origin/dev' into dev

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/ElementPageReqVO.java

@@ -35,4 +35,6 @@ public class ElementPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
 
+    @Schema(description = "排序")
+    private Integer sort;
 }

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/ElementRespVO.java

@@ -44,4 +44,6 @@ public class ElementRespVO {
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
 
+    @Schema(description = "排序")
+    private Integer sort;
 }

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/ElementSaveReqVO.java

@@ -34,4 +34,7 @@ public class ElementSaveReqVO {
     @NotEmpty(message = "品位单位不能为空")
     private String gradeUnit;
 
+    @Schema(description = "排序")
+    private Integer sort;
+
 }

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/doctemplate/DocTemplateInstanceController.java

@@ -7,15 +7,19 @@ import com.zt.plat.module.base.controller.admin.doctemplate.vo.DocTemplateInstan
 import com.zt.plat.module.base.controller.admin.doctemplate.vo.DocTemplateInstanceSaveReqVO;
 import com.zt.plat.module.base.service.doctemplate.DocTemplateInstanceService;
 import com.zt.plat.module.base.service.doctemplate.DocTemplateRenderService;
+import com.zt.plat.module.base.service.doctemplate.DocumentRenderApiService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import jakarta.annotation.Resource;
 import jakarta.validation.Valid;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.Map;
 
@@ -38,6 +42,9 @@ public class DocTemplateInstanceController {
     @Resource
     private DocTemplateRenderService renderService;
 
+    @Resource
+    private DocumentRenderApiService documentRenderApiService;
+
     @PostMapping("/create")
     @Operation(summary = "创建模板实例")
     @PreAuthorize("@ss.hasPermission('base:template-instance:create')")
@@ -104,4 +111,35 @@ public class DocTemplateInstanceController {
         return success(true);
     }
 
+    @PostMapping("/render-and-export-word")
+    @Operation(summary = "渲染实例并导出为Word")
+    @PreAuthorize("@ss.hasPermission('base:template-instance:query')")
+    public ResponseEntity<byte[]> renderAndExportToWord(
+            @Parameter(name = "instanceId", description = "实例ID", required = true) @RequestParam("instanceId") Long instanceId,
+            @Parameter(name = "fileName", description = "文件名") @RequestParam(value = "fileName", required = false) String fileName,
+            @Parameter(name = "dataMap", description = "数据Map") @RequestBody(required = false) Map<String, Object> dataMap) {
+        byte[] fileContent = documentRenderApiService.renderAndExportToWord(instanceId, dataMap, fileName);
+        String actualFileName = (fileName != null ? fileName : "document") + ".docx";
+        String encodedFileName = URLEncoder.encode(actualFileName, StandardCharsets.UTF_8).replace("+", "%20");
+        return ResponseEntity.ok()
+                .header("Content-Disposition", "attachment; filename=\"document.docx\"; filename*=UTF-8''" + encodedFileName)
+                .header("Content-Type", "application/vnd.openxmlformats-officedocument.wordprocessingml.document")
+                .body(fileContent);
+    }
+
+    @PostMapping("/export-html-to-word")
+    @Operation(summary = "导出HTML为Word文档")
+    @PreAuthorize("@ss.hasPermission('base:template-instance:query')")
+    public ResponseEntity<byte[]> exportHtmlToWord(
+            @Parameter(name = "html", description = "HTML内容", required = true) @RequestBody String html,
+            @Parameter(name = "fileName", description = "文件名") @RequestParam(value = "fileName", required = false) String fileName) {
+        byte[] fileContent = documentRenderApiService.exportToWord(html, fileName);
+        String actualFileName = (fileName != null ? fileName : "document") + ".docx";
+        String encodedFileName = URLEncoder.encode(actualFileName, StandardCharsets.UTF_8).replace("+", "%20");
+        return ResponseEntity.ok()
+                .header("Content-Disposition", "attachment; filename=\"document.docx\"; filename*=UTF-8''" + encodedFileName)
+                .header("Content-Type", "application/vnd.openxmlformats-officedocument.wordprocessingml.document")
+                .body(fileContent);
+    }
+
 }

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/doctemplate/render/vo/BusinessExportRequest.java

@@ -0,0 +1,19 @@
+package com.zt.plat.module.base.controller.admin.doctemplate.render.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Map;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class BusinessExportRequest {
+    private Long templateInstanceId;
+    private String businessType;
+    private Long businessId;
+    private Map<String, String> fieldMappings;
+}

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/doctemplate/render/vo/BusinessPreviewRequest.java

@@ -0,0 +1,19 @@
+package com.zt.plat.module.base.controller.admin.doctemplate.render.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Map;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class BusinessPreviewRequest {
+    private Long templateInstanceId;
+    private String businessType;
+    private Long businessId;
+    private Map<String, String> fieldMappings;
+}

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/doctemplate/render/vo/CustomExportRequest.java

@@ -0,0 +1,17 @@
+package com.zt.plat.module.base.controller.admin.doctemplate.render.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Map;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class CustomExportRequest {
+    private Long templateInstanceId;
+    private Map<String, Object> customData;
+}

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/doctemplate/render/vo/CustomPreviewRequest.java

@@ -0,0 +1,17 @@
+package com.zt.plat.module.base.controller.admin.doctemplate.render.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Map;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class CustomPreviewRequest {
+    private Long templateInstanceId;
+    private Map<String, Object> customData;
+}

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/doctemplate/vo/DocTemplateCategoryRespVO.java

@@ -34,9 +34,21 @@ public class DocTemplateCategoryRespVO {
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     private LocalDateTime createTime;
 
-    @Schema(description = "创建人", example = "admin")
+    @Schema(description = "创建人ID", example = "1")
     private String creator;
 
+    @Schema(description = "创建人名称", example = "管理员")
+    private String creatorName;
+
+    @Schema(description = "更新时间")
+    private LocalDateTime updateTime;
+
+    @Schema(description = "更新人ID", example = "1")
+    private String updater;
+
+    @Schema(description = "更新人名称", example = "管理员")
+    private String updaterName;
+
     @Schema(description = "子分类列表")
     private List<DocTemplateCategoryRespVO> children;