Merge branch 'master' of https://git.enterlo.com/YuanJiFeng/emoon_ai

ruoyi-extend/ruoyi-mcp-server/src/main/java/org/ruoyi/mcpserve/entity/McpTool.java

@@ -1,24 +0,0 @@
-package org.ruoyi.mcpserve.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
-import lombok.Data;
-
-import java.util.Map;
-
-@Data
-@TableName(value = "mcp_tools", autoResultMap = true)
-public class McpTool {
-    @TableId
-    private Long id;
-
-    private String name;
-    private String description;
-
-    @TableField(value = "schema_json", typeHandler = JacksonTypeHandler.class)
-    private Map<String, Object> schemaJson;
-
-    private int enabled = 1;
-}

ruoyi-extend/ruoyi-mcp-server/src/main/java/org/ruoyi/mcpserve/entity/ThinkMcp.java

@@ -1,68 +0,0 @@
-package org.ruoyi.mcpserve.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serial;
-import java.io.Serializable;
-
-//mcp列表 think_mcp
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("think_mcp")
-public class ThinkMcp implements Serializable {
-
-    @Serial
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * id
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * MCP名称
-     */
-    private String mcp;
-
-    /**
-     * MCP描述
-     */
-    private String mcpintroduce;
-
-    /**
-     * MCP出参
-     */
-    private String mcpOutdata;
-
-    /**
-     * MCP入参
-     */
-    private String mcpIndata;
-
-    /**
-     * mcp地址
-     */
-    private String mcpUrl;
-
-    /**
-     * 序号
-     */
-    private int sort;
-
-    /**
-     * 所属智能体
-     */
-    private String agent;
-
-    /**
-     * 0为删除，1为未删除
-     */
-    private int state;
-
-
-}

ruoyi-extend/ruoyi-mcp-server/src/main/java/org/ruoyi/mcpserve/entity/ToolSchema.java

@@ -16,22 +16,9 @@ public class ToolSchema {
     @JsonProperty("tool")
     private String tool;
 
-    @JsonProperty("name")
-    private String name;
-
-    private Map<String,Object> schema;
-
     @JsonProperty("description")
     private String description;
 
     @JsonProperty("parameters")
     private Map<String, Object> parameters;
-
-
-
-    public ToolSchema(String name, String description, Map<String, Object> schemaJson) {
-        this.name = name;
-        this.description = description;
-        this.schema = schemaJson;
-    }
 }

ruoyi-extend/ruoyi-mcp-server/src/main/java/org/ruoyi/mcpserve/mapper/McpToolMapper.java

@@ -1,11 +0,0 @@
-package org.ruoyi.mcpserve.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.ruoyi.mcpserve.entity.McpTool;
-
-
-@Mapper
-public interface McpToolMapper extends BaseMapper<McpTool> {
-}
-

ruoyi-extend/ruoyi-mcp-server/src/main/java/org/ruoyi/mcpserve/mapper/ThinkMcpMapper.java

@@ -1,12 +0,0 @@
-package org.ruoyi.mcpserve.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.ruoyi.mcpserve.entity.McpTool;
-import org.ruoyi.mcpserve.entity.ThinkMcp;
-
-
-@Mapper
-public interface ThinkMcpMapper extends BaseMapper<ThinkMcp> {
-}
-

ruoyi-extend/ruoyi-mcp-server/src/main/java/org/ruoyi/mcpserve/service/McpToolService.java

@@ -1,27 +0,0 @@
-package org.ruoyi.mcpserve.service;
-
-import com.baomidou.dynamic.datasource.annotation.DS;
-import org.ruoyi.mcpserve.entity.McpTool;
-import org.ruoyi.mcpserve.entity.ThinkMcp;
-import org.ruoyi.mcpserve.entity.ToolSchema;
-
-import java.util.List;
-
-public interface McpToolService {
-     void saveToolSchema(ToolSchema ts);
-
-
-
-     List<ToolSchema> loadEnabledToolSchemas();
-
-    McpTool getMcpData(McpTool mcpTool);
-
-
-    @DS("open-db")
-    ThinkMcp getThinkMcpData(ThinkMcp thinkMcp);
-
-
-
-
-
-}

ruoyi-extend/ruoyi-mcp-server/src/main/java/org/ruoyi/mcpserve/service/impl/FastMCPServiceImpl.java

@@ -1,10 +1,7 @@
 package org.ruoyi.mcpserve.service.impl;
 
-import org.ruoyi.mcpserve.entity.McpTool;
-import org.ruoyi.mcpserve.entity.ThinkMcp;
 import org.ruoyi.mcpserve.entity.ToolSchema;
 import org.ruoyi.mcpserve.service.IMCPService;
-import org.ruoyi.mcpserve.service.McpToolService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.*;
 import org.springframework.stereotype.Service;
