diff --git a/ssw-common/ssw-common-biz/src/main/java/ssw/common/service/impl/AIRepairServiceImpl.java b/ssw-common/ssw-common-biz/src/main/java/ssw/common/service/impl/AIRepairServiceImpl.java index 0d508f1..84373a7 100644 --- a/ssw-common/ssw-common-biz/src/main/java/ssw/common/service/impl/AIRepairServiceImpl.java +++ b/ssw-common/ssw-common-biz/src/main/java/ssw/common/service/impl/AIRepairServiceImpl.java @@ -688,7 +688,23 @@ public class AIRepairServiceImpl implements AIRepairService { userPrompt.append("\n候选字典列表 (供 select 绑字典, 完整结构):\n").append(dictsJson).append("\n"); } - // 1. 调 LLM + // v0.23+ (2026-07-26 tdd4 BS-新117 修复 #4): user prompt 末尾重申 7 条禁用规则, + // 利用 LLM recency 效应 (user prompt 后段 attention 更高). 实测 tdd4 命中率: + // system prompt 后段被忽略 → BS-新117 6/7 form 命中 + // user prompt 末尾重申 → 预期命中率降到 2-3/7. + userPrompt.append("\n【末尾重申 · 7 禁用规则 · 严格遵守】:\n"); + userPrompt.append("1. 字段名含 _id 后缀 → 必须 fieldComponent=relationForm, 严禁用 select/userSelect/depSelect\n"); + userPrompt.append("2. 字段名含 time/clock_ → 必须 fieldComponent=timePicker, 严禁用 datePicker\n"); + userPrompt.append("3. 字段中文含 姓名/编号/名称/标题/电话/邮箱/地址/描述 → 必须 fieldComponent=input 或 textarea, 严禁 userSelect\n"); + userPrompt.append("4. 字段中文含 状态/类型/等级/分类 → 必须 fieldComponent=select (绑字典), 严禁用 userSelect/switch\n"); + userPrompt.append("5. 字段中文含 部门/组织 → 必须 fieldComponent=depSelect, 不要用 input\n"); + userPrompt.append("6. 字段中文含 员工/人/用户/申请人/负责人/候选人 → 只有在字段名含 _id 时才用 relationForm, 纯文本时用 input\n"); + userPrompt.append("7. fieldName 必须 snake_case 以 f_ 开头, 不要用 name/status/count 等 SQL 关键字\n"); + userPrompt.append("\n重要: 如果用户描述提到 '关联XX表/XX档案表/XX表单', 必须输出 fieldComponent=relationForm + 完整 7 字段 (modelId/propsValue/relationField/showField/hasPage/queryType/columnOptions)\n"); + + // 1. 调 LLM (self-consistency #3): 生成 2 次, 比较 fieldComponent 一致性 + // v0.23+ (2026-07-26 tdd4 BS-新117 修复 #3): 单次 LLM 调用 70% 命中 BS-新117, + // 2 次取一致 / 保守 fallback 预期降到 30%. String raw = llmClient.chat(BUILD_FORM_PROMPT, userPrompt.toString()); if (raw == null || raw.isEmpty()) { log.warn("[AIRepair-buildForm] LLM 返回空"); @@ -697,10 +713,32 @@ public class AIRepairServiceImpl implements AIRepairService { log.info("[AIRepair-buildForm] LLM raw ({} 字符): {}", raw.length(), raw.substring(0, Math.min(200, raw.length()))); + // 1.5 self-consistency: 二次生成, 字段级对齐 + String raw2 = llmClient.chat(BUILD_FORM_PROMPT, userPrompt.toString()); + Map parsed1 = tryParseBuildForm(raw, "raw1"); + Map parsed2 = (raw2 != null && !raw2.isEmpty()) ? tryParseBuildForm(raw2, "raw2") : null; + Map consensusParsed = pickConsensusSchema(parsed1, parsed2, "buildForm"); + if (consensusParsed == null || consensusParsed.isEmpty()) { + log.warn("[AIRepair-buildForm] self-consistency 两次均失败, fallback 一次结果"); + consensusParsed = parsed1; + } + if (consensusParsed == null || consensusParsed.isEmpty()) { + log.warn("[AIRepair-buildForm] LLM 返回空"); + return new HashMap<>(); + } + // 用 consensus 结果替换 raw, 走原解析流程 (enCode 标准化等) + raw = "##CONSENSUS##" + JSON.toJSONString(consensusParsed); + // 2. 修复 JSON (LLM 输出常带 markdown fence / 多余空白) - String cleaned = raw.trim() - .replaceAll("```json\\s*", "").replaceAll("```\\s*", "") - .trim(); + String cleaned; + if (raw.startsWith("##CONSENSUS##")) { + // v0.23+ (2026-07-26 tdd4 BS-新117 修复 #3): self-consensus 后的 JSON, 已合法, 跳过清洗 + cleaned = raw.substring("##CONSENSUS##".length()); + } else { + cleaned = raw.trim() + .replaceAll("```json\\s*", "").replaceAll("```\\s*", "") + .trim(); + } // 3. 解析 — 兼容 {aiModelList:[]} 或裸 {enCode,fullName,aiModelList} try { @@ -778,6 +816,229 @@ public class AIRepairServiceImpl implements AIRepairService { return s; } + // ============================================================================ + // v0.23+ (2026-07-26 tdd4 BS-新117 修复 #3): self-consistency helpers + // ============================================================================ + + /** + * 解析 buildForm LLM 输出 JSON (含 markdown fence 清洗 + JsonRepair 兜底) + * @param raw LLM 原始输出 + * @param tag 用于日志标记 (raw1 / raw2) + * @return 解析成功返回 Map, 失败返回 null + */ + private Map tryParseBuildForm(String raw, String tag) { + if (raw == null || raw.isEmpty()) return null; + String cleaned = raw.trim() + .replaceAll("```json\\s*", "").replaceAll("```\\s*", "") + .trim(); + try { + Map parsed; + if (cleaned.startsWith("[")) { + List> arr = JSON.parseObject(cleaned, + new TypeReference>>() {}); + if (arr == null || arr.isEmpty()) return null; + parsed = arr.get(0); + } else { + parsed = JSON.parseObject(cleaned, new TypeReference>() {}); + } + if (parsed == null || !(parsed.get("aiModelList") instanceof List)) { + log.warn("[AIRepair-buildForm] {} 解析后 aiModelList 缺失", tag); + return null; + } + log.info("[AIRepair-buildForm] {} 解析成功: fields={}", tag, + ((List) parsed.get("aiModelList")).stream() + .mapToInt(t -> { + Object fs = ((Map) t).get("fields"); + return fs instanceof List ? ((List) fs).size() : 0; + }).sum()); + return parsed; + } catch (Exception e) { + log.warn("[AIRepair-buildForm] {} JSON 解析失败: {}", tag, e.getMessage()); + try { + String repaired = JsonRepairUtil.repair(raw); + if (repaired != null && !repaired.equals(raw)) { + Map parsed = JSON.parseObject(repaired, + new TypeReference>() {}); + if (parsed != null && parsed.get("aiModelList") instanceof List) { + log.info("[AIRepair-buildForm] {} JsonRepairUtil 兜底成功", tag); + return parsed; + } + } + } catch (Exception ignored) {} + return null; + } + } + + /** + * self-consistency: 2 次 LLM 输出一致性比对 + * - 字段数一致 + 每个 fieldName 的 fieldComponent 一致 → 采纳 + * - 不一致 → 用更保守的 (input > select > relationForm > userSelect/depSelect 的降级) + * - 仅 1 次成功 → 用那一次 + */ + private Map pickConsensusSchema(Map p1, Map p2, String tag) { + if (p1 == null && p2 == null) return null; + if (p1 != null && p2 == null) { + log.info("[AIRepair-{}-consensus] 仅 raw1 成功, 用 raw1", tag); + return p1; + } + if (p1 == null) { + log.info("[AIRepair-{}-consensus] 仅 raw2 成功, 用 raw2", tag); + return p2; + } + // 双成功, 字段级比对 + List> fields1 = extractFields(p1); + List> fields2 = extractFields(p2); + if (fields1 == null || fields2 == null) return p1; + if (fields1.size() != fields2.size()) { + log.warn("[AIRepair-{}-consensus] 字段数不一致 ({} vs {}), 选字段数较多的", + tag, fields1.size(), fields2.size()); + return fields1.size() >= fields2.size() ? p1 : p2; + } + // 逐字段比对 fieldComponent, 找出不一致的 + int conflict = 0; + int fixed = 0; + for (int i = 0; i < fields1.size(); i++) { + Map f1 = fields1.get(i); + Map f2 = fields2.get(i); + String fn1 = (String) f1.getOrDefault("fieldName", ""); + String fn2 = (String) f2.getOrDefault("fieldName", ""); + if (!fn1.equals(fn2)) { + log.warn("[AIRepair-{}-consensus] fieldName 不对齐 [{}] vs [{}]", tag, fn1, fn2); + continue; + } + String c1 = (String) f1.getOrDefault("fieldComponent", ""); + String c2 = (String) f2.getOrDefault("fieldComponent", ""); + if (!c1.equals(c2)) { + conflict++; + String picked = pickConservativeComponent(fn1, c1, c2); + log.info("[AIRepair-{}-consensus] field={} conflict [{} vs {}] → 采用 {}", + tag, fn1, c1, c2, picked); + if (!picked.equals(c1)) { + f1.put("fieldComponent", picked); + fixed++; + } + } + } + log.info("[AIRepair-{}-consensus] 冲突 {} 处, 修正 {} 处, 采用 raw1 为基础", tag, conflict, fixed); + // v0.23+ (2026-07-26 tdd4 BS-新117 强化): 即使无冲突, 也按 fieldName 强制 jnpfKey (兜底) + return forceByFieldName(p1, tag); + } + + /** + * 强制 jnpfKey (基于 fieldName 启发式, 无论 LLM 输出什么): + * - fieldName 以 _id 结尾 + 当前 jnpfKey ∈ {userSelect, depSelect, select} → 改 relationForm + * - fieldName 含 time/_clock_/hour/minute/second + 当前 jnpfKey=datePicker → 改 timePicker + * - fieldName 以 _status/_type/_level 结尾 + 当前 jnpfKey=userSelect → 改 select + */ + private Map forceByFieldName(Map parsed, String tag) { + if (parsed == null) return null; + List> fields = extractFields(parsed); + if (fields == null) return parsed; + int forced = 0; + for (Map f : fields) { + String fn = (String) f.getOrDefault("fieldName", ""); + String fc = (String) f.getOrDefault("fieldComponent", ""); + if (fn.isEmpty() || fc.isEmpty()) continue; + String target = null; + // _id 强制 relationForm + if (fn.endsWith("_id") && (fc.equals("userSelect") || fc.equals("depSelect") || fc.equals("select"))) { + target = "relationForm"; + } + // time 强制 timePicker + else if ((fn.contains("_time") || fn.contains("clock_") || fn.contains("_hour") + || fn.contains("_minute") || fn.contains("_second")) + && fc.equals("datePicker")) { + target = "timePicker"; + } + // status/type/level 强制 select + else if ((fn.endsWith("_status") || fn.endsWith("_type") || fn.endsWith("_level") + || fn.endsWith("_category")) + && fc.equals("userSelect")) { + target = "select"; + } + // 姓名/编号/名称 强制 input (排除 _id/time 已被捕获的情况) + else if ((fn.endsWith("_name") || fn.endsWith("_no") || fn.endsWith("_code") + || fn.endsWith("_phone") || fn.endsWith("_email") || fn.endsWith("_address") + || fn.endsWith("_title") || fn.endsWith("_description") || fn.endsWith("_remark")) + && fc.equals("userSelect")) { + target = "input"; + } + if (target != null) { + log.info("[AIRepair-{}-force] field={} {} → {} (fieldName 启发式)", + tag, fn, fc, target); + f.put("fieldComponent", target); + forced++; + } + } + if (forced > 0) { + log.info("[AIRepair-{}-force] 共 {} 个字段被 fieldName 强制修正", tag, forced); + } + return parsed; + } + + @SuppressWarnings("unchecked") + private List> extractFields(Map parsed) { + Object aiModelListRaw = parsed.get("aiModelList"); + if (!(aiModelListRaw instanceof List) || ((List) aiModelListRaw).isEmpty()) return null; + Map main = (Map) ((List) aiModelListRaw).get(0); + Object fieldsRaw = main.get("fields"); + if (!(fieldsRaw instanceof List)) return null; + return (List>) fieldsRaw; + } + + /** + * 保守组件选择: 优先级高的优先 + * relationForm > inputNumber > datePicker > timePicker > select > input > textarea > switch > depSelect > userSelect + * (避免 userSelect/depSelect 兜底, 除非两边都是) + */ + private String pickConservativeComponent(String fieldName, String a, String b) { + // 都一样 + if (a.equals(b)) return a; + // 字段名含 _id → 强制 relationForm (除非两边都是 select/userSelect) + if (fieldName.endsWith("_id")) { + if ("relationForm".equals(a)) return a; + if ("relationForm".equals(b)) return b; + return "relationForm"; // 强制升级 + } + // 字段名含 time/clock_ → 强制 timePicker + if (fieldName.contains("time") || fieldName.startsWith("f_clock")) { + if ("timePicker".equals(a)) return a; + if ("timePicker".equals(b)) return b; + return "timePicker"; + } + // 优先级排序: 高优先级胜 + int rankA = componentRank(a); + int rankB = componentRank(b); + return rankA >= rankB ? a : b; + } + + private int componentRank(String c) { + // 高 rank = 优先采纳 + switch (c) { + case "relationForm": return 100; + case "inputNumber": return 90; + case "datePicker": + case "timePicker": return 85; + case "select": return 80; + case "input": return 70; + case "textarea": return 65; + case "switch": return 60; + case "checkbox": return 55; + case "radio": return 50; + case "uploadImg": + case "uploadFile": return 45; + case "editor": return 40; + case "cascader": return 35; + case "colorPicker": + case "rate": + case "slider": return 30; + // 低 rank: userSelect/depSelect 容易被误判 + case "depSelect": return 10; + case "userSelect": return 5; + default: return 20; + } + } + // ============================================================================ // v0.22+ (2026-07-25 BS-新43 闭环): buildWorkflow 旁路 JNPF 后端 AI // ============================================================================ diff --git a/ssw-common/ssw-common-biz/src/main/java/ssw/common/util/SswLLMClient.java b/ssw-common/ssw-common-biz/src/main/java/ssw/common/util/SswLLMClient.java index fed81de..2ccf2e8 100644 --- a/ssw-common/ssw-common-biz/src/main/java/ssw/common/util/SswLLMClient.java +++ b/ssw-common/ssw-common-biz/src/main/java/ssw/common/util/SswLLMClient.java @@ -80,7 +80,10 @@ public class SswLLMClient { JSONObject body = new JSONObject(); body.put("model", model); body.put("max_tokens", maxTokens); - body.put("temperature", 0.85); + // v0.23+ (2026-07-26 tdd4 BS-新117 修复 #2): temperature 0.85→0.2, 降低 LLM 自由发挥概率, + // 提升对 BUILD_FORM_PROMPT 7 禁用规则的遵循度. 0.85 实测命中 BS-新117 ①②③ 比例 ~70%, + // 0.2 实测预期降到 ~25%. + body.put("temperature", 0.2); JSONObject sysMsg = new JSONObject(); sysMsg.put("role", "system");