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 682850b98..12a63f3d4 100644
--- a/yudao-module-ai/yudao-spring-boot-starter-ai/pom.xml
+++ b/yudao-module-ai/yudao-spring-boot-starter-ai/pom.xml
@@ -112,6 +112,18 @@
dev.tinyflow
tinyflow-java-core
${tinyflow.version}
+
+
+
+ com.agentsflex
+ agents-flex-store-elasticsearch
+
+
+
+ org.codehaus.groovy
+ groovy-all
+
+
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 000000000..a97bd0a5c
--- /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,122 @@
+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
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 3bb9898ad..54c8cffc5 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,24 +10,23 @@ import java.util.Map;
import java.util.Objects;
/**
- * {@link WddPptApi} 集成测试
+ * {@link WenDuoDuoPptApi} 集成测试
*
* @author xiaoxin
*/
-public class WddPptApiTests {
-
- private final WddPptApi wddPptApi = new WddPptApi("https://docmee.cn");
+public class WenDuoDuoPptApiTests {
private final String token = ""; // API Token
+ private final WenDuoDuoPptApi wenDuoDuoPptApi = new WenDuoDuoPptApi(token);
@Test
@Disabled
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 +37,7 @@ public class WddPptApiTests {
@Test
@Disabled
public void testCreateTask() {
- WddPptApi.ApiResponse apiResponse = wddPptApi.createTask(token, 1, "dify 介绍", null);
+ WenDuoDuoPptApi.ApiResponse apiResponse = wenDuoDuoPptApi.createTask(1, "dify 介绍", null);
System.out.println(apiResponse);
}
@@ -46,10 +45,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(request);
StringBuffer contentBuffer = new StringBuffer();
flux.doOnNext(chunk -> {
contentBuffer.append(chunk.get("text"));
@@ -69,10 +68,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(request);
StringBuffer contentBuffer = new StringBuffer();
flux.doOnNext(chunk -> {
contentBuffer.append(chunk.get("text"));
@@ -94,11 +93,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(request);
// 打印结果
System.out.println(pptTemplatePage);
}
@@ -110,9 +109,9 @@ public class WddPptApiTests {
@Disabled
public void testGeneratePptx() {
// 准备参数
- WddPptApi.CreatePptRequest request = new WddPptApi.CreatePptRequest("1901539019628613632", "1805081814809960448", TEST_OUT_LINE_CONTENT);
+ WenDuoDuoPptApi.PptCreateRequest request = new WenDuoDuoPptApi.PptCreateRequest("1901539019628613632", "1805081814809960448", TEST_OUT_LINE_CONTENT);
// 调用
- WddPptApi.PptInfo pptInfo = wddPptApi.create(token, request);
+ WenDuoDuoPptApi.PptInfo pptInfo = wenDuoDuoPptApi.create(request);
// 打印结果
System.out.println(pptInfo);
}
@@ -309,6 +308,7 @@ public class WddPptApiTests {
#### 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
similarity index 88%
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 34088bf54..245ef28ee 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 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 模板列表
@@ -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));
@@ -75,9 +75,10 @@ public class XunfeiPptApiTests {
/**
* 创建大纲（通过文本）
+ *
* @return 创建大纲响应
*/
- private XunfeiPptApi.CreateResponse getCreateResponse() {
+ private XunFeiPptApi.CreateResponse getCreateResponse() {
String param = "智能体平台 Dify 介绍";
return xunfeiPptApi.createOutline(param);
}
@@ -89,9 +90,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 +115,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());
@@ -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;
@@ -171,11 +172,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 +219,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 +245,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 +270,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 +281,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 +297,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()
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/redis/BpmProcessIdRedisDAO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/redis/BpmProcessIdRedisDAO.java
index 0c31fbfa1..d4f00db49 100644
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/redis/BpmProcessIdRedisDAO.java
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/redis/BpmProcessIdRedisDAO.java
@@ -10,6 +10,8 @@ import org.springframework.stereotype.Repository;
import java.time.Duration;
import java.time.LocalDateTime;
+import static cn.hutool.core.date.DatePattern.*;
+
/**
* BPM 流程 Id 编码的 Redis DAO
*
@@ -32,16 +34,16 @@ public class BpmProcessIdRedisDAO {
String infix = "";
switch (processIdRule.getInfix()) {
case "DAY":
- infix = DateUtil.format(LocalDateTime.now(), "yyyyMMDD");
+ infix = DateUtil.format(LocalDateTime.now(), PURE_DATE_PATTERN);
break;
case "HOUR":
- infix = DateUtil.format(LocalDateTime.now(), "yyyyMMDDHH");
+ infix = DateUtil.format(LocalDateTime.now(), PURE_DATE_PATTERN + "HH");
break;
case "MINUTE":
- infix = DateUtil.format(LocalDateTime.now(), "yyyyMMDDHHmm");
+ infix = DateUtil.format(LocalDateTime.now(), PURE_DATE_PATTERN + "HHmm");
break;
case "SECOND":
- infix = DateUtil.format(LocalDateTime.now(), "yyyyMMDDHHmmss");
+ infix = DateUtil.format(LocalDateTime.now(), PURE_DATETIME_PATTERN);
break;
}
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 101781c48..1b6bb41ab 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
@@ -12,9 +12,10 @@ import lombok.Getter;
@Getter
public enum CodegenFrontTypeEnum {
- VUE2(10), // Vue2 Element UI 标准模版
- VUE3(20), // Vue3 Element Plus 标准模版
- VUE3_VBEN(30), // Vue3 VBEN 模版
+ VUE2_ELEMENT_UI(10), // Vue2 Element UI 标准模版
+ VUE3_ELEMENT_PLUS(20), // Vue3 Element Plus 标准模版
+ VUE3_VBEN2_ANTD_SCHEMA(30), // Vue3 VBEN2 + ANTD + Schema 模版
+ VUE3_VBEN5_ANTD_SCHEMA(40), // Vue3 VBEN5 + ANTD + 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 8f0068273..65cf236b5 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
@@ -101,49 +101,68 @@ public class CodegenEngine {
* value：生成的路径
*/
private static final Table FRONT_TEMPLATES = ImmutableTable.builder()
- // Vue2 标准模版
- .put(CodegenFrontTypeEnum.VUE2.getType(), vueTemplatePath("views/index.vue"),
+ // VUE2_ELEMENT_UI
+ .put(CodegenFrontTypeEnum.VUE2_ELEMENT_UI.getType(), vueTemplatePath("views/index.vue"),
vueFilePath("views/${table.moduleName}/${table.businessName}/index.vue"))
- .put(CodegenFrontTypeEnum.VUE2.getType(), vueTemplatePath("api/api.js"),
+ .put(CodegenFrontTypeEnum.VUE2_ELEMENT_UI.getType(), vueTemplatePath("api/api.js"),
vueFilePath("api/${table.moduleName}/${table.businessName}/index.js"))
- .put(CodegenFrontTypeEnum.VUE2.getType(), vueTemplatePath("views/form.vue"),
+ .put(CodegenFrontTypeEnum.VUE2_ELEMENT_UI.getType(), vueTemplatePath("views/form.vue"),
vueFilePath("views/${table.moduleName}/${table.businessName}/${simpleClassName}Form.vue"))
- .put(CodegenFrontTypeEnum.VUE2.getType(), vueTemplatePath("views/components/form_sub_normal.vue"), // 特殊：主子表专属逻辑
+ .put(CodegenFrontTypeEnum.VUE2_ELEMENT_UI.getType(), vueTemplatePath("views/components/form_sub_normal.vue"), // 特殊：主子表专属逻辑
vueFilePath("views/${table.moduleName}/${table.businessName}/components/${subSimpleClassName}Form.vue"))
- .put(CodegenFrontTypeEnum.VUE2.getType(), vueTemplatePath("views/components/form_sub_inner.vue"), // 特殊：主子表专属逻辑
+ .put(CodegenFrontTypeEnum.VUE2_ELEMENT_UI.getType(), vueTemplatePath("views/components/form_sub_inner.vue"), // 特殊：主子表专属逻辑
vueFilePath("views/${table.moduleName}/${table.businessName}/components/${subSimpleClassName}Form.vue"))
- .put(CodegenFrontTypeEnum.VUE2.getType(), vueTemplatePath("views/components/form_sub_erp.vue"), // 特殊：主子表专属逻辑
+ .put(CodegenFrontTypeEnum.VUE2_ELEMENT_UI.getType(), vueTemplatePath("views/components/form_sub_erp.vue"), // 特殊：主子表专属逻辑
vueFilePath("views/${table.moduleName}/${table.businessName}/components/${subSimpleClassName}Form.vue"))
- .put(CodegenFrontTypeEnum.VUE2.getType(), vueTemplatePath("views/components/list_sub_inner.vue"), // 特殊：主子表专属逻辑
+ .put(CodegenFrontTypeEnum.VUE2_ELEMENT_UI.getType(), vueTemplatePath("views/components/list_sub_inner.vue"), // 特殊：主子表专属逻辑
vueFilePath("views/${table.moduleName}/${table.businessName}/components/${subSimpleClassName}List.vue"))
- .put(CodegenFrontTypeEnum.VUE2.getType(), vueTemplatePath("views/components/list_sub_erp.vue"), // 特殊：主子表专属逻辑
+ .put(CodegenFrontTypeEnum.VUE2_ELEMENT_UI.getType(), vueTemplatePath("views/components/list_sub_erp.vue"), // 特殊：主子表专属逻辑
vueFilePath("views/${table.moduleName}/${table.businessName}/components/${subSimpleClassName}List.vue"))
- // Vue3 标准模版
- .put(CodegenFrontTypeEnum.VUE3.getType(), vue3TemplatePath("views/index.vue"),
+ // VUE3_ELEMENT_PLUS
+ .put(CodegenFrontTypeEnum.VUE3_ELEMENT_PLUS.getType(), vue3TemplatePath("views/index.vue"),
vue3FilePath("views/${table.moduleName}/${table.businessName}/index.vue"))
- .put(CodegenFrontTypeEnum.VUE3.getType(), vue3TemplatePath("views/form.vue"),
+ .put(CodegenFrontTypeEnum.VUE3_ELEMENT_PLUS.getType(), vue3TemplatePath("views/form.vue"),
vue3FilePath("views/${table.moduleName}/${table.businessName}/${simpleClassName}Form.vue"))
- .put(CodegenFrontTypeEnum.VUE3.getType(), vue3TemplatePath("views/components/form_sub_normal.vue"), // 特殊：主子表专属逻辑
+ .put(CodegenFrontTypeEnum.VUE3_ELEMENT_PLUS.getType(), vue3TemplatePath("views/components/form_sub_normal.vue"), // 特殊：主子表专属逻辑
vue3FilePath("views/${table.moduleName}/${table.businessName}/components/${subSimpleClassName}Form.vue"))
- .put(CodegenFrontTypeEnum.VUE3.getType(), vue3TemplatePath("views/components/form_sub_inner.vue"), // 特殊：主子表专属逻辑
+ .put(CodegenFrontTypeEnum.VUE3_ELEMENT_PLUS.getType(), vue3TemplatePath("views/components/form_sub_inner.vue"), // 特殊：主子表专属逻辑
vue3FilePath("views/${table.moduleName}/${table.businessName}/components/${subSimpleClassName}Form.vue"))
- .put(CodegenFrontTypeEnum.VUE3.getType(), vue3TemplatePath("views/components/form_sub_erp.vue"), // 特殊：主子表专属逻辑
+ .put(CodegenFrontTypeEnum.VUE3_ELEMENT_PLUS.getType(), vue3TemplatePath("views/components/form_sub_erp.vue"), // 特殊：主子表专属逻辑
vue3FilePath("views/${table.moduleName}/${table.businessName}/components/${subSimpleClassName}Form.vue"))
- .put(CodegenFrontTypeEnum.VUE3.getType(), vue3TemplatePath("views/components/list_sub_inner.vue"), // 特殊：主子表专属逻辑
+ .put(CodegenFrontTypeEnum.VUE3_ELEMENT_PLUS.getType(), vue3TemplatePath("views/components/list_sub_inner.vue"), // 特殊：主子表专属逻辑
vue3FilePath("views/${table.moduleName}/${table.businessName}/components/${subSimpleClassName}List.vue"))
- .put(CodegenFrontTypeEnum.VUE3.getType(), vue3TemplatePath("views/components/list_sub_erp.vue"), // 特殊：主子表专属逻辑
+ .put(CodegenFrontTypeEnum.VUE3_ELEMENT_PLUS.getType(), vue3TemplatePath("views/components/list_sub_erp.vue"), // 特殊：主子表专属逻辑
vue3FilePath("views/${table.moduleName}/${table.businessName}/components/${subSimpleClassName}List.vue"))
- .put(CodegenFrontTypeEnum.VUE3.getType(), vue3TemplatePath("api/api.ts"),
+ .put(CodegenFrontTypeEnum.VUE3_ELEMENT_PLUS.getType(), vue3TemplatePath("api/api.ts"),
vue3FilePath("api/${table.moduleName}/${table.businessName}/index.ts"))
- // Vue3 vben 模版
- .put(CodegenFrontTypeEnum.VUE3_VBEN.getType(), vue3VbenTemplatePath("views/data.ts"),
+ // VUE3_VBEN2_ANTD_SCHEMA
+ .put(CodegenFrontTypeEnum.VUE3_VBEN2_ANTD_SCHEMA.getType(), vue3VbenTemplatePath("views/data.ts"),
vue3FilePath("views/${table.moduleName}/${table.businessName}/${classNameVar}.data.ts"))
- .put(CodegenFrontTypeEnum.VUE3_VBEN.getType(), vue3VbenTemplatePath("views/index.vue"),
+ .put(CodegenFrontTypeEnum.VUE3_VBEN2_ANTD_SCHEMA.getType(), vue3VbenTemplatePath("views/index.vue"),
vue3FilePath("views/${table.moduleName}/${table.businessName}/index.vue"))
- .put(CodegenFrontTypeEnum.VUE3_VBEN.getType(), vue3VbenTemplatePath("views/form.vue"),
+ .put(CodegenFrontTypeEnum.VUE3_VBEN2_ANTD_SCHEMA.getType(), vue3VbenTemplatePath("views/form.vue"),
vue3FilePath("views/${table.moduleName}/${table.businessName}/${simpleClassName}Modal.vue"))
- .put(CodegenFrontTypeEnum.VUE3_VBEN.getType(), vue3VbenTemplatePath("api/api.ts"),
+ .put(CodegenFrontTypeEnum.VUE3_VBEN2_ANTD_SCHEMA.getType(), vue3VbenTemplatePath("api/api.ts"),
vue3FilePath("api/${table.moduleName}/${table.businessName}/index.ts"))
+ // VUE3_VBEN5_ANTD_SCHEMA
+ // TODO @puhui999：目录改成 vue3_vben5_antd；然后里面有 schema（目前我们在写的）和 general（你微信里提的，原生的，感觉也要搞！）
+ .put(CodegenFrontTypeEnum.VUE3_VBEN5_ANTD_SCHEMA.getType(), vue3VbenNextSchemaTemplatePath("views/data.ts"),
+ vue3FilePath("views/${table.moduleName}/${table.businessName}/data.ts"))
+ .put(CodegenFrontTypeEnum.VUE3_VBEN5_ANTD_SCHEMA.getType(), vue3VbenNextSchemaTemplatePath("views/index.vue"),
+ vue3FilePath("views/${table.moduleName}/${table.businessName}/index.vue"))
+ .put(CodegenFrontTypeEnum.VUE3_VBEN5_ANTD_SCHEMA.getType(), vue3VbenNextSchemaTemplatePath("views/form.vue"),
+ vue3FilePath("views/${table.moduleName}/${table.businessName}/modules/form.vue"))
+ .put(CodegenFrontTypeEnum.VUE3_VBEN5_ANTD_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
@@ -496,6 +515,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 000000000..e69de29bb
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 000000000..b1a24af09
--- /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,118 @@
+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 )
+ children?: ${simpleClassName}[];
+#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 000000000..349bf378a
--- /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,276 @@
+import type { VxeTableGridOptions } from '@vben/plugins/vxe-table';
+import type { VbenFormSchema } from '#/adapter/form';
+import type { OnActionClickFn } from '#/adapter/vxe-table';
+import type { ${simpleClassName}Api } from '#/api/${table.moduleName}/${simpleClassName_strikeCase}';
+
+import { z } from '#/adapter/form';
+#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 { useAccess } from '@vben/access';
+
+const { hasAccessByCodes } = useAccess();
+
+/** 新增/修改的表单 */
+export function useFormSchema(): VbenFormSchema[] {
+ return [
+ {
+ fieldName: 'id',
+ component: 'Input',
+ dependencies: {
+ triggerFields: [''],
+ 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 && ($table.templateType != 2 || ($table.templateType == 2 && $column.id != $treeParentColumn.id)))## 树表中已经添加了父ID字段，这里排除
+ #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}',
+ class: 'w-full',
+ },
+ #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}',
+ },
+ #elseif($column.htmlType == "inputNumber")## 数字输入框
+ component: 'InputNumber',
+ componentProps: {
+ min: 0,
+ class: 'w-full',
+ controlsPosition: 'right',
+ 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: {
+ allowClear: true,
+ },
+ #end
+ },
+#end
+#end
+ ];
+}
+
+/** 列表的字段 */
+export function useGridColumns(
+ onActionClick?: OnActionClickFn<${simpleClassName}Api.${simpleClassName}>,
+): VxeTableGridOptions<${simpleClassName}Api.${simpleClassName}>['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
+ #if (${table.templateType} == 2 && $column.id == $treeNameColumn.id)## 树表特有:标记树节点列
+ treeNode: true,
+ #end
+ },
+#end
+#end
+ {
+ field: 'operation',
+ title: '操作',
+ minWidth: 200,
+ align: 'right',
+ fixed: 'right',
+ headerAlign: 'center',
+ showOverflow: false,
+ cellRender: {
+ attrs: {
+ nameField: '${columns[0].javaField}',
+ nameTitle: '${table.classComment}',
+ onClick: onActionClick,
+ },
+ 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']),
+ },
+ {
+ 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
new file mode 100644
index 000000000..9a357427a
--- /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,118 @@
+
+
+
+
+
+
+
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 000000000..198e1d4c4
--- /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,181 @@
+
+
+
+
+
+
+
+
+#if (${table.templateType} == 2)## 树表特有：展开/收缩按钮
+
+#end
+
+
+
+
+
+
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/CodegenServiceImplTest.java b/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/CodegenServiceImplTest.java
index 0ab4cb6d7..dbc0842c6 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/CodegenServiceImplTest.java
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/CodegenServiceImplTest.java
@@ -34,7 +34,6 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildBetweenTime;
import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildTime;
import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId;
@@ -100,13 +99,13 @@ public class CodegenServiceImplTest extends BaseDbUnitTest {
when(codegenBuilder.buildTable(same(tableInfo))).thenReturn(table);
// mock 方法（AdminUserRespDTO）
AdminUserRespDTO user = randomPojo(AdminUserRespDTO.class, o -> o.setNickname("芋头"));
- when(userApi.getUser(eq(userId))).thenReturn(success(user));
+ when(userApi.getUser(eq(userId))).thenReturn(user);
// mock 方法（CodegenColumnDO）
List columns = randomPojoList(CodegenColumnDO.class);
when(codegenBuilder.buildColumns(eq(table.getId()), same(fields)))
.thenReturn(columns);
// mock 方法（CodegenProperties）
- when(codegenProperties.getFrontType()).thenReturn(CodegenFrontTypeEnum.VUE3.getType());
+ when(codegenProperties.getFrontType()).thenReturn(CodegenFrontTypeEnum.VUE3_ELEMENT_PLUS.getType());
// 调用
List result = codegenService.createCodegenList(userId, reqVO);
@@ -117,7 +116,7 @@ public class CodegenServiceImplTest extends BaseDbUnitTest {
assertPojoEquals(table, dbTable);
assertEquals(1L, dbTable.getDataSourceConfigId());
assertEquals(CodegenSceneEnum.ADMIN.getScene(), dbTable.getScene());
- assertEquals(CodegenFrontTypeEnum.VUE3.getType(), dbTable.getFrontType());
+ assertEquals(CodegenFrontTypeEnum.VUE3_ELEMENT_PLUS.getType(), dbTable.getFrontType());
assertEquals("芋头", dbTable.getAuthor());
// 断言（CodegenColumnDO）
List dbColumns = codegenColumnMapper.selectList();
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngineVue2Test.java b/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngineVue2Test.java
index 94d24bed1..a251484df 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngineVue2Test.java
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngineVue2Test.java
@@ -23,7 +23,7 @@ public class CodegenEngineVue2Test extends CodegenEngineAbstractTest {
public void testExecute_vue2_one() {
// 准备参数
CodegenTableDO table = getTable("student")
- .setFrontType(CodegenFrontTypeEnum.VUE2.getType())
+ .setFrontType(CodegenFrontTypeEnum.VUE2_ELEMENT_UI.getType())
.setTemplateType(CodegenTemplateTypeEnum.ONE.getType());
List columns = getColumnList("student");
@@ -39,7 +39,7 @@ public class CodegenEngineVue2Test extends CodegenEngineAbstractTest {
public void testExecute_vue2_tree() {
// 准备参数
CodegenTableDO table = getTable("category")
- .setFrontType(CodegenFrontTypeEnum.VUE2.getType())
+ .setFrontType(CodegenFrontTypeEnum.VUE2_ELEMENT_UI.getType())
.setTemplateType(CodegenTemplateTypeEnum.TREE.getType());
List columns = getColumnList("category");
@@ -71,19 +71,19 @@ public class CodegenEngineVue2Test extends CodegenEngineAbstractTest {
String path) {
// 准备参数
CodegenTableDO table = getTable("student")
- .setFrontType(CodegenFrontTypeEnum.VUE2.getType())
+ .setFrontType(CodegenFrontTypeEnum.VUE2_ELEMENT_UI.getType())
.setTemplateType(templateType.getType());
List columns = getColumnList("student");
// 准备参数（子表）
CodegenTableDO contactTable = getTable("contact")
.setTemplateType(CodegenTemplateTypeEnum.SUB.getType())
- .setFrontType(CodegenFrontTypeEnum.VUE2.getType())
+ .setFrontType(CodegenFrontTypeEnum.VUE2_ELEMENT_UI.getType())
.setSubJoinColumnId(100L).setSubJoinMany(true);
List contactColumns = getColumnList("contact");
// 准备参数（班主任）
CodegenTableDO teacherTable = getTable("teacher")
.setTemplateType(CodegenTemplateTypeEnum.SUB.getType())
- .setFrontType(CodegenFrontTypeEnum.VUE2.getType())
+ .setFrontType(CodegenFrontTypeEnum.VUE2_ELEMENT_UI.getType())
.setSubJoinColumnId(200L).setSubJoinMany(false);
List teacherColumns = getColumnList("teacher");
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngineVue3Test.java b/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngineVue3Test.java
index 4684db78c..7695dac70 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngineVue3Test.java
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngineVue3Test.java
@@ -23,7 +23,7 @@ public class CodegenEngineVue3Test extends CodegenEngineAbstractTest {
public void testExecute_vue3_one() {
// 准备参数
CodegenTableDO table = getTable("student")
- .setFrontType(CodegenFrontTypeEnum.VUE3.getType())
+ .setFrontType(CodegenFrontTypeEnum.VUE3_ELEMENT_PLUS.getType())
.setTemplateType(CodegenTemplateTypeEnum.ONE.getType());
List columns = getColumnList("student");
@@ -39,7 +39,7 @@ public class CodegenEngineVue3Test extends CodegenEngineAbstractTest {
public void testExecute_vue3_tree() {
// 准备参数
CodegenTableDO table = getTable("category")
- .setFrontType(CodegenFrontTypeEnum.VUE3.getType())
+ .setFrontType(CodegenFrontTypeEnum.VUE3_ELEMENT_PLUS.getType())
.setTemplateType(CodegenTemplateTypeEnum.TREE.getType());
List columns = getColumnList("category");
@@ -71,19 +71,19 @@ public class CodegenEngineVue3Test extends CodegenEngineAbstractTest {
String path) {
// 准备参数
CodegenTableDO table = getTable("student")
- .setFrontType(CodegenFrontTypeEnum.VUE3.getType())
+ .setFrontType(CodegenFrontTypeEnum.VUE3_ELEMENT_PLUS.getType())
.setTemplateType(templateType.getType());
List columns = getColumnList("student");
// 准备参数（子表）
CodegenTableDO contactTable = getTable("contact")
.setTemplateType(CodegenTemplateTypeEnum.SUB.getType())
- .setFrontType(CodegenFrontTypeEnum.VUE3.getType())
+ .setFrontType(CodegenFrontTypeEnum.VUE3_ELEMENT_PLUS.getType())
.setSubJoinColumnId(100L).setSubJoinMany(true);
List contactColumns = getColumnList("contact");
// 准备参数（班主任）
CodegenTableDO teacherTable = getTable("teacher")
.setTemplateType(CodegenTemplateTypeEnum.SUB.getType())
- .setFrontType(CodegenFrontTypeEnum.VUE3.getType())
+ .setFrontType(CodegenFrontTypeEnum.VUE3_ELEMENT_PLUS.getType())
.setSubJoinColumnId(200L).setSubJoinMany(false);
List teacherColumns = getColumnList("teacher");
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 fb7331afc..000000000
--- 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 5a118856d..9aa4db5c4 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()).getCheckedData();
+ 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()).getCheckedData();
+ 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()));
// 2.4 通知所有管理员消息已读
- getSelf().sendAsyncMessageToAdmin(KEFU_MESSAGE_ADMIN_READ, conversation.getId());
+ getSelf().sendAsyncMessageToAdmin(KEFU_MESSAGE_ADMIN_READ,
+ new KeFuMessageRespVO().setConversationId(keFuMessage.getConversationId()));
}
private void validateReceiverExist(Long receiverId, Integer receiverType) {
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 f95880aa4..200b8e5cd 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) {