From 270fea0c5dc736a5733611d27f4a4a8783ddfe67 Mon Sep 17 00:00:00 2001
From: xiaoxin <718949661@qq.com>
Date: Tue, 18 Mar 2025 14:41:06 +0800
Subject: [PATCH 01/15] =?UTF-8?q?=E3=80=90=E8=A7=A3=E5=86=B3=20TODO=20?=
=?UTF-8?q?=E3=80=91AI=20PPT=EF=BC=9A=E8=A7=A3=E5=86=B3=E4=B8=80=E4=BA=9B?=
=?UTF-8?q?=20TODO?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../{WddPptApi.java => WenDuoDuoPptApi.java} | 59 ++++++++-----------
.../{XunfeiPptApi.java => XunFeiPptApi.java} | 52 +++++++++-------
...piTests.java => WenDuoDuoPptApiTests.java} | 32 +++++-----
...ptApiTests.java => XunFeiPptApiTests.java} | 40 ++++++-------
4 files changed, 89 insertions(+), 94 deletions(-)
rename yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/core/model/wenduoduo/api/{WddPptApi.java => WenDuoDuoPptApi.java} (88%)
rename yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/core/model/xinghuo/api/{XunfeiPptApi.java => XunFeiPptApi.java} (96%)
rename yudao-module-ai/yudao-spring-boot-starter-ai/src/test/java/cn/iocoder/yudao/framework/ai/ppt/wdd/{WddPptApiTests.java => WenDuoDuoPptApiTests.java} (91%)
rename yudao-module-ai/yudao-spring-boot-starter-ai/src/test/java/cn/iocoder/yudao/framework/ai/ppt/xunfei/{XunfeiPptApiTests.java => XunFeiPptApiTests.java} (90%)
diff --git a/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/core/model/wenduoduo/api/WddPptApi.java b/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/core/model/wenduoduo/api/WenDuoDuoPptApi.java
similarity index 88%
rename from yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/core/model/wenduoduo/api/WddPptApi.java
rename to yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/core/model/wenduoduo/api/WenDuoDuoPptApi.java
index c3757a73c0..b86fb53e93 100644
--- a/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/core/model/wenduoduo/api/WddPptApi.java
+++ b/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/core/model/wenduoduo/api/WenDuoDuoPptApi.java
@@ -24,16 +24,15 @@ import java.util.Objects;
import java.util.function.Function;
import java.util.function.Predicate;
-// TODO @新：要不改成 WenDuoDuoPptApi
+
/**
* 文多多 API
*
- * @see PPT 生成 API
- *
* @author xiaoxin
+ * @see PPT 生成 API
*/
@Slf4j
-public class WddPptApi {
+public class WenDuoDuoPptApi {
public static final String BASE_URL = "https://docmee.cn";
@@ -50,7 +49,7 @@ public class WddPptApi {
});
// TODO @新：是不是不用 baseUrl 哈
- public WddPptApi(String baseUrl) {
+ public WenDuoDuoPptApi(String baseUrl) {
this.webClient = WebClient.builder()
.baseUrl(baseUrl)
// TODO @新：建议，token 作为 defaultHeader
@@ -82,35 +81,14 @@ public class WddPptApi {
.block();
}
- // TODO @xin：是不是给个 API 连接，这样 type、content、files 都不用写注释太细了
/**
* 创建任务
*
* @param type 类型
- * 1.智能生成（主题、要求）
- * 2.上传文件生成
- * 3.上传思维导图生成
- * 4.通过word精准转ppt
- * 5.通过网页链接生成
- * 6.粘贴文本内容生成
- * 7.Markdown大纲生成
* @param content 内容
- * type=1 用户输入主题或要求（不超过1000字符）
- * type=2、4 不传
- * type=3 幕布等分享链接
- * type=5 网页链接地址（http/https）
- * type=6 粘贴文本内容（不超过20000字符）
- * type=7 大纲内容（markdown）
* @param files 文件列表
- * 文件列表（文件数不超过5个，总大小不超过50M）：
- * type=1 上传参考文件（非必传，支持多个）
- * type=2 上传文件（支持多个）
- * type=3 上传思维导图（xmind/mm/md）（仅支持一个）
- * type=4 上传word文件（仅支持一个）
- * type=5、6、7 不传
- *
- * 支持格式：doc/docx/pdf/ppt/pptx/txt/md/xls/xlsx/csv/html/epub/mobi/xmind/mm
* @return 任务ID
+ * @see 创建任务
*/
public ApiResponse createTask(String token, Integer type, String content, List files) {
MultiValueMap formData = new LinkedMultiValueMap<>();
@@ -258,7 +236,8 @@ public class WddPptApi {
Integer code,
String message,
Map data
- ) { }
+ ) {
+ }
/**
* 创建任务
@@ -268,7 +247,8 @@ public class WddPptApi {
Integer type,
String content,
List files
- ) { }
+ ) {
+ }
/**
* 生成大纲内容请求
@@ -281,7 +261,8 @@ public class WddPptApi {
String audience,
String lang,
String prompt
- ) { }
+ ) {
+ }
/**
* 修改大纲内容请求
@@ -291,7 +272,8 @@ public class WddPptApi {
String id,
String markdown,
String question
- ) { }
+ ) {
+ }
/**
* 生成 PPT 请求
@@ -302,7 +284,8 @@ public class WddPptApi {
String id,
String templateId,
String markdown
- ) { }
+ ) {
+ }
// TODO @新：要不写下类注释
@JsonInclude(value = JsonInclude.Include.NON_NULL)
@@ -323,7 +306,8 @@ public class WddPptApi {
LocalDateTime createTime,
String createUser,
String updateUser
- ) { }
+ ) {
+ }
// TODO @新：要不写下类注释
@JsonInclude(value = JsonInclude.Include.NON_NULL)
@@ -339,7 +323,8 @@ public class WddPptApi {
String category,
String style,
String themeColor
- ) { }
+ ) {
+ }
}
@@ -348,7 +333,8 @@ public class WddPptApi {
public record PagePptTemplateInfo(
List data,
String total
- ) {}
+ ) {
+ }
// TODO @新：要不写下类注释
@@ -380,6 +366,7 @@ public class WddPptApi {
LocalDateTime createTime,
String createUser,
String updateUser
- ) { }
+ ) {
+ }
}
\ No newline at end of file
diff --git a/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/core/model/xinghuo/api/XunfeiPptApi.java b/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/core/model/xinghuo/api/XunFeiPptApi.java
similarity index 96%
rename from yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/core/model/xinghuo/api/XunfeiPptApi.java
rename to yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/core/model/xinghuo/api/XunFeiPptApi.java
index c3320ef21c..60ce4335a2 100644
--- a/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/core/model/xinghuo/api/XunfeiPptApi.java
+++ b/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/core/model/xinghuo/api/XunFeiPptApi.java
@@ -1,5 +1,6 @@
package cn.iocoder.yudao.framework.ai.core.model.xinghuo.api;
+import cn.hutool.core.util.ObjUtil;
import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
import com.fasterxml.jackson.annotation.JsonInclude;
import lombok.extern.slf4j.Slf4j;
@@ -28,16 +29,16 @@ import java.util.Map;
import java.util.function.Function;
import java.util.function.Predicate;
-// TODO @新：要不改成 XunFeiPptApi
+
+
/**
* 讯飞智能 PPT 生成 API
*
- * @see 智能 PPT 生成 API
- *
* @author xiaoxin
+ * @see 智能 PPT 生成 API
*/
@Slf4j
-public class XunfeiPptApi {
+public class XunFeiPptApi {
public static final String BASE_URL = "https://zwapi.xfyun.cn/api/ppt/v2";
@@ -54,7 +55,7 @@ public class XunfeiPptApi {
});
// TODO @新：是不是不用 baseUrl 哈
- public XunfeiPptApi(String baseUrl, String appId, String apiSecret) {
+ public XunFeiPptApi(String baseUrl, String appId, String apiSecret) {
// TODO @新：建议，增加 defaultheaders，例如说 appid 之类的；或者每个请求，通过 headers customer 处理。
this.webClient = WebClient.builder()
.baseUrl(baseUrl)
@@ -134,8 +135,7 @@ public class XunfeiPptApi {
SignatureInfo signInfo = getSignature();
Map requestBody = new HashMap<>();
requestBody.put("style", style);
- // TODO @新：可以使用 ObjUtil.defaultIfNull
- requestBody.put("pageSize", pageSize != null ? pageSize : 10);
+ requestBody.put("pageSize", ObjUtil.defaultIfNull(pageSize, 20));
return this.webClient.post()
.uri("/template/list")
.header("appId", signInfo.appId)
@@ -288,7 +288,8 @@ public class XunfeiPptApi {
String appId,
String timestamp,
String signature
- ) { }
+ ) {
+ }
/**
* 模板列表响应
@@ -300,7 +301,8 @@ public class XunfeiPptApi {
String desc,
Integer count,
TemplatePageData data
- ) { }
+ ) {
+ }
/**
* 模板列表数据
@@ -310,7 +312,8 @@ public class XunfeiPptApi {
String total,
List records,
Integer pageNum
- ) { }
+ ) {
+ }
/**
* 模板信息
@@ -324,7 +327,8 @@ public class XunfeiPptApi {
String industry,
String style,
String detailImage
- ) { }
+ ) {
+ }
/**
* 创建响应
@@ -336,7 +340,8 @@ public class XunfeiPptApi {
String desc,
Integer count,
CreateResponseData data
- ) { }
+ ) {
+ }
/**
* 创建响应数据
@@ -348,7 +353,8 @@ public class XunfeiPptApi {
String title,
String subTitle,
OutlineData outline
- ) { }
+ ) {
+ }
/**
* 大纲数据结构
@@ -375,7 +381,8 @@ public class XunfeiPptApi {
@JsonInclude(value = JsonInclude.Include.NON_NULL)
public record ChapterContent(
String chapterTitle
- ) { }
+ ) {
+ }
}
@@ -397,7 +404,8 @@ public class XunfeiPptApi {
int code,
String desc,
ProgressResponseData data
- ) { }
+ ) {
+ }
/**
* 进度响应数据
@@ -407,13 +415,12 @@ public class XunfeiPptApi {
int process,
String pptId,
String pptUrl,
- // TODO @新：字段注释，去掉
- String pptStatus, // PPT构建状态：building（构建中），done（已完成），build_failed（生成失败）
- String aiImageStatus, // ai配图状态：building（构建中），done（已完成）
- String cardNoteStatus, // 演讲备注状态：building（构建中），done（已完成）
- String errMsg, // 生成PPT的失败信息
- Integer totalPages, // 生成PPT的总页数
- Integer donePages // 生成PPT的完成页数
+ String pptStatus,
+ String aiImageStatus,
+ String cardNoteStatus,
+ String errMsg,
+ Integer totalPages,
+ Integer donePages
) {
/**
@@ -480,6 +487,7 @@ public class XunfeiPptApi {
}
// TODO @新：这个可以用 lombok 简化么？
+
/**
* 构建器类
*/
diff --git a/yudao-module-ai/yudao-spring-boot-starter-ai/src/test/java/cn/iocoder/yudao/framework/ai/ppt/wdd/WddPptApiTests.java b/yudao-module-ai/yudao-spring-boot-starter-ai/src/test/java/cn/iocoder/yudao/framework/ai/ppt/wdd/WenDuoDuoPptApiTests.java
similarity index 91%
rename from yudao-module-ai/yudao-spring-boot-starter-ai/src/test/java/cn/iocoder/yudao/framework/ai/ppt/wdd/WddPptApiTests.java
rename to yudao-module-ai/yudao-spring-boot-starter-ai/src/test/java/cn/iocoder/yudao/framework/ai/ppt/wdd/WenDuoDuoPptApiTests.java
index 3bb9898ad8..15ba7840bd 100644
--- a/yudao-module-ai/yudao-spring-boot-starter-ai/src/test/java/cn/iocoder/yudao/framework/ai/ppt/wdd/WddPptApiTests.java
+++ b/yudao-module-ai/yudao-spring-boot-starter-ai/src/test/java/cn/iocoder/yudao/framework/ai/ppt/wdd/WenDuoDuoPptApiTests.java
@@ -1,6 +1,6 @@
package cn.iocoder.yudao.framework.ai.ppt.wdd;
-import cn.iocoder.yudao.framework.ai.core.model.wenduoduo.api.WddPptApi;
+import cn.iocoder.yudao.framework.ai.core.model.wenduoduo.api.WenDuoDuoPptApi;
import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
@@ -10,13 +10,13 @@ import java.util.Map;
import java.util.Objects;
/**
- * {@link WddPptApi} 集成测试
+ * {@link WenDuoDuoPptApi} 集成测试
*
* @author xiaoxin
*/
-public class WddPptApiTests {
+public class WenDuoDuoPptApiTests {
- private final WddPptApi wddPptApi = new WddPptApi("https://docmee.cn");
+ private final WenDuoDuoPptApi wenDuoDuoPptApi = new WenDuoDuoPptApi("https://docmee.cn");
private final String token = ""; // API Token
@@ -25,9 +25,9 @@ public class WddPptApiTests {
public void testCreateApiToken() {
// 准备参数
String apiKey = "";
- WddPptApi.CreateTokenRequest request = new WddPptApi.CreateTokenRequest(apiKey);
+ WenDuoDuoPptApi.CreateTokenRequest request = new WenDuoDuoPptApi.CreateTokenRequest(apiKey);
// 调用方法
- String token = wddPptApi.createApiToken(request);
+ String token = wenDuoDuoPptApi.createApiToken(request);
// 打印结果
System.out.println(token);
}
@@ -38,7 +38,7 @@ public class WddPptApiTests {
@Test
@Disabled
public void testCreateTask() {
- WddPptApi.ApiResponse apiResponse = wddPptApi.createTask(token, 1, "dify 介绍", null);
+ WenDuoDuoPptApi.ApiResponse apiResponse = wenDuoDuoPptApi.createTask(token, 1, "dify 介绍", null);
System.out.println(apiResponse);
}
@@ -46,10 +46,10 @@ public class WddPptApiTests {
@Test // 创建大纲
@Disabled
public void testGenerateOutlineRequest() {
- WddPptApi.CreateOutlineRequest request = new WddPptApi.CreateOutlineRequest(
+ WenDuoDuoPptApi.CreateOutlineRequest request = new WenDuoDuoPptApi.CreateOutlineRequest(
"1901539019628613632", "medium", null, null, null, null);
// 调用
- Flux> flux = wddPptApi.createOutline(token, request);
+ Flux> flux = wenDuoDuoPptApi.createOutline(token, request);
StringBuffer contentBuffer = new StringBuffer();
flux.doOnNext(chunk -> {
contentBuffer.append(chunk.get("text"));
@@ -69,10 +69,10 @@ public class WddPptApiTests {
@Test
@Disabled
public void testUpdateOutlineRequest() {
- WddPptApi.UpdateOutlineRequest request = new WddPptApi.UpdateOutlineRequest(
+ WenDuoDuoPptApi.UpdateOutlineRequest request = new WenDuoDuoPptApi.UpdateOutlineRequest(
"1901539019628613632", TEST_OUT_LINE_CONTENT, "精简一点，三个章节即可");
// 调用
- Flux> flux = wddPptApi.updateOutline(token, request);
+ Flux> flux = wenDuoDuoPptApi.updateOutline(token, request);
StringBuffer contentBuffer = new StringBuffer();
flux.doOnNext(chunk -> {
contentBuffer.append(chunk.get("text"));
@@ -94,11 +94,11 @@ public class WddPptApiTests {
@Disabled
public void testGetPptTemplatePage() {
// 准备参数
- WddPptApi.TemplateQueryRequest.Filter filter = new WddPptApi.TemplateQueryRequest.Filter(
+ WenDuoDuoPptApi.TemplateQueryRequest.Filter filter = new WenDuoDuoPptApi.TemplateQueryRequest.Filter(
1, null, null, null);
- WddPptApi.TemplateQueryRequest request = new WddPptApi.TemplateQueryRequest(1, 10, filter);
+ WenDuoDuoPptApi.TemplateQueryRequest request = new WenDuoDuoPptApi.TemplateQueryRequest(1, 10, filter);
// 调用
- WddPptApi.PagePptTemplateInfo pptTemplatePage = wddPptApi.getTemplatePage(token, request);
+ WenDuoDuoPptApi.PagePptTemplateInfo pptTemplatePage = wenDuoDuoPptApi.getTemplatePage(token, request);
// 打印结果
System.out.println(pptTemplatePage);
}
@@ -110,9 +110,9 @@ public class WddPptApiTests {
@Disabled
public void testGeneratePptx() {
// 准备参数
- WddPptApi.CreatePptRequest request = new WddPptApi.CreatePptRequest("1901539019628613632", "1805081814809960448", TEST_OUT_LINE_CONTENT);
+ WenDuoDuoPptApi.CreatePptRequest request = new WenDuoDuoPptApi.CreatePptRequest("1901539019628613632", "1805081814809960448", TEST_OUT_LINE_CONTENT);
// 调用
- WddPptApi.PptInfo pptInfo = wddPptApi.create(token, request);
+ WenDuoDuoPptApi.PptInfo pptInfo = wenDuoDuoPptApi.create(token, request);
// 打印结果
System.out.println(pptInfo);
}
diff --git a/yudao-module-ai/yudao-spring-boot-starter-ai/src/test/java/cn/iocoder/yudao/framework/ai/ppt/xunfei/XunfeiPptApiTests.java b/yudao-module-ai/yudao-spring-boot-starter-ai/src/test/java/cn/iocoder/yudao/framework/ai/ppt/xunfei/XunFeiPptApiTests.java
similarity index 90%
rename from yudao-module-ai/yudao-spring-boot-starter-ai/src/test/java/cn/iocoder/yudao/framework/ai/ppt/xunfei/XunfeiPptApiTests.java
rename to yudao-module-ai/yudao-spring-boot-starter-ai/src/test/java/cn/iocoder/yudao/framework/ai/ppt/xunfei/XunFeiPptApiTests.java
index 34088bf544..9d9117c0b9 100644
--- a/yudao-module-ai/yudao-spring-boot-starter-ai/src/test/java/cn/iocoder/yudao/framework/ai/ppt/xunfei/XunfeiPptApiTests.java
+++ b/yudao-module-ai/yudao-spring-boot-starter-ai/src/test/java/cn/iocoder/yudao/framework/ai/ppt/xunfei/XunFeiPptApiTests.java
@@ -1,7 +1,7 @@
package cn.iocoder.yudao.framework.ai.ppt.xunfei;
import cn.hutool.core.io.FileUtil;
-import cn.iocoder.yudao.framework.ai.core.model.xinghuo.api.XunfeiPptApi;
+import cn.iocoder.yudao.framework.ai.core.model.xinghuo.api.XunFeiPptApi;
import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
@@ -11,17 +11,17 @@ import org.springframework.web.multipart.MultipartFile;
import java.io.File;
/**
- * {@link XunfeiPptApi} 集成测试
+ * {@link XunFeiPptApi} 集成测试
*
* @author xiaoxin
*/
-public class XunfeiPptApiTests {
+public class XunFeiPptApiTests {
// 讯飞 API 配置信息，实际使用时请替换为您的应用信息
private static final String APP_ID = "";
private static final String API_SECRET = "";
- private final XunfeiPptApi xunfeiPptApi = new XunfeiPptApi(XunfeiPptApi.BASE_URL, APP_ID, API_SECRET);
+ private final XunFeiPptApi xunfeiPptApi = new XunFeiPptApi(XunFeiPptApi.BASE_URL, APP_ID, API_SECRET);
/**
* 获取 PPT 模板列表
@@ -30,7 +30,7 @@ public class XunfeiPptApiTests {
@Disabled
public void testGetTemplatePage() {
// 调用方法
- XunfeiPptApi.TemplatePageResponse response = xunfeiPptApi.getTemplatePage("商务", 10);
+ XunFeiPptApi.TemplatePageResponse response = xunfeiPptApi.getTemplatePage("商务", 10);
// 打印结果
System.out.println("模板列表响应：" + JsonUtils.toJsonString(response));
@@ -41,7 +41,7 @@ public class XunfeiPptApiTests {
// 打印第一个模板的信息（如果存在）
if (!response.data().records().isEmpty()) {
- XunfeiPptApi.TemplateInfo firstTemplate = response.data().records().get(0);
+ XunFeiPptApi.TemplateInfo firstTemplate = response.data().records().get(0);
System.out.println("模板ID：" + firstTemplate.templateIndexId());
System.out.println("模板风格：" + firstTemplate.style());
System.out.println("模板颜色：" + firstTemplate.color());
@@ -56,7 +56,7 @@ public class XunfeiPptApiTests {
@Test
@Disabled
public void testCreateOutline() {
- XunfeiPptApi.CreateResponse response = getCreateResponse();
+ XunFeiPptApi.CreateResponse response = getCreateResponse();
// 打印结果
System.out.println("创建大纲响应：" + JsonUtils.toJsonString(response));
@@ -77,7 +77,7 @@ public class XunfeiPptApiTests {
* 创建大纲（通过文本）
* @return 创建大纲响应
*/
- private XunfeiPptApi.CreateResponse getCreateResponse() {
+ private XunFeiPptApi.CreateResponse getCreateResponse() {
String param = "智能体平台 Dify 介绍";
return xunfeiPptApi.createOutline(param);
}
@@ -89,9 +89,9 @@ public class XunfeiPptApiTests {
@Disabled
public void testCreatePptByOutlineWithFullParams() {
// 创建大纲对象
- XunfeiPptApi.CreateResponse createResponse = getCreateResponse();
+ XunFeiPptApi.CreateResponse createResponse = getCreateResponse();
// 调用方法
- XunfeiPptApi.CreateResponse response = xunfeiPptApi.createPptByOutline(createResponse.data().outline(), "精简一些，不要超过6个章节");
+ XunFeiPptApi.CreateResponse response = xunfeiPptApi.createPptByOutline(createResponse.data().outline(), "精简一些，不要超过6个章节");
// 打印结果
System.out.println("通过大纲创建 PPT 响应：" + JsonUtils.toJsonString(response));
@@ -114,13 +114,13 @@ public class XunfeiPptApiTests {
String sid = "e96dac09f2ec4ee289f029a5fb874ecd"; // 替换为实际的sid
// 调用方法
- XunfeiPptApi.ProgressResponse response = xunfeiPptApi.checkProgress(sid);
+ XunFeiPptApi.ProgressResponse response = xunfeiPptApi.checkProgress(sid);
// 打印结果
System.out.println("检查进度响应：" + JsonUtils.toJsonString(response));
// 安全地访问响应数据
if (response != null && response.data() != null) {
- XunfeiPptApi.ProgressResponseData data = response.data();
+ XunFeiPptApi.ProgressResponseData data = response.data();
// 打印PPT生成状态
System.out.println("PPT 构建状态: " + data.pptStatus());
@@ -171,11 +171,11 @@ public class XunfeiPptApiTests {
System.out.println("第" + (i + 1) + "次查询进度...");
// 调用方法
- XunfeiPptApi.ProgressResponse response = xunfeiPptApi.checkProgress(sid);
+ XunFeiPptApi.ProgressResponse response = xunfeiPptApi.checkProgress(sid);
// 安全地访问响应数据
if (response != null && response.data() != null) {
- XunfeiPptApi.ProgressResponseData data = response.data();
+ XunFeiPptApi.ProgressResponseData data = response.data();
// 打印进度信息
System.out.println("PPT 构建状态: " + data.pptStatus());
@@ -218,7 +218,7 @@ public class XunfeiPptApiTests {
String query = "合肥天气趋势分析，包括近5年的气温变化、降水量变化、极端天气事件，以及对城市生活的影响";
// 调用方法
- XunfeiPptApi.CreateResponse response = xunfeiPptApi.create(query);
+ XunFeiPptApi.CreateResponse response = xunfeiPptApi.create(query);
// 打印结果
System.out.println("直接创建 PPT 响应：" + JsonUtils.toJsonString(response));
@@ -244,7 +244,7 @@ public class XunfeiPptApiTests {
MultipartFile multipartFile = convertFileToMultipartFile(file);
// 调用方法
- XunfeiPptApi.CreateResponse response = xunfeiPptApi.create(multipartFile, file.getName());
+ XunFeiPptApi.CreateResponse response = xunfeiPptApi.create(multipartFile, file.getName());
// 打印结果
System.out.println("通过文件创建PPT响应：" + JsonUtils.toJsonString(response));
@@ -269,7 +269,7 @@ public class XunfeiPptApiTests {
String query = "合肥天气趋势分析，包括近 5 年的气温变化、降水量变化、极端天气事件，以及对城市生活的影响";
// 创建请求对象
- XunfeiPptApi.CreatePptRequest request = XunfeiPptApi.CreatePptRequest.builder()
+ XunFeiPptApi.CreatePptRequest request = XunFeiPptApi.CreatePptRequest.builder()
.query(query)
.language("cn")
.isCardNote(true)
@@ -280,7 +280,7 @@ public class XunfeiPptApiTests {
.build();
// 调用方法
- XunfeiPptApi.CreateResponse response = xunfeiPptApi.create(request);
+ XunFeiPptApi.CreateResponse response = xunfeiPptApi.create(request);
// 打印结果
System.out.println("使用完整参数创建 PPT 响应：" + JsonUtils.toJsonString(response));
@@ -296,9 +296,9 @@ public class XunfeiPptApiTests {
// 立即查询一次进度
System.out.println("立即查询进度...");
- XunfeiPptApi.ProgressResponse progressResponse = xunfeiPptApi.checkProgress(sid);
+ XunFeiPptApi.ProgressResponse progressResponse = xunfeiPptApi.checkProgress(sid);
if (progressResponse != null && progressResponse.data() != null) {
- XunfeiPptApi.ProgressResponseData progressData = progressResponse.data();
+ XunFeiPptApi.ProgressResponseData progressData = progressResponse.data();
System.out.println("PPT 构建状态: " + progressData.pptStatus());
if (progressData.totalPages() != null && progressData.donePages() != null) {
System.out.println("完成进度: " + progressData.donePages() + "/" + progressData.totalPages()
From b2ec4d38a0f187e74a5cf519dc75b7fd5c8fcaaa Mon Sep 17 00:00:00 2001
From: xiaoxin <718949661@qq.com>
Date: Fri, 21 Mar 2025 14:41:02 +0800
Subject: [PATCH 02/15] =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E4=BB=A3?=
=?UTF-8?q?=E7=A0=81=E3=80=91AI=20PPT=EF=BC=9A=E4=BC=98=E5=8C=96=E6=96=87?=
=?UTF-8?q?=E5=A4=9A=E5=A4=9A=E3=80=81=E8=AE=AF=E9=A3=9E=20API?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../model/wenduoduo/api/WenDuoDuoPptApi.java | 69 ++--
.../core/model/xinghuo/api/XunFeiPptApi.java | 389 ++++--------------
.../ai/ppt/wdd/WenDuoDuoPptApiTests.java | 21 +-
.../ai/ppt/xunfei/XunFeiPptApiTests.java | 9 +-
4 files changed, 133 insertions(+), 355 deletions(-)
diff --git a/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/core/model/wenduoduo/api/WenDuoDuoPptApi.java b/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/core/model/wenduoduo/api/WenDuoDuoPptApi.java
index b86fb53e93..c1731e77b6 100644
--- a/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/core/model/wenduoduo/api/WenDuoDuoPptApi.java
+++ b/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/core/model/wenduoduo/api/WenDuoDuoPptApi.java
@@ -8,6 +8,7 @@ import org.springframework.core.ParameterizedTypeReference;
import org.springframework.http.HttpRequest;
import org.springframework.http.HttpStatusCode;
import org.springframework.http.MediaType;
+import org.springframework.util.Assert;
import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap;
import org.springframework.web.multipart.MultipartFile;
@@ -35,6 +36,7 @@ import java.util.function.Predicate;
public class WenDuoDuoPptApi {
public static final String BASE_URL = "https://docmee.cn";
+ public static final String TOKEN_NAME = "token";
private final WebClient webClient;
@@ -43,17 +45,24 @@ public class WenDuoDuoPptApi {
private final Function>> EXCEPTION_FUNCTION =
reqParam -> response -> response.bodyToMono(String.class).handle((responseBody, sink) -> {
HttpRequest request = response.request();
- log.error("[wdd-api] 调用失败！请求方式:[{}]，请求地址:[{}]，请求参数:[{}]，响应数据: [{}]",
+ log.error("[WenDuoDuoPptApi] 调用失败！请求方式:[{}]，请求地址:[{}]，请求参数:[{}]，响应数据: [{}]",
request.getMethod(), request.getURI(), reqParam, responseBody);
- sink.error(new IllegalStateException("[wdd-api] 调用失败！"));
+ sink.error(new IllegalStateException("[WenDuoDuoPptApi] 调用失败！"));
});
- // TODO @新：是不是不用 baseUrl 哈
- public WenDuoDuoPptApi(String baseUrl) {
+ /**
+ * 构造方法
+ *
+ * @param token API令牌，可为空，后续API调用时单独指定
+ */
+ public WenDuoDuoPptApi(String token) {
+ Assert.hasText(token, "token 不能为空");
this.webClient = WebClient.builder()
- .baseUrl(baseUrl)
- // TODO @新：建议，token 作为 defaultHeader
- .defaultHeaders((headers) -> headers.setContentType(MediaType.APPLICATION_JSON))
+ .baseUrl(BASE_URL)
+ .defaultHeaders((headers) -> {
+ headers.setContentType(MediaType.APPLICATION_JSON);
+ headers.add(TOKEN_NAME, token);
+ })
.build();
}
@@ -90,7 +99,7 @@ public class WenDuoDuoPptApi {
* @return 任务ID
* @see 创建任务
*/
- public ApiResponse createTask(String token, Integer type, String content, List files) {
+ public ApiResponse createTask(Integer type, String content, List files) {
MultiValueMap formData = new LinkedMultiValueMap<>();
formData.add("type", type);
if (content != null) {
@@ -103,7 +112,6 @@ public class WenDuoDuoPptApi {
}
return this.webClient.post()
.uri("/api/ppt/v2/createTask")
- .header("token", token)
.contentType(MediaType.MULTIPART_FORM_DATA)
.body(BodyInserters.fromMultipartData(formData))
.retrieve()
@@ -146,10 +154,9 @@ public class WenDuoDuoPptApi {
* @param request 请求体
* @return 模板列表
*/
- public PagePptTemplateInfo getTemplatePage(String token, TemplateQueryRequest request) {
+ public PagePptTemplateInfo getTemplatePage(TemplateQueryRequest request) {
return this.webClient.post()
.uri("/api/ppt/templates")
- .header("token", token)
.bodyValue(request)
.retrieve()
.onStatus(STATUS_PREDICATE, EXCEPTION_FUNCTION.apply(request))
@@ -163,10 +170,9 @@ public class WenDuoDuoPptApi {
*
* @return 大纲内容流
*/
- public Flux> createOutline(String token, CreateOutlineRequest request) {
+ public Flux> createOutline(CreateOutlineRequest request) {
return this.webClient.post()
.uri("/api/ppt/v2/generateContent")
- .header("token", token)
.body(Mono.just(request), CreateOutlineRequest.class)
.retrieve()
.onStatus(STATUS_PREDICATE, EXCEPTION_FUNCTION.apply(request))
@@ -180,10 +186,9 @@ public class WenDuoDuoPptApi {
* @param request 请求体
* @return 大纲内容流
*/
- public Flux> updateOutline(String token, UpdateOutlineRequest request) {
+ public Flux> updateOutline(UpdateOutlineRequest request) {
return this.webClient.post()
.uri("/api/ppt/v2/updateContent")
- .header("token", token)
.body(Mono.just(request), UpdateOutlineRequest.class)
.retrieve()
.onStatus(STATUS_PREDICATE, EXCEPTION_FUNCTION.apply(request))
@@ -196,11 +201,10 @@ public class WenDuoDuoPptApi {
*
* @return PPT信息
*/
- public PptInfo create(String token, CreatePptRequest request) {
+ public PptInfo create(PptCreateRequest request) {
return this.webClient.post()
.uri("/api/ppt/v2/generatePptx")
- .header("token", token)
- .body(Mono.just(request), CreatePptRequest.class)
+ .body(Mono.just(request), PptCreateRequest.class)
.retrieve()
.onStatus(STATUS_PREDICATE, EXCEPTION_FUNCTION.apply(request))
.bodyToMono(ApiResponse.class)
@@ -214,7 +218,9 @@ public class WenDuoDuoPptApi {
.block();
}
-
+ /**
+ * 创建Token请求参数
+ */
@JsonInclude(value = JsonInclude.Include.NON_NULL)
public record CreateTokenRequest(
String apiKey,
@@ -276,18 +282,19 @@ public class WenDuoDuoPptApi {
}
/**
- * 生成 PPT 请求
+ * 生成 PPT 请求参数
*/
- // TODO @新：要不按照 PptCreateRequest 这样的风格
@JsonInclude(value = JsonInclude.Include.NON_NULL)
- public record CreatePptRequest(
+ public record PptCreateRequest(
String id,
String templateId,
String markdown
) {
}
- // TODO @新：要不写下类注释
+ /**
+ * PPT 信息
+ */
@JsonInclude(value = JsonInclude.Include.NON_NULL)
public record PptInfo(
String id,
@@ -309,7 +316,9 @@ public class WenDuoDuoPptApi {
) {
}
- // TODO @新：要不写下类注释
+ /**
+ * 模板查询请求参数
+ */
@JsonInclude(value = JsonInclude.Include.NON_NULL)
public record TemplateQueryRequest(
int page,
@@ -317,6 +326,9 @@ public class WenDuoDuoPptApi {
Filter filters
) {
+ /**
+ * 模板查询过滤条件
+ */
@JsonInclude(value = JsonInclude.Include.NON_NULL)
public record Filter(
int type,
@@ -328,7 +340,9 @@ public class WenDuoDuoPptApi {
}
- // TODO @新：要不写下类注释
+ /**
+ * PPT模板分页信息
+ */
@JsonInclude(value = JsonInclude.Include.NON_NULL)
public record PagePptTemplateInfo(
List data,
@@ -336,8 +350,9 @@ public class WenDuoDuoPptApi {
) {
}
-
- // TODO @新：要不写下类注释
+ /**
+ * PPT模板信息
+ */
@JsonInclude(value = JsonInclude.Include.NON_NULL)
public record PptTemplateInfo(
String id,
diff --git a/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/core/model/xinghuo/api/XunFeiPptApi.java b/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/core/model/xinghuo/api/XunFeiPptApi.java
index 60ce4335a2..8a8ec609b8 100644
--- a/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/core/model/xinghuo/api/XunFeiPptApi.java
+++ b/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/core/model/xinghuo/api/XunFeiPptApi.java
@@ -1,36 +1,31 @@
package cn.iocoder.yudao.framework.ai.core.model.xinghuo.api;
import cn.hutool.core.util.ObjUtil;
+import cn.hutool.crypto.SecureUtil;
+import cn.hutool.crypto.digest.HmacAlgorithm;
import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.Builder;
import lombok.extern.slf4j.Slf4j;
import org.springframework.core.io.ByteArrayResource;
import org.springframework.http.HttpStatusCode;
import org.springframework.http.MediaType;
import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap;
+import org.springframework.util.StringUtils;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.reactive.function.BodyInserters;
import org.springframework.web.reactive.function.client.ClientResponse;
import org.springframework.web.reactive.function.client.WebClient;
import reactor.core.publisher.Mono;
-import javax.crypto.Mac;
-import javax.crypto.spec.SecretKeySpec;
import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.security.InvalidKeyException;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.util.Base64;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.function.Function;
import java.util.function.Predicate;
-
-
/**
* 讯飞智能 PPT 生成 API
*
@@ -41,6 +36,9 @@ import java.util.function.Predicate;
public class XunFeiPptApi {
public static final String BASE_URL = "https://zwapi.xfyun.cn/api/ppt/v2";
+ private static final String HEADER_APP_ID = "appId";
+ private static final String HEADER_TIMESTAMP = "timestamp";
+ private static final String HEADER_SIGNATURE = "signature";
private final WebClient webClient;
private final String appId;
@@ -50,18 +48,21 @@ public class XunFeiPptApi {
private final Function>> EXCEPTION_FUNCTION =
reqParam -> response -> response.bodyToMono(String.class).handle((responseBody, sink) -> {
- log.error("[xunfei-ppt-api] 调用失败！请求参数:[{}]，响应数据: [{}]", reqParam, responseBody);
- sink.error(new IllegalStateException("[xunfei-ppt-api] 调用失败！"));
+ log.error("[XunFeiPptApi] 调用失败！请求参数:[{}]，响应数据: [{}]", reqParam, responseBody);
+ sink.error(new IllegalStateException("[XunFeiPptApi] 调用失败！"));
});
- // TODO @新：是不是不用 baseUrl 哈
- public XunFeiPptApi(String baseUrl, String appId, String apiSecret) {
- // TODO @新：建议，增加 defaultheaders，例如说 appid 之类的；或者每个请求，通过 headers customer 处理。
- this.webClient = WebClient.builder()
- .baseUrl(baseUrl)
- .build();
+ public XunFeiPptApi(String appId, String apiSecret) {
this.appId = appId;
this.apiSecret = apiSecret;
+ this.webClient = WebClient.builder()
+ .baseUrl(BASE_URL)
+ .defaultHeaders((headers) -> {
+ headers.setContentType(MediaType.APPLICATION_JSON);
+ headers.add(HEADER_APP_ID, appId);
+ })
+ .build();
+
}
/**
@@ -73,7 +74,7 @@ public class XunFeiPptApi {
long timestamp = System.currentTimeMillis() / 1000;
String ts = String.valueOf(timestamp);
String signature = generateSignature(appId, apiSecret, timestamp);
- return new SignatureInfo(appId, ts, signature);
+ return new SignatureInfo(ts, signature);
}
/**
@@ -85,43 +86,8 @@ public class XunFeiPptApi {
* @return 签名
*/
private String generateSignature(String appId, String apiSecret, long timestamp) {
- try {
- // TODO @新：使用 hutool 简化
- String auth = md5(appId + timestamp);
- return hmacSHA1Encrypt(auth, apiSecret);
- } catch (NoSuchAlgorithmException | InvalidKeyException e) {
- log.error("[xunfei-ppt-api] 生成签名失败", e);
- throw new IllegalStateException("[xunfei-ppt-api] 生成签名失败");
- }
- }
-
- /**
- * HMAC SHA1 加密
- */
- private String hmacSHA1Encrypt(String encryptText, String encryptKey)
- throws NoSuchAlgorithmException, InvalidKeyException {
- SecretKeySpec keySpec = new SecretKeySpec(
- encryptKey.getBytes(StandardCharsets.UTF_8), "HmacSHA1");
-
- Mac mac = Mac.getInstance("HmacSHA1");
- mac.init(keySpec);
- byte[] result = mac.doFinal(encryptText.getBytes(StandardCharsets.UTF_8));
-
- return Base64.getEncoder().encodeToString(result);
- }
-
- /**
- * MD5 哈希
- */
- private String md5(String text) throws NoSuchAlgorithmException {
- MessageDigest md = MessageDigest.getInstance("MD5");
- byte[] digest = md.digest(text.getBytes(StandardCharsets.UTF_8));
-
- StringBuilder sb = new StringBuilder();
- for (byte b : digest) {
- sb.append(String.format("%02x", b));
- }
- return sb.toString();
+ String auth = SecureUtil.md5(appId + timestamp);
+ return SecureUtil.hmac(HmacAlgorithm.HmacSHA1, apiSecret).digestBase64(auth, false);
}
/**
@@ -138,9 +104,8 @@ public class XunFeiPptApi {
requestBody.put("pageSize", ObjUtil.defaultIfNull(pageSize, 20));
return this.webClient.post()
.uri("/template/list")
- .header("appId", signInfo.appId)
- .header("timestamp", signInfo.timestamp)
- .header("signature", signInfo.signature)
+ .header(HEADER_TIMESTAMP, signInfo.timestamp)
+ .header(HEADER_SIGNATURE, signInfo.signature)
.contentType(MediaType.APPLICATION_JSON)
.bodyValue(requestBody)
.retrieve()
@@ -161,9 +126,8 @@ public class XunFeiPptApi {
formData.add("query", query);
return this.webClient.post()
.uri("/createOutline")
- .header("appId", signInfo.appId)
- .header("timestamp", signInfo.timestamp)
- .header("signature", signInfo.signature)
+ .header(HEADER_TIMESTAMP, signInfo.timestamp)
+ .header(HEADER_SIGNATURE, signInfo.signature)
.contentType(MediaType.MULTIPART_FORM_DATA)
.body(BodyInserters.fromMultipartData(formData))
.retrieve()
@@ -207,12 +171,11 @@ public class XunFeiPptApi {
*/
public CreateResponse create(CreatePptRequest request) {
SignatureInfo signInfo = getSignature();
- MultiValueMap formData = buildCreateFormData(request);
+ MultiValueMap formData = buildCreatePptFormData(request);
return this.webClient.post()
.uri("/create")
- .header("appId", signInfo.appId)
- .header("timestamp", signInfo.timestamp)
- .header("signature", signInfo.signature)
+ .header(HEADER_TIMESTAMP, signInfo.timestamp)
+ .header(HEADER_SIGNATURE, signInfo.signature)
.contentType(MediaType.MULTIPART_FORM_DATA)
.body(BodyInserters.fromMultipartData(formData))
.retrieve()
@@ -247,9 +210,8 @@ public class XunFeiPptApi {
SignatureInfo signInfo = getSignature();
return this.webClient.post()
.uri("/createPptByOutline")
- .header("appId", signInfo.appId)
- .header("timestamp", signInfo.timestamp)
- .header("signature", signInfo.signature)
+ .header(HEADER_TIMESTAMP, signInfo.timestamp)
+ .header(HEADER_SIGNATURE, signInfo.signature)
.contentType(MediaType.APPLICATION_JSON)
.bodyValue(request)
.retrieve()
@@ -271,9 +233,8 @@ public class XunFeiPptApi {
.path("/progress")
.queryParam("sid", sid)
.build())
- .header("appId", signInfo.appId)
- .header("timestamp", signInfo.timestamp)
- .header("signature", signInfo.signature)
+ .header(HEADER_TIMESTAMP, signInfo.timestamp)
+ .header(HEADER_SIGNATURE, signInfo.signature)
.retrieve()
.onStatus(STATUS_PREDICATE, EXCEPTION_FUNCTION.apply(sid))
.bodyToMono(ProgressResponse.class)
@@ -285,7 +246,6 @@ public class XunFeiPptApi {
*/
@JsonInclude(value = JsonInclude.Include.NON_NULL)
private record SignatureInfo(
- String appId,
String timestamp,
String signature
) {
@@ -461,6 +421,7 @@ public class XunFeiPptApi {
* 通过大纲创建 PPT 请求参数
*/
@JsonInclude(value = JsonInclude.Include.NON_NULL)
+ @Builder
public record CreatePptByOutlineRequest(
String query, // 用户生成PPT要求（最多8000字）
String outlineSid, // 已生成大纲后，响应返回的请求大纲唯一id
@@ -476,123 +437,18 @@ public class XunFeiPptApi {
Boolean isFigure, // 是否自动配图
String aiImage // ai配图类型：normal、advanced
) {
-
- /**
- * 创建构建器
- *
- * @return 构建器
- */
- public static Builder builder() {
- return new Builder();
- }
-
- // TODO @新：这个可以用 lombok 简化么？
-
- /**
- * 构建器类
- */
- public static class Builder {
-
- private String query;
- private String outlineSid;
- private OutlineData outline;
- private String templateId;
- private String businessId;
- private String author;
- private Boolean isCardNote;
- private Boolean search;
- private String language;
- private String fileUrl;
- private String fileName;
- private Boolean isFigure;
- private String aiImage;
-
- public Builder query(String query) {
- this.query = query;
- return this;
- }
-
- public Builder outlineSid(String outlineSid) {
- this.outlineSid = outlineSid;
- return this;
- }
-
- public Builder outline(OutlineData outline) {
- this.outline = outline;
- return this;
- }
-
- public Builder templateId(String templateId) {
- this.templateId = templateId;
- return this;
- }
-
- public Builder businessId(String businessId) {
- this.businessId = businessId;
- return this;
- }
-
- public Builder author(String author) {
- this.author = author;
- return this;
- }
-
- public Builder isCardNote(Boolean isCardNote) {
- this.isCardNote = isCardNote;
- return this;
- }
-
- public Builder search(Boolean search) {
- this.search = search;
- return this;
- }
-
- public Builder language(String language) {
- this.language = language;
- return this;
- }
-
- public Builder fileUrl(String fileUrl) {
- this.fileUrl = fileUrl;
- return this;
- }
-
- public Builder fileName(String fileName) {
- this.fileName = fileName;
- return this;
- }
-
- public Builder isFigure(Boolean isFigure) {
- this.isFigure = isFigure;
- return this;
- }
-
- public Builder aiImage(String aiImage) {
- this.aiImage = aiImage;
- return this;
- }
-
- public CreatePptByOutlineRequest build() {
- return new CreatePptByOutlineRequest(
- query, outlineSid, outline, templateId, businessId, author,
- isCardNote, search, language, fileUrl, fileName, isFigure, aiImage
- );
- }
- }
}
+
/**
* 构建创建 PPT 的表单数据
*
* @param request 请求参数
* @return 表单数据
*/
- private MultiValueMap buildCreateFormData(CreatePptRequest request) {
+ private MultiValueMap buildCreatePptFormData(CreatePptRequest request) {
MultiValueMap formData = new LinkedMultiValueMap<>();
- // 添加请求参数
- if (request.query() != null) {
- formData.add("query", request.query());
- }
+
if (request.file() != null) {
try {
formData.add("file", new ByteArrayResource(request.file().getBytes()) {
@@ -602,48 +458,52 @@ public class XunFeiPptApi {
}
});
} catch (IOException e) {
- log.error("[xunfei-ppt-api] 文件处理失败", e);
- throw new IllegalStateException("[xunfei-ppt-api] 文件处理失败", e);
+ log.error("[XunFeiPptApi] 文件处理失败", e);
+ throw new IllegalStateException("[XunFeiPptApi] 文件处理失败", e);
}
}
- // TODO @新：要不搞个 MapUtil.addIfPresent 方法？
- if (request.fileUrl() != null) {
- formData.add("fileUrl", request.fileUrl());
- }
- if (request.fileName() != null) {
- formData.add("fileName", request.fileName());
- }
- if (request.templateId() != null) {
- formData.add("templateId", request.templateId());
- }
- if (request.businessId() != null) {
- formData.add("businessId", request.businessId());
- }
- if (request.author() != null) {
- formData.add("author", request.author());
- }
- if (request.isCardNote() != null) {
- formData.add("isCardNote", request.isCardNote().toString());
- }
- if (request.search() != null) {
- formData.add("search", request.search().toString());
- }
- if (request.language() != null) {
- formData.add("language", request.language());
- }
- if (request.isFigure() != null) {
- formData.add("isFigure", request.isFigure().toString());
- }
- if (request.aiImage() != null) {
- formData.add("aiImage", request.aiImage());
- }
+ Map param = new HashMap<>();
+ addIfPresent(param, "query", request.query());
+ addIfPresent(param, "fileUrl", request.fileUrl());
+ addIfPresent(param, "fileName", request.fileName());
+ addIfPresent(param, "templateId", request.templateId());
+ addIfPresent(param, "businessId", request.businessId());
+ addIfPresent(param, "author", request.author());
+ addIfPresent(param, "isCardNote", request.isCardNote());
+ addIfPresent(param, "search", request.search());
+ addIfPresent(param, "language", request.language());
+ addIfPresent(param, "isFigure", request.isFigure());
+ addIfPresent(param, "aiImage", request.aiImage());
+ param.forEach(formData::add);
return formData;
}
+ public static void addIfPresent(Map map, K key, V value) {
+ if (ObjUtil.isNull(key) || ObjUtil.isNull(map)) {
+ return;
+ }
+
+ boolean isPresent = false;
+ if (ObjUtil.isNotNull(value)) {
+ if (value instanceof String) {
+ // 字符串：需要有实际内容
+ isPresent = StringUtils.hasText((String) value);
+ } else {
+ // 其他类型：非 null 即视为存在
+ isPresent = true;
+ }
+ }
+
+ if (isPresent) {
+ map.put(key, value);
+ }
+ }
+
/**
* 直接生成PPT请求参数
*/
@JsonInclude(value = JsonInclude.Include.NON_NULL)
+ @Builder
public record CreatePptRequest(
String query, // 用户生成PPT要求（最多8000字）
MultipartFile file, // 上传文件
@@ -659,109 +519,6 @@ public class XunFeiPptApi {
String aiImage // ai配图类型：normal、advanced
) {
- /**
- * 创建构建器
- *
- * @return 构建器
- */
- public static Builder builder() {
- return new Builder();
- }
-
- /**
- * 构建器类
- */
- public static class Builder {
-
- private String query;
- private MultipartFile file;
- private String fileUrl;
- private String fileName;
- private String templateId;
- private String businessId;
- private String author;
- private Boolean isCardNote;
- private Boolean search;
- private String language;
- private Boolean isFigure;
- private String aiImage;
-
- // TODO @新：这个可以用 lombok 简化么？
-
- public Builder query(String query) {
- this.query = query;
- return this;
- }
-
- public Builder file(MultipartFile file) {
- this.file = file;
- return this;
- }
-
- public Builder fileUrl(String fileUrl) {
- this.fileUrl = fileUrl;
- return this;
- }
-
- public Builder fileName(String fileName) {
- this.fileName = fileName;
- return this;
- }
-
- public Builder templateId(String templateId) {
- this.templateId = templateId;
- return this;
- }
-
- public Builder businessId(String businessId) {
- this.businessId = businessId;
- return this;
- }
-
- public Builder author(String author) {
- this.author = author;
- return this;
- }
-
- public Builder isCardNote(Boolean isCardNote) {
- this.isCardNote = isCardNote;
- return this;
- }
-
- public Builder search(Boolean search) {
- this.search = search;
- return this;
- }
-
- public Builder language(String language) {
- this.language = language;
- return this;
- }
-
- public Builder isFigure(Boolean isFigure) {
- this.isFigure = isFigure;
- return this;
- }
-
- public Builder aiImage(String aiImage) {
- this.aiImage = aiImage;
- return this;
- }
-
- public CreatePptRequest build() {
- // 验证参数
- if (query == null && file == null && fileUrl == null) {
- throw new IllegalArgumentException("query、file、fileUrl必填其一");
- }
- if ((file != null || fileUrl != null) && fileName == null) {
- throw new IllegalArgumentException("如果传file或者fileUrl，fileName必填");
- }
- return new CreatePptRequest(
- query, file, fileUrl, fileName, templateId, businessId, author,
- isCardNote, search, language, isFigure, aiImage
- );
- }
- }
}
}
\ No newline at end of file
diff --git a/yudao-module-ai/yudao-spring-boot-starter-ai/src/test/java/cn/iocoder/yudao/framework/ai/ppt/wdd/WenDuoDuoPptApiTests.java b/yudao-module-ai/yudao-spring-boot-starter-ai/src/test/java/cn/iocoder/yudao/framework/ai/ppt/wdd/WenDuoDuoPptApiTests.java
index 15ba7840bd..729775e279 100644
--- a/yudao-module-ai/yudao-spring-boot-starter-ai/src/test/java/cn/iocoder/yudao/framework/ai/ppt/wdd/WenDuoDuoPptApiTests.java
+++ b/yudao-module-ai/yudao-spring-boot-starter-ai/src/test/java/cn/iocoder/yudao/framework/ai/ppt/wdd/WenDuoDuoPptApiTests.java
@@ -16,10 +16,14 @@ import java.util.Objects;
*/
public class WenDuoDuoPptApiTests {
- private final WenDuoDuoPptApi wenDuoDuoPptApi = new WenDuoDuoPptApi("https://docmee.cn");
+ private final WenDuoDuoPptApi wenDuoDuoPptApi;
private final String token = ""; // API Token
+ {
+ wenDuoDuoPptApi = new WenDuoDuoPptApi(token);
+ }
+
@Test
@Disabled
public void testCreateApiToken() {
@@ -38,7 +42,7 @@ public class WenDuoDuoPptApiTests {
@Test
@Disabled
public void testCreateTask() {
- WenDuoDuoPptApi.ApiResponse apiResponse = wenDuoDuoPptApi.createTask(token, 1, "dify 介绍", null);
+ WenDuoDuoPptApi.ApiResponse apiResponse = wenDuoDuoPptApi.createTask(1, "dify 介绍", null);
System.out.println(apiResponse);
}
@@ -49,7 +53,7 @@ public class WenDuoDuoPptApiTests {
WenDuoDuoPptApi.CreateOutlineRequest request = new WenDuoDuoPptApi.CreateOutlineRequest(
"1901539019628613632", "medium", null, null, null, null);
// 调用
- Flux> flux = wenDuoDuoPptApi.createOutline(token, request);
+ Flux> flux = wenDuoDuoPptApi.createOutline(request);
StringBuffer contentBuffer = new StringBuffer();
flux.doOnNext(chunk -> {
contentBuffer.append(chunk.get("text"));
@@ -72,7 +76,7 @@ public class WenDuoDuoPptApiTests {
WenDuoDuoPptApi.UpdateOutlineRequest request = new WenDuoDuoPptApi.UpdateOutlineRequest(
"1901539019628613632", TEST_OUT_LINE_CONTENT, "精简一点，三个章节即可");
// 调用
- Flux> flux = wenDuoDuoPptApi.updateOutline(token, request);
+ Flux> flux = wenDuoDuoPptApi.updateOutline(request);
StringBuffer contentBuffer = new StringBuffer();
flux.doOnNext(chunk -> {
contentBuffer.append(chunk.get("text"));
@@ -98,7 +102,7 @@ public class WenDuoDuoPptApiTests {
1, null, null, null);
WenDuoDuoPptApi.TemplateQueryRequest request = new WenDuoDuoPptApi.TemplateQueryRequest(1, 10, filter);
// 调用
- WenDuoDuoPptApi.PagePptTemplateInfo pptTemplatePage = wenDuoDuoPptApi.getTemplatePage(token, request);
+ WenDuoDuoPptApi.PagePptTemplateInfo pptTemplatePage = wenDuoDuoPptApi.getTemplatePage(request);
// 打印结果
System.out.println(pptTemplatePage);
}
@@ -110,9 +114,9 @@ public class WenDuoDuoPptApiTests {
@Disabled
public void testGeneratePptx() {
// 准备参数
- WenDuoDuoPptApi.CreatePptRequest request = new WenDuoDuoPptApi.CreatePptRequest("1901539019628613632", "1805081814809960448", TEST_OUT_LINE_CONTENT);
+ WenDuoDuoPptApi.PptCreateRequest request = new WenDuoDuoPptApi.PptCreateRequest("1901539019628613632", "1805081814809960448", TEST_OUT_LINE_CONTENT);
// 调用
- WenDuoDuoPptApi.PptInfo pptInfo = wenDuoDuoPptApi.create(token, request);
+ WenDuoDuoPptApi.PptInfo pptInfo = wenDuoDuoPptApi.create(request);
// 打印结果
System.out.println(pptInfo);
}
@@ -309,6 +313,7 @@ public class WenDuoDuoPptApiTests {
#### 7.2.2 合作共赢
期待与更多的企业和机构合作，共同推动AI技术的应用。
#### 7.2.3 共创未来
- 让我们一起用AI技术改变世界，共创美好未来。""";
+ 让我们一起用AI技术改变世界，共创美好未来。
+ """;
}
diff --git a/yudao-module-ai/yudao-spring-boot-starter-ai/src/test/java/cn/iocoder/yudao/framework/ai/ppt/xunfei/XunFeiPptApiTests.java b/yudao-module-ai/yudao-spring-boot-starter-ai/src/test/java/cn/iocoder/yudao/framework/ai/ppt/xunfei/XunFeiPptApiTests.java
index 9d9117c0b9..245ef28eef 100644
--- a/yudao-module-ai/yudao-spring-boot-starter-ai/src/test/java/cn/iocoder/yudao/framework/ai/ppt/xunfei/XunFeiPptApiTests.java
+++ b/yudao-module-ai/yudao-spring-boot-starter-ai/src/test/java/cn/iocoder/yudao/framework/ai/ppt/xunfei/XunFeiPptApiTests.java
@@ -18,10 +18,10 @@ import java.io.File;
public class XunFeiPptApiTests {
// 讯飞 API 配置信息，实际使用时请替换为您的应用信息
- private static final String APP_ID = "";
- private static final String API_SECRET = "";
+ private static final String APP_ID = "6c8ac023";
+ private static final String API_SECRET = "Y2RjM2Q1MWJjZTdkYmFiODc0OGE5NmRk";
- private final XunFeiPptApi xunfeiPptApi = new XunFeiPptApi(XunFeiPptApi.BASE_URL, APP_ID, API_SECRET);
+ private final XunFeiPptApi xunfeiPptApi = new XunFeiPptApi(APP_ID, API_SECRET);
/**
* 获取 PPT 模板列表
@@ -75,6 +75,7 @@ public class XunFeiPptApiTests {
/**
* 创建大纲（通过文本）
+ *
* @return 创建大纲响应
*/
private XunFeiPptApi.CreateResponse getCreateResponse() {
@@ -160,7 +161,7 @@ public class XunFeiPptApiTests {
@Disabled
public void testPollCheckProgress() throws InterruptedException {
// 准备参数 - 使用之前创建 PP T时返回的 sid
- String sid = "fa36e926f2ed434987fcb4c1f0776ffb"; // 替换为实际的sid
+ String sid = "1690ef6ee0344e72b5c5434f403b8eaa"; // 替换为实际的sid
// 最大轮询次数
int maxPolls = 20;
From 81124292fd8b524daac7fdbb6897b9160cb32b51 Mon Sep 17 00:00:00 2001
From: puhui999
Date: Tue, 1 Apr 2025 16:28:02 +0800
Subject: [PATCH 03/15] =?UTF-8?q?=E3=80=90=E4=BB=A3=E7=A0=81=E4=BC=98?=
=?UTF-8?q?=E5=8C=96=E3=80=91=E5=95=86=E5=9F=8E=EF=BC=9A=E5=AE=A2=E6=9C=8D?=
=?UTF-8?q?=E6=B6=88=E6=81=AF=E6=90=BA=E5=B8=A6=E7=94=A8=E6=88=B7=E5=A4=B4?=
=?UTF-8?q?=E5=83=8F=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../kefu/vo/message/AppKeFuMessageRespVO.java | 42 -------------------
.../service/kefu/KeFuMessageServiceImpl.java | 19 ++++++---
2 files changed, 14 insertions(+), 47 deletions(-)
delete mode 100644 yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/kefu/vo/message/AppKeFuMessageRespVO.java
diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/kefu/vo/message/AppKeFuMessageRespVO.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/kefu/vo/message/AppKeFuMessageRespVO.java
deleted file mode 100644
index fb7331afc8..0000000000
--- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/kefu/vo/message/AppKeFuMessageRespVO.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package cn.iocoder.yudao.module.promotion.controller.app.kefu.vo.message;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Schema(description = "用户 App - 客服消息 Response VO")
-@Data
-public class AppKeFuMessageRespVO {
-
- @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "23202")
- private Long id;
-
- @Schema(description = "会话编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "12580")
- private Long conversationId;
-
- @Schema(description = "发送人编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "24571")
- private Long senderId;
-
- @Schema(description = "发送人类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- private Integer senderType;
-
- @Schema(description = "接收人编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "29124")
- private Long receiverId;
-
- @Schema(description = "接收人类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
- private Integer receiverType;
-
- @Schema(description = "消息类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- private Integer contentType;
-
- @Schema(description = "消息", requiredMode = Schema.RequiredMode.REQUIRED)
- private String content;
-
- @Schema(description = "是否已读", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- private Boolean readStatus;
-
- @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
- private LocalDateTime createTime;
-
-}
\ No newline at end of file
diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/kefu/KeFuMessageServiceImpl.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/kefu/KeFuMessageServiceImpl.java
index 5a118856d8..5736559cb7 100644
--- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/kefu/KeFuMessageServiceImpl.java
+++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/kefu/KeFuMessageServiceImpl.java
@@ -7,7 +7,9 @@ import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.infra.api.websocket.WebSocketSenderApi;
import cn.iocoder.yudao.module.member.api.user.MemberUserApi;
+import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
import cn.iocoder.yudao.module.promotion.controller.admin.kefu.vo.message.KeFuMessageListReqVO;
+import cn.iocoder.yudao.module.promotion.controller.admin.kefu.vo.message.KeFuMessageRespVO;
import cn.iocoder.yudao.module.promotion.controller.admin.kefu.vo.message.KeFuMessageSendReqVO;
import cn.iocoder.yudao.module.promotion.controller.app.kefu.vo.message.AppKeFuMessagePageReqVO;
import cn.iocoder.yudao.module.promotion.controller.app.kefu.vo.message.AppKeFuMessageSendReqVO;
@@ -15,6 +17,7 @@ import cn.iocoder.yudao.module.promotion.dal.dataobject.kefu.KeFuConversationDO;
import cn.iocoder.yudao.module.promotion.dal.dataobject.kefu.KeFuMessageDO;
import cn.iocoder.yudao.module.promotion.dal.mysql.kefu.KeFuMessageMapper;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
+import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
import jakarta.annotation.Resource;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
@@ -66,9 +69,11 @@ public class KeFuMessageServiceImpl implements KeFuMessageService {
conversationService.updateConversationLastMessage(kefuMessage);
// 3.1 发送消息给会员
- getSelf().sendAsyncMessageToMember(conversation.getUserId(), KEFU_MESSAGE_TYPE, kefuMessage);
+ AdminUserRespDTO user = adminUserApi.getUser(kefuMessage.getSenderId());
+ KeFuMessageRespVO message = BeanUtils.toBean(kefuMessage, KeFuMessageRespVO.class).setSenderAvatar(user.getAvatar());
+ getSelf().sendAsyncMessageToMember(conversation.getUserId(), KEFU_MESSAGE_TYPE, message);
// 3.2 通知所有管理员更新对话
- getSelf().sendAsyncMessageToAdmin(KEFU_MESSAGE_TYPE, kefuMessage);
+ getSelf().sendAsyncMessageToAdmin(KEFU_MESSAGE_TYPE, message);
return kefuMessage.getId();
}
@@ -84,7 +89,9 @@ public class KeFuMessageServiceImpl implements KeFuMessageService {
// 2. 更新会话消息冗余
conversationService.updateConversationLastMessage(kefuMessage);
// 3. 通知所有管理员更新对话
- getSelf().sendAsyncMessageToAdmin(KEFU_MESSAGE_TYPE, kefuMessage);
+ MemberUserRespDTO user = memberUserApi.getUser(kefuMessage.getSenderId());
+ KeFuMessageRespVO message = BeanUtils.toBean(kefuMessage, KeFuMessageRespVO.class).setSenderAvatar(user.getAvatar());
+ getSelf().sendAsyncMessageToAdmin(KEFU_MESSAGE_TYPE, message);
return kefuMessage.getId();
}
@@ -112,9 +119,11 @@ public class KeFuMessageServiceImpl implements KeFuMessageService {
// 2.3 发送消息通知会员，管理员已读 -> 会员更新发送的消息状态
KeFuMessageDO keFuMessage = getFirst(filterList(messageList, message -> UserTypeEnum.MEMBER.getValue().equals(message.getSenderType())));
assert keFuMessage != null; // 断言避免警告
- getSelf().sendAsyncMessageToMember(keFuMessage.getSenderId(), KEFU_MESSAGE_ADMIN_READ, conversation.getId());
+ getSelf().sendAsyncMessageToMember(keFuMessage.getSenderId(), KEFU_MESSAGE_ADMIN_READ,
+ new KeFuMessageRespVO().setConversationId(keFuMessage.getConversationId())); // 统一返回 json 格式
// 2.4 通知所有管理员消息已读
- getSelf().sendAsyncMessageToAdmin(KEFU_MESSAGE_ADMIN_READ, conversation.getId());
+ getSelf().sendAsyncMessageToAdmin(KEFU_MESSAGE_ADMIN_READ,
+ new KeFuMessageRespVO().setConversationId(keFuMessage.getConversationId())); // 统一返回 json 格式
}
private void validateReceiverExist(Long receiverId, Integer receiverType) {
From 40b6e5a3bbb2ebc4075e26bd11343848c76bb93a Mon Sep 17 00:00:00 2001
From: puhui999
Date: Tue, 1 Apr 2025 18:04:17 +0800
Subject: [PATCH 04/15] =?UTF-8?q?=E3=80=90=E7=BC=BA=E9=99=B7=E4=BF=AE?=
=?UTF-8?q?=E5=A4=8D=E3=80=91=E5=95=86=E5=9F=8E=EF=BC=9A=E6=A3=80=E6=9F=A5?=
=?UTF-8?q?=E6=98=AF=E5=90=A6=E5=8C=85=E9=82=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../service/price/calculator/TradeDeliveryPriceCalculator.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeDeliveryPriceCalculator.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeDeliveryPriceCalculator.java
index cb592030ff..b45c22d8a1 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeDeliveryPriceCalculator.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeDeliveryPriceCalculator.java
@@ -213,7 +213,7 @@ public class TradeDeliveryPriceCalculator implements TradePriceCalculator {
}
double totalChargeValue = getTotalChargeValue(orderItems, chargeMode);
double totalPrice = TradePriceCalculatorHelper.calculateTotalPayPrice(orderItems);
- return totalChargeValue >= templateFree.getFreeCount() && totalPrice >= templateFree.getFreePrice();
+ return totalChargeValue <= templateFree.getFreeCount() && totalPrice >= templateFree.getFreePrice();
}
private double getTotalChargeValue(List orderItems, Integer chargeMode) {
From be416b7d789c31d248253ccde1824bd04fb25915 Mon Sep 17 00:00:00 2001
From: YunaiV
Date: Thu, 3 Apr 2025 23:33:21 +0800
Subject: [PATCH 05/15] =?UTF-8?q?=E3=80=90=E4=BB=A3=E7=A0=81=E4=BC=98?=
=?UTF-8?q?=E5=8C=96=E3=80=91MALL=EF=BC=9A=E5=9C=A8=E7=BA=BF=E5=AE=A2?=
=?UTF-8?q?=E6=9C=8D=E7=9A=84=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../module/bpm/service/task/listener/BpmUserTaskListener.java | 1 -
.../module/promotion/service/kefu/KeFuMessageServiceImpl.java | 4 ++--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/listener/BpmUserTaskListener.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/listener/BpmUserTaskListener.java
index 48e2393b0f..0364eddda9 100644
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/listener/BpmUserTaskListener.java
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/listener/BpmUserTaskListener.java
@@ -13,7 +13,6 @@ import org.flowable.engine.runtime.ProcessInstance;
import org.flowable.task.service.delegate.DelegateTask;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Component;
-import org.springframework.web.client.RestTemplate;
import static cn.iocoder.yudao.module.bpm.framework.flowable.core.util.BpmnModelUtils.parseListenerConfig;
diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/kefu/KeFuMessageServiceImpl.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/kefu/KeFuMessageServiceImpl.java
index 5736559cb7..bdae150bad 100644
--- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/kefu/KeFuMessageServiceImpl.java
+++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/kefu/KeFuMessageServiceImpl.java
@@ -120,10 +120,10 @@ public class KeFuMessageServiceImpl implements KeFuMessageService {
KeFuMessageDO keFuMessage = getFirst(filterList(messageList, message -> UserTypeEnum.MEMBER.getValue().equals(message.getSenderType())));
assert keFuMessage != null; // 断言避免警告
getSelf().sendAsyncMessageToMember(keFuMessage.getSenderId(), KEFU_MESSAGE_ADMIN_READ,
- new KeFuMessageRespVO().setConversationId(keFuMessage.getConversationId())); // 统一返回 json 格式
+ new KeFuMessageRespVO().setConversationId(keFuMessage.getConversationId()));
// 2.4 通知所有管理员消息已读
getSelf().sendAsyncMessageToAdmin(KEFU_MESSAGE_ADMIN_READ,
- new KeFuMessageRespVO().setConversationId(keFuMessage.getConversationId())); // 统一返回 json 格式
+ new KeFuMessageRespVO().setConversationId(keFuMessage.getConversationId()));
}
private void validateReceiverExist(Long receiverId, Integer receiverType) {
From 8b49e5a94debc982fe8ca6e6a2a4869bd34254fb Mon Sep 17 00:00:00 2001
From: neviabit <10192451+neviabit@user.noreply.gitee.com>
Date: Tue, 8 Apr 2025 09:20:56 +0000
Subject: [PATCH 06/15] =?UTF-8?q?=E6=8E=92=E9=99=A4TinyFlow=E7=9A=84AI?=
=?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=B5=81=E4=B8=AD=E7=9A=84agents-flex-store-?=
=?UTF-8?q?elasticsearch,=20=E9=98=B2=E6=AD=A2=E4=B8=80=E7=9B=B4=E6=A3=80?=
=?UTF-8?q?=E6=B5=8B=E5=A4=B1=E8=B4=A5=E5=AF=BC=E8=87=B4=E7=9A=84Elasticse?=
=?UTF-8?q?arch=20health=20check=20failed,=20=E8=BF=99=E5=AF=BC=E8=87=B4?=
=?UTF-8?q?=E4=BA=86=E6=97=A5=E5=BF=97logs=E8=A2=AB=E8=BF=99=E4=BA=9B?=
=?UTF-8?q?=E6=97=A0=E6=84=8F=E4=B9=89=E7=9A=84=E5=BC=82=E5=B8=B8=E7=BB=99?=
=?UTF-8?q?=E5=8D=A0=E6=BB=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: neviabit <10192451+neviabit@user.noreply.gitee.com>
---
yudao-module-ai/yudao-spring-boot-starter-ai/pom.xml | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/yudao-module-ai/yudao-spring-boot-starter-ai/pom.xml b/yudao-module-ai/yudao-spring-boot-starter-ai/pom.xml
index 3ed8724b76..5f8726532d 100644
--- a/yudao-module-ai/yudao-spring-boot-starter-ai/pom.xml
+++ b/yudao-module-ai/yudao-spring-boot-starter-ai/pom.xml
@@ -123,6 +123,12 @@
dev.tinyflow
tinyflow-java-core
${tinyflow.version}
+
+
+ com.agentsflex
+ agents-flex-store-elasticsearch
+
+
From 47df4bb21fcc8230bee1338b52c9dea484cb2b6b Mon Sep 17 00:00:00 2001
From: xiaoxin <718949661@qq.com>
Date: Wed, 9 Apr 2025 13:16:29 +0800
Subject: [PATCH 07/15] feat: mcp demo
---
.../framework/ai/mcp/DouBaoMcpTests.java | 124 ++++++++++++++++++
1 file changed, 124 insertions(+)
create mode 100644 yudao-module-ai/yudao-spring-boot-starter-ai/src/test/java/cn/iocoder/yudao/framework/ai/mcp/DouBaoMcpTests.java
diff --git a/yudao-module-ai/yudao-spring-boot-starter-ai/src/test/java/cn/iocoder/yudao/framework/ai/mcp/DouBaoMcpTests.java b/yudao-module-ai/yudao-spring-boot-starter-ai/src/test/java/cn/iocoder/yudao/framework/ai/mcp/DouBaoMcpTests.java
new file mode 100644
index 0000000000..0c10443b81
--- /dev/null
+++ b/yudao-module-ai/yudao-spring-boot-starter-ai/src/test/java/cn/iocoder/yudao/framework/ai/mcp/DouBaoMcpTests.java
@@ -0,0 +1,124 @@
+package cn.iocoder.yudao.framework.ai.mcp;
+
+import cn.iocoder.yudao.framework.ai.core.model.doubao.DouBaoChatModel;
+import org.junit.jupiter.api.Test;
+import org.springframework.ai.chat.client.ChatClient;
+import org.springframework.ai.openai.OpenAiChatModel;
+import org.springframework.ai.openai.OpenAiChatOptions;
+import org.springframework.ai.openai.api.OpenAiApi;
+import org.springframework.ai.tool.annotation.Tool;
+import org.springframework.ai.tool.method.MethodToolCallbackProvider;
+
+
+public class DouBaoMcpTests {
+
+
+ private final OpenAiChatModel openAiChatModel = OpenAiChatModel.builder()
+ .openAiApi(OpenAiApi.builder()
+ .baseUrl(DouBaoChatModel.BASE_URL)
+ .apiKey("5c1b5747-26d2-4ebd-a4e0-dd0e8d8b4272") // apiKey
+ .build())
+ .defaultOptions(OpenAiChatOptions.builder()
+ .model("doubao-1-5-lite-32k-250115") // 模型（doubao）
+ .temperature(0.7)
+ .build())
+ .build();
+
+ private final DouBaoChatModel chatModel = new DouBaoChatModel(openAiChatModel);
+
+ private final MethodToolCallbackProvider provider = MethodToolCallbackProvider.builder()
+ .toolObjects(new UserService())
+ .build();
+
+ private final ChatClient chatClient = ChatClient.builder(chatModel)
+ .defaultTools(provider)
+ .build();
+
+ @Test
+ public void testMcpGetUserInfo() {
+
+ // 打印结果
+ System.out.println(chatClient.prompt()
+ .user("目前有哪些工具可以使用")
+ .call()
+ .content());
+ System.out.println("====================================");
+ // 打印结果
+ System.out.println(chatClient.prompt()
+ .user("小新的年龄是多少")
+ .call()
+ .content());
+ System.out.println("====================================");
+ // 打印结果
+ System.out.println(chatClient.prompt()
+ .user("获取小新的基本信息")
+ .call()
+ .content());
+ System.out.println("====================================");
+ // 打印结果
+ System.out.println(chatClient.prompt()
+ .user("小新是什么职业的")
+ .call()
+ .content());
+ System.out.println("====================================");
+ // 打印结果
+ System.out.println(chatClient.prompt()
+ .user("小新的教育背景")
+ .call()
+ .content());
+ System.out.println("====================================");
+ // 打印结果
+ System.out.println(chatClient.prompt()
+ .user("小新的兴趣爱好是什么")
+ .call()
+ .content());
+ System.out.println("====================================");
+
+ }
+
+
+ static class UserService {
+
+ @Tool(name = "getUserAge", description = "获取用户年龄")
+ public String getUserAge(String userName) {
+ return "《" + userName + "》的年龄为：18";
+ }
+
+ @Tool(name = "getUserSex", description = "获取用户性别")
+ public String getUserSex(String userName) {
+ return "《" + userName + "》的性别为：男";
+ }
+
+ @Tool(name = "getUserBasicInfo", description = "获取用户基本信息，包括姓名、年龄、性别等")
+ public String getUserBasicInfo(String userName) {
+ return "《" + userName + "》的基本信息：\n姓名：" + userName + "\n年龄：18\n性别：男\n身高：175cm\n体重：65kg";
+ }
+
+ @Tool(name = "getUserContact", description = "获取用户联系方式，包括电话、邮箱等")
+ public String getUserContact(String userName) {
+ return "《" + userName + "》的联系方式：\n电话：138****1234\n邮箱：" + userName.toLowerCase() + "@example.com\nQQ：123456789";
+ }
+
+ @Tool(name = "getUserAddress", description = "获取用户地址信息")
+ public String getUserAddress(String userName) {
+ return "《" + userName + "》的地址信息：北京市朝阳区科技园区88号";
+ }
+
+ @Tool(name = "getUserJob", description = "获取用户职业信息")
+ public String getUserJob(String userName) {
+ return "《" + userName + "》的职业信息：软件工程师，就职于ABC科技有限公司，工作年限5年";
+ }
+
+ @Tool(name = "getUserHobbies", description = "获取用户兴趣爱好")
+ public String getUserHobbies(String userName) {
+ return "《" + userName + "》的兴趣爱好：编程、阅读、旅游、摄影、打篮球";
+ }
+
+ @Tool(name = "getUserEducation", description = "获取用户教育背景")
+ public String getUserEducation(String userName) {
+ return "《" + userName + "》的教育背景：\n本科：计算机科学与技术专业，北京大学\n硕士：软件工程专业，清华大学";
+ }
+
+ }
+
+}
\ No newline at end of file
From 69486939d5b48aea0902de3ec1b9a79a6a301333 Mon Sep 17 00:00:00 2001
From: puhui999
Date: Fri, 11 Apr 2025 16:47:11 +0800
Subject: [PATCH 08/15] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E6=96=B0?=
=?UTF-8?q?=E5=A2=9E=E3=80=91INFRA:=20vben=20next=20=E5=8D=95=E8=A1=A8?=
=?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../enums/codegen/CodegenFrontTypeEnum.java | 1 +
.../service/codegen/inner/CodegenEngine.java | 13 +
.../ant_design_vue/index.vue.vm | 0
.../vue3_vben_next/schema/api/api.ts.vm | 115 +++++++++
.../vue3_vben_next/schema/views/data.ts.vm | 223 ++++++++++++++++++
.../vue3_vben_next/schema/views/form.vue.vm | 78 ++++++
.../vue3_vben_next/schema/views/index.vue.vm | 128 ++++++++++
7 files changed, 558 insertions(+)
create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben_next/ant_design_vue/index.vue.vm
create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben_next/schema/api/api.ts.vm
create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben_next/schema/views/data.ts.vm
create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben_next/schema/views/form.vue.vm
create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben_next/schema/views/index.vue.vm
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/enums/codegen/CodegenFrontTypeEnum.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/enums/codegen/CodegenFrontTypeEnum.java
index 101781c48c..b3550ddd00 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/enums/codegen/CodegenFrontTypeEnum.java
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/enums/codegen/CodegenFrontTypeEnum.java
@@ -15,6 +15,7 @@ public enum CodegenFrontTypeEnum {
VUE2(10), // Vue2 Element UI 标准模版
VUE3(20), // Vue3 Element Plus 标准模版
VUE3_VBEN(30), // Vue3 VBEN 模版
+ VUE3_VBEN_NEXT_SCHEMA(40), // Vue3 vben5 schema 模版
;
/**
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngine.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngine.java
index 8f00682735..ec12bfb839 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngine.java
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngine.java
@@ -144,6 +144,15 @@ public class CodegenEngine {
vue3FilePath("views/${table.moduleName}/${table.businessName}/${simpleClassName}Modal.vue"))
.put(CodegenFrontTypeEnum.VUE3_VBEN.getType(), vue3VbenTemplatePath("api/api.ts"),
vue3FilePath("api/${table.moduleName}/${table.businessName}/index.ts"))
+ // Vue3 vben5 schema 模版
+ .put(CodegenFrontTypeEnum.VUE3_VBEN_NEXT_SCHEMA.getType(), vue3VbenNextSchemaTemplatePath("views/data.ts"),
+ vue3FilePath("views/${table.moduleName}/${table.businessName}/data.ts"))
+ .put(CodegenFrontTypeEnum.VUE3_VBEN_NEXT_SCHEMA.getType(), vue3VbenNextSchemaTemplatePath("views/index.vue"),
+ vue3FilePath("views/${table.moduleName}/${table.businessName}/index.vue"))
+ .put(CodegenFrontTypeEnum.VUE3_VBEN_NEXT_SCHEMA.getType(), vue3VbenNextSchemaTemplatePath("views/form.vue"),
+ vue3FilePath("views/${table.moduleName}/${table.businessName}/modules/form.vue"))
+ .put(CodegenFrontTypeEnum.VUE3_VBEN_NEXT_SCHEMA.getType(), vue3VbenNextSchemaTemplatePath("api/api.ts"),
+ vue3FilePath("api/${table.moduleName}/${table.businessName}/index.ts"))
.build();
@Resource
@@ -496,6 +505,10 @@ public class CodegenEngine {
return "codegen/vue3_vben/" + path + ".vm";
}
+ private static String vue3VbenNextSchemaTemplatePath(String path) {
+ return "codegen/vue3_vben_next/schema/" + path + ".vm";
+ }
+
private static boolean isSubTemplate(String path) {
return path.contains("_sub");
}
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben_next/ant_design_vue/index.vue.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben_next/ant_design_vue/index.vue.vm
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben_next/schema/api/api.ts.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben_next/schema/api/api.ts.vm
new file mode 100644
index 0000000000..e313b1c7d5
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben_next/schema/api/api.ts.vm
@@ -0,0 +1,115 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+#set ($baseURL = "/${table.moduleName}/${simpleClassName_strikeCase}")
+
+export namespace ${simpleClassName}Api {
+ /** ${table.classComment}信息 */
+ export interface ${simpleClassName} {
+#foreach ($column in $columns)
+#if ($column.createOperation || $column.updateOperation)
+#if(${column.javaType.toLowerCase()} == "long" || ${column.javaType.toLowerCase()} == "integer" || ${column.javaType.toLowerCase()} == "short" || ${column.javaType.toLowerCase()} == "double" || ${column.javaType.toLowerCase()} == "bigdecimal")
+ ${column.javaField}#if($column.updateOperation && !$column.primaryKey && !$column.nullable)?#end: number; // ${column.columnComment}
+#elseif(${column.javaType.toLowerCase()} == "date" || ${column.javaType.toLowerCase()} == "localdate" || ${column.javaType.toLowerCase()} == "localdatetime")
+ ${column.javaField}#if($column.updateOperation && !$column.primaryKey && !$column.nullable)?#end: Date; // ${column.columnComment}
+#else
+ ${column.javaField}#if($column.updateOperation && !$column.primaryKey && !$column.nullable)?#end: ${column.javaType.toLowerCase()}; // ${column.columnComment}
+#end
+#end
+#end
+ }
+}
+
+#if ( $table.templateType != 2 )
+/** 查询${table.classComment}分页 */
+export function get${simpleClassName}Page(params: PageParam) {
+ return requestClient.get>('${baseURL}/page', { params });
+}
+#else
+/** 查询${table.classComment}列表 */
+export function get${simpleClassName}List(params: any) {
+ return requestClient.get<${simpleClassName}Api.${simpleClassName}[]>('${baseURL}/list', { params });
+}
+#end
+
+/** 查询${table.classComment}详情 */
+export function get${simpleClassName}(id: number) {
+ return requestClient.get<${simpleClassName}Api.${simpleClassName}>(`${baseURL}/get?id=${id}`);
+}
+
+/** 新增${table.classComment} */
+export function create${simpleClassName}(data: ${simpleClassName}Api.${simpleClassName}) {
+ return requestClient.post('${baseURL}/create', data);
+}
+
+/** 修改${table.classComment} */
+export function update${simpleClassName}(data: ${simpleClassName}Api.${simpleClassName}) {
+ return requestClient.put('${baseURL}/update', data);
+}
+
+/** 删除${table.classComment} */
+export function delete${simpleClassName}(id: number) {
+ return requestClient.delete(`${baseURL}/delete?id=${id}`);
+}
+
+/** 导出${table.classComment} */
+export function export${simpleClassName}(params: any) {
+ return requestClient.download('${baseURL}/export-excel', params);
+}
+
+## 特殊：主子表专属逻辑
+#foreach ($subTable in $subTables)
+#set ($index = $foreach.count - 1)
+#set ($subSimpleClassName = $subSimpleClassNames.get($index))
+#set ($subPrimaryColumn = $subPrimaryColumns.get($index))##当前 primary 字段
+#set ($subJoinColumn = $subJoinColumns.get($index))##当前 join 字段
+#set ($SubJoinColumnName = $subJoinColumn.javaField.substring(0,1).toUpperCase() + ${subJoinColumn.javaField.substring(1)})##首字母大写
+#set ($subSimpleClassName_strikeCase = $subSimpleClassName_strikeCases.get($index))
+#set ($subJoinColumn_strikeCase = $subJoinColumn_strikeCases.get($index))
+#set ($subClassNameVar = $subClassNameVars.get($index))
+
+// ==================== 子表（$subTable.classComment） ====================
+## 情况一：MASTER_ERP 时，需要分查询页子表
+#if ( $table.templateType == 11 )
+/** 获得${subTable.classComment}分页 */
+export function get${subSimpleClassName}Page(params: PageParam) {
+ return requestClient.get>(`${baseURL}/${subSimpleClassName_strikeCase}/page`, { params });
+}
+## 情况二：非 MASTER_ERP 时，需要列表查询子表
+#else
+ #if ( $subTable.subJoinMany )
+/** 获得${subTable.classComment}列表 */
+export function get${subSimpleClassName}ListBy${SubJoinColumnName}(${subJoinColumn.javaField}: number) {
+ return requestClient.get<${simpleClassName}Api.${simpleClassName}[]>(`${baseURL}/${subSimpleClassName_strikeCase}/list-by-${subJoinColumn_strikeCase}?${subJoinColumn.javaField}=${${subJoinColumn.javaField}}`);
+}
+ #else
+/** 获得${subTable.classComment} */
+export function get${subSimpleClassName}By${SubJoinColumnName}(${subJoinColumn.javaField}: number) {
+ return requestClient.get<${simpleClassName}Api.${simpleClassName}>(`${baseURL}/${subSimpleClassName_strikeCase}/get-by-${subJoinColumn_strikeCase}?${subJoinColumn.javaField}=${${subJoinColumn.javaField}}`);
+}
+ #end
+#end
+## 特殊：MASTER_ERP 时，支持单个的新增、修改、删除操作
+#if ( $table.templateType == 11 )
+/** 新增${subTable.classComment} */
+export function create${subSimpleClassName}(data: ${simpleClassName}Api.${simpleClassName}) {
+ return requestClient.post(`${baseURL}/${subSimpleClassName_strikeCase}/create`, data);
+}
+
+/** 修改${subTable.classComment} */
+export function update${subSimpleClassName}(data: ${simpleClassName}Api.${simpleClassName}) {
+ return requestClient.put(`${baseURL}/${subSimpleClassName_strikeCase}/update`, data);
+}
+
+/** 删除${subTable.classComment} */
+export function delete${subSimpleClassName}(id: number) {
+ return requestClient.delete(`${baseURL}/${subSimpleClassName_strikeCase}/delete?id=${id}`);
+}
+
+/** 获得${subTable.classComment} */
+export function get${subSimpleClassName}(id: number) {
+ return requestClient.get<${simpleClassName}Api.${simpleClassName}>(`${baseURL}/${subSimpleClassName_strikeCase}/get?id=${id}`);
+}
+#end
+#end
+
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben_next/schema/views/data.ts.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben_next/schema/views/data.ts.vm
new file mode 100644
index 0000000000..99223df0f8
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben_next/schema/views/data.ts.vm
@@ -0,0 +1,223 @@
+import type { VbenFormSchema } from '#/adapter/form';
+import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { ${simpleClassName}Api } from '#/api/${table.moduleName}/${simpleClassName_strikeCase}';
+
+import { z } from '#/adapter/form';
+import { CommonStatusEnum } from '#/utils/constants';
+import { DICT_TYPE, getDictOptions } from '#/utils/dict';
+import { getRangePickerDefaultProps } from '#/utils/date';
+import { useAccess } from '@vben/access';
+
+const { hasAccessByCodes } = useAccess();
+
+/** 新增/修改的表单 */
+export function useFormSchema(): VbenFormSchema[] {
+ return [
+ {
+ fieldName: 'id',
+ component: 'Input',
+ dependencies: {
+ triggerFields: [''],
+ show: () => false,
+ },
+ },
+#foreach($column in $columns)
+#if ($column.createOperation || $column.updateOperation)
+#if (!$column.primaryKey)## 忽略主键，不用在表单里
+ #set ($dictType = $column.dictType)
+ #set ($javaType = $column.javaType)
+ #set ($javaField = $column.javaField)
+ #set ($comment = $column.columnComment)
+ #if ($javaType == "Integer" || $javaType == "Long" || $javaType == "Byte" || $javaType == "Short")
+ #set ($dictMethod = "number")
+ #elseif ($javaType == "String")
+ #set ($dictMethod = "string")
+ #elseif ($javaType == "Boolean")
+ #set ($dictMethod = "boolean")
+ #end
+ {
+ fieldName: '${javaField}',
+ label: '${comment}',
+ #if (($column.createOperation || $column.updateOperation) && !$column.nullable && !${column.primaryKey})## 创建或者更新操作 && 要求非空 && 非主键
+ rules: 'required',
+ #end
+ #if ($column.htmlType == "input")
+ component: 'Input',
+ componentProps: {
+ placeholder: '请输入${comment}',
+ },
+ #elseif($column.htmlType == "imageUpload")## 图片上传
+ component: 'FileUpload',
+ componentProps: {
+ fileType: 'image',
+ maxCount: 1,
+ },
+ #elseif($column.htmlType == "fileUpload")## 文件上传
+ component: 'FileUpload',
+ componentProps: {
+ fileType: 'file',
+ maxCount: 1,
+ },
+ #elseif($column.htmlType == "editor")## 文本编辑器
+ component: 'Editor',
+ #elseif($column.htmlType == "select")## 下拉框
+ component: 'Select',
+ componentProps: {
+ #if ("" != $dictType)## 有数据字典
+ options: getDictOptions(DICT_TYPE.$dictType.toUpperCase(), '$dictMethod'),
+ #else##没数据字典
+ options: [],
+ #end
+ placeholder: '请选择${comment}',
+ },
+ #elseif($column.htmlType == "checkbox")## 多选框
+ component: 'Checkbox',
+ componentProps: {
+ #if ("" != $dictType)## 有数据字典
+ options: getDictOptions(DICT_TYPE.$dictType.toUpperCase(), '$dictMethod'),
+ #else##没数据字典
+ options: [],
+ #end
+ },
+ #elseif($column.htmlType == "radio")## 单选框
+ component: 'RadioGroup',
+ componentProps: {
+ #if ("" != $dictType)## 有数据字典
+ options: getDictOptions(DICT_TYPE.$dictType.toUpperCase(), '$dictMethod'),
+ #else##没数据字典
+ options: [],
+ #end
+ buttonStyle: 'solid',
+ optionType: 'button',
+ },
+ #elseif($column.htmlType == "datetime")## 时间框
+ component: 'DatePicker',
+ componentProps: {
+ showTime: true,
+ format: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x',
+ },
+ #elseif($column.htmlType == "textarea")## 文本域
+ component: 'Textarea',
+ componentProps: {
+ placeholder: '请输入${comment}',
+ },
+ #end
+ },
+#end
+#end
+#end
+ ];
+}
+
+/** 列表的搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+ return [
+#foreach($column in $columns)
+#if ($column.listOperation)
+ #set ($dictType = $column.dictType)
+ #set ($javaType = $column.javaType)
+ #set ($javaField = $column.javaField)
+ #set ($comment = $column.columnComment)
+ #if ($javaType == "Integer" || $javaType == "Long" || $javaType == "Byte" || $javaType == "Short")
+ #set ($dictMethod = "number")
+ #elseif ($javaType == "String")
+ #set ($dictMethod = "string")
+ #elseif ($javaType == "Boolean")
+ #set ($dictMethod = "boolean")
+ #end
+ {
+ fieldName: '${javaField}',
+ label: '${comment}',
+ #if ($column.htmlType == "input")
+ component: 'Input',
+ componentProps: {
+ allowClear: true,
+ placeholder: '请输入${comment}',
+ },
+ #elseif ($column.htmlType == "select")
+ component: 'Select',
+ componentProps: {
+ allowClear: true,
+ #if ("" != $dictType)## 设置了 dictType 数据字典的情况
+ options: getDictOptions(DICT_TYPE.$dictType.toUpperCase(), '$dictMethod'),
+ #else## 未设置 dictType 数据字典的情况
+ options: [],
+ #end
+ placeholder: '请选择${comment}',
+ },
+ #elseif ($column.htmlType == "radio")
+ component: 'Select',
+ componentProps: {
+ allowClear: true,
+ #if ("" != $dictType)## 设置了 dictType 数据字典的情况
+ options: getDictOptions(DICT_TYPE.$dictType.toUpperCase(), '$dictMethod'),
+ #else## 未设置 dictType 数据字典的情况
+ options: [],
+ #end
+ },
+ #elseif($column.htmlType == "datetime")
+ component: 'RangePicker',
+ componentProps: {
+ ...getRangePickerDefaultProps(),
+ allowClear: true,
+ },
+ #end
+ },
+#end
+#end
+ ];
+}
+
+/** 列表的字段 */
+export function useGridColumns(
+ onActionClick: OnActionClickFn,
+): VxeTableGridOptions['columns'] {
+ return [
+#foreach($column in $columns)
+#if ($column.listOperationResult)
+ #set ($dictType = $column.dictType)
+ #set ($javaField = $column.javaField)
+ #set ($comment = $column.columnComment)
+ {
+ field: '${javaField}',
+ title: '${comment}',
+ minWidth: 120,
+ #if ($column.javaType == "LocalDateTime")## 时间类型
+ formatter: 'formatDateTime',
+ #elseif("" != $dictType)## 数据字典
+ cellRender: {
+ name: 'CellDict',
+ props: { type: DICT_TYPE.$dictType.toUpperCase() },
+ },
+ #end
+ },
+#end
+#end
+ {
+ field: 'operation',
+ title: '操作',
+ minWidth: 180,
+ align: 'center',
+ fixed: 'right',
+ cellRender: {
+ attrs: {
+ nameField: '${columns[0].javaField}',
+ nameTitle: '${table.classComment}',
+ onClick: onActionClick,
+ },
+ name: 'CellOperation',
+ options: [
+ {
+ code: 'edit',
+ show: hasAccessByCodes(['${table.moduleName}:${simpleClassName_strikeCase}:update']),
+ },
+ {
+ code: 'delete',
+ show: hasAccessByCodes(['${table.moduleName}:${simpleClassName_strikeCase}:delete']),
+ }
+ ],
+ },
+ },
+ ];
+}
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben_next/schema/views/form.vue.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben_next/schema/views/form.vue.vm
new file mode 100644
index 0000000000..1970b3707c
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben_next/schema/views/form.vue.vm
@@ -0,0 +1,78 @@
+
+
+
+
+
+
+
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben_next/schema/views/index.vue.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben_next/schema/views/index.vue.vm
new file mode 100644
index 0000000000..62d0bd568a
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben_next/schema/views/index.vue.vm
@@ -0,0 +1,128 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
From 015565cc9a577f6e2174f08d8a683f2574d41d53 Mon Sep 17 00:00:00 2001
From: puhui999
Date: Fri, 11 Apr 2025 18:21:42 +0800
Subject: [PATCH 09/15] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E6=96=B0?=
=?UTF-8?q?=E5=A2=9E=E3=80=91INFRA:=20vben=20next=20=E6=A0=91=E8=A1=A8?=
=?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../service/codegen/inner/CodegenEngine.java | 9 +++
.../vue3_vben_next/schema/api/api.ts.vm | 3 +
.../vue3_vben_next/schema/views/data.ts.vm | 76 ++++++++++++++++---
.../vue3_vben_next/schema/views/form.vue.vm | 60 +++++++++++++--
.../vue3_vben_next/schema/views/index.vue.vm | 62 ++++++++++++++-
5 files changed, 187 insertions(+), 23 deletions(-)
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngine.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngine.java
index ec12bfb839..2380c6d89a 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngine.java
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngine.java
@@ -153,6 +153,15 @@ public class CodegenEngine {
vue3FilePath("views/${table.moduleName}/${table.businessName}/modules/form.vue"))
.put(CodegenFrontTypeEnum.VUE3_VBEN_NEXT_SCHEMA.getType(), vue3VbenNextSchemaTemplatePath("api/api.ts"),
vue3FilePath("api/${table.moduleName}/${table.businessName}/index.ts"))
+ // 主子表模板配置 - Vue3 vben5 schema 模版
+ //.put(CodegenFrontTypeEnum.VUE3_VBEN_NEXT_SCHEMA.getType(), vue3VbenNextSchemaTemplatePath("views/master_slave_data.ts"),
+ // vue3FilePath("views/${table.moduleName}/${table.businessName}/data.ts"))
+ //.put(CodegenFrontTypeEnum.VUE3_VBEN_NEXT_SCHEMA.getType(), vue3VbenNextSchemaTemplatePath("views/master_slave_index.vue"),
+ // vue3FilePath("views/${table.moduleName}/${table.businessName}/index.vue"))
+ //.put(CodegenFrontTypeEnum.VUE3_VBEN_NEXT_SCHEMA.getType(), vue3VbenNextSchemaTemplatePath("views/modules/master_slave_form.vue"),
+ // vue3FilePath("views/${table.moduleName}/${table.businessName}/modules/form.vue"))
+ //.put(CodegenFrontTypeEnum.VUE3_VBEN_NEXT_SCHEMA.getType(), vue3VbenNextSchemaTemplatePath("views/modules/sub_table.vue"),
+ // vue3FilePath("views/${table.moduleName}/${table.businessName}/modules/sub_table.vue"))
.build();
@Resource
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben_next/schema/api/api.ts.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben_next/schema/api/api.ts.vm
index e313b1c7d5..b1a24af09c 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben_next/schema/api/api.ts.vm
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben_next/schema/api/api.ts.vm
@@ -16,6 +16,9 @@ export namespace ${simpleClassName}Api {
${column.javaField}#if($column.updateOperation && !$column.primaryKey && !$column.nullable)?#end: ${column.javaType.toLowerCase()}; // ${column.columnComment}
#end
#end
+#end
+#if ( $table.templateType == 2 )
+ children?: ${simpleClassName}[];
#end
}
}
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben_next/schema/views/data.ts.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben_next/schema/views/data.ts.vm
index 99223df0f8..2ff36e963c 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben_next/schema/views/data.ts.vm
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben_next/schema/views/data.ts.vm
@@ -1,11 +1,15 @@
+import type { VxeTableGridOptions } from '@vben/plugins/vxe-table';
import type { VbenFormSchema } from '#/adapter/form';
-import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { OnActionClickFn } from '#/adapter/vxe-table';
import type { ${simpleClassName}Api } from '#/api/${table.moduleName}/${simpleClassName_strikeCase}';
import { z } from '#/adapter/form';
-import { CommonStatusEnum } from '#/utils/constants';
+#if(${table.templateType} == 2)## 树表需要导入这些
+import { get${simpleClassName}List } from '#/api/${table.moduleName}/${simpleClassName_strikeCase}';
+import { handleTree } from '#/utils/tree';
+#end
import { DICT_TYPE, getDictOptions } from '#/utils/dict';
-import { getRangePickerDefaultProps } from '#/utils/date';
+import { CommonStatusEnum } from '#/utils/constants';
import { useAccess } from '@vben/access';
const { hasAccessByCodes } = useAccess();
@@ -21,9 +25,34 @@ export function useFormSchema(): VbenFormSchema[] {
show: () => false,
},
},
+#if(${table.templateType} == 2)## 树表特有字段：上级
+ {
+ fieldName: '${treeParentColumn.javaField}',
+ label: '上级${table.classComment}',
+ component: 'ApiTreeSelect',
+ componentProps: {
+ allowClear: true,
+ api: async () => {
+ const data = await get${simpleClassName}List({});
+ data.unshift({
+ id: 0,
+ ${treeNameColumn.javaField}: '顶级${table.classComment}',
+ });
+ return handleTree(data);
+ },
+ class: 'w-full',
+ labelField: '${treeNameColumn.javaField}',
+ valueField: 'id',
+ childrenField: 'children',
+ placeholder: '请选择上级${table.classComment}',
+ treeDefaultExpandAll: true,
+ },
+ rules: 'selectRequired',
+ },
+#end
#foreach($column in $columns)
#if ($column.createOperation || $column.updateOperation)
-#if (!$column.primaryKey)## 忽略主键，不用在表单里
+#if (!$column.primaryKey && ($table.templateType != 2 || ($table.templateType == 2 && $column.id != $treeParentColumn.id)))## 树表中已经添加了父ID字段，这里排除
#set ($dictType = $column.dictType)
#set ($javaType = $column.javaType)
#set ($javaField = $column.javaField)
@@ -69,6 +98,7 @@ export function useFormSchema(): VbenFormSchema[] {
options: [],
#end
placeholder: '请选择${comment}',
+ class: 'w-full',
},
#elseif($column.htmlType == "checkbox")## 多选框
component: 'Checkbox',
@@ -102,6 +132,14 @@ export function useFormSchema(): VbenFormSchema[] {
componentProps: {
placeholder: '请输入${comment}',
},
+ #elseif($column.htmlType == "inputNumber")## 数字输入框
+ component: 'InputNumber',
+ componentProps: {
+ min: 0,
+ class: 'w-full',
+ controlsPosition: 'right',
+ placeholder: '请输入${comment}',
+ },
#end
},
#end
@@ -159,7 +197,6 @@ export function useGridFormSchema(): VbenFormSchema[] {
#elseif($column.htmlType == "datetime")
component: 'RangePicker',
componentProps: {
- ...getRangePickerDefaultProps(),
allowClear: true,
},
#end
@@ -170,9 +207,9 @@ export function useGridFormSchema(): VbenFormSchema[] {
}
/** 列表的字段 */
-export function useGridColumns(
- onActionClick: OnActionClickFn,
-): VxeTableGridOptions['columns'] {
+export function useGridColumns(
+ onActionClick?: OnActionClickFn<${simpleClassName}Api.${simpleClassName}>,
+): VxeTableGridOptions<${simpleClassName}Api.${simpleClassName}>['columns'] {
return [
#foreach($column in $columns)
#if ($column.listOperationResult)
@@ -190,6 +227,9 @@ export function useGridColumns(
name: 'CellDict',
props: { type: DICT_TYPE.$dictType.toUpperCase() },
},
+ #end
+ #if (${table.templateType} == 2 && $column.id == $treeNameColumn.id)## 树表特有:标记树节点列
+ treeNode: true,
#end
},
#end
@@ -197,9 +237,11 @@ export function useGridColumns(
{
field: 'operation',
title: '操作',
- minWidth: 180,
- align: 'center',
+ minWidth: 200,
+ align: 'right',
fixed: 'right',
+ headerAlign: 'center',
+ showOverflow: false,
cellRender: {
attrs: {
nameField: '${columns[0].javaField}',
@@ -208,6 +250,13 @@ export function useGridColumns(
},
name: 'CellOperation',
options: [
+#if (${table.templateType} == 2)## 树表特有操作
+ {
+ code: 'add_child',
+ text: '新增下级',
+ show: hasAccessByCodes(['${table.moduleName}:${simpleClassName_strikeCase}:create']),
+ },
+#end
{
code: 'edit',
show: hasAccessByCodes(['${table.moduleName}:${simpleClassName_strikeCase}:update']),
@@ -215,7 +264,12 @@ export function useGridColumns(
{
code: 'delete',
show: hasAccessByCodes(['${table.moduleName}:${simpleClassName_strikeCase}:delete']),
- }
+#if (${table.templateType} == 2)## 树表禁止删除带有子节点的数据
+ disabled: (row: ${simpleClassName}Api.${simpleClassName}) => {
+ return !!(row.children && row.children.length > 0);
+ },
+#end
+ },
],
},
},
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben_next/schema/views/form.vue.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben_next/schema/views/form.vue.vm
index 1970b3707c..91d86e7e9a 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben_next/schema/views/form.vue.vm
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben_next/schema/views/form.vue.vm
@@ -4,8 +4,8 @@ import type { ${simpleClassName}Api } from '#/api/${table.moduleName}/${simpleCl
import { useVbenModal } from '@vben/common-ui';
import { message } from 'ant-design-vue';
-import { $t } from '#/locales';
import { computed, ref } from 'vue';
+import { $t } from '#/locales';
import { useVbenForm } from '#/adapter/form';
import { get${simpleClassName}, create${simpleClassName}, update${simpleClassName} } from '#/api/${table.moduleName}/${simpleClassName_strikeCase}';
@@ -13,11 +13,25 @@ import { useFormSchema } from '../data';
const emit = defineEmits(['success']);
const formData = ref<${simpleClassName}Api.${simpleClassName}>();
+#if (${table.templateType} == 2)## 树表特有：父ID处理
+// 新增下级时的父级ID
+const parentId = ref();
+
+const getTitle = computed(() => {
+ if (formData.value?.id) {
+ return $t('ui.actionTitle.edit', ['${table.classComment}']);
+ }
+ return parentId.value
+ ? $t('ui.actionTitle.create', ['下级${table.classComment}'])
+ : $t('ui.actionTitle.create', ['${table.classComment}']);
+});
+#else## 标准表标题
const getTitle = computed(() => {
return formData.value?.id
? $t('ui.actionTitle.edit', ['${table.classComment}'])
: $t('ui.actionTitle.create', ['${table.classComment}']);
});
+#end
const [Form, formApi] = useVbenForm({
layout: 'horizontal',
@@ -55,17 +69,47 @@ const [Modal, modalApi] = useVbenModal({
return;
}
// 加载数据
+#if (${table.templateType} == 2)## 树表处理传入的父ID
+ let data = modalApi.getData<${simpleClassName}Api.${simpleClassName}>();
+#else## 标准表直接获取
const data = modalApi.getData<${simpleClassName}Api.${simpleClassName}>();
- if (!data || !data.id) {
+#end
+ if (!data) {
return;
}
- modalApi.lock();
- try {
- formData.value = await get${simpleClassName}(data.id as number);
- // 设置到 values
+
+#if (${table.templateType} == 2)## 树表特有：处理新增下级的情况
+ // 处理新增下级的情况
+ if (!data.id && data.${treeParentColumn.javaField}) {
+ parentId.value = data.${treeParentColumn.javaField};
+ formData.value = { ${treeParentColumn.javaField}: parentId.value } as ${simpleClassName}Api.${simpleClassName};
await formApi.setValues(formData.value);
- } finally {
- modalApi.lock(false);
+ return;
+ }
+#end
+
+ if (data.id) {
+ // 编辑
+ modalApi.lock();
+ try {
+#if (${table.templateType} == 2)## 树表获取数据后重新赋值
+ data = await get${simpleClassName}(data.id);
+ formData.value = data;
+#else## 标准表设置表单数据
+ formData.value = await get${simpleClassName}(data.id as number);
+#end
+ await formApi.setValues(formData.value);
+ } finally {
+ modalApi.lock(false);
+ }
+ } else {
+ // 新增
+#if (${table.templateType} == 2)## 树表特有：设置顶级ID
+ formData.value = { ${treeParentColumn.javaField}: 0 } as ${simpleClassName}Api.${simpleClassName};
+#else## 标准表：设置空值
+ formData.value = data;
+#end
+ await formApi.setValues(formData.value || {});
}
},
});
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben_next/schema/views/index.vue.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben_next/schema/views/index.vue.vm
index 62d0bd568a..e0ba37174b 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben_next/schema/views/index.vue.vm
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben_next/schema/views/index.vue.vm
@@ -8,9 +8,15 @@ import { Download, Plus } from '@vben/icons';
import Form from './modules/form.vue';
import { DocAlert } from '#/components/doc-alert';
+import { ref } from 'vue';
import { $t } from '#/locales';
import { useVbenVxeGrid } from '#/adapter/vxe-table';
+#if (${table.templateType} == 2)## 树表接口
+import { get${simpleClassName}List, delete${simpleClassName}, export${simpleClassName} } from '#/api/${table.moduleName}/${simpleClassName_strikeCase}';
+import { handleTree } from '#/utils/tree';
+#else## 标准表接口
import { get${simpleClassName}Page, delete${simpleClassName}, export${simpleClassName} } from '#/api/${table.moduleName}/${simpleClassName_strikeCase}';
+#end
import { downloadByData } from '#/utils/download';
import { useGridColumns, useGridFormSchema } from './data';
@@ -20,6 +26,15 @@ const [FormModal, formModalApi] = useVbenModal({
destroyOnClose: true,
});
+#if (${table.templateType} == 2)## 树表特有：控制表格展开收缩
+/** 切换树形展开/收缩状态 */
+const isExpanded = ref(true);
+function toggleExpand() {
+ isExpanded.value = !isExpanded.value;
+ gridApi.grid.setAllTreeExpand(isExpanded.value);
+}
+#end
+
/** 刷新表格 */
function onRefresh() {
gridApi.query();
@@ -41,17 +56,24 @@ function onEdit(row: ${simpleClassName}Api.${simpleClassName}) {
formModalApi.setData(row).open();
}
+#if (${table.templateType} == 2)## 树表特有：新增下级
+/** 新增下级${table.classComment} */
+function onAddChild(row: ${simpleClassName}Api.${simpleClassName}) {
+ formModalApi.setData({ ${treeParentColumn.javaField}: row.id }).open();
+}
+#end
+
/** 删除${table.classComment} */
async function onDelete(row: ${simpleClassName}Api.${simpleClassName}) {
const hideLoading = message.loading({
- content: $t('ui.actionMessage.deleting', [row.${columns[0].javaField}]),
+ content: $t('ui.actionMessage.deleting', [row.id]),
duration: 0,
key: 'action_process_msg',
});
try {
await delete${simpleClassName}(row.id as number);
message.success({
- content: $t('ui.actionMessage.deleteSuccess', [row.${columns[0].javaField}]),
+ content: $t('ui.actionMessage.deleteSuccess', [row.id]),
key: 'action_process_msg',
});
onRefresh();
@@ -74,6 +96,12 @@ function onActionClick({
onDelete(row);
break;
}
+#if (${table.templateType} == 2)## 树表特有：新增下级
+ case 'add_child': {
+ onAddChild(row);
+ break;
+ }
+#end
}
}
@@ -84,20 +112,40 @@ const [Grid, gridApi] = useVbenVxeGrid({
gridOptions: {
columns: useGridColumns(onActionClick),
height: 'auto',
- keepSource: true,
+#if (${table.templateType} == 2)## 树表设置
+ treeConfig: {
+ parentField: '${treeParentColumn.javaField}',
+ rowField: 'id',
+ transform: true,
+ expandAll: true,
+ reserve: true,
+ },
+#else## 标准表设置
+ pagerConfig: {
+ enabled: true,
+ },
+#end
proxyConfig: {
ajax: {
+#if (${table.templateType} == 2)## 树表数据加载
+ query: async (_, formValues) => {
+ return await get${simpleClassName}List(formValues);
+ },
+#else## 标准表数据加载
query: async ({ page }, formValues) => {
- return await get${simpleClassName}Page({
+ const { items, total } = await get${simpleClassName}Page({
pageNo: page.currentPage,
pageSize: page.pageSize,
...formValues,
});
+ return { items, total };
},
+#end
},
},
rowConfig: {
keyField: 'id',
+ isHover: true,
},
toolbarConfig: {
refresh: { code: 'query' },
@@ -112,8 +160,14 @@ const [Grid, gridApi] = useVbenVxeGrid({
+
+#if (${table.templateType} == 2)## 树表特有：展开/收缩按钮
+
+#end