Commit Graph
89 Commits
Author SHA1 Message Date
sswandClaude 038bd981fc ssw-common: BS-新30 v0.14+ AI 修复层 (dacli form create --ai fallback)
背景: jnpf-common-ai/SendAiMessage.java:148 硬编码 maxTokens=1500,
       不对 LLM 输出做 format 修复. LLM 输出经常不规范:
       - fieldOptions: ["男","女"] 字符串数组 (期望 List<{id, fullName}>)
       - 含 // 注释行 (fastjson 1.2.83 不支持, 抛 "not match : -")
       - 输出截断缺闭合 } 或 ]
       - 偶尔输出纯文字说明 (无 JSON)
       - 输出字段名用 SQL 关键字 (name/status) 触发 BS-新3 SYS128

CLAUDE.md §14 规定 jnpf 源码不能改, 所以加 ssw-common 拦截层:

ssw-common-biz 新增:
- util/JsonRepairUtil: stripMarkdownFence + extractJsonArray + stripJsonComments
  + tryCloseTruncatedJson + fixFieldOptionsStrings
- util/SswLLMClient: 从 base_ai 表读 default AI 配置 + 直调 MiniMax OpenAI 兼容 API
  (maxTokens=3000, 可注入)
- service/AIRepairService: 入口接口
- service/impl/AIRepairServiceImpl: 调 LLMClient 拿原始 → JsonRepairUtil 修复
  → 构造 VisualAiModel 兼容结构 + fixFieldKeywords 修复 SQL 关键字
  (name → nameX, status → statusX 等, 镜像 jnpf GenerateConstant.containKeyword)

ssw-common-controller 新增:
- SswAIRepairController: POST /api/ssw/ai/repair 暴露给 dacli fallback

集成: dacli form create --ai 失败时 (后端错/空 data) 自动调 SSW 修复,
       完全不动 jnpf 源码. CLAUDE.md §3.6 兼容 (ssw-common 是合规扩展点).

测试: 26 字段用户管理表 --ai prompt, jnpf 后端返回空 → SSW fallback 修复
       → 26 字段全部生成 + fieldOptions 自动转换 → form 创建+发布成功
       (id=842169175051863237).

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <[email protected]>
2026-07-02 01:00:09 +08:00
ssw fb0069179d auto(854d697c05d0): session end @ 2026-07-02T00:59:18 (+3f) 2026-07-02 00:59:19 +08:00
ssw f153891e07 auto(854d697c05d0): session end @ 2026-07-01T20:28:21 (+1f) 2026-07-01 20:28:23 +08:00
ssw a4c7353971 auto(284e8d004cbb): session end @ 2026-07-01T11:03:46 (+1f) 2026-07-01 11:03:46 +08:00
ssw 70735464fb auto(284e8d004cbb): session end @ 2026-07-01T10:48:44 (+1f) 2026-07-01 10:48:48 +08:00
ssw fa177e644a auto(284e8d004cbb): session end @ 2026-07-01T09:26:08 (+1f) 2026-07-01 09:26:11 +08:00
ssw 06bcbbece1 auto(284e8d004cbb): session end @ 2026-06-30T17:30:09 (+1f) 2026-06-30 17:30:10 +08:00
ssw 01a0706909 auto(284e8d004cbb): session end @ 2026-06-29T14:07:58 (+1f) 2026-06-29 14:07:58 +08:00
ssw 4df6852809 auto(284e8d004cbb): session end @ 2026-06-29T11:51:44 (+340f) 2026-06-29 11:51:47 +08:00
ssw 96742b242a auto(d389ca8d6886): session end @ 2026-06-27T21:58:34 (+2f) 2026-06-27 21:58:37 +08:00
sswandClaude 0e312fdd67 refactor(jxcj): 移除 ssw-jxcj 包内 app/ web/ 前端目录
背景: app/ web/ 是 dacli form codegen 输出到 ssw-jxcj 的前端代码
  - app/ = uniapp 风格 (4 文件, lowercase .vue + .js)
  - web/ = web Vue 3 (7 文件, mixed case + .ts)
  - 实际位置应在 web/uniapp 项目下, 不应放在 ssw-jxcj 后端包

