zgty/zt-base
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
潘荣晟
2025-11-11 14:05:14 +08:00
parent ddfc7d8965 83c1f318e1
commit 717db0f3ce
65 changed files with 3647 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
zt-module-base/zt-module-base-server/pom.xml
View File

@@ -126,7 +126,20 @@
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity-engine-core</artifactId>
<version>2.3</version>
</dependency>
<!-- docx4j - Word文档处理 -->
<dependency>
<groupId>org.docx4j</groupId>
<artifactId>docx4j-core</artifactId>
<version>11.4.11</version>
</dependency>
<!-- docx4j JAXB 运行时支持 (Java 17 兼容) -->
<dependency>
<groupId>org.docx4j</groupId>
<artifactId>docx4j-JAXB-ReferenceImpl</artifactId>
<version>11.4.11</version>
</dependency>
<!-- 监控相关 -->

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

@@ -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;
}

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

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

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

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

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

@@ -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);
}
}

223
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/doctemplate/render/DocTemplateRenderController.java Normal file
View File

File diff suppressed because it is too large Load Diff

19
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/doctemplate/render/vo/BusinessExportRequest.java Normal file
View File

@@ -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;
}

19
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/doctemplate/render/vo/BusinessPreviewRequest.java Normal file
View File

@@ -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;
}

17
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/doctemplate/render/vo/CustomExportRequest.java Normal file
View File

@@ -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;
}

17
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/doctemplate/render/vo/CustomPreviewRequest.java Normal file
View File

@@ -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;
}

Some files were not shown because too many files have changed in this diff Show More