resourceSummary) {
+ /** @param value 实体 @return 安全绑定 */
+ static SkillBindingView from(AgentSkillBinding value) {
+ return new SkillBindingView(value.getId(), value.getSkillId(), value.getSortNo(),
+ value.getResourceSummary());
+ }
+ }
+}
diff --git a/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/agent/AgentDraftSaveRequest.java b/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/agent/AgentDraftSaveRequest.java
new file mode 100644
index 00000000..23e2d44c
--- /dev/null
+++ b/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/agent/AgentDraftSaveRequest.java
@@ -0,0 +1,109 @@
+package tech.easyflow.admin.controller.agent;
+
+import tech.easyflow.agent.entity.Agent;
+import tech.easyflow.agent.entity.AgentKnowledgeBinding;
+import tech.easyflow.agent.entity.AgentSkillBinding;
+import tech.easyflow.agent.entity.AgentToolBinding;
+
+import java.util.List;
+
+/**
+ * Agent 设计器原子保存请求。
+ *
+ * 绑定变更标记由设计器基于加载后的稳定业务字段计算。服务端仍会执行权限、状态与幂等比较，
+ * 标记为未变化的绑定不会进入查询、外部资源校验或整组重写流程。
+ */
+public class AgentDraftSaveRequest {
+
+ private Agent agent;
+ private List toolBindings;
+ private boolean replaceToolBindings;
+ private List knowledgeBindings;
+ private boolean replaceKnowledgeBindings;
+ private List skillBindings;
+ private boolean replaceSkillBindings;
+
+ /** 创建空请求。 */
+ public AgentDraftSaveRequest() {
+ }
+
+ /** @return Agent 草稿 */
+ public Agent getAgent() {
+ return agent;
+ }
+
+ /** @param agent Agent 草稿 */
+ public void setAgent(Agent agent) {
+ this.agent = agent;
+ }
+
+ /** @return 工具绑定 */
+ public List getToolBindings() {
+ return toolBindings;
+ }
+
+ /** @param toolBindings 工具绑定 */
+ public void setToolBindings(List toolBindings) {
+ this.toolBindings = toolBindings;
+ }
+
+ /** @return 是否替换工具绑定 */
+ public boolean isReplaceToolBindings() {
+ return replaceToolBindings;
+ }
+
+ /** @param replaceToolBindings 是否替换工具绑定 */
+ public void setReplaceToolBindings(boolean replaceToolBindings) {
+ this.replaceToolBindings = replaceToolBindings;
+ }
+
+ /** @return 知识库绑定 */
+ public List getKnowledgeBindings() {
+ return knowledgeBindings;
+ }
+
+ /** @param knowledgeBindings 知识库绑定 */
+ public void setKnowledgeBindings(List knowledgeBindings) {
+ this.knowledgeBindings = knowledgeBindings;
+ }
+
+ /** @return 是否替换知识库绑定 */
+ public boolean isReplaceKnowledgeBindings() {
+ return replaceKnowledgeBindings;
+ }
+
+ /** @param replaceKnowledgeBindings 是否替换知识库绑定 */
+ public void setReplaceKnowledgeBindings(boolean replaceKnowledgeBindings) {
+ this.replaceKnowledgeBindings = replaceKnowledgeBindings;
+ }
+
+ /** @return Skill 绑定 */
+ public List getSkillBindings() {
+ return skillBindings;
+ }
+
+ /** @param skillBindings Skill 绑定 */
+ public void setSkillBindings(List skillBindings) {
+ this.skillBindings = skillBindings;
+ }
+
+ /** @return 是否替换 Skill 绑定 */
+ public boolean isReplaceSkillBindings() {
+ return replaceSkillBindings;
+ }
+
+ /** @param replaceSkillBindings 是否替换 Skill 绑定 */
+ public void setReplaceSkillBindings(boolean replaceSkillBindings) {
+ this.replaceSkillBindings = replaceSkillBindings;
+ }
+
+ /**
+ * 将 Skill 白名单引用转换为领域绑定。
+ *
+ * @return 最小 Skill 绑定列表
+ */
+ public List toSkillBindings() {
+ return skillBindings == null
+ ? List.of() : skillBindings.stream().map(AgentSkillBindingUpdateRequest.Binding::toEntity).toList();
+ }
+}
diff --git a/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/agent/AgentSessionController.java b/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/agent/AgentSessionController.java
index 7259de13..c506a466 100644
--- a/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/agent/AgentSessionController.java
+++ b/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/agent/AgentSessionController.java
@@ -1,16 +1,21 @@
package tech.easyflow.admin.controller.agent;
+import cn.dev33.satoken.annotation.SaCheckPermission;
import com.mybatisflex.core.keygen.impl.SnowFlakeIDKeyGenerator;
import org.springframework.web.bind.annotation.*;
import tech.easyflow.admin.dto.chatworkspace.ChatWorkspaceConversationView;
import tech.easyflow.admin.dto.chatworkspace.ChatWorkspaceSessionDetailView;
import tech.easyflow.admin.dto.chatworkspace.ChatWorkspaceSessionPage;
import tech.easyflow.admin.service.agent.AgentSessionService;
+import tech.easyflow.agent.service.AgentOptionQueryService;
+import tech.easyflow.agent.vo.AgentOptionView;
+import tech.easyflow.agent.vo.AgentResourceOptionsView;
import tech.easyflow.chatlog.domain.dto.ChatHistoryPage;
import tech.easyflow.chatlog.domain.query.ChatPageQuery;
import tech.easyflow.common.domain.Result;
import tech.easyflow.common.entity.LoginAccount;
import tech.easyflow.common.satoken.util.SaTokenUtil;
+import tech.easyflow.common.web.exceptions.BusinessException;
import tech.easyflow.common.web.jsonbody.JsonBody;
import java.math.BigInteger;
@@ -21,17 +26,42 @@ import java.util.List;
*/
@RestController
@RequestMapping("/api/v1/agent/session")
+@SaCheckPermission("/api/v1/agent/session/query")
public class AgentSessionController {
private final AgentSessionService agentSessionService;
+ private final AgentOptionQueryService agentOptionQueryService;
/**
* 创建 Agent 管理端会话控制器。
*
* @param agentSessionService Agent 会话服务
+ * @param agentOptionQueryService Agent 安全选项服务
*/
- public AgentSessionController(AgentSessionService agentSessionService) {
+ public AgentSessionController(AgentSessionService agentSessionService,
+ AgentOptionQueryService agentOptionQueryService) {
this.agentSessionService = agentSessionService;
+ this.agentOptionQueryService = agentOptionQueryService;
+ }
+
+ /**
+ * 查询正式聊天可使用的已发布 Agent。
+ *
+ * @return Agent 安全选项
+ */
+ @GetMapping("/options")
+ public Result> options() {
+ return Result.ok(agentOptionQueryService.listAgentOptions(true));
+ }
+
+ /**
+ * 查询正式聊天可附加的知识库。
+ *
+ * @return 知识库安全选项
+ */
+ @GetMapping("/knowledgeOptions")
+ public Result> knowledgeOptions() {
+ return Result.ok(agentOptionQueryService.listKnowledgeOptions());
}
/**
@@ -130,7 +160,17 @@ public class AgentSessionController {
return Result.ok();
}
+ /**
+ * 获取当前登录账号。
+ *
+ * @return 当前登录账号
+ * @throws BusinessException 登录信息失效时抛出
+ */
private LoginAccount currentAccount() {
- return SaTokenUtil.getLoginAccount();
+ LoginAccount account = SaTokenUtil.getLoginAccount();
+ if (account == null || account.getId() == null || account.getTenantId() == null) {
+ throw new BusinessException("当前登录状态失效，请重新登录后再试");
+ }
+ return account;
}
}
diff --git a/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/agent/AgentSkillBindingUpdateRequest.java b/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/agent/AgentSkillBindingUpdateRequest.java
new file mode 100644
index 00000000..73f3ce67
--- /dev/null
+++ b/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/agent/AgentSkillBindingUpdateRequest.java
@@ -0,0 +1,84 @@
+package tech.easyflow.admin.controller.agent;
+
+import tech.easyflow.agent.entity.AgentSkillBinding;
+
+import java.math.BigInteger;
+import java.util.List;
+
+/**
+ * Agent Skill 整组替换请求。
+ *
+ * 使用标准 JavaBean 以兼容 {@code @JsonBody} 的 Fastjson 1 嵌套列表转换。
+ */
+public class AgentSkillBindingUpdateRequest {
+
+ private BigInteger agentId;
+ private List bindings;
+
+ /** 创建空请求。 */
+ public AgentSkillBindingUpdateRequest() {
+ }
+
+ /**
+ * 创建 Agent Skill 绑定请求。
+ *
+ * @param agentId Agent ID
+ * @param bindings Skill 引用
+ */
+ public AgentSkillBindingUpdateRequest(BigInteger agentId, List bindings) {
+ this.agentId = agentId;
+ this.bindings = bindings;
+ }
+
+ /** @return Agent ID */
+ public BigInteger getAgentId() { return agentId; }
+ /** @param agentId Agent ID */
+ public void setAgentId(BigInteger agentId) { this.agentId = agentId; }
+ /** @return Skill 引用 */
+ public List getBindings() { return bindings; }
+ /** @param bindings Skill 引用 */
+ public void setBindings(List bindings) { this.bindings = bindings; }
+
+ /** 客户端允许提交的最小 Skill 引用。 */
+ public static class Binding {
+
+ private BigInteger skillId;
+ private Integer sortNo;
+
+ /** 创建空绑定。 */
+ public Binding() {
+ }
+
+ /**
+ * 创建最小 Skill 绑定。
+ *
+ * @param skillId Skill ID
+ * @param sortNo 排序号
+ */
+ public Binding(BigInteger skillId, Integer sortNo) {
+ this.skillId = skillId;
+ this.sortNo = sortNo;
+ }
+
+ /** @return Skill ID */
+ public BigInteger getSkillId() { return skillId; }
+ /** @param skillId Skill ID */
+ public void setSkillId(BigInteger skillId) { this.skillId = skillId; }
+ /** @return 排序号 */
+ public Integer getSortNo() { return sortNo; }
+ /** @param sortNo 排序号 */
+ public void setSortNo(Integer sortNo) { this.sortNo = sortNo; }
+
+ /**
+ * 转换为不含任何服务端快照的领域引用。
+ *
+ * @return 最小 Skill 绑定
+ */
+ public AgentSkillBinding toEntity() {
+ AgentSkillBinding value = new AgentSkillBinding();
+ value.setSkillId(skillId);
+ value.setSortNo(sortNo);
+ return value;
+ }
+ }
+}
diff --git a/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/ai/BotController.java b/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/ai/BotController.java
index 534013a0..37be4678 100644
--- a/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/ai/BotController.java
+++ b/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/ai/BotController.java
@@ -18,7 +18,7 @@ import org.springframework.web.context.request.ServletRequestAttributes;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
-import tech.easyflow.admin.controller.ai.support.AiResourceCreatorNameSupport;
+import tech.easyflow.admin.controller.ai.support.BotResourceCreatorNameSupport;
import tech.easyflow.admin.service.ai.ChatWorkspaceService;
import tech.easyflow.ai.chattime.availability.ChatTimeToolAvailabilityContext;
import tech.easyflow.ai.easyagents.listener.PromptChoreChatStreamListener;
@@ -82,9 +82,9 @@ public class BotController extends BaseCurdController {
@Resource
private ChatRoundOperateService chatRoundOperateService;
@Resource
- private AiResourceApprovalStateService aiResourceApprovalStateService;
+ private BotApprovalStateService botApprovalStateService;
@Resource
- private AiResourceCreatorNameSupport aiResourceCreatorNameSupport;
+ private BotResourceCreatorNameSupport botResourceCreatorNameSupport;
@Resource
private ChatWorkspaceService chatWorkspaceService;
@@ -97,6 +97,16 @@ public class BotController extends BaseCurdController {
this.botMessageService = botMessageService;
}
+ /**
+ * 获取智能体列表关键字搜索字段。
+ *
+ * @return 标题和描述属性
+ */
+ @Override
+ protected String[] getKeywordSearchProperties() {
+ return new String[]{"title", "description"};
+ }
+
@Resource
private BotPluginService botPluginService;
@@ -240,7 +250,7 @@ public class BotController extends BaseCurdController {
bot = botService.toPublishedView(rawBot);
}
if (StpUtil.isLogin()) {
- aiResourceApprovalStateService.fillBotApprovalState(bot);
+ botApprovalStateService.fillApprovalState(bot);
}
return Result.ok(bot);
}
@@ -275,7 +285,7 @@ public class BotController extends BaseCurdController {
if (data.getModelId() == null) {
if (StpUtil.isLogin()) {
- aiResourceApprovalStateService.fillBotApprovalState(data);
+ botApprovalStateService.fillApprovalState(data);
}
return Result.ok(data);
}
@@ -286,7 +296,7 @@ public class BotController extends BaseCurdController {
if (llm == null) {
data.setModelId(null);
if (StpUtil.isLogin()) {
- aiResourceApprovalStateService.fillBotApprovalState(data);
+ botApprovalStateService.fillApprovalState(data);
}
return Result.ok(data);
}
@@ -302,21 +312,43 @@ public class BotController extends BaseCurdController {
}
if (StpUtil.isLogin()) {
- aiResourceApprovalStateService.fillBotApprovalState(data);
+ botApprovalStateService.fillApprovalState(data);
}
return Result.ok(data);
}
+ /**
+ * 提交聊天助手发布审批。
+ *
+ * @param id 助手 ID
+ * @param applicationReason 审批说明
+ * @return 审批实例 ID
+ */
@PostMapping("/submitPublishApproval")
@SaCheckPermission("/api/v1/bot/save")
- public Result submitPublishApproval(@JsonBody("id") BigInteger id) {
+ public Result submitPublishApproval(
+ @JsonBody("id") BigInteger id,
+ @JsonBody("applicationReason") String applicationReason
+ ) {
return buildApprovalActionResult(
- botPublishAppService.submitPublishApproval(id),
+ botPublishAppService.submitPublishApproval(id, applicationReason),
"已提交发布审批",
"已直接发布"
);
}
+ /**
+ * 预检聊天助手发布是否命中审批流。
+ *
+ * @param id 助手 ID
+ * @return 是否需要审批
+ */
+ @GetMapping("/publishApprovalRequirement")
+ @SaCheckPermission("/api/v1/bot/save")
+ public Result publishApprovalRequirement(@RequestParam BigInteger id) {
+ return Result.ok(botPublishAppService.isPublishApprovalRequired(id));
+ }
+
@PostMapping("/submitOfflineApproval")
@SaCheckPermission("/api/v1/bot/save")
public Result submitOfflineApproval(@JsonBody("id") BigInteger id) {
@@ -347,7 +379,7 @@ public class BotController extends BaseCurdController {
if (isPublishedOnlyRequest()) {
bots = bots.stream().map(botService::toPublishedView).toList();
}
- aiResourceApprovalStateService.fillBotApprovalState(bots);
+ botApprovalStateService.fillApprovalState(bots);
return Result.ok(bots);
}
@@ -359,8 +391,8 @@ public class BotController extends BaseCurdController {
if (isPublishedOnlyRequest()) {
result.setRecords(result.getRecords().stream().map(botService::toPublishedView).toList());
}
- aiResourceApprovalStateService.fillBotApprovalState(result.getRecords());
- aiResourceCreatorNameSupport.fillBotCreatorNames(result.getRecords());
+ botApprovalStateService.fillApprovalState(result.getRecords());
+ botResourceCreatorNameSupport.fillCreatorNames(result.getRecords());
return result;
}
diff --git a/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/ai/BotPluginItemController.java b/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/ai/BotPluginItemController.java
new file mode 100644
index 00000000..984393f8
--- /dev/null
+++ b/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/ai/BotPluginItemController.java
@@ -0,0 +1,64 @@
+package tech.easyflow.admin.controller.ai;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import tech.easyflow.ai.entity.PluginItem;
+import tech.easyflow.ai.service.BotPluginService;
+import tech.easyflow.common.annotation.UsePermission;
+import tech.easyflow.common.domain.Result;
+import tech.easyflow.common.web.jsonbody.JsonBody;
+
+import java.math.BigInteger;
+import java.util.List;
+
+/**
+ * 旧 Bot 插件工具绑定查询控制器。
+ *
+ * 保留历史接口地址，同时将 Bot 表依赖限制在 Bot 专属代码中。
+ */
+@RestController
+@RequestMapping("/api/v1/pluginItem")
+@UsePermission(moduleName = "/api/v1/plugin")
+public class BotPluginItemController {
+
+ private final BotPluginService botPluginService;
+
+ /**
+ * 创建 Bot 插件工具绑定查询控制器。
+ *
+ * @param botPluginService Bot 插件绑定服务
+ */
+ public BotPluginItemController(BotPluginService botPluginService) {
+ this.botPluginService = botPluginService;
+ }
+
+ /**
+ * 查询插件工具，并标记指定 Bot 已绑定的工具。
+ *
+ * @param pluginId 插件 ID
+ * @param botId Bot ID
+ * @return 插件工具列表
+ */
+ @PostMapping("/toolsList")
+ @SaCheckPermission("/api/v1/plugin/query")
+ public Result> searchPluginTools(
+ @JsonBody(value = "pluginId", required = true) BigInteger pluginId,
+ @JsonBody(value = "botId", required = false) BigInteger botId) {
+ return Result.ok(botPluginService.searchPluginTools(pluginId, botId));
+ }
+
+ /**
+ * 查询指定 Bot 已绑定的插件工具。
+ *
+ * @param botId Bot ID
+ * @return 已绑定插件工具列表
+ */
+ @PostMapping("/tool/list")
+ @SaCheckPermission("/api/v1/plugin/query")
+ public Result> getPluginTools(
+ @JsonBody(value = "botId", required = true) BigInteger botId) {
+ return Result.ok(botPluginService.getPluginTools(botId));
+ }
+}
diff --git a/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/ai/ChatHistoryController.java b/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/ai/ChatHistoryController.java
index fb6fef2f..3b02aee0 100644
--- a/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/ai/ChatHistoryController.java
+++ b/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/ai/ChatHistoryController.java
@@ -1,10 +1,13 @@
package tech.easyflow.admin.controller.ai;
+import cn.dev33.satoken.annotation.SaCheckPermission;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import tech.easyflow.agent.service.AgentOptionQueryService;
+import tech.easyflow.agent.vo.AgentOptionView;
import tech.easyflow.chatlog.domain.dto.ChatHistoryPage;
import tech.easyflow.chatlog.domain.dto.ChatMessageRecord;
import tech.easyflow.chatlog.domain.dto.ChatSessionPage;
@@ -16,46 +19,133 @@ import tech.easyflow.common.domain.Result;
import tech.easyflow.common.entity.LoginAccount;
import tech.easyflow.common.satoken.util.SaTokenUtil;
import tech.easyflow.common.web.jsonbody.JsonBody;
+import tech.easyflow.system.service.CategoryPermissionService;
import java.math.BigInteger;
import java.util.List;
@RestController
@RequestMapping("/api/v1/chatHistory")
+@SaCheckPermission("/api/v1/chatHistory/query")
public class ChatHistoryController {
private final ChatHistoryManageService chatHistoryManageService;
+ private final CategoryPermissionService categoryPermissionService;
+ private final AgentOptionQueryService agentOptionQueryService;
- public ChatHistoryController(ChatHistoryManageService chatHistoryManageService) {
+ /**
+ * 创建聊天历史控制器。
+ *
+ * @param chatHistoryManageService 聊天历史管理服务
+ * @param categoryPermissionService 账号权限服务
+ * @param agentOptionQueryService Agent 安全选项服务
+ */
+ public ChatHistoryController(ChatHistoryManageService chatHistoryManageService,
+ CategoryPermissionService categoryPermissionService,
+ AgentOptionQueryService agentOptionQueryService) {
this.chatHistoryManageService = chatHistoryManageService;
+ this.categoryPermissionService = categoryPermissionService;
+ this.agentOptionQueryService = agentOptionQueryService;
}
+ /**
+ * 查询聊天记录筛选可使用的 Agent。
+ *
+ * @return Agent 安全选项
+ */
+ @GetMapping("/agentOptions")
+ public Result> agentOptions() {
+ return Result.ok(agentOptionQueryService.listAgentOptions(false));
+ }
+
+ /**
+ * 分页查询当前账号可见的 Agent 会话。
+ *
+ * @param query 会话筛选条件
+ * @return 会话分页结果
+ */
@GetMapping("/sessions")
public Result listSessions(ChatSessionFilterQuery query) {
- return Result.ok(chatHistoryManageService.queryAdminSessions(query));
+ LoginAccount account = SaTokenUtil.getLoginAccount();
+ return Result.ok(chatHistoryManageService.queryAdminSessions(
+ account.getId(),
+ categoryPermissionService.isSuperAdmin(account),
+ query
+ ));
}
+ /**
+ * 获取当前账号可见的 Agent 会话详情。
+ *
+ * @param sessionId 会话 ID
+ * @return 会话详情
+ */
@GetMapping("/sessions/{sessionId}")
public Result getSession(@PathVariable BigInteger sessionId) {
- return Result.ok(chatHistoryManageService.getAdminSession(sessionId));
+ LoginAccount account = SaTokenUtil.getLoginAccount();
+ return Result.ok(chatHistoryManageService.getAdminSession(
+ account.getId(),
+ categoryPermissionService.isSuperAdmin(account),
+ sessionId
+ ));
}
+ /**
+ * 分页查询当前账号可见会话的消息。
+ *
+ * @param sessionId 会话 ID
+ * @param query 消息分页条件
+ * @return 消息分页结果
+ */
@GetMapping("/sessions/{sessionId}/messages")
public Result queryMessages(@PathVariable BigInteger sessionId, ChatPageQuery query) {
- return Result.ok(chatHistoryManageService.queryAdminMessages(sessionId, query));
+ LoginAccount account = SaTokenUtil.getLoginAccount();
+ return Result.ok(chatHistoryManageService.queryAdminMessages(
+ account.getId(),
+ categoryPermissionService.isSuperAdmin(account),
+ sessionId,
+ query
+ ));
}
+ /**
+ * 查询当前账号可见会话的答案版本。
+ *
+ * @param sessionId 会话 ID
+ * @param roundId 对话轮次 ID
+ * @return 答案版本列表
+ */
@GetMapping("/sessions/{sessionId}/rounds/{roundId}/variants")
public Result> listRoundVariants(@PathVariable BigInteger sessionId,
@PathVariable BigInteger roundId) {
- return Result.ok(chatHistoryManageService.listAdminRoundVariants(sessionId, roundId));
+ LoginAccount account = SaTokenUtil.getLoginAccount();
+ return Result.ok(chatHistoryManageService.listAdminRoundVariants(
+ account.getId(),
+ categoryPermissionService.isSuperAdmin(account),
+ sessionId,
+ roundId
+ ));
}
+ /**
+ * 选择当前账号可见会话的答案版本。
+ *
+ * @param sessionId 会话 ID
+ * @param roundId 对话轮次 ID
+ * @param variantIndex 目标版本索引
+ * @return 选中的答案记录
+ */
@PostMapping("/sessions/{sessionId}/rounds/{roundId}/selectVariant")
public Result selectRoundVariant(@PathVariable BigInteger sessionId,
@PathVariable BigInteger roundId,
@JsonBody(value = "variantIndex", required = true) Integer variantIndex) {
LoginAccount account = SaTokenUtil.getLoginAccount();
- return Result.ok(chatHistoryManageService.selectAdminRoundVariant(sessionId, roundId, variantIndex, account.getId()));
+ return Result.ok(chatHistoryManageService.selectAdminRoundVariant(
+ account.getId(),
+ categoryPermissionService.isSuperAdmin(account),
+ sessionId,
+ roundId,
+ variantIndex
+ ));
}
}
diff --git a/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/ai/DocumentCollectionController.java b/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/ai/DocumentCollectionController.java
index 59dcf159..70523874 100644
--- a/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/ai/DocumentCollectionController.java
+++ b/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/ai/DocumentCollectionController.java
@@ -14,10 +14,11 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import tech.easyflow.admin.controller.ai.support.AiResourceCreatorNameSupport;
+import tech.easyflow.agent.entity.AgentKnowledgeBinding;
+import tech.easyflow.agent.service.AgentKnowledgeBindingService;
import tech.easyflow.ai.permission.KnowledgeVisibilityQueryHelper;
import tech.easyflow.ai.documentimport.DocumentImportDtos;
import tech.easyflow.ai.dto.KnowledgeSearchResultItem;
-import tech.easyflow.ai.entity.BotDocumentCollection;
import tech.easyflow.ai.entity.DocumentCollection;
import tech.easyflow.ai.entity.Model;
import tech.easyflow.ai.enums.PublishStatus;
@@ -27,7 +28,6 @@ import tech.easyflow.ai.vo.OfflineImpactCheckVo;
import tech.easyflow.approval.entity.vo.ApprovalActionResult;
import tech.easyflow.ai.rag.KnowledgeRetrievalRequest;
import tech.easyflow.ai.rag.KnowledgeRetrievalModes;
-import tech.easyflow.ai.service.BotDocumentCollectionService;
import tech.easyflow.ai.service.DocumentChunkService;
import tech.easyflow.ai.service.DocumentCollectionService;
import tech.easyflow.ai.service.ModelService;
@@ -68,7 +68,7 @@ public class DocumentCollectionController extends BaseCurdController onSaveOrUpdateBefore(DocumentCollection entity, boolean isSave) {
normalizeVisibilityScope(entity, isSave);
@@ -169,11 +179,11 @@ public class DocumentCollectionController extends BaseCurdController submitPublishApproval(@JsonBody("id") BigInteger id) {
+ public Result submitPublishApproval(
+ @JsonBody("id") BigInteger id,
+ @JsonBody("applicationReason") String applicationReason
+ ) {
return buildApprovalActionResult(
- knowledgePublishAppService.submitPublishApproval(id),
+ knowledgePublishAppService.submitPublishApproval(id, applicationReason),
"已提交发布审批",
"已直接发布"
);
}
+ /**
+ * 预检知识库发布是否命中审批流。
+ *
+ * @param id 知识库 ID
+ * @return 是否需要审批
+ */
+ @GetMapping("/publishApprovalRequirement")
+ @SaCheckPermission("/api/v1/documentCollection/save")
+ public Result publishApprovalRequirement(@RequestParam BigInteger id) {
+ return Result.ok(knowledgePublishAppService.isPublishApprovalRequired(id));
+ }
+
/**
* 提交下线审批。
*
diff --git a/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/ai/DocumentController.java b/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/ai/DocumentController.java
index 694ca72f..ad92f16b 100644
--- a/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/ai/DocumentController.java
+++ b/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/ai/DocumentController.java
@@ -11,8 +11,11 @@ import org.springframework.core.io.ClassPathResource;
import org.springframework.http.MediaType;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
+import tech.easyflow.ai.documentimport.DocumentImportBatchDtos;
import tech.easyflow.ai.documentimport.DocumentImportDtos;
+import tech.easyflow.ai.documentimport.task.DocumentImportBatchAppService;
import tech.easyflow.ai.documentimport.task.DocumentImportTaskStatusStreamService;
import tech.easyflow.ai.entity.Document;
import tech.easyflow.ai.entity.DocumentCollection;
@@ -83,6 +86,9 @@ public class DocumentController extends BaseCurdController> documentList(@RequestParam(name="title", required = false) String fileName, @RequestParam(name="pageSize") int pageSize, @RequestParam(name = "pageNumber") int pageNumber) {
+ public Result> documentList(
+ @RequestParam(name = "keyword", required = false) String keyword,
+ @RequestParam(name = "title", required = false) String legacyTitle,
+ @RequestParam(name = "pageSize") int pageSize,
+ @RequestParam(name = "pageNumber") int pageNumber) {
String kbSlug = RequestUtil.getParamAsString("id");
if (StringUtil.noText(kbSlug)) {
throw new BusinessException("知识库id不能为空");
}
DocumentCollection knowledge = getDocumentCollection(kbSlug, ResourceAction.READ, "无权限访问知识库");
- Page documentList = documentService.getDocumentList(knowledge.getId().toString(), pageSize, pageNumber,fileName);
+ String effectiveKeyword = StringUtil.hasText(keyword) ? keyword : legacyTitle;
+ Page documentList = documentService.getDocumentList(
+ knowledge.getId().toString(), pageSize, pageNumber, effectiveKeyword);
return Result.ok(documentList);
}
@@ -312,6 +334,142 @@ public class DocumentController extends BaseCurdController createImportBatch(
+ @JsonBody DocumentImportBatchDtos.CreateRequest request) {
+ if (request == null || request.getKnowledgeId() == null) {
+ throw new BusinessException("知识库id不能为空");
+ }
+ getDocumentCollection(request.getKnowledgeId().toString(), ResourceAction.MANAGE, "无权限管理知识库");
+ return Result.ok(documentImportBatchAppService.createBatch(request));
+ }
+
+ /**
+ * 上传一个批次文件。
+ *
+ * @param batchId 批次 ID
+ * @param itemId 文件项 ID
+ * @param knowledgeId 知识库 ID
+ * @param file 上传文件
+ * @return 文件项状态
+ */
+ @PostMapping(value = "import/batch/{batchId}/item/{itemId}/upload",
+ consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+ @SaCheckPermission("/api/v1/documentCollection/save")
+ public Result uploadImportBatchItem(
+ @PathVariable BigInteger batchId,
+ @PathVariable BigInteger itemId,
+ @RequestParam BigInteger knowledgeId,
+ @RequestPart("file") MultipartFile file) {
+ getDocumentCollection(knowledgeId.toString(), ResourceAction.MANAGE, "无权限管理知识库");
+ return Result.ok(documentImportBatchAppService.uploadItem(
+ knowledgeId, batchId, itemId, file));
+ }
+
+ /**
+ * 启动手动或自动批量导入。
+ *
+ * @param request 启动请求
+ * @return 批次状态
+ */
+ @PostMapping("import/batch/start")
+ @SaCheckPermission("/api/v1/documentCollection/save")
+ public Result startImportBatch(
+ @JsonBody DocumentImportBatchDtos.StartRequest request) {
+ if (request == null || request.getKnowledgeId() == null) {
+ throw new BusinessException("知识库id不能为空");
+ }
+ getDocumentCollection(request.getKnowledgeId().toString(), ResourceAction.MANAGE, "无权限管理知识库");
+ return Result.ok(documentImportBatchAppService.startBatch(request));
+ }
+
+ /**
+ * 取消一个尚未启动的上传批次。
+ *
+ * @param knowledgeId 知识库 ID
+ * @param batchId 批次 ID
+ * @return 空结果
+ */
+ @PostMapping("import/batch/cancel")
+ @SaCheckPermission("/api/v1/documentCollection/save")
+ public Result cancelImportBatch(
+ @JsonBody(value = "knowledgeId", required = true) BigInteger knowledgeId,
+ @JsonBody(value = "batchId", required = true) BigInteger batchId) {
+ getDocumentCollection(knowledgeId.toString(), ResourceAction.MANAGE, "无权限管理知识库");
+ documentImportBatchAppService.cancelBatch(knowledgeId, batchId);
+ return Result.ok();
+ }
+
+ /**
+ * 查询批次状态。
+ *
+ * @param knowledgeId 知识库 ID
+ * @param batchId 批次 ID
+ * @return 批次状态
+ */
+ @GetMapping("import/batch/status")
+ @SaCheckPermission("/api/v1/documentCollection/query")
+ public Result getImportBatchStatus(
+ @RequestParam BigInteger knowledgeId,
+ @RequestParam BigInteger batchId) {
+ getDocumentCollection(knowledgeId.toString(), ResourceAction.READ, "无权限访问知识库");
+ return Result.ok(documentImportBatchAppService.getBatchStatus(knowledgeId, batchId));
+ }
+
+ /**
+ * 查询知识库最近一个自动导入批次。
+ *
+ * @param knowledgeId 知识库 ID
+ * @return 最近批次状态
+ */
+ @GetMapping("import/batch/current")
+ @SaCheckPermission("/api/v1/documentCollection/query")
+ public Result getCurrentImportBatch(
+ @RequestParam BigInteger knowledgeId) {
+ getDocumentCollection(knowledgeId.toString(), ResourceAction.READ, "无权限访问知识库");
+ return Result.ok(documentImportBatchAppService.getLatestAutoBatch(knowledgeId));
+ }
+
+ /**
+ * 继续中断或部分失败的自动导入批次。
+ *
+ * @param knowledgeId 知识库 ID
+ * @param batchId 批次 ID
+ * @return 继续后的批次状态
+ */
+ @PostMapping("import/batch/continue")
+ @SaCheckPermission("/api/v1/documentCollection/save")
+ public Result continueImportBatch(
+ @JsonBody(value = "knowledgeId", required = true) BigInteger knowledgeId,
+ @JsonBody(value = "batchId", required = true) BigInteger batchId) {
+ getDocumentCollection(knowledgeId.toString(), ResourceAction.MANAGE, "无权限管理知识库");
+ return Result.ok(documentImportBatchAppService.continueBatch(knowledgeId, batchId));
+ }
+
+ /**
+ * 根据解析、分块或向量化失败阶段统一重试。
+ *
+ * @param request 重试请求
+ * @return 重试任务状态
+ */
+ @PostMapping("import/task/retry")
+ @SaCheckPermission("/api/v1/documentCollection/save")
+ public Result retryImportTask(
+ @JsonBody DocumentImportDtos.TaskRetryRequest request) {
+ if (request == null || request.getKnowledgeId() == null || request.getDocumentId() == null) {
+ throw new BusinessException("重试信息不完整");
+ }
+ getDocumentCollection(request.getKnowledgeId().toString(), ResourceAction.MANAGE, "无权限管理知识库");
+ return documentService.retryFailedTask(request);
+ }
+
/**
* 更新 entity
*
diff --git a/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/ai/FaqItemController.java b/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/ai/FaqItemController.java
index 70f18757..27580be0 100644
--- a/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/ai/FaqItemController.java
+++ b/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/ai/FaqItemController.java
@@ -2,6 +2,7 @@ package tech.easyflow.admin.controller.ai;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.mybatisflex.core.paginate.Page;
+import com.mybatisflex.core.query.QueryColumn;
import com.mybatisflex.core.query.QueryWrapper;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
@@ -47,7 +48,7 @@ import java.util.Set;
@UsePermission(moduleName = "/api/v1/documentCollection")
public class FaqItemController extends BaseCurdController {
- private static final long MAX_IMAGE_SIZE_BYTES = 5L * 1024L * 1024L;
+ private static final long MAX_IMAGE_SIZE_BYTES = 20L * 1024L * 1024L;
private static final Set ALLOWED_IMAGE_TYPES = new HashSet<>(Arrays.asList(
"image/jpeg",
"image/png",
@@ -114,9 +115,14 @@ public class FaqItemController extends BaseCurdController MAX_IMAGE_SIZE_BYTES) {
- throw new BusinessException("图片大小不能超过5MB");
+ throw new BusinessException("图片大小不能超过20MB");
}
if (!isAllowedImageType(file)) {
throw new BusinessException("仅支持 JPG/PNG/WEBP/GIF 图片");
diff --git a/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/ai/McpController.java b/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/ai/McpController.java
index 1ede9e94..0b1ecabe 100644
--- a/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/ai/McpController.java
+++ b/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/ai/McpController.java
@@ -9,16 +9,19 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import tech.easyflow.ai.entity.BotMcp;
import tech.easyflow.ai.entity.Mcp;
-import tech.easyflow.ai.service.BotMcpService;
+import tech.easyflow.ai.service.AgentResourceReferenceService;
import tech.easyflow.ai.service.McpService;
import tech.easyflow.common.domain.Result;
+import tech.easyflow.common.entity.LoginAccount;
+import tech.easyflow.common.satoken.util.SaTokenUtil;
import tech.easyflow.common.web.controller.BaseCurdController;
+import tech.easyflow.common.web.exceptions.BusinessException;
import tech.easyflow.common.web.jsonbody.JsonBody;
import javax.annotation.Resource;
import java.io.Serializable;
+import java.math.BigInteger;
/**
* 控制层。
@@ -33,8 +36,18 @@ public class McpController extends BaseCurdController {
super(service);
}
+ /**
+ * 获取 MCP 列表关键字搜索字段。
+ *
+ * @return 标题和描述属性
+ */
+ @Override
+ protected String[] getKeywordSearchProperties() {
+ return new String[]{"title", "description"};
+ }
+
@Resource
- private BotMcpService botMcpService;
+ private AgentResourceReferenceService agentResourceReferenceService;
@Override
public Result save(Mcp entity) {
return service.saveMcp(entity);
@@ -45,11 +58,29 @@ public class McpController extends BaseCurdController {
return service.updateMcp(entity);
}
+ /**
+ * 删除未被 Agent 绑定的 MCP。
+ *
+ * @param id MCP ID
+ * @return 删除结果
+ */
@Override
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
public Result remove(Serializable id) {
+ LoginAccount account = SaTokenUtil.getLoginAccount();
+ if (account == null || account.getTenantId() == null) {
+ throw new BusinessException("当前登录状态失效，请重新登录后再试");
+ }
+ // 锁定 MCP 资源行，与 Agent 绑定校验串行，避免检查后并发写入绑定。
+ Mcp mcp = service.getOne(QueryWrapper.create()
+ .eq(Mcp::getId, id)
+ .eq(Mcp::getTenantId, account.getTenantId())
+ .forUpdate());
+ if (mcp == null) {
+ throw new BusinessException("MCP 不存在或无权删除");
+ }
+ agentResourceReferenceService.assertMcpUnused(new BigInteger(String.valueOf(id)));
service.removeMcp(id);
- botMcpService.remove(QueryWrapper.create().eq(BotMcp::getMcpId, id));
return Result.ok();
}
diff --git a/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/ai/ModelController.java b/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/ai/ModelController.java
index d9728ac5..a7bf1633 100644
--- a/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/ai/ModelController.java
+++ b/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/ai/ModelController.java
@@ -9,15 +9,21 @@ import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import tech.easyflow.ai.dto.ModelInvokeConfigDtos;
import tech.easyflow.ai.entity.Model;
-import tech.easyflow.ai.entity.ModelProvider;
import tech.easyflow.ai.entity.table.ModelTableDef;
import tech.easyflow.ai.mapper.ModelMapper;
+import tech.easyflow.ai.service.AgentResourceReferenceService;
import tech.easyflow.ai.service.ModelService;
+import tech.easyflow.admin.model.ai.ModelGatewayConfigView;
+import tech.easyflow.common.satoken.util.SaTokenUtil;
+import tech.easyflow.system.entity.SysOption;
+import tech.easyflow.system.service.SysOptionService;
+import tech.easyflow.ai.service.capability.ModelCapabilityResolution;
import tech.easyflow.common.domain.Result;
import tech.easyflow.common.entity.LoginAccount;
import tech.easyflow.common.satoken.util.SaTokenUtil;
import tech.easyflow.common.tree.Tree;
import tech.easyflow.common.web.controller.BaseCurdController;
+import tech.easyflow.common.web.exceptions.BusinessException;
import tech.easyflow.common.web.jsonbody.JsonBody;
import javax.annotation.Resource;
@@ -26,7 +32,6 @@ import java.math.BigInteger;
import java.util.Collections;
import java.util.List;
import java.util.Map;
-import java.util.Optional;
import java.util.stream.Collectors;
/**
@@ -39,6 +44,11 @@ import java.util.stream.Collectors;
@RequestMapping("/api/v1/model")
public class ModelController extends BaseCurdController {
+ private static final String CHAT_PUBLISH_BASE_URL = "chat_publish_base_url";
+
+ @Autowired
+ private SysOptionService sysOptionService;
+
public ModelController(ModelService service) {
super(service);
}
@@ -46,22 +56,30 @@ public class ModelController extends BaseCurdController {
@Autowired
ModelService modelService;
+ /**
+ * 查询模型统一网关页面所需的安全配置。
+ *
+ * @return 仅包含模型发布基础地址的配置
+ */
+ @GetMapping("/gatewayConfig")
+ @SaCheckPermission("/api/v1/model/query")
+ public Result gatewayConfig() {
+ SysOption option = sysOptionService.getByOptionKey(
+ CHAT_PUBLISH_BASE_URL,
+ SaTokenUtil.getLoginAccount().getTenantId()
+ );
+ return Result.ok(new ModelGatewayConfigView(option == null ? null : option.getValue()));
+ }
+
@Resource
ModelMapper modelMapper;
+ @Resource
+ AgentResourceReferenceService agentResourceReferenceService;
@GetMapping("list")
@SaCheckPermission("/api/v1/model/query")
public Result> list(Model entity, Boolean asTree, String sortKey, String sortType) {
- QueryWrapper queryWrapper = QueryWrapper.create(entity, buildOperators(entity));
- queryWrapper.orderBy(buildOrderBy(sortKey, sortType, getDefaultOrderBy()));
- List list = Tree.tryToTree(modelMapper.selectListWithRelationsByQuery(queryWrapper), asTree);
- list.forEach(item -> {
- String providerName = Optional.ofNullable(item.getModelProvider())
- .map(ModelProvider::getProviderName)
- .orElse("-");
- item.setTitle(providerName + "/" + item.getTitle());
- });
- return Result.ok(list);
+ return Result.ok(service.listSelectableModels(entity, asTree, sortKey, sortType));
}
@GetMapping("getList")
@@ -92,9 +110,39 @@ public class ModelController extends BaseCurdController {
return Result.ok(modelService.verifyModelConfig(model));
}
+ /**
+ * 根据模型 ID 返回自动识别的类型和能力。
+ *
+ * @param providerId 供应商 ID
+ * @param modelName 模型 ID
+ * @return 模型能力识别结果
+ */
+ @GetMapping("capabilities")
+ @SaCheckPermission("/api/v1/model/query")
+ public Result resolveCapabilities(
+ @RequestParam(required = false) BigInteger providerId,
+ @RequestParam String modelName) {
+ return Result.ok(modelService.resolveModelCapabilities(providerId, modelName));
+ }
+
@PostMapping("/removeByEntity")
@SaCheckPermission("/api/v1/model/remove")
+ @Transactional(rollbackFor = Exception.class)
public Result removeByEntity(@RequestBody Model entity) {
+ LoginAccount account = requireAccount();
+ List models = service.list(QueryWrapper.create()
+ .select(Model::getId)
+ .eq(Model::getProviderId, entity.getProviderId())
+ .eq(Model::getGroupName, entity.getGroupName())
+ .eq(Model::getTenantId, account.getTenantId())
+ .orderBy(Model::getId, true)
+ .forUpdate());
+ if (models.isEmpty()) {
+ throw new BusinessException("模型不存在或无权删除");
+ }
+ agentResourceReferenceService.assertModelsUnused(
+ models.stream().map(Model::getId).toList());
+ entity.setTenantId(account.getTenantId());
modelService.removeByEntity(entity);
return Result.ok();
}
@@ -145,8 +193,10 @@ public class ModelController extends BaseCurdController {
QueryWrapper queryWrapper = QueryWrapper.create();
queryWrapper.eq(Model::getProviderId, providerId);
queryWrapper.eq(Model::getModelType, modelType);
- if (StringUtils.hasLength(selectText)) {
- queryWrapper.and(ModelTableDef.MODEL.TITLE.like(selectText).or(ModelTableDef.MODEL.MODEL_NAME.like(selectText)));
+ String keyword = normalizeSearchKeyword(selectText);
+ if (StringUtils.hasText(keyword)) {
+ queryWrapper.and(buildLiteralContainsCondition(
+ keyword, ModelTableDef.MODEL.TITLE, ModelTableDef.MODEL.MODEL_NAME));
}
List totalList = service.getMapper().selectListWithRelationsByQuery(queryWrapper);
Map> groupList = totalList.stream().collect(Collectors.groupingBy(Model::getGroupName));
@@ -167,11 +217,39 @@ public class ModelController extends BaseCurdController {
}
@PostMapping("removeLlmByIds")
- @Transactional
+ @SaCheckPermission("/api/v1/model/remove")
+ @Transactional(rollbackFor = Exception.class)
public Result removeLlm(@JsonBody(value = "id", required = true) Serializable id) {
+ LoginAccount account = requireAccount();
List ids = Collections.singletonList(id);
- QueryWrapper queryWrapper = QueryWrapper.create().in(Model::getId, ids);
- service.remove(queryWrapper);
+ QueryWrapper queryWrapper = QueryWrapper.create()
+ .in(Model::getId, ids)
+ .eq(Model::getTenantId, account.getTenantId())
+ .orderBy(Model::getId, true)
+ .forUpdate();
+ List models = service.list(queryWrapper);
+ if (models.isEmpty()) {
+ throw new BusinessException("模型不存在或无权删除");
+ }
+ agentResourceReferenceService.assertModelsUnused(
+ models.stream().map(Model::getId).toList());
+ service.remove(QueryWrapper.create()
+ .in(Model::getId, ids)
+ .eq(Model::getTenantId, account.getTenantId()));
return Result.ok();
}
+
+ /**
+ * 获取带租户信息的当前登录账号。
+ *
+ * @return 当前登录账号
+ * @throws BusinessException 登录状态无效时抛出
+ */
+ private LoginAccount requireAccount() {
+ LoginAccount account = SaTokenUtil.getLoginAccount();
+ if (account == null || account.getTenantId() == null) {
+ throw new BusinessException("当前登录状态失效，请重新登录后再试");
+ }
+ return account;
+ }
}
diff --git a/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/ai/ModelProviderController.java b/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/ai/ModelProviderController.java
index 6a6df634..e6c76032 100644
--- a/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/ai/ModelProviderController.java
+++ b/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/ai/ModelProviderController.java
@@ -1,21 +1,33 @@
package tech.easyflow.admin.controller.ai;
+import cn.dev33.satoken.annotation.SaCheckPermission;
import com.mybatisflex.core.query.QueryWrapper;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import tech.easyflow.ai.dto.RemoteModelImportRequest;
import tech.easyflow.ai.entity.Model;
import tech.easyflow.ai.entity.ModelProvider;
import tech.easyflow.ai.service.ModelProviderService;
import tech.easyflow.ai.service.ModelService;
+import tech.easyflow.ai.service.discovery.RemoteModelDiscoveryService;
+import tech.easyflow.ai.service.discovery.RemoteModelImportResult;
+import tech.easyflow.ai.service.discovery.RemoteModelImportService;
+import tech.easyflow.ai.service.discovery.RemoteModelListResult;
import tech.easyflow.common.annotation.UsePermission;
import tech.easyflow.common.domain.Result;
+import tech.easyflow.common.entity.LoginAccount;
+import tech.easyflow.common.satoken.util.SaTokenUtil;
import tech.easyflow.common.web.controller.BaseCurdController;
import tech.easyflow.common.web.exceptions.BusinessException;
import tech.easyflow.common.web.jsonbody.JsonBody;
import java.io.Serializable;
+import java.math.BigInteger;
/**
* 控制层。
@@ -28,12 +40,33 @@ import java.io.Serializable;
@UsePermission(moduleName = "/api/v1/model")
public class ModelProviderController extends BaseCurdController {
private final ModelService modelService;
+ private final RemoteModelDiscoveryService remoteModelDiscoveryService;
+ private final RemoteModelImportService remoteModelImportService;
- public ModelProviderController(ModelProviderService service, ModelService modelService) {
+ /**
+ * 创建模型服务商控制器。
+ *
+ * @param service 模型服务商服务
+ * @param modelService 模型服务
+ * @param remoteModelDiscoveryService 远端模型发现服务
+ * @param remoteModelImportService 远端模型一键添加服务
+ */
+ public ModelProviderController(ModelProviderService service,
+ ModelService modelService,
+ RemoteModelDiscoveryService remoteModelDiscoveryService,
+ RemoteModelImportService remoteModelImportService) {
super(service);
this.modelService = modelService;
+ this.remoteModelDiscoveryService = remoteModelDiscoveryService;
+ this.remoteModelImportService = remoteModelImportService;
}
+ /**
+ * 删除没有子模型的服务商。
+ *
+ * @param id 服务商 ID
+ * @return 删除结果
+ */
@Override
@PostMapping("remove")
@Transactional
@@ -45,4 +78,35 @@ public class ModelProviderController extends BaseCurdController remoteModels(@PathVariable BigInteger providerId) {
+ return Result.ok(remoteModelDiscoveryService.discover(providerId));
+ }
+
+ /**
+ * 幂等添加单个远端模型。
+ *
+ * @param providerId 服务商 ID
+ * @param request 一键添加请求
+ * @return 创建或已存在结果
+ */
+ @PostMapping("{providerId}/remoteModels/import")
+ @SaCheckPermission("/api/v1/model/save")
+ public Result importRemoteModel(
+ @PathVariable BigInteger providerId,
+ @RequestBody RemoteModelImportRequest request) {
+ LoginAccount account = SaTokenUtil.getLoginAccount();
+ Model model = new Model();
+ commonFiled(model, account.getId(), account.getTenantId(), account.getDeptId());
+ String modelId = request == null ? null : request.getModelId();
+ return Result.ok(remoteModelImportService.importModel(providerId, modelId, model));
+ }
+}
diff --git a/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/ai/PluginController.java b/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/ai/PluginController.java
index 509b6d36..ca1ca71d 100644
--- a/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/ai/PluginController.java
+++ b/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/ai/PluginController.java
@@ -2,6 +2,7 @@ package tech.easyflow.admin.controller.ai;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.mybatisflex.core.paginate.Page;
+import com.mybatisflex.core.query.QueryColumn;
import com.mybatisflex.core.query.QueryWrapper;
import jakarta.servlet.http.HttpServletRequest;
import org.springframework.web.bind.annotation.GetMapping;
@@ -12,6 +13,7 @@ import tech.easyflow.ai.entity.Plugin;
import tech.easyflow.ai.entity.Workflow;
import tech.easyflow.ai.plugin.workflow.snapshot.WorkflowPluginSnapshotResolver;
import tech.easyflow.ai.service.ModelService;
+import tech.easyflow.ai.service.PluginItemService;
import tech.easyflow.ai.service.PluginVisibilityService;
import tech.easyflow.ai.permission.WorkflowVisibilityQueryHelper;
import tech.easyflow.ai.service.WorkflowService;
@@ -47,8 +49,24 @@ import static tech.easyflow.ai.entity.table.PluginTableDef.PLUGIN;
@RestController
@RequestMapping("/api/v1/plugin")
public class PluginController extends BaseCurdController {
+ /**
+ * 创建插件控制器。
+ *
+ * @param service 插件服务
+ */
public PluginController(PluginService service) {
super(service);
+ this.pluginService = service;
+ }
+
+ /**
+ * 获取插件列表关键字搜索字段。
+ *
+ * @return 插件名称和描述属性
+ */
+ @Override
+ protected String[] getKeywordSearchProperties() {
+ return new String[]{"name", "description"};
}
@Resource
@@ -89,10 +107,15 @@ public class PluginController extends BaseCurdController
return Result.ok(pluginService.updatePlugin(plugin));
}
+ /**
+ * 删除插件。
+ *
+ * @param id 插件 ID
+ * @return 删除结果
+ */
@PostMapping("/plugin/remove")
@SaCheckPermission("/api/v1/plugin/remove")
public Result removePlugin(@JsonBody(value = "id", required = true) String id){
-
return Result.ok(pluginService.removePlugin(id));
}
@@ -105,9 +128,24 @@ public class PluginController extends BaseCurdController
return Result.ok(pluginService.preparePluginsForCurrentUser(plugins, true, false));
}
+ /**
+ * 按分类分页查询插件，并支持按名称、描述模糊查询。
+ *
+ * @param request 当前请求
+ * @param sortKey 排序字段
+ * @param sortType 排序方向
+ * @param pageNumber 页码
+ * @param pageSize 每页数量
+ * @param category 分类 ID，0 表示全部分类
+ * @param keyword 插件名称或描述关键字
+ * @param name 兼容旧客户端的插件名称关键字
+ * @return 插件分页结果
+ */
@GetMapping("/pageByCategory")
@SaCheckPermission("/api/v1/plugin/query")
- public Result> pageByCategory(HttpServletRequest request, String sortKey, String sortType, Long pageNumber, Long pageSize, int category) {
+ public Result> pageByCategory(HttpServletRequest request, String sortKey, String sortType,
+ Long pageNumber, Long pageSize, int category,
+ String keyword, String name) {
if (pageNumber == null || pageNumber < 1) {
pageNumber = 1L;
}
@@ -120,7 +158,10 @@ public class PluginController extends BaseCurdController
queryWrapper.orderBy(buildOrderBy(sortKey, sortType, getDefaultOrderBy()));
return Result.ok(queryPage(new Page<>(pageNumber, pageSize), queryWrapper));
} else {
- Result> result = pluginService.pageByCategory(pageNumber, pageSize, category);
+ String effectiveKeyword = normalizeSearchKeyword(
+ keyword == null || keyword.isBlank() ? name : keyword);
+ Result> result = pluginService.pageByCategory(
+ pageNumber, pageSize, category, effectiveKeyword);
if (result != null && result.getData() != null) {
aiResourceCreatorNameSupport.fillPluginCreatorNames(result.getData().getRecords());
}
@@ -135,7 +176,7 @@ public class PluginController extends BaseCurdController
workflowVisibilityQueryHelper.applyReadableAccess(queryWrapper);
queryWrapper.eq("publish_status", tech.easyflow.ai.enums.PublishStatus.PUBLISHED.getCode());
if (keyword != null && !keyword.isBlank()) {
- queryWrapper.like("title", keyword.trim());
+ queryWrapper.and(buildLiteralContainsCondition(keyword, new QueryColumn("title")));
}
queryWrapper.orderBy("modified desc");
LoginAccount loginAccount = SaTokenUtil.getLoginAccount();
diff --git a/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/ai/PluginItemController.java b/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/ai/PluginItemController.java
index 7b59a555..30e898e6 100644
--- a/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/ai/PluginItemController.java
+++ b/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/ai/PluginItemController.java
@@ -19,19 +19,20 @@ import tech.easyflow.ai.easyagentsflow.entity.WorkflowCheckStage;
import tech.easyflow.ai.easyagentsflow.service.TinyFlowService;
import tech.easyflow.ai.easyagentsflow.service.WorkflowCheckService;
import tech.easyflow.ai.easyagentsflow.support.PublishedWorkflowDefinitionIds;
-import tech.easyflow.ai.entity.BotPlugin;
import tech.easyflow.ai.entity.Plugin;
import tech.easyflow.ai.entity.PluginItem;
import tech.easyflow.ai.entity.Workflow;
import tech.easyflow.ai.enums.PluginType;
import tech.easyflow.ai.plugin.workflow.snapshot.WorkflowPluginSnapshotResolver;
-import tech.easyflow.ai.service.BotPluginService;
import tech.easyflow.ai.service.PluginService;
import tech.easyflow.ai.service.PluginItemService;
+import tech.easyflow.ai.service.AgentResourceReferenceService;
+import tech.easyflow.ai.service.PluginVisibilityService;
import tech.easyflow.ai.service.WorkflowService;
import tech.easyflow.common.constant.Constants;
import tech.easyflow.common.annotation.UsePermission;
import tech.easyflow.common.domain.Result;
+import tech.easyflow.common.entity.LoginAccount;
import tech.easyflow.common.satoken.util.SaTokenUtil;
import tech.easyflow.common.web.controller.BaseCurdController;
import tech.easyflow.common.web.exceptions.BusinessException;
@@ -42,8 +43,10 @@ import java.io.Serializable;
import java.math.BigInteger;
import java.util.Collection;
import java.util.HashMap;
+import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
+import java.util.Set;
/**
* 控制层。
@@ -55,18 +58,35 @@ import java.util.Map;
@RequestMapping("/api/v1/pluginItem")
@UsePermission(moduleName = "/api/v1/plugin")
public class PluginItemController extends BaseCurdController {
+ /**
+ * 创建插件工具控制器。
+ *
+ * @param service 插件工具服务
+ */
public PluginItemController(PluginItemService service) {
super(service);
}
+ /**
+ * 获取插件工具列表关键字搜索字段。
+ *
+ * @return 工具名称和描述属性
+ */
+ @Override
+ protected String[] getKeywordSearchProperties() {
+ return new String[]{"name", "description"};
+ }
+
@Resource
private PluginItemService pluginItemService;
@Resource
- private BotPluginService botPluginService;
+ private AgentResourceReferenceService agentResourceReferenceService;
@Resource
private PluginService pluginService;
@Resource
+ private PluginVisibilityService pluginVisibilityService;
+ @Resource
private WorkflowPluginSnapshotResolver workflowPluginSnapshotResolver;
@Resource
private WorkflowService workflowService;
@@ -91,25 +111,12 @@ public class PluginItemController extends BaseCurdController> searchPluginToolByPluginId(@JsonBody(value = "pluginId", required = true) BigInteger pluginId,
- @JsonBody(value = "botId", required = false) BigInteger botId){
- return Result.ok(pluginItemService.searchPluginToolByPluginId(pluginId, botId));
- }
-
@PostMapping("/tool/update")
@SaCheckPermission("/api/v1/plugin/save")
public Result updatePlugin(@JsonBody PluginItem pluginItem){
return Result.ok(pluginItemService.updatePlugin(pluginItem));
}
- @PostMapping("/tool/list")
- @SaCheckPermission("/api/v1/plugin/query")
- public Result> getPluginToolList(@JsonBody(value = "botId", required = true) BigInteger botId){
- return Result.ok(pluginItemService.getPluginToolList(botId));
- }
-
@GetMapping("/getTinyFlowData")
@SaCheckPermission("/api/v1/plugin/query")
public Result getTinyFlowData(BigInteger id) {
@@ -275,26 +282,64 @@ public class PluginItemController extends BaseCurdController onRemoveBefore(Collection ids) {
-
- QueryWrapper queryWrapper = QueryWrapper.create();
- queryWrapper.in(BotPlugin::getPluginItemId, ids);
-
- boolean exists = botPluginService.exists(queryWrapper);
- if (exists){
- return Result.fail(1, "此工具还关联着bot，请先取消关联！");
- }
- if (ids.size() == 1) {
- PluginItem pluginItem = pluginItemService.getById(ids.iterator().next());
- if (pluginItem != null) {
- Plugin plugin = pluginService.getById(pluginItem.getPluginId());
- if (plugin != null && PluginType.isWorkflow(plugin.getType())) {
- return Result.fail(1, "工作流插件工具由系统自动维护，不支持删除");
+ Set uniquePluginItemIds = new LinkedHashSet<>();
+ try {
+ for (Serializable id : ids) {
+ if (id == null) {
+ throw new NumberFormatException("null");
}
+ uniquePluginItemIds.add(new BigInteger(String.valueOf(id)));
+ }
+ } catch (NumberFormatException exception) {
+ throw new BusinessException("插件工具 ID 不合法");
+ }
+
+ // BaseCurdController#remove 已开启事务；锁定工具行后校验权限和 Agent 引用。
+ List lockedPluginItems = pluginItemService.list(QueryWrapper.create()
+ .in(PluginItem::getId, uniquePluginItemIds)
+ .orderBy(PluginItem::getId, true)
+ .forUpdate());
+ if (lockedPluginItems == null || lockedPluginItems.size() != uniquePluginItemIds.size()) {
+ throw new BusinessException("插件工具不存在或已被删除");
+ }
+
+ LoginAccount loginAccount = SaTokenUtil.getLoginAccount();
+ if (loginAccount == null || loginAccount.getTenantId() == null) {
+ throw new BusinessException("当前登录信息无效");
+ }
+ Map plugins = new HashMap<>();
+ for (PluginItem pluginItem : lockedPluginItems) {
+ if (pluginItem.getPluginId() == null) {
+ throw new BusinessException("插件工具关联的插件不存在");
+ }
+ Plugin plugin = plugins.get(pluginItem.getPluginId());
+ if (plugin == null) {
+ plugin = pluginService.getById(pluginItem.getPluginId());
+ if (plugin == null || plugin.getTenantId() == null
+ || !loginAccount.getTenantId().toString().equals(plugin.getTenantId().toString())) {
+ throw new BusinessException("无权限删除该插件工具");
+ }
+ pluginVisibilityService.assertPluginVisible(
+ plugin.getCreatedBy(),
+ plugin.getId(),
+ "无权限删除该插件工具"
+ );
+ plugins.put(pluginItem.getPluginId(), plugin);
+ }
+ if (PluginType.isWorkflow(plugin.getType())) {
+ return Result.fail(1, "工作流插件工具由系统自动维护，不支持删除");
}
}
+ agentResourceReferenceService.assertPluginItemsUnused(List.copyOf(uniquePluginItemIds));
return null;
}
}
diff --git a/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/ai/ResourceController.java b/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/ai/ResourceController.java
index a885cede..ce5066bd 100644
--- a/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/ai/ResourceController.java
+++ b/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/ai/ResourceController.java
@@ -45,6 +45,16 @@ public class ResourceController extends BaseCurdController onSaveOrUpdateBefore(Resource entity, boolean isSave) {
LoginAccount loginUser = SaTokenUtil.getLoginAccount();
diff --git a/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/ai/ShareKnowledgeController.java b/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/ai/ShareKnowledgeController.java
index 9718b6e5..f3d2f0ec 100644
--- a/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/ai/ShareKnowledgeController.java
+++ b/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/ai/ShareKnowledgeController.java
@@ -6,6 +6,7 @@ import com.easyagents.core.store.DocumentStore;
import com.easyagents.core.store.StoreOptions;
import com.easyagents.core.store.StoreResult;
import com.mybatisflex.core.paginate.Page;
+import com.mybatisflex.core.query.QueryColumn;
import com.mybatisflex.core.query.QueryWrapper;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
@@ -47,6 +48,7 @@ import tech.easyflow.ai.vo.FaqImportResultVo;
import tech.easyflow.ai.vo.KnowledgeShareAuthContext;
import tech.easyflow.ai.vo.KnowledgeShareViewDetail;
import tech.easyflow.common.domain.Result;
+import tech.easyflow.common.util.SearchKeywordUtil;
import tech.easyflow.common.filestorage.FileStorageService;
import tech.easyflow.common.vo.UploadResVo;
import tech.easyflow.common.web.exceptions.BusinessException;
@@ -75,7 +77,7 @@ import java.util.Set;
@RequestMapping("/api/v1/share/knowledge")
public class ShareKnowledgeController {
- private static final long MAX_IMAGE_SIZE_BYTES = 5L * 1024L * 1024L;
+ private static final long MAX_IMAGE_SIZE_BYTES = 20L * 1024L * 1024L;
private static final Set ALLOWED_IMAGE_TYPES = new HashSet<>(Arrays.asList(
"image/jpeg",
"image/png",
@@ -668,9 +670,15 @@ public class ShareKnowledgeController {
faqCategoryService.ensureDefaultCategory(context.getKnowledge().getId());
QueryWrapper queryWrapper = QueryWrapper.create()
.eq(FaqItem::getCollectionId, context.getKnowledge().getId());
+ String keyword = request.getParameter("keyword");
String question = request.getParameter("question");
- if (StringUtils.hasText(question)) {
- queryWrapper.like(FaqItem::getQuestion, question.trim());
+ if (StringUtils.hasText(keyword)) {
+ String pattern = SearchKeywordUtil.literalContainsPattern(keyword);
+ queryWrapper.and(new QueryColumn("question").likeRaw(pattern)
+ .or(new QueryColumn("answer_text").likeRaw(pattern)));
+ } else if (StringUtils.hasText(question)) {
+ queryWrapper.and(new QueryColumn("question")
+ .likeRaw(SearchKeywordUtil.literalContainsPattern(question)));
}
String categoryId = request.getParameter("categoryId");
if (StringUtils.hasText(categoryId)) {
@@ -785,7 +793,7 @@ public class ShareKnowledgeController {
throw new BusinessException("图片不能为空");
}
if (file.getSize() > MAX_IMAGE_SIZE_BYTES) {
- throw new BusinessException("图片大小不能超过5MB");
+ throw new BusinessException("图片大小不能超过20MB");
}
if (!isAllowedImageType(file)) {
throw new BusinessException("仅支持 JPG/PNG/WEBP/GIF 图片");
diff --git a/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/ai/WorkFlowNodeController.java b/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/ai/WorkFlowNodeController.java
index f61c21a6..a60ed0a7 100644
--- a/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/ai/WorkFlowNodeController.java
+++ b/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/ai/WorkFlowNodeController.java
@@ -1,88 +1,45 @@
package tech.easyflow.admin.controller.ai;
-import cn.hutool.core.util.IdUtil;
-import com.alibaba.fastjson2.JSON;
-import com.alibaba.fastjson2.JSONArray;
+import cn.dev33.satoken.annotation.SaCheckPermission;
import com.alibaba.fastjson2.JSONObject;
-import com.easyagents.flow.core.chain.ChainDefinition;
-import com.easyagents.flow.core.chain.Node;
-import com.easyagents.flow.core.node.ConfirmNode;
-import com.easyagents.flow.core.node.EndNode;
-import com.easyagents.flow.core.node.StartNode;
-import com.easyagents.flow.core.parser.ChainParser;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import tech.easyflow.ai.easyagentsflow.service.WorkflowDatacenterContentService;
-import tech.easyflow.ai.entity.Workflow;
-import tech.easyflow.ai.service.WorkflowService;
+import tech.easyflow.admin.service.ai.WorkflowDesignerOptionService;
import tech.easyflow.common.domain.Result;
-import tech.easyflow.common.web.exceptions.BusinessException;
-import javax.annotation.Resource;
-import java.util.List;
+import java.math.BigInteger;
+/**
+ * 工作流节点兼容接口。
+ */
@RequestMapping("/api/v1/workflowNode")
@RestController
public class WorkFlowNodeController {
- @Resource
- private WorkflowService workflowService;
- @Resource
- private ChainParser chainParser;
- @Resource
- private WorkflowDatacenterContentService workflowDatacenterContentService;
+ private final WorkflowDesignerOptionService workflowDesignerOptionService;
- @GetMapping("/getChainParams")
- public Result getChainParams(String currentId, String workflowId) {
- if (workflowId.equals(currentId)) {
- throw new BusinessException("工作流不能作为自身子节点");
- }
- JSONObject nodeData = new JSONObject();
- Workflow workflow = workflowService.getById(workflowId);
- if (workflow == null) {
- throw new BusinessException("工作流不存在: " + workflowId);
- }
- nodeData.put("workflowId", workflow.getId());
- nodeData.put("workflowName", workflow.getTitle());
-
- ChainDefinition definition = chainParser.parse(workflowDatacenterContentService.prepareContent(workflow.getContent()));
- List nodes = definition.getNodes();
- JSONArray inputs = new JSONArray();
- JSONArray outputs = new JSONArray();
- for (Node node : nodes) {
- if (node instanceof StartNode) {
- inputs = JSON.parseArray(JSON.toJSONString(node.getParameters()));
- handleArray(inputs);
- }
- if (node instanceof EndNode) {
- outputs = JSON.parseArray(JSON.toJSONString(((EndNode) node).getOutputDefs()));
- handleArray(outputs);
- }
- if (node instanceof ConfirmNode) {
- throw new BusinessException("工作流存在【确认节点】，暂不支持作为子节点");
- }
- }
- nodeData.put("parameters", inputs);
- nodeData.put("outputDefs", outputs);
- return Result.ok(nodeData);
+ /**
+ * 创建工作流节点兼容控制器。
+ *
+ * @param workflowDesignerOptionService 工作流设计器选项服务
+ */
+ public WorkFlowNodeController(WorkflowDesignerOptionService workflowDesignerOptionService) {
+ this.workflowDesignerOptionService = workflowDesignerOptionService;
}
- private void handleArray(JSONArray array) {
- if (array != null) {
- for (Object o : array) {
- JSONObject obj = (JSONObject) o;
- obj.put("id", IdUtil.simpleUUID());
- obj.put("nameDisabled", true);
- obj.put("dataTypeDisabled", true);
- obj.put("deleteDisabled", true);
- obj.put("addChildDisabled", true);
- obj.put("refType", "ref");
- JSONArray children = obj.getJSONArray("children");
- if (children != null) {
- handleArray(children);
- }
- }
- }
+ /**
+ * 查询子流程输入输出定义。
+ *
+ * @param currentId 当前工作流 ID
+ * @param workflowId 子流程 ID
+ * @return 子流程节点配置
+ * @deprecated 请使用 {@code /api/v1/workflow/designer/childWorkflow}
+ */
+ @Deprecated
+ @GetMapping("/getChainParams")
+ @SaCheckPermission("/api/v1/workflow/query")
+ public Result getChainParams(BigInteger currentId, BigInteger workflowId) {
+ return Result.ok(workflowDesignerOptionService.getChildWorkflowNodeData(currentId, workflowId));
}
}
diff --git a/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/ai/WorkflowChatController.java b/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/ai/WorkflowChatController.java
new file mode 100644
index 00000000..e2091282
--- /dev/null
+++ b/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/ai/WorkflowChatController.java
@@ -0,0 +1,353 @@
+package tech.easyflow.admin.controller.ai;
+
+import com.easyagents.flow.core.chain.ChainStatus;
+import com.easyagents.flow.core.chain.runtime.ChainExecutor;
+import com.mybatisflex.core.query.QueryWrapper;
+import jakarta.servlet.http.HttpServletRequest;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
+import tech.easyflow.admin.service.ai.WorkflowChatEventStream;
+import tech.easyflow.ai.easyagentsflow.entity.WorkflowCheckStage;
+import tech.easyflow.ai.easyagentsflow.service.WorkflowCheckService;
+import tech.easyflow.ai.easyagentsflow.service.WorkflowRunningParameterResolver;
+import tech.easyflow.ai.easyagentsflow.support.PublishedWorkflowDefinitionIds;
+import tech.easyflow.ai.entity.Workflow;
+import tech.easyflow.ai.entity.WorkflowExecResult;
+import tech.easyflow.ai.entity.WorkflowExecStep;
+import tech.easyflow.ai.enums.PublishStatus;
+import tech.easyflow.ai.service.WorkflowExecResultService;
+import tech.easyflow.ai.service.WorkflowExecStepService;
+import tech.easyflow.ai.service.WorkflowService;
+import tech.easyflow.ai.service.WorkflowShareService;
+import tech.easyflow.ai.share.WorkflowSharePolicy;
+import tech.easyflow.ai.utils.WorkFlowUtil;
+import tech.easyflow.common.constant.Constants;
+import tech.easyflow.common.domain.Result;
+import tech.easyflow.common.entity.LoginAccount;
+import tech.easyflow.common.satoken.util.SaTokenUtil;
+import tech.easyflow.common.web.exceptions.BusinessException;
+import tech.easyflow.common.web.jsonbody.JsonBody;
+import tech.easyflow.system.enums.CategoryResourceType;
+import tech.easyflow.system.enums.ResourceAction;
+import tech.easyflow.system.service.ResourceAccessService;
+
+import javax.annotation.Resource;
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 工作流管理端与分享端的对话运行接口。
+ */
+@RestController
+@RequestMapping("/api/v1/workflowChat")
+public class WorkflowChatController {
+
+ @Resource
+ private WorkflowService workflowService;
+ @Resource
+ private WorkflowShareService workflowShareService;
+ @Resource
+ private WorkflowCheckService workflowCheckService;
+ @Resource
+ private WorkflowRunningParameterResolver parameterResolver;
+ @Resource
+ private ResourceAccessService resourceAccessService;
+ @Resource
+ private WorkflowChatEventStream eventStream;
+ @Resource
+ private ChainExecutor chainExecutor;
+ @Resource
+ private WorkflowExecResultService execResultService;
+ @Resource
+ private WorkflowExecStepService execStepService;
+
+ /**
+ * 获取工作流的对话运行描述和输入表单。
+ *
+ * @param workflowId 工作流 ID
+ * @param request HTTP 请求
+ * @return 对话运行描述
+ */
+ @GetMapping("/descriptor")
+ public Result> descriptor(
+ BigInteger workflowId,
+ HttpServletRequest request
+ ) {
+ Workflow workflow = loadRunnableWorkflow(workflowId, request);
+ workflowCheckService.checkOrThrow(
+ workflow.getContent(),
+ WorkflowCheckStage.PRE_EXECUTE,
+ workflow.getId()
+ );
+ Map descriptor =
+ parameterResolver.buildRunningParametersView(workflow);
+ if (descriptor == null) {
+ throw new BusinessException("工作流输入配置无法解析");
+ }
+ descriptor.put("workflowId", workflow.getId());
+ descriptor.put("publishStatus", workflow.getPublishStatus());
+ descriptor.put("shareable", isStrictlyPublished(workflow));
+ return Result.ok(descriptor);
+ }
+
+ /**
+ * 启动工作流，并流式返回全部可见输出。
+ *
+ * @param workflowId 工作流 ID
+ * @param variables 工作流运行变量
+ * @param request HTTP 请求
+ * @return 工作流 SSE 事件流
+ */
+ @PostMapping(
+ value = "/run",
+ produces = MediaType.TEXT_EVENT_STREAM_VALUE
+ )
+ public SseEmitter run(
+ @JsonBody(value = "workflowId", required = true)
+ BigInteger workflowId,
+ @JsonBody("variables") Map variables,
+ HttpServletRequest request
+ ) {
+ Workflow workflow = loadRunnableWorkflow(workflowId, request);
+ workflowCheckService.checkOrThrow(
+ workflow.getContent(),
+ WorkflowCheckStage.PRE_EXECUTE,
+ workflow.getId()
+ );
+ Map normalizedVariables =
+ parameterResolver.normalizeRuntimeVariables(
+ workflow.getContent(),
+ variables
+ );
+ LoginAccount account = SaTokenUtil.getLoginAccount();
+ normalizedVariables.put(Constants.LOGIN_USER_KEY, account);
+ normalizedVariables.put(
+ WorkFlowUtil.CREATED_KEY_MEMORY_KEY,
+ hasChatShareKey(request)
+ ? WorkFlowUtil.WORKFLOW_CHAT_SHARE
+ : WorkFlowUtil.WORKFLOW_CHAT
+ );
+ return eventStream.start(
+ isStrictlyPublished(workflow)
+ ? PublishedWorkflowDefinitionIds.published(workflowId.toString())
+ : workflowId.toString(),
+ normalizedVariables
+ );
+ }
+
+ /**
+ * 取消当前用户发起的工作流执行。
+ *
+ * @param executeId 执行实例 ID
+ * @return 是否完成取消状态转换
+ */
+ @PostMapping("/cancel")
+ public Result cancel(
+ @JsonBody(value = "executeId", required = true)
+ String executeId
+ ) {
+ assertExecutionOwnership(executeId);
+ return Result.ok(chainExecutor.cancel(executeId, "用户已中止运行"));
+ }
+
+ /**
+ * 恢复当前用户发起并等待确认的工作流执行。
+ *
+ * @param executeId 执行实例 ID
+ * @param confirmParams 确认参数
+ * @return 空结果
+ */
+ @PostMapping("/resume")
+ public Result resume(
+ @JsonBody(value = "executeId", required = true)
+ String executeId,
+ @JsonBody("confirmParams")
+ Map confirmParams
+ ) {
+ WorkflowExecResult record = assertExecutionOwnership(executeId);
+ if (record.getStatus() != null
+ && (record.getStatus() == ChainStatus.SUCCEEDED.getValue()
+ || record.getStatus() == ChainStatus.FAILED.getValue()
+ || record.getStatus() == ChainStatus.CANCELLED.getValue())) {
+ throw new BusinessException("当前工作流执行已结束");
+ }
+ chainExecutor.resumeAsync(
+ executeId,
+ confirmParams == null
+ ? new LinkedHashMap<>()
+ : new LinkedHashMap<>(confirmParams)
+ );
+ return Result.ok();
+ }
+
+ /**
+ * 获取当前用户工作流执行的运行详情。
+ *
+ * @param executeId 执行实例 ID
+ * @return 执行记录和有序节点步骤
+ */
+ @GetMapping("/execution")
+ public Result> detail(String executeId) {
+ WorkflowExecResult record = assertExecutionOwnership(executeId);
+ List steps = execStepService.list(
+ QueryWrapper.create()
+ .eq(WorkflowExecStep::getRecordId, record.getId())
+ .orderBy(WorkflowExecStep::getStartTime, true)
+ );
+ List> stepViews = new ArrayList<>(steps.size());
+ for (WorkflowExecStep step : steps) {
+ Map view = new LinkedHashMap<>();
+ view.put("id", step.getId());
+ view.put("attemptKey", step.getExecKey());
+ view.put("nodeId", step.getNodeId());
+ view.put("nodeName", step.getNodeName());
+ view.put("input", step.getInput());
+ view.put("output", step.getOutput());
+ view.put("status", step.getStatus());
+ view.put("errorInfo", step.getErrorInfo());
+ view.put("startTime", step.getStartTime());
+ view.put("endTime", step.getEndTime());
+ view.put("execTime", step.getExecTime());
+ stepViews.add(view);
+ }
+
+ Map recordView = new LinkedHashMap<>();
+ recordView.put("executeId", record.getExecKey());
+ recordView.put("workflowId", record.getWorkflowId());
+ recordView.put("title", record.getTitle());
+ recordView.put("status", record.getStatus());
+ recordView.put("input", record.getInput());
+ recordView.put("output", record.getOutput());
+ recordView.put("errorInfo", record.getErrorInfo());
+ recordView.put("startTime", record.getStartTime());
+ recordView.put("endTime", record.getEndTime());
+ recordView.put("execTime", record.getExecTime());
+
+ Map detail = new LinkedHashMap<>();
+ detail.put("record", recordView);
+ detail.put("steps", stepViews);
+ return Result.ok(detail);
+ }
+
+ /**
+ * 加载可运行工作流，并校验直接访问或对话分享权限。
+ * 管理端直接运行时，已发布工作流使用发布快照，未发布工作流使用当前内容；
+ * 分享运行始终要求严格发布快照。
+ *
+ * @param workflowId 工作流 ID
+ * @param request HTTP 请求
+ * @return 可运行工作流视图
+ */
+ private Workflow loadRunnableWorkflow(
+ BigInteger workflowId,
+ HttpServletRequest request
+ ) {
+ if (workflowId == null) {
+ throw new BusinessException("工作流ID不能为空");
+ }
+ LoginAccount account = SaTokenUtil.getLoginAccount();
+ Workflow current = workflowService.getById(workflowId);
+ if (current == null) {
+ throw new BusinessException("工作流不存在");
+ }
+ boolean sharedRequest = hasChatShareKey(request);
+ if (sharedRequest) {
+ workflowShareService.assertChatShareAccess(
+ request.getHeader(
+ WorkflowSharePolicy.CHAT_SHARE_KEY_HEADER
+ ),
+ workflowId,
+ account.getTenantId()
+ );
+ } else {
+ resourceAccessService.assertAccess(
+ CategoryResourceType.WORKFLOW,
+ current,
+ ResourceAction.USE,
+ "无权限运行工作流"
+ );
+ }
+
+ Workflow published = workflowService.getPublishedById(workflowId);
+ if (isStrictlyPublished(published)) {
+ return published;
+ }
+ if (sharedRequest) {
+ throw new BusinessException(
+ 409,
+ 409,
+ "工作流尚未发布或已下线"
+ );
+ }
+ return current;
+ }
+
+ /**
+ * 校验执行记录属于当前用户发起的工作流对话。
+ *
+ * @param executeId 执行实例 ID
+ * @return 执行记录
+ */
+ private WorkflowExecResult assertExecutionOwnership(String executeId) {
+ if (executeId == null || executeId.isBlank()) {
+ throw new BusinessException("执行ID不能为空");
+ }
+ WorkflowExecResult record = execResultService.getByExecKey(executeId);
+ if (record == null) {
+ throw new BusinessException("工作流执行记录不存在，请稍后重试");
+ }
+ LoginAccount account = SaTokenUtil.getLoginAccount();
+ boolean chatSource = WorkFlowUtil.WORKFLOW_CHAT.equals(
+ record.getCreatedKey()
+ ) || WorkFlowUtil.WORKFLOW_CHAT_SHARE.equals(record.getCreatedKey());
+ if (!chatSource
+ || account.getId() == null
+ || !account.getId().toString().equals(
+ record.getCreatedBy()
+ )) {
+ throw new BusinessException(
+ 403,
+ 403,
+ "无权限访问当前工作流执行记录"
+ );
+ }
+ return record;
+ }
+
+ /**
+ * 判断请求是否携带对话分享密钥。
+ *
+ * @param request HTTP 请求
+ * @return 携带非空对话分享密钥时返回 {@code true}
+ */
+ private boolean hasChatShareKey(HttpServletRequest request) {
+ String shareKey = request == null
+ ? null
+ : request.getHeader(
+ WorkflowSharePolicy.CHAT_SHARE_KEY_HEADER
+ );
+ return shareKey != null && !shareKey.isBlank();
+ }
+
+ /**
+ * 判断工作流是否可按严格发布快照运行。
+ *
+ * @param workflow 工作流
+ * @return 已发布且存在快照时返回 {@code true}
+ */
+ private boolean isStrictlyPublished(Workflow workflow) {
+ return workflow != null
+ && PublishStatus.PUBLISHED.getCode().equals(
+ workflow.getPublishStatus()
+ )
+ && workflow.getPublishedSnapshotJson() != null
+ && !workflow.getPublishedSnapshotJson().isEmpty();
+ }
+}
diff --git a/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/ai/WorkflowController.java b/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/ai/WorkflowController.java
index 62f39697..b8257f5c 100644
--- a/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/ai/WorkflowController.java
+++ b/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/ai/WorkflowController.java
@@ -4,15 +4,23 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.dev33.satoken.stp.StpUtil;
import cn.hutool.core.io.IoUtil;
import cn.hutool.core.util.IdUtil;
+import com.alibaba.fastjson2.JSONObject;
import com.mybatisflex.core.paginate.Page;
import com.easyagents.flow.core.chain.runtime.ChainExecutor;
import com.mybatisflex.core.query.QueryWrapper;
import org.springframework.util.StringUtils;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import tech.easyflow.admin.controller.ai.support.AiResourceCreatorNameSupport;
+import tech.easyflow.admin.model.ai.WorkflowDesignerOptionsView;
+import tech.easyflow.admin.service.ai.WorkflowDesignerOptionService;
+import tech.easyflow.agent.entity.AgentToolBinding;
+import tech.easyflow.agent.enums.AgentToolType;
+import tech.easyflow.agent.service.AgentToolBindingService;
+import tech.easyflow.ai.permission.WorkflowShareResourceAccessGrantProvider;
import tech.easyflow.ai.permission.WorkflowVisibilityQueryHelper;
import tech.easyflow.ai.easyagentsflow.entity.ChainInfo;
import tech.easyflow.ai.easyagentsflow.entity.NodeInfo;
@@ -29,7 +37,6 @@ import tech.easyflow.ai.publish.WorkflowPublishAppService;
import tech.easyflow.ai.service.AiResourceApprovalStateService;
import tech.easyflow.ai.vo.OfflineImpactCheckVo;
import tech.easyflow.approval.entity.vo.ApprovalActionResult;
-import tech.easyflow.ai.service.BotWorkflowService;
import tech.easyflow.ai.service.ModelService;
import tech.easyflow.ai.service.WorkflowService;
import tech.easyflow.common.constant.Constants;
@@ -39,6 +46,7 @@ import tech.easyflow.common.satoken.util.SaTokenUtil;
import tech.easyflow.common.web.controller.BaseCurdController;
import tech.easyflow.common.web.exceptions.BusinessException;
import tech.easyflow.common.web.jsonbody.JsonBody;
+import tech.easyflow.datacenter.execution.model.DatasetRef;
import tech.easyflow.system.enums.CategoryResourceType;
import tech.easyflow.system.enums.ResourceAction;
import tech.easyflow.system.enums.ResourceLookup;
@@ -53,6 +61,7 @@ import java.io.Serializable;
import java.math.BigInteger;
import java.nio.charset.StandardCharsets;
import java.util.Collection;
+import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -71,7 +80,7 @@ public class WorkflowController extends BaseCurdController designerOptions() {
+ return Result.ok(workflowDesignerOptionService.listOptions(
+ codeEngineCapabilityService.listSupportedCodeEngines()));
+ }
+
+ /**
+ * 分页查询工作流设计器可用插件。
+ *
+ * @param pageNumber 页码
+ * @param pageSize 每页数量
+ * @param keyword 插件名称或描述关键字
+ * @return 插件安全选项分页
+ */
+ @GetMapping("/designer/plugins")
+ @SaCheckPermission("/api/v1/workflow/query")
+ public Result> designerPlugins(
+ Long pageNumber,
+ Long pageSize,
+ String keyword) {
+ return Result.ok(workflowDesignerOptionService.pagePlugins(pageNumber, pageSize, keyword));
+ }
+
+ /**
+ * 查询工作流插件节点配置。
+ *
+ * @param id 插件工具 ID
+ * @return 插件节点配置
+ */
+ @GetMapping("/designer/pluginTinyFlow")
+ @SaCheckPermission("/api/v1/workflow/query")
+ public Result designerPluginTinyFlow(BigInteger id) {
+ return Result.ok(workflowDesignerOptionService.getPluginTinyFlowData(id));
+ }
+
+ /**
+ * 查询工作流设计器的子流程节点配置。
+ *
+ * @param currentId 当前工作流 ID
+ * @param workflowId 子流程 ID
+ * @return 子流程输入输出定义
+ */
+ @GetMapping("/designer/childWorkflow")
+ @SaCheckPermission("/api/v1/workflow/query")
+ public Result designerChildWorkflow(BigInteger currentId, BigInteger workflowId) {
+ return Result.ok(workflowDesignerOptionService.getChildWorkflowNodeData(currentId, workflowId));
+ }
+
+ /**
+ * 查询工作流数据节点可见的数据源。
+ *
+ * @return 数据源安全选项
+ */
+ @GetMapping("/designer/dataSources")
+ @SaCheckPermission("/api/v1/workflow/query")
+ public Result> designerDataSources() {
+ return Result.ok(workflowDesignerOptionService.listDataSources());
+ }
+
+ /**
+ * 查询工作流数据节点的数据目录。
+ *
+ * @param sourceId 数据源 ID
+ * @return 目录安全选项
+ */
+ @GetMapping("/designer/catalogs")
+ @SaCheckPermission("/api/v1/workflow/query")
+ public Result> designerCatalogs(BigInteger sourceId) {
+ return Result.ok(workflowDesignerOptionService.listCatalogs(sourceId));
+ }
+
+ /**
+ * 查询工作流数据节点的已接入数据集。
+ *
+ * @param sourceId 数据源 ID
+ * @param catalogId 目录 ID
+ * @return 数据集安全选项
+ */
+ @GetMapping("/designer/managedTables")
+ @SaCheckPermission("/api/v1/workflow/query")
+ public Result> designerManagedTables(
+ BigInteger sourceId,
+ BigInteger catalogId) {
+ return Result.ok(workflowDesignerOptionService.listManagedDatasets(sourceId, catalogId));
+ }
+
+ /**
+ * 查询工作流数据节点的数据集结构。
+ *
+ * @param datasetRef 数据集引用
+ * @return 数据集结构安全视图
+ */
+ @GetMapping("/designer/schema")
+ @SaCheckPermission("/api/v1/workflow/query")
+ public Result designerSchema(DatasetRef datasetRef) {
+ return Result.ok(workflowDesignerOptionService.getDatasetSchema(datasetRef));
+ }
+
/**
* 节点单独运行
*/
@@ -121,6 +248,9 @@ public class WorkflowController extends BaseCurdController();
}
@@ -154,6 +284,7 @@ public class WorkflowController extends BaseCurdController resume(@JsonBody(value = "executeId", required = true) String executeId,
@JsonBody("confirmParams") Map confirmParams) {
- chainExecutor.resumeAsync(executeId, confirmParams);
+ if (!chainExecutor.resumeAsyncIfSuspended(executeId, confirmParams)) {
+ throw new BusinessException(
+ 409,
+ 40901,
+ "当前执行状态不可恢复，仅暂停中的工作流允许恢复");
+ }
return Result.ok();
}
@@ -245,6 +381,7 @@ public class WorkflowController extends BaseCurdController res = workflowRunningParameterResolver.buildRunningParametersView(workflow);
if (res == null) {
return Result.fail(2, "节点配置错误，请检查! ");
@@ -256,18 +393,48 @@ public class WorkflowController extends BaseCurdController submitPublishApproval(@JsonBody("id") BigInteger id) {
+ @RequireResourceAccess(
+ resource = CategoryResourceType.WORKFLOW,
+ action = ResourceAction.MANAGE,
+ lookup = ResourceLookup.WORKFLOW_ID,
+ idExpr = "#id",
+ denyMessage = "无权限发布工作流"
+ )
+ public Result submitPublishApproval(
+ @JsonBody("id") BigInteger id,
+ @JsonBody("applicationReason") String applicationReason
+ ) {
return buildApprovalActionResult(
- workflowPublishAppService.submitPublishApproval(id),
+ workflowPublishAppService.submitPublishApproval(id, applicationReason),
"已提交发布审批",
"已直接发布"
);
}
+ /**
+ * 预检工作流发布是否命中审批流。
+ *
+ * @param id 工作流 ID
+ * @return 是否需要审批
+ */
+ @GetMapping("/publishApprovalRequirement")
+ @SaCheckPermission("/api/v1/workflow/save")
+ @RequireResourceAccess(
+ resource = CategoryResourceType.WORKFLOW,
+ action = ResourceAction.MANAGE,
+ lookup = ResourceLookup.WORKFLOW_ID,
+ idExpr = "#id",
+ denyMessage = "无权限发布工作流"
+ )
+ public Result publishApprovalRequirement(@RequestParam BigInteger id) {
+ return Result.ok(workflowPublishAppService.isPublishApprovalRequired(id));
+ }
+
/**
* 提交下线审批。
*
@@ -276,6 +443,13 @@ public class WorkflowController extends BaseCurdController submitOfflineApproval(@JsonBody("id") BigInteger id) {
return buildApprovalActionResult(
workflowPublishAppService.submitOfflineApproval(id),
@@ -311,6 +485,13 @@ public class WorkflowController extends BaseCurdController submitDeleteApproval(@JsonBody("id") BigInteger id) {
return buildApprovalActionResult(
workflowPublishAppService.submitDeleteApproval(id),
@@ -378,20 +559,76 @@ public class WorkflowController extends BaseCurdController update(@JsonBody Workflow entity) {
+ if (entity == null || entity.getId() == null) {
+ throw new BusinessException("工作流 ID 不能为空");
+ }
+ LoginAccount loginAccount = SaTokenUtil.getLoginAccount();
+ boolean sharedRequest = workflowShareGrantProvider.isSharedRequestFor(
+ entity.getId(),
+ loginAccount
+ );
+ if (sharedRequest && entity.getContent() == null) {
+ throw new BusinessException(403, 403, "分享链接仅允许编辑工作流内容");
+ }
+ if (entity.getContent() == null) {
+ return super.update(entity);
+ }
+ if (entity.getRevision() == null) {
+ throw workflowRevisionConflict();
+ }
+ Result beforeResult = onSaveOrUpdateBefore(entity, false);
+ if (beforeResult != null) {
+ return beforeResult;
+ }
+ boolean updated = service.updateContentByRevision(
+ entity.getId(),
+ entity.getContent(),
+ entity.getRevision(),
+ new Date(),
+ loginAccount.getId()
+ );
+ if (!updated) {
+ throw workflowRevisionConflict();
+ }
+ entity.setRevision(entity.getRevision() + 1);
+ if (!sharedRequest) {
+ entity.setContent(null);
+ service.updateById(entity);
+ }
+ onSaveOrUpdateAfter(entity, false);
+ return Result.ok(Map.of("revision", entity.getRevision()));
+ }
+
@Override
protected Result onSaveOrUpdateBefore(Workflow entity, boolean isSave) {
normalizeVisibilityScope(entity, isSave);
+ if (isSave && entity.getRevision() == null) {
+ entity.setRevision(0);
+ }
if (!isSave && entity.getId() != null) {
Workflow existed = requireWorkflow(String.valueOf(entity.getId()));
resourceAccessService.assertAccess(CategoryResourceType.WORKFLOW, existed, ResourceAction.MANAGE, "无权限管理工作流");
}
if (StringUtils.hasLength(entity.getContent())) {
workflowCheckService.checkOrThrow(entity.getContent(), WorkflowCheckStage.SAVE, entity.getId());
+ workflowDesignerOptionService.assertContentReferences(entity.getContent());
}
String alias = entity.getAlias();
@@ -455,11 +692,12 @@ public class WorkflowController extends BaseCurdController del(BigInteger id) {
LoginAccount account = SaTokenUtil.getLoginAccount();
WorkflowExecResult record = service.getById(id);
@@ -61,4 +73,4 @@ public class WorkflowExecResultController extends BaseCurdController> getListByRecordId(BigInteger recordId) {
if (recordId == null) {
@@ -60,4 +70,4 @@ public class WorkflowExecStepController extends BaseCurdController createUrlShare(
+ HttpServletRequest request,
+ @JsonBody("workflowId") BigInteger workflowId
+ ) {
+ Workflow workflow = workflowService.getById(workflowId);
+ if (workflow == null) {
+ throw new BusinessException("工作流不存在");
+ }
+ resourceAccessService.assertAccess(
+ CategoryResourceType.WORKFLOW,
+ workflow,
+ ResourceAction.MANAGE,
+ "无权限分享工作流"
+ );
+ LoginAccount loginAccount = SaTokenUtil.getLoginAccount();
+ WorkflowShareCreateResult result = workflowShareService.createChatShare(
+ workflowId,
+ loginAccount.getTenantId(),
+ loginAccount.getDeptId(),
+ loginAccount.getId(),
+ buildShareBaseUrl(request)
+ );
+ knowledgeShareAuditService.log(
+ loginAccount.getId(),
+ "创建工作流对话分享",
+ "WORKFLOW_CHAT_SHARE_CREATE",
+ request.getRequestURI(),
+ Map.of("workflowId", workflowId, "shareId", result.getId())
+ );
+ return Result.ok(result);
+ }
+
+ /**
+ * 解析当前对话分享指向的工作流。
+ *
+ * @param request HTTP 请求
+ * @return 工作流标识
+ */
+ @GetMapping("/resolve")
+ public Result> resolveUrlShare(HttpServletRequest request) {
+ LoginAccount loginAccount = SaTokenUtil.getLoginAccount();
+ WorkflowShare share = workflowShareService.resolveChatShare(
+ request.getHeader(WorkflowSharePolicy.CHAT_SHARE_KEY_HEADER),
+ loginAccount.getTenantId()
+ );
+ return Result.ok(Map.of("workflowId", share.getWorkflowId()));
+ }
+
+ /**
+ * 根据管理端来源构建工作流分享基础 URL。
+ *
+ * @param request HTTP 请求
+ * @return 工作流独立分享页 URL
+ */
+ private String buildShareBaseUrl(HttpServletRequest request) {
+ String refererBaseUrl = extractFrontendBaseUrl(RequestUtil.getReferer(request));
+ if (refererBaseUrl != null) {
+ return refererBaseUrl + "/share/workflow";
+ }
+
+ String forwardedOrigin = buildForwardedOrigin(request);
+ if (forwardedOrigin != null) {
+ return forwardedOrigin
+ + normalizeBasePath(firstHeaderValue(request.getHeader("X-Forwarded-Prefix")))
+ + "/share/workflow";
+ }
+
+ String origin = normalizeOrigin(request.getHeader("Origin"));
+ if (origin != null) {
+ return origin + normalizeBasePath(request.getContextPath()) + "/share/workflow";
+ }
+ StringBuilder builder = new StringBuilder();
+ builder.append(request.getScheme()).append("://").append(request.getServerName());
+ if (request.getServerPort() != 80 && request.getServerPort() != 443) {
+ builder.append(':').append(request.getServerPort());
+ }
+ return builder.append(normalizeBasePath(request.getContextPath()))
+ .append("/share/workflow")
+ .toString();
+ }
+
+ /**
+ * 从来源地址提取前端 origin 与部署基路径。
+ *
+ * @param sourceUrl 来源地址
+ * @return origin 与部署基路径，无法解析时返回 {@code null}
+ */
+ private String extractFrontendBaseUrl(String sourceUrl) {
+ if (sourceUrl == null || sourceUrl.isBlank()) {
+ return null;
+ }
+ try {
+ URI uri = new URI(sourceUrl.trim());
+ if (uri.getScheme() == null || uri.getHost() == null) {
+ return null;
+ }
+ String origin = extractOrigin(sourceUrl);
+ return origin == null ? null : origin + inferFrontendBasePath(uri.getPath());
+ } catch (URISyntaxException e) {
+ return null;
+ }
+ }
+
+ /**
+ * 从前端页面路径推断部署基路径。
+ *
+ * @param path 页面路径
+ * @return 规范化后的部署基路径
+ */
+ private String inferFrontendBasePath(String path) {
+ if (path == null || path.isBlank() || "/".equals(path)) {
+ return "";
+ }
+ for (String marker : new String[]{"/ai/", "/auth/", "/share/"}) {
+ int markerIndex = path.indexOf(marker);
+ if (markerIndex > 0) {
+ return normalizeBasePath(path.substring(0, markerIndex));
+ }
+ if (markerIndex == 0) {
+ return "";
+ }
+ }
+ return "";
+ }
+
+ /**
+ * 规范化部署基路径。
+ *
+ * @param basePath 原始基路径
+ * @return 无尾斜杠的基路径
+ */
+ private String normalizeBasePath(String basePath) {
+ if (basePath == null || basePath.isBlank() || "/".equals(basePath.trim())) {
+ return "";
+ }
+ String normalized = basePath.trim();
+ if (!normalized.startsWith("/")) {
+ normalized = "/" + normalized;
+ }
+ while (normalized.endsWith("/") && normalized.length() > 1) {
+ normalized = normalized.substring(0, normalized.length() - 1);
+ }
+ return normalized;
+ }
+
+ /**
+ * 按反向代理头构建外部访问 origin。
+ *
+ * @param request HTTP 请求
+ * @return 外部 origin，缺少代理头时返回 {@code null}
+ */
+ private String buildForwardedOrigin(HttpServletRequest request) {
+ String proto = firstHeaderValue(request.getHeader("X-Forwarded-Proto"));
+ String host = firstHeaderValue(request.getHeader("X-Forwarded-Host"));
+ if (proto == null || host == null) {
+ return null;
+ }
+ return normalizeOrigin(proto + "://" + host);
+ }
+
+ /**
+ * 从 URL 提取 origin。
+ *
+ * @param url 完整 URL
+ * @return origin，无法解析时返回 {@code null}
+ */
+ private String extractOrigin(String url) {
+ if (url == null || url.isBlank()) {
+ return null;
+ }
+ try {
+ URI uri = new URI(url.trim());
+ if (uri.getScheme() == null || uri.getHost() == null) {
+ return null;
+ }
+ StringBuilder builder = new StringBuilder();
+ builder.append(uri.getScheme()).append("://").append(uri.getHost());
+ if (uri.getPort() != -1 && uri.getPort() != 80 && uri.getPort() != 443) {
+ builder.append(':').append(uri.getPort());
+ }
+ return builder.toString();
+ } catch (URISyntaxException e) {
+ return null;
+ }
+ }
+
+ /**
+ * 规范化 origin。
+ *
+ * @param origin 原始 origin
+ * @return 规范化结果
+ */
+ private String normalizeOrigin(String origin) {
+ return extractOrigin(origin);
+ }
+
+ /**
+ * 读取代理头的首个有效值。
+ *
+ * @param value 原始请求头
+ * @return 首个有效值
+ */
+ private String firstHeaderValue(String value) {
+ if (value == null || value.isBlank()) {
+ return null;
+ }
+ int commaIndex = value.indexOf(',');
+ String normalized = commaIndex >= 0 ? value.substring(0, commaIndex) : value;
+ normalized = normalized.trim();
+ return normalized.isEmpty() ? null : normalized;
+ }
+}
diff --git a/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/ai/support/AiResourceCreatorNameSupport.java b/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/ai/support/AiResourceCreatorNameSupport.java
index 99cb7156..4d715a74 100644
--- a/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/ai/support/AiResourceCreatorNameSupport.java
+++ b/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/ai/support/AiResourceCreatorNameSupport.java
@@ -1,12 +1,14 @@
package tech.easyflow.admin.controller.ai.support;
import org.springframework.stereotype.Component;
+import com.mybatisflex.core.query.QueryWrapper;
import tech.easyflow.agent.entity.Agent;
-import tech.easyflow.ai.entity.Bot;
import tech.easyflow.ai.entity.DocumentCollection;
import tech.easyflow.ai.entity.Plugin;
import tech.easyflow.ai.entity.Workflow;
+import tech.easyflow.skill.entity.Skill;
import tech.easyflow.system.service.SysAccountService;
+import tech.easyflow.system.entity.SysAccount;
import javax.annotation.Resource;
import java.math.BigInteger;
@@ -40,15 +42,6 @@ public class AiResourceCreatorNameSupport {
fillCreatorNames(workflows, Workflow::getCreatedBy, Workflow::setCreatedByName);
}
- /**
- * 批量填充聊天助手创建人名称。
- *
- * @param bots 聊天助手集合
- */
- public void fillBotCreatorNames(Collection bots) {
- fillCreatorNames(bots, Bot::getCreatedBy, Bot::setCreatedByName);
- }
-
/**
* 批量填充知识库创建人名称。
*
@@ -76,6 +69,46 @@ public class AiResourceCreatorNameSupport {
fillCreatorNames(agents, Agent::getCreatedBy, Agent::setCreatedByName);
}
+ /**
+ * 批量填充 Skill 创建人名称。
+ *
+ * @param skills Skill 集合
+ */
+ public void fillSkillCreatorNames(Collection skills) {
+ if (skills == null || skills.isEmpty()) {
+ return;
+ }
+ LinkedHashSet creatorIds = skills.stream().map(Skill::getCreatedBy)
+ .filter(Objects::nonNull)
+ .collect(java.util.stream.Collectors.toCollection(LinkedHashSet::new));
+ if (creatorIds.isEmpty()) {
+ return;
+ }
+ Map labels = sysAccountService.list(QueryWrapper.create()
+ .select(SysAccount::getId, SysAccount::getNickname, SysAccount::getLoginName)
+ .in(SysAccount::getId, creatorIds)).stream()
+ .collect(java.util.stream.Collectors.toMap(SysAccount::getId, this::skillCreatorLabel,
+ (left, right) -> left, java.util.LinkedHashMap::new));
+ skills.forEach(skill -> skill.setCreatedByName(
+ labels.getOrDefault(skill.getCreatedBy(), String.valueOf(skill.getCreatedBy()))));
+ }
+
+ /**
+ * 将 Skill 创建人格式化为“昵称（账号）”。
+ *
+ * @param account 创建人账号
+ * @return 创建人展示标签
+ */
+ private String skillCreatorLabel(SysAccount account) {
+ String nickname = account.getNickname() == null ? "" : account.getNickname().trim();
+ String loginName = account.getLoginName() == null ? "" : account.getLoginName().trim();
+ if (nickname.isBlank()) {
+ return loginName.isBlank() ? String.valueOf(account.getId()) : loginName;
+ }
+ return loginName.isBlank() || nickname.equals(loginName)
+ ? nickname : nickname + "（" + loginName + "）";
+ }
+
/**
* 通用的创建人名称填充逻辑。
*
@@ -84,7 +117,7 @@ public class AiResourceCreatorNameSupport {
* @param createdByNameSetter 创建人名称回填函数
* @param 资源类型
*/
- private void fillCreatorNames(
+ void fillCreatorNames(
Collection resources,
Function createdByGetter,
BiConsumer createdByNameSetter
diff --git a/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/ai/support/BotResourceCreatorNameSupport.java b/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/ai/support/BotResourceCreatorNameSupport.java
new file mode 100644
index 00000000..8f261129
--- /dev/null
+++ b/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/ai/support/BotResourceCreatorNameSupport.java
@@ -0,0 +1,33 @@
+package tech.easyflow.admin.controller.ai.support;
+
+import org.springframework.stereotype.Component;
+import tech.easyflow.ai.entity.Bot;
+
+import java.util.Collection;
+
+/**
+ * 为旧 Bot 资源批量补充创建人展示名称。
+ */
+@Component
+public class BotResourceCreatorNameSupport {
+
+ private final AiResourceCreatorNameSupport creatorNameSupport;
+
+ /**
+ * 创建 Bot 创建人名称填充组件。
+ *
+ * @param creatorNameSupport 通用 AI 资源创建人名称组件
+ */
+ public BotResourceCreatorNameSupport(AiResourceCreatorNameSupport creatorNameSupport) {
+ this.creatorNameSupport = creatorNameSupport;
+ }
+
+ /**
+ * 批量填充 Bot 创建人名称。
+ *
+ * @param bots Bot 集合
+ */
+ public void fillCreatorNames(Collection bots) {
+ creatorNameSupport.fillCreatorNames(bots, Bot::getCreatedBy, Bot::setCreatedByName);
+ }
+}
diff --git a/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/common/DictController.java b/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/common/DictController.java
index 71f07b79..b8efa6ee 100644
--- a/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/common/DictController.java
+++ b/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/common/DictController.java
@@ -6,6 +6,7 @@ import tech.easyflow.common.dict.Dict;
import tech.easyflow.common.dict.DictItem;
import tech.easyflow.common.dict.DictLoader;
import tech.easyflow.common.dict.DictManager;
+import tech.easyflow.common.web.exceptions.BusinessException;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -16,18 +17,30 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
+/**
+ * 提供已注册静态字典的查询接口。
+ */
@RestController
@RequestMapping("/api/v1/dict/")
public class DictController {
@Resource
- DictManager dictManager;
+ private DictManager dictManager;
+ /**
+ * 查询指定静态字典的选项。
+ *
+ * @param code 字典编码
+ * @param keyword 搜索关键字
+ * @param request HTTP 请求
+ * @return 字典选项
+ * @throws BusinessException 字典未注册时抛出
+ */
@GetMapping("/items/{code}")
public Result> items(@PathVariable("code") String code, String keyword, HttpServletRequest request) {
DictLoader loader = dictManager.getLoader(code);
if (loader == null) {
- return Result.ok(Collections.emptyList());
+ throw new BusinessException("字典不存在或不支持公共查询");
}
Map parameterMap = request.getParameterMap();
Dict dict = loader.load(keyword, parameterMap);
diff --git a/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/dashboard/DashboardController.java b/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/dashboard/DashboardController.java
index 52d45efd..2d6e194c 100644
--- a/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/dashboard/DashboardController.java
+++ b/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/dashboard/DashboardController.java
@@ -10,6 +10,8 @@ import tech.easyflow.admin.model.dashboard.DashboardOverviewVo;
import tech.easyflow.admin.model.dashboard.DashboardUserRankItemVo;
import tech.easyflow.admin.model.dashboard.DashboardUserRankQuery;
import tech.easyflow.admin.service.dashboard.DashboardService;
+import tech.easyflow.agent.service.AgentOptionQueryService;
+import tech.easyflow.agent.vo.AgentOptionView;
import tech.easyflow.common.domain.Result;
import tech.easyflow.common.satoken.util.SaTokenUtil;
@@ -28,9 +30,29 @@ import java.util.List;
public class DashboardController {
private final DashboardService dashboardService;
+ private final AgentOptionQueryService agentOptionQueryService;
- public DashboardController(DashboardService dashboardService) {
+ /**
+ * 创建管理端工作台控制器。
+ *
+ * @param dashboardService 工作台统计服务
+ * @param agentOptionQueryService Agent 安全选项服务
+ */
+ public DashboardController(DashboardService dashboardService,
+ AgentOptionQueryService agentOptionQueryService) {
this.dashboardService = dashboardService;
+ this.agentOptionQueryService = agentOptionQueryService;
+ }
+
+ /**
+ * 查询工作台筛选可使用的 Agent。
+ *
+ * @return Agent 安全选项
+ */
+ @GetMapping("/agentOptions")
+ @SaCheckPermission("/api/v1/dashboard/query")
+ public Result> agentOptions() {
+ return Result.ok(agentOptionQueryService.listAgentOptions(false));
}
@GetMapping("/overview")
diff --git a/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/datacenter/DatacenterExcelController.java b/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/datacenter/DatacenterExcelController.java
index c4d299ed..1751c86e 100644
--- a/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/datacenter/DatacenterExcelController.java
+++ b/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/datacenter/DatacenterExcelController.java
@@ -6,6 +6,7 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
import tech.easyflow.common.domain.Result;
@@ -32,11 +33,21 @@ public class DatacenterExcelController {
@Resource
private DatacenterExcelImportService excelImportService;
+ /**
+ * 上传并导入 Excel 工作簿。
+ *
+ * @param file Excel 工作簿
+ * @param sourceName 数据源名称，留空时使用文件名
+ * @return 导入任务及新建数据源标识
+ * @throws Exception 文件解析或数据写入失败时抛出
+ */
@PostMapping("/import")
@SaCheckPermission("/api/v1/datacenterSource/save")
- public Result importWorkbook(MultipartFile file) throws Exception {
+ public Result importWorkbook(
+ @RequestParam("file") MultipartFile file,
+ @RequestParam(value = "sourceName", required = false) String sourceName) throws Exception {
LoginAccount account = SaTokenUtil.getLoginAccount();
- return Result.ok(excelImportService.importWorkbook(file, account));
+ return Result.ok(excelImportService.importWorkbook(file, sourceName, account));
}
@PostMapping("/split")
diff --git a/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/job/SysJobController.java b/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/job/SysJobController.java
index 8c244632..3047a43f 100644
--- a/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/job/SysJobController.java
+++ b/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/job/SysJobController.java
@@ -2,17 +2,33 @@ package tech.easyflow.admin.controller.job;
import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.hutool.core.date.DateUtil;
+import com.easyagents.flow.core.chain.Parameter;
+import com.mybatisflex.core.query.QueryWrapper;
import org.quartz.CronExpression;
+import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import tech.easyflow.ai.easyagentsflow.service.WorkflowRunningParameterResolver;
+import tech.easyflow.ai.entity.Workflow;
+import tech.easyflow.ai.service.WorkflowService;
+import tech.easyflow.ai.service.WorkflowUsageAuthorizationService;
+import tech.easyflow.admin.model.SysJobWorkflowOptionView;
+import tech.easyflow.common.constant.enums.EnumDataStatus;
+import tech.easyflow.common.constant.enums.EnumJobType;
import tech.easyflow.common.domain.Result;
+import tech.easyflow.common.entity.LoginAccount;
import tech.easyflow.common.satoken.util.SaTokenUtil;
import tech.easyflow.common.web.controller.BaseCurdController;
+import tech.easyflow.common.web.exceptions.BusinessException;
import tech.easyflow.job.entity.SysJob;
+import tech.easyflow.job.job.JobConstant;
import tech.easyflow.job.service.SysJobService;
-
-import tech.easyflow.common.entity.LoginAccount;
+import tech.easyflow.job.support.SysJobWorkflowReferenceSupport;
+import tech.easyflow.log.annotation.LogRecord;
+import tech.easyflow.system.enums.CategoryResourceType;
+import tech.easyflow.system.enums.ResourceAction;
+import tech.easyflow.system.service.ResourceAccessService;
import java.io.Serializable;
import java.math.BigInteger;
@@ -20,6 +36,8 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Date;
import java.util.List;
+import java.util.Map;
+import java.util.Objects;
/**
* 系统任务表 控制层。
@@ -30,25 +48,71 @@ import java.util.List;
@RestController
@RequestMapping("/api/v1/sysJob")
public class SysJobController extends BaseCurdController {
- public SysJobController(SysJobService service) {
+
+ /** 工作流服务。 */
+ private final WorkflowService workflowService;
+
+ /** 工作流使用权限校验服务。 */
+ private final WorkflowUsageAuthorizationService workflowUsageAuthorizationService;
+
+ /** 资源访问控制服务。 */
+ private final ResourceAccessService resourceAccessService;
+
+ /** 工作流运行参数解析器。 */
+ private final WorkflowRunningParameterResolver workflowRunningParameterResolver;
+
+ /**
+ * 创建定时任务控制器。
+ *
+ * @param service 定时任务服务
+ * @param workflowService 工作流服务
+ * @param workflowUsageAuthorizationService 工作流使用权限校验服务
+ * @param resourceAccessService 资源访问控制服务
+ * @param workflowRunningParameterResolver 工作流运行参数解析器
+ */
+ public SysJobController(SysJobService service,
+ WorkflowService workflowService,
+ WorkflowUsageAuthorizationService workflowUsageAuthorizationService,
+ ResourceAccessService resourceAccessService,
+ WorkflowRunningParameterResolver workflowRunningParameterResolver) {
super(service);
+ this.workflowService = workflowService;
+ this.workflowUsageAuthorizationService = workflowUsageAuthorizationService;
+ this.resourceAccessService = resourceAccessService;
+ this.workflowRunningParameterResolver = workflowRunningParameterResolver;
+ }
+
+ /**
+ * 获取定时任务关键字搜索字段。
+ *
+ * @return 任务名称和备注属性
+ */
+ @Override
+ protected String[] getKeywordSearchProperties() {
+ return new String[]{"jobName", "remark"};
}
@GetMapping("/start")
@SaCheckPermission("/api/v1/sysJob/save")
+ @LogRecord("启动定时任务")
public Result start(BigInteger id) {
+ LoginAccount account = SaTokenUtil.getLoginAccount();
+ SysJob job = requireExistingJob(id);
+ validateWorkflowReference(job, account);
service.startJob(id);
return Result.ok();
}
@GetMapping("/stop")
@SaCheckPermission("/api/v1/sysJob/save")
+ @LogRecord("停止定时任务")
public Result stop(BigInteger id) {
service.stopJob(id);
return Result.ok();
}
@GetMapping("/getNextTimes")
+ @SaCheckPermission("/api/v1/sysJob/save")
public Result> getNextTimes(String cronExpression) throws Exception{
CronExpression ex = new CronExpression(cronExpression);
List times = new ArrayList<>();
@@ -61,18 +125,203 @@ public class SysJobController extends BaseCurdController
return Result.ok(times);
}
+ /**
+ * 查询当前账号可用于定时任务的工作流。
+ *
+ * @return 工作流安全选项
+ */
+ @GetMapping("/workflowOptions")
+ @SaCheckPermission("/api/v1/sysJob/save")
+ public Result> workflowOptions() {
+ LoginAccount account = SaTokenUtil.getLoginAccount();
+ List options = workflowService.list(QueryWrapper.create()
+ .eq(Workflow::getTenantId, account.getTenantId())
+ .eq(Workflow::getStatus, EnumDataStatus.AVAILABLE.getCode())
+ .orderBy(Workflow::getModified, false))
+ .stream()
+ .filter(workflow -> Objects.equals(workflow.getTenantId(), account.getTenantId()))
+ .filter(workflow -> resourceAccessService.canAccess(
+ account,
+ CategoryResourceType.WORKFLOW,
+ workflow,
+ ResourceAction.USE))
+ .map(workflow -> new SysJobWorkflowOptionView(
+ workflow.getId(),
+ workflow.getTitle(),
+ workflow.getDescription()))
+ .toList();
+ return Result.ok(options);
+ }
+
+ /**
+ * 查询定时任务所选工作流的运行参数。
+ *
+ * @param id 工作流 ID
+ * @return 工作流运行参数
+ * @throws BusinessException 工作流不存在或无运行权限时抛出
+ */
+ @GetMapping("/workflowRunningParameters")
+ @SaCheckPermission("/api/v1/sysJob/save")
+ public Result> workflowRunningParameters(BigInteger id) {
+ Workflow workflow = workflowUsageAuthorizationService.requireUsableWorkflow(
+ id,
+ SaTokenUtil.getLoginAccount(),
+ "工作流不存在、已禁用或无权运行");
+ Map result = workflowRunningParameterResolver.buildRunningParametersView(workflow);
+ if (result == null) {
+ throw new BusinessException("工作流参数配置无效，请检查工作流后重试");
+ }
+ return Result.ok(result);
+ }
+
@Override
protected Result onSaveOrUpdateBefore(SysJob entity, boolean isSave) {
+ if (entity == null) {
+ throw new BusinessException("定时任务不能为空");
+ }
LoginAccount loginUser = SaTokenUtil.getLoginAccount();
+ SysJob effectiveEntity = entity;
if (isSave) {
commonFiled(entity,loginUser.getId(),loginUser.getTenantId(), loginUser.getDeptId());
} else {
+ SysJob existing = requireExistingJob(entity.getId());
+ preserveServerControlledFields(entity, existing);
+ effectiveEntity = mergeForValidation(entity, existing);
entity.setModified(new Date());
entity.setModifiedBy(loginUser.getId());
}
+ validateWorkflowReference(effectiveEntity, loginUser);
return super.onSaveOrUpdateBefore(entity, isSave);
}
+ /**
+ * 校验工作流类型任务引用的工作流可被当前用户运行。
+ *
+ * @param entity 待保存的定时任务
+ * @param account 当前账号
+ * @throws BusinessException 工作流不存在、参数非法或无运行权限时抛出
+ */
+ private void validateWorkflowReference(SysJob entity, LoginAccount account) {
+ if (entity == null
+ || !Integer.valueOf(EnumJobType.TINY_FLOW.getCode()).equals(entity.getJobType())) {
+ return;
+ }
+ BigInteger workflowId = SysJobWorkflowReferenceSupport.requireWorkflowId(entity);
+ Workflow workflow = workflowUsageAuthorizationService.requireUsableWorkflow(
+ workflowId,
+ account,
+ "工作流不存在、已禁用或无权运行");
+ validateRequiredWorkflowParams(entity, workflow);
+ }
+
+ /**
+ * 获取当前租户内存在的定时任务。
+ *
+ * @param id 定时任务 ID
+ * @return 已存在的定时任务
+ * @throws BusinessException ID 缺失或任务不存在时抛出
+ */
+ private SysJob requireExistingJob(BigInteger id) {
+ if (id == null) {
+ throw new BusinessException("定时任务ID不能为空");
+ }
+ SysJob existing = service.getById(id);
+ if (existing == null) {
+ throw new BusinessException("定时任务不存在");
+ }
+ return existing;
+ }
+
+ /**
+ * 保留更新请求不能修改的服务端控制字段。
+ *
+ * @param entity 更新请求
+ * @param existing 数据库中的定时任务
+ */
+ private void preserveServerControlledFields(SysJob entity, SysJob existing) {
+ entity.setTenantId(existing.getTenantId());
+ entity.setDeptId(existing.getDeptId());
+ entity.setCreated(existing.getCreated());
+ entity.setCreatedBy(existing.getCreatedBy());
+ }
+
+ /**
+ * 合并部分更新请求与原记录，生成用于权限和参数校验的有效任务状态。
+ *
+ * @param entity 更新请求
+ * @param existing 数据库中的定时任务
+ * @return 合并后的校验对象
+ */
+ private SysJob mergeForValidation(SysJob entity, SysJob existing) {
+ SysJob effective = new SysJob();
+ effective.setJobType(entity.getJobType() == null
+ ? existing.getJobType()
+ : entity.getJobType());
+ effective.setJobParams(entity.getJobParams() == null
+ ? existing.getJobParams()
+ : entity.getJobParams());
+ return effective;
+ }
+
+ /**
+ * 校验定时任务已填写工作流的全部必填运行参数。
+ *
+ * @param entity 待保存定时任务
+ * @param workflow 关联工作流
+ * @throws BusinessException 工作流参数配置无效或必填值缺失时抛出
+ */
+ private void validateRequiredWorkflowParams(SysJob entity, Workflow workflow) {
+ List parameters =
+ workflowRunningParameterResolver.resolveStartParameters(workflow.getContent());
+ if (parameters == null) {
+ throw new BusinessException("工作流参数配置无效，请检查工作流后重试");
+ }
+ Map jobParams = entity.getJobParams();
+ Object rawWorkflowParams = jobParams == null
+ ? null
+ : jobParams.get(JobConstant.WORKFLOW_PARAMS_KEY);
+ Map workflowParams = rawWorkflowParams instanceof Map map
+ ? map
+ : Map.of();
+ for (Parameter parameter : parameters) {
+ if (parameter == null || !parameter.isRequired()) {
+ continue;
+ }
+ String name = parameter.getName();
+ if (!StringUtils.hasText(name)) {
+ throw new BusinessException("工作流存在无效必填参数配置，请检查工作流后重试");
+ }
+ if (!hasRequiredValue(workflowParams.get(name))) {
+ String label = StringUtils.hasText(parameter.getFormLabel())
+ ? parameter.getFormLabel()
+ : name;
+ throw new BusinessException("工作流必填参数“" + label + "”不能为空");
+ }
+ }
+ }
+
+ /**
+ * 判断必填参数值是否有效。
+ *
+ * @param value 参数值
+ * @return 非空时为 true
+ */
+ private boolean hasRequiredValue(Object value) {
+ if (value == null) {
+ return false;
+ }
+ if (value instanceof CharSequence sequence) {
+ return StringUtils.hasText(sequence);
+ }
+ if (value instanceof Collection collection) {
+ return !collection.isEmpty();
+ }
+ if (value instanceof Map map) {
+ return !map.isEmpty();
+ }
+ return true;
+ }
+
@Override
protected Result onRemoveBefore(Collection ids) {
service.deleteJob(ids);
diff --git a/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/skill/SkillCategoryController.java b/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/skill/SkillCategoryController.java
new file mode 100644
index 00000000..37cea67d
--- /dev/null
+++ b/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/skill/SkillCategoryController.java
@@ -0,0 +1,241 @@
+package tech.easyflow.admin.controller.skill;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.mybatisflex.core.query.QueryWrapper;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import tech.easyflow.common.annotation.UsePermission;
+import tech.easyflow.common.domain.Result;
+import tech.easyflow.common.entity.LoginAccount;
+import tech.easyflow.common.satoken.util.SaTokenUtil;
+import tech.easyflow.common.util.SearchKeywordUtil;
+import tech.easyflow.common.web.exceptions.BusinessException;
+import tech.easyflow.common.web.jsonbody.JsonBody;
+import tech.easyflow.skill.entity.SkillCategory;
+import tech.easyflow.skill.service.SkillCategoryService;
+import tech.easyflow.system.entity.vo.RoleCategoryAccessSnapshot;
+import tech.easyflow.system.enums.CategoryResourceType;
+import tech.easyflow.system.service.CategoryPermissionService;
+
+import java.io.Serializable;
+import java.math.BigInteger;
+import java.util.List;
+import java.util.LinkedHashMap;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Skill 分类管理控制器。
+ */
+@RestController
+@RequestMapping("/api/v1/skill/category")
+@UsePermission(moduleName = "/api/v1/skill")
+public class SkillCategoryController {
+
+ private static final Set SORT_COLUMNS = Set.of(
+ "id", "category_name", "parent_id", "level_no", "sort_no", "status", "created", "modified");
+
+ private final SkillCategoryService service;
+ @javax.annotation.Resource
+ private CategoryPermissionService categoryPermissionService;
+
+ /**
+ * 创建 Skill 分类管理控制器。
+ *
+ * @param service Skill 分类服务
+ */
+ public SkillCategoryController(SkillCategoryService service) {
+ this.service = service;
+ }
+
+ /**
+ * 查询当前用户可见的 Skill 分类。
+ *
+ * @param entity 查询条件
+ * @param asTree 是否转树
+ * @param sortKey 排序字段
+ * @param sortType 排序方式
+ * @return 可见分类列表
+ */
+ @GetMapping("visibleList")
+ @SaCheckPermission("/api/v1/skill/query")
+ public Result> visibleList(SkillCategory entity, Boolean asTree, String sortKey, String sortType) {
+ QueryWrapper queryWrapper = QueryWrapper.create()
+ .eq(SkillCategory::getTenantId, currentAccount().getTenantId());
+ if (entity != null) {
+ queryWrapper.eq(SkillCategory::getId, entity.getId(), entity.getId() != null)
+ .eq(SkillCategory::getParentId, entity.getParentId(), entity.getParentId() != null)
+ .eq(SkillCategory::getLevelNo, entity.getLevelNo(), entity.getLevelNo() != null)
+ .eq(SkillCategory::getStatus, entity.getStatus(), entity.getStatus() != null);
+ if (entity.getCategoryName() != null && !entity.getCategoryName().isBlank()) {
+ queryWrapper.and("category_name LIKE ?",
+ SearchKeywordUtil.literalContainsPattern(entity.getCategoryName()));
+ }
+ }
+ RoleCategoryAccessSnapshot access = categoryPermissionService.getCurrentAccess(CategoryResourceType.SKILL.getCode());
+ queryWrapper.orderBy(resolveOrderBy(sortKey, sortType));
+ List categories = service.list(queryWrapper);
+ if (access.isRestricted()) {
+ Set visibleIds = new java.util.LinkedHashSet<>(access.getCategoryIds());
+ categories.stream().filter(category -> access.getCategoryIds().contains(category.getId()))
+ .map(SkillCategory::getAncestors).filter(value -> value != null && !value.isBlank())
+ .flatMap(value -> java.util.Arrays.stream(value.split(",")))
+ .map(String::trim).filter(value -> !value.isBlank() && !"0".equals(value))
+ .map(BigInteger::new).forEach(visibleIds::add);
+ categories = categories.stream().filter(category -> visibleIds.contains(category.getId())).toList();
+ }
+ return Result.ok(Boolean.FALSE.equals(asTree) ? categories : toTree(categories));
+ }
+
+ /**
+ * 查询当前租户完整分类管理树，包含停用分类。
+ *
+ * @return 分类树
+ */
+ @GetMapping("tree")
+ @SaCheckPermission("/api/v1/skill/category")
+ public Result> tree() {
+ List categories = service.list(QueryWrapper.create()
+ .eq(SkillCategory::getTenantId, currentAccount().getTenantId())
+ .orderBy("sort_no asc, id asc"));
+ return Result.ok(toTree(categories));
+ }
+
+ /**
+ * 移动 Skill 分类到新的父级。
+ *
+ * @param id 分类 ID
+ * @param parentId 新父级 ID，根分类为空
+ * @return 更新结果
+ */
+ @PostMapping("move")
+ @SaCheckPermission("/api/v1/skill/category")
+ public Result move(
+ @JsonBody(value = "id", required = true, skipConvertError = false) BigInteger id,
+ @JsonBody(value = "parentId", skipConvertError = false) BigInteger parentId) {
+ SkillCategory category = service.getOne(QueryWrapper.create()
+ .eq(SkillCategory::getId, id)
+ .eq(SkillCategory::getTenantId, currentAccount().getTenantId()));
+ if (category == null) {
+ throw new BusinessException(404, 404, "Skill 分类不存在");
+ }
+ category.setParentId(parentId);
+ if (!service.updateById(category)) {
+ throw new BusinessException(500, 500, "移动 Skill 分类失败，请稍后重试");
+ }
+ return Result.ok();
+ }
+
+ /**
+ * 创建 Skill 分类。
+ *
+ * @param entity 分类
+ * @return 保存结果
+ */
+ @PostMapping("save")
+ @SaCheckPermission("/api/v1/skill/category")
+ public Result save(@JsonBody(required = true, skipConvertError = false) SkillCategory entity) {
+ if (entity != null) {
+ entity.setId(null);
+ entity.setTenantId(null);
+ entity.setAncestors(null);
+ entity.setLevelNo(null);
+ entity.setCreated(null);
+ entity.setCreatedBy(null);
+ entity.setModified(null);
+ entity.setModifiedBy(null);
+ }
+ if (!service.save(entity)) {
+ throw new BusinessException(500, 500, "创建 Skill 分类失败，请稍后重试");
+ }
+ return Result.ok(entity);
+ }
+
+ /**
+ * 更新 Skill 分类。
+ *
+ * @param entity 分类
+ * @return 更新结果
+ */
+ @PostMapping("update")
+ @SaCheckPermission("/api/v1/skill/category")
+ public Result update(@JsonBody(required = true, skipConvertError = false) SkillCategory entity) {
+ if (entity != null) {
+ entity.setTenantId(null);
+ entity.setAncestors(null);
+ entity.setLevelNo(null);
+ entity.setCreated(null);
+ entity.setCreatedBy(null);
+ entity.setModified(null);
+ entity.setModifiedBy(null);
+ }
+ if (entity == null || entity.getId() == null) {
+ throw new BusinessException("Skill 分类 ID 不能为空");
+ }
+ if (!service.updateById(entity)) {
+ throw new BusinessException(500, 500, "更新 Skill 分类失败，请稍后重试");
+ }
+ return Result.ok(entity);
+ }
+
+ /**
+ * 删除 Skill 分类。
+ *
+ * @param id 分类 ID
+ * @return 删除结果
+ */
+ @PostMapping("remove")
+ @SaCheckPermission("/api/v1/skill/category")
+ public Result remove(
+ @JsonBody(value = "id", required = true, skipConvertError = false) Serializable id) {
+ if (!service.removeById(id)) {
+ throw new BusinessException(500, 500, "删除 Skill 分类失败，请稍后重试");
+ }
+ return Result.ok();
+ }
+
+ private LoginAccount currentAccount() {
+ LoginAccount account = SaTokenUtil.getLoginAccount();
+ if (account == null || account.getId() == null || account.getTenantId() == null) {
+ throw new BusinessException(401, 401, "未登录或登录态无效");
+ }
+ return account;
+ }
+
+ /**
+ * 将分类排序参数收敛到固定字段白名单，禁止原始 SQL 片段进入查询。
+ *
+ * @param sortKey 排序字段
+ * @param sortType 排序方向
+ * @return 安全排序表达式
+ */
+ String resolveOrderBy(String sortKey, String sortType) {
+ String snake = sortKey == null ? "" : sortKey
+ .replaceAll("([a-z0-9])([A-Z])", "$1_$2")
+ .toLowerCase(Locale.ROOT);
+ String column = SORT_COLUMNS.contains(snake) ? snake : "sort_no";
+ String direction = "desc".equalsIgnoreCase(sortType) ? "desc" : "asc";
+ return column + " " + direction + ("id".equals(column) ? "" : ", id asc");
+ }
+
+ private List toTree(List categories) {
+ Map byId = new LinkedHashMap<>();
+ categories.forEach(category -> {
+ category.setChildren(null);
+ byId.put(category.getId(), category);
+ });
+ List roots = new java.util.ArrayList<>();
+ for (SkillCategory category : categories) {
+ SkillCategory parent = category.getParentId() == null ? null : byId.get(category.getParentId());
+ if (parent == null) {
+ roots.add(category);
+ } else {
+ parent.getChildren().add(category);
+ }
+ }
+ return roots;
+ }
+}
diff --git a/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/skill/SkillController.java b/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/skill/SkillController.java
new file mode 100644
index 00000000..f254bbcf
--- /dev/null
+++ b/easyflow-api/easyflow-api-admin/src/main/java/tech/easyflow/admin/controller/skill/SkillController.java
@@ -0,0 +1,755 @@
+package tech.easyflow.admin.controller.skill;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.annotation.SaMode;
+import com.mybatisflex.core.paginate.Page;
+import com.mybatisflex.core.query.QueryWrapper;
+import jakarta.servlet.http.HttpServletResponse;
+import org.springframework.http.MediaType;
+import org.springframework.util.StreamUtils;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.RequestPart;
+import org.springframework.web.multipart.MultipartFile;
+import tech.easyflow.admin.controller.ai.support.AiResourceCreatorNameSupport;
+import tech.easyflow.admin.controller.skill.vo.SkillCopyRequest;
+import tech.easyflow.admin.controller.skill.vo.SkillDraftRequest;
+import tech.easyflow.admin.controller.skill.vo.SkillGitRepositoryPrepareRequest;
+import tech.easyflow.admin.controller.skill.vo.SkillGitRepositoryScanRequest;
+import tech.easyflow.admin.controller.skill.vo.SkillImportBatchResultView;
+import tech.easyflow.admin.controller.skill.vo.SkillView;
+import tech.easyflow.admin.controller.skill.vo.SkillToolBindingUpdateRequest;
+import tech.easyflow.admin.controller.skill.vo.SkillPublishStatusView;
+import tech.easyflow.approval.entity.vo.ApprovalActionResult;
+import tech.easyflow.common.entity.LoginAccount;
+import tech.easyflow.common.domain.Result;
+import tech.easyflow.common.satoken.util.SaTokenUtil;
+import tech.easyflow.common.util.SearchKeywordUtil;
+import tech.easyflow.common.web.exceptions.BusinessException;
+import tech.easyflow.common.web.jsonbody.JsonBody;
+import tech.easyflow.skill.entity.Skill;
+import tech.easyflow.skill.file.SkillFileContent;
+import tech.easyflow.skill.file.SkillFileNode;
+import tech.easyflow.skill.file.SkillFileRenameRequest;
+import tech.easyflow.skill.file.SkillFileSaveRequest;
+import tech.easyflow.skill.file.SkillFileService;
+import tech.easyflow.skill.imports.SkillExportRequest;
+import tech.easyflow.skill.imports.SkillExportArtifact;
+import tech.easyflow.skill.imports.SkillExportService;
+import tech.easyflow.skill.imports.SkillImportConfirmRequest;
+import tech.easyflow.skill.imports.SkillImportPreview;
+import tech.easyflow.skill.imports.SkillImportService;
+import tech.easyflow.skill.gitimport.SkillGitImportService;
+import tech.easyflow.skill.gitimport.SkillGitScanResult;
+import tech.easyflow.skill.publish.SkillPublishAppService;
+import tech.easyflow.skill.security.SkillVisibilityQueryHelper;
+import tech.easyflow.skill.service.SkillApprovalStateService;
+import tech.easyflow.skill.service.SkillService;
+import tech.easyflow.skill.service.SkillToolBindingService;
+import tech.easyflow.skill.service.SkillToolOptionQueryService;
+import tech.easyflow.skill.vo.SkillMcpToolManifestView;
+import tech.easyflow.skill.vo.SkillToolOptionPage;
+import tech.easyflow.skill.validation.SkillValidationResult;
+import tech.easyflow.system.enums.CategoryResourceType;
+import tech.easyflow.system.enums.ResourceAction;
+import tech.easyflow.system.service.CategoryPermissionService;
+import tech.easyflow.system.service.ResourceAccessService;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.math.BigInteger;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+import java.util.Locale;
+import java.util.Objects;
+import java.util.Set;
+
+/**
+ * Skill 管理端 API，统一负责轻量查询、白名单写入、文件工作台和标准包导入导出。
+ */
+@RestController
+@RequestMapping("/api/v1/skill")
+public class SkillController {
+
+ private static final Set PAGE_SORT_COLUMNS = Set.of(
+ "id", "name", "display_name", "created", "modified", "publish_status");
+
+ private final SkillService skillService;
+ private final SkillApprovalStateService skillApprovalStateService;
+ private final SkillPublishAppService skillPublishAppService;
+ private final SkillImportService skillImportService;
+ private final SkillGitImportService skillGitImportService;
+ private final SkillExportService skillExportService;
+ private final SkillFileService skillFileService;
+ private final SkillToolBindingService skillToolBindingService;
+ private final SkillToolOptionQueryService skillToolOptionQueryService;
+ private final ResourceAccessService resourceAccessService;
+ private final CategoryPermissionService categoryPermissionService;
+ private final SkillVisibilityQueryHelper visibilityQueryHelper;
+ private final AiResourceCreatorNameSupport creatorNameSupport;
+
+ /**
+ * 创建 Skill 管理控制器。
+ *
+ * @param skillService Skill 服务
+ * @param skillApprovalStateService 审批状态服务
+ * @param skillPublishAppService 发布服务
+ * @param skillImportService 导入服务
+ * @param skillGitImportService Git 仓库导入服务
+ * @param skillExportService 导出服务
+ * @param skillFileService 文件服务
+ * @param skillToolBindingService Skill Tool 绑定服务
+ * @param skillToolOptionQueryService Skill Tool 候选查询服务
+ * @param resourceAccessService 资源权限服务
+ * @param categoryPermissionService 分类权限服务
+ * @param visibilityQueryHelper 可见性查询助手
+ * @param creatorNameSupport 创建人名称助手
+ */
+ public SkillController(SkillService skillService,
+ SkillApprovalStateService skillApprovalStateService,
+ SkillPublishAppService skillPublishAppService,
+ SkillImportService skillImportService,
+ SkillGitImportService skillGitImportService,
+ SkillExportService skillExportService,
+ SkillFileService skillFileService,
+ SkillToolBindingService skillToolBindingService,
+ SkillToolOptionQueryService skillToolOptionQueryService,
+ ResourceAccessService resourceAccessService,
+ CategoryPermissionService categoryPermissionService,
+ SkillVisibilityQueryHelper visibilityQueryHelper,
+ AiResourceCreatorNameSupport creatorNameSupport) {
+ this.skillService = skillService;
+ this.skillApprovalStateService = skillApprovalStateService;
+ this.skillPublishAppService = skillPublishAppService;
+ this.skillImportService = skillImportService;
+ this.skillGitImportService = skillGitImportService;
+ this.skillExportService = skillExportService;
+ this.skillFileService = skillFileService;
+ this.skillToolBindingService = skillToolBindingService;
+ this.skillToolOptionQueryService = skillToolOptionQueryService;
+ this.resourceAccessService = resourceAccessService;
+ this.categoryPermissionService = categoryPermissionService;
+ this.visibilityQueryHelper = visibilityQueryHelper;
+ this.creatorNameSupport = creatorNameSupport;
+ }
+
+ /**
+ * 分页查询当前用户可读的 Skill 描述信息。
+ *
+ * @param pageNumber 页码
+ * @param pageSize 每页数量
+ * @param categoryId 分类 ID
+ * @param categoryScope 分类范围，UNCATEGORIZED 表示未分类
+ * @param name 名称关键词
+ * @param displayName 展示名称关键词
+ * @param keyword 名称、用途或创建人模糊关键词
+ * @param publishStatus 发布状态
+ * @param visibilityScope 使用范围
+ * @param sortKey 排序字段
+ * @param sortType 排序方向
+ * @return 轻量分页结果
+ */
+ @GetMapping("/page")
+ @SaCheckPermission("/api/v1/skill/query")
+ public Result> page(Long pageNumber, Long pageSize, BigInteger categoryId, String categoryScope,
+ String name, String displayName, String keyword, String publishStatus,
+ String visibilityScope, String sortKey, String sortType) {
+ long normalizedPage = pageNumber == null || pageNumber < 1 ? 1 : pageNumber;
+ long normalizedSize = pageSize == null || pageSize < 1 ? 10 : Math.min(pageSize, 100);
+ QueryWrapper query = descriptorQuery();
+ visibilityQueryHelper.applyReadableAccess(query);
+ if ("UNCATEGORIZED".equalsIgnoreCase(categoryScope)) {
+ query.isNull("category_id");
+ } else {
+ query.eq("category_id", categoryId, categoryId != null);
+ }
+ query.eq("publish_status", publishStatus, hasText(publishStatus))
+ .eq("visibility_scope", visibilityScope, hasText(visibilityScope));
+ String effectiveKeyword = hasText(keyword) ? keyword : hasText(displayName) ? displayName : name;
+ if (hasText(effectiveKeyword)) {
+ String pattern = SearchKeywordUtil.literalContainsPattern(effectiveKeyword);
+ query.and("(name LIKE ? ESCAPE '\\\\' OR display_name LIKE ? ESCAPE '\\\\' "
+ + "OR description LIKE ? ESCAPE '\\\\' OR EXISTS (SELECT 1 FROM tb_sys_account a "
+ + "WHERE a.id = tb_skill.created_by AND a.tenant_id = tb_skill.tenant_id "
+ + "AND (a.nickname LIKE ? ESCAPE '\\\\' OR a.login_name LIKE ? ESCAPE '\\\\'))) ",
+ pattern, pattern, pattern, pattern, pattern);
+ }
+ query.orderBy(resolveSortColumn(sortKey) + ("asc".equalsIgnoreCase(sortType) ? " asc" : " desc"));
+ Page source = skillService.page(new Page<>(normalizedPage, normalizedSize), query);
+ fillListState(source.getRecords());
+ LoginAccount account = SaTokenUtil.getLoginAccount();
+ boolean superAdmin = account != null && categoryPermissionService.isSuperAdmin(account);
+ List records = source.getRecords().stream()
+ .map(skill -> toPageView(skill, account, superAdmin)).toList();
+ return Result.ok(new Page<>(records, source.getPageNumber(), source.getPageSize(), source.getTotalRow()));
+ }
+
+ /**
+ * 获取 Skill 完整管理详情。
+ *
+ * @param id Skill ID
+ * @return Skill 详情
+ */
+ @GetMapping("/detail")
+ @SaCheckPermission("/api/v1/skill/getDetail")
+ public Result detail(BigInteger id) {
+ Skill skill = skillService.getManagementDetail(id);
+ fillListState(List.of(skill));
+ return Result.ok(toView(skill));
+ }
+
+ /**
+ * 查询 Skill 可绑定的 Tool 候选。
+ *
+ * @param keyword 名称或描述关键词
+ * @param toolType 类型过滤
+ * @param pageNum 页码
+ * @param pageSize 每页数量
+ * @return 安全候选分页
+ */
+ @GetMapping("/toolOptions")
+ @SaCheckPermission(value = {"/api/v1/skill/save", "/api/v1/skill/update"}, mode = SaMode.OR)
+ public Result toolOptions(String keyword, String toolType,
+ Long pageNum, Long pageSize) {
+ return Result.ok(skillToolOptionQueryService.page(keyword, toolType,
+ pageNum == null ? 1 : pageNum, pageSize == null ? 20 : pageSize));
+ }
+
+ /**
+ * 按需读取指定 MCP 的脱敏 Tool 清单。
+ *
+ * @param mcpId MCP ID
+ * @return MCP Tool 清单
+ */
+ @GetMapping("/mcpTools")
+ @SaCheckPermission(value = {"/api/v1/skill/save", "/api/v1/skill/update"}, mode = SaMode.OR)
+ public Result