models = modelIds.stream()
+ .map(repositoryService::getModel)
+ .filter(Objects::nonNull)
+ .toList();
+ models.forEach(this::checkNoRunningInstance);
+ models.forEach(this::removeModelAndDeployments);
+ }
+
+ /**
+ * 校验流程无运行中实例
+ *
+ * 级联删除会连同在办任务一并抹除，审批人无从知晓，故有在办实例时禁止删除
+ */
+ private void checkNoRunningInstance(Model model) {
+ long runningCount = runtimeService.createProcessInstanceQuery()
+ .processDefinitionKey(model.getKey())
+ .count();
+ if (runningCount > 0) {
+ throw new BusinessException("流程【" + model.getName() + "】存在 " + runningCount
+ + " 个运行中的实例，请先撤销或办结后再删除");
+ }
+ }
+
+ /**
+ * 删除模型的全部发布版本（级联流程定义、实例与历史）及设计草稿
+ */
+ private void removeModelAndDeployments(Model model) {
+ repositoryService.createDeploymentQuery()
+ .processDefinitionKey(model.getKey()).list()
+ .forEach(deployment -> repositoryService.deleteDeployment(deployment.getId(), true));
+ repositoryService.deleteModel(model.getId());
+ }
+
+ /**
+ * 查询引用指定表单的流程
+ *
+ * 引用写在 BPMN 的开始节点与用户任务节点（flowable:formKey）；模型草稿虽未部署但已绑定表单，
+ * 一并计入：表单被删除后，流程发起或审批时无表单可渲染
+ *
+ * @param formKeys 表单标识集合
+ * @return 表单标识 → 引用它的流程名称集合（无引用返回空 Map）
+ */
+ @Override
+ public Map> getFormReferences(Collection formKeys) {
+ if (CollUtil.isEmpty(formKeys)) {
+ return Map.of();
+ }
+ Set targets = new HashSet<>(formKeys);
+ Map> references = new HashMap<>();
+
+ // 已部署定义：全部版本都算引用，旧版本的实例仍在流转
+ for (ProcessDefinition definition : repositoryService.createProcessDefinitionQuery().list()) {
+ Set referenced;
+ try {
+ referenced = bpmnModelHelper.getFormKeys(definition.getId());
+ } catch (Exception e) {
+ log.warn("流程定义 [{}] 表单引用解析失败，跳过校验", definition.getKey());
+ continue;
}
- repositoryService.createDeploymentQuery()
- .processDefinitionKey(model.getKey()).list()
- .forEach(deployment -> repositoryService.deleteDeployment(deployment.getId(), true));
- repositoryService.deleteModel(modelId);
- });
+ referenced.stream().filter(targets::contains)
+ .forEach(formKey -> recordReference(references, formKey, definition.getName()));
+ }
+
+ // 模型草稿：设计器里已绑定表单，删除后该模型发布即成无表单流程
+ for (Model model : repositoryService.createModelQuery().list()) {
+ byte[] source = repositoryService.getModelEditorSource(model.getId());
+ if (source == null || source.length == 0) {
+ continue;
+ }
+ Set referenced;
+ try {
+ referenced = bpmnModelHelper.getFormKeysFromXml(new String(source, StandardCharsets.UTF_8));
+ } catch (Exception e) {
+ log.warn("流程模型 [{}] 表单引用解析失败，跳过校验", model.getKey());
+ continue;
+ }
+ referenced.stream().filter(targets::contains)
+ .forEach(formKey -> recordReference(references, formKey, model.getName()));
+ }
+ return references;
+ }
+
+ /**
+ * 记录一条引用关系（同一表单被多个流程引用时累加，按流程名称排序保证提示稳定）
+ */
+ private void recordReference(Map> references, String formKey, String processName) {
+ references.computeIfAbsent(formKey, key -> new TreeSet<>()).add(processName);
}
/**
diff --git a/src/main/java/com/youlai/boot/module/workflow/service/impl/WorkflowTaskServiceImpl.java b/src/main/java/com/youlai/boot/module/workflow/service/impl/WorkflowTaskServiceImpl.java
index 455b8148..782d4bac 100644
--- a/src/main/java/com/youlai/boot/module/workflow/service/impl/WorkflowTaskServiceImpl.java
+++ b/src/main/java/com/youlai/boot/module/workflow/service/impl/WorkflowTaskServiceImpl.java
@@ -1,15 +1,21 @@
package com.youlai.boot.module.workflow.service.impl;
+import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.youlai.boot.common.exception.BusinessException;
import com.youlai.boot.framework.security.util.SecurityUtils;
import com.youlai.boot.module.form.model.vo.FormDataVO;
import com.youlai.boot.module.form.service.FormDataService;
+import com.youlai.boot.module.form.util.FormRuleValidator;
import com.youlai.boot.module.workflow.model.form.CompleteTaskForm;
import com.youlai.boot.module.workflow.model.form.RejectTaskForm;
import com.youlai.boot.module.workflow.model.query.WorkflowTaskPageQuery;
+import com.youlai.boot.module.workflow.model.vo.ApprovalHistoryVO;
import com.youlai.boot.module.workflow.model.vo.DoneTaskVO;
import com.youlai.boot.module.workflow.model.vo.RejectTargetVO;
import com.youlai.boot.module.workflow.model.vo.TaskDetailVO;
@@ -19,6 +25,8 @@ import com.youlai.boot.module.workflow.service.WorkflowTaskService;
import com.youlai.boot.module.workflow.util.ApprovalHistoryHelper;
import com.youlai.boot.module.workflow.util.BpmnModelHelper;
import com.youlai.boot.module.workflow.config.ConditionalOnWorkflowEnabled;
+import com.youlai.boot.support.ai.AiChatService;
+import com.youlai.boot.support.ai.PromptLoader;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.flowable.common.engine.impl.identity.Authentication;
@@ -37,6 +45,7 @@ import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -58,6 +67,11 @@ import java.util.stream.Collectors;
@RequiredArgsConstructor
public class WorkflowTaskServiceImpl implements WorkflowTaskService {
+ /** 系统提示词名称，对应 resources/prompts 下的相对路径 */
+ private static final String SYSTEM_PROMPT_PATH = "workflow/summary.md";
+
+ private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
+
private final TaskService taskService;
private final RuntimeService runtimeService;
private final HistoryService historyService;
@@ -66,6 +80,8 @@ public class WorkflowTaskServiceImpl implements WorkflowTaskService {
private final WorkflowDefinitionService workflowDefinitionService;
private final BpmnModelHelper bpmnModelHelper;
private final ApprovalHistoryHelper approvalHistoryHelper;
+ private final AiChatService aiChatService;
+ private final PromptLoader promptLoader;
/**
* 待办任务分页列表
@@ -379,4 +395,72 @@ public class WorkflowTaskServiceImpl implements WorkflowTaskService {
.collect(Collectors.toMap(ProcessInstance::getId, instance -> instance));
}
+ //---------------------------------------------------
+ // AI 辅助：未开启 AI 时调用返回业务异常
+ //---------------------------------------------------
+
+ /**
+ * 用 AI 汇总表单数据与审批记录，生成审批摘要
+ *
+ * @param taskId 任务ID
+ * @return 摘要文本
+ */
+ @Override
+ public String aiSummarizeTask(String taskId) {
+ TaskDetailVO detail = getTaskDetail(taskId);
+ return aiChatService.chat(promptLoader.get(SYSTEM_PROMPT_PATH), buildAiUserPrompt(detail));
+ }
+
+ /**
+ * 构造用户提示词
+ *
+ * @param detail 任务详情
+ * @return 用户提示词
+ */
+ private String buildAiUserPrompt(TaskDetailVO detail) {
+ StringBuilder text = new StringBuilder();
+ text.append("流程名称：").append(StrUtil.blankToDefault(detail.getProcessName(), "未命名流程")).append("\n");
+ text.append("当前节点：").append(StrUtil.blankToDefault(detail.getTaskName(), "未命名节点")).append("\n");
+ text.append("表单数据：\n").append(buildAiFormDataText(detail));
+ if (CollectionUtil.isNotEmpty(detail.getHistory())) {
+ text.append("审批记录：\n");
+ for (ApprovalHistoryVO history : detail.getHistory()) {
+ text.append("- ")
+ .append(StrUtil.blankToDefault(history.getActivityName(), "环节"))
+ .append("（")
+ .append(StrUtil.blankToDefault(history.getAssignee(), "待处理"))
+ .append("）：")
+ .append(StrUtil.blankToDefault(history.getComment(), "无意见"))
+ .append("\n");
+ }
+ }
+ return text.toString();
+ }
+
+ /**
+ * 把表单数据按 rule 的中文标题输出，便于模型理解字段含义
+ *
+ * @param detail 任务详情
+ * @return 逐行「标题：值」文本
+ */
+ private String buildAiFormDataText(TaskDetailVO detail) {
+ Map titles = FormRuleValidator.resolveTitles(detail.getFormJson());
+ if (StrUtil.isBlank(detail.getDataJson())) {
+ return "（无表单数据）\n";
+ }
+ StringBuilder text = new StringBuilder();
+ try {
+ JsonNode data = OBJECT_MAPPER.readTree(detail.getDataJson());
+ Iterator> fields = data.fields();
+ while (fields.hasNext()) {
+ Map.Entry entry = fields.next();
+ String title = titles.getOrDefault(entry.getKey(), entry.getKey());
+ text.append(title).append("：").append(entry.getValue().asText()).append("\n");
+ }
+ } catch (Exception e) {
+ throw new BusinessException("表单数据解析失败");
+ }
+ return text.toString();
+ }
+
}
diff --git a/src/main/java/com/youlai/boot/module/workflow/util/BpmnModelHelper.java b/src/main/java/com/youlai/boot/module/workflow/util/BpmnModelHelper.java
index 4d380c89..2a9a8868 100644
--- a/src/main/java/com/youlai/boot/module/workflow/util/BpmnModelHelper.java
+++ b/src/main/java/com/youlai/boot/module/workflow/util/BpmnModelHelper.java
@@ -18,6 +18,7 @@ import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
+import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
@@ -98,6 +99,50 @@ public class BpmnModelHelper {
.orElse(null);
}
+ /**
+ * 获取流程定义引用的全部表单标识（开始节点与用户任务节点，去重）
+ *
+ * @param processDefinitionId 流程定义ID
+ * @return formKey 集合，未绑定返回空集合
+ */
+ public Set getFormKeys(String processDefinitionId) {
+ Process process = getMainProcess(processDefinitionId);
+ if (process == null) {
+ return Set.of();
+ }
+ return extractFormKeys(process);
+ }
+
+ /**
+ * 提取 BPMN XML 引用的全部表单标识（开始节点与用户任务节点，去重）
+ *
+ * 供表单删除前校验使用：设计器草稿未部署，其引用不体现在流程定义里
+ *
+ * @param bpmnXml BPMN 2.0 XML 字符串
+ * @return formKey 集合，无引用返回空集合
+ */
+ public Set getFormKeysFromXml(String bpmnXml) {
+ BpmnModel bpmnModel = new BpmnXMLConverter().convertToBpmnModel(
+ () -> new ByteArrayInputStream(bpmnXml.getBytes(StandardCharsets.UTF_8)), false, true);
+ Process process = bpmnModel.getMainProcess();
+ if (process == null) {
+ throw new BusinessException("流程文件校验失败，未找到主流程");
+ }
+ return extractFormKeys(process);
+ }
+
+ /**
+ * 提取主流程中开始节点与用户任务节点引用的表单标识
+ */
+ private Set extractFormKeys(Process process) {
+ Set formKeys = new HashSet<>();
+ process.findFlowElementsOfType(StartEvent.class).stream()
+ .map(StartEvent::getFormKey).filter(StrUtil::isNotBlank).forEach(formKeys::add);
+ process.findFlowElementsOfType(UserTask.class).stream()
+ .map(UserTask::getFormKey).filter(StrUtil::isNotBlank).forEach(formKeys::add);
+ return formKeys;
+ }
+
/**
* 获取流程定义的 BPMN XML
*
diff --git a/src/main/java/com/youlai/boot/support/ai/AiChatService.java b/src/main/java/com/youlai/boot/support/ai/AiChatService.java
new file mode 100644
index 00000000..432200ba
--- /dev/null
+++ b/src/main/java/com/youlai/boot/support/ai/AiChatService.java
@@ -0,0 +1,123 @@
+package com.youlai.boot.support.ai;
+
+import cn.hutool.core.util.StrUtil;
+import com.youlai.boot.common.exception.BusinessException;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.ai.chat.client.ChatClient;
+import org.springframework.ai.chat.model.ChatModel;
+import org.springframework.beans.factory.ObjectProvider;
+import org.springframework.core.ParameterizedTypeReference;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+import java.util.function.Supplier;
+
+/**
+ * AI 对话服务
+ *
+ * 代码生成、动态表单、工作流的 AI 辅助功能统一走这里；对话客户端由 spring.ai 自动装配提供，
+ * 未开启时调用返回业务异常，不影响应用启动
+ *
+ * @author Ray.Hao
+ * @since 0.1.0
+ */
+@Service
+@RequiredArgsConstructor
+@Slf4j
+public class AiChatService {
+
+ private final ObjectProvider chatModelProvider;
+
+ private final ObjectProvider chatClientBuilderProvider;
+
+ /**
+ * 对话客户端，首次调用时构建
+ */
+ private ChatClient chatClient;
+
+ /**
+ * 发送提示词并返回模型输出
+ *
+ * @param systemPrompt 系统提示词（角色与约束）
+ * @param userPrompt 用户提示词（输入数据）
+ * @return 模型输出文本
+ */
+ public String chat(String systemPrompt, String userPrompt) {
+ return execute("chat", () -> {
+ String content = client().prompt().system(systemPrompt).user(userPrompt).call().content();
+ return StrUtil.blankToDefault(content, StrUtil.EMPTY).trim();
+ });
+ }
+
+ /**
+ * 发送提示词并映射为实体
+ *
+ * 实体结构不符时框架会携带校验错误自动重试，无需手工解析 JSON
+ *
+ * @param systemPrompt 系统提示词（角色与约束）
+ * @param userPrompt 用户提示词（输入数据）
+ * @param type 目标实体类型
+ * @return 映射后的实体
+ */
+ public T chatEntity(String systemPrompt, String userPrompt, Class type) {
+ return execute("chatEntity(" + type.getSimpleName() + ")", () -> client().prompt()
+ .system(systemPrompt).user(userPrompt).call()
+ .entity(type, spec -> spec.validateSchema()));
+ }
+
+ /**
+ * 发送提示词并映射为 JSON 数组
+ *
+ * 元素结构开放（如 form-create rule）时使用，产出后仍需业务侧校验
+ *
+ * @param systemPrompt 系统提示词（角色与约束）
+ * @param userPrompt 用户提示词（输入数据）
+ * @return JSON 数组
+ */
+ public List> chatJsonList(String systemPrompt, String userPrompt) {
+ return execute("chatJsonList", () -> client().prompt()
+ .system(systemPrompt).user(userPrompt).call()
+ .entity(new ParameterizedTypeReference>>() {
+ }));
+ }
+
+ /**
+ * 获取对话客户端，首次调用时构建
+ *
+ * @return 对话客户端
+ */
+ private synchronized ChatClient client() {
+ if (chatClient == null) {
+ // 未装配 ChatModel 时 Builder 也建不出来，先判断模型是否存在，避免抛出框架的 BeanCreationException
+ if (chatModelProvider.getIfAvailable() == null) {
+ throw new BusinessException(
+ "AI 功能未开启，请将 spring.ai.model.chat 置为 openai 并配置 spring.ai.openai.api-key");
+ }
+ log.info("AI 对话客户端初始化");
+ chatClient = chatClientBuilderProvider.getObject().build();
+ }
+ return chatClient;
+ }
+
+ /**
+ * 执行模型调用并记录开始、耗时与异常
+ *
+ * @param operation 调用标识
+ * @param call 模型调用
+ * @return 调用结果
+ */
+ private T execute(String operation, Supplier call) {
+ log.info("AI 调用开始, {}", operation);
+ long start = System.currentTimeMillis();
+ try {
+ T result = call.get();
+ log.info("AI 调用完成, {} 耗时 {} ms", operation, System.currentTimeMillis() - start);
+ return result;
+ } catch (RuntimeException e) {
+ log.error("AI 调用失败, {} 耗时 {} ms", operation, System.currentTimeMillis() - start, e);
+ throw e;
+ }
+ }
+}
diff --git a/src/main/java/com/youlai/boot/support/ai/PromptLoader.java b/src/main/java/com/youlai/boot/support/ai/PromptLoader.java
new file mode 100644
index 00000000..d54b3173
--- /dev/null
+++ b/src/main/java/com/youlai/boot/support/ai/PromptLoader.java
@@ -0,0 +1,126 @@
+package com.youlai.boot.support.ai;
+
+import cn.hutool.core.util.StrUtil;
+import jakarta.annotation.PostConstruct;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.core.io.Resource;
+import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
+import org.springframework.stereotype.Component;
+import org.springframework.util.StreamUtils;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * 提示词加载器
+ *
+ * 提示词文本统一放在类路径的 prompts 目录下，一个文件对应一段系统提示词，
+ * 应用启动时全部载入并缓存；文本中的 {{键}} 在渲染时替换为变量值
+ *
+ * @author Ray.Hao
+ * @since 0.1.0
+ */
+@Slf4j
+@Component
+public class PromptLoader {
+
+ /**
+ * 提示词文件位置
+ */
+ private static final String LOCATION_PATTERN = "classpath*:prompts/**/*.md";
+
+ /**
+ * 提示词目录，用于从资源地址截取提示词名称
+ */
+ private static final String DIRECTORY = "prompts/";
+
+ /**
+ * 占位符左标记
+ */
+ private static final String PLACEHOLDER_LEFT = "{{";
+
+ /**
+ * 占位符右标记
+ */
+ private static final String PLACEHOLDER_RIGHT = "}}";
+
+ /**
+ * 提示词内容，键为 prompts 下的相对路径
+ */
+ private final Map prompts = new ConcurrentHashMap<>();
+
+ /**
+ * 载入全部提示词文件，读取失败则应用启动失败
+ */
+ @PostConstruct
+ public void load() {
+ try {
+ Resource[] resources = new PathMatchingResourcePatternResolver().getResources(LOCATION_PATTERN);
+ for (Resource resource : resources) {
+ try (InputStream inputStream = resource.getInputStream()) {
+ String content = StreamUtils.copyToString(inputStream, StandardCharsets.UTF_8).trim();
+ prompts.put(resolveName(resource), content);
+ }
+ }
+ log.info("提示词载入完成, {} 个", prompts.size());
+ } catch (IOException e) {
+ throw new IllegalStateException("提示词载入失败", e);
+ }
+ }
+
+ /**
+ * 获取提示词原文
+ *
+ * @param name 提示词名称，prompts 下的相对路径，如 codegen/system.md
+ * @return 提示词原文
+ */
+ public String get(String name) {
+ String prompt = prompts.get(name);
+ if (prompt == null) {
+ throw new IllegalStateException("提示词不存在：" + name);
+ }
+ return prompt;
+ }
+
+ /**
+ * 获取提示词并替换占位符，替换后仍残留 {{ 的视为占位符漏传，直接抛出异常
+ *
+ * @param name 提示词名称，prompts 下的相对路径
+ * @param variables 变量值，键与文本中的 {{键}} 对应
+ * @return 替换后的提示词
+ */
+ public String render(String name, Map variables) {
+ String prompt = get(name);
+ for (Map.Entry variable : variables.entrySet()) {
+ prompt = prompt.replace(PLACEHOLDER_LEFT + variable.getKey() + PLACEHOLDER_RIGHT,
+ StrUtil.nullToEmpty(variable.getValue()));
+ }
+ int index = prompt.indexOf(PLACEHOLDER_LEFT);
+ if (index >= 0) {
+ int end = prompt.indexOf(PLACEHOLDER_RIGHT, index);
+ String placeholder = end > index
+ ? prompt.substring(index, end + PLACEHOLDER_RIGHT.length())
+ : prompt.substring(index);
+ throw new IllegalStateException("提示词 " + name + " 存在未替换的占位符：" + placeholder);
+ }
+ return prompt;
+ }
+
+ /**
+ * 截取资源地址中 prompts 之后的路径作为提示词名称
+ *
+ * @param resource 提示词资源
+ * @return 提示词名称
+ */
+ private String resolveName(Resource resource) throws IOException {
+ String url = resource.getURL().toString();
+ int index = url.lastIndexOf(DIRECTORY);
+ if (index < 0) {
+ throw new IllegalStateException("提示词路径异常：" + url);
+ }
+ return url.substring(index + DIRECTORY.length());
+ }
+}
diff --git a/src/main/java/com/youlai/boot/system/controller/DictController.java b/src/main/java/com/youlai/boot/system/controller/DictController.java
index 0d2f604e..a1f2d8c4 100644
--- a/src/main/java/com/youlai/boot/system/controller/DictController.java
+++ b/src/main/java/com/youlai/boot/system/controller/DictController.java
@@ -1,28 +1,28 @@
package com.youlai.boot.system.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.youlai.boot.common.annotation.Log;
+import com.youlai.boot.common.enums.ActionTypeEnum;
+import com.youlai.boot.common.enums.LogModuleEnum;
import com.youlai.boot.common.model.Option;
import com.youlai.boot.common.result.PageResult;
import com.youlai.boot.common.result.Result;
-import com.youlai.boot.common.enums.ActionTypeEnum;
-import com.youlai.boot.common.enums.LogModuleEnum;
-import com.youlai.boot.system.model.form.DictItemForm;
-import com.youlai.boot.system.model.query.DictItemQuery;
-import com.youlai.boot.system.model.query.DictQuery;
-import com.youlai.boot.system.model.vo.DictItemOptionVO;
-import com.youlai.boot.system.model.vo.DictItemPageVO;
-import com.youlai.boot.system.model.vo.DictPageVO;
import com.youlai.boot.framework.web.repeatsubmit.RepeatSubmit;
-import com.youlai.boot.system.model.form.DictForm;
-import com.youlai.boot.common.annotation.Log;
-import com.youlai.boot.system.service.DictItemService;
-import com.youlai.boot.system.service.DictService;
import com.youlai.boot.support.sse.SseService;
import com.youlai.boot.support.sse.constant.SseTopics;
import com.youlai.boot.system.model.dto.DictChangeDTO;
+import com.youlai.boot.system.model.form.DictForm;
+import com.youlai.boot.system.model.form.DictItemForm;
+import com.youlai.boot.system.model.query.DictQuery;
+import com.youlai.boot.system.model.query.DictItemQuery;
+import com.youlai.boot.system.model.vo.DictItemOptionVO;
+import com.youlai.boot.system.model.vo.DictItemPageVO;
+import com.youlai.boot.system.model.vo.DictPageVO;
+import com.youlai.boot.system.service.DictItemService;
+import com.youlai.boot.system.service.DictService;
+import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Operation;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -34,8 +34,8 @@ import java.util.List;
/**
* 字典控制层
*
- * @author Ray.Hao
- * @since 2.9.0
+ * @author Ray Hao
+ * @since 2022/10/12
*/
@Tag(name = "06.字典接口")
@RestController
@@ -56,9 +56,6 @@ public class DictController {
sseService.broadcast(SseTopics.DICT, new DictChangeDTO(dictCode));
}
- //---------------------------------------------------
- // 字典相关接口
- //---------------------------------------------------
@Operation(summary = "字典分页列表")
@GetMapping
@Log(module = LogModuleEnum.DICT, value = ActionTypeEnum.LIST)
@@ -106,12 +103,12 @@ public class DictController {
@Log(module = LogModuleEnum.DICT, value = ActionTypeEnum.UPDATE)
public Result updateDict(
@PathVariable Long dictId,
- @RequestBody @Valid DictForm dictForm
+ @RequestBody @Valid DictForm formData
) {
- boolean status = dictService.updateDict(dictId, dictForm);
+ boolean status = dictService.updateDict(dictId, formData);
// 发送字典更新通知
- if (status && dictForm.getDictCode() != null) {
- sendDictChange(dictForm.getDictCode());
+ if (status && formData.getDictCode() != null) {
+ sendDictChange(formData.getDictCode());
}
return Result.judge(status);
}
@@ -130,20 +127,16 @@ public class DictController {
// 发送字典删除通知
for (String dictCode : dictCodes) {
- sendDictChange(dictCode);
+ sendDictChange(dictCode);
}
return Result.success();
}
-
- //---------------------------------------------------
- // 字典项相关接口
- //---------------------------------------------------
- @Operation(summary = "字典项分页列表")
+ @Operation(summary = "获取字典项分页列表")
@GetMapping("/{dictCode}/items")
- public PageResult getDictItemPage(
- @PathVariable String dictCode,
+ public PageResult getDictItemsPage(
+ @Parameter(description = "字典编码") @PathVariable String dictCode,
@Valid DictItemQuery queryParams
) {
queryParams.setDictCode(dictCode);
@@ -151,7 +144,7 @@ public class DictController {
return PageResult.success(result);
}
- @Operation(summary = "字典项列表")
+ @Operation(summary = "获取字典项列表")
@GetMapping("/{dictCode}/items/options")
public Result> getDictItems(
@Parameter(description = "字典编码") @PathVariable String dictCode
@@ -160,8 +153,18 @@ public class DictController {
return Result.success(list);
}
+ @Operation(summary = "获取字典项表单数据")
+ @GetMapping("/{dictCode}/items/{itemId}/form")
+ public Result getDictItemForm(
+ @PathVariable String dictCode,
+ @Parameter(description = "字典ID") @PathVariable Long itemId
+ ) {
+ DictItemForm formData = dictItemService.getDictItemForm(itemId);
+ return Result.success(formData);
+ }
+
@Operation(summary = "新增字典项")
- @PostMapping("/{dictCode}/items")
+ @PostMapping(value = "/{dictCode}/items")
@PreAuthorize("@ss.hasPerm('sys:dict-item:create')")
@RepeatSubmit
@Log(module = LogModuleEnum.DICT, value = ActionTypeEnum.INSERT)
@@ -174,22 +177,12 @@ public class DictController {
// 发送字典更新通知
if (result) {
- sendDictChange(dictCode);
+ sendDictChange(dictCode);
}
return Result.judge(result);
}
- @Operation(summary = "字典项表单数据")
- @GetMapping("/{dictCode}/items/{itemId}/form")
- public Result getDictItemForm(
- @PathVariable String dictCode,
- @Parameter(description = "字典项ID") @PathVariable Long itemId
- ) {
- DictItemForm formData = dictItemService.getDictItemForm(itemId);
- return Result.success(formData);
- }
-
@Operation(summary = "修改字典项")
@PutMapping("/{dictCode}/items/{itemId}")
@PreAuthorize("@ss.hasPerm('sys:dict-item:update')")
@@ -216,15 +209,13 @@ public class DictController {
@DeleteMapping("/{dictCode}/items/{itemIds}")
@PreAuthorize("@ss.hasPerm('sys:dict-item:delete')")
@Log(module = LogModuleEnum.DICT, value = ActionTypeEnum.DELETE)
- public Result deleteDictItems(
+ public Result deleteDictItemByIds(
@PathVariable String dictCode,
- @Parameter(description = "字典ID，多个以英文逗号(,)拼接") @PathVariable String itemIds
+ @Parameter(description = "字典项ID，多个以英文逗号(,)拼接") @PathVariable String itemIds
) {
dictItemService.deleteDictItemByIds(itemIds);
-
// 发送字典更新通知
sendDictChange(dictCode);
-
return Result.success();
}
diff --git a/src/main/java/com/youlai/boot/system/controller/MenuController.java b/src/main/java/com/youlai/boot/system/controller/MenuController.java
index bdfd55da..11c1e344 100644
--- a/src/main/java/com/youlai/boot/system/controller/MenuController.java
+++ b/src/main/java/com/youlai/boot/system/controller/MenuController.java
@@ -6,8 +6,10 @@ import com.youlai.boot.common.enums.ActionTypeEnum;
import com.youlai.boot.common.enums.LogModuleEnum;
import com.youlai.boot.common.model.Option;
import com.youlai.boot.common.result.Result;
+import com.youlai.boot.system.model.form.MenuAiFillForm;
import com.youlai.boot.system.model.form.MenuForm;
import com.youlai.boot.system.model.query.MenuQuery;
+import com.youlai.boot.system.model.vo.MenuAiVO;
import com.youlai.boot.system.model.vo.MenuVO;
import com.youlai.boot.system.model.vo.RouteVO;
import com.youlai.boot.system.service.MenuService;
@@ -48,11 +50,8 @@ public class MenuController {
@Operation(summary = "菜单下拉列表")
@GetMapping("/options")
public Result>> getMenuOptions(
- @Parameter(description = "是否只查询父级菜单")
- @RequestParam(required = false, defaultValue = "false") boolean onlyParent
- ) {
- List> menus = menuService.listMenuOptions(onlyParent);
- return Result.success(menus);
+ @Parameter(description = "菜单类型，可传多个，为空查全部") @RequestParam(required = false) List types) {
+ return Result.success(menuService.listMenuOptions(types));
}
@Operation(summary = "当前用户菜单路由列表")
@@ -118,5 +117,13 @@ public class MenuController {
return Result.judge(result);
}
+ // AI 辅助：未开启 AI 时调用返回业务异常
+
+ @Operation(summary = "AI 推断菜单的访问路径与权限标识")
+ @PostMapping("/ai-fill")
+ public Result aiFillMenu(@RequestBody @Valid MenuAiFillForm form) {
+ return Result.success(menuService.aiFillMenu(form));
+ }
+
}
diff --git a/src/main/java/com/youlai/boot/system/controller/UserController.java b/src/main/java/com/youlai/boot/system/controller/UserController.java
index d3dffece..44207118 100644
--- a/src/main/java/com/youlai/boot/system/controller/UserController.java
+++ b/src/main/java/com/youlai/boot/system/controller/UserController.java
@@ -170,7 +170,8 @@ public class UserController {
response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
response.setHeader("Content-Disposition", "attachment; filename=" + URLEncoder.encode(fileName, StandardCharsets.UTF_8));
- String fileClassPath = "templates" + File.separator + "excel" + File.separator + fileName;
+ // ClassLoader 只认 / 分隔，用 File.separator 打 jar 后（Linux）会取不到资源
+ String fileClassPath = "excel/" + fileName;
InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream(fileClassPath);
try (ServletOutputStream outputStream = response.getOutputStream();
diff --git a/src/main/java/com/youlai/boot/system/converter/DictItemConverter.java b/src/main/java/com/youlai/boot/system/converter/DictItemConverter.java
index 99a354b0..81e22731 100644
--- a/src/main/java/com/youlai/boot/system/converter/DictItemConverter.java
+++ b/src/main/java/com/youlai/boot/system/converter/DictItemConverter.java
@@ -3,12 +3,9 @@ package com.youlai.boot.system.converter;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.youlai.boot.system.model.entity.DictItem;
import com.youlai.boot.system.model.form.DictItemForm;
-import com.youlai.boot.system.model.vo.DictPageVO;
-import com.youlai.boot.common.model.Option;
+import com.youlai.boot.system.model.vo.DictItemPageVO;
import org.mapstruct.Mapper;
-import java.util.List;
-
/**
* 字典项对象转换器
*
@@ -18,12 +15,9 @@ import java.util.List;
@Mapper(componentModel = "spring")
public interface DictItemConverter {
- Page toPageVo(Page page);
+ Page toPageVo(Page page);
DictItemForm toForm(DictItem entity);
- DictItem toEntity(DictItemForm formFata);
-
- Option toOption(DictItem dictItem);
- List> toOption(List dictData);
+ DictItem toEntity(DictItemForm formData);
}
diff --git a/src/main/java/com/youlai/boot/system/mapper/DictItemMapper.java b/src/main/java/com/youlai/boot/system/mapper/DictItemMapper.java
index 64bb7af5..69b877ca 100644
--- a/src/main/java/com/youlai/boot/system/mapper/DictItemMapper.java
+++ b/src/main/java/com/youlai/boot/system/mapper/DictItemMapper.java
@@ -18,10 +18,10 @@ public interface DictItemMapper extends BaseMapper {
/**
* 字典项分页列表
+ *
+ * @param page 分页参数
+ * @param queryParams 查询参数
+ * @return 字典项分页列表
*/
Page getDictItemPage(Page page, DictItemQuery queryParams);
}
-
-
-
-
diff --git a/src/main/java/com/youlai/boot/system/mapper/DictMapper.java b/src/main/java/com/youlai/boot/system/mapper/DictMapper.java
index c18b5d06..2c9a1c18 100644
--- a/src/main/java/com/youlai/boot/system/mapper/DictMapper.java
+++ b/src/main/java/com/youlai/boot/system/mapper/DictMapper.java
@@ -26,7 +26,3 @@ public interface DictMapper extends BaseMapper {
Page getDictPage(Page page, DictQuery queryParams);
}
-
-
-
-
diff --git a/src/main/java/com/youlai/boot/system/model/entity/Dict.java b/src/main/java/com/youlai/boot/system/model/entity/Dict.java
index 1085e4f2..8708c0dd 100644
--- a/src/main/java/com/youlai/boot/system/model/entity/Dict.java
+++ b/src/main/java/com/youlai/boot/system/model/entity/Dict.java
@@ -6,7 +6,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
/**
- * 字典实体
+ * 字典实体对象
*
* @author Ray.Hao
* @since 2022/12/17
@@ -39,8 +39,8 @@ public class Dict extends BaseEntity {
private String remark;
/**
- * 逻辑删除标识(0-未删除 1-已删除)
+ * 逻辑删除(1-已删除 0-未删除)
*/
private Integer isDeleted;
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/youlai/boot/system/model/entity/DictItem.java b/src/main/java/com/youlai/boot/system/model/entity/DictItem.java
index 0fc80ee2..e90c0c40 100644
--- a/src/main/java/com/youlai/boot/system/model/entity/DictItem.java
+++ b/src/main/java/com/youlai/boot/system/model/entity/DictItem.java
@@ -37,7 +37,7 @@ public class DictItem extends BaseEntity {
private Integer sort;
/**
- * 状态（1-正常，0-禁用）
+ * 状态（1-启用，0-停用）
*/
private Integer status;
@@ -64,4 +64,10 @@ public class DictItem extends BaseEntity {
*/
@TableField(fill = FieldFill.INSERT_UPDATE)
private Long updateBy;
-}
\ No newline at end of file
+
+ /**
+ * 逻辑删除(1-已删除 0-未删除)
+ */
+ private Integer isDeleted;
+
+}
diff --git a/src/main/java/com/youlai/boot/system/model/entity/Menu.java b/src/main/java/com/youlai/boot/system/model/entity/Menu.java
index 2eb8d833..890a71ff 100644
--- a/src/main/java/com/youlai/boot/system/model/entity/Menu.java
+++ b/src/main/java/com/youlai/boot/system/model/entity/Menu.java
@@ -94,11 +94,6 @@ public class Menu extends BaseEntity {
*/
private Integer keepAlive;
- /**
- * 【目录】只有一个子路由是否始终显示(1:是 0:否)
- */
- private Integer alwaysShow;
-
/**
* 路由参数
*/
diff --git a/src/main/java/com/youlai/boot/system/model/form/DictForm.java b/src/main/java/com/youlai/boot/system/model/form/DictForm.java
index b17d320a..039866da 100644
--- a/src/main/java/com/youlai/boot/system/model/form/DictForm.java
+++ b/src/main/java/com/youlai/boot/system/model/form/DictForm.java
@@ -4,12 +4,8 @@ package com.youlai.boot.system.model.form;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
import lombok.Data;
-import lombok.Getter;
-import lombok.Setter;
import org.hibernate.validator.constraints.Range;
-import java.util.List;
-
/**
* 字典表单对象
*
diff --git a/src/main/java/com/youlai/boot/system/model/form/DictItemForm.java b/src/main/java/com/youlai/boot/system/model/form/DictItemForm.java
index 472fc745..3c48101b 100644
--- a/src/main/java/com/youlai/boot/system/model/form/DictItemForm.java
+++ b/src/main/java/com/youlai/boot/system/model/form/DictItemForm.java
@@ -38,12 +38,12 @@ public class DictItemForm {
@Range(min = 0, max = 9999, message = "排序值需在 0-9999 之间")
private Integer sort;
- @Schema(description = "状态（0：禁用，1：启用）")
+ @Schema(description = "状态（1-启用，0-禁用）")
@Range(min = 0, max = 1, message = "状态取值不正确")
private Integer status;
- @Schema(description = "字典类型（用于显示样式）")
- @Size(max = 30, message = "字典类型长度不能超过 30 个字符")
+ @Schema(description = "标签样式（primary-主要 success-成功 warning-警告 danger-危险 info-信息）")
+ @Size(max = 30, message = "标签样式长度不能超过 30 个字符")
private String tagType;
}
diff --git a/src/main/java/com/youlai/boot/system/model/form/MenuAiFillForm.java b/src/main/java/com/youlai/boot/system/model/form/MenuAiFillForm.java
new file mode 100644
index 00000000..497f9c6f
--- /dev/null
+++ b/src/main/java/com/youlai/boot/system/model/form/MenuAiFillForm.java
@@ -0,0 +1,26 @@
+package com.youlai.boot.system.model.form;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+
+/**
+ * AI 推断菜单配置入参
+ *
+ * @author Ray.Hao
+ * @since 0.1.0
+ */
+@Schema(description = "AI 推断菜单配置入参")
+@Data
+public class MenuAiFillForm {
+
+ @Schema(description = "菜单名称", example = "公告管理")
+ @NotBlank(message = "菜单名称不能为空")
+ private String name;
+
+ @Schema(description = "菜单类型（C-目录 M-菜单 E-外链 B-按钮）", example = "M")
+ private String type;
+
+ @Schema(description = "上级菜单ID，用于参考同级菜单的命名风格", example = "1")
+ private Long parentId;
+}
diff --git a/src/main/java/com/youlai/boot/system/model/form/MenuForm.java b/src/main/java/com/youlai/boot/system/model/form/MenuForm.java
index 459ab708..921ee496 100644
--- a/src/main/java/com/youlai/boot/system/model/form/MenuForm.java
+++ b/src/main/java/com/youlai/boot/system/model/form/MenuForm.java
@@ -60,10 +60,13 @@ public class MenuForm {
@Schema(description = "【菜单】是否开启页面缓存", example = "1")
private Integer keepAlive;
- @Schema(description = "【目录】只有一个子路由是否始终显示", example = "1")
- private Integer alwaysShow;
-
@Schema(description = "路由参数")
private List params;
+ @Schema(description = "新增页面菜单时是否生成增删改查按钮")
+ private Boolean generateCrudButtons;
+
+ @Schema(description = "按钮权限标识前缀，如 sys:user")
+ private String buttonPermPrefix;
+
}
diff --git a/src/main/java/com/youlai/boot/system/model/vo/DictItemOptionVO.java b/src/main/java/com/youlai/boot/system/model/vo/DictItemOptionVO.java
index 3fc2742c..246b2755 100644
--- a/src/main/java/com/youlai/boot/system/model/vo/DictItemOptionVO.java
+++ b/src/main/java/com/youlai/boot/system/model/vo/DictItemOptionVO.java
@@ -21,9 +21,7 @@ public class DictItemOptionVO {
@Schema(description = "字典项标签")
private String label;
- @Schema(description = "标签类型")
+ @Schema(description = "标签样式")
private String tagType;
}
-
-
\ No newline at end of file
diff --git a/src/main/java/com/youlai/boot/system/model/vo/DictItemPageVO.java b/src/main/java/com/youlai/boot/system/model/vo/DictItemPageVO.java
index 53a1b8df..177c4ac0 100644
--- a/src/main/java/com/youlai/boot/system/model/vo/DictItemPageVO.java
+++ b/src/main/java/com/youlai/boot/system/model/vo/DictItemPageVO.java
@@ -28,12 +28,13 @@ public class DictItemPageVO {
@Schema(description = "字典值")
private String value;
+ @Schema(description = "标签样式")
+ private String tagType;
+
@Schema(description = "排序")
private Integer sort;
- @Schema(description = "状态（1:启用，0:禁用）")
+ @Schema(description = "状态（1-启用，0-停用）")
private Integer status;
}
-
-
\ No newline at end of file
diff --git a/src/main/java/com/youlai/boot/system/model/vo/DictPageVO.java b/src/main/java/com/youlai/boot/system/model/vo/DictPageVO.java
index 5185146b..a2d5454e 100644
--- a/src/main/java/com/youlai/boot/system/model/vo/DictPageVO.java
+++ b/src/main/java/com/youlai/boot/system/model/vo/DictPageVO.java
@@ -24,8 +24,6 @@ public class DictPageVO {
@Schema(description = "字典编码")
private String dictCode;
- @Schema(description = "字典状态（1-启用，0-禁用）")
+ @Schema(description = "字典状态（1-启用，0-停用）")
private Integer status;
}
-
-
\ No newline at end of file
diff --git a/src/main/java/com/youlai/boot/system/model/vo/MenuAiVO.java b/src/main/java/com/youlai/boot/system/model/vo/MenuAiVO.java
new file mode 100644
index 00000000..70bae7bb
--- /dev/null
+++ b/src/main/java/com/youlai/boot/system/model/vo/MenuAiVO.java
@@ -0,0 +1,26 @@
+package com.youlai.boot.system.model.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * AI 推断的菜单配置
+ *
+ * @author Ray.Hao
+ * @since 0.1.0
+ */
+@Schema(description = "AI 推断的菜单配置")
+@Data
+public class MenuAiVO {
+
+ @Schema(description = "访问路径")
+ private String routePath;
+
+ @Schema(description = "权限标识")
+ private String perm;
+
+ @Schema(description = "建议的图标关键词，按贴切程度排列")
+ private List iconKeywords;
+}
diff --git a/src/main/java/com/youlai/boot/system/model/vo/RouteVO.java b/src/main/java/com/youlai/boot/system/model/vo/RouteVO.java
index 121ca5df..8c32f42e 100644
--- a/src/main/java/com/youlai/boot/system/model/vo/RouteVO.java
+++ b/src/main/java/com/youlai/boot/system/model/vo/RouteVO.java
@@ -50,10 +50,6 @@ public class RouteVO {
@JsonInclude(JsonInclude.Include.NON_NULL)
private Boolean keepAlive;
- @Schema(description = "【目录】只有一个子路由是否始终显示", example = "true")
- @JsonInclude(JsonInclude.Include.NON_NULL)
- private Boolean alwaysShow;
-
@Schema(description = "外链地址(内嵌模式用)", example = "https://www.youlai.tech")
@JsonInclude(JsonInclude.Include.NON_NULL)
private String externalUrl;
diff --git a/src/main/java/com/youlai/boot/system/service/DictService.java b/src/main/java/com/youlai/boot/system/service/DictService.java
index a064deda..942098b1 100644
--- a/src/main/java/com/youlai/boot/system/service/DictService.java
+++ b/src/main/java/com/youlai/boot/system/service/DictService.java
@@ -6,7 +6,6 @@ import com.youlai.boot.common.model.Option;
import com.youlai.boot.system.model.entity.Dict;
import com.youlai.boot.system.model.form.DictForm;
import com.youlai.boot.system.model.query.DictQuery;
-import com.youlai.boot.system.model.vo.DictItemOptionVO;
import com.youlai.boot.system.model.vo.DictPageVO;
import java.util.List;
diff --git a/src/main/java/com/youlai/boot/system/service/MenuService.java b/src/main/java/com/youlai/boot/system/service/MenuService.java
index b465b6fd..287d2dee 100644
--- a/src/main/java/com/youlai/boot/system/service/MenuService.java
+++ b/src/main/java/com/youlai/boot/system/service/MenuService.java
@@ -2,10 +2,12 @@ package com.youlai.boot.system.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.youlai.boot.system.model.dto.MenuCreateDTO;
+import com.youlai.boot.system.model.form.MenuAiFillForm;
import com.youlai.boot.system.model.form.MenuForm;
import com.youlai.boot.common.model.Option;
import com.youlai.boot.system.model.entity.Menu;
import com.youlai.boot.system.model.query.MenuQuery;
+import com.youlai.boot.system.model.vo.MenuAiVO;
import com.youlai.boot.system.model.vo.MenuVO;
import com.youlai.boot.system.model.vo.RouteVO;
@@ -27,9 +29,9 @@ public interface MenuService extends IService