@@ -21,14 +18,14 @@ public class FastMCPServiceImpl implements IMCPService {
     @Autowired
     private RestTemplate restTemplate;
 
-    @Autowired
-    private McpToolService mcpToolService;
-
 
     @Override
     public List<String> supportedTools() {
         return List.of("queryKnowledgeList", "hospitalActivity", "loginUser");
     }
+
+
+
     @Override
     public List<ToolSchema> getToolSchemas() {
         Map<String, Object> schema = Map.of(
@@ -36,11 +33,11 @@ public class FastMCPServiceImpl implements IMCPService {
                 "properties", Map.of(
                         "username", Map.of(
                                 "type", "string",
-                                "description", "登录用户名"
+                                "description", "登录用户名，例如：admin"
                         ),
                         "password", Map.of(
                                 "type", "string",
-                                "description", "登录密码"
+                                "description", "登录密码，例如：admin123"
                         )
                 ),
                 "required", List.of("username", "password")
@@ -127,14 +124,6 @@ public class FastMCPServiceImpl implements IMCPService {
         }
     }
     public Map<String, Object> dispatch(String tool, Map<String, Object> params) {
-        ThinkMcp thinkMcp = new ThinkMcp();
-        thinkMcp.setState(1);
-        thinkMcp.setMcp(tool);
-
-        ThinkMcp mcpData = mcpToolService.getThinkMcpData(thinkMcp);
-        if(mcpData == null){
-            return Map.of("code", -1, "message", "不支持的工具: " + tool);
-        }
         switch (tool) {
             case "loginUser":
                 return handleLogin(params);

ruoyi-extend/ruoyi-mcp-server/src/main/java/org/ruoyi/mcpserve/service/impl/McpToolServiceImpl.java

@@ -1,91 +0,0 @@
-package org.ruoyi.mcpserve.service.impl;
-
-import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
-import org.ruoyi.mcpserve.entity.McpTool;
-import org.ruoyi.mcpserve.entity.ThinkMcp;
-import org.ruoyi.mcpserve.entity.ToolSchema;
-import org.ruoyi.mcpserve.mapper.McpToolMapper;
-import org.ruoyi.mcpserve.mapper.ThinkMcpMapper;
-import org.ruoyi.mcpserve.service.McpToolService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service
-public class McpToolServiceImpl implements McpToolService {
-
-    @Autowired
-    private McpToolMapper mcpToolMapper;
-
-    @Autowired
-    private ThinkMcpMapper thinkMcpMapper;
-
-    @Override
-    public void saveToolSchema(ToolSchema ts) {
-        McpTool e = new McpTool();
-        e.setName(ts.getName());
-        e.setDescription(ts.getDescription());
-        e.setSchemaJson(ts.getSchema());
-        e.setEnabled(1);
-        mcpToolMapper.insert(e);
-    }
-
-    @Override
-    public List<ToolSchema> loadEnabledToolSchemas() {
-        return mcpToolMapper.selectList(
-                        new LambdaQueryChainWrapper<>(mcpToolMapper)
-                                .eq(McpTool::getEnabled, 1)
-                ).stream()
-                .map(e -> new ToolSchema(e.getName(), e.getDescription(), e.getSchemaJson()))
-                .toList();
-    }
-
-    @Override
-    public McpTool getMcpData(McpTool mcpTool) {
-        try {
-            return new LambdaQueryChainWrapper<>(mcpToolMapper)
-                    .eq(McpTool::getEnabled, 1)
-                    .eq(McpTool::getName, mcpTool.getName())
-                    .list()
-                    .stream()
-                    .findFirst()
-                    .orElse(null);
-        } catch (Exception e) {
-            // 如果是表不存在的异常，可以判断异常类型或内容
-            if (e.getCause() instanceof java.sql.SQLSyntaxErrorException) {
-                String msg = e.getCause().getMessage();
-                if (msg != null && msg.contains("doesn't exist")) {
-                    // 表不存在，返回空
-                    return null;
-                }
-            }
-            throw e; // 其他异常继续抛出
-        }
-    }
-
-    @Override
-    public ThinkMcp getThinkMcpData(ThinkMcp thinkMcp) {
-        try {
-            return new LambdaQueryChainWrapper<>(thinkMcpMapper)
-                    .eq(ThinkMcp::getState, 1)
-                    .eq(ThinkMcp::getMcp, thinkMcp.getMcp())
-                    .list()
-                    .stream()
-                    .findFirst()
-                    .orElse(null);
-        } catch (Exception e) {
-            // 如果是表不存在的异常，可以判断异常类型或内容
-            if (e.getCause() instanceof java.sql.SQLSyntaxErrorException) {
-                String msg = e.getCause().getMessage();
-                if (msg != null && msg.contains("doesn't exist")) {
-                    // 表不存在，返回空
-                    return null;
-                }
-            }
-            throw e; // 其他异常继续抛出
-        }
-
-    }
-
-}