FINDING-S3: 旧版只 log.warn 不强制, 跟 BS-56 suggestedAlias 思路脱节 - 用户传 --table=MirrorProduct (CamelCase) - 旧版只 warning, 继续发请求 → backend 'table doesn't exist' - 用户再调一次才知道改 lowercase, 缺自动 fallback 修复: - 警告 + 自动 lowercase (替代旧版仅 warn) - finalTable 替代 cleanTable 用作后续 API body - 跨平台说明保留 (Linux default 0 / macOS default 2 / Windows default 1) 跟 jyzs 2026-07-02 实战一致, 跟 BS-56 suggestedAlias 思路对齐 审计: dacli/docs/cmd-review/v0.14-rollout-audit-2026-07-02.md §5.1 S3
246 lines
14 KiB
TypeScript
246 lines
14 KiB
TypeScript
/**
|
|
* commands/dm/create.ts — 创建物理表
|
|
*
|
|
* API: POST /api/system/DataModel/{linkId}/Table
|
|
*
|
|
* 注意: tables[].fields[] 必须含 autoIncrement/identity/columnName 等
|
|
* 见 prompt §6.3 "Database exception"
|
|
*/
|
|
import { Command } from 'commander'
|
|
import { JnpfClient } from '../../core/client.ts'
|
|
import { installAiHelpHook } from '../../core/help.ts'
|
|
import { log, printJson } from '../../core/log.ts'
|
|
import { preCheckDmCreate, handlePreCheckResult, loadContextSafe } from '../_precheck.ts'
|
|
import { runGuards, handleGuardResult } from '../_blindspot_guards.ts'
|
|
import { loadAppContext } from '../app/context.ts'
|
|
import { initWebapi, loadDataModel } from '../../webapi/dataModel.ts'
|
|
import { validateDmCreate, type DmFieldLite } from './_validate.ts'
|
|
import { enhanceFromBackend, formatErrorLine } from '../_error_codes.ts'
|
|
|
|
interface CreateOpts {
|
|
table: string
|
|
tableName: string
|
|
dbLinkId?: string
|
|
fields: string
|
|
/** 2026-06-25 tdd9 BS-55: 显式不去 appCode 前缀 (默认 true = 去掉, 跟 form create 逻辑一致) */
|
|
stripAppCode?: boolean
|
|
json?: boolean
|
|
}
|
|
|
|
export function buildDmCreateCommand(): Command {
|
|
const cmd = new Command('create')
|
|
.description('★ 建物理表 (高级: 独立物理表管理工具, 不是 form create 的前置; AI 快速建表单不需要先跑这个; 9 系统列自动补)')
|
|
.requiredOption('--table <name>', '表名 (snake_case)')
|
|
.requiredOption('--tableName <cn>', '表中文名')
|
|
.requiredOption('--fields <json>', '字段定义 JSON 数组')
|
|
.option('--dbLinkId <id>', '业务库 id (默认从 token.dbLinkId)')
|
|
.option('--strip-app-code [val]', '自动去 appCode 前缀 (默认 true; --no-strip-app-code 保留前缀, BS-55 修复)', v => v !== 'false')
|
|
.option('--json', '原始 JSON 输出', false)
|
|
.action(async (opts: CreateOpts) => {
|
|
const c = await JnpfClient.fromToken()
|
|
// BS-48 fix: '--dbLinkId=default' 字面量 → token.dbLinkId (与 web formDesign Form.vue 一致)
|
|
const dbLinkId = c.resolveDbLinkId(opts.dbLinkId)
|
|
|
|
const userFields = JSON.parse(opts.fields) as Record<string, unknown>[]
|
|
|
|
// CLAUDE.md §3: 表名 snake_case 无前缀 — 自动去 appCode 前缀 (jxcj_announcement → announcement)
|
|
// 已存在老表带前缀也允许 (向后兼容); 新建表推荐无前缀
|
|
// ⚠ 2026-06-25 tdd9 BS-55: form create 用 cleanTable 找物理表, dm 必须用同样的 cleanTable 名
|
|
const appCode = c.appCode
|
|
const stripAppCode = opts.stripAppCode ?? true
|
|
const cleanTable = (stripAppCode && opts.table.startsWith(`${appCode}_`))
|
|
? opts.table.slice(appCode.length + 1)
|
|
: opts.table
|
|
if (cleanTable !== opts.table) {
|
|
log.info(`📌 CLAUDE.md §3: 自动去 appCode 前缀: '${opts.table}' → '${cleanTable}'`)
|
|
log.info(` (包名 ssw.${appCode}.entity 已带 appCode, 表名不重复)`)
|
|
}
|
|
// 同步去字段前缀 (f_xxx 不动, 系统列不动; 只去 appCode 前缀的字段)
|
|
const cleanFields = userFields.map(f => {
|
|
const fieldName = String(f.field || '')
|
|
if (fieldName.startsWith(`${appCode}_`)) {
|
|
const newField = fieldName.slice(appCode.length + 1)
|
|
log.info(` 字段同步去前缀: ${fieldName} → ${newField}`)
|
|
return { ...f, field: newField }
|
|
}
|
|
return f
|
|
})
|
|
|
|
// BS-111 (jyzs 2026-07-02): MySQL lower_case_table_names=2 大小写警告
|
|
// jyzs 实战: mirrorProduct/mirrorDemand CamelCase 表名 → backend INSERT 用 lowercase, 报 "table doesn't exist"
|
|
// v0.15+ (P2-7): 警告 + 自动 lowercase (替代旧版仅 warn, 让用户自己改)
|
|
// 跨 Linux+macOS+Windows MySQL 兼容 (跟 jyzs 实战一致)
|
|
let finalTable = cleanTable
|
|
if (/[A-Z]/.test(cleanTable)) {
|
|
const lower = cleanTable.toLowerCase()
|
|
log.warn(`BS-111: 表名 "${cleanTable}" 含大写字母, 自动转 lowercase: "${lower}"`)
|
|
log.warn(` 原因: MySQL lower_case_table_names=2 时, backend INSERT 用 lowercase 表名`)
|
|
log.warn(` 跨平台: Linux (default 0, 区分大小写) / macOS (default 2, 不区分) / Windows (default 1, 全部 lowercase)`)
|
|
finalTable = lower
|
|
}
|
|
|
|
// v0.11d+ step machine 校验 (镜像 web dataModel/Form.vue handleSubmit L210-242 + 后端 DbTableController checkName L92-112)
|
|
// 在发 API 前暴露问题, 聚合错误, AI 不用试错
|
|
runDmStepMachine(c, dbLinkId, { table: finalTable, tableName: opts.tableName, fields: cleanFields as DmFieldLite[] })
|
|
|
|
// P1.2: dm create pre-check (dbLinkId / 表重复)
|
|
// 失败时 exit 2, 不进入 API 调用; 警告不阻断
|
|
handlePreCheckResult(
|
|
'dm create',
|
|
await preCheckDmCreate(c, {
|
|
table: finalTable,
|
|
dbLinkId,
|
|
}),
|
|
)
|
|
|
|
// P3.1: 第二层防御 — blindspot guard (BS-1/5/8/15b/38/42/46/48 等)
|
|
// - ERROR → exit 2 (与 pre-check 一致)
|
|
// - WARN → 仅打印, 不阻断
|
|
// - context 加载失败时跳过 (容错)
|
|
const guardCtx = await loadContextSafe(c)
|
|
if (guardCtx.warning) log.warn(guardCtx.warning)
|
|
handleGuardResult('dm create', runGuards(guardCtx.ctx, {
|
|
table: finalTable,
|
|
dbLinkId,
|
|
fields: cleanFields,
|
|
}, 'dm create'))
|
|
|
|
// D-5 (盲点 38 防御): 用户字段含 f_description 会被系统自动加的 text 列冲突
|
|
// 系统会自动注入 f_description (text) 作为"描述"列, 用户不应自己再传
|
|
const userFieldNames = cleanFields.map((f) => String(f.field || ''))
|
|
if (userFieldNames.includes('f_description')) {
|
|
log.warn('⚠️ D-5 检测: 用户字段含 f_description, 这与系统自动注入的 "描述(text)" 列冲突!')
|
|
log.warn(' 建议: 把 f_description 改名 (如 f_desc), 或移除 (系统已含默认 text 描述列)')
|
|
log.warn(' 继续执行会报 "Duplicate column name \'f_description\'" (盲点 38)')
|
|
}
|
|
|
|
// 强制补全 schema 必填项 (autoIncrement/identity/columnName/index/primaryKey)
|
|
const fields = cleanFields.map((f) => ({
|
|
autoIncrement: 0,
|
|
identity: 0,
|
|
primaryKey: 0,
|
|
columnName: f.field,
|
|
...f,
|
|
}))
|
|
// v10.6+ JNPF runtime 要求 9 系统列 (硬编码 SQL 引用) + 复合主键
|
|
const sysCols = [
|
|
{ field: 'f_id', fieldName: '主键', dataType: 'varchar', dataLength: '50', primaryKey: 1, allowNull: 0, autoIncrement: 0, identity: 0, columnName: 'f_id' },
|
|
{ field: 'f_tenant_id', fieldName: '租户id', dataType: 'varchar', dataLength: '50', primaryKey: 1, allowNull: 0, autoIncrement: 0, identity: 0, columnName: 'f_tenant_id' },
|
|
{ field: 'f_flow_task_id', fieldName: '流程任务ID', dataType: 'varchar', dataLength: '50', primaryKey: 0, allowNull: 1, autoIncrement: 0, identity: 0, columnName: 'f_flow_task_id' },
|
|
{ field: 'f_flow_id', fieldName: '流程ID', dataType: 'varchar', dataLength: '50', primaryKey: 0, allowNull: 1, autoIncrement: 0, identity: 0, columnName: 'f_flow_id' },
|
|
{ field: 'f_flow_state', fieldName: '流程状态', dataType: 'int', dataLength: '0', primaryKey: 0, allowNull: 1, autoIncrement: 0, identity: 0, columnName: 'f_flow_state' },
|
|
{ field: 'f_sort_code', fieldName: '排序', dataType: 'bigint', dataLength: '0', primaryKey: 0, allowNull: 1, autoIncrement: 0, identity: 0, columnName: 'f_sort_code' },
|
|
{ field: 'f_create_user', fieldName: '创建人', dataType: 'varchar', dataLength: '50', primaryKey: 0, allowNull: 1, autoIncrement: 0, identity: 0, columnName: 'f_create_user' },
|
|
{ field: 'f_create_time', fieldName: '创建时间', dataType: 'datetime', dataLength: '0', primaryKey: 0, allowNull: 1, autoIncrement: 0, identity: 0, columnName: 'f_create_time' },
|
|
{ field: 'f_modify_user', fieldName: '修改人', dataType: 'varchar', dataLength: '50', primaryKey: 0, allowNull: 1, autoIncrement: 0, identity: 0, columnName: 'f_modify_user' },
|
|
{ field: 'f_modify_time', fieldName: '修改时间', dataType: 'datetime', dataLength: '0', primaryKey: 0, allowNull: 1, autoIncrement: 0, identity: 0, columnName: 'f_modify_time' },
|
|
{ field: 'f_description', fieldName: '描述', dataType: 'text', dataLength: '0', primaryKey: 0, allowNull: 1, autoIncrement: 0, identity: 0, columnName: 'f_description' },
|
|
]
|
|
const allFields = [...fields, ...sysCols]
|
|
// JNPF dmpost body 结构: { tableInfo:{...}, tableFieldList:[...] }
|
|
const body = {
|
|
tableInfo: {
|
|
table: finalTable,
|
|
tableName: opts.tableName,
|
|
newTable: finalTable,
|
|
},
|
|
tableFieldList: allFields,
|
|
}
|
|
log.info(`loadDataModel.createDataModel table=${finalTable} fields=${allFields.length} (含9系统列)`)
|
|
// v0.11+ Phase 2: 改用 webapi (loadDataModel.createDataModel)
|
|
// 注: webapi 路径下不再用 callWithDiagnosis (走 defHttp shim), 错误仍捕获显示
|
|
await initWebapi(c)
|
|
const r = (await loadDataModel.createDataModel(dbLinkId, body)) as { code?: number; msg?: string; table?: string; data?: unknown }
|
|
if (r.code !== 200 && r.code !== undefined) {
|
|
// D-5 (盲点 38 防御): 友好提示 f_description 冲突
|
|
const errMsg = r.msg || ''
|
|
if (errMsg.includes("Duplicate column name 'f_description'")) {
|
|
log.error(`建表失败 (code=${r.code}): ${r.msg}`)
|
|
log.error('')
|
|
log.error(' 💡 这是盲点 38 已知问题: f_description 已被系统自动注入为 "描述(text)" 列')
|
|
log.error(' 解决方法: 移除 --fields 里的 f_description, 或改名为 f_desc')
|
|
log.error(' 详见 docs/tds/summary.html §3 盲点 38')
|
|
} else {
|
|
log.error(`建表失败 (code=${r.code}): ${r.msg}`)
|
|
// v0.11e+ Phase A1: 后端错误增强 — 自动从 msg 提取 ErrorCode
|
|
const enhanced = enhanceFromBackend(errMsg, 'table', { entity: 'dm' })
|
|
log.error(` ${formatErrorLine(enhanced, { step: 2, stepName: '后端API' })}`)
|
|
}
|
|
if (opts.json) printJson(r)
|
|
process.exit(1)
|
|
}
|
|
log.ok(`建表成功: ${finalTable}`)
|
|
if (opts.json) printJson(r.data)
|
|
})
|
|
|
|
installAiHelpHook(cmd, {
|
|
purpose: '在指定业务库建物理表. fields JSON 必含 field/fieldName/dataType/dataLength. v0.11d+ 加 step machine 校验 (3 step 镜像 web dataModel/Form.vue + 后端 DbTableController.checkName, 聚合错误, AI 不用去浏览器试错)',
|
|
required: { '--table': '表名', '--tableName': '中文名', '--fields': '字段 JSON' },
|
|
optional: { '--dbLinkId': '业务库 id' },
|
|
example: `dacli dm create --table=test_table --tableName="测试表" --fields='[{"field":"f_name","fieldName":"名称","dataType":"varchar","dataLength":"100","allowNull":0,"primaryKey":1}]'`,
|
|
source: { api: 'POST /api/system/DataModel/{dbLinkId}/Table', ref: 'web/views/dataCenter/dataModel/Form.vue (后端: jnpf/.../DbTableController.java:262-280)' },
|
|
notes: [
|
|
'v0.11d+ step machine (镜像 web dataModel/Form.vue handleSubmit + 后端 DbTableController.checkName):',
|
|
' step 0 基础信息: table 正则 + tableName 必填 (镜像 Form.vue:50 正则 + L57 tableName)',
|
|
' step 1 字段定义: 字段数 ≥ 1 + 至少 1 个 primaryKey + field 正则 + dataType 白名单 + decimal dataLength 格式 + 字段不重复 + fieldName 必填 (镜像 Form.vue:174-209 exist() + L213/L215-216)',
|
|
' step 2 关键字+唯一性: Java/SQL 关键字 + 表名重复 (镜像后端 checkName L92-112 + EXIST001)',
|
|
'autoIncrement/identity/columnName 已自动补全 (11 系统列: 9 核心 + f_description + f_modify_user)',
|
|
'建表前确认 dbLinkId 对应业务库',
|
|
],
|
|
})
|
|
return cmd
|
|
}
|
|
|
|
/**
|
|
* v0.11d+ step machine 校验 (3 步镜像 web dataModel/Form.vue + 后端 DbTableController.checkName)
|
|
* 在发 API 前暴露问题, 聚合错误一次报
|
|
*
|
|
* 镜像原型:
|
|
* - web dataModel/Form.vue:42-61 schemas (newTable 正则 + tableName 必填)
|
|
* - web dataModel/Form.vue:174-209 exist() (字段级 7 项校验)
|
|
* - web dataModel/Form.vue:210-242 handleSubmit (≥1 字段 + ≥1 主键)
|
|
* - jnpf DbTableController.java:92-112 checkName (Java+SQL 关键字)
|
|
* - jnpf DbTableController.java:262-280 create (3 重返回码 SU001/EXIST001/DB019)
|
|
*/
|
|
async function runDmStepMachine(
|
|
c: JnpfClient,
|
|
dbLinkId: string,
|
|
opts: { table: string; tableName: string; fields: DmFieldLite[] },
|
|
): Promise<void> {
|
|
// 拉已存在表名 (供 step 2 唯一性预校验, 容错: 拉失败跳过)
|
|
let existingTables: string[] = []
|
|
try {
|
|
const r = await c.get<{ data?: { list?: Array<{ table: string }> } | Array<{ table: string }> }>(
|
|
`/system/DataModel/${dbLinkId}/TableAll`,
|
|
)
|
|
const data = r.data
|
|
if (Array.isArray(data)) {
|
|
existingTables = data.map((t) => t.table).filter(Boolean)
|
|
} else if (data && Array.isArray((data as { list?: unknown }).list)) {
|
|
existingTables = ((data as { list: Array<{ table: string }> }).list || []).map((t) => t.table).filter(Boolean)
|
|
}
|
|
} catch {
|
|
// 拉表列表失败不阻断 (step 2 跳过查重)
|
|
}
|
|
|
|
const result = validateDmCreate({
|
|
table: opts.table,
|
|
tableName: opts.tableName,
|
|
fields: opts.fields,
|
|
existingTables,
|
|
})
|
|
|
|
if (!result.ok) {
|
|
const allErrors = result.steps.flatMap((s) =>
|
|
s.errors.map((e) => ({ step: s.step, stepName: s.stepName, ...e })),
|
|
)
|
|
log.error(`✗ step machine 校验失败 (${allErrors.length} 个错误):`)
|
|
for (const e of allErrors) {
|
|
log.error(` [step ${e.step} ${e.stepName}] ${e.field || '?'}: ${e.message}`)
|
|
}
|
|
process.exit(1)
|
|
}
|
|
|
|
log.info(`✓ step machine 校验通过 (3/3): table=${opts.table}, fields=${opts.fields.length}`)
|
|
}
|