agentworkshop 0.7.21 → 0.7.22

package/app/composables/workshop/useDaqStream.ts

@@ -308,6 +308,15 @@ const createStore = () => {
     upsert(data.node)
   }
 
+  /** 多对多绑定:整体设定节点的绑定设备列表(服务端去重+校验) */
+  async function setNodeBindings(id: string, deviceIds: string[]): Promise<void> {
+    const data = await api<{ node: DaqNodeView }>(`/${id}/bindings`, {
+      method: 'PUT',
+      body: JSON.stringify({ deviceIds }),
+    })
+    upsert(data.node)
+  }
+
   async function testDriver(driver: string, driverConfig: Record<string, string | number | boolean>): Promise<DaqDriverTestResult> {
     const data = await api<{ test: DaqDriverTestResult }>('/test-driver', {
       method: 'POST',
@@ -422,6 +431,7 @@ const createStore = () => {
     saveTransform,
     removeNode,
     bindNode,
+    setNodeBindings,
     controllerAction,
     alarms,
     fetchAlarms,

package/app/pages/daq/[id].vue

@@ -197,9 +197,10 @@ function driverPlanned(kind: string): boolean {
 // ---------- 设备绑定 ----------
 const bindDeviceId = ref('')
 const boundDeviceName = computed(() => {
-  const id = node.value?.deviceBindingId
-  if (!id) return ''
-  return deviceTwins.twins.find(t => t.id === id)?.name ?? `${id.slice(0, 8)}…`
+  const ids = node.value?.deviceIds ?? (node.value?.deviceBindingId ? [node.value.deviceBindingId] : [])
+  return ids
+    .map(id => deviceTwins.twins.find(t => t.id === id)?.name ?? `${id.slice(0, 8)}…`)
+    .join(' / ')
 })
 function onBindToggle(): void {
   void daq.bindNode(nodeId.value, node.value?.deviceBindingId ? null : (bindDeviceId.value || null))

package/app/pages/daq/index.vue

@@ -40,17 +40,38 @@ async function setNodeLine(id: string, e: Event): Promise<void> {
   }
 }
 
-/** 节点绑定设备(bind REST server 落库;与数字孪生/节点检查器同一条 deviceBindingId 链路) */
-async function setNodeDevice(id: string, e: Event): Promise<void> {
+/** 节点绑定设备(多对多:add 挂新设备 / remove 摘除一台;server 落库,与数字孪生同一 deviceIds 链路) */
+async function addNodeDevice(id: string, e: Event): Promise<void> {
   const deviceId = (e.target as HTMLSelectElement).value
+  if (!deviceId) return
+  const node = daq.nodes.find(n => n.id === id)
+  if (!node) return
+  if (node.deviceIds?.includes(deviceId)) return
   try {
-    await daq.bindNode(id, deviceId || null)
+    await daq.setNodeBindings(id, [...(node.deviceIds ?? []), deviceId])
   }
   catch (err) {
     message.error(apiErrorMessage(err))
   }
+  ;(e.target as HTMLSelectElement).value = ''
 }
 
+async function removeNodeDevice(id: string, deviceId: string): Promise<void> {
+  const node = daq.nodes.find(n => n.id === id)
+  if (!node) return
+  try {
+    await daq.setNodeBindings(id, (node.deviceIds ?? []).filter(d => d !== deviceId))
+  }
+  catch (err) {
+    message.error(apiErrorMessage(err))
+  }
+}
+
+const nodeDeviceIds = (n: DaqNodeView): string[] =>
+  n.deviceIds ?? (n.deviceBindingId ? [n.deviceBindingId] : [])
+const deviceNameById = (id: string): string =>
+  nodeDevices.get(id) ?? deviceTwins.twins.find(t => t.id === id)?.name ?? id
+
 /** 单节点独立 启动/停止采集(PATCH enabled;server 权威,本地乐观翻转 + WS/轮询收敛) */
 async function toggleNodeEnabled(n: { id: string, enabled: boolean, state: string }): Promise<void> {
   const next = !n.enabled
@@ -295,7 +316,9 @@ function fmtPoint(v: number | null | undefined): string {
 const boundDevices = computed<Array<{ id: string, name: string, count: number }>>(() => {
   const used = new Map<string, number>()
   for (const n of daq.nodes) {
-    if (n.deviceBindingId) used.set(n.deviceBindingId, (used.get(n.deviceBindingId) ?? 0) + 1)
+    for (const d of n.deviceIds ?? (n.deviceBindingId ? [n.deviceBindingId] : [])) {
+      used.set(d, (used.get(d) ?? 0) + 1)
+    }
   }
   return deviceTwins.twins
     .filter(t => used.has(t.id))
@@ -371,7 +394,8 @@ function statePillOf(n: DaqNodeView): { key: RowState, label: string, tip: strin
 
 const filteredNodes = computed<DaqNodeView[]>(() => daq.nodes.filter((n) => {
   if (filters.lineId && (filters.lineId === 'none' ? !!n.lineId : (n.lineId ?? '') !== filters.lineId)) return false
-  if (filters.deviceId && (filters.deviceId === 'none' ? !!n.deviceBindingId : n.deviceBindingId !== filters.deviceId)) return false
+  const nodeDevIds = n.deviceIds ?? (n.deviceBindingId ? [n.deviceBindingId] : [])
+  if (filters.deviceId && (filters.deviceId === 'none' ? nodeDevIds.length > 0 : !nodeDevIds.includes(filters.deviceId))) return false
   if (filters.template && n.templateRef !== filters.template) return false
   if (filters.driver && n.driver !== filters.driver) return false
   if (!lineRunMatch(n)) return false
@@ -1771,23 +1795,39 @@ async function doReconnect(): Promise<void> {
                 >--</span>
               </td>
               <td>
-                <select
-                  class="line-sel"
-                  :value="n.deviceBindingId ?? ''"
-                  :title="$t('daq.k2bindtip137')"
-                  @change="setNodeDevice(n.id, $event)"
-                >
-                  <option value="">
-                    {{ $t('daq.k3own4q056') }}
-                  </option>
-                  <option
-                    v-for="d in bindableDeviceTwins"
-                    :key="d.id"
-                    :value="d.id"
+                <div class="dev-binds">
+                  <span
+                    v-for="did in nodeDeviceIds(n)"
+                    :key="did"
+                    class="dev-bind-chip"
+                    :title="$t('daq.k2bindtip137')"
                   >
-                    {{ nodeDevices.get(d.id) ?? d.name }}
-                  </option>
-                </select>
+                    {{ deviceNameById(did) }}
+                    <span
+                      class="dev-unbind"
+                      title="unbind"
+                      @click="removeNodeDevice(n.id, did)"
+                    >✕</span>
+                  </span>
+                  <select
+                    class="line-sel dev-add"
+                    :value="''"
+                    :title="$t('daq.k2bindtip137')"
+                    @change="addNodeDevice(n.id, $event)"
+                  >
+                    <option value="">
+                      {{ $t('daq.k3own4q056') }}
+                    </option>
+                    <option
+                      v-for="d in bindableDeviceTwins"
+                      :key="d.id"
+                      :value="d.id"
+                      :disabled="(n.deviceIds ?? []).includes(d.id)"
+                    >
+                      {{ nodeDevices.get(d.id) ?? d.name }}
+                    </option>
+                  </select>
+                </div>
               </td>
               <td class="right">
                 <button
@@ -2395,6 +2435,11 @@ tr.row-recipe-alarm td:first-child { box-shadow: inset 3px 0 0 var(--tone-danger
 .flt-search::placeholder { color: var(--ink-fainter); }
 .count { padding-bottom: 4px; font-size: 11px; color: var(--ink-faint); }
 
+.dev-binds { display: flex; flex-wrap: wrap; gap: 4px; align-items: center; }
+.dev-bind-chip { display: inline-flex; gap: 4px; align-items: center; padding: 1px 7px; font-size: 11px; color: var(--accent); background: color-mix(in srgb, var(--accent) 8%, transparent); border: 1px solid color-mix(in srgb, var(--accent) 30%, transparent); border-radius: var(--radius-chip); }
+.dev-unbind { cursor: pointer; opacity: 0.55; font-size: 10px; }
+.dev-unbind:hover { opacity: 1; color: var(--tone-danger-dot); }
+.dev-add { max-width: 130px; font-size: 11px; }
 .line-sel {
   max-width: 120px;
   padding: 3px 6px;

package/app/pages/dcw/[id].vue

@@ -25,6 +25,10 @@ void dcw.load()
 const unsubDcw = dcw.ensureWsFeed()
 onUnmounted(() => unsubDcw())
 
+const nodeDeviceNames = (n: { deviceIds?: string[], deviceBindingId?: string | null }): string =>
+  (n.deviceIds ?? (n.deviceBindingId ? [n.deviceBindingId] : []))
+    .map(id => deviceName(id))
+    .join(' / ') || '—'
 const deviceName = (id: string | null): string =>
   id ? (deviceTwins.twins.find(t => t.id === id)?.name ?? id) : t('dcwDetail.k3own4q121')
 
@@ -1341,7 +1345,7 @@ function fmtPoint(p: { value?: number, avg?: number } | undefined): string {
                   :title="$t('dcwDetail.k9r7d4e016')"
                 >· {{ n.readIntervalMs === 0 ? $t('dcwDetail.k9r7d4e022') : (n.readIntervalMs == null ? $t('dcwDetail.k9r7d4e023') : `${n.readIntervalMs}ms`) }}</small>
               </td>
-              <td>{{ deviceName(n.deviceBindingId) }}</td>
+              <td>{{ nodeDeviceNames(n) }}</td>
               <td class="right">
                 <button
                   class="mini-btn danger"

package/package.json

@@ -1,148 +1,148 @@
-{
-  "name": "agentworkshop",
-  "version": "0.7.21",
-  "type": "module",
-  "description": "AgentWorkShop 软件开发系统 - 基于 Nuxt 4 的配置驱动运行范式",
-  "license": "PolyForm-Noncommercial-1.0.0",
-  "exports": {
-    ".": {
-      "types": "./sdk/index.d.mts",
-      "default": "./sdk/index.mjs"
-    },
-    "./sdk": {
-      "types": "./sdk/index.d.mts",
-      "default": "./sdk/index.mjs"
-    },
-    "./sdk/client": {
-      "types": "./sdk/client.d.mts",
-      "default": "./sdk/client.mjs"
-    },
-    "./package.json": "./package.json"
-  },
-  "bin": {
-    "aw": "bin/aw.mjs",
-    "agentworkshop": "bin/aw.mjs"
-  },
-  "files": [
-    ".output",
-    "bin",
-    "cli",
-    "sdk",
-    "app",
-    "server",
-    "shared",
-    "i18n",
-    "public",
-    "scripts",
-    ".AgentWorkShop/prompts",
-    "config.yml",
-    "nuxt.config.ts",
-    "tsconfig.json",
-    "uno.config.ts",
-    "docker-compose.yml",
-    ".env.example",
-    "README-zh.md",
-    "docs/cli.md",
-    "docs/plugins.md",
-    "docs/sdk.md",
-    "docs/tui.md",
-    "tui"
-  ],
-  "packageManager": "pnpm@11.9.0",
-  "engines": {
-    "node": ">=23.4.0"
-  },
-  "scripts": {
-    "dev": "node bin/aw.mjs dev",
-    "build": "node bin/aw.mjs build",
-    "start": "node bin/aw.mjs start",
-    "generate": "nuxt generate",
-    "preview": "node bin/aw.mjs start",
-    "cli": "node bin/aw.mjs",
-    "tui": "node tui/aw-tui.mjs",
-    "postinstall": "node scripts/home-bootstrap.mjs",
-    "prepublishOnly": "node bin/aw.mjs build",
-    "lint": "eslint .",
-    "lint:fix": "eslint . --fix",
-    "typecheck": "nuxt typecheck",
-    "prepare": "husky",
-    "game:test": "tsx scripts/test-agent-brain.ts && tsx scripts/test-game-session.ts",
-    "test:api-live": "node scripts/api-live-e2e.mjs",
-    "game:verify": "node scripts/verify-game.mjs",
-    "game:build-assets": "node scripts/build-player-sheet.mjs",
-    "game:build-wuwa": "node scripts/build-wuwa-assets.mjs",
-    "game:build-models": "node scripts/build-character-models.mjs",
-    "game:build-world": "node scripts/build-world-map.mjs",
-    "game:build-model3d": "node scripts/build-model-3d.mjs"
-  },
-  "lint-staged": {
-    "*.{js,mjs,cjs,ts,vue}": "eslint --fix"
-  },
-  "dependencies": {
-    "@ant-design-vue/nuxt": "^1.4.6",
-    "@ant-design/icons-vue": "^7.0.1",
-    "@earendil-works/pi-tui": "^0.84.4",
-    "@fontsource-variable/fraunces": "^5.3.0",
-    "@fontsource-variable/geist": "^5.3.0",
-    "@fontsource-variable/geist-mono": "^5.3.0",
-    "@fontsource-variable/inter": "^5.3.0",
-    "@fontsource/eb-garamond": "^5.3.0",
-    "@fontsource/ibm-plex-mono": "^5.3.0",
-    "@iconify-json/tabler": "^1.2.0",
-    "@modelcontextprotocol/sdk": "^1.30.0",
-    "@nuxtjs/i18n": "^9.0.0",
-    "@pinia/nuxt": "^0.11.0",
-    "@unocss/nuxt": "^66.0.0",
-    "@unocss/preset-attributify": "^66.0.0",
-    "@unocss/preset-icons": "^66.7.5",
-    "@unocss/preset-typography": "^66.0.0",
-    "@vueuse/core": "^13.0.0",
-    "@vueuse/nuxt": "^13.0.0",
-    "@xterm/addon-fit": "^0.11.0",
-    "@xterm/xterm": "^6.0.0",
-    "ant-design-vue": "^4.2.6",
-    "axios": "^1.7.9",
-    "echarts": "^5.6.0",
-    "h3": "2.0.1-rc.26",
-    "js-yaml": "^4.1.0",
-    "minio": "^8.0.7",
-    "modbus-serial": "^8.0.25",
-    "mqtt": "^5.15.2",
-    "node-opcua": "^2.178.0",
-    "nuxt": "^4.0.0",
-    "nuxt-auth-utils": "^0.5.0",
-    "pg": "^8.23.0",
-    "phaser": "^4.0.0",
-    "pinia": "^3.0.0",
-    "pinia-plugin-persistedstate": "^4.2.0",
-    "sqlite-vec": "^0.1.9",
-    "three": "^0.185.1",
-    "unocss": "^66.0.0",
-    "unplugin-icons": "^22.0.0",
-    "vue": "^3.5.13",
-    "vue-echarts": "^7.0.3",
-    "vue-router": "^4.5.0",
-    "zod": "^3.24.1"
-  },
-  "devDependencies": {
-    "@commitlint/cli": "^19.6.1",
-    "@commitlint/config-conventional": "^19.6.0",
-    "@nuxt/eslint": "^1.0.0",
-    "@types/js-yaml": "^4.0.9",
-    "@types/node": "^26.2.0",
-    "@types/three": "^0.185.4",
-    "eslint": "^9.17.0",
-    "husky": "^9.1.7",
-    "lint-staged": "^15.3.0",
-    "pngjs": "^7.0.0",
-    "puppeteer-core": "^25.5.0",
-    "tsx": "^4.23.12",
-    "typescript": "^5.7.3",
-    "vue-tsc": "^3.3.10"
-  },
-  "pnpm": {
-    "ignoredBuiltDependencies": [
-      "@serialport/bindings-cpp"
-    ]
-  }
-}
+{
+  "name": "agentworkshop",
+  "version": "0.7.22",
+  "type": "module",
+  "description": "AgentWorkShop 软件开发系统 - 基于 Nuxt 4 的配置驱动运行范式",
+  "license": "PolyForm-Noncommercial-1.0.0",
+  "exports": {
+    ".": {
+      "types": "./sdk/index.d.mts",
+      "default": "./sdk/index.mjs"
+    },
+    "./sdk": {
+      "types": "./sdk/index.d.mts",
+      "default": "./sdk/index.mjs"
+    },
+    "./sdk/client": {
+      "types": "./sdk/client.d.mts",
+      "default": "./sdk/client.mjs"
+    },
+    "./package.json": "./package.json"
+  },
+  "bin": {
+    "aw": "bin/aw.mjs",
+    "agentworkshop": "bin/aw.mjs"
+  },
+  "files": [
+    ".output",
+    "bin",
+    "cli",
+    "sdk",
+    "app",
+    "server",
+    "shared",
+    "i18n",
+    "public",
+    "scripts",
+    ".AgentWorkShop/prompts",
+    "config.yml",
+    "nuxt.config.ts",
+    "tsconfig.json",
+    "uno.config.ts",
+    "docker-compose.yml",
+    ".env.example",
+    "README-zh.md",
+    "docs/cli.md",
+    "docs/plugins.md",
+    "docs/sdk.md",
+    "docs/tui.md",
+    "tui"
+  ],
+  "packageManager": "pnpm@11.9.0",
+  "engines": {
+    "node": ">=23.4.0"
+  },
+  "scripts": {
+    "dev": "node bin/aw.mjs dev",
+    "build": "node bin/aw.mjs build",
+    "start": "node bin/aw.mjs start",
+    "generate": "nuxt generate",
+    "preview": "node bin/aw.mjs start",
+    "cli": "node bin/aw.mjs",
+    "tui": "node tui/aw-tui.mjs",
+    "postinstall": "node scripts/home-bootstrap.mjs",
+    "prepublishOnly": "node bin/aw.mjs build",
+    "lint": "eslint .",
+    "lint:fix": "eslint . --fix",
+    "typecheck": "nuxt typecheck",
+    "prepare": "husky",
+    "game:test": "tsx scripts/test-agent-brain.ts && tsx scripts/test-game-session.ts",
+    "test:api-live": "node scripts/api-live-e2e.mjs",
+    "game:verify": "node scripts/verify-game.mjs",
+    "game:build-assets": "node scripts/build-player-sheet.mjs",
+    "game:build-wuwa": "node scripts/build-wuwa-assets.mjs",
+    "game:build-models": "node scripts/build-character-models.mjs",
+    "game:build-world": "node scripts/build-world-map.mjs",
+    "game:build-model3d": "node scripts/build-model-3d.mjs"
+  },
+  "lint-staged": {
+    "*.{js,mjs,cjs,ts,vue}": "eslint --fix"
+  },
+  "dependencies": {
+    "@ant-design-vue/nuxt": "^1.4.6",
+    "@ant-design/icons-vue": "^7.0.1",
+    "@earendil-works/pi-tui": "^0.84.4",
+    "@fontsource-variable/fraunces": "^5.3.0",
+    "@fontsource-variable/geist": "^5.3.0",
+    "@fontsource-variable/geist-mono": "^5.3.0",
+    "@fontsource-variable/inter": "^5.3.0",
+    "@fontsource/eb-garamond": "^5.3.0",
+    "@fontsource/ibm-plex-mono": "^5.3.0",
+    "@iconify-json/tabler": "^1.2.0",
+    "@modelcontextprotocol/sdk": "^1.30.0",
+    "@nuxtjs/i18n": "^9.0.0",
+    "@pinia/nuxt": "^0.11.0",
+    "@unocss/nuxt": "^66.0.0",
+    "@unocss/preset-attributify": "^66.0.0",
+    "@unocss/preset-icons": "^66.7.5",
+    "@unocss/preset-typography": "^66.0.0",
+    "@vueuse/core": "^13.0.0",
+    "@vueuse/nuxt": "^13.0.0",
+    "@xterm/addon-fit": "^0.11.0",
+    "@xterm/xterm": "^6.0.0",
+    "ant-design-vue": "^4.2.6",
+    "axios": "^1.7.9",
+    "echarts": "^5.6.0",
+    "h3": "2.0.1-rc.26",
+    "js-yaml": "^4.1.0",
+    "minio": "^8.0.7",
+    "modbus-serial": "^8.0.25",
+    "mqtt": "^5.15.2",
+    "node-opcua": "^2.178.0",
+    "nuxt": "^4.0.0",
+    "nuxt-auth-utils": "^0.5.0",
+    "pg": "^8.23.0",
+    "phaser": "^4.0.0",
+    "pinia": "^3.0.0",
+    "pinia-plugin-persistedstate": "^4.2.0",
+    "sqlite-vec": "^0.1.9",
+    "three": "^0.185.1",
+    "unocss": "^66.0.0",
+    "unplugin-icons": "^22.0.0",
+    "vue": "^3.5.13",
+    "vue-echarts": "^7.0.3",
+    "vue-router": "^4.5.0",
+    "zod": "^3.24.1"
+  },
+  "devDependencies": {
+    "@commitlint/cli": "^19.6.1",
+    "@commitlint/config-conventional": "^19.6.0",
+    "@nuxt/eslint": "^1.0.0",
+    "@types/js-yaml": "^4.0.9",
+    "@types/node": "^26.2.0",
+    "@types/three": "^0.185.4",
+    "eslint": "^9.17.0",
+    "husky": "^9.1.7",
+    "lint-staged": "^15.3.0",
+    "pngjs": "^7.0.0",
+    "puppeteer-core": "^25.5.0",
+    "tsx": "^4.23.12",
+    "typescript": "^5.7.3",
+    "vue-tsc": "^3.3.10"
+  },
+  "pnpm": {
+    "ignoredBuiltDependencies": [
+      "@serialport/bindings-cpp"
+    ]
+  }
+}

package/scripts/_dbg-device-bind-e2e.mjs

@@ -0,0 +1,129 @@
+/**
+ * 节点 ↔ 设备 多对多绑定 E2E(隔离实例 :3021)
+ *
+ * 验证:
+ *  1) legacy 单绑 POST bind {deviceId} → deviceIds=[d1](迁移语义)
+ *  2) PUT bindings [d1,d2] → 两台设备;重复设定不产生重复对
+ *  3) 数采回写:节点采样值同时出现在 d1/d2 的 telemetry(多对多回写)
+ *  4) 摘除 d2 → 仅 d1 继续回写;d2 的 telemetry 冻结在摘除时刻
+ *  5) 级联:删除 d1 → 节点 deviceIds 自动移除 d1(保留 d2)
+ *  6) dcw 同模型:PUT bindings 双设备 + legacy 兼容
+ *  7) 负向:绑定不存在的设备 404
+ * 用法:NO_PROXY='127.0.0.1,localhost' node scripts/_dbg-device-bind-e2e.mjs [base]
+ */
+const BASE = process.argv[2] ?? 'http://127.0.0.1:3021'
+const TAG = `db${Math.random().toString(36).slice(2, 6)}`
+let pass = 0
+let fail = 0
+const ok = (cond, name, extra = '') => {
+  if (cond) { pass++; console.log(`  ✓ ${name}`) }
+  else { fail++; console.log(`  ✗ ${name} ${extra}`) }
+}
+const sleep = ms => new Promise(r => setTimeout(r, ms))
+const api = async (method, path, { body, token } = {}) => {
+  const res = await fetch(`${BASE}${path}`, {
+    method,
+    headers: { 'content-type': 'application/json', ...(token ? { authorization: `Bearer ${token}` } : {}) },
+    body: body === undefined ? undefined : JSON.stringify(body),
+    signal: AbortSignal.timeout(30_000),
+  })
+  return { status: res.status, ...(await res.json().catch(() => ({}))) }
+}
+
+async function main() {
+  console.log(`━━━ 节点↔设备多对多绑定 E2E @ ${BASE} (tag=${TAG}) ━━━`)
+  const login = await api('POST', '/api/users/login', { body: { email: 'admin', password: 'admin123' } })
+  const token = login.data?.token
+  ok(Boolean(token), 'admin 登录')
+
+  // ── 夹具:2 设备 + 1 数采节点(mock)+ 1 数控节点(mock)──
+  const d1 = (await api('POST', '/api/workshop/device-twins', { body: { name: `dev1-${TAG}`, kind: 'device' }, token })).data?.twin
+  const d2 = (await api('POST', '/api/workshop/device-twins', { body: { name: `dev2-${TAG}`, kind: 'device' }, token })).data?.twin
+  ok(Boolean(d1?.id && d2?.id), '两台设备孪生创建')
+  const line = (await api('POST', '/api/workshop/dcw/lines', { body: { name: `bindline-${TAG}` }, token })).data?.line
+  const node = (await api('POST', '/api/workshop/daq', {
+    body: { name: `daq-${TAG}`, templateRef: 'temp-tc', driver: 'mock', intervalMs: 1000, min: 0, max: 200, lineId: line.id },
+    token,
+  })).data?.node
+  const dcw = (await api('POST', '/api/workshop/dcw', {
+    body: { name: `dcw-${TAG}`, templateRef: 'temp-sp', driver: 'mock', driverConfig: { key: `${TAG}` }, min: 0, max: 200, unit: '℃' },
+    token,
+  })).data?.node
+  ok(Boolean(node?.id && dcw?.id), '数采/数控节点创建')
+  // 采样门控:开跑产线(产品/配方非必需?start 需要 recipeId —— 先建最小产品+配方)
+  const product = (await api('POST', '/api/workshop/dcw/products', { body: { name: `bindprod-${TAG}`, lineId: line.id }, token })).data?.product
+  const recipe = (await api('POST', '/api/workshop/dcw/recipes', { body: { name: `bindrec-${TAG}`, productId: product.id, params: [{ nodeId: dcw.id, value: 50 }] }, token })).data?.recipe
+  const st = await api('POST', `/api/workshop/dcw/lines/${line.id}/start`, { body: { recipeId: recipe.id }, token })
+  ok(st.status === 200, '产线开跑(采样门控放行)')
+
+  const nodeById = async (id) => (await api('GET', '/api/workshop/daq', { token })).data?.nodes?.find(n => n.id === id)
+  const dcwById = async (id) => (await api('GET', '/api/workshop/dcw', { token })).data?.nodes?.find(n => n.id === id)
+  const twinById = async (id) => (await api('GET', '/api/workshop/device-twins', { token })).data?.twins?.find(t => t.id === id)
+    ?? (await api('GET', '/api/workshop/device-twins', { token })).data?.find?.(t => t.id === id)
+
+  // ── 1. legacy 单绑 ──
+  let n = (await api('POST', `/api/workshop/daq/${node.id}/bind`, { body: { deviceId: d1.id }, token })).data?.node
+  ok(Array.isArray(n?.deviceIds) && n.deviceIds.length === 1 && n.deviceIds[0] === d1.id && n.deviceBindingId === d1.id,
+    `legacy 单绑 → deviceIds=[d1](实际 ${JSON.stringify(n?.deviceIds)})`)
+
+  // ── 2. PUT bindings 双设备 + 唯一对 ──
+  n = (await api('PUT', `/api/workshop/daq/${node.id}/bindings`, { body: { deviceIds: [d1.id, d2.id, d1.id] }, token })).data?.node
+  ok(n?.deviceIds?.length === 2 && n.deviceIds.includes(d1.id) && n.deviceIds.includes(d2.id),
+    `PUT bindings 去重 → [d1,d2](实际 ${JSON.stringify(n?.deviceIds)})`)
+  n = (await api('PUT', `/api/workshop/daq/${node.id}/bindings`, { body: { deviceIds: [d1.id, d2.id] }, token })).data?.node
+  ok(n?.deviceIds?.length === 2, '重复设定仍为 2 台(无重复对)')
+
+  // ── 3. 采样回写双设备 ──
+  await sleep(6000)
+  const t1 = await twinById(d1.id)
+  const t2 = await twinById(d2.id)
+  const key1 = Object.keys(t1?.telemetry ?? {})
+  ok(key1.length > 0 && Object.keys(t2?.telemetry ?? {}).length > 0,
+    `采样回写双设备(d1 keys=${key1.join(',')} | d2 keys=${Object.keys(t2?.telemetry ?? {}).join(',')})`)
+
+  // ── 4. 摘除 d2 → 仅 d1 继续回写 ──
+  n = (await api('PUT', `/api/workshop/daq/${node.id}/bindings`, { body: { deviceIds: [d1.id] }, token })).data?.node
+  ok(n?.deviceIds?.length === 1, '摘除 d2 → deviceIds=[d1]')
+  const t2frozen = JSON.stringify((await twinById(d2.id))?.telemetry ?? {})
+  await sleep(5000)
+  const t2after = JSON.stringify((await twinById(d2.id))?.telemetry ?? {})
+  ok(t2frozen === t2after, `d2 摘除后遥测冻结(不再回写)`)
+  const t1b = JSON.stringify((await twinById(d1.id))?.telemetry ?? {})
+  await sleep(5000)
+  const t1c = JSON.stringify((await twinById(d1.id))?.telemetry ?? {})
+  ok(t1b !== t1c, 'd1 绑定保留,持续回写')
+
+  // ── 5. 级联:删除 d1 → 节点自动解绑 d1 ──
+  await api('DELETE', `/api/workshop/device-twins/${d1.id}`, { token })
+  n = await nodeById(node.id)
+  ok(Array.isArray(n?.deviceIds) && !n.deviceIds.includes(d1.id), `删除 d1 → 节点级联解绑(deviceIds=${JSON.stringify(n?.deviceIds)})`)
+
+  // ── 6. dcw 同模型 ──
+  let dcn = (await api('PUT', `/api/workshop/dcw/${dcw.id}/bindings`, { body: { deviceIds: [d2.id] }, token })).data?.node
+  ok(dcn?.deviceIds?.[0] === d2.id, '[dcw] PUT bindings 单设备')
+  dcn = (await api('POST', `/api/workshop/dcw/${dcw.id}/bind`, { body: { deviceId: null }, token })).data?.node
+  ok((dcn?.deviceIds ?? []).length === 0, '[dcw] legacy bind null → 清空')
+  dcn = (await api('PUT', `/api/workshop/dcw/${dcw.id}/bindings`, { body: { deviceIds: [d2.id] }, token })).data?.node
+  ok(dcn?.deviceIds?.length === 1, '[dcw] 恢复绑定')
+
+  // ── 7. 负向:不存在的设备 ──
+  const bad = await api('PUT', `/api/workshop/daq/${node.id}/bindings`, { body: { deviceIds: ['no-such-device'] }, token })
+  ok(bad.status === 404, `负向:不存在设备 404(实际 ${bad.status})`)
+
+  // ── 清理 ──
+  await api('POST', `/api/workshop/dcw/lines/${line.id}/stop`, { body: {}, token }).catch(() => {})
+  await api('DELETE', `/api/workshop/daq/${node.id}`, { token }).catch(() => {})
+  await api('DELETE', `/api/workshop/dcw/${dcw.id}`, { token }).catch(() => {})
+  await api('DELETE', `/api/workshop/dcw/recipes/${recipe.id}`, { token }).catch(() => {})
+  await api('DELETE', `/api/workshop/dcw/products/${product.id}`, { token }).catch(() => {})
+  await api('DELETE', `/api/workshop/dcw/lines/${line.id}`, { token }).catch(() => {})
+  await api('DELETE', `/api/workshop/device-twins/${d2.id}`, { token }).catch(() => {})
+
+  console.log(`\n━━━ DeviceBind E2E: ${pass} passed / ${fail} failed ━━━`)
+  process.exit(fail === 0 ? 0 : 1)
+}
+
+main().catch((err) => {
+  console.error('E2E 异常:', err)
+  process.exit(1)
+})

package/server/api/workshop/daq/[id]/bind.post.ts

@@ -16,7 +16,10 @@ export default defineApiHandler(async (event) => {
   const id = getRouterParam(event, 'id') ?? ''
   // 产线权限:数采设备绑定=操控能力(绑定后通道值回写设备)
   requireLineMode(user, getDaqController().byId(id)?.lineId, 'operate')
-  const body = await readBody<{ deviceId?: string | null }>(event) ?? {}
-  const node = getDaqController().bind(id, body.deviceId ?? null)
+  const body = await readBody<{ deviceId?: string | null, deviceIds?: string[] }>(event) ?? {}
+  // 两种形态:{ deviceId } 排他设置(兼容旧客户端);{ deviceIds: [...] } 整体设定多对多
+  const node = Array.isArray(body.deviceIds)
+    ? getDaqController().setDeviceBindings(id, body.deviceIds)
+    : getDaqController().bind(id, body.deviceId ?? null)
   return { node: node.toView() }
 })