From 82624affb0251b75b62b35567d3eb260c06efe78 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期一, 23 三月 2026 12:48:07 +0800
Subject: [PATCH] #ai 代码优化
---
rsf-server/src/main/java/com/vincent/rsf/server/ai/service/impl/BuiltinMcpToolRegistryImpl.java | 132 ++++++++-----------------------------------
1 files changed, 26 insertions(+), 106 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/impl/BuiltinMcpToolRegistryImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/impl/BuiltinMcpToolRegistryImpl.java
index 41f0d52..da7c1d6 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/impl/BuiltinMcpToolRegistryImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/ai/service/impl/BuiltinMcpToolRegistryImpl.java
@@ -4,6 +4,7 @@
import com.vincent.rsf.server.ai.config.AiDefaults;
import com.vincent.rsf.server.ai.dto.AiMcpToolPreviewDto;
import com.vincent.rsf.server.ai.entity.AiMcpMount;
+import com.vincent.rsf.server.ai.service.impl.mcp.BuiltinMcpToolCatalogProvider;
import com.vincent.rsf.server.ai.service.BuiltinMcpToolRegistry;
import com.vincent.rsf.server.ai.tool.RsfWmsBaseTools;
import com.vincent.rsf.server.ai.tool.RsfWmsStockTools;
@@ -27,56 +28,59 @@
private final RsfWmsStockTools rsfWmsStockTools;
private final RsfWmsTaskTools rsfWmsTaskTools;
private final RsfWmsBaseTools rsfWmsBaseTools;
+ private final BuiltinMcpToolCatalogProvider builtinMcpToolCatalogProvider;
+ /**
+ * 鏍￠獙鍐呯疆 MCP 缂栫爜鏄惁鍚堟硶銆�
+ * 褰撳墠鐗堟湰鍙厑璁镐娇鐢ㄦ樉寮忕櫥璁板湪娉ㄥ唽琛ㄤ腑鐨勭紪鐮侊紝鏈煡缂栫爜鐩存帴鎷掔粷锛�
+ * 杩欐牱鍙互纭繚鈥滈〉闈㈠彲閫夐」鈥濆拰鈥滆繍琛屾椂鍙寕杞介」鈥濆缁堜竴鑷淬��
+ */
@Override
public void validateBuiltinCode(String builtinCode) {
if (!StringUtils.hasText(builtinCode)) {
throw new CoolException("鍐呯疆 MCP 缂栫爜涓嶈兘涓虹┖");
}
- if (!supportedBuiltinCodes().contains(builtinCode)) {
+ if (!builtinMcpToolCatalogProvider.supportedBuiltinCodes().contains(builtinCode)) {
throw new CoolException("涓嶆敮鎸佺殑鍐呯疆 MCP 缂栫爜: " + builtinCode);
}
}
+ /**
+ * 鏍规嵁鎸傝浇璁板綍鍒涘缓鍐呯疆宸ュ叿鍥炶皟銆�
+ * 杩欓噷涓嶄細鍋氫换浣曞姩鎬佸彂鐜帮紝鎵�鏈夊伐鍏烽兘蹇呴』缁忚繃鏄惧紡娉ㄥ唽鍜屾不鐞嗙洰褰曟牎楠屽悗鎵嶈兘鏆撮湶缁欐ā鍨嬨��
+ */
@Override
public List<ToolCallback> createToolCallbacks(AiMcpMount mount, Long userId) {
String builtinCode = mount.getBuiltinCode();
validateBuiltinCode(builtinCode);
if (AiDefaults.MCP_BUILTIN_RSF_WMS.equals(builtinCode)) {
List<ToolCallback> callbacks = new ArrayList<>();
- callbacks.addAll(createValidatedCallbacks(rsfWmsStockTools, AiDefaults.MCP_BUILTIN_RSF_WMS_STOCK));
- callbacks.addAll(createValidatedCallbacks(rsfWmsTaskTools, AiDefaults.MCP_BUILTIN_RSF_WMS_TASK));
- callbacks.addAll(createValidatedCallbacks(rsfWmsBaseTools, AiDefaults.MCP_BUILTIN_RSF_WMS_BASE));
+ callbacks.addAll(createValidatedCallbacks(rsfWmsStockTools, builtinCode));
+ callbacks.addAll(createValidatedCallbacks(rsfWmsTaskTools, builtinCode));
+ callbacks.addAll(createValidatedCallbacks(rsfWmsBaseTools, builtinCode));
return callbacks;
- }
- if (AiDefaults.MCP_BUILTIN_RSF_WMS_STOCK.equals(builtinCode)) {
- return createValidatedCallbacks(rsfWmsStockTools, builtinCode);
- }
- if (AiDefaults.MCP_BUILTIN_RSF_WMS_TASK.equals(builtinCode)) {
- return createValidatedCallbacks(rsfWmsTaskTools, builtinCode);
- }
- if (AiDefaults.MCP_BUILTIN_RSF_WMS_BASE.equals(builtinCode)) {
- return createValidatedCallbacks(rsfWmsBaseTools, builtinCode);
}
throw new CoolException("涓嶆敮鎸佺殑鍐呯疆 MCP 缂栫爜: " + builtinCode);
}
+ /**
+ * 杩斿洖鏌愪釜鍐呯疆缂栫爜涓嬪彲棰勮鐨勫伐鍏风洰褰曚俊鎭��
+ * 璇ョ洰褰曟瘮杩愯鏃跺洖璋冨浜嗗伐鍏风敤閫斻�佹煡璇㈣竟鐣屽拰绀轰緥鎻愰棶锛屼緵绠＄悊椤靛睍绀恒��
+ */
@Override
public List<AiMcpToolPreviewDto> listBuiltinToolCatalog(String builtinCode) {
validateBuiltinCode(builtinCode);
- if (AiDefaults.MCP_BUILTIN_RSF_WMS.equals(builtinCode)) {
- List<AiMcpToolPreviewDto> catalog = new ArrayList<>();
- catalog.addAll(catalogByBuiltinCode(AiDefaults.MCP_BUILTIN_RSF_WMS_STOCK).values());
- catalog.addAll(catalogByBuiltinCode(AiDefaults.MCP_BUILTIN_RSF_WMS_TASK).values());
- catalog.addAll(catalogByBuiltinCode(AiDefaults.MCP_BUILTIN_RSF_WMS_BASE).values());
- return catalog;
- }
- return new ArrayList<>(catalogByBuiltinCode(builtinCode).values());
+ return new ArrayList<>(builtinMcpToolCatalogProvider.getCatalog(builtinCode).values());
}
private List<ToolCallback> createValidatedCallbacks(Object toolBean, String builtinCode) {
+ /**
+ * 鎶� `@Tool` Bean 杞垚 Spring AI ToolCallback锛屽苟寮哄埗鏍￠獙锛�
+ * 1. 宸ュ叿鍚嶅繀椤荤鍚堝懡鍚嶈鑼�
+ * 2. 姣忎釜宸ュ叿閮藉繀椤诲嚭鐜板湪娌荤悊鐩綍閲�
+ */
List<ToolCallback> callbacks = Arrays.asList(ToolCallbacks.from(toolBean));
- Map<String, AiMcpToolPreviewDto> catalog = catalogByBuiltinCode(builtinCode);
+ Map<String, AiMcpToolPreviewDto> catalog = builtinMcpToolCatalogProvider.getCatalog(builtinCode);
for (ToolCallback callback : callbacks) {
if (callback == null || callback.getToolDefinition() == null) {
continue;
@@ -92,88 +96,4 @@
return callbacks;
}
- private List<String> supportedBuiltinCodes() {
- return List.of(
- AiDefaults.MCP_BUILTIN_RSF_WMS,
- AiDefaults.MCP_BUILTIN_RSF_WMS_STOCK,
- AiDefaults.MCP_BUILTIN_RSF_WMS_TASK,
- AiDefaults.MCP_BUILTIN_RSF_WMS_BASE
- );
- }
-
- private Map<String, AiMcpToolPreviewDto> catalogByBuiltinCode(String builtinCode) {
- if (AiDefaults.MCP_BUILTIN_RSF_WMS_STOCK.equals(builtinCode)) {
- Map<String, AiMcpToolPreviewDto> catalog = new LinkedHashMap<>();
- catalog.put("rsf_query_available_inventory", buildCatalogItem(
- "rsf_query_available_inventory",
- "搴撳瓨鏌ヨ",
- "鏌ヨ鎸囧畾鐗╂枡褰撳墠鍙敤浜庡嚭搴撶殑搴撳瓨鏄庣粏銆�",
- "蹇呴』鎻愪緵鐗╂枡缂栫爜鎴栫墿鏂欏悕绉帮紝骞朵笖鏈�澶氳繑鍥� 50 鏉″簱瀛樿褰曘��",
- List.of("鏌ヨ鐗╂枡 MAT001 褰撳墠鍙嚭搴撳簱瀛�", "鎸夌墿鏂欏悕绉版煡璇㈡墭鐩樺簱瀛樻槑缁�")
- ));
- catalog.put("rsf_query_station_list", buildCatalogItem(
- "rsf_query_station_list",
- "搴撳瓨鏌ヨ",
- "鏌ヨ鎸囧畾浣滀笟绫诲瀷鍙敤鐨勮澶囩珯鐐广��",
- "蹇呴』鎻愪緵绔欑偣绫诲瀷鍒楄〃锛岀被鍨嬫暟閲忔渶澶� 10 涓紝鏈�澶氳繑鍥� 50 涓珯鐐广��",
- List.of("鏌ヨ鍏ュ簱鍜屽嚭搴撲綔涓氬彲鐢ㄧ珯鐐�", "鍒楀嚭 AGV_PICK 绫诲瀷鐨勪綔涓氱珯鐐�")
- ));
- return catalog;
- }
- if (AiDefaults.MCP_BUILTIN_RSF_WMS_TASK.equals(builtinCode)) {
- Map<String, AiMcpToolPreviewDto> catalog = new LinkedHashMap<>();
- catalog.put("rsf_query_task_list", buildCatalogItem(
- "rsf_query_task_list",
- "浠诲姟鏌ヨ",
- "鎸変换鍔″彿銆佺姸鎬併�佺被鍨嬫垨绔欑偣鏉′欢鏌ヨ浠诲姟鍒楄〃銆�",
- "鑷冲皯鎻愪緵涓�涓繃婊ゆ潯浠讹紝鏈�澶氳繑鍥� 50 鏉′换鍔¤褰曪紝涓嶆敮鎸佸叏琛ㄦ壂鎻忋��",
- List.of("鏌ヨ鏈�杩� 10 鏉＄姸鎬佷负鎵ц涓殑浠诲姟", "鎸変换鍔″彿鍏抽敭瀛楁煡璇换鍔″垪琛�")
- ));
- catalog.put("rsf_query_task_detail", buildCatalogItem(
- "rsf_query_task_detail",
- "浠诲姟鏌ヨ",
- "鎸変换鍔� ID 鎴栦换鍔″彿鏌ヨ鍗曚釜浠诲姟璇︽儏銆�",
- "蹇呴』鎻愪緵浠诲姟 ID 鎴栦换鍔″彿涔嬩竴锛屽彧杩斿洖鍗曚釜浠诲姟銆�",
- List.of("鏌ヨ浠诲姟 12345 鐨勮鎯�", "鏍规嵁浠诲姟鍙� TASK24001 鏌ョ湅鎵ц鏄庣粏")
- ));
- return catalog;
- }
- if (AiDefaults.MCP_BUILTIN_RSF_WMS_BASE.equals(builtinCode)) {
- Map<String, AiMcpToolPreviewDto> catalog = new LinkedHashMap<>();
- catalog.put("rsf_query_warehouses", buildCatalogItem(
- "rsf_query_warehouses",
- "鍩虹璧勬枡",
- "鏌ヨ浠撳簱鍩虹淇℃伅銆�",
- "鑷冲皯鎻愪緵浠撳簱缂栫爜鎴栧悕绉帮紝鏈�澶氳繑鍥� 50 鏉′粨搴撹褰曘��",
- List.of("鏌ヨ缂栫爜鍖呭惈 WH 鐨勪粨搴�", "鎸変粨搴撳悕绉版煡璇粨搴撳湴鍧�")
- ));
- catalog.put("rsf_query_bas_stations", buildCatalogItem(
- "rsf_query_bas_stations",
- "鍩虹璧勬枡",
- "鏌ヨ鍩虹绔欑偣淇℃伅銆�",
- "鑷冲皯鎻愪緵绔欑偣缂栧彿銆佺珯鐐瑰悕绉版垨浣跨敤鐘舵�佷箣涓�锛屾渶澶氳繑鍥� 50 鏉＄珯鐐硅褰曘��",
- List.of("鏌ヨ浣跨敤涓殑鍩虹绔欑偣", "鎸夌珯鐐圭紪鍙锋煡璇㈠熀纭�绔欑偣")
- ));
- catalog.put("rsf_query_dict_data", buildCatalogItem(
- "rsf_query_dict_data",
- "鍩虹璧勬枡",
- "鏌ヨ鎸囧畾瀛楀吀绫诲瀷涓嬬殑瀛楀吀鏁版嵁銆�",
- "蹇呴』鎻愪緵瀛楀吀绫诲瀷缂栫爜锛屾渶澶氳繑鍥� 100 鏉″瓧鍏歌褰曘��",
- List.of("鏌ヨ task_status 瀛楀吀", "鎸夊瓧鍏告爣绛捐繃婊� task_type 瀛楀吀鏁版嵁")
- ));
- return catalog;
- }
- throw new CoolException("涓嶆敮鎸佺殑鍐呯疆 MCP 缂栫爜: " + builtinCode);
- }
-
- private AiMcpToolPreviewDto buildCatalogItem(String name, String toolGroup, String toolPurpose,
- String queryBoundary, List<String> exampleQuestions) {
- return AiMcpToolPreviewDto.builder()
- .name(name)
- .toolGroup(toolGroup)
- .toolPurpose(toolPurpose)
- .queryBoundary(queryBoundary)
- .exampleQuestions(exampleQuestions)
- .build();
- }
}
--
Gitblit v1.9.1