移动:
- ssw-jxcj/app/* → uniapp/pages/ssw/jxcj/Announcement/ (4 文件)
- ssw-jxcj/web/* → web/apps/jnpf-web-apps-main/src/views/ssw/jxcj/Announcement/ (7 文件)
  (web/ 在 .gitignore 中, 不入仓, 后续 codegen 重新生成)

每模块 per-model 目录结构 (对齐现有 web/.../ssw/jxcj/TeamInfo/):
  uniapp/pages/ssw/jxcj/{ModelName}/
    ├── index.vue
    ├── form.vue
    ├── detail.vue
    └── columnList.js
  web/.../ssw/jxcj/{ModelName}/
    ├── index.vue
    ├── Form.vue
    ├── Detail.vue
    ├── api.ts
    ├── columnList.ts
    ├── searchList.ts
    └── superQueryJson.ts

后续: dacli form codegen 应默认不输出到 ssw-jxcj, 直接写 web/uniapp 目标位置

Co-Authored-By: Claude <[email protected]>
2026-06-24 09:36:05 +08:00
sswandClaude b3459e0475 refactor(jxcj): 重新生成 28 form 使用 PascalCase (无 appCode 前缀)
背景: 业务反馈"生成的类名没有按照 SnakCase 命名法" + "可以不用前缀比如jxcj"
  - 旧: Jxcj_develop_projectMapper / ssw.jxcj.mapper.Jxcj_develop_projectMapper
  - 新: DevelopProjectMapper / ssw.jxcj.mapper.DevelopProjectMapper

策略: 用 dacli form codegen --auto-alias 让 JNPF 直接生成 PascalCase
  - 旧: 28 mapper = Jxcj_xxxMapper (snake_case + PascalCase 前缀)
  - 新: 28 mapper = XxxMapper (纯 PascalCase, 无前缀)

变更:
- ssw-jxcj/ssw-jxcj-entity/ (168 java): Entity + Model + Constant + Json
  * e.g. Jxcj_develop_projectEntity.java → DevelopProjectEntity.java
- ssw-jxcj/ssw-jxcj-biz/ (84 java + 28 xml): Mapper + Service + ServiceImpl
  * e.g. Jxcj_develop_projectMapper.java → DevelopProjectMapper.java
- ssw-jxcj/ssw-jxcj-controller/ (28 java): Controller
  * e.g. Jxcj_develop_projectController.java → DevelopProjectController.java
- ssw-jxcj/app/ (web 前端, 重新生成)

依赖: ssw-common-biz (含 SswMapperConfig 共享 @MapperScan("ssw.**.mapper"))
  - 业务包零 MapperConfig 配置 (BS-14 集中化)

运行时验证:
- 168 + 84 + 28 = 280 java + 28 xml 编译 BUILD SUCCESS
- 3/3 jxcj visualdev/OnlineDev/{formId}/List API → HTTP 200
- 28 Mapper class 嵌进 fat-jar BOOT-INF/lib/ssw-jxcj-biz
- 诊断端点: @Autowired ssw.jxcj.mapper.AnnouncementMapper → autowired_ok: true
  (Spring 注入 PascalCase mapper 成功, SswMapperConfig 集中注册生效)

包名: ssw.jxcj.{entity|model|mapper|service|controller} (appCode 已在包名, 类名不重复)
DB 表名: jxcj_xxx (保留, @TableName 仍指向 DB 表名)
alias: 已写入 base_visual_alias 表 (dacli form codegen --auto-alias 副作用, 持久化)

Co-Authored-By: Claude <[email protected]>
2026-06-24 09:25:22 +08:00
sswandClaude e9170e4b16 refactor(ssw): 集中 MapperConfig 到 ssw-common 共享 (BS-14 v2)
背景: 2026-06-23 jxcj E2E BS-14 闭环后, 每个 ssw-{app_code} 都要自己写 MapperConfig
       仍重复且易遗漏。集中到 ssw-common 后, 业务包零配置。

修改:
- 新增 boot/ssw-common/ssw-common-biz/.../config/SswMapperConfig.java
  * @Configuration @MapperScan(basePackages = "ssw.**.mapper")
  * 一处配置覆盖所有 ssw-{app_code}/ssw-{app_code}.mapper

- 删除 boot/ssw-jxcj/.../config/JxcjMapperConfig.java
  * jxcj 不再自己写 MapperConfig

- 修改 boot/ssw-jxcj/ssw-jxcj-biz/pom.xml
  * 加 ssw-common-biz 依赖 (传递包含 SswMapperConfig)

配套已更新:
- .claude/skills/{no-spa-page,backend-dev,ssw-pack-init} 文档统一指向 ssw-common
- .claude/skills/ssw-pack-init/scripts/check_ssw_pack.py BS-14 检测改成共享版
- dacli/src/commands/_blindspot_guards.ts BS-14 guard 同改

验证:
- python3 .claude/skills/ssw-pack-init/scripts/check_ssw_pack.py jxcj
  ✓ BS-14: 共享 SswMapperConfig @MapperScan('ssw.**.mapper') + 业务包依赖 ssw-common-biz

Co-Authored-By: Claude <[email protected]>
2026-06-23 18:24:26 +08:00
ssw b55fd281da auto(09213057c521): session end @ 2026-06-23T17:49:51 (+3f) 2026-06-23 17:49:52 +08:00
ssw 61605b4fce feat(jnpf-admin): application-dev.yml 注册 jxcj 数据源 (D-16/17 终解)
用 yml 命名数据源替代 sed hack:
- spring.datasource.dynamic.datasource.jxcj 段
- 重启即装, 不需 visualdev warmup
- 与 sswportal 同架构, 平台原生
- @DS("jxcj") 名字稳定, dev/prod 一致

闭环: 28/28 ssw-jxcj controller 重启即用, 无 CannotFindDataSourceException
D-16 (sed @DS hack) 改为 D-16 (yml 注册), D-17 (warmup) 已被 D-16 解决
2026-06-23 17:49:20 +08:00
ssw afecfae187 auto(09213057c521): session end @ 2026-06-23T17:29:54 (+32f) 2026-06-23 17:29:55 +08:00
ssw d14bbe62b6 feat(jxcj): ssw-jxcj 业务包 (D-12/13/14/15/16/17 BS-51 闭环)
- ssw-jxcj/{entity,biz,controller} Maven 多模块 (28 entity + 28 mapper + 28 service + 28 controller)
- JxcjMapperConfig @MapperScan('ssw.jxcj.mapper') (BS-14)
- @DS 替换为 dbLinkId 数字 (BS-16)
- yml type-aliases-package 加 ssw.**.entity (BS-15)
- 28 张物理表 + 28 form (type=1, webType=2, 100% 已发布)
- 40 菜单 (1 顶级 + 11 模块 + 28 叶子)
- 7 角色 + 15 字典
- 5 no-spa 页面 (portal/team-wizard/jupyter/blind-review/sandbox)

BS-51/52/12/13/14/15/16/17 全部闭环, 浏览器层 28 form + 5 no-spa + 40 菜单正常工作
2026-06-23 17:25:57 +08:00
ssw bad2b441bf auto(09213057c521): session end @ 2026-06-23T17:11:37 (+1f) 2026-06-23 17:11:38 +08:00
ssw e6fbca538c auto(09213057c521): session end @ 2026-06-23T15:57:48 (+2f) 2026-06-23 15:57:49 +08:00
ssw b374a8fff6 fix(boot-template): ServiceImpMarco.vm 加 fieldAlias 空保护
JNPF 模板 ServiceImpMarco.vm 在主表字段和搜索条件拼接时, 无条件对
$Field.fieldAlias / $SearchTypeModel.afterVModel 调 substring/toUpperCase.
当 Velocity 变量未定义 (虚拟字段: searchList 但不在任何物理表) 时, 输出字面:
  ${Field.fieldAlias.substring(0,1).toUpperCase()}${Field.fieldAlias.substring(1)}
→ .java 文件含非法 Java 语法, javac 失败.

触发: searchList 字段不在 form.tables[].fields (虚拟字段), 例如 jxcj_team
8 个 searchList 字段中只有 f_team_name 在主表里, 其余 7 个触发 bug.

修改 (boot/resources/TemplateCodeVue3/PublicMacro/ServiceImpMarco.vm):
- 主表字段验证 foreach 加 #if fieldAlias 非空保护 (空时整个字段跳过)
- PaginationQuery macro 加 #if afterVModel 非空保护 (空时跳过该字段)
- 都加了详细注释

端到端验证 (developSystem/jxcj_team + workSystem xdxx/yhjs):
- jxcj_team (之前 43 errors) → 0 errors, 10 classes ✓
- workSystem xdxx (无回归) → 0 errors, 10 classes ✓
- workSystem yhjs (无回归) → 0 errors, 10 classes ✓

注: 此文件在 HEAD 中不存在 (老 commit 残留), 但 boot/resources/TemplateCodeVue3/
是 JNPF 运行时模板路径 (getLocalBasePath + getTemplateCodePathVue3).
修改对运行中 JNPF 生效. force add.
2026-06-23 14:04:16 +08:00
ssw 9e8081c661 auto(a17f98b34161): session end @ 2026-06-15T18:22:10 (+1f) 2026-06-15 18:22:11 +08:00
ssw 34d2fdc93a auto(a17f98b34161): session end @ 2026-06-15T18:21:58 (+3f) 2026-06-15 18:22:00 +08:00
ssw a2a156f904 auto(a17f98b34161): session end @ 2026-06-15T18:18:49 (+1f) 2026-06-15 18:18:56 +08:00
ssw 7bfa21f40b auto(a17f98b34161): session end @ 2026-06-15T18:17:35 (+1648f) 2026-06-15 18:18:29 +08:00
ssw 79e79fa973 auto(6f177c177d02): session end @ 2026-06-13T12:00:07 (+1f) 2026-06-13 12:00:24 +08:00
ssw 9b516219dd auto(6f177c177d02): session end @ 2026-06-12T18:18:20 (+1841f) 2026-06-12 18:18:28 +08:00
ssw 891c7d92cf v15 W2 DictConfigValidator: DictTypeConfig + DictDataConfig + 3 L2 + 4 L1 字段校验 + 20 tests (416 total tests) 2026-06-12 11:46:43 +08:00
ssw 49e445c2b2 v15 W1+ FormNegativeDemoTest: 17 form 负面用例 (L1-1~1-4 + L2-1~2-6 + SQL 注入 + 全角空格 + 对照组) (396 total tests) 2026-06-12 11:37:17 +08:00
ssw f77d252f80 v15 W1+ 负面 fuzz 测试: 8 大类 31 例 (空白/Unicode/超长/null/类型错/边界/大小写/SQL-XSS) 验证校验器真拒违规输入 (379 total tests) 2026-06-12 11:30:36 +08:00
ssw d996aaedbe v15 W1+ FormConfigValidator: bonus 加 form 验证 (4 L1 + 6 L2, 含 jnpfKey 已注册检测) + 22 tests (348 total) 2026-06-12 11:23:41 +08:00
ssw 7f1ee9361f v15 D5+D6 DmCoverageValidator: 扫 baseline/{developSystem,workSystem}/dm/*.json + Fuzz 7 规则 100% 覆盖 + 报告输出 (326 total tests) 2026-06-12 11:00:56 +08:00
ssw d6d700815f v15 D4 DmConfigValidator: DmConfig/DmField + 7 L2 规则 (字段数/主键/必填/格式/去重/decimal/说明) + 28 tests (323 total) 2026-06-12 10:49:25 +08:00
ssw 10bf91b011 v15 D3 ConfigValidator SPI: Module/Severity/ValidationError/ConfigValidator/Factory + DacliValidation 加载 validation-rules.json + 37 tests (298 total) 2026-06-12 10:43:42 +08:00
ssw 309c16c716 v15 dacli validation-rules.json: L1 正则库 14 条 + 4 module 字段绑定 2026-06-12 10:28:39 +08:00
ssw 141750cfcf v14 P0.3: ignore boot/docs/dacli/java-web-cross-ref.md (duplicate of docs repo)
速查表 docs/dacli/java-web-cross-ref.md 在 docs 仓已提交 (39aacbf),
boot/docs/dacli/ 副本仅作 backup, 不入 boot git.
2026-06-12 09:41:15 +08:00
ssw 81354eeee9 v14 P0.3: untrack scripts/*-output.json (renderKey timestamp drift noise)
v13.25 残留: 56 个 scripts/*-output.json 在 mvn test 后产生 renderKey=currentTimeMillis() 漂移,
仅 1 个字段变化 (formId 18 位时间戳), 1-by-1 行差异. 单元测试已覆盖结构断言 (FieldBuilderTest),
output.json 仅供人工 diff 查看, 不入 git.

修改:
- .gitignore: scripts/*-output.json, scripts/verify.sh
- git rm --cached 56 个 scripts/*-output.json

效果:
- 后续 mvn test 不会产生 git diff 噪声
- 56 个 timestamp drift 噪声消除
- P0.3 验收: 0 conflict marker, 仅 timestamp drift, 现已通过 untrack 解决
2026-06-12 09:39:30 +08:00
ssw 6d7b176fa2 auto(1dc9423ac708): session end @ 2026-06-12T09:23:51 (+1f) 2026-06-12 09:24:22 +08:00
ssw 216d312ae7 v13.25 速查表: docs/dacli/2/java-web-cross-ref.md (53 FieldBuilder + 6 特殊 + 5 menu builder ↔ Rxxx.vue / componentMap.ts 完整对照) 2026-06-12 09:09:02 +08:00
ssw 467ef43305 v13.25 P2 7 装饰 merge (scripts/UserSelectFieldBuilder-output.json 解决冲突) 2026-06-12 09:07:15 +08:00
ssw e71ee817a7 v13.25 P2 7 装饰 scripts/*-output.json 2026-06-12 09:05:47 +08:00
ssw ee5e243ba4 v13.25 P2 7 装饰: alert+barcode+billRule+button+card+collapse+text 0 误差 (28 新 tests, 236/236 PASS) 2026-06-12 09:04:00 +08:00
ssw fb0fe93975 v13.24 P1 11 控件 merge (scripts/UserSelectFieldBuilder-output.json 用 incoming 解决冲突) 2026-06-12 08:53:11 +08:00
ssw 76767170de v13.24 scripts/*-output.json: 11 P1 builders dump + v13.23 timestamp 漂移 2026-06-12 08:52:34 +08:00
ssw 99323b2791 v13.24 P1 11 控件: checkbox+switch+editor+treeSelect+iframe+steps+row+tab+orgRight+link+qrcode 0 误差 (44 新 tests, 208/208 PASS) 2026-06-12 08:49:33 +08:00
ssw 3c5edbdea4 v13.23 P0 7 盲点 merge: select+userSelect+groupTitle+radio+divider+tableGrid+cascader 完整字段集 (替代 v13 简化版, 28 新 tests, 164/164 PASS) 2026-06-12 08:16:22 +08:00
ssw 6cfc9d52d8 v13.23 P0 7 盲点: select+userSelect+groupTitle+radio+divider+tableGrid+cascader 完整字段集 0 误差 (替代 v13 简化版, 28 新 tests) 2026-06-12 08:13:50 +08:00
ssw 927e83bb57 Phase 3 终极 E2E 报告: 6 方案 + 6 盲点 (35-40), v14 修复浏览器层 (密码加密算法已复刻, 7 keys 已捕获, 待 router.beforeEach 字段验证) 2026-06-12 02:26:19 +08:00
ssw 07a263c251 Phase 3: polish-changes-v13.md + E2E 报告 (API+mvn test 0 误差, 浏览器层待 v14 基础设施修复) 2026-06-12 02:12:14 +08:00
ssw 2ee18a52b9 Phase 1: merge v13-f1-form 33 builders (29 FieldBuilder + 1 Column + 1 Flow + 1 System + 1 Reverse, 33 builders / 136 tests PASS, pom.xml 冲突合并) 2026-06-12 01:47:30 +08:00
ssw e5f8bad3fc Phase 2: merge v13-f2-menu 5 type menu builder (5 type 0 误差 + 139 menu 验收 + 反向调试器) 2026-06-12 01:46:38 +08:00