From ff94ff28fe77b441766808d2e4a8863d3d8984b3 Mon Sep 17 00:00:00 2001 From: weijuesen Date: Thu, 13 Aug 2026 22:18:35 +0800 Subject: [PATCH 01/18] =?UTF-8?q?feat:=20=E5=BB=BA=E7=AB=8B=E6=95=B4?= =?UTF-8?q?=E6=94=B9=20Task=201=20=E5=A4=9A=E7=AB=AF=E8=B4=A8=E9=87=8F?= =?UTF-8?q?=E5=9F=BA=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + ai-service/README.md | 8 + app/.eslintrc.js | 7 + app/package-lock.json | 3566 ++++++++++++++++-- app/package.json | 6 +- app/src/components/MiniChart.tsx | 2 +- app/src/navigation/AppNavigator.tsx | 4 +- app/src/screens/AlertsScreen.tsx | 5 +- app/src/screens/DeviceControlScreen.tsx | 5 +- app/src/screens/DevicesScreen.tsx | 3 +- app/src/screens/RoomDetailScreen.tsx | 3 +- app/src/screens/RoomsScreen.tsx | 4 +- app/src/screens/SettingsScreen.tsx | 2 - app/src/screens/VideoPlayerScreen.tsx | 2 +- app/src/screens/VideoScreen.tsx | 4 +- miniapp/package.json | 1 + miniapp/src/app.tsx | 2 +- miniapp/src/pages/alerts/index.tsx | 2 +- miniapp/src/pages/dashboard/index.tsx | 4 +- miniapp/src/pages/devices/control/index.tsx | 4 +- miniapp/src/pages/knowledge/detail/index.tsx | 2 +- miniapp/src/pages/lamp/index.tsx | 11 +- miniapp/src/pages/notification/index.tsx | 1 + miniapp/src/pages/video/player/index.tsx | 6 +- miniapp/tsconfig.json | 1 + scripts/verify.ps1 | 94 + 开发交接记录.md | 35 + 27 files changed, 3470 insertions(+), 315 deletions(-) create mode 100644 app/.eslintrc.js create mode 100644 scripts/verify.ps1 diff --git a/.gitignore b/.gitignore index 4c11052..2af4184 100644 --- a/.gitignore +++ b/.gitignore @@ -26,6 +26,7 @@ __pycache__/ /wvp/*.sh *.sh *.ps1 +!scripts/verify.ps1 *.py *.sql # ai-service（Python 推理服务）文件例外 diff --git a/ai-service/README.md b/ai-service/README.md index 837293c..2fa0bbc 100644 --- a/ai-service/README.md +++ b/ai-service/README.md @@ -17,6 +17,14 @@ python -m venv .venv MODEL_MODE=mock .venv/Scripts/python -m uvicorn app.main:app --host 0.0.0.0 --port 8000 ``` +## 质量检查 + +仓库根目录的 `scripts/verify.ps1` 会使用 `ai-service/.venv/Scripts/python.exe` 运行 pytest；如果该虚拟环境不存在，会回退到 `python`。 + +```powershell +powershell -ExecutionPolicy Bypass -File scripts/verify.ps1 +``` + ## 环境变量 | 变量 | 默认 | 说明 | diff --git a/app/.eslintrc.js b/app/.eslintrc.js new file mode 100644 index 0000000..6f62e77 --- /dev/null +++ b/app/.eslintrc.js @@ -0,0 +1,7 @@ +module.exports = { + root: true, + extends: '@react-native', + rules: { + 'prettier/prettier': 'warn', + }, +}; diff --git a/app/package-lock.json b/app/package-lock.json index 69d7e2e..155cef2 100644 --- a/app/package-lock.json +++ b/app/package-lock.json @@ -15,14 +15,13 @@ "@react-navigation/native-stack": "^6.10.0", "axios": "^1.7.2", "dayjs": "^1.11.11", - "react": "18.3.1", + "react": "18.2.0", "react-native": "0.74.5", "react-native-paper": "^5.12.3", "react-native-safe-area-context": "^4.10.5", "react-native-screens": "^3.32.0", "react-native-vector-icons": "^10.1.0", "react-native-video": "^6.2.0", - "victory-native": "^41.6.0", "zustand": "^4.5.4" }, "devDependencies": { @@ -30,9 +29,12 @@ "@babel/preset-env": "^7.25.3", "@babel/runtime": "^7.25.0", "@react-native/babel-preset": "0.74.85", + "@react-native/eslint-config": "0.74.85", "@react-native/metro-config": "^0.74.85", "@react-native/typescript-config": "0.74.85", "@types/react": "^18.3.3", + "eslint": "^8.57.1", + "prettier": "^2.8.8", "react-native-dotenv": "^3.4.11", "typescript": "^5.5.4" } @@ -90,6 +92,25 @@ "url": "https://opencollective.com/babel" } }, + "node_modules/@babel/eslint-parser": { + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.29.7.tgz", + "integrity": "sha512-zxt+UJTOMKvUt3yOg+D58MLuz334pHp93qifMFcjIIO+9hN6t+ufw2gi7vDPMpxvfnHRR+3VVXvIjineCcgyXw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@nicolo-ribaudo/eslint-scope-5-internals": "5.1.1-v1", + "eslint-visitor-keys": "^2.1.0", + "semver": "^6.3.1" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || >=14.0.0" + }, + "peerDependencies": { + "@babel/core": "^7.11.0", + "eslint": "^7.5.0 || ^8.0.0 || ^9.0.0" + } + }, "node_modules/@babel/generator": { "version": "7.29.7", "resolved": "https://registry.npmmirror.com/@babel/generator/-/generator-7.29.7.tgz", @@ -393,7 +414,6 @@ "version": "7.29.7", "resolved": "https://registry.npmmirror.com/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.29.7.tgz", "integrity": "sha512-j8SrR0zLZrRsC09DlszEx8FpMiwukKffYXMK0d5LmOglO7vGG6sz/BR/20yHqWH+Lnn31JTt2PE3hIWNgM2J6w==", - "dev": true, "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.29.7", @@ -410,7 +430,6 @@ "version": "7.29.7", "resolved": "https://registry.npmmirror.com/@babel/plugin-bugfix-safari-class-field-initializer-scope/-/plugin-bugfix-safari-class-field-initializer-scope-7.29.7.tgz", "integrity": "sha512-r8j8escF+U2FUHo0KOhPUdMzUO+jp9fInva6+ACVAF3Y97Ev+5iNZwiqTghmzNeWwDkOPlYuTcfb1vDaoZKmAQ==", - "dev": true, "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.29.7" @@ -426,7 +445,6 @@ "version": "7.29.7", "resolved": "https://registry.npmmirror.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.29.7.tgz", "integrity": "sha512-GE1TFSiuFeGsCxmYXZl8HwoPrVlwe4rHPFE8weieGKZqnDORK+Ar3vgWMgW+AOxQ6/2TgLSKx9p6W7O4rC6qgQ==", - "dev": true, "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.29.7" @@ -442,7 +460,6 @@ "version": "7.29.7", "resolved": "https://registry.npmmirror.com/@babel/plugin-bugfix-safari-rest-destructuring-rhs-array/-/plugin-bugfix-safari-rest-destructuring-rhs-array-7.29.7.tgz", "integrity": "sha512-oBNVCvnO5tND+xSopWvV8WNGfpTfgP4Zr/YXXSj8zfmcPktp5Ku/aZlsIowgSD4fjmgHn6sGmB9APVsU5zOdhA==", - "dev": true, "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.29.7", @@ -459,7 +476,6 @@ "version": "7.29.7", "resolved": "https://registry.npmmirror.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.29.7.tgz", "integrity": "sha512-QQt9qKHZ2sg/kivaLr7lnQr8HVrQDdBNSfCsTjiDxRuX/K5ORyKq+Bu8Xr0cDE3Dfkv0cw28Ve0EKyKMvulkOw==", - "dev": true, "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.29.7", @@ -477,7 +493,6 @@ "version": "7.29.7", "resolved": "https://registry.npmmirror.com/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.29.7.tgz", "integrity": "sha512-pn6QacGLgvCcwc+syUhKE/qSjV2D1IHDB84RNxWYSt1mW3K/SCtjinZ2p0cETJxAWBjPy3K/1lHwG5BjjPxNlw==", - "dev": true, "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.29.7", @@ -651,7 +666,6 @@ "version": "7.21.0-placeholder-for-preset-env.2", "resolved": "https://registry.npmmirror.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz", "integrity": "sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==", - "dev": true, "license": "MIT", "engines": { "node": ">=6.9.0" @@ -718,7 +732,6 @@ "version": "7.29.7", "resolved": "https://registry.npmmirror.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.29.7.tgz", "integrity": "sha512-/An1OCBN93thpBAGyfsK2pcf0jvju1SAtKkL2Ny++B5Sy6sqgzXDQH1cZxWbF96Wuk+bn41MDA9bLd4VVAw6rw==", - "dev": true, "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.29.7" @@ -734,7 +747,6 @@ "version": "7.29.7", "resolved": "https://registry.npmmirror.com/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.29.7.tgz", "integrity": "sha512-zGYcYfq/WmZ4V+kBIXQon9dSSc8ircGZqw9ZaNhhGj9nZkeBu1jHLBDQqYYi5WA9uawvA2sIMbry2nCFhf5Djg==", - "dev": true, "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.29.7" @@ -852,7 +864,6 @@ "version": "7.18.6", "resolved": "https://registry.npmmirror.com/@babel/plugin-syntax-unicode-sets-regex/-/plugin-syntax-unicode-sets-regex-7.18.6.tgz", "integrity": "sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg==", - "dev": true, "license": "MIT", "dependencies": { "@babel/helper-create-regexp-features-plugin": "^7.18.6", @@ -884,7 +895,6 @@ "version": "7.29.7", "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.29.7.tgz", "integrity": "sha512-d98gXZkgswvkyohMBABkhm3GeXhYj8psWfwQ2C7gtfrKGTykQa/iOIi+JJhwMjPlZ6Vm2XN+DCf3Es1EoG4ZLA==", - "dev": true, "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.29.7", @@ -919,7 +929,6 @@ "version": "7.29.7", "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.29.7.tgz", "integrity": "sha512-cUSmjh72N+rN4PrkFlN1dJwNCwjVp5d38/CQrEsFggkD10UiFlBFgdH3tv5dNsLuHY+3S8db2xCHjhZcv5WgvA==", - "dev": true, "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.29.7" @@ -950,7 +959,6 @@ "version": "7.29.7", "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.29.7.tgz", "integrity": "sha512-GtcpjFvanPfzNQi3eTitsCqtRRmmqzpy/A+yhTR1HaZo1Ly3EA8ZXxlPyHdR8/IuRMYc3E4wdGBewB2QKQjAaA==", - "dev": true, "license": "MIT", "dependencies": { "@babel/helper-create-class-features-plugin": "^7.29.7", @@ -967,7 +975,6 @@ "version": "7.29.7", "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.29.7.tgz", "integrity": "sha512-kibJgmEdX2iMwsHY2tSZNDgj8PwIlCQz7FK9KuGKO8zsuoUwSEhoNnNVp/emKWrbY4HeO6kkXfdMqRKKKXBm2A==", - "dev": true, "license": "MIT", "dependencies": { "@babel/helper-create-class-features-plugin": "^7.29.7", @@ -1036,7 +1043,6 @@ "version": "7.29.7", "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.29.7.tgz", "integrity": "sha512-3qc18hsD2RdZiyJNDNc7HQpv6xbncwh8FYtxNFFzclSyh/trPD9KkVR9BDECUjDLvb7yJVF15GfYUuC+LMkkiQ==", - "dev": true, "license": "MIT", "dependencies": { "@babel/helper-create-regexp-features-plugin": "^7.29.7", @@ -1053,7 +1059,6 @@ "version": "7.29.7", "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.29.7.tgz", "integrity": "sha512-6IvRRriEMqnBwD6chtxdLpMYCHWEzN+oL5cyQtjykya19UgzbmKhxmhZgKC/LHxS2nYr9Q/qYPZ5Lr6jOL9+yQ==", - "dev": true, "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.29.7" @@ -1069,7 +1074,6 @@ "version": "7.29.7", "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-duplicate-named-capturing-groups-regex/-/plugin-transform-duplicate-named-capturing-groups-regex-7.29.7.tgz", "integrity": "sha512-2wiIyo2BjtgU7HufSeDnL9L2O7zr8jmhFKuSr65VpRkUiRKRNpb0mdlk56+XPPKoIrfHqzbMuglDvZun0RISsA==", - "dev": true, "license": "MIT", "dependencies": { "@babel/helper-create-regexp-features-plugin": "^7.29.7", @@ -1086,7 +1090,6 @@ "version": "7.29.7", "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.29.7.tgz", "integrity": "sha512-giOlEm/EFjfjr+te9NsdjkUo2v4f8rS/SXPumRVHAtbNcyNlvtREkU1dZzaIDclNpnaVhlCqRdFKhJBjBikzLg==", - "dev": true, "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.29.7" @@ -1102,7 +1105,6 @@ "version": "7.29.7", "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-explicit-resource-management/-/plugin-transform-explicit-resource-management-7.29.7.tgz", "integrity": "sha512-Rstj7coNz8sE+7Ju7ihpHLI564lsK5pUpNNlvptCIC/16E/S5hbl6n3kESPKdNRmqEWlpn5xpS5Q2dvXBsySLw==", - "dev": true, "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.29.7", @@ -1119,7 +1121,6 @@ "version": "7.29.7", "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.29.7.tgz", "integrity": "sha512-zFpMOTLZBdW5LfObqcSbL6kefg4R4eLdmvS0wbN9M6D5Mym/sKm9toOoWyVOa+xDjvCnuWcHls2YonXwHvH3CQ==", - "dev": true, "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.29.7" @@ -1135,7 +1136,6 @@ "version": "7.29.7", "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.29.7.tgz", "integrity": "sha512-24B2nOy2TeJSMheqwPD4DDQOV/elLSIlKxjZt4i05H5AgdPdWR3n18HnNrcJ+j76WJd9gbwb9jPjNYUy6RautA==", - "dev": true, "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.29.7" @@ -1167,7 +1167,6 @@ "version": "7.29.7", "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.29.7.tgz", "integrity": "sha512-zeSIHh0+E1Um1WJRXCFlHQYu2ieJNdivLLjlBEp+dIBu3S51n+SZZmIXjxnItw6pz56Cn+KvK68BIBVsxq2JiQ==", - "dev": true, "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.29.7", @@ -1201,7 +1200,6 @@ "version": "7.29.7", "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.29.7.tgz", "integrity": "sha512-RRnE2+eon1rJAq8MnoF1b5kTpY1vU88twHcvcKMrsqP/jxIRqDVs9iJB5fqPuqyeFAW0wJo4MlUIPpQCq/aRsg==", - "dev": true, "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.29.7" @@ -1232,7 +1230,6 @@ "version": "7.29.7", "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.29.7.tgz", "integrity": "sha512-A0H91hh6W8MFRkp5TqJmMr39jzGD1A1E1Ysiv2O06Sfbhkapm+XyIzxWCEh5kqwOZ1/8QZ0dY3SeQ7XBqfJd5Q==", - "dev": true, "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.29.7" @@ -1248,7 +1245,6 @@ "version": "7.29.7", "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.29.7.tgz", "integrity": "sha512-hl1kwFZCCiDyfH25Xmco9jTrkPgnS9pmOzSG7W5I4SaGbLeqKv417hcU2RKmaxoPEgsoJh7ZPOrnPGq99bHoUg==", - "dev": true, "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.29.7" @@ -1264,7 +1260,6 @@ "version": "7.29.7", "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.29.7.tgz", "integrity": "sha512-fxtQoH3m5ywUSIfaH0FGCzWu4McsYon5bD3K4XnskC7f+OyQMj7rsOMi4NvvmJ83WwBAg4UCe+ov4VZlqEvyew==", - "dev": true, "license": "MIT", "dependencies": { "@babel/helper-module-transforms": "^7.29.7", @@ -1297,7 +1292,6 @@ "version": "7.29.7", "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.29.7.tgz", "integrity": "sha512-TM2ZcQLoG2/y4HODiStCo10DibYhWhGWAwVv+EQKmG/7GFl0N+AAmUiXOMKM+aiJ9XBJ9AHVZBvTzMnJ2sM3cQ==", - "dev": true, "license": "MIT", "dependencies": { "@babel/helper-module-transforms": "^7.29.7", @@ -1316,7 +1310,6 @@ "version": "7.29.7", "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.29.7.tgz", "integrity": "sha512-B4UkaTK3QpgCwJnrxKfMPKdo92CN7OKXAlpAAnM3UPu0Q0lCCk57ylA9AJbRy2v8dDKOPAAWcoR6CMyeoHwRCA==", - "dev": true, "license": "MIT", "dependencies": { "@babel/helper-module-transforms": "^7.29.7", @@ -1349,7 +1342,6 @@ "version": "7.29.7", "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.29.7.tgz", "integrity": "sha512-fEo41GmsOUhOBlw8ioo6zvjX5Xc2Lqkzlyfqbpsk3eB6TReV18uhxZ0esfEokVbY2+PVJAQHNKxER6lGrzNd3A==", - "dev": true, "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.29.7" @@ -1365,7 +1357,6 @@ "version": "7.29.7", "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.29.7.tgz", "integrity": "sha512-idmp1dFaekP9GbcMvG24Kvw2BfhFZjHnNJCkV4WuIY4PskJzwI3f1N5OdgYke38T7rftO6ERulFRn2cFeZwRkg==", - "dev": true, "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.29.7" @@ -1381,7 +1372,6 @@ "version": "7.29.7", "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.29.7.tgz", "integrity": "sha512-zR7fv/z14OjgHl4AgRtkDBvBMhIzCxqV/qN/2BCRC7LjFwvuzjYe7gDWxC4Wl/SNsLM6SE1IWvRPYMgSJaUvNw==", - "dev": true, "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.29.7" @@ -1397,7 +1387,6 @@ "version": "7.29.7", "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.29.7.tgz", "integrity": "sha512-Ld98jn4c0smUywL57m7SgsHq3OpThOa6LqZJif3G6jYOovPleoFhVrBJ1WegRApSFB2wu4+RelAj9AC9G08Z4A==", - "dev": true, "license": "MIT", "dependencies": { "@babel/helper-compilation-targets": "^7.29.7", @@ -1417,7 +1406,6 @@ "version": "7.29.7", "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.29.7.tgz", "integrity": "sha512-Ea/diGcw0twB5IlZPO5sgET6fJsLJqPABqTuFWIR+iMPGPZJkATEIWx0wa+aEQ5UY1CBQyP/gkAiLEqn1vBiQA==", - "dev": true, "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.29.7", @@ -1434,7 +1422,6 @@ "version": "7.29.7", "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.29.7.tgz", "integrity": "sha512-sLsyndxK2VwX6yNUOakMb7Sh553ZTe/vVM1XJ+9Z5aW1ytsc8xOIwmyk05NNjN60vkc5/KqoTH6hB4V41LJhng==", - "dev": true, "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.29.7" @@ -1450,7 +1437,6 @@ "version": "7.29.7", "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.29.7.tgz", "integrity": "sha512-6GM1dhvK3gNODkXcEcMCOLEDCLSoZ/sBbro2Ax8HURyasQ4NshagQixkRFdh5niI6E4gmA/jYI/4aT7rRos3ZQ==", - "dev": true, "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.29.7", @@ -1515,7 +1501,6 @@ "version": "7.29.7", "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.29.7.tgz", "integrity": "sha512-bOMRLQuI0A5ZqHq3OWJ89/rXpJ/NJrbVhXiP4zwPGMs6kpcVsuTUNjwoE30K0Qm3mf48a/TnRYYD6vPNqcg6jA==", - "dev": true, "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.29.7" @@ -1595,7 +1580,6 @@ "version": "7.29.7", "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.29.7.tgz", "integrity": "sha512-rNNFV0DBAJp988xW2DOntfDoYn1eR8GGF5AT5vYc+rjyfaQkM242c9tZUHHPe7KYaiJizXPWhQTzzdbXySyhBw==", - "dev": true, "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.29.7" @@ -1611,7 +1595,6 @@ "version": "7.29.7", "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-regexp-modifiers/-/plugin-transform-regexp-modifiers-7.29.7.tgz", "integrity": "sha512-mB5Fs0VWrJ42ZCmc8114v60qetdaUVNkj9PmSZRmanCZM3S9hm0CFRLjRmYIsuXav14l2jvZ+4T8iiCGnhj3nQ==", - "dev": true, "license": "MIT", "dependencies": { "@babel/helper-create-regexp-features-plugin": "^7.29.7", @@ -1628,7 +1611,6 @@ "version": "7.29.7", "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.29.7.tgz", "integrity": "sha512-5+YhdpVgmfSmwZyLMftfaiffLRMHjzIRHFHHLdibcSyJm2pasMrKHrO3Ptrt2DRshjvpgjEJJ1zVW14WPq/6QA==", - "dev": true, "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.29.7" @@ -1723,7 +1705,6 @@ "version": "7.29.7", "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.29.7.tgz", "integrity": "sha512-NCSEJ4sLFU2gqAub45HYh4fus2yQ36rr6ei6vpU7NdoJqCpxvEG8E6eJpscGyXP3VHD2Ny+fSXr04k1hoUrFqA==", - "dev": true, "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.29.7" @@ -1739,7 +1720,6 @@ "version": "7.29.7", "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.29.7.tgz", "integrity": "sha512-223mNGoTkBiTEWFoK+Q6Go3tueMRclO8vxxxxquNCYuNI4jWOofFKJRRDu6SDrB8Sgo1UEGW9T4GAQ8ZyRso1A==", - "dev": true, "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.29.7" @@ -1774,7 +1754,6 @@ "version": "7.29.7", "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.29.7.tgz", "integrity": "sha512-jCfXxSjf94lf4E0hKE0AByxF6F3/pVFqRdUUNkDJhsY0m1ZKjnN6ZYyMeHNpzflxb/0q5b7t3p+BE+SLF1WOtA==", - "dev": true, "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.29.7" @@ -1790,7 +1769,6 @@ "version": "7.29.7", "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.29.7.tgz", "integrity": "sha512-OgZ+zoAJgZLUCunsTRQ5LAjOywDv5zzZ2/hQ5aMw1pGXyY2rtE8/chXYUmu3AlVHKpm10KEdG9aMwbI/K76ZGw==", - "dev": true, "license": "MIT", "dependencies": { "@babel/helper-create-regexp-features-plugin": "^7.29.7", @@ -1823,7 +1801,6 @@ "version": "7.29.7", "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.29.7.tgz", "integrity": "sha512-BLOhLht9DOJwIxlmp91wHvkXv1lguuHS3/FwUO8HL1H0u8s4hR1gASVFyilu9iGtcTRYqjTZmlsFFeQletntEg==", - "dev": true, "license": "MIT", "dependencies": { "@babel/helper-create-regexp-features-plugin": "^7.29.7", @@ -1840,7 +1817,6 @@ "version": "7.29.7", "resolved": "https://registry.npmmirror.com/@babel/preset-env/-/preset-env-7.29.7.tgz", "integrity": "sha512-GYzX36n1nsciIb0uyH0GHwxwtNwPQIcpxSeiVLDtG/B7jB5xXgchnmL1f/jCX5o+pwnaDBtO60ONSJhEBJfxYA==", - "dev": true, "license": "MIT", "dependencies": { "@babel/compat-data": "^7.29.7", @@ -1943,7 +1919,6 @@ "version": "0.1.6-no-external-plugins", "resolved": "https://registry.npmmirror.com/@babel/preset-modules/-/preset-modules-0.1.6-no-external-plugins.tgz", "integrity": "sha512-HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA==", - "dev": true, "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.0.0", @@ -2068,6 +2043,139 @@ "node": ">=0.10.0" } }, + "node_modules/@eslint-community/eslint-utils": { + "version": "4.10.1", + "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.10.1.tgz", + "integrity": "sha512-cuadcxVFE8sDK6iWJbs8Sn0av2Nrh2QSGQhVlBW9AaAHqHwjWsZHT8LJ4hFGPh7ASBV2deFdM7H/DPjulmh8rg==", + "dev": true, + "license": "MIT", + "dependencies": { + "eslint-visitor-keys": "^3.4.3" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + }, + "peerDependencies": { + "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0" + } + }, + "node_modules/@eslint-community/eslint-utils/node_modules/eslint-visitor-keys": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", + "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/@eslint-community/regexpp": { + "version": "4.12.2", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.2.tgz", + "integrity": "sha512-EriSTlt5OC9/7SXkRSCAhfSxxoSUgBm33OH+IkwbdpgoqsSsUg7y3uh+IICI/Qg4BBWr3U2i39RpmycbxMq4ew==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^12.0.0 || ^14.0.0 || >=16.0.0" + } + }, + "node_modules/@eslint/eslintrc": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz", + "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ajv": "^6.12.4", + "debug": "^4.3.2", + "espree": "^9.6.0", + "globals": "^13.19.0", + "ignore": "^5.2.0", + "import-fresh": "^3.2.1", + "js-yaml": "^4.1.0", + "minimatch": "^3.1.2", + "strip-json-comments": "^3.1.1" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/@eslint/eslintrc/node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true, + "license": "Python-2.0" + }, + "node_modules/@eslint/eslintrc/node_modules/import-fresh": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz", + "integrity": "sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "parent-module": "^1.0.0", + "resolve-from": "^4.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/@eslint/eslintrc/node_modules/js-yaml": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.3.1.tgz", + "integrity": "sha512-CY6crGq313MX8GkwvB7tzgp99vjQxY1++5y10/BKN/GUfHqWaOGQMNZkBvqSzsZKWk/ijwHlWzzkLulsGHhjWQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/puzrin" + }, + { + "type": "github", + "url": "https://github.com/sponsors/nodeca" + } + ], + "license": "MIT", + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/@eslint/eslintrc/node_modules/resolve-from": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", + "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/@eslint/js": { + "version": "8.57.1", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.1.tgz", + "integrity": "sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + } + }, "node_modules/@hapi/hoek": { "version": "9.3.0", "resolved": "https://registry.npmmirror.com/@hapi/hoek/-/hoek-9.3.0.tgz", @@ -2083,6 +2191,44 @@ "@hapi/hoek": "^9.0.0" } }, + "node_modules/@humanwhocodes/config-array": { + "version": "0.13.0", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.13.0.tgz", + "integrity": "sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==", + "deprecated": "Use @eslint/config-array instead", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@humanwhocodes/object-schema": "^2.0.3", + "debug": "^4.3.1", + "minimatch": "^3.0.5" + }, + "engines": { + "node": ">=10.10.0" + } + }, + "node_modules/@humanwhocodes/module-importer": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", + "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=12.22" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/nzakas" + } + }, + "node_modules/@humanwhocodes/object-schema": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz", + "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==", + "deprecated": "Use @eslint/object-schema instead", + "dev": true, + "license": "BSD-3-Clause" + }, "node_modules/@isaacs/ttlcache": { "version": "1.4.1", "resolved": "https://registry.npmmirror.com/@isaacs/ttlcache/-/ttlcache-1.4.1.tgz", @@ -2220,6 +2366,16 @@ "@jridgewell/sourcemap-codec": "^1.4.14" } }, + "node_modules/@nicolo-ribaudo/eslint-scope-5-internals": { + "version": "5.1.1-v1", + "resolved": "https://registry.npmjs.org/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz", + "integrity": "sha512-54/JRvkLIzzDWshCWfuhadfrfZVPiElY8Fcgmg1HroEly/EDSszzhBAsarCux+D/kOslTRquNzuyGSmUSTTHGg==", + "dev": true, + "license": "MIT", + "dependencies": { + "eslint-scope": "5.1.1" + } + }, "node_modules/@nodelib/fs.scandir": { "version": "2.1.5", "resolved": "https://registry.npmmirror.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", @@ -2803,6 +2959,45 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/@react-native/eslint-config": { + "version": "0.74.85", + "resolved": "https://registry.npmjs.org/@react-native/eslint-config/-/eslint-config-0.74.85.tgz", + "integrity": "sha512-ylp+lFKfJAtfbb+3kqP7oBL9BMJcxBDIcX6ot16NXTkDXNGDC4YK1ViDkyZvmzTgAIlSCyq/+XZBD7xsNsVy2A==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/core": "^7.20.0", + "@babel/eslint-parser": "^7.20.0", + "@react-native/eslint-plugin": "0.74.85", + "@typescript-eslint/eslint-plugin": "^7.1.1", + "@typescript-eslint/parser": "^7.1.1", + "eslint-config-prettier": "^8.5.0", + "eslint-plugin-eslint-comments": "^3.2.0", + "eslint-plugin-ft-flow": "^2.0.1", + "eslint-plugin-jest": "^27.9.0", + "eslint-plugin-prettier": "^4.2.1", + "eslint-plugin-react": "^7.30.1", + "eslint-plugin-react-hooks": "^4.6.0", + "eslint-plugin-react-native": "^4.0.0" + }, + "engines": { + "node": ">=18" + }, + "peerDependencies": { + "eslint": ">=8", + "prettier": ">=2" + } + }, + "node_modules/@react-native/eslint-plugin": { + "version": "0.74.85", + "resolved": "https://registry.npmjs.org/@react-native/eslint-plugin/-/eslint-plugin-0.74.85.tgz", + "integrity": "sha512-FtyfgL8EOTddxm+DyjfsInqMtjmU0PWQIRdyET/uob8i6sCxS+HmBzhbtEVZUKwld2kNG1JGgdNLndcEejC81Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=18" + } + }, "node_modules/@react-native/gradle-plugin": { "version": "0.74.87", "resolved": "https://registry.npmmirror.com/@react-native/gradle-plugin/-/gradle-plugin-0.74.87.tgz", @@ -3212,6 +3407,13 @@ "@types/istanbul-lib-report": "*" } }, + "node_modules/@types/json-schema": { + "version": "7.0.15", + "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz", + "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==", + "dev": true, + "license": "MIT" + }, "node_modules/@types/node": { "version": "26.1.1", "resolved": "https://registry.npmmirror.com/@types/node/-/node-26.1.1.tgz", @@ -3234,28 +3436,26 @@ "version": "15.7.15", "resolved": "https://registry.npmmirror.com/@types/prop-types/-/prop-types-15.7.15.tgz", "integrity": "sha512-F6bEyamV9jKGAFBEmlQnesRPGOQqS2+Uwi0Em15xenOxHaf2hv6L8YCVn3rPdPJOiJfPiCnLIRyvwVaqMY3MIw==", - "dev": true, + "devOptional": true, "license": "MIT" }, "node_modules/@types/react": { "version": "18.3.31", "resolved": "https://registry.npmmirror.com/@types/react/-/react-18.3.31.tgz", "integrity": "sha512-vfEqpXTvwT91yhmwdfouStN2hSKwTvyRs8qpLfADyrq/kxDw0hZM7Wk9Ug1FELj8hIby+S/+kQCSRFF32nv2Qw==", - "dev": true, + "devOptional": true, "license": "MIT", "dependencies": { "@types/prop-types": "*", "csstype": "^3.2.2" } }, - "node_modules/@types/react-reconciler": { - "version": "0.28.9", - "resolved": "https://registry.npmmirror.com/@types/react-reconciler/-/react-reconciler-0.28.9.tgz", - "integrity": "sha512-HHM3nxyUZ3zAylX8ZEyrDNd2XZOnQ0D5XfunJF5FLQnZbHHYq4UWvW1QfelQNXv1ICNkwYhfxjwfnqivYB6bFg==", - "license": "MIT", - "peerDependencies": { - "@types/react": "*" - } + "node_modules/@types/semver": { + "version": "7.8.0", + "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.8.0.tgz", + "integrity": "sha512-1mAINjtQCXXeLkJ9ehXkwOcBpqtLxiVtKhpUf83DdRNdQKV0iXZpaHYqRr7nj+wvxuJzoAmAwXI+sCNMv1CzLQ==", + "dev": true, + "license": "MIT" }, "node_modules/@types/stack-utils": { "version": "2.0.3", @@ -3278,6 +3478,258 @@ "integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==", "license": "MIT" }, + "node_modules/@typescript-eslint/eslint-plugin": { + "version": "7.18.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.18.0.tgz", + "integrity": "sha512-94EQTWZ40mzBc42ATNIBimBEDltSJ9RQHCC8vc/PDbxi4k8dVwUAv4o98dk50M1zB+JGFxp43FP7f8+FP8R6Sw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@eslint-community/regexpp": "^4.10.0", + "@typescript-eslint/scope-manager": "7.18.0", + "@typescript-eslint/type-utils": "7.18.0", + "@typescript-eslint/utils": "7.18.0", + "@typescript-eslint/visitor-keys": "7.18.0", + "graphemer": "^1.4.0", + "ignore": "^5.3.1", + "natural-compare": "^1.4.0", + "ts-api-utils": "^1.3.0" + }, + "engines": { + "node": "^18.18.0 || >=20.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "@typescript-eslint/parser": "^7.0.0", + "eslint": "^8.56.0" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@typescript-eslint/parser": { + "version": "7.18.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.18.0.tgz", + "integrity": "sha512-4Z+L8I2OqhZV8qA132M4wNL30ypZGYOQVBfMgxDH/K5UX0PNqTu1c6za9ST5r9+tavvHiTWmBnKzpCJ/GlVFtg==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "@typescript-eslint/scope-manager": "7.18.0", + "@typescript-eslint/types": "7.18.0", + "@typescript-eslint/typescript-estree": "7.18.0", + "@typescript-eslint/visitor-keys": "7.18.0", + "debug": "^4.3.4" + }, + "engines": { + "node": "^18.18.0 || >=20.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^8.56.0" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@typescript-eslint/scope-manager": { + "version": "7.18.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.18.0.tgz", + "integrity": "sha512-jjhdIE/FPF2B7Z1uzc6i3oWKbGcHb87Qw7AWj6jmEqNOfDFbJWtjt/XfwCpvNkpGWlcJaog5vTR+VV8+w9JflA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@typescript-eslint/types": "7.18.0", + "@typescript-eslint/visitor-keys": "7.18.0" + }, + "engines": { + "node": "^18.18.0 || >=20.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@typescript-eslint/type-utils": { + "version": "7.18.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.18.0.tgz", + "integrity": "sha512-XL0FJXuCLaDuX2sYqZUUSOJ2sG5/i1AAze+axqmLnSkNEVMVYLF+cbwlB2w8D1tinFuSikHmFta+P+HOofrLeA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@typescript-eslint/typescript-estree": "7.18.0", + "@typescript-eslint/utils": "7.18.0", + "debug": "^4.3.4", + "ts-api-utils": "^1.3.0" + }, + "engines": { + "node": "^18.18.0 || >=20.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^8.56.0" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@typescript-eslint/types": { + "version": "7.18.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.18.0.tgz", + "integrity": "sha512-iZqi+Ds1y4EDYUtlOOC+aUmxnE9xS/yCigkjA7XpTKV6nCBd3Hp/PRGGmdwnfkV2ThMyYldP1wRpm/id99spTQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^18.18.0 || >=20.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@typescript-eslint/typescript-estree": { + "version": "7.18.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.18.0.tgz", + "integrity": "sha512-aP1v/BSPnnyhMHts8cf1qQ6Q1IFwwRvAQGRvBFkWlo3/lH29OXA3Pts+c10nxRxIBrDnoMqzhgdwVe5f2D6OzA==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "@typescript-eslint/types": "7.18.0", + "@typescript-eslint/visitor-keys": "7.18.0", + "debug": "^4.3.4", + "globby": "^11.1.0", + "is-glob": "^4.0.3", + "minimatch": "^9.0.4", + "semver": "^7.6.0", + "ts-api-utils": "^1.3.0" + }, + "engines": { + "node": "^18.18.0 || >=20.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.1.4.tgz", + "integrity": "sha512-hGfVzPxthbf3+2yjg/RBs60cB0FhqBS/zvdV/4wn4/BmN0bNMMHPc4V/BbFieqf1TKAGGAHnY4eSjajCl0f2Xg==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": { + "version": "9.0.9", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.9.tgz", + "integrity": "sha512-OBwBN9AL4dqmETlpS2zasx+vTeWclWzkblfZk7KTA5j3jeOONz/tRCnZomUyvNg83wL5Zv9Ss6HMJXAgL8R2Yg==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.2" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/@typescript-eslint/typescript-estree/node_modules/semver": { + "version": "7.8.5", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.5.tgz", + "integrity": "sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@typescript-eslint/utils": { + "version": "7.18.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.18.0.tgz", + "integrity": "sha512-kK0/rNa2j74XuHVcoCZxdFBMF+aq/vH83CXAOHieC+2Gis4mF8jJXT5eAfyD3K0sAxtPuwxaIOIOvhwzVDt/kw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@eslint-community/eslint-utils": "^4.4.0", + "@typescript-eslint/scope-manager": "7.18.0", + "@typescript-eslint/types": "7.18.0", + "@typescript-eslint/typescript-estree": "7.18.0" + }, + "engines": { + "node": "^18.18.0 || >=20.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^8.56.0" + } + }, + "node_modules/@typescript-eslint/visitor-keys": { + "version": "7.18.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.18.0.tgz", + "integrity": "sha512-cDF0/Gf81QpY3xYyJKDV14Zwdmid5+uuENhjH2EqFaF0ni+yAyq/LzMaIJdhNJXZI7uLzwIlA+V7oWoyn6Curg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@typescript-eslint/types": "7.18.0", + "eslint-visitor-keys": "^3.4.3" + }, + "engines": { + "node": "^18.18.0 || >=20.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", + "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/@ungap/structured-clone": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.3.3.tgz", + "integrity": "sha512-60YRaenCQcVjYEKOcG824+DRGGIQ3VKErcBoAEDJZz5bKIs2ZG+X/H9Nk+Q6EVkwJk5QNApxbrc5QtBSwtrXAg==", + "dev": true, + "license": "ISC" + }, "node_modules/abort-controller": { "version": "3.0.0", "resolved": "https://registry.npmmirror.com/abort-controller/-/abort-controller-3.0.0.tgz", @@ -3324,6 +3776,16 @@ "node": ">=0.4.0" } }, + "node_modules/acorn-jsx": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", + "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", + "dev": true, + "license": "MIT", + "peerDependencies": { + "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" + } + }, "node_modules/agent-base": { "version": "6.0.2", "resolved": "https://registry.npmmirror.com/agent-base/-/agent-base-6.0.2.tgz", @@ -3336,6 +3798,23 @@ "node": ">= 6.0.0" } }, + "node_modules/ajv": { + "version": "6.15.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.15.0.tgz", + "integrity": "sha512-fgFx7Hfoq60ytK2c7DhnF8jIvzYgOMxfugjLOSMHjLIPgenqa7S7oaagATUq99mV6IYvN2tRmC0wnTYX6iPbMw==", + "dev": true, + "license": "MIT", + "dependencies": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, "node_modules/anser": { "version": "1.4.10", "resolved": "https://registry.npmmirror.com/anser/-/anser-1.4.10.tgz", @@ -3405,6 +3884,154 @@ "sprintf-js": "~1.0.2" } }, + "node_modules/array-buffer-byte-length": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.2.tgz", + "integrity": "sha512-LHE+8BuR7RYGDKvnrmcuSq3tDcKv9OFEXQt/HpbZhY7V6h0zlUXutnAD82GiFx9rdieCMjkvtcsPqBwgUl1Iiw==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3", + "is-array-buffer": "^3.0.5" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array-includes": { + "version": "3.1.9", + "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.9.tgz", + "integrity": "sha512-FmeCCAenzH0KH381SPT5FZmiA/TmpndpcaShhfgEN9eCVjnFBqq3l1xrI42y8+PPLI6hypzou4GXw00WHmPBLQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "call-bound": "^1.0.4", + "define-properties": "^1.2.1", + "es-abstract": "^1.24.0", + "es-object-atoms": "^1.1.1", + "get-intrinsic": "^1.3.0", + "is-string": "^1.1.1", + "math-intrinsics": "^1.1.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array-union": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", + "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/array.prototype.findlast": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/array.prototype.findlast/-/array.prototype.findlast-1.2.5.tgz", + "integrity": "sha512-CVvd6FHg1Z3POpBLxO6E6zr+rSKEQ9L6rZHAaY7lLfhKsWYUBBOuMs0e9o24oopj6H+geRCX0YJ+TJLBK2eHyQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.2", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.0.0", + "es-shim-unscopables": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array.prototype.flat": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.3.tgz", + "integrity": "sha512-rwG/ja1neyLqCuGZ5YYrznA62D4mZXg0i1cIskIUKSiqF3Cje9/wXAls9B9s1Wa2fomMsIv8czB8jZcPmxCXFg==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.5", + "es-shim-unscopables": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array.prototype.flatmap": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.3.tgz", + "integrity": "sha512-Y7Wt51eKJSyi80hFrJCePGGNo5ktJCslFuboqJsbf57CCPcm5zztluPlc4/aD8sWsKvlwatezpV4U1efk8kpjg==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.5", + "es-shim-unscopables": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array.prototype.tosorted": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.4.tgz", + "integrity": "sha512-p6Fx8B7b7ZhL/gmUsAy0D15WhvDccw3mnGNbZpi3pmeJdxtWsj2jEaI4Y6oo3XiHfzuSgPwKc04MYt6KgvC/wA==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.3", + "es-errors": "^1.3.0", + "es-shim-unscopables": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/arraybuffer.prototype.slice": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.4.tgz", + "integrity": "sha512-BNoCY6SXXPQ7gF2opIP4GBE+Xw7U+pHMYKuzjgCN3GwiaIR09UUeKfheyIry77QtrCBlC0KK0q5/TER/tYh3PQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "array-buffer-byte-length": "^1.0.1", + "call-bind": "^1.0.8", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.5", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.6", + "is-array-buffer": "^3.0.4" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/asap": { "version": "2.0.6", "resolved": "https://registry.npmmirror.com/asap/-/asap-2.0.6.tgz", @@ -3432,6 +4059,16 @@ "node": ">=4" } }, + "node_modules/async-function": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/async-function/-/async-function-1.0.0.tgz", + "integrity": "sha512-hsU18Ae8CDTR6Kgu9DYf0EbCr/a5iGL0rytQDobUcdpYOKokk8LEjVphnXkDkgpi0wYVsqrXuP0bZxJaTqdgoA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, "node_modules/async-limiter": { "version": "1.0.1", "resolved": "https://registry.npmmirror.com/async-limiter/-/async-limiter-1.0.1.tgz", @@ -3444,6 +4081,22 @@ "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==", "license": "MIT" }, + "node_modules/available-typed-arrays": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz", + "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "possible-typed-array-names": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/axios": { "version": "1.18.1", "resolved": "https://registry.npmmirror.com/axios/-/axios-1.18.1.tgz", @@ -3483,7 +4136,6 @@ "version": "0.14.2", "resolved": "https://registry.npmmirror.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.14.2.tgz", "integrity": "sha512-coWpDLJ410R781Npmn/SIBZEsAetR4xVi0SxLMXPaMO4lSf1MwnkGYMtkFxew0Dn8B3/CpbpYxN0JCgg8mn67g==", - "dev": true, "license": "MIT", "dependencies": { "@babel/helper-define-polyfill-provider": "^0.6.8", @@ -3666,6 +4318,25 @@ "node": ">= 0.8" } }, + "node_modules/call-bind": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.9.tgz", + "integrity": "sha512-a/hy+pNsFUTR+Iz8TCJvXudKVLAnz/DyeSUo10I5yvFDQJBFU2s9uqQpoSrJlroHUKoKqzg+epxyP9lqFdzfBQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind-apply-helpers": "^1.0.2", + "es-define-property": "^1.0.1", + "get-intrinsic": "^1.3.0", + "set-function-length": "^1.2.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/call-bind-apply-helpers": { "version": "1.0.2", "resolved": "https://registry.npmmirror.com/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz", @@ -3679,6 +4350,23 @@ "node": ">= 0.4" } }, + "node_modules/call-bound": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz", + "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind-apply-helpers": "^1.0.2", + "get-intrinsic": "^1.3.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/caller-callsite": { "version": "2.0.0", "resolved": "https://registry.npmmirror.com/caller-callsite/-/caller-callsite-2.0.0.tgz", @@ -4085,194 +4773,61 @@ "version": "3.2.3", "resolved": "https://registry.npmmirror.com/csstype/-/csstype-3.2.3.tgz", "integrity": "sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ==", - "dev": true, + "devOptional": true, "license": "MIT" }, - "node_modules/d3-array": { - "version": "3.2.4", - "resolved": "https://registry.npmmirror.com/d3-array/-/d3-array-3.2.4.tgz", - "integrity": "sha512-tdQAmyA18i4J7wprpYq8ClcxZy3SC31QMeByyCFyRt7BVHdREQZ5lpzoe5mFEYZUWe+oq8HBvk9JjpibyEV4Jg==", - "license": "ISC", + "node_modules/data-view-buffer": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.2.tgz", + "integrity": "sha512-EmKO5V3OLXh1rtK2wgXRansaK1/mtVdTUEiEI0W8RkvgT05kfxaH29PliLnpLP73yYO6142Q72QNa8Wx/A5CqQ==", + "dev": true, + "license": "MIT", "dependencies": { - "internmap": "1 - 2" + "call-bound": "^1.0.3", + "es-errors": "^1.3.0", + "is-data-view": "^1.0.2" }, "engines": { - "node": ">=12" + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/d3-color": { - "version": "3.1.0", - "resolved": "https://registry.npmmirror.com/d3-color/-/d3-color-3.1.0.tgz", - "integrity": "sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA==", - "license": "ISC", - "engines": { - "node": ">=12" - } - }, - "node_modules/d3-dispatch": { - "version": "3.0.1", - "resolved": "https://registry.npmmirror.com/d3-dispatch/-/d3-dispatch-3.0.1.tgz", - "integrity": "sha512-rzUyPU/S7rwUflMyLc1ETDeBj0NRuHKKAcvukozwhshr6g6c5d8zh4c2gQjY2bZ0dXeGLWc1PF174P2tVvKhfg==", - "license": "ISC", - "engines": { - "node": ">=12" - } - }, - "node_modules/d3-drag": { - "version": "3.0.0", - "resolved": "https://registry.npmmirror.com/d3-drag/-/d3-drag-3.0.0.tgz", - "integrity": "sha512-pWbUJLdETVA8lQNJecMxoXfH6x+mO2UQo8rSmZ+QqxcbyA3hfeprFgIT//HW2nlHChWeIIMwS2Fq+gEARkhTkg==", - "license": "ISC", + "node_modules/data-view-byte-length": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.2.tgz", + "integrity": "sha512-tuhGbE6CfTM9+5ANGf+oQb72Ky/0+s3xKUpHvShfiz2RxMFgFPjsXuRLBVMtvMs15awe45SRb83D6wH4ew6wlQ==", + "dev": true, + "license": "MIT", "dependencies": { - "d3-dispatch": "1 - 3", - "d3-selection": "3" + "call-bound": "^1.0.3", + "es-errors": "^1.3.0", + "is-data-view": "^1.0.2" }, "engines": { - "node": ">=12" + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/inspect-js" } }, - "node_modules/d3-ease": { - "version": "3.0.1", - "resolved": "https://registry.npmmirror.com/d3-ease/-/d3-ease-3.0.1.tgz", - "integrity": "sha512-wR/XK3D3XcLIZwpbvQwQ5fK+8Ykds1ip7A2Txe0yxncXSdq1L9skcG7blcedkOX+ZcgxGAmLX1FrRGbADwzi0w==", - "license": "BSD-3-Clause", - "engines": { - "node": ">=12" - } - }, - "node_modules/d3-format": { - "version": "3.1.2", - "resolved": "https://registry.npmmirror.com/d3-format/-/d3-format-3.1.2.tgz", - "integrity": "sha512-AJDdYOdnyRDV5b6ArilzCPPwc1ejkHcoyFarqlPqT7zRYjhavcT3uSrqcMvsgh2CgoPbK3RCwyHaVyxYcP2Arg==", - "license": "ISC", - "engines": { - "node": ">=12" - } - }, - "node_modules/d3-interpolate": { - "version": "3.0.1", - "resolved": "https://registry.npmmirror.com/d3-interpolate/-/d3-interpolate-3.0.1.tgz", - "integrity": "sha512-3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g==", - "license": "ISC", + "node_modules/data-view-byte-offset": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.1.tgz", + "integrity": "sha512-BS8PfmtDGnrgYdOonGZQdLZslWIeCGFP9tpan0hi1Co2Zr2NKADsvGYA8XxuG/4UWgJ6Cjtv+YJnB6MM69QGlQ==", + "dev": true, + "license": "MIT", "dependencies": { - "d3-color": "1 - 3" + "call-bound": "^1.0.2", + "es-errors": "^1.3.0", + "is-data-view": "^1.0.1" }, "engines": { - "node": ">=12" - } - }, - "node_modules/d3-path": { - "version": "3.1.0", - "resolved": "https://registry.npmmirror.com/d3-path/-/d3-path-3.1.0.tgz", - "integrity": "sha512-p3KP5HCf/bvjBSSKuXid6Zqijx7wIfNW+J/maPs+iwR35at5JCbLUT0LzF1cnjbCHWhqzQTIN2Jpe8pRebIEFQ==", - "license": "ISC", - "engines": { - "node": ">=12" - } - }, - "node_modules/d3-scale": { - "version": "4.0.2", - "resolved": "https://registry.npmmirror.com/d3-scale/-/d3-scale-4.0.2.tgz", - "integrity": "sha512-GZW464g1SH7ag3Y7hXjf8RoUuAFIqklOAq3MRl4OaWabTFJY9PN/E1YklhXLh+OQ3fM9yS2nOkCoS+WLZ6kvxQ==", - "license": "ISC", - "dependencies": { - "d3-array": "2.10.0 - 3", - "d3-format": "1 - 3", - "d3-interpolate": "1.2.0 - 3", - "d3-time": "2.1.1 - 3", - "d3-time-format": "2 - 4" + "node": ">= 0.4" }, - "engines": { - "node": ">=12" - } - }, - "node_modules/d3-selection": { - "version": "3.0.0", - "resolved": "https://registry.npmmirror.com/d3-selection/-/d3-selection-3.0.0.tgz", - "integrity": "sha512-fmTRWbNMmsmWq6xJV8D19U/gw/bwrHfNXxrIN+HfZgnzqTHp9jOmKMhsTUjXOJnZOdZY9Q28y4yebKzqDKlxlQ==", - "license": "ISC", - "engines": { - "node": ">=12" - } - }, - "node_modules/d3-shape": { - "version": "3.2.0", - "resolved": "https://registry.npmmirror.com/d3-shape/-/d3-shape-3.2.0.tgz", - "integrity": "sha512-SaLBuwGm3MOViRq2ABk3eLoxwZELpH6zhl3FbAoJ7Vm1gofKx6El1Ib5z23NUEhF9AsGl7y+dzLe5Cw2AArGTA==", - "license": "ISC", - "dependencies": { - "d3-path": "^3.1.0" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/d3-time": { - "version": "3.1.0", - "resolved": "https://registry.npmmirror.com/d3-time/-/d3-time-3.1.0.tgz", - "integrity": "sha512-VqKjzBLejbSMT4IgbmVgDjpkYrNWUYJnbCGo874u7MMKIWsILRX+OpX/gTk8MqjpT1A/c6HY2dCA77ZN0lkQ2Q==", - "license": "ISC", - "dependencies": { - "d3-array": "2 - 3" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/d3-time-format": { - "version": "4.1.0", - "resolved": "https://registry.npmmirror.com/d3-time-format/-/d3-time-format-4.1.0.tgz", - "integrity": "sha512-dJxPBlzC7NugB2PDLwo9Q8JiTR3M3e4/XANkreKSUxF8vvXKqm1Yfq4Q5dl8budlunRVlUUaDUgFt7eA8D6NLg==", - "license": "ISC", - "dependencies": { - "d3-time": "1 - 3" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/d3-timer": { - "version": "3.0.1", - "resolved": "https://registry.npmmirror.com/d3-timer/-/d3-timer-3.0.1.tgz", - "integrity": "sha512-ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA==", - "license": "ISC", - "engines": { - "node": ">=12" - } - }, - "node_modules/d3-transition": { - "version": "3.0.1", - "resolved": "https://registry.npmmirror.com/d3-transition/-/d3-transition-3.0.1.tgz", - "integrity": "sha512-ApKvfjsSR6tg06xrL434C0WydLr7JewBB3V+/39RMHsaXTOG0zmt/OAXeng5M5LBm0ojmxJrpomQVZ1aPvBL4w==", - "license": "ISC", - "dependencies": { - "d3-color": "1 - 3", - "d3-dispatch": "1 - 3", - "d3-ease": "1 - 3", - "d3-interpolate": "1 - 3", - "d3-timer": "1 - 3" - }, - "engines": { - "node": ">=12" - }, - "peerDependencies": { - "d3-selection": "2 - 3" - } - }, - "node_modules/d3-zoom": { - "version": "3.0.0", - "resolved": "https://registry.npmmirror.com/d3-zoom/-/d3-zoom-3.0.0.tgz", - "integrity": "sha512-b8AmV3kfQaqWAuacbPuNbL6vahnOJflOhexLzMMNLga62+/nh0JzvJ0aO/5a5MVgUFGS7Hu1P9P03o3fJkDCyw==", - "license": "ISC", - "dependencies": { - "d3-dispatch": "1 - 3", - "d3-drag": "2 - 3", - "d3-interpolate": "1 - 3", - "d3-selection": "2 - 3", - "d3-transition": "2 - 3" - }, - "engines": { - "node": ">=12" + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, "node_modules/dayjs": { @@ -4316,6 +4871,13 @@ "node": ">=0.10" } }, + "node_modules/deep-is": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", + "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", + "dev": true, + "license": "MIT" + }, "node_modules/deepmerge": { "version": "4.3.1", "resolved": "https://registry.npmmirror.com/deepmerge/-/deepmerge-4.3.1.tgz", @@ -4337,6 +4899,42 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/define-data-property": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz", + "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==", + "dev": true, + "license": "MIT", + "dependencies": { + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", + "gopd": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/define-properties": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz", + "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==", + "dev": true, + "license": "MIT", + "dependencies": { + "define-data-property": "^1.0.1", + "has-property-descriptors": "^1.0.0", + "object-keys": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/delayed-stream": { "version": "1.0.0", "resolved": "https://registry.npmmirror.com/delayed-stream/-/delayed-stream-1.0.0.tgz", @@ -4371,6 +4969,32 @@ "npm": "1.2.8000 || >= 1.4.16" } }, + "node_modules/dir-glob": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", + "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", + "dev": true, + "license": "MIT", + "dependencies": { + "path-type": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/doctrine": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", + "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "esutils": "^2.0.2" + }, + "engines": { + "node": ">=6.0.0" + } + }, "node_modules/dotenv": { "version": "16.6.1", "resolved": "https://registry.npmmirror.com/dotenv/-/dotenv-16.6.1.tgz", @@ -4472,6 +5096,94 @@ "url": "https://opencollective.com/express" } }, + "node_modules/es-abstract": { + "version": "1.24.2", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.24.2.tgz", + "integrity": "sha512-2FpH9Q5i2RRwyEP1AylXe6nYLR5OhaJTZwmlcP0dL/+JCbgg7yyEo/sEK6HeGZRf3dFpWwThaRHVApXSkW3xeg==", + "dev": true, + "license": "MIT", + "dependencies": { + "array-buffer-byte-length": "^1.0.2", + "arraybuffer.prototype.slice": "^1.0.4", + "available-typed-arrays": "^1.0.7", + "call-bind": "^1.0.8", + "call-bound": "^1.0.4", + "data-view-buffer": "^1.0.2", + "data-view-byte-length": "^1.0.2", + "data-view-byte-offset": "^1.0.1", + "es-define-property": "^1.0.1", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.1.1", + "es-set-tostringtag": "^2.1.0", + "es-to-primitive": "^1.3.0", + "function.prototype.name": "^1.1.8", + "get-intrinsic": "^1.3.0", + "get-proto": "^1.0.1", + "get-symbol-description": "^1.1.0", + "globalthis": "^1.0.4", + "gopd": "^1.2.0", + "has-property-descriptors": "^1.0.2", + "has-proto": "^1.2.0", + "has-symbols": "^1.1.0", + "hasown": "^2.0.2", + "internal-slot": "^1.1.0", + "is-array-buffer": "^3.0.5", + "is-callable": "^1.2.7", + "is-data-view": "^1.0.2", + "is-negative-zero": "^2.0.3", + "is-regex": "^1.2.1", + "is-set": "^2.0.3", + "is-shared-array-buffer": "^1.0.4", + "is-string": "^1.1.1", + "is-typed-array": "^1.1.15", + "is-weakref": "^1.1.1", + "math-intrinsics": "^1.1.0", + "object-inspect": "^1.13.4", + "object-keys": "^1.1.1", + "object.assign": "^4.1.7", + "own-keys": "^1.0.1", + "regexp.prototype.flags": "^1.5.4", + "safe-array-concat": "^1.1.3", + "safe-push-apply": "^1.0.0", + "safe-regex-test": "^1.1.0", + "set-proto": "^1.0.0", + "stop-iteration-iterator": "^1.1.0", + "string.prototype.trim": "^1.2.10", + "string.prototype.trimend": "^1.0.9", + "string.prototype.trimstart": "^1.0.8", + "typed-array-buffer": "^1.0.3", + "typed-array-byte-length": "^1.0.3", + "typed-array-byte-offset": "^1.0.4", + "typed-array-length": "^1.0.7", + "unbox-primitive": "^1.1.0", + "which-typed-array": "^1.1.19" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/es-abstract-get": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/es-abstract-get/-/es-abstract-get-1.0.0.tgz", + "integrity": "sha512-6PMWXpdhshVvFp+FoWYs1EvG1Nj0tvk0dZM+XcK0xMEM1czRVcP6ohqPWHy6qPagSpC8j4+p89WXlT+xXJs/fg==", + "dev": true, + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "es-object-atoms": "^1.1.2", + "is-callable": "^1.2.7", + "object-inspect": "^1.13.4" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/es-define-property": { "version": "1.0.1", "resolved": "https://registry.npmmirror.com/es-define-property/-/es-define-property-1.0.1.tgz", @@ -4490,6 +5202,34 @@ "node": ">= 0.4" } }, + "node_modules/es-iterator-helpers": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.4.0.tgz", + "integrity": "sha512-c/A0P0oxkACDc+cKWw8evLXK83oBKgn0qPOqCYT4x9uolpCIJAcYvJC9QYKNDRPsTeGyCrQ326jrvgZWdCdK5Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.9", + "call-bound": "^1.0.4", + "define-properties": "^1.2.1", + "es-abstract": "^1.24.2", + "es-errors": "^1.3.0", + "es-set-tostringtag": "^2.1.0", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.3.0", + "globalthis": "^1.0.4", + "gopd": "^1.2.0", + "has-property-descriptors": "^1.0.2", + "has-proto": "^1.2.0", + "has-symbols": "^1.1.0", + "internal-slot": "^1.1.0", + "iterator.prototype": "^1.1.5", + "math-intrinsics": "^1.1.0" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/es-object-atoms": { "version": "1.1.2", "resolved": "https://registry.npmmirror.com/es-object-atoms/-/es-object-atoms-1.1.2.tgz", @@ -4517,6 +5257,40 @@ "node": ">= 0.4" } }, + "node_modules/es-shim-unscopables": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.1.0.tgz", + "integrity": "sha512-d9T8ucsEhh8Bi1woXCf+TIKDIROLG5WCkxg8geBCbvk22kzwC5G2OnXVMO6FUsvQlgUUXQ2itephWDLqDzbeCw==", + "dev": true, + "license": "MIT", + "dependencies": { + "hasown": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-to-primitive": { + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.3.4.tgz", + "integrity": "sha512-yPDz7wqpg1/mmHLmS3tcfTfbw5f1eryXvyghYBffGdERwe+mV7ZcWzTR8LR17Kvqt3qfPurjlonmnq3MKXIOXw==", + "dev": true, + "license": "MIT", + "dependencies": { + "es-abstract-get": "^1.0.0", + "es-define-property": "^1.0.1", + "es-errors": "^1.3.0", + "is-callable": "^1.2.7", + "is-date-object": "^1.1.0", + "is-symbol": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/escalade": { "version": "3.2.0", "resolved": "https://registry.npmmirror.com/escalade/-/escalade-3.2.0.tgz", @@ -4544,6 +5318,632 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/eslint": { + "version": "8.57.1", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.1.tgz", + "integrity": "sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==", + "deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.", + "dev": true, + "license": "MIT", + "dependencies": { + "@eslint-community/eslint-utils": "^4.2.0", + "@eslint-community/regexpp": "^4.6.1", + "@eslint/eslintrc": "^2.1.4", + "@eslint/js": "8.57.1", + "@humanwhocodes/config-array": "^0.13.0", + "@humanwhocodes/module-importer": "^1.0.1", + "@nodelib/fs.walk": "^1.2.8", + "@ungap/structured-clone": "^1.2.0", + "ajv": "^6.12.4", + "chalk": "^4.0.0", + "cross-spawn": "^7.0.2", + "debug": "^4.3.2", + "doctrine": "^3.0.0", + "escape-string-regexp": "^4.0.0", + "eslint-scope": "^7.2.2", + "eslint-visitor-keys": "^3.4.3", + "espree": "^9.6.1", + "esquery": "^1.4.2", + "esutils": "^2.0.2", + "fast-deep-equal": "^3.1.3", + "file-entry-cache": "^6.0.1", + "find-up": "^5.0.0", + "glob-parent": "^6.0.2", + "globals": "^13.19.0", + "graphemer": "^1.4.0", + "ignore": "^5.2.0", + "imurmurhash": "^0.1.4", + "is-glob": "^4.0.0", + "is-path-inside": "^3.0.3", + "js-yaml": "^4.1.0", + "json-stable-stringify-without-jsonify": "^1.0.1", + "levn": "^0.4.1", + "lodash.merge": "^4.6.2", + "minimatch": "^3.1.2", + "natural-compare": "^1.4.0", + "optionator": "^0.9.3", + "strip-ansi": "^6.0.1", + "text-table": "^0.2.0" + }, + "bin": { + "eslint": "bin/eslint.js" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/eslint-config-prettier": { + "version": "8.10.2", + "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.10.2.tgz", + "integrity": "sha512-/IGJ6+Dka158JnP5n5YFMOszjDWrXggGz1LaK/guZq9vZTmniaKlHcsscvkAhn9y4U+BU3JuUdYvtAMcv30y4A==", + "dev": true, + "license": "MIT", + "bin": { + "eslint-config-prettier": "bin/cli.js" + }, + "peerDependencies": { + "eslint": ">=7.0.0" + } + }, + "node_modules/eslint-plugin-eslint-comments": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-eslint-comments/-/eslint-plugin-eslint-comments-3.2.0.tgz", + "integrity": "sha512-0jkOl0hfojIHHmEHgmNdqv4fmh7300NdpA9FFpF7zaoLvB/QeXOGNLIo86oAveJFrfB1p05kC8hpEMHM8DwWVQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "escape-string-regexp": "^1.0.5", + "ignore": "^5.0.5" + }, + "engines": { + "node": ">=6.5.0" + }, + "funding": { + "url": "https://github.com/sponsors/mysticatea" + }, + "peerDependencies": { + "eslint": ">=4.19.1" + } + }, + "node_modules/eslint-plugin-eslint-comments/node_modules/escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/eslint-plugin-ft-flow": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/eslint-plugin-ft-flow/-/eslint-plugin-ft-flow-2.0.3.tgz", + "integrity": "sha512-Vbsd/b+LYA99jUbsL6viEUWShFaYQt2YQs3QN3f+aeszOhh2sgdcU0mjzDyD4yyBvMc8qy2uwvBBWfMzEX06tg==", + "dev": true, + "license": "MIT", + "dependencies": { + "lodash": "^4.17.21", + "string-natural-compare": "^3.0.1" + }, + "engines": { + "node": ">=12.22.0" + }, + "peerDependencies": { + "@babel/eslint-parser": "^7.12.0", + "eslint": "^8.1.0" + } + }, + "node_modules/eslint-plugin-jest": { + "version": "27.9.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-27.9.0.tgz", + "integrity": "sha512-QIT7FH7fNmd9n4se7FFKHbsLKGQiw885Ds6Y/sxKgCZ6natwCsXdgPOADnYVxN2QrRweF0FZWbJ6S7Rsn7llug==", + "dev": true, + "license": "MIT", + "dependencies": { + "@typescript-eslint/utils": "^5.10.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + }, + "peerDependencies": { + "@typescript-eslint/eslint-plugin": "^5.0.0 || ^6.0.0 || ^7.0.0", + "eslint": "^7.0.0 || ^8.0.0", + "jest": "*" + }, + "peerDependenciesMeta": { + "@typescript-eslint/eslint-plugin": { + "optional": true + }, + "jest": { + "optional": true + } + } + }, + "node_modules/eslint-plugin-jest/node_modules/@typescript-eslint/scope-manager": { + "version": "5.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz", + "integrity": "sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==", + "dev": true, + "license": "MIT", + "dependencies": { + "@typescript-eslint/types": "5.62.0", + "@typescript-eslint/visitor-keys": "5.62.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/eslint-plugin-jest/node_modules/@typescript-eslint/types": { + "version": "5.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz", + "integrity": "sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/eslint-plugin-jest/node_modules/@typescript-eslint/typescript-estree": { + "version": "5.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz", + "integrity": "sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "@typescript-eslint/types": "5.62.0", + "@typescript-eslint/visitor-keys": "5.62.0", + "debug": "^4.3.4", + "globby": "^11.1.0", + "is-glob": "^4.0.3", + "semver": "^7.3.7", + "tsutils": "^3.21.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/eslint-plugin-jest/node_modules/@typescript-eslint/utils": { + "version": "5.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.62.0.tgz", + "integrity": "sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@eslint-community/eslint-utils": "^4.2.0", + "@types/json-schema": "^7.0.9", + "@types/semver": "^7.3.12", + "@typescript-eslint/scope-manager": "5.62.0", + "@typescript-eslint/types": "5.62.0", + "@typescript-eslint/typescript-estree": "5.62.0", + "eslint-scope": "^5.1.1", + "semver": "^7.3.7" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" + } + }, + "node_modules/eslint-plugin-jest/node_modules/@typescript-eslint/visitor-keys": { + "version": "5.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz", + "integrity": "sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@typescript-eslint/types": "5.62.0", + "eslint-visitor-keys": "^3.3.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/eslint-plugin-jest/node_modules/eslint-visitor-keys": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", + "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/eslint-plugin-jest/node_modules/semver": { + "version": "7.8.5", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.5.tgz", + "integrity": "sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/eslint-plugin-prettier": { + "version": "4.2.5", + "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-4.2.5.tgz", + "integrity": "sha512-9Ni+xgemM2IWLq6aXEpP2+V/V30GeA/46Ar629vcMqVPodFFWC9skHu/D1phvuqtS8bJCFnNf01/qcmqYEwNfg==", + "dev": true, + "license": "MIT", + "dependencies": { + "prettier-linter-helpers": "^1.0.0" + }, + "engines": { + "node": ">=12.0.0" + }, + "peerDependencies": { + "eslint": ">=7.28.0", + "prettier": ">=2.0.0" + }, + "peerDependenciesMeta": { + "eslint-config-prettier": { + "optional": true + } + } + }, + "node_modules/eslint-plugin-react": { + "version": "7.37.5", + "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.37.5.tgz", + "integrity": "sha512-Qteup0SqU15kdocexFNAJMvCJEfa2xUKNV4CC1xsVMrIIqEy3SQ/rqyxCWNzfrd3/ldy6HMlD2e0JDVpDg2qIA==", + "dev": true, + "license": "MIT", + "dependencies": { + "array-includes": "^3.1.8", + "array.prototype.findlast": "^1.2.5", + "array.prototype.flatmap": "^1.3.3", + "array.prototype.tosorted": "^1.1.4", + "doctrine": "^2.1.0", + "es-iterator-helpers": "^1.2.1", + "estraverse": "^5.3.0", + "hasown": "^2.0.2", + "jsx-ast-utils": "^2.4.1 || ^3.0.0", + "minimatch": "^3.1.2", + "object.entries": "^1.1.9", + "object.fromentries": "^2.0.8", + "object.values": "^1.2.1", + "prop-types": "^15.8.1", + "resolve": "^2.0.0-next.5", + "semver": "^6.3.1", + "string.prototype.matchall": "^4.0.12", + "string.prototype.repeat": "^1.0.0" + }, + "engines": { + "node": ">=4" + }, + "peerDependencies": { + "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8 || ^9.7" + } + }, + "node_modules/eslint-plugin-react-hooks": { + "version": "4.6.2", + "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.2.tgz", + "integrity": "sha512-QzliNJq4GinDBcD8gPB5v0wh6g8q3SUi6EFF0x8N/BL9PoVs0atuGc47ozMRyOWAKdwaZ5OnbOEa3WR+dSGKuQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "peerDependencies": { + "eslint": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0" + } + }, + "node_modules/eslint-plugin-react-native": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-react-native/-/eslint-plugin-react-native-4.1.0.tgz", + "integrity": "sha512-QLo7rzTBOl43FvVqDdq5Ql9IoElIuTdjrz9SKAXCvULvBoRZ44JGSkx9z4999ZusCsb4rK3gjS8gOGyeYqZv2Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "eslint-plugin-react-native-globals": "^0.1.1" + }, + "peerDependencies": { + "eslint": "^3.17.0 || ^4 || ^5 || ^6 || ^7 || ^8" + } + }, + "node_modules/eslint-plugin-react-native-globals": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/eslint-plugin-react-native-globals/-/eslint-plugin-react-native-globals-0.1.2.tgz", + "integrity": "sha512-9aEPf1JEpiTjcFAmmyw8eiIXmcNZOqaZyHO77wgm0/dWfT/oxC1SrIq8ET38pMxHYrcB6Uew+TzUVsBeczF88g==", + "dev": true, + "license": "MIT" + }, + "node_modules/eslint-plugin-react/node_modules/doctrine": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", + "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "esutils": "^2.0.2" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/eslint-plugin-react/node_modules/resolve": { + "version": "2.0.0-next.7", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.7.tgz", + "integrity": "sha512-tqt+NBWwyaMgw3zDsnygx4CByWjQEJHOPMdslYhppaQSJUtL/D4JO9CcBBlhPoI8lz9oJIDXkwXfhF4aWqP8xQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "is-core-module": "^2.16.2", + "node-exports-info": "^1.6.0", + "object-keys": "^1.1.1", + "path-parse": "^1.0.7", + "supports-preserve-symlinks-flag": "^1.0.0" + }, + "bin": { + "resolve": "bin/resolve" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/eslint-scope": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", + "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "esrecurse": "^4.3.0", + "estraverse": "^4.1.1" + }, + "engines": { + "node": ">=8.0.0" + } + }, + "node_modules/eslint-scope/node_modules/estraverse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", + "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", + "dev": true, + "license": "BSD-2-Clause", + "engines": { + "node": ">=4.0" + } + }, + "node_modules/eslint-visitor-keys": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", + "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=10" + } + }, + "node_modules/eslint/node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true, + "license": "Python-2.0" + }, + "node_modules/eslint/node_modules/eslint-scope": { + "version": "7.2.2", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz", + "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "esrecurse": "^4.3.0", + "estraverse": "^5.2.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/eslint/node_modules/eslint-visitor-keys": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", + "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/eslint/node_modules/find-up": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", + "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", + "dev": true, + "license": "MIT", + "dependencies": { + "locate-path": "^6.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/eslint/node_modules/glob-parent": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", + "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", + "dev": true, + "license": "ISC", + "dependencies": { + "is-glob": "^4.0.3" + }, + "engines": { + "node": ">=10.13.0" + } + }, + "node_modules/eslint/node_modules/js-yaml": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.3.1.tgz", + "integrity": "sha512-CY6crGq313MX8GkwvB7tzgp99vjQxY1++5y10/BKN/GUfHqWaOGQMNZkBvqSzsZKWk/ijwHlWzzkLulsGHhjWQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/puzrin" + }, + { + "type": "github", + "url": "https://github.com/sponsors/nodeca" + } + ], + "license": "MIT", + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/eslint/node_modules/locate-path": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", + "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-locate": "^5.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/eslint/node_modules/p-limit": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "yocto-queue": "^0.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/eslint/node_modules/p-locate": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", + "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-limit": "^3.0.2" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/eslint/node_modules/path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/eslint/node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/espree": { + "version": "9.6.1", + "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz", + "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "acorn": "^8.9.0", + "acorn-jsx": "^5.3.2", + "eslint-visitor-keys": "^3.4.1" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/espree/node_modules/eslint-visitor-keys": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", + "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, "node_modules/esprima": { "version": "4.0.1", "resolved": "https://registry.npmmirror.com/esprima/-/esprima-4.0.1.tgz", @@ -4557,11 +5957,46 @@ "node": ">=4" } }, + "node_modules/esquery": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.7.0.tgz", + "integrity": "sha512-Ap6G0WQwcU/LHsvLwON1fAQX9Zp0A2Y6Y/cJBl9r/JbW90Zyg4/zbG6zzKa2OTALELarYHmKu0GhpM5EO+7T0g==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "estraverse": "^5.1.0" + }, + "engines": { + "node": ">=0.10" + } + }, + "node_modules/esrecurse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", + "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "estraverse": "^5.2.0" + }, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/estraverse": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", + "dev": true, + "license": "BSD-2-Clause", + "engines": { + "node": ">=4.0" + } + }, "node_modules/esutils": { "version": "2.0.3", "resolved": "https://registry.npmmirror.com/esutils/-/esutils-2.0.3.tgz", "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", - "dev": true, "license": "BSD-2-Clause", "engines": { "node": ">=0.10.0" @@ -4620,6 +6055,13 @@ "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", "license": "MIT" }, + "node_modules/fast-diff": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.3.0.tgz", + "integrity": "sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==", + "dev": true, + "license": "Apache-2.0" + }, "node_modules/fast-glob": { "version": "3.3.3", "resolved": "https://registry.npmmirror.com/fast-glob/-/fast-glob-3.3.3.tgz", @@ -4636,6 +6078,20 @@ "node": ">=8.6.0" } }, + "node_modules/fast-json-stable-stringify": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", + "dev": true, + "license": "MIT" + }, + "node_modules/fast-levenshtein": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", + "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", + "dev": true, + "license": "MIT" + }, "node_modules/fast-xml-parser": { "version": "4.5.7", "resolved": "https://registry.npmmirror.com/fast-xml-parser/-/fast-xml-parser-4.5.7.tgz", @@ -4672,6 +6128,19 @@ "bser": "2.1.1" } }, + "node_modules/file-entry-cache": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", + "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", + "dev": true, + "license": "MIT", + "dependencies": { + "flat-cache": "^3.0.4" + }, + "engines": { + "node": "^10.12.0 || >=12.0.0" + } + }, "node_modules/fill-range": { "version": "7.1.1", "resolved": "https://registry.npmmirror.com/fill-range/-/fill-range-7.1.1.tgz", @@ -4752,6 +6221,28 @@ "node": ">=6" } }, + "node_modules/flat-cache": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz", + "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==", + "dev": true, + "license": "MIT", + "dependencies": { + "flatted": "^3.2.9", + "keyv": "^4.5.3", + "rimraf": "^3.0.2" + }, + "engines": { + "node": "^10.12.0 || >=12.0.0" + } + }, + "node_modules/flatted": { + "version": "3.4.4", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.4.4.tgz", + "integrity": "sha512-5+ybhBZANEJxaH3X5evAFatUxLfEHSr7n6kYJ+1Qd0mUqr4eu9gIf6GDbWHf8RJijHrjjO8G+la14SlL2SeS1Q==", + "dev": true, + "license": "ISC" + }, "node_modules/flow-enums-runtime": { "version": "0.0.6", "resolved": "https://registry.npmmirror.com/flow-enums-runtime/-/flow-enums-runtime-0.0.6.tgz", @@ -4799,6 +6290,22 @@ } } }, + "node_modules/for-each": { + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.5.tgz", + "integrity": "sha512-dKx12eRCVIzqCxFGplyFKJMPvLEWgmNtUrpTiJIR5u97zEhRG8ySrtboPHZXx7daLxQVrl643cTzbab2tkQjxg==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-callable": "^1.2.7" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/form-data": { "version": "4.0.6", "resolved": "https://registry.npmmirror.com/form-data/-/form-data-4.0.6.tgz", @@ -4867,6 +6374,50 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/function.prototype.name": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.2.0.tgz", + "integrity": "sha512-jObKIik1P2QjPHP5nz5BaOtUlfgS0fWo8IUByNXkM+o+02sJOi94em77GwJKQSJ3gfPHdgzLNrHc1uokV4P/ew==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.9", + "call-bound": "^1.0.4", + "es-define-property": "^1.0.1", + "es-errors": "^1.3.0", + "functions-have-names": "^1.2.3", + "has-property-descriptors": "^1.0.2", + "hasown": "^2.0.4", + "is-callable": "^1.2.7", + "is-document.all": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/functions-have-names": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz", + "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==", + "dev": true, + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/generator-function": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/generator-function/-/generator-function-2.0.1.tgz", + "integrity": "sha512-SFdFmIJi+ybC0vjlHN0ZGVGHc3lgE0DxPAT0djjVg+kjOnSqclqmj0KQ7ykTOLP6YxoqOvuAODGdcHJn+43q3g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, "node_modules/gensync": { "version": "1.0.0-beta.2", "resolved": "https://registry.npmmirror.com/gensync/-/gensync-1.0.0-beta.2.tgz", @@ -4934,6 +6485,24 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/get-symbol-description": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.1.0.tgz", + "integrity": "sha512-w9UMqWwJxHNOvoNzSJ2oPF5wvYcvP7jUvYzhp67yEhTi17ZDBBC1z9pTdGuzjD+EFIqLSYRweZjqfiPzQ06Ebg==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.6" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/glob": { "version": "7.2.3", "resolved": "https://registry.npmmirror.com/glob/-/glob-7.2.3.tgz", @@ -4967,6 +6536,73 @@ "node": ">= 6" } }, + "node_modules/globals": { + "version": "13.24.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz", + "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "type-fest": "^0.20.2" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/globals/node_modules/type-fest": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", + "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", + "dev": true, + "license": "(MIT OR CC0-1.0)", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/globalthis": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.4.tgz", + "integrity": "sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "define-properties": "^1.2.1", + "gopd": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/globby": { + "version": "11.1.0", + "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", + "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", + "dev": true, + "license": "MIT", + "dependencies": { + "array-union": "^2.1.0", + "dir-glob": "^3.0.1", + "fast-glob": "^3.2.9", + "ignore": "^5.2.0", + "merge2": "^1.4.1", + "slash": "^3.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/gopd": { "version": "1.2.0", "resolved": "https://registry.npmmirror.com/gopd/-/gopd-1.2.0.tgz", @@ -4985,6 +6621,26 @@ "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", "license": "ISC" }, + "node_modules/graphemer": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", + "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", + "dev": true, + "license": "MIT" + }, + "node_modules/has-bigints": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.1.0.tgz", + "integrity": "sha512-R3pbpkcIqv2Pm3dUwgjclDRVmWpTJW2DcMzcIhEXEx1oh/CEMObMm3KLmRJOdvhM7o4uQBnwr8pzRK2sJWIqfg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/has-flag": { "version": "4.0.0", "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz", @@ -4994,6 +6650,35 @@ "node": ">=8" } }, + "node_modules/has-property-descriptors": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", + "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==", + "dev": true, + "license": "MIT", + "dependencies": { + "es-define-property": "^1.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-proto": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.2.0.tgz", + "integrity": "sha512-KIL7eQPfHQRC8+XluaIw7BHUwwqL19bQn4hzNgdr+1wXoU0KKj6rufu47lhY7KbJR2C6T6+PfyN0Ea7wkSS+qQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "dunder-proto": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/has-symbols": { "version": "1.1.0", "resolved": "https://registry.npmmirror.com/has-symbols/-/has-symbols-1.1.0.tgz", @@ -5140,6 +6825,16 @@ ], "license": "BSD-3-Clause" }, + "node_modules/ignore": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz", + "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 4" + } + }, "node_modules/image-size": { "version": "1.2.1", "resolved": "https://registry.npmmirror.com/image-size/-/image-size-1.2.1.tgz", @@ -5194,13 +6889,19 @@ "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", "license": "ISC" }, - "node_modules/internmap": { - "version": "2.0.3", - "resolved": "https://registry.npmmirror.com/internmap/-/internmap-2.0.3.tgz", - "integrity": "sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg==", - "license": "ISC", + "node_modules/internal-slot": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.1.0.tgz", + "integrity": "sha512-4gd7VpWNQNB4UKKCFFVcp1AVv+FMOgs9NKzjHKusc8jTMhd5eL1NqQqOpE0KzMds804/yHlglp3uxgluOqAPLw==", + "dev": true, + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "hasown": "^2.0.2", + "side-channel": "^1.1.0" + }, "engines": { - "node": ">=12" + "node": ">= 0.4" } }, "node_modules/invariant": { @@ -5212,12 +6913,96 @@ "loose-envify": "^1.0.0" } }, + "node_modules/is-array-buffer": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.5.tgz", + "integrity": "sha512-DDfANUiiG2wC1qawP66qlTugJeL5HyzMpfr8lLK+jMQirGzNod0B12cFB/9q838Ru27sBwfw78/rdoU7RERz6A==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "call-bound": "^1.0.3", + "get-intrinsic": "^1.2.6" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/is-arrayish": { "version": "0.2.1", "resolved": "https://registry.npmmirror.com/is-arrayish/-/is-arrayish-0.2.1.tgz", "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==", "license": "MIT" }, + "node_modules/is-async-function": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-async-function/-/is-async-function-2.1.1.tgz", + "integrity": "sha512-9dgM/cZBnNvjzaMYHVoxxfPj2QXt22Ev7SuuPrs+xav0ukGB0S6d4ydZdEiM48kLx5kDV+QBPrpVnFyefL8kkQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "async-function": "^1.0.0", + "call-bound": "^1.0.3", + "get-proto": "^1.0.1", + "has-tostringtag": "^1.0.2", + "safe-regex-test": "^1.1.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-bigint": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.1.0.tgz", + "integrity": "sha512-n4ZT37wG78iz03xPRKJrHTdZbe3IicyucEtdRsV5yglwc3GyUfbAfpSeD0FJ41NbUNSt5wbhqfp1fS+BgnvDFQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "has-bigints": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-boolean-object": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.2.2.tgz", + "integrity": "sha512-wa56o2/ElJMYqjCjGkXri7it5FbebW5usLw/nPmCMs5DeZ7eziSYZhSmPRn0txqeW4LnAmQQU7FgqLpsEFKM4A==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3", + "has-tostringtag": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-callable": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz", + "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/is-core-module": { "version": "2.16.2", "resolved": "https://registry.npmmirror.com/is-core-module/-/is-core-module-2.16.2.tgz", @@ -5233,6 +7018,41 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/is-data-view": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.2.tgz", + "integrity": "sha512-RKtWF8pGmS87i2D6gqQu/l7EYRlVdfzemCJN/P3UOs//x1QE7mfhvzHIApBTRf7axvT6DMGwSwBXYCT0nfB9xw==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "get-intrinsic": "^1.2.6", + "is-typed-array": "^1.1.13" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-date-object": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.1.0.tgz", + "integrity": "sha512-PwwhEakHVKTdRNVOw+/Gyh0+MzlCl4R6qKvkhuvLtPMggI1WAHt9sOwZxQLSGpUaDnrdyDsomoRgNnCfKNSXXg==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "has-tostringtag": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/is-directory": { "version": "0.3.1", "resolved": "https://registry.npmmirror.com/is-directory/-/is-directory-0.3.1.tgz", @@ -5257,6 +7077,22 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/is-document.all": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-document.all/-/is-document.all-1.0.0.tgz", + "integrity": "sha512-+XSoyS05OdBbhFuELhgTCpFNHkpBOJqtsZfUFFpe5QTw+9Sjbh8zitxhQkYAo6wV7e1Vb8cAPvpCk9jGam/82g==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.4" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/is-extglob": { "version": "2.1.1", "resolved": "https://registry.npmmirror.com/is-extglob/-/is-extglob-2.1.1.tgz", @@ -5266,6 +7102,22 @@ "node": ">=0.10.0" } }, + "node_modules/is-finalizationregistry": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-finalizationregistry/-/is-finalizationregistry-1.1.1.tgz", + "integrity": "sha512-1pC6N8qWJbWoPtEjgcL2xyhQOP491EQjeUo3qTKcmV8YSDDJrOepfG8pcC7h/QgnQHYSv0mJ3Z/ZWxmatVrysg==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/is-fullwidth-code-point": { "version": "2.0.0", "resolved": "https://registry.npmmirror.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", @@ -5275,6 +7127,26 @@ "node": ">=4" } }, + "node_modules/is-generator-function": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.1.2.tgz", + "integrity": "sha512-upqt1SkGkODW9tsGNG5mtXTXtECizwtS2kA161M+gJPc1xdb/Ax629af6YrTwcOeQHbewrPNlE5Dx7kzvXTizA==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.4", + "generator-function": "^2.0.0", + "get-proto": "^1.0.1", + "has-tostringtag": "^1.0.2", + "safe-regex-test": "^1.1.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/is-glob": { "version": "4.0.3", "resolved": "https://registry.npmmirror.com/is-glob/-/is-glob-4.0.3.tgz", @@ -5296,6 +7168,32 @@ "node": ">=8" } }, + "node_modules/is-map": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.3.tgz", + "integrity": "sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-negative-zero": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.3.tgz", + "integrity": "sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/is-number": { "version": "7.0.0", "resolved": "https://registry.npmmirror.com/is-number/-/is-number-7.0.0.tgz", @@ -5305,6 +7203,33 @@ "node": ">=0.12.0" } }, + "node_modules/is-number-object": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.1.1.tgz", + "integrity": "sha512-lZhclumE1G6VYD8VHe35wFaIif+CTy5SJIi5+3y4psDgWu4wPDoBhF8NxUOinEc7pHgiTsT6MaBb92rKhhD+Xw==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3", + "has-tostringtag": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-path-inside": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", + "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, "node_modules/is-plain-obj": { "version": "2.1.0", "resolved": "https://registry.npmmirror.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz", @@ -5326,6 +7251,54 @@ "node": ">=0.10.0" } }, + "node_modules/is-regex": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.2.1.tgz", + "integrity": "sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "gopd": "^1.2.0", + "has-tostringtag": "^1.0.2", + "hasown": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-set": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.3.tgz", + "integrity": "sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-shared-array-buffer": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.4.tgz", + "integrity": "sha512-ISWac8drv4ZGfwKl5slpHG9OwPNty4jOWPRIhBpxOoD+hqITiwuipOQ2bNthAzwA3B4fIjO4Nln74N0S9byq8A==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/is-stream": { "version": "2.0.1", "resolved": "https://registry.npmmirror.com/is-stream/-/is-stream-2.0.1.tgz", @@ -5338,6 +7311,57 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/is-string": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.1.1.tgz", + "integrity": "sha512-BtEeSsoaQjlSPBemMQIrY1MY0uM6vnS1g5fmufYOtnxLGUZM2178PKbhsk7Ffv58IX+ZtcvoGwccYsh0PglkAA==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3", + "has-tostringtag": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-symbol": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.1.1.tgz", + "integrity": "sha512-9gGx6GTtCQM73BgmHQXfDmLtfjjTUDSyoxTCbp5WtoixAhfgsDirWIcVQ/IHpvI5Vgd5i/J5F7B9cN/WlVbC/w==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "has-symbols": "^1.1.0", + "safe-regex-test": "^1.1.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-typed-array": { + "version": "1.1.15", + "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.15.tgz", + "integrity": "sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "which-typed-array": "^1.1.16" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/is-unicode-supported": { "version": "0.1.0", "resolved": "https://registry.npmmirror.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz", @@ -5350,6 +7374,52 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/is-weakmap": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.2.tgz", + "integrity": "sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-weakref": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.1.1.tgz", + "integrity": "sha512-6i9mGWSlqzNMEqpCp93KwRS1uUOodk2OJ6b+sq7ZPDSy2WuI5NFIxp/254TytR8ftefexkWn5xNiHUNpPOfSew==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-weakset": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.4.tgz", + "integrity": "sha512-mfcwb6IzQyOKTs84CQMrOwW4gQcaTOAWJ0zzJCl2WSPDrWk/OzDaImWFH3djXhb24g4eudZfLRozAvPGw4d9hQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3", + "get-intrinsic": "^1.2.6" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/is-wsl": { "version": "2.2.0", "resolved": "https://registry.npmmirror.com/is-wsl/-/is-wsl-2.2.0.tgz", @@ -5383,16 +7453,22 @@ "node": ">=0.10.0" } }, - "node_modules/its-fine": { - "version": "1.2.5", - "resolved": "https://registry.npmmirror.com/its-fine/-/its-fine-1.2.5.tgz", - "integrity": "sha512-fXtDA0X0t0eBYAGLVM5YsgJGsJ5jEmqZEPrGbzdf5awjv0xE7nqv3TVnvtUF060Tkes15DbDAKW/I48vsb6SyA==", + "node_modules/iterator.prototype": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/iterator.prototype/-/iterator.prototype-1.1.5.tgz", + "integrity": "sha512-H0dkQoCa3b2VEeKQBOxFph+JAbcrQdE7KC0UkqwpLmv2EC4P41QXP+rqo9wYodACiG5/WM5s9oDApTU8utwj9g==", + "dev": true, "license": "MIT", "dependencies": { - "@types/react-reconciler": "^0.28.0" + "define-data-property": "^1.1.4", + "es-object-atoms": "^1.0.0", + "get-intrinsic": "^1.2.6", + "get-proto": "^1.0.0", + "has-symbols": "^1.1.0", + "set-function-name": "^2.0.2" }, - "peerDependencies": { - "react": ">=18.0" + "engines": { + "node": ">= 0.4" } }, "node_modules/jest-environment-node": { @@ -5672,12 +7748,33 @@ "node": ">=6" } }, + "node_modules/json-buffer": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", + "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", + "dev": true, + "license": "MIT" + }, "node_modules/json-parse-better-errors": { "version": "1.0.2", "resolved": "https://registry.npmmirror.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz", "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==", "license": "MIT" }, + "node_modules/json-schema-traverse": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "dev": true, + "license": "MIT" + }, + "node_modules/json-stable-stringify-without-jsonify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", + "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", + "dev": true, + "license": "MIT" + }, "node_modules/json5": { "version": "2.2.3", "resolved": "https://registry.npmmirror.com/json5/-/json5-2.2.3.tgz", @@ -5699,6 +7796,32 @@ "graceful-fs": "^4.1.6" } }, + "node_modules/jsx-ast-utils": { + "version": "3.3.5", + "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz", + "integrity": "sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "array-includes": "^3.1.6", + "array.prototype.flat": "^1.3.1", + "object.assign": "^4.1.4", + "object.values": "^1.1.6" + }, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/keyv": { + "version": "4.5.4", + "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", + "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", + "dev": true, + "license": "MIT", + "dependencies": { + "json-buffer": "3.0.1" + } + }, "node_modules/kind-of": { "version": "6.0.3", "resolved": "https://registry.npmmirror.com/kind-of/-/kind-of-6.0.3.tgz", @@ -5726,6 +7849,20 @@ "node": ">=6" } }, + "node_modules/levn": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", + "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "prelude-ls": "^1.2.1", + "type-check": "~0.4.0" + }, + "engines": { + "node": ">= 0.8.0" + } + }, "node_modules/lighthouse-logger": { "version": "1.4.2", "resolved": "https://registry.npmmirror.com/lighthouse-logger/-/lighthouse-logger-1.4.2.tgz", @@ -5764,12 +7901,26 @@ "node": ">=6" } }, + "node_modules/lodash": { + "version": "4.18.1", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.18.1.tgz", + "integrity": "sha512-dMInicTPVE8d1e5otfwmmjlxkZoUpiVLwyeTdUsi/Caj/gfzzblBcCE5sRHV/AsjuCmxWrte2TNGSYuCeCq+0Q==", + "dev": true, + "license": "MIT" + }, "node_modules/lodash.debounce": { "version": "4.0.8", "resolved": "https://registry.npmmirror.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz", "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==", "license": "MIT" }, + "node_modules/lodash.merge": { + "version": "4.6.2", + "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", + "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", + "dev": true, + "license": "MIT" + }, "node_modules/lodash.throttle": { "version": "4.1.1", "resolved": "https://registry.npmmirror.com/lodash.throttle/-/lodash.throttle-4.1.1.tgz", @@ -6552,6 +8703,13 @@ "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" } }, + "node_modules/natural-compare": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", + "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", + "dev": true, + "license": "MIT" + }, "node_modules/negotiator": { "version": "0.6.4", "resolved": "https://registry.npmmirror.com/negotiator/-/negotiator-0.6.4.tgz", @@ -6594,6 +8752,25 @@ "node": ">= 0.10.5" } }, + "node_modules/node-exports-info": { + "version": "1.6.2", + "resolved": "https://registry.npmjs.org/node-exports-info/-/node-exports-info-1.6.2.tgz", + "integrity": "sha512-kXs9Go0cah0qHVV2v389IXQLdLCeE1xfFtjOAF+iobu0OIoG1pje8At2vMHyaPMiPMnG/LWP50twML21eMcAag==", + "dev": true, + "license": "MIT", + "dependencies": { + "array.prototype.flatmap": "^1.3.3", + "es-errors": "^1.3.0", + "object.entries": "^1.1.9", + "semver": "^6.3.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/node-fetch": { "version": "2.7.0", "resolved": "https://registry.npmmirror.com/node-fetch/-/node-fetch-2.7.0.tgz", @@ -6699,6 +8876,104 @@ "node": ">=0.10.0" } }, + "node_modules/object-inspect": { + "version": "1.13.4", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz", + "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/object-keys": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", + "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/object.assign": { + "version": "4.1.7", + "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.7.tgz", + "integrity": "sha512-nK28WOo+QIjBkDduTINE4JkF/UJJKyf2EJxvJKfblDpyg0Q+pkOHNTL0Qwy6NP6FhE/EnzV73BxxqcJaXY9anw==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "call-bound": "^1.0.3", + "define-properties": "^1.2.1", + "es-object-atoms": "^1.0.0", + "has-symbols": "^1.1.0", + "object-keys": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/object.entries": { + "version": "1.1.9", + "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.9.tgz", + "integrity": "sha512-8u/hfXFRBD1O0hPUjioLhoWFHRmt6tKA4/vZPyckBr18l1KE9uHrFaFaUi8MDRTpi4uak2goyPTSNJLXX2k2Hw==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "call-bound": "^1.0.4", + "define-properties": "^1.2.1", + "es-object-atoms": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/object.fromentries": { + "version": "2.0.8", + "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.8.tgz", + "integrity": "sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.2", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/object.values": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.2.1.tgz", + "integrity": "sha512-gXah6aZrcUxjWg2zR2MwouP2eHlCBzdV4pygudehaKXSGW4v2AsRQUK+lwwXhii6KFZcunEnmSUoYp5CXibxtA==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "call-bound": "^1.0.3", + "define-properties": "^1.2.1", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/on-finished": { "version": "2.3.0", "resolved": "https://registry.npmmirror.com/on-finished/-/on-finished-2.3.0.tgz", @@ -6765,6 +9040,24 @@ "node": ">=4" } }, + "node_modules/optionator": { + "version": "0.9.4", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz", + "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==", + "dev": true, + "license": "MIT", + "dependencies": { + "deep-is": "^0.1.3", + "fast-levenshtein": "^2.0.6", + "levn": "^0.4.1", + "prelude-ls": "^1.2.1", + "type-check": "^0.4.0", + "word-wrap": "^1.2.5" + }, + "engines": { + "node": ">= 0.8.0" + } + }, "node_modules/ora": { "version": "5.4.1", "resolved": "https://registry.npmmirror.com/ora/-/ora-5.4.1.tgz", @@ -6800,6 +9093,25 @@ "node": ">=8" } }, + "node_modules/own-keys": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/own-keys/-/own-keys-1.0.2.tgz", + "integrity": "sha512-19YVAg7T+WTrxggPukVq7DjTv6+PJ867TmhCvBsYwmbFCsZd344rq2Ld1p0wo8f8Qrrhgp82c6FJRqdXWtSEhg==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.4", + "get-intrinsic": "^1.3.0", + "object-keys": "^1.1.1", + "safe-push-apply": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/p-limit": { "version": "2.3.0", "resolved": "https://registry.npmmirror.com/p-limit/-/p-limit-2.3.0.tgz", @@ -6836,6 +9148,29 @@ "node": ">=6" } }, + "node_modules/parent-module": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", + "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", + "dev": true, + "license": "MIT", + "dependencies": { + "callsites": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/parent-module/node_modules/callsites": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", + "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, "node_modules/parse-json": { "version": "4.0.0", "resolved": "https://registry.npmmirror.com/parse-json/-/parse-json-4.0.0.tgz", @@ -6891,6 +9226,16 @@ "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", "license": "MIT" }, + "node_modules/path-type": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", + "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, "node_modules/picocolors": { "version": "1.1.1", "resolved": "https://registry.npmmirror.com/picocolors/-/picocolors-1.1.1.tgz", @@ -6939,6 +9284,55 @@ "node": ">=6" } }, + "node_modules/possible-typed-array-names": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.1.0.tgz", + "integrity": "sha512-/+5VFTchJDoVj3bhoqi6UeymcD00DAwb1nJwamzPvHEszJ4FpF6SNNbUbOS8yI56qHzdV8eK0qEfOSiodkTdxg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/prelude-ls": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", + "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/prettier": { + "version": "2.8.8", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz", + "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==", + "dev": true, + "license": "MIT", + "bin": { + "prettier": "bin-prettier.js" + }, + "engines": { + "node": ">=10.13.0" + }, + "funding": { + "url": "https://github.com/prettier/prettier?sponsor=1" + } + }, + "node_modules/prettier-linter-helpers": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.1.tgz", + "integrity": "sha512-SxToR7P8Y2lWmv/kTzVLC1t/GDI2WGjMwNhLLE9qtH8Q13C+aEmuRlzDst4Up4s0Wc8sF2M+J57iB3cMLqftfg==", + "dev": true, + "license": "MIT", + "dependencies": { + "fast-diff": "^1.1.2" + }, + "engines": { + "node": ">=6.0.0" + } + }, "node_modules/pretty-format": { "version": "26.6.2", "resolved": "https://registry.npmmirror.com/pretty-format/-/pretty-format-26.6.2.tgz", @@ -7033,6 +9427,16 @@ "node": ">=10" } }, + "node_modules/punycode": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", + "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, "node_modules/query-string": { "version": "7.1.3", "resolved": "https://registry.npmmirror.com/query-string/-/query-string-7.1.3.tgz", @@ -7100,9 +9504,9 @@ } }, "node_modules/react": { - "version": "18.3.1", - "resolved": "https://registry.npmmirror.com/react/-/react-18.3.1.tgz", - "integrity": "sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==", + "version": "18.2.0", + "resolved": "https://registry.npmjs.org/react/-/react-18.2.0.tgz", + "integrity": "sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==", "license": "MIT", "dependencies": { "loose-envify": "^1.1.0" @@ -7142,12 +9546,6 @@ } } }, - "node_modules/react-fast-compare": { - "version": "3.2.2", - "resolved": "https://registry.npmmirror.com/react-fast-compare/-/react-fast-compare-3.2.2.tgz", - "integrity": "sha512-nsO+KSNgo1SbJqJEYRE9ERzo7YtYbou/OqjSQKxV7jcKox7+usiUVZOAC+XnDOABXggQTno0Y1CpVnuWEc1boQ==", - "license": "MIT" - }, "node_modules/react-freeze": { "version": "1.0.4", "resolved": "https://registry.npmmirror.com/react-freeze/-/react-freeze-1.0.4.tgz", @@ -7472,6 +9870,29 @@ "node": ">=0.10.0" } }, + "node_modules/reflect.getprototypeof": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.10.tgz", + "integrity": "sha512-00o4I+DVrefhv+nX0ulyi3biSHCPDe+yLv5o/p6d/UVlirijB8E16FtfwSAi4g3tcqrQ4lRAqQSoFEZJehYEcw==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.9", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.0.0", + "get-intrinsic": "^1.2.7", + "get-proto": "^1.0.1", + "which-builtin-type": "^1.2.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/regenerate": { "version": "1.4.2", "resolved": "https://registry.npmmirror.com/regenerate/-/regenerate-1.4.2.tgz", @@ -7496,6 +9917,27 @@ "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==", "license": "MIT" }, + "node_modules/regexp.prototype.flags": { + "version": "1.5.4", + "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.4.tgz", + "integrity": "sha512-dYqgNSZbDwkaJ2ceRd9ojCGjBq+mOm9LmtXnAnEGyHhN/5R7iDW2TRw3h+o/jCFxus3P2LfWIIiwowAjANm7IA==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "define-properties": "^1.2.1", + "es-errors": "^1.3.0", + "get-proto": "^1.0.1", + "gopd": "^1.2.0", + "set-function-name": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/regexpu-core": { "version": "6.4.0", "resolved": "https://registry.npmmirror.com/regexpu-core/-/regexpu-core-6.4.0.tgz", @@ -7638,6 +10080,33 @@ "queue-microtask": "^1.2.2" } }, + "node_modules/safe-array-concat": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.4.tgz", + "integrity": "sha512-wtZlHyOje6OZTGqAoaDKxFkgRtkF9CnHAVnCHKfuj200wAgL+bSJhdsCD2l0Qx/2ekEXjPWcyKkfGb5CPboslg==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.9", + "call-bound": "^1.0.4", + "get-intrinsic": "^1.3.0", + "has-symbols": "^1.1.0", + "isarray": "^2.0.5" + }, + "engines": { + "node": ">=0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/safe-array-concat/node_modules/isarray": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", + "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==", + "dev": true, + "license": "MIT" + }, "node_modules/safe-buffer": { "version": "5.2.1", "resolved": "https://registry.npmmirror.com/safe-buffer/-/safe-buffer-5.2.1.tgz", @@ -7658,6 +10127,48 @@ ], "license": "MIT" }, + "node_modules/safe-push-apply": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/safe-push-apply/-/safe-push-apply-1.0.0.tgz", + "integrity": "sha512-iKE9w/Z7xCzUMIZqdBsp6pEQvwuEebH4vdpjcDWnyzaI6yl6O9FHvVpmGelvEHNsoY6wGblkxR6Zty/h00WiSA==", + "dev": true, + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "isarray": "^2.0.5" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/safe-push-apply/node_modules/isarray": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", + "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==", + "dev": true, + "license": "MIT" + }, + "node_modules/safe-regex-test": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.1.0.tgz", + "integrity": "sha512-x/+Cz4YrimQxQccJf5mKEbIa1NzeCRNI5Ecl/ekmlYaampdNLPalVyIcCZNNH3MvmqBugV5TMYZXv0ljslUlaw==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "es-errors": "^1.3.0", + "is-regex": "^1.2.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/scheduler": { "version": "0.24.0-canary-efb381bbf-20230505", "resolved": "https://registry.npmmirror.com/scheduler/-/scheduler-0.24.0-canary-efb381bbf-20230505.tgz", @@ -7809,6 +10320,55 @@ "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==", "license": "ISC" }, + "node_modules/set-function-length": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz", + "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==", + "dev": true, + "license": "MIT", + "dependencies": { + "define-data-property": "^1.1.4", + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.4", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/set-function-name": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.2.tgz", + "integrity": "sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "define-data-property": "^1.1.4", + "es-errors": "^1.3.0", + "functions-have-names": "^1.2.3", + "has-property-descriptors": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/set-proto": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/set-proto/-/set-proto-1.0.0.tgz", + "integrity": "sha512-RJRdvCo6IAnPdsvP/7m6bsQqNnn1FCBX5ZNtFL98MmFF/4xAIJTIg1YbHW5DC2W5SKZanrC6i4HsJqlajw/dZw==", + "dev": true, + "license": "MIT", + "dependencies": { + "dunder-proto": "^1.0.1", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/setprototypeof": { "version": "1.2.0", "resolved": "https://registry.npmmirror.com/setprototypeof/-/setprototypeof-1.2.0.tgz", @@ -7860,6 +10420,82 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/side-channel": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.1.tgz", + "integrity": "sha512-6x6dK6zJdpTzF4sQeNYxwtvBzf6Eg4GtlesS94HOvTudUeyK2WXAaIfmDgsyslYrRBeFIlsi54AYsFGUuhmvrQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "object-inspect": "^1.13.4", + "side-channel-list": "^1.0.1", + "side-channel-map": "^1.0.1", + "side-channel-weakmap": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/side-channel-list": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.1.tgz", + "integrity": "sha512-mjn/0bi/oUURjc5Xl7IaWi/OJJJumuoJFQJfDDyO46+hBWsfaVM65TBHq2eoZBhzl9EchxOijpkbRC8SVBQU0w==", + "dev": true, + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "object-inspect": "^1.13.4" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/side-channel-map": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz", + "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.5", + "object-inspect": "^1.13.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/side-channel-weakmap": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz", + "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.5", + "object-inspect": "^1.13.3", + "side-channel-map": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/signal-exit": { "version": "3.0.7", "resolved": "https://registry.npmmirror.com/signal-exit/-/signal-exit-3.0.7.tgz", @@ -8028,6 +10664,20 @@ "node": ">= 0.6" } }, + "node_modules/stop-iteration-iterator": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.1.0.tgz", + "integrity": "sha512-eLoXW/DHyl62zxY4SCaIgnRhuMr6ri4juEYARS8E6sCEqzKpOiE521Ucofdx+KnDZl5xmvGYaaKCk5FEOxJCoQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "internal-slot": "^1.1.0" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/strict-uri-encode": { "version": "2.0.0", "resolved": "https://registry.npmmirror.com/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz", @@ -8046,6 +10696,13 @@ "safe-buffer": "~5.2.0" } }, + "node_modules/string-natural-compare": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/string-natural-compare/-/string-natural-compare-3.0.1.tgz", + "integrity": "sha512-n3sPwynL1nwKi3WJ6AIsClwBMa0zTi54fn2oLU6ndfTSIO05xaznjSf15PcBZU6FNWbmN5Q6cxT4V5hGvB4taw==", + "dev": true, + "license": "MIT" + }, "node_modules/string-width": { "version": "4.2.3", "resolved": "https://registry.npmmirror.com/string-width/-/string-width-4.2.3.tgz", @@ -8081,6 +10738,105 @@ "node": ">=8" } }, + "node_modules/string.prototype.matchall": { + "version": "4.0.12", + "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.12.tgz", + "integrity": "sha512-6CC9uyBL+/48dYizRf7H7VAYCMCNTBeM78x/VTUe9bFEaxBepPJDa1Ow99LqI/1yF7kuy7Q3cQsYMrcjGUcskA==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "call-bound": "^1.0.3", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.6", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.0.0", + "get-intrinsic": "^1.2.6", + "gopd": "^1.2.0", + "has-symbols": "^1.1.0", + "internal-slot": "^1.1.0", + "regexp.prototype.flags": "^1.5.3", + "set-function-name": "^2.0.2", + "side-channel": "^1.1.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/string.prototype.repeat": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/string.prototype.repeat/-/string.prototype.repeat-1.0.0.tgz", + "integrity": "sha512-0u/TldDbKD8bFCQ/4f5+mNRrXwZ8hg2w7ZR8wa16e8z9XpePWl3eGEcUD0OXpEH/VJH/2G3gjUtR3ZOiBe2S/w==", + "dev": true, + "license": "MIT", + "dependencies": { + "define-properties": "^1.1.3", + "es-abstract": "^1.17.5" + } + }, + "node_modules/string.prototype.trim": { + "version": "1.2.11", + "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.11.tgz", + "integrity": "sha512-PwvK7BU+CMTJGYQCTZb5RWXIML92lftJLhQz1tBzgKiqGxJaMlBAa48POXaNAC2s4y8jr3EFqrkF9+44neS46w==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.9", + "call-bound": "^1.0.4", + "define-data-property": "^1.1.4", + "define-properties": "^1.2.1", + "es-abstract": "^1.24.2", + "es-object-atoms": "^1.1.2", + "has-property-descriptors": "^1.0.2", + "safe-regex-test": "^1.1.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/string.prototype.trimend": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.10.tgz", + "integrity": "sha512-2+3aDAOmPTmuFwjDnmJG2ctEkQKVki7vOSqaxkv42Mowj1V6PnvuwFCRrR5lChUux1TBskPjfkeTOhqczDMxTw==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.9", + "call-bound": "^1.0.4", + "define-properties": "^1.2.1", + "es-object-atoms": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/string.prototype.trimstart": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz", + "integrity": "sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/strip-ansi": { "version": "5.2.0", "resolved": "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-5.2.0.tgz", @@ -8111,6 +10867,19 @@ "node": ">=6" } }, + "node_modules/strip-json-comments": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", + "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/strnum": { "version": "1.1.2", "resolved": "https://registry.npmmirror.com/strnum/-/strnum-1.1.2.tgz", @@ -8212,6 +10981,13 @@ "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", "license": "MIT" }, + "node_modules/text-table": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", + "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", + "dev": true, + "license": "MIT" + }, "node_modules/throat": { "version": "5.0.0", "resolved": "https://registry.npmmirror.com/throat/-/throat-5.0.0.tgz", @@ -8291,12 +11067,61 @@ "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==", "license": "MIT" }, + "node_modules/ts-api-utils": { + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.4.3.tgz", + "integrity": "sha512-i3eMG77UTMD0hZhgRS562pv83RC6ukSAC2GMNWc+9dieh/+jDM5u5YG+NHX6VNDRHQcHwmsTHctP9LhbC3WxVw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=16" + }, + "peerDependencies": { + "typescript": ">=4.2.0" + } + }, "node_modules/tslib": { "version": "2.8.1", "resolved": "https://registry.npmmirror.com/tslib/-/tslib-2.8.1.tgz", "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==", "license": "0BSD" }, + "node_modules/tsutils": { + "version": "3.21.0", + "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz", + "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==", + "dev": true, + "license": "MIT", + "dependencies": { + "tslib": "^1.8.1" + }, + "engines": { + "node": ">= 6" + }, + "peerDependencies": { + "typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta" + } + }, + "node_modules/tsutils/node_modules/tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true, + "license": "0BSD" + }, + "node_modules/type-check": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", + "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", + "dev": true, + "license": "MIT", + "dependencies": { + "prelude-ls": "^1.2.1" + }, + "engines": { + "node": ">= 0.8.0" + } + }, "node_modules/type-detect": { "version": "4.0.8", "resolved": "https://registry.npmmirror.com/type-detect/-/type-detect-4.0.8.tgz", @@ -8315,6 +11140,84 @@ "node": ">=8" } }, + "node_modules/typed-array-buffer": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.3.tgz", + "integrity": "sha512-nAYYwfY3qnzX30IkA6AQZjVbtK6duGontcQm1WSG1MD94YLqK0515GNApXkoxKOWMusVssAHWLh9SeaoefYFGw==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3", + "es-errors": "^1.3.0", + "is-typed-array": "^1.1.14" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/typed-array-byte-length": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.3.tgz", + "integrity": "sha512-BaXgOuIxz8n8pIq3e7Atg/7s+DpiYrxn4vdot3w9KbnBhcRQq6o3xemQdIfynqSeXeDrF32x+WvfzmOjPiY9lg==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "for-each": "^0.3.3", + "gopd": "^1.2.0", + "has-proto": "^1.2.0", + "is-typed-array": "^1.1.14" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/typed-array-byte-offset": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.4.tgz", + "integrity": "sha512-bTlAFB/FBYMcuX81gbL4OcpH5PmlFHqlCCpAl8AlEzMz5k53oNDvN8p1PNOWLEmI2x4orp3raOFB51tv9X+MFQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "available-typed-arrays": "^1.0.7", + "call-bind": "^1.0.8", + "for-each": "^0.3.3", + "gopd": "^1.2.0", + "has-proto": "^1.2.0", + "is-typed-array": "^1.1.15", + "reflect.getprototypeof": "^1.0.9" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/typed-array-length": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.8.tgz", + "integrity": "sha512-phPGCwqr2+Qo0fwniCE8e4pKnGu/yFb5nD5Y8bf0EEeiI5GklnACYA9GFy/DrAeRrKHXvHn+1SUsOWgJp6RO+g==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.9", + "for-each": "^0.3.5", + "gopd": "^1.2.0", + "is-typed-array": "^1.1.15", + "possible-typed-array-names": "^1.1.0", + "reflect.getprototypeof": "^1.0.10" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/typescript": { "version": "5.9.3", "resolved": "https://registry.npmmirror.com/typescript/-/typescript-5.9.3.tgz", @@ -8329,6 +11232,25 @@ "node": ">=14.17" } }, + "node_modules/unbox-primitive": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.1.0.tgz", + "integrity": "sha512-nWJ91DjeOkej/TA8pXQ3myruKpKEYgqvpw9lz4OPHj/NWFNluYrjbz9j01CJ8yKQd2g4jFoOkINCTW2I5LEEyw==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3", + "has-bigints": "^1.0.2", + "has-symbols": "^1.1.0", + "which-boxed-primitive": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/undici-types": { "version": "8.3.0", "resolved": "https://registry.npmmirror.com/undici-types/-/undici-types-8.3.0.tgz", @@ -8423,6 +11345,16 @@ "browserslist": ">= 4.21.0" } }, + "node_modules/uri-js": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", + "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "punycode": "^2.1.0" + } + }, "node_modules/use-latest-callback": { "version": "0.2.6", "resolved": "https://registry.npmmirror.com/use-latest-callback/-/use-latest-callback-0.2.6.tgz", @@ -8465,26 +11397,6 @@ "node": ">= 0.8" } }, - "node_modules/victory-native": { - "version": "41.26.0", - "resolved": "https://registry.npmmirror.com/victory-native/-/victory-native-41.26.0.tgz", - "integrity": "sha512-NCRPQKdK99cIREXvtefEnGlOf29gd3RBMb5qVQ49+weY+mG6UHbBu4Wru7TObDyZo0NgywPWZP4dno9K8bz+Cg==", - "license": "MIT", - "dependencies": { - "d3-scale": "^4.0.2", - "d3-shape": "^3.2.0", - "d3-zoom": "^3.0.0", - "its-fine": "^1.2.5", - "react-fast-compare": "^3.2.2" - }, - "peerDependencies": { - "@shopify/react-native-skia": ">=1.2.3 <3.0.0", - "react": "*", - "react-native": "*", - "react-native-gesture-handler": ">=2.0.0", - "react-native-reanimated": ">=3.0.0" - } - }, "node_modules/vlq": { "version": "1.0.1", "resolved": "https://registry.npmmirror.com/vlq/-/vlq-1.0.1.tgz", @@ -8552,12 +11464,118 @@ "node": ">= 8" } }, + "node_modules/which-boxed-primitive": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.1.1.tgz", + "integrity": "sha512-TbX3mj8n0odCBFVlY8AxkqcHASw3L60jIuF8jFP78az3C2YhmGvqbHBpAjTRH2/xqYunrJ9g1jSyjCjpoWzIAA==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-bigint": "^1.1.0", + "is-boolean-object": "^1.2.1", + "is-number-object": "^1.1.1", + "is-string": "^1.1.1", + "is-symbol": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/which-builtin-type": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.2.1.tgz", + "integrity": "sha512-6iBczoX+kDQ7a3+YJBnh3T+KZRxM/iYNPXicqk66/Qfm1b93iu+yOImkg0zHbj5LNOcNv1TEADiZ0xa34B4q6Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "function.prototype.name": "^1.1.6", + "has-tostringtag": "^1.0.2", + "is-async-function": "^2.0.0", + "is-date-object": "^1.1.0", + "is-finalizationregistry": "^1.1.0", + "is-generator-function": "^1.0.10", + "is-regex": "^1.2.1", + "is-weakref": "^1.0.2", + "isarray": "^2.0.5", + "which-boxed-primitive": "^1.1.0", + "which-collection": "^1.0.2", + "which-typed-array": "^1.1.16" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/which-builtin-type/node_modules/isarray": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", + "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==", + "dev": true, + "license": "MIT" + }, + "node_modules/which-collection": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.2.tgz", + "integrity": "sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-map": "^2.0.3", + "is-set": "^2.0.3", + "is-weakmap": "^2.0.2", + "is-weakset": "^2.0.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/which-module": { "version": "2.0.1", "resolved": "https://registry.npmmirror.com/which-module/-/which-module-2.0.1.tgz", "integrity": "sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==", "license": "ISC" }, + "node_modules/which-typed-array": { + "version": "1.1.22", + "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.22.tgz", + "integrity": "sha512-fvO4ExWMFsqyhG3AiPAObMuY1lxaqgYcxbc49CNdWDDECOJNgQyvsOWVwbZc+qf3rzRtxojBK+CMEv0Ld5CYpw==", + "dev": true, + "license": "MIT", + "dependencies": { + "available-typed-arrays": "^1.0.7", + "call-bind": "^1.0.9", + "call-bound": "^1.0.4", + "for-each": "^0.3.5", + "get-proto": "^1.0.1", + "gopd": "^1.2.0", + "has-tostringtag": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/word-wrap": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", + "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/wrap-ansi": { "version": "7.0.0", "resolved": "https://registry.npmmirror.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz", diff --git a/app/package.json b/app/package.json index 9e8e37c..f020657 100644 --- a/app/package.json +++ b/app/package.json @@ -17,14 +17,13 @@ "@react-navigation/native-stack": "^6.10.0", "axios": "^1.7.2", "dayjs": "^1.11.11", - "react": "18.3.1", + "react": "18.2.0", "react-native": "0.74.5", "react-native-paper": "^5.12.3", "react-native-safe-area-context": "^4.10.5", "react-native-screens": "^3.32.0", "react-native-vector-icons": "^10.1.0", "react-native-video": "^6.2.0", - "victory-native": "^41.6.0", "zustand": "^4.5.4" }, "devDependencies": { @@ -32,9 +31,12 @@ "@babel/preset-env": "^7.25.3", "@babel/runtime": "^7.25.0", "@react-native/babel-preset": "0.74.85", + "@react-native/eslint-config": "0.74.85", "@react-native/metro-config": "^0.74.85", "@react-native/typescript-config": "0.74.85", "@types/react": "^18.3.3", + "eslint": "^8.57.1", + "prettier": "^2.8.8", "react-native-dotenv": "^3.4.11", "typescript": "^5.5.4" } diff --git a/app/src/components/MiniChart.tsx b/app/src/components/MiniChart.tsx index 960aa6a..ed8d431 100644 --- a/app/src/components/MiniChart.tsx +++ b/app/src/components/MiniChart.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { View, StyleSheet, Text, Dimensions } from 'react-native'; +import { View, StyleSheet, Text } from 'react-native'; interface MiniChartProps { data: { time: string; temp?: number; humidity?: number; co2?: number }[]; diff --git a/app/src/navigation/AppNavigator.tsx b/app/src/navigation/AppNavigator.tsx index 82c25c4..ff500e2 100644 --- a/app/src/navigation/AppNavigator.tsx +++ b/app/src/navigation/AppNavigator.tsx @@ -2,7 +2,7 @@ import React, { useEffect } from 'react'; import { NavigationContainer, useNavigation } from '@react-navigation/native'; import { createNativeStackNavigator } from '@react-navigation/native-stack'; import { createBottomTabNavigator } from '@react-navigation/bottom-tabs'; -import { Provider as PaperProvider, useTheme, MD3LightTheme } from 'react-native-paper'; +import { Provider as PaperProvider, MD3LightTheme } from 'react-native-paper'; import Icon from 'react-native-vector-icons/MaterialCommunityIcons'; import { setNavigationRef } from '../api/client'; import { useAuthStore } from '../store/authStore'; @@ -25,7 +25,7 @@ import SettingsScreen from '../screens/SettingsScreen'; const Stack = createNativeStackNavigator(); const Tab = createBottomTabNavigator(); -const TabIcon: React.FC<{ name: string; activeName: string; color: string; size: number; focused: boolean }> = ({ name, activeName, color, size, focused }) => ( +const TabIcon: React.FC<{ name: string; activeName: string; color: string; size: number; focused: boolean }> = ({ name, activeName, color, focused }) => ( ); diff --git a/app/src/screens/AlertsScreen.tsx b/app/src/screens/AlertsScreen.tsx index ae533e7..c39e9db 100644 --- a/app/src/screens/AlertsScreen.tsx +++ b/app/src/screens/AlertsScreen.tsx @@ -1,16 +1,13 @@ import React, { useEffect, useState, useCallback } from 'react'; import { StyleSheet, View, FlatList, RefreshControl, Alert } from 'react-native'; -import { Text, Card, useTheme, ActivityIndicator, Surface, SegmentedButtons, Button, Snackbar } from 'react-native-paper'; +import { Text, Card, ActivityIndicator, Surface, SegmentedButtons, Button, Snackbar } from 'react-native-paper'; import { SafeAreaView } from 'react-native-safe-area-context'; -import { useNavigation } from '@react-navigation/native'; import { getAlarms, ackAlarm, getAlarmClip } from '../api/alarms'; import { extractErrorMessage } from '../api/client'; import { formatRelativeTime, getSeverityLabel } from '../utils/format'; import type { Alarm } from '../types'; export default function AlertsScreen() { - const theme = useTheme(); - const navigation = useNavigation(); const [loading, setLoading] = useState(true); const [refreshing, setRefreshing] = useState(false); const [alarms, setAlarms] = useState([]); diff --git a/app/src/screens/DeviceControlScreen.tsx b/app/src/screens/DeviceControlScreen.tsx index b33eaeb..77b503c 100644 --- a/app/src/screens/DeviceControlScreen.tsx +++ b/app/src/screens/DeviceControlScreen.tsx @@ -1,6 +1,6 @@ import React, { useEffect, useState, useCallback } from 'react'; -import { StyleSheet, View, ScrollView, Alert } from 'react-native'; -import { Text, Card, Button, Switch, useTheme, ActivityIndicator, TextInput, SegmentedButtons, Divider, Snackbar } from 'react-native-paper'; +import { StyleSheet, View, ScrollView } from 'react-native'; +import { Text, Card, Button, Switch, ActivityIndicator, TextInput, SegmentedButtons, Divider, Snackbar } from 'react-native-paper'; import { SafeAreaView } from 'react-native-safe-area-context'; import { useRoute } from '@react-navigation/native'; import { sendControl } from '../api/devices'; @@ -10,7 +10,6 @@ import { formatNumber } from '../utils/format'; import type { RealtimeMetric } from '../types'; export default function DeviceControlScreen() { - const theme = useTheme(); const route = useRoute(); const { deviceKey, deviceName } = route.params; const [loading, setLoading] = useState(true); diff --git a/app/src/screens/DevicesScreen.tsx b/app/src/screens/DevicesScreen.tsx index f9249c0..4474873 100644 --- a/app/src/screens/DevicesScreen.tsx +++ b/app/src/screens/DevicesScreen.tsx @@ -1,6 +1,6 @@ import React, { useEffect, useState, useCallback } from 'react'; import { StyleSheet, View, FlatList, RefreshControl } from 'react-native'; -import { Text, Card, useTheme, ActivityIndicator, Surface, Searchbar, IconButton } from 'react-native-paper'; +import { Text, Card, ActivityIndicator, Surface, Searchbar, IconButton } from 'react-native-paper'; import { SafeAreaView } from 'react-native-safe-area-context'; import { useNavigation } from '@react-navigation/native'; import { getDevices } from '../api/devices'; @@ -8,7 +8,6 @@ import { formatRelativeTime } from '../utils/format'; import type { Device } from '../types'; export default function DevicesScreen() { - const theme = useTheme(); const navigation = useNavigation(); const [loading, setLoading] = useState(true); const [refreshing, setRefreshing] = useState(false); diff --git a/app/src/screens/RoomDetailScreen.tsx b/app/src/screens/RoomDetailScreen.tsx index f3e25b1..79d5357 100644 --- a/app/src/screens/RoomDetailScreen.tsx +++ b/app/src/screens/RoomDetailScreen.tsx @@ -1,6 +1,6 @@ import React, { useEffect, useState, useCallback, useRef } from 'react'; import { StyleSheet, View, ScrollView, RefreshControl } from 'react-native'; -import { Text, Card, useTheme, ActivityIndicator, Surface } from 'react-native-paper'; +import { Text, Card, ActivityIndicator, Surface } from 'react-native-paper'; import { SafeAreaView } from 'react-native-safe-area-context'; import { useRoute } from '@react-navigation/native'; import { getRoom } from '../api/rooms'; @@ -11,7 +11,6 @@ import { formatRelativeTime } from '../utils/format'; import type { Room, RealtimeMetric, Device, TrendPoint } from '../types'; export default function RoomDetailScreen() { - const theme = useTheme(); const route = useRoute(); const { roomId, roomName } = route.params; const [loading, setLoading] = useState(true); diff --git a/app/src/screens/RoomsScreen.tsx b/app/src/screens/RoomsScreen.tsx index a48564d..cc5cb2a 100644 --- a/app/src/screens/RoomsScreen.tsx +++ b/app/src/screens/RoomsScreen.tsx @@ -1,14 +1,12 @@ import React, { useEffect, useState, useCallback } from 'react'; import { StyleSheet, View, FlatList, RefreshControl } from 'react-native'; -import { Text, Card, useTheme, ActivityIndicator, IconButton } from 'react-native-paper'; +import { Text, Card, ActivityIndicator, IconButton } from 'react-native-paper'; import { SafeAreaView } from 'react-native-safe-area-context'; import { useNavigation } from '@react-navigation/native'; import { getRooms } from '../api/rooms'; -import { formatRelativeTime } from '../utils/format'; import type { Room } from '../types'; export default function RoomsScreen() { - const theme = useTheme(); const navigation = useNavigation(); const [loading, setLoading] = useState(true); const [refreshing, setRefreshing] = useState(false); diff --git a/app/src/screens/SettingsScreen.tsx b/app/src/screens/SettingsScreen.tsx index 14e29b7..a837955 100644 --- a/app/src/screens/SettingsScreen.tsx +++ b/app/src/screens/SettingsScreen.tsx @@ -2,13 +2,11 @@ import React, { useState } from 'react'; import { StyleSheet, View, Alert, ScrollView } from 'react-native'; import { Text, Card, Button, useTheme, Divider, TextInput, List, Avatar } from 'react-native-paper'; import { SafeAreaView } from 'react-native-safe-area-context'; -import { useNavigation } from '@react-navigation/native'; import { useAuthStore } from '../store/authStore'; import { API_BASE_URL } from '@env'; export default function SettingsScreen() { const theme = useTheme(); - const navigation = useNavigation(); const { user, logout } = useAuthStore(); const [apiUrl, setApiUrl] = useState(API_BASE_URL || 'http://localhost:3000/api/v1'); diff --git a/app/src/screens/VideoPlayerScreen.tsx b/app/src/screens/VideoPlayerScreen.tsx index 9371b33..7a52d84 100644 --- a/app/src/screens/VideoPlayerScreen.tsx +++ b/app/src/screens/VideoPlayerScreen.tsx @@ -1,5 +1,5 @@ import React, { useState, useRef, useEffect } from 'react'; -import { StyleSheet, View, StatusBar, Alert, ActivityIndicator } from 'react-native'; +import { StyleSheet, View, StatusBar, ActivityIndicator } from 'react-native'; import { Text, IconButton, Surface } from 'react-native-paper'; import { SafeAreaView } from 'react-native-safe-area-context'; import { useRoute, useNavigation } from '@react-navigation/native'; diff --git a/app/src/screens/VideoScreen.tsx b/app/src/screens/VideoScreen.tsx index 1001444..223e4d8 100644 --- a/app/src/screens/VideoScreen.tsx +++ b/app/src/screens/VideoScreen.tsx @@ -3,8 +3,8 @@ import { StyleSheet, View, FlatList, RefreshControl, Alert } from 'react-native' import { Text, Card, Button, useTheme, ActivityIndicator, Surface, IconButton, SegmentedButtons } from 'react-native-paper'; import { SafeAreaView } from 'react-native-safe-area-context'; import { useNavigation } from '@react-navigation/native'; -import { getCameras, getClips, playCamera } from '../api/video'; -import { extractErrorMessage, resolveUrl } from '../api/client'; +import { getCameras, getClips } from '../api/video'; +import { resolveUrl } from '../api/client'; import { formatDateTime, formatDuration, formatFileSize } from '../utils/format'; import type { Camera, VideoClip } from '../types'; diff --git a/miniapp/package.json b/miniapp/package.json index 4fa86fc..952ea0a 100644 --- a/miniapp/package.json +++ b/miniapp/package.json @@ -10,6 +10,7 @@ "framework": "React" }, "scripts": { + "typecheck": "tsc --noEmit", "build:weapp": "taro build --type weapp", "build:swan": "taro build --type swan", "build:alipay": "taro build --type alipay", diff --git a/miniapp/src/app.tsx b/miniapp/src/app.tsx index 0d576f6..e02dd4a 100644 --- a/miniapp/src/app.tsx +++ b/miniapp/src/app.tsx @@ -1,4 +1,4 @@ -import React, { useEffect } from 'react'; +import { useEffect } from 'react'; import { useDidShow, useDidHide } from '@tarojs/taro'; import { useStore } from '@/store/useStore'; import './app.scss'; diff --git a/miniapp/src/pages/alerts/index.tsx b/miniapp/src/pages/alerts/index.tsx index e0d0e3f..99dda4f 100644 --- a/miniapp/src/pages/alerts/index.tsx +++ b/miniapp/src/pages/alerts/index.tsx @@ -188,7 +188,7 @@ const AlertsPage: React.FC = () => { - {alarm.severity === 'critical' || alarm.severity === 1 ? '🔴' : '🟡'} + {alarm.severity === 'critical' || alarm.severity === '1' ? '🔴' : '🟡'} {alarm.title || alarm.code || '环境告警'} diff --git a/miniapp/src/pages/dashboard/index.tsx b/miniapp/src/pages/dashboard/index.tsx index ff51f89..65a060b 100644 --- a/miniapp/src/pages/dashboard/index.tsx +++ b/miniapp/src/pages/dashboard/index.tsx @@ -285,7 +285,7 @@ const DashboardPage: React.FC = () => { className={styles.sectionAction} onClick={() => handleRoomDetail(selectedRoom.id)} > - 详情 > + 详情 {'>'} )} @@ -347,7 +347,7 @@ const DashboardPage: React.FC = () => { 最近告警 - 全部 > + 全部 {'>'} {recentAlarms.length > 0 ? ( diff --git a/miniapp/src/pages/devices/control/index.tsx b/miniapp/src/pages/devices/control/index.tsx index 7d365c4..a5adc4a 100644 --- a/miniapp/src/pages/devices/control/index.tsx +++ b/miniapp/src/pages/devices/control/index.tsx @@ -79,8 +79,8 @@ const ControlPage: React.FC = () => { } }; - const handleToggle = (newVal: boolean) => { - handleSend('power', newVal ? 'on' : 'off'); + const handleToggle = (event: { detail: { value: boolean } }) => { + handleSend('power', event.detail.value ? 'on' : 'off'); }; const getMetricColor = (status: string) => { diff --git a/miniapp/src/pages/knowledge/detail/index.tsx b/miniapp/src/pages/knowledge/detail/index.tsx index 008f889..31209db 100644 --- a/miniapp/src/pages/knowledge/detail/index.tsx +++ b/miniapp/src/pages/knowledge/detail/index.tsx @@ -1,6 +1,6 @@ import React, { useCallback, useEffect, useState } from 'react'; import { Image, ScrollView, Text, View } from '@tarojs/components'; -import Taro, { useRouter } from '@tarojs/taro'; +import { useRouter } from '@tarojs/taro'; import styles from './index.module.scss'; import { getArticle, diff --git a/miniapp/src/pages/lamp/index.tsx b/miniapp/src/pages/lamp/index.tsx index ae1262f..83bc0e4 100644 --- a/miniapp/src/pages/lamp/index.tsx +++ b/miniapp/src/pages/lamp/index.tsx @@ -37,7 +37,6 @@ const LampPage: React.FC = () => { const [stepsMap, setStepsMap] = useState>({}); const [expandedId, setExpandedId] = useState(''); const [result, setResult] = useState(''); - const [imagePath, setImagePath] = useState(''); const [loading, setLoading] = useState(true); const fetchData = useCallback(async () => { @@ -71,7 +70,6 @@ const LampPage: React.FC = () => { } setExpandedId(t.id); setResult(t.result || ''); - setImagePath(''); }; const handleStepToggle = async (t: LampTest, s: LampTestStep, done: boolean) => { @@ -88,7 +86,6 @@ const LampPage: React.FC = () => { sizeType: ['compressed'], success: async (res) => { const path = res.tempFilePaths[0]; - setImagePath(path); try { const up = await uploadLampResultImage(t.id, path); setTests((prev) => @@ -155,11 +152,11 @@ const LampPage: React.FC = () => { 检测结果（天蓝=阳性，紫罗兰=阴性） - setResult(e.detail.value)}> + setResult(e.detail.value[0])}> - 阳性 - 阴性 - 无效 + 阳性 + 阴性 + 无效 {t.result ? 当前结果：{RESULT_LABELS[t.result]} : null} diff --git a/miniapp/src/pages/notification/index.tsx b/miniapp/src/pages/notification/index.tsx index 272182d..2c9439c 100644 --- a/miniapp/src/pages/notification/index.tsx +++ b/miniapp/src/pages/notification/index.tsx @@ -56,6 +56,7 @@ const NotificationPage: React.FC = () => { try { const res = await Taro.requestSubscribeMessage({ tmplIds: configured.map((t) => t.id), + entityIds: configured.map((t) => t.id), }); for (const t of configured) { if (res[t.id] === 'accept') { diff --git a/miniapp/src/pages/video/player/index.tsx b/miniapp/src/pages/video/player/index.tsx index 11fa7ee..2c39fdf 100644 --- a/miniapp/src/pages/video/player/index.tsx +++ b/miniapp/src/pages/video/player/index.tsx @@ -1,10 +1,10 @@ import React, { useState, useEffect } from 'react'; import { View, Text, Video } from '@tarojs/components'; -import Taro, { useRouter } from '@tarojs/taro'; +import { useRouter } from '@tarojs/taro'; import styles from './index.module.scss'; -import { getCameras, playCamera } from '@/api/video'; +import { getCameras } from '@/api/video'; import { resolveUrl } from '@/api/config'; -import type { Camera, VideoPlayResponse } from '@/types'; +import type { Camera } from '@/types'; const VideoPlayerPage: React.FC = () => { const router = useRouter(); diff --git a/miniapp/tsconfig.json b/miniapp/tsconfig.json index 9f8b9a1..84f4834 100644 --- a/miniapp/tsconfig.json +++ b/miniapp/tsconfig.json @@ -12,6 +12,7 @@ "noUnusedLocals": true, "noUnusedParameters": true, "strictNullChecks": true, + "skipLibCheck": true, "sourceMap": true, "baseUrl": "", "rootDir": "", diff --git a/scripts/verify.ps1 b/scripts/verify.ps1 new file mode 100644 index 0000000..f2ba91b --- /dev/null +++ b/scripts/verify.ps1 @@ -0,0 +1,94 @@ +$ErrorActionPreference = 'Stop' + +$root = Split-Path -Parent $PSScriptRoot +$script:failed = @() + +function Resolve-Go { + $cmd = Get-Command go -ErrorAction SilentlyContinue + if ($cmd) { + return $cmd.Source + } + foreach ($candidate in @('C:\Program Files\Go\bin\go.exe', 'C:\Go\bin\go.exe')) { + if (Test-Path -LiteralPath $candidate) { + return $candidate + } + } + throw 'Go executable not found. Install Go 1.23 or add it to PATH.' +} + +function Invoke-Check { + param( + [Parameter(Mandatory = $true)] + [string]$Name, + [Parameter(Mandatory = $true)] + [scriptblock]$Command + ) + + Write-Host "[$Name]" + try { + & $Command + if ($LASTEXITCODE -ne 0) { + Write-Host "FAILED: $Name (exit $LASTEXITCODE)" + $script:failed += $Name + } + } catch { + Write-Host "FAILED: $Name - $($_.Exception.Message)" + $script:failed += $Name + } +} + +$goExe = Resolve-Go + +Push-Location (Join-Path $root 'server-go') +try { + Invoke-Check 'server-go test' { & $goExe test ./... } + Invoke-Check 'server-go vet' { & $goExe vet ./... } + Invoke-Check 'server-go build' { & $goExe build ./... } +} finally { + Pop-Location +} + +Push-Location (Join-Path $root 'web') +try { + Invoke-Check 'web test' { npm test } + Invoke-Check 'web lint' { npm run lint } + Invoke-Check 'web build' { npm run build } +} finally { + Pop-Location +} + +Push-Location (Join-Path $root 'miniapp') +try { + Invoke-Check 'miniapp typecheck' { npm run typecheck } + Invoke-Check 'miniapp build:weapp' { npm run build:weapp } +} finally { + Pop-Location +} + +Push-Location (Join-Path $root 'app') +try { + Invoke-Check 'app typecheck' { npm run tsc } + Invoke-Check 'app lint' { npm run lint } +} finally { + Pop-Location +} + +$aiPython = Join-Path $root 'ai-service\.venv\Scripts\python.exe' +if (-not (Test-Path -LiteralPath $aiPython)) { + $aiPython = 'python' +} + +Push-Location (Join-Path $root 'ai-service') +try { + Invoke-Check 'ai-service pytest' { & $aiPython -m pytest } +} finally { + Pop-Location +} + +if ($script:failed.Count -gt 0) { + Write-Error "Verification failed for: $($script:failed -join ', ')" + exit 1 +} + +Write-Host 'All verification checks passed.' +exit 0 diff --git a/开发交接记录.md b/开发交接记录.md index 6f61351..d553b88 100644 --- a/开发交接记录.md +++ b/开发交接记录.md @@ -743,3 +743,38 @@ MVP 沿用 IoTDB（现状）；TDengine 作为生产规模化候选（先基准 - 删除索引：`codebase-memory-mcp cli delete_project '{"project":"D-silk-master-84e4ddc"}'`； - 恢复 Codex 配置：用备份 `config.toml.cbm-bak-20260813-213259` 覆盖 `config.toml` 即可；本次未改业务代码、数据库或服务器。 + +--- + +## 2026-08-13 整改 Task 1：恢复可复现的多端质量基线 + +### 做了什么 + +- 修复小程序 `dashboard` 两处 TS1382 裸 `>`，新增 `npm run typecheck`； +- 小程序 tsconfig 增加 `skipLibCheck`，修复 alerts、设备控制、LAMP、通知、视频播放、app、知识详情等源码类型问题，使 `tsc --noEmit` 通过； +- APP 依赖对齐 RN 0.74：`react` 调整为 `18.2.0`，移除未使用的 `victory-native`，补充 `@react-native/eslint-config`、`eslint`、`prettier`，新增 `.eslintrc.js`； +- APP 清理未使用导入/变量，`npm run tsc` 通过，`npm run lint` 无 error； +- 新增 `scripts/verify.ps1` 单命令质量门禁，覆盖 Go、Web、小程序、APP、ai-service；`ai-service/README.md` 增加质量检查说明； +- `.gitignore` 增加 `scripts/verify.ps1` 例外。CI 接入未做，等待 Task 0 确认平台。 + +### 设计思路与决策依据 + +- Task 1 目标是建立可复现门禁，因此以“最小修复、不重排全仓”为原则：Taro 依赖声明文件用 `skipLibCheck` 隔离，真实源码错误逐个修正； +- APP 不重排全仓：将 `prettier/prettier` 降为 warning，保留 1032 个风格 warning 待后续单独格式化任务处理，不让既有格式差异阻塞 lint 门禁； +- APP 安装失败根因是 RN 0.74 要求 `react@18.2.0`，以及 `victory-native` 最新依赖链引入 React 19 的 Skia；因源码未引用 `victory-native`，直接移除； +- `verify.ps1` 显式解析 Go 路径，并在存在 `.venv` 时使用 `ai-service/.venv/Scripts/python.exe`，解决本机 PATH 与系统 Python 缺依赖问题。 + +### 验证结果 + +- `powershell -ExecutionPolicy Bypass -File scripts/verify.ps1` 最终 exit 0； +- Go：`go test ./...`、`go vet ./...`、`go build ./...` 通过； +- Web：`npm test` 3/3 通过，`npm run lint` 有 5 个 warning，`npm run build` 通过； +- 小程序：`npm run typecheck`、`npm run build:weapp` 通过； +- APP：`npm run tsc` 通过，`npm run lint` 0 error / 1032 warning； +- ai-service：pytest 8/8 通过，仅保留 Starlette/httpx deprecation warning； +- 未执行 CI、服务器部署、真实模型或容量验收，这些仍等待 Task 0 决策与后续任务。 + +### 回滚点 + +- 本任务前基线提交为 `1b8cab1`；回滚可删除/还原本 Task 1 分支提交，恢复 `.gitignore`、APP 依赖锁文件与小程序类型修复； +- 无数据库、环境变量、服务器或生成产物变更；APP `node_modules` 为忽略目录，不影响回滚。 From 20bea001ac1282556a2f0deb8aceb9022614380f Mon Sep 17 00:00:00 2001 From: weijuesen Date: Thu, 13 Aug 2026 22:35:30 +0800 Subject: [PATCH 02/18] =?UTF-8?q?docs:=20=E5=9B=BA=E5=8C=96=E6=95=B4?= =?UTF-8?q?=E6=94=B9=20Task=200=20=E5=86=B3=E7=AD=96=E4=B8=8E=20Wave=200-4?= =?UTF-8?q?=20=E7=8A=B6=E6=80=81=E5=9F=BA=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../2026-08-13-remediation-decisions.md | 21 +++++++++++++++ 后续工作计划.md | 22 ++++++++++++++++ 开发交接记录.md | 26 +++++++++++++++++++ 3 files changed, 69 insertions(+) create mode 100644 docs/decisions/2026-08-13-remediation-decisions.md diff --git a/docs/decisions/2026-08-13-remediation-decisions.md b/docs/decisions/2026-08-13-remediation-decisions.md new file mode 100644 index 0000000..066f682 --- /dev/null +++ b/docs/decisions/2026-08-13-remediation-decisions.md @@ -0,0 +1,21 @@ +# 2026-08-13 整改决策记录 + +> 范围：对应《项目整改实施计划 V1.0》Task 0 与《蚕病智能防控平台规格说明书 V2.2》第 13 章开放决策。 +> 执行原则：项目负责人已指示开始整改；未获得明确产品/合规/专业确认的事项，本记录采用“保持现状 + 明确复审触发条件”，不擅自进入生产部署。 + +| Decision ID | 结论 | 备选方案 | 选择理由 | 影响 | 负责人 | 复审条件 | +|---|---|---|---|---|---|---| +| DEC-001 | Go 数据库迁移采用 `golang-migrate/migrate/v4`；SQL 迁移文件是唯一 schema 事实来源，命名 `NNNNNN_name.up.sql` / `NNNNNN_name.down.sql` | goose；自研 runner；GORM AutoMigrate | 与计划中 `000001_baseline.up.sql` 命名一致；支持嵌入式 SQL、版本表、up/down 和 PostgreSQL；可复用 Go 标准 `embed` | Task 2 起引入迁移依赖；生产启动执行迁移并禁止 AutoMigrate | 项目负责人 + 后端 | golang-migrate 升级、迁移目录规则变更或生产多实例发现锁冲突时 | +| DEC-002 | CI 保持现状：不新增远程 CI；本地门禁使用 `scripts/verify.ps1`；候选平台为 GitHub Actions | GitLab CI；Jenkins；Gitea Actions | 仓库当前无 remote，无法配置并验证外部 CI；先保留可复现本地门禁 | Task 1 的 CI 接入步骤暂不完成；CI 配置待平台确定 | 项目负责人 + 运维 | 仓库获得 remote 或团队确认 CI 平台时 | +| DEC-003 | 制品保持现状：构建产物不入库，沿用 `web/dist`、`miniapp/dist`、二进制等 gitignore 规则 | GitHub Releases/Artifacts；NAS；Git LFS | 尚未确定 CI 与发布平台，先避免生成产物污染仓库 | 发布继续按 AGENTS.md 手动备份/回滚 | 项目负责人 + 运维 | 进入正式发布流程前 | +| DEC-004 | 数据保留期限保持现状：不自动删除历史数据；具体 bucket/表保留期在 Task 13/14 前评审 | 固定 30/90/365 天 | 当前试点数据量有限，且未获合规/业务确认，不应擅自删数 | 存储增长需纳入容量监控 | 项目负责人 + 运维 | 生产试点或容量告警触发时 | +| DEC-005 | qPCR 保持“只录入、不自动判读”；领域专家确认 protocolVersion、对照规则和阈值后才启用自动判读 | 沿用现有“无 Ct 即阴性” | 当前自动判读存在误判风险，Task 7 将改为四态结果 | Task 7 实现 positive/negative/invalid/indeterminate；专家签字前不输出业务结论 | 领域专家 + 后端 | 专家签字并给出 protocolVersion 时 | +| DEC-006 | APP 保持现状：作为环境监控端，不扩展为全量蚕病功能 | 全量同步 Web/小程序蚕病功能 | 当前 APP 源码未实现蚕病功能，扩大同步会显著增加维护面 | Task 0 后不新增 APP 蚕病页面 | 产品负责人 | 试点用户明确提出 APP 蚕病需求时 | +| DEC-007 | 真实模型二分类转多病种指标门槛保持“未定义，不允许上生产”；待数据集修复和训练恢复后按冻结测试集、mAP、混淆矩阵评审 | 先预设 mAP 0.5 | 当前无真实模型，不能凭空设置验收门槛 | AI 生产继续 mock/不接受为真实验收 | AI 负责人 + 项目负责人 | 数据集修复完成或模型训练恢复时 | +| DEC-008 | 生产云厂商、对象存储、域名和证书保持现状：不迁移云，继续沿用物理机开发环境 | 云 OSS/COS；云 RDS | 当前无生产试点和上云评审；上云属于发布决策 | 部署仍按 `部署指南(物理机).md` | 项目负责人 + 运维 | 正式生产试点前 | + +## 生效与复审 + +- 生效日期：2026-08-13。 +- 所有“保持现状”决策不是永久结论，仅在本轮整改期内有效。 +- 任何决策变化必须更新本表，并在 `开发交接记录.md` 追加影响与回滚点。 diff --git a/后续工作计划.md b/后续工作计划.md index f65e31a..a56ba3e 100644 --- a/后续工作计划.md +++ b/后续工作计划.md @@ -2,6 +2,28 @@ > **完成状态（2026-08-13 更新）**：#5-#24、#27 已完成（详见 `开发交接记录.md`）；#1-4 因物理机问题挂起；#23/#26 骨架完成；微信/天气真实数据待凭证。 +## 整改实施计划 Wave 0-4（2026-08-13 启动） + +能力状态使用七态：未开始、方案确定、骨架、Mock、手工录入、部分可用、可验收、已验证。 + +| Wave | 范围 | 任务 | 状态 | 阻塞 | +|---|---|---|---|---| +| Wave 0 | 决策与基线 | Task 0 固化开放决策与整改基线 | 方案确定 | 无，决策记录已生成 | +| Wave 0 | 决策与基线 | Task 1 恢复可复现的多端质量基线 | 部分可用 | CI 待 Task 0 平台落地 | +| Wave 1 | P0 安全与正确性 | Task 2 版本化数据库迁移与 Schema 启动门禁 | 未开始 | 无 | +| Wave 1 | P0 安全与正确性 | Task 3 移除默认密钥与默认管理员密码 | 未开始 | 无 | +| Wave 1 | P0 安全与正确性 | Task 4 收口视频访问与摄像头密钥输出 | 未开始 | 无 | +| Wave 1 | P0 安全与正确性 | Task 5 修复 WebSocket 越权与 AI 流 SSRF | 未开始 | 无 | +| Wave 1 | P0 安全与正确性 | Task 6 修复 AI 风险语义并隔离 Mock 数据 | 未开始 | 无 | +| Wave 1 | P0 安全与正确性 | Task 7 修订 qPCR 判读与检测质控 | 未开始 | 需领域专家确认 | +| Wave 2 | 工程可靠性 | Task 8 建立可靠通知、吊销与跨实例状态 | 未开始 | 无 | +| Wave 2 | 工程可靠性 | Task 9 建立统一检测任务、样本链与发病事件 | 未开始 | 无 | +| Wave 3 | 业务闭环 | Task 10 补齐消毒、种源与二维码身份链 | 未开始 | 无 | +| Wave 3 | 业务闭环 | Task 11 实现小程序离线巡检与可靠同步 | 未开始 | 无 | +| Wave 3 | 业务闭环 | Task 12 完善环境规则、会诊治理、知识审核与效果评估 | 未开始 | 无 | +| Wave 4 | 验收与发布 | Task 13 建立可观测性、容量与恢复验证 | 未开始 | 无 | +| Wave 4 | 验收与发布 | Task 14 建立规格追踪、端到端验收与发布门禁 | 未开始 | 无 | + ## 技术选型决策（2026-08-11 确定） **采用混合架构：现有 Go 底座 + Python AI 微服务** diff --git a/开发交接记录.md b/开发交接记录.md index d553b88..028babd 100644 --- a/开发交接记录.md +++ b/开发交接记录.md @@ -778,3 +778,29 @@ MVP 沿用 IoTDB（现状）；TDengine 作为生产规模化候选（先基准 - 本任务前基线提交为 `1b8cab1`；回滚可删除/还原本 Task 1 分支提交，恢复 `.gitignore`、APP 依赖锁文件与小程序类型修复； - 无数据库、环境变量、服务器或生成产物变更；APP `node_modules` 为忽略目录，不影响回滚。 + +--- + +## 2026-08-13 整改 Task 0：固化开放决策与整改基线 + +### 做了什么 + +- 新增 `docs/decisions/2026-08-13-remediation-decisions.md`，按固定表头固化 8 项决策； +- `后续工作计划.md` 增加 Wave 0-4 状态表，使用规格书 V2.2 七态能力状态； +- 决策范围覆盖迁移工具、CI/制品、数据保留、qPCR、APP 范围、模型指标门槛、云部署/域名/证书。 + +### 设计思路与决策依据 + +- 未获得明确产品/合规/专业确认的事项，按“保持现状 + 明确复审触发条件”记录，不擅自进入生产部署； +- 迁移工具选择 `golang-migrate/migrate/v4`，与实施计划中的 `NNNNNN_name.up.sql/.down.sql` 命名和 PostgreSQL 目标一致； +- CI 当前无 remote，先保留 `scripts/verify.ps1` 本地门禁，避免配置无法验证的外部 CI。 + +### 验证结果 + +- `rg -n "Decision ID|迁移|CI|保留|qPCR|APP|二分类" docs/decisions/2026-08-13-remediation-decisions.md` 可检索到对应主题； +- `git diff --check` 无空白错误； +- 本交付只新增/修改文档，不改业务代码、依赖、数据库或服务器。 + +### 回滚点 + +- 删除 `docs/decisions/2026-08-13-remediation-decisions.md`，移除 `后续工作计划.md` Wave 0-4 表和本节即可；无运行时影响。 From 8b977e41643ca40d3dc6786b9d4b7f42de05997f Mon Sep 17 00:00:00 2001 From: weijuesen Date: Thu, 13 Aug 2026 22:51:45 +0800 Subject: [PATCH 03/18] =?UTF-8?q?feat:=20=E5=BC=95=E5=85=A5=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=8C=96=E6=95=B0=E6=8D=AE=E5=BA=93=E8=BF=81=E7=A7=BB?= =?UTF-8?q?=E4=B8=8E=20Schema=20=E5=90=AF=E5=8A=A8=E9=97=A8=E7=A6=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 + README.md | 6 +- server-go/cmd/server/main.go | 2 +- server-go/go.mod | 19 +- server-go/go.sum | 85 +++- server-go/internal/config/config.go | 2 + server-go/internal/database/db.go | 47 +- server-go/internal/database/migrate.go | 66 +++ server-go/internal/database/migrate_test.go | 103 +++++ server-go/migrations/000001_baseline.down.sql | 26 ++ server-go/migrations/000001_baseline.up.sql | 420 ++++++++++++++++++ server-go/migrations/embed.go | 6 + 后续工作计划.md | 2 +- 开发交接记录.md | 32 ++ 部署指南(物理机).md | 6 + 15 files changed, 779 insertions(+), 45 deletions(-) create mode 100644 server-go/internal/database/migrate.go create mode 100644 server-go/internal/database/migrate_test.go create mode 100644 server-go/migrations/000001_baseline.down.sql create mode 100644 server-go/migrations/000001_baseline.up.sql create mode 100644 server-go/migrations/embed.go diff --git a/.gitignore b/.gitignore index 2af4184..e7cee0a 100644 --- a/.gitignore +++ b/.gitignore @@ -29,6 +29,8 @@ __pycache__/ !scripts/verify.ps1 *.py *.sql +!server-go/migrations/ +!server-go/migrations/*.sql # ai-service（Python 推理服务）文件例外 !ai-service/ !ai-service/app/ diff --git a/README.md b/README.md index 1cbaf37..e2fb719 100644 --- a/README.md +++ b/README.md @@ -173,7 +173,7 @@ silk/ │ ├─ cmd/server/main.go # 入口 │ ├─ internal/ │ │ ├─ config/ # 环境变量配置 -│ │ ├─ database/ # GORM 数据库连接与自动迁移 +│ │ ├─ database/ # GORM 数据库连接与版本化迁移 │ │ ├─ handler/ # HTTP handler（auth/device/alarm/video 等） │ │ ├─ middleware/ # JWT 鉴权、RBAC 权限、CORS、限流、安全头 │ │ ├─ model/ # GORM 数据模型 + 权限种子数据 @@ -426,7 +426,7 @@ Payload 示例： ### 10.1 PostgreSQL（业务数据） -保存用户、蚕房、设备、传感器、阈值、告警、摄像头、录像片段、审计日志、权限等业务数据。GORM 自动迁移建表，系统启动时自动初始化权限种子数据。 +保存用户、蚕房、设备、传感器、阈值、告警、摄像头、录像片段、审计日志、权限等业务数据。系统启动时先执行 `server-go/migrations/` 下的版本化 SQL 迁移，再初始化权限种子数据；生产环境禁用 AutoMigrate。 ```env PG=postgresql://postgres:pan@localhost:5432/silk @@ -499,6 +499,8 @@ C:\msys64\usr\bin\sshpass.exe -p "pan" C:\msys64\usr\bin\ssh.exe -o StrictHostKe | 变量 | 默认值 | 说明 | |------|--------|------| | `PG` | `postgresql://postgres:pan@localhost:5432/silk` | PostgreSQL 连接串 | +| `APP_ENV` | `development` | 运行环境；生产环境应设为 `production` | +| `ALLOW_DEV_AUTOMIGRATE` | `false` | 仅开发环境可显式开启 AutoMigrate，生产忽略此开关 | | `REDIS` | `redis://:pan@localhost:6379` | Valkey/Redis 连接串 | | `JWT_SECRET` | `silk-secret-please-change-me` | JWT 签名密钥 | | `JWT_EXPIRES_IN` | `2h` | JWT 有效期 | diff --git a/server-go/cmd/server/main.go b/server-go/cmd/server/main.go index 8ea219c..a4e1e0d 100644 --- a/server-go/cmd/server/main.go +++ b/server-go/cmd/server/main.go @@ -28,7 +28,7 @@ func main() { os.Exit(1) } - // 2. 连接数据库（GORM 自动迁移） + // 2. 连接数据库并执行版本化迁移 if err := database.Init(cfg); err != nil { slog.Error("数据库连接失败", "err", err) os.Exit(1) diff --git a/server-go/go.mod b/server-go/go.mod index 03fc01f..764c945 100644 --- a/server-go/go.mod +++ b/server-go/go.mod @@ -5,6 +5,7 @@ go 1.23 exclude github.com/rogpeppe/go-internal v1.15.0 require ( + github.com/DATA-DOG/go-sqlmock v1.5.2 github.com/aws/aws-sdk-go-v2 v1.30.3 github.com/aws/aws-sdk-go-v2/credentials v1.17.27 github.com/aws/aws-sdk-go-v2/service/s3 v1.58.2 @@ -12,9 +13,10 @@ require ( github.com/eclipse/paho.mqtt.golang v1.5.0 github.com/gin-gonic/gin v1.10.0 github.com/golang-jwt/jwt/v5 v5.2.1 + github.com/golang-migrate/migrate/v4 v4.18.2 github.com/gorilla/websocket v1.5.3 github.com/redis/go-redis/v9 v9.6.1 - golang.org/x/crypto v0.25.0 + golang.org/x/crypto v0.31.0 gorm.io/driver/postgres v1.5.9 gorm.io/gorm v1.25.10 ) @@ -41,6 +43,8 @@ require ( github.com/go-playground/universal-translator v0.18.1 // indirect github.com/go-playground/validator/v10 v10.20.0 // indirect github.com/goccy/go-json v0.10.2 // indirect + github.com/hashicorp/errwrap v1.1.0 // indirect + github.com/hashicorp/go-multierror v1.1.1 // indirect github.com/jackc/pgpassfile v1.0.0 // indirect github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect github.com/jackc/pgx/v5 v5.5.5 // indirect @@ -49,8 +53,8 @@ require ( github.com/jinzhu/now v1.1.5 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/cpuid/v2 v2.2.7 // indirect - github.com/kr/text v0.2.0 // indirect github.com/leodido/go-urn v1.4.0 // indirect + github.com/lib/pq v1.10.9 // indirect github.com/mattn/go-isatty v0.0.20 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect @@ -58,11 +62,12 @@ require ( github.com/rogpeppe/go-internal v1.14.1 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect github.com/ugorji/go/codec v1.2.12 // indirect + go.uber.org/atomic v1.7.0 // indirect golang.org/x/arch v0.8.0 // indirect - golang.org/x/net v0.27.0 // indirect - golang.org/x/sync v0.7.0 // indirect - golang.org/x/sys v0.26.0 // indirect - golang.org/x/text v0.16.0 // indirect - google.golang.org/protobuf v1.34.1 // indirect + golang.org/x/net v0.33.0 // indirect + golang.org/x/sync v0.10.0 // indirect + golang.org/x/sys v0.28.0 // indirect + golang.org/x/text v0.21.0 // indirect + google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/server-go/go.sum b/server-go/go.sum index 738dbe2..6345af8 100644 --- a/server-go/go.sum +++ b/server-go/go.sum @@ -1,3 +1,9 @@ +github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 h1:L/gRVlceqvL25UVaW/CKtUDjefjrs0SPonmDGUVOYP0= +github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= +github.com/DATA-DOG/go-sqlmock v1.5.2 h1:OcvFkGmslmlZibjAjaHm3L//6LiuBgolP7OputlJIzU= +github.com/DATA-DOG/go-sqlmock v1.5.2/go.mod h1:88MAG/4G7SMwSE3CeA0ZKzrT5CiOU3OJ+JlNzwDqpNU= +github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY= +github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU= github.com/aws/aws-sdk-go-v2 v1.30.3 h1:jUeBtG0Ih+ZIFH0F4UkmL9w3cSpaMv9tYYDbzILP8dY= github.com/aws/aws-sdk-go-v2 v1.30.3/go.mod h1:nIQjQVp5sfpQcTc9mPSr1B0PaWK5ByX9MOoDadSN4lc= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.3 h1:tW1/Rkad38LA15X4UQtjXZXNKsCgkshC3EbmcUmghTg= @@ -38,20 +44,35 @@ github.com/cloudwego/base64x v0.1.4 h1:jwCgWpFanWmN8xoIUHa2rtzmkd5J2plF/dnLS6Xd/ github.com/cloudwego/base64x v0.1.4/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJgA0rcu/8w= github.com/cloudwego/iasm v0.2.0 h1:1KNIy1I1H9hNNFEEH3DVnI4UujN+1zjpuk6gwHLTssg= github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQPiEFhY= -github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= +github.com/dhui/dktest v0.4.4 h1:+I4s6JRE1yGuqflzwqG+aIaMdgXIorCf5P98JnaAWa8= +github.com/dhui/dktest v0.4.4/go.mod h1:4+22R4lgsdAXrDyaH4Nqx2JEz2hLp49MqQmm9HLCQhM= +github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk= +github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= +github.com/docker/docker v27.2.0+incompatible h1:Rk9nIVdfH3+Vz4cyI/uhbINhEZ/oLmc+CBXmH6fbNk4= +github.com/docker/docker v27.2.0+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c= +github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc= +github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= +github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= github.com/eclipse/paho.mqtt.golang v1.5.0 h1:EH+bUVJNgttidWFkLLVKaQPGmkTUfQQqjOsyvMGvD6o= github.com/eclipse/paho.mqtt.golang v1.5.0/go.mod h1:du/2qNQVqJf/Sqs4MEL77kR8QTqANF7XU7Fk0aOTAgk= +github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= +github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/gabriel-vasile/mimetype v1.4.3 h1:in2uUcidCuFcDKtdcBxlR0rJ1+fsokWf+uqxgUFjbI0= github.com/gabriel-vasile/mimetype v1.4.3/go.mod h1:d8uq/6HKRL6CGdk+aubisF/M5GcPfT7nKyLpA0lbSSk= github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= github.com/gin-gonic/gin v1.10.0 h1:nTuyha1TYqgedzytsKYqna+DfLos46nTv2ygFy86HFU= github.com/gin-gonic/gin v1.10.0/go.mod h1:4PMNQiOhvDRa013RKVbsiNwoyezlm2rm0uX/T7kzp5Y= +github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= +github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= +github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s= github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA= @@ -62,13 +83,22 @@ github.com/go-playground/validator/v10 v10.20.0 h1:K9ISHbSaI0lyB2eWMPJo+kOS/FBEx github.com/go-playground/validator/v10 v10.20.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM= github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU= github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= +github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= +github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang-jwt/jwt/v5 v5.2.1 h1:OuVbFODueb089Lh128TAcimifWaLhJwVflnrgM17wHk= github.com/golang-jwt/jwt/v5 v5.2.1/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk= +github.com/golang-migrate/migrate/v4 v4.18.2 h1:2VSCMz7x7mjyTXx3m2zPokOY82LTRgxK1yQYKo6wWQ8= +github.com/golang-migrate/migrate/v4 v4.18.2/go.mod h1:2CM6tJvn2kqPXwnXO/d3rAQYiyoIm180VsO8PRX6Rpk= github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg= github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= +github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I= +github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= +github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= +github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM= github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg= github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a h1:bbPeKD0xmW/Y25WS6cokEszi5g+S0QxI/d45PkRi7Nk= @@ -83,6 +113,7 @@ github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ= github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= +github.com/kisielk/sqlstruct v0.0.0-20201105191214-5f3e10d3ab46/go.mod h1:yyMNCyc/Ib3bDTKd379tNMpB/7/H5TjM2Y9QJ5THLbE= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.2.7 h1:ZWSB3igEs+d0qvnxR/ZBzXVmxkgt8DdzP6m9pfuVLDM= github.com/klauspost/cpuid/v2 v2.2.7/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= @@ -93,15 +124,29 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ= github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI= +github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw= +github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0= +github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo= +github.com/moby/term v0.5.0 h1:xt8Q1nalod/v7BqbG21f8mQPqH+xAaC9C3N3wfWbVP0= +github.com/moby/term v0.5.0/go.mod h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= +github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= +github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= +github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= +github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQb2IpWsCzug= +github.com/opencontainers/image-spec v1.1.0/go.mod h1:W4s4sFTMaBeK1BQLXbG4AdM2szdn85PY75RI83NrTrM= github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM= github.com/pelletier/go-toml/v2 v2.2.2/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs= +github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= +github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/redis/go-redis/v9 v9.6.1 h1:HHDteefn6ZkTtY5fGUE8tj8uy85AHk6zP7CpzIAM0y4= @@ -124,25 +169,35 @@ github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08= github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE= github.com/ugorji/go/codec v1.2.12/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 h1:TT4fX+nBOA/+LUkobKGW1ydGcn+G3vRw9+g5HwCphpk= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0/go.mod h1:L7UH0GbB0p47T4Rri3uHjbpCFYrVrwc1I25QhNPiGK8= +go.opentelemetry.io/otel v1.29.0 h1:PdomN/Al4q/lN6iBJEN3AwPvUiHPMlt93c8bqTG5Llw= +go.opentelemetry.io/otel v1.29.0/go.mod h1:N/WtXPs1CNCUEx+Agz5uouwCba+i+bJGFicT8SR4NP8= +go.opentelemetry.io/otel/metric v1.29.0 h1:vPf/HFWTNkPu1aYeIsc98l4ktOQaL6LeSoeV2g+8YLc= +go.opentelemetry.io/otel/metric v1.29.0/go.mod h1:auu/QWieFVWx+DmQOUMgj0F8LHWdgalxXqvp7BII/W8= +go.opentelemetry.io/otel/trace v1.29.0 h1:J/8ZNK4XgR7a21DZUAsbF8pZ5Jcw1VhACmnYt39JTi4= +go.opentelemetry.io/otel/trace v1.29.0/go.mod h1:eHl3w0sp3paPkYstJOmAimxhiFXPg+MMTlEh3nsQgWQ= +go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw= +go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= golang.org/x/arch v0.8.0 h1:3wRIsP3pM4yUptoR96otTUOXI367OS0+c9eeRi9doIc= golang.org/x/arch v0.8.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys= -golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30= -golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M= -golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys= -golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE= -golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= -golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U= +golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= +golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I= +golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= +golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ= +golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo= -golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= -golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg= -google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA= +golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= +golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= +golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 h1:+cNy6SZtPcJQH3LJVLOSmiC7MMxXNOb3PU/VUEz+EhU= +golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90= +google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= +google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= diff --git a/server-go/internal/config/config.go b/server-go/internal/config/config.go index 270287b..7511824 100644 --- a/server-go/internal/config/config.go +++ b/server-go/internal/config/config.go @@ -6,6 +6,8 @@ import ( // Config 全局配置，从环境变量加载 type Config struct { + AppEnv string `env:"APP_ENV" envDefault:"development"` + AllowDevAutoMigrate bool `env:"ALLOW_DEV_AUTOMIGRATE" envDefault:"false"` PG string `env:"PG" envDefault:"postgresql://postgres:pan@localhost:5432/silk"` Redis string `env:"REDIS" envDefault:"redis://:pan@localhost:6379"` JWTSecret string `env:"JWT_SECRET" envDefault:"silk-secret-please-change-me"` diff --git a/server-go/internal/database/db.go b/server-go/internal/database/db.go index 853f624..43ed346 100644 --- a/server-go/internal/database/db.go +++ b/server-go/internal/database/db.go @@ -1,6 +1,7 @@ package database import ( + "fmt" "log/slog" "silk-server-go/internal/config" @@ -21,30 +22,38 @@ func Init(cfg *config.Config) error { return err } DB = db - // 自动迁移（错误不阻止启动，仅记录警告） - if err := db.AutoMigrate( - &model.User{}, &model.Room{}, &model.Device{}, &model.Sensor{}, - &model.Threshold{}, &model.Alarm{}, &model.Camera{}, &model.VideoClip{}, - &model.AuditLog{}, &model.Telemetry{}, - &model.Permission{}, &model.RolePermission{}, - &model.Disease{}, &model.KnowledgeArticle{}, - &model.InspectionRecord{}, - &model.Tray{}, &model.Batch{}, &model.RearingRecord{}, - &model.WechatBinding{}, - &model.WeatherAlert{}, - &model.LampTest{}, &model.LampTestStep{}, - &model.Consumable{}, - &model.Consultation{}, - &model.SpectrumEntry{}, - &model.TraceRecord{}, - ); err != nil { - slog.Warn("自动迁移有警告（可忽略）", "err", err) + if err := RunMigrations(db); err != nil { + return err + } + if err := CheckSchemaVersion(db, CurrentSchemaVersion); err != nil { + return err + } + if cfg.AllowDevAutoMigrate && cfg.AppEnv != "production" { + if err := db.AutoMigrate( + &model.User{}, &model.Room{}, &model.Device{}, &model.Sensor{}, + &model.Threshold{}, &model.Alarm{}, &model.Camera{}, &model.VideoClip{}, + &model.AuditLog{}, &model.Telemetry{}, + &model.Permission{}, &model.RolePermission{}, + &model.Disease{}, &model.KnowledgeArticle{}, + &model.InspectionRecord{}, + &model.Tray{}, &model.Batch{}, &model.RearingRecord{}, + &model.WechatBinding{}, + &model.WeatherAlert{}, + &model.LampTest{}, &model.LampTestStep{}, + &model.Consumable{}, + &model.Consultation{}, + &model.SpectrumEntry{}, + &model.TraceRecord{}, + ); err != nil { + return fmt.Errorf("开发环境 AutoMigrate 失败: %w", err) + } + slog.Warn("开发环境 AutoMigrate 已启用，SQL 迁移仍是生产 schema 事实来源") } // 初始化权限种子数据 seedPermissions(db) // 初始化知识库种子数据 seedKnowledge(db) - slog.Info("数据库连接成功，自动迁移完成") + slog.Info("数据库连接成功，版本化迁移完成", "schemaVersion", CurrentSchemaVersion) return nil } diff --git a/server-go/internal/database/migrate.go b/server-go/internal/database/migrate.go new file mode 100644 index 0000000..3874ed2 --- /dev/null +++ b/server-go/internal/database/migrate.go @@ -0,0 +1,66 @@ +package database + +import ( + "errors" + "fmt" + "strconv" + + "github.com/golang-migrate/migrate/v4" + "github.com/golang-migrate/migrate/v4/database/postgres" + "github.com/golang-migrate/migrate/v4/source/iofs" + "silk-server-go/migrations" + "gorm.io/gorm" +) + +// CurrentSchemaVersion 是当前后端代码期望的迁移版本。 +const CurrentSchemaVersion = "1" + +// RunMigrations 使用嵌入式 SQL 迁移文件将数据库升级到最新版本。 +func RunMigrations(db *gorm.DB) error { + sqlDB, err := db.DB() + if err != nil { + return fmt.Errorf("获取数据库连接: %w", err) + } + + sourceDriver, err := iofs.New(migrations.FS, ".") + if err != nil { + return fmt.Errorf("加载嵌入式迁移文件: %w", err) + } + + databaseDriver, err := postgres.WithInstance(sqlDB, &postgres.Config{}) + if err != nil { + return fmt.Errorf("初始化 PostgreSQL 迁移驱动: %w", err) + } + + m, err := migrate.NewWithInstance("iofs", sourceDriver, "postgres", databaseDriver) + if err != nil { + return fmt.Errorf("创建迁移实例: %w", err) + } + defer func() { + _, _ = m.Close() + }() + + if err := m.Up(); err != nil && !errors.Is(err, migrate.ErrNoChange) { + return fmt.Errorf("执行数据库迁移: %w", err) + } + + return nil +} + +// CheckSchemaVersion 校验 schema_migrations 当前版本与 expected 一致，且不是 dirty。 +func CheckSchemaVersion(db *gorm.DB, expected string) error { + var version int64 + var dirty bool + + row := db.Raw("SELECT version, dirty FROM schema_migrations ORDER BY version DESC LIMIT 1").Row() + if err := row.Scan(&version, &dirty); err != nil { + return fmt.Errorf("读取 schema_migrations: %w", err) + } + if dirty { + return fmt.Errorf("schema 迁移处于 dirty 状态，版本 %d", version) + } + if strconv.FormatInt(version, 10) != expected { + return fmt.Errorf("schema 版本不匹配：当前 %d，期望 %s", version, expected) + } + return nil +} diff --git a/server-go/internal/database/migrate_test.go b/server-go/internal/database/migrate_test.go new file mode 100644 index 0000000..00fc19b --- /dev/null +++ b/server-go/internal/database/migrate_test.go @@ -0,0 +1,103 @@ +package database + +import ( + "testing" + + "github.com/DATA-DOG/go-sqlmock" + "silk-server-go/migrations" + + "github.com/golang-migrate/migrate/v4/source/iofs" + "gorm.io/driver/postgres" + "gorm.io/gorm" +) + +func newMockGormDB(t *testing.T) (*gorm.DB, sqlmock.Sqlmock) { + t.Helper() + + sqlDB, mock, err := sqlmock.New() + if err != nil { + t.Fatalf("create sqlmock: %v", err) + } + + gdb, err := gorm.Open(postgres.New(postgres.Config{Conn: sqlDB}), &gorm.Config{}) + if err != nil { + t.Fatalf("open gorm with sqlmock: %v", err) + } + + return gdb, mock +} + +func TestCheckSchemaVersionRejectsMismatch(t *testing.T) { + db, mock := newMockGormDB(t) + defer func() { + sqlDB, _ := db.DB() + _ = sqlDB.Close() + }() + + mock.ExpectQuery("SELECT version, dirty FROM schema_migrations"). + WillReturnRows(sqlmock.NewRows([]string{"version", "dirty"}).AddRow(1, false)) + + if err := CheckSchemaVersion(db, "2"); err == nil { + t.Fatal("expected schema mismatch error") + } +} + +func TestCheckSchemaVersionAcceptsMatch(t *testing.T) { + db, mock := newMockGormDB(t) + defer func() { + sqlDB, _ := db.DB() + _ = sqlDB.Close() + }() + + mock.ExpectQuery("SELECT version, dirty FROM schema_migrations"). + WillReturnRows(sqlmock.NewRows([]string{"version", "dirty"}).AddRow(1, false)) + + if err := CheckSchemaVersion(db, "1"); err != nil { + t.Fatalf("expected schema version match, got %v", err) + } +} + +func TestCheckSchemaVersionRejectsMissingVersion(t *testing.T) { + db, mock := newMockGormDB(t) + defer func() { + sqlDB, _ := db.DB() + _ = sqlDB.Close() + }() + + mock.ExpectQuery("SELECT version, dirty FROM schema_migrations"). + WillReturnRows(sqlmock.NewRows([]string{"version", "dirty"})) + + if err := CheckSchemaVersion(db, "1"); err == nil { + t.Fatal("expected missing schema version error") + } +} + +func TestCheckSchemaVersionRejectsDirty(t *testing.T) { + db, mock := newMockGormDB(t) + defer func() { + sqlDB, _ := db.DB() + _ = sqlDB.Close() + }() + + mock.ExpectQuery("SELECT version, dirty FROM schema_migrations"). + WillReturnRows(sqlmock.NewRows([]string{"version", "dirty"}).AddRow(1, true)) + + if err := CheckSchemaVersion(db, "1"); err == nil { + t.Fatal("expected dirty migration error") + } +} + +func TestEmbeddedMigrationsIncludeBaseline(t *testing.T) { + driver, err := iofs.New(migrations.FS, ".") + if err != nil { + t.Fatalf("load embedded migrations: %v", err) + } + + version, err := driver.First() + if err != nil { + t.Fatalf("read first migration: %v", err) + } + if version != 1 { + t.Fatalf("expected baseline migration version 1, got %d", version) + } +} diff --git a/server-go/migrations/000001_baseline.down.sql b/server-go/migrations/000001_baseline.down.sql new file mode 100644 index 0000000..39fdec6 --- /dev/null +++ b/server-go/migrations/000001_baseline.down.sql @@ -0,0 +1,26 @@ +DROP TABLE IF EXISTS trace_records CASCADE; +DROP TABLE IF EXISTS spectrum_entries CASCADE; +DROP TABLE IF EXISTS consultations CASCADE; +DROP TABLE IF EXISTS consumables CASCADE; +DROP TABLE IF EXISTS lamp_test_steps CASCADE; +DROP TABLE IF EXISTS lamp_tests CASCADE; +DROP TABLE IF EXISTS weather_alerts CASCADE; +DROP TABLE IF EXISTS wechat_bindings CASCADE; +DROP TABLE IF EXISTS rearing_records CASCADE; +DROP TABLE IF EXISTS batches CASCADE; +DROP TABLE IF EXISTS trays CASCADE; +DROP TABLE IF EXISTS inspection_records CASCADE; +DROP TABLE IF EXISTS knowledge_articles CASCADE; +DROP TABLE IF EXISTS diseases CASCADE; +DROP TABLE IF EXISTS role_permissions CASCADE; +DROP TABLE IF EXISTS permissions CASCADE; +DROP TABLE IF EXISTS telemetry CASCADE; +DROP TABLE IF EXISTS audit_logs CASCADE; +DROP TABLE IF EXISTS video_clips CASCADE; +DROP TABLE IF EXISTS cameras CASCADE; +DROP TABLE IF EXISTS alarms CASCADE; +DROP TABLE IF EXISTS thresholds CASCADE; +DROP TABLE IF EXISTS sensors CASCADE; +DROP TABLE IF EXISTS devices CASCADE; +DROP TABLE IF EXISTS rooms CASCADE; +DROP TABLE IF EXISTS users CASCADE; diff --git a/server-go/migrations/000001_baseline.up.sql b/server-go/migrations/000001_baseline.up.sql new file mode 100644 index 0000000..bab73c0 --- /dev/null +++ b/server-go/migrations/000001_baseline.up.sql @@ -0,0 +1,420 @@ +CREATE TABLE users ( + id uuid PRIMARY KEY DEFAULT gen_random_uuid(), + username text NOT NULL UNIQUE, + email text NOT NULL UNIQUE, + password_hash text NOT NULL, + full_name text, + role text NOT NULL DEFAULT 'user', + active boolean NOT NULL DEFAULT true, + created_at timestamptz NOT NULL DEFAULT now(), + updated_at timestamptz NOT NULL DEFAULT now() +); + +CREATE TABLE rooms ( + id uuid PRIMARY KEY DEFAULT gen_random_uuid(), + name text NOT NULL, + code text, + location text, + description text, + capacity bigint, + stage varchar(32), + region varchar(64), + status text NOT NULL DEFAULT 'active', + created_at timestamptz NOT NULL DEFAULT now(), + updated_at timestamptz NOT NULL DEFAULT now() +); + +CREATE TABLE devices ( + id uuid PRIMARY KEY DEFAULT gen_random_uuid(), + device_key text NOT NULL UNIQUE, + name text NOT NULL, + kind text NOT NULL DEFAULT 'sensor', + model text, + firmware text, + online_status text NOT NULL DEFAULT 'online', + last_seen timestamptz, + room_id uuid NOT NULL, + topic text, + created_at timestamptz NOT NULL DEFAULT now(), + updated_at timestamptz NOT NULL DEFAULT now() +); + +CREATE INDEX idx_devices_room_id ON devices (room_id); + +CREATE TABLE sensors ( + id uuid PRIMARY KEY DEFAULT gen_random_uuid(), + name text NOT NULL, + metric text NOT NULL, + unit text, + data_type text, + device_id uuid NOT NULL, + created_at timestamptz NOT NULL DEFAULT now() +); + +CREATE INDEX idx_sensors_device_id ON sensors (device_id); + +CREATE TABLE thresholds ( + id uuid PRIMARY KEY DEFAULT gen_random_uuid(), + name text, + min_value double precision NOT NULL, + max_value double precision NOT NULL, + debounce_seconds bigint NOT NULL DEFAULT 5, + severity bigint NOT NULL DEFAULT 3, + enabled boolean NOT NULL DEFAULT true, + sensor_id uuid NOT NULL, + created_at timestamptz NOT NULL DEFAULT now(), + updated_at timestamptz NOT NULL DEFAULT now() +); + +CREATE INDEX idx_thresholds_sensor_id ON thresholds (sensor_id); + +CREATE TABLE alarms ( + id uuid PRIMARY KEY DEFAULT gen_random_uuid(), + code text, + title text, + message text, + severity text, + open boolean NOT NULL DEFAULT true, + acknowledged boolean NOT NULL DEFAULT false, + acknowledged_at timestamptz, + triggered_at timestamptz NOT NULL, + resolved_at timestamptz, + device_key text, + metric text, + value double precision, + threshold_min double precision, + threshold_max double precision +); + +CREATE INDEX idx_alarms_device_open_triggered ON alarms (device_key, open, triggered_at); + +CREATE TABLE cameras ( + id bigserial PRIMARY KEY, + room_id text, + code varchar(64) NOT NULL, + name varchar(128) NOT NULL, + rtsp_url varchar(512), + http_url varchar(512), + username varchar(64), + password_enc varchar(255), + position varchar(255), + resolution varchar(32), + fps bigint, + is_online boolean NOT NULL DEFAULT true, + gb_device_id varchar(20), + gb_channel_id varchar(20), + gb_auth_id varchar(20), + gb_auth_password varchar(255), + gb_stream_type varchar(10), + gb_transport varchar(10), + gb_alarm_channel_id varchar(20), + gb_voice_channel_id varchar(20), + gb_manufacturer varchar(64), + manufacturer_id varchar(64), + enabled boolean NOT NULL DEFAULT true, + created_at timestamptz NOT NULL DEFAULT now(), + updated_at timestamptz NOT NULL DEFAULT now() +); + +CREATE INDEX idx_cameras_room_id ON cameras (room_id); + +CREATE TABLE video_clips ( + id bigserial PRIMARY KEY, + trigger text NOT NULL DEFAULT 'alarm', + file_path text, + duration_sec real NOT NULL DEFAULT 0, + start_at timestamptz NOT NULL, + end_at timestamptz, + resolution text, + size_bytes bigint, + notes text, + camera_id text NOT NULL, + room_id text, + alarm_id text, + created_at timestamptz NOT NULL DEFAULT now(), + updated_at timestamptz NOT NULL DEFAULT now(), + s3_bucket text, + s3_key text +); + +CREATE INDEX idx_video_clips_alarm_id ON video_clips (alarm_id); +CREATE INDEX idx_video_clips_room_id ON video_clips (room_id); +CREATE INDEX idx_video_clips_camera_id ON video_clips (camera_id); + +CREATE TABLE audit_logs ( + id uuid PRIMARY KEY DEFAULT gen_random_uuid(), + user_id uuid, + username text, + action text NOT NULL, + resource text, + target_id text, + description text, + ip_address text, + user_agent text, + metadata jsonb, + created_at timestamptz NOT NULL DEFAULT now() +); + +CREATE INDEX idx_audit_logs_resource_target ON audit_logs (resource, target_id); +CREATE INDEX idx_audit_logs_action_created ON audit_logs (action, created_at); +CREATE INDEX idx_audit_logs_user_created ON audit_logs (user_id, created_at); + +CREATE TABLE telemetry ( + id uuid PRIMARY KEY DEFAULT gen_random_uuid(), + device_key text NOT NULL, + metric text NOT NULL, + value double precision NOT NULL, + timestamp timestamptz NOT NULL +); + +CREATE INDEX idx_telemetry_device_timestamp ON telemetry (device_key, timestamp); + +CREATE TABLE permissions ( + id uuid PRIMARY KEY DEFAULT gen_random_uuid(), + code text NOT NULL, + name text NOT NULL, + description text, + created_at timestamptz NOT NULL DEFAULT now() +); + +CREATE UNIQUE INDEX idx_permissions_code ON permissions (code); + +CREATE TABLE role_permissions ( + id uuid PRIMARY KEY DEFAULT gen_random_uuid(), + role text NOT NULL, + permission_id uuid NOT NULL, + created_at timestamptz NOT NULL DEFAULT now() +); + +CREATE UNIQUE INDEX idx_role_permissions_role_code ON role_permissions (role, permission_id); + +CREATE TABLE diseases ( + id uuid PRIMARY KEY DEFAULT gen_random_uuid(), + name varchar(64) NOT NULL, + category varchar(32) NOT NULL, + pathogen text NOT NULL, + transmission text NOT NULL, + medium text NOT NULL, + incubation text NOT NULL, + symptoms text NOT NULL, + high_risk_stage text NOT NULL, + high_risk_condition text NOT NULL, + lethal_time text NOT NULL, + spread_trend text NOT NULL, + recurrence text NOT NULL, + detection text NOT NULL, + prevention text NOT NULL, + image_url varchar(512), + sort_order bigint NOT NULL DEFAULT 0, + enabled boolean NOT NULL DEFAULT true, + created_at timestamptz NOT NULL DEFAULT now(), + updated_at timestamptz NOT NULL DEFAULT now() +); + +CREATE INDEX idx_diseases_category ON diseases (category); + +CREATE TABLE knowledge_articles ( + id uuid PRIMARY KEY DEFAULT gen_random_uuid(), + kind varchar(32) NOT NULL, + title varchar(128) NOT NULL, + summary text NOT NULL, + content text NOT NULL, + sort_order bigint NOT NULL DEFAULT 0, + enabled boolean NOT NULL DEFAULT true, + created_at timestamptz NOT NULL DEFAULT now(), + updated_at timestamptz NOT NULL DEFAULT now() +); + +CREATE INDEX idx_knowledge_articles_kind ON knowledge_articles (kind); + +CREATE TABLE inspection_records ( + id uuid PRIMARY KEY DEFAULT gen_random_uuid(), + user_id uuid, + room_id uuid, + image_url varchar(512), + detections jsonb, + risk_score double precision, + risk_level varchar(16), + ai_status varchar(16) NOT NULL DEFAULT 'done', + idempotency_key varchar(128), + created_at timestamptz NOT NULL DEFAULT now(), + updated_at timestamptz NOT NULL DEFAULT now() +); + +CREATE UNIQUE INDEX idx_inspection_records_idempotency_key ON inspection_records (idempotency_key); +CREATE INDEX idx_inspection_records_room_id ON inspection_records (room_id); +CREATE INDEX idx_inspection_records_user_id ON inspection_records (user_id); + +CREATE TABLE trays ( + id uuid PRIMARY KEY DEFAULT gen_random_uuid(), + name varchar(64) NOT NULL, + code varchar(64), + position varchar(128), + room_id uuid NOT NULL, + enabled boolean NOT NULL DEFAULT true, + created_at timestamptz NOT NULL DEFAULT now(), + updated_at timestamptz NOT NULL DEFAULT now() +); + +CREATE INDEX idx_trays_room_id ON trays (room_id); + +CREATE TABLE batches ( + id uuid PRIMARY KEY DEFAULT gen_random_uuid(), + room_id uuid NOT NULL, + name varchar(64) NOT NULL, + variety varchar(64), + source varchar(128), + seed_batch_no varchar(64), + quarantine_no varchar(64), + instar bigint, + entered_at timestamptz, + mount_at timestamptz, + status varchar(16) NOT NULL DEFAULT 'rearing', + note text, + created_at timestamptz NOT NULL DEFAULT now(), + updated_at timestamptz NOT NULL DEFAULT now() +); + +CREATE INDEX idx_batches_room_id ON batches (room_id); + +CREATE TABLE rearing_records ( + id uuid PRIMARY KEY DEFAULT gen_random_uuid(), + batch_id uuid NOT NULL, + record_date timestamptz NOT NULL, + instar bigint, + mulberry_source varchar(128), + density varchar(64), + note text, + created_at timestamptz NOT NULL DEFAULT now(), + updated_at timestamptz NOT NULL DEFAULT now() +); + +CREATE INDEX idx_rearing_records_batch_id ON rearing_records (batch_id); + +CREATE TABLE wechat_bindings ( + id uuid PRIMARY KEY DEFAULT gen_random_uuid(), + user_id uuid NOT NULL, + open_id varchar(128) NOT NULL, + authorized_templates jsonb, + created_at timestamptz NOT NULL DEFAULT now(), + updated_at timestamptz NOT NULL DEFAULT now() +); + +CREATE UNIQUE INDEX idx_wechat_bindings_open_id ON wechat_bindings (open_id); +CREATE UNIQUE INDEX idx_wechat_bindings_user_id ON wechat_bindings (user_id); + +CREATE TABLE weather_alerts ( + id uuid PRIMARY KEY DEFAULT gen_random_uuid(), + disease varchar(64) NOT NULL, + level varchar(16) NOT NULL, + reason text NOT NULL, + snapshot jsonb, + created_at timestamptz NOT NULL DEFAULT now() +); + +CREATE TABLE lamp_tests ( + id uuid PRIMARY KEY DEFAULT gen_random_uuid(), + method varchar(32) NOT NULL DEFAULT 'lamp', + room_id uuid, + batch_id uuid, + diseases jsonb, + status varchar(16) NOT NULL DEFAULT 'pending', + sample_info varchar(255), + result varchar(16), + result_image_url varchar(512), + operator_id uuid, + resulted_at timestamptz, + cross_status varchar(16) NOT NULL DEFAULT 'pending', + cross_reason text, + extra_data jsonb, + note text, + created_at timestamptz NOT NULL DEFAULT now(), + updated_at timestamptz NOT NULL DEFAULT now() +); + +CREATE INDEX idx_lamp_tests_batch_id ON lamp_tests (batch_id); +CREATE INDEX idx_lamp_tests_room_id ON lamp_tests (room_id); + +CREATE TABLE lamp_test_steps ( + id uuid PRIMARY KEY DEFAULT gen_random_uuid(), + lamp_test_id uuid NOT NULL, + step_no bigint NOT NULL, + name varchar(64) NOT NULL, + done boolean NOT NULL DEFAULT false, + done_at timestamptz, + note text, + created_at timestamptz NOT NULL DEFAULT now(), + updated_at timestamptz NOT NULL DEFAULT now() +); + +CREATE INDEX idx_lamp_test_steps_lamp_test_id ON lamp_test_steps (lamp_test_id); + +CREATE TABLE consumables ( + id uuid PRIMARY KEY DEFAULT gen_random_uuid(), + name varchar(64) NOT NULL, + category varchar(32) NOT NULL, + spec varchar(128), + quantity double precision NOT NULL, + unit varchar(32), + min_quantity double precision NOT NULL, + expiry_date timestamptz, + supplier varchar(128), + note text, + created_at timestamptz NOT NULL DEFAULT now(), + updated_at timestamptz NOT NULL DEFAULT now() +); + +CREATE INDEX idx_consumables_category ON consumables (category); + +CREATE TABLE consultations ( + id uuid PRIMARY KEY DEFAULT gen_random_uuid(), + room_id uuid, + batch_id uuid, + lamp_test_id uuid, + title varchar(128) NOT NULL, + summary text, + snapshot jsonb, + status varchar(16) NOT NULL DEFAULT 'pending', + expert_id uuid, + opinion text, + plan text, + resolved_at timestamptz, + archived_at timestamptz, + created_at timestamptz NOT NULL DEFAULT now(), + updated_at timestamptz NOT NULL DEFAULT now() +); + +CREATE INDEX idx_consultations_lamp_test_id ON consultations (lamp_test_id); +CREATE INDEX idx_consultations_batch_id ON consultations (batch_id); +CREATE INDEX idx_consultations_room_id ON consultations (room_id); + +CREATE TABLE spectrum_entries ( + id uuid PRIMARY KEY DEFAULT gen_random_uuid(), + disease varchar(64) NOT NULL, + source varchar(128), + data_url varchar(512), + note text, + created_at timestamptz NOT NULL DEFAULT now() +); + +CREATE TABLE trace_records ( + id uuid PRIMARY KEY DEFAULT gen_random_uuid(), + room_id uuid, + lamp_test_id uuid, + consultation_id uuid, + disease varchar(64) NOT NULL, + status varchar(16) NOT NULL DEFAULT 'pending', + origin varchar(32), + confidence double precision, + auto_report jsonb, + checklist jsonb, + analysis_report jsonb, + expert_note text, + lab_note text, + created_at timestamptz NOT NULL DEFAULT now(), + updated_at timestamptz NOT NULL DEFAULT now() +); + +CREATE INDEX idx_trace_records_consultation_id ON trace_records (consultation_id); +CREATE INDEX idx_trace_records_lamp_test_id ON trace_records (lamp_test_id); +CREATE INDEX idx_trace_records_room_id ON trace_records (room_id); diff --git a/server-go/migrations/embed.go b/server-go/migrations/embed.go new file mode 100644 index 0000000..91cca1c --- /dev/null +++ b/server-go/migrations/embed.go @@ -0,0 +1,6 @@ +package migrations + +import "embed" + +//go:embed *.sql +var FS embed.FS diff --git a/后续工作计划.md b/后续工作计划.md index a56ba3e..0513a53 100644 --- a/后续工作计划.md +++ b/后续工作计划.md @@ -10,7 +10,7 @@ |---|---|---|---|---| | Wave 0 | 决策与基线 | Task 0 固化开放决策与整改基线 | 方案确定 | 无，决策记录已生成 | | Wave 0 | 决策与基线 | Task 1 恢复可复现的多端质量基线 | 部分可用 | CI 待 Task 0 平台落地 | -| Wave 1 | P0 安全与正确性 | Task 2 版本化数据库迁移与 Schema 启动门禁 | 未开始 | 无 | +| Wave 1 | P0 安全与正确性 | Task 2 版本化数据库迁移与 Schema 启动门禁 | 部分可用 | 本机无 PostgreSQL/Docker，真实空库/回滚演练待环境 | | Wave 1 | P0 安全与正确性 | Task 3 移除默认密钥与默认管理员密码 | 未开始 | 无 | | Wave 1 | P0 安全与正确性 | Task 4 收口视频访问与摄像头密钥输出 | 未开始 | 无 | | Wave 1 | P0 安全与正确性 | Task 5 修复 WebSocket 越权与 AI 流 SSRF | 未开始 | 无 | diff --git a/开发交接记录.md b/开发交接记录.md index 028babd..7133808 100644 --- a/开发交接记录.md +++ b/开发交接记录.md @@ -804,3 +804,35 @@ MVP 沿用 IoTDB（现状）；TDengine 作为生产规模化候选（先基准 ### 回滚点 - 删除 `docs/decisions/2026-08-13-remediation-decisions.md`，移除 `后续工作计划.md` Wave 0-4 表和本节即可；无运行时影响。 + +--- + +## 2026-08-13 整改 Task 2：版本化数据库迁移与 Schema 启动门禁 + +### 做了什么 + +- 采用 `golang-migrate/migrate/v4 v4.18.2`，新增 `server-go/migrations/` 嵌入式迁移包； +- 新增 `000001_baseline.up.sql` / `000001_baseline.down.sql`，覆盖当前 26 张业务表、索引和唯一约束； +- 新增 `internal/database/migrate.go`：`RunMigrations`、`CheckSchemaVersion`、`CurrentSchemaVersion`； +- `database.Init` 改为先执行版本化迁移并校验 `schema_migrations`，生产环境忽略 `ALLOW_DEV_AUTOMIGRATE`；开发环境仅显式开启时允许 AutoMigrate； +- `config.Config` 增加 `APP_ENV`、`ALLOW_DEV_AUTOMIGRATE`；README 与物理机部署指南补充迁移说明和环境变量； +- 新增 sqlmock 测试，覆盖版本匹配、版本不匹配、空版本、dirty 状态和嵌入式迁移文件解析。 + +### 设计思路与决策依据 + +- SQL 迁移文件作为唯一 schema 事实来源，不使用旧 `silk-db-backup.dump` 中的 app_runtime/public 结构（两套均为旧版）； +- 基线 SQL 由当前 GORM 模型 dry-run 生成后人工核对，保留当前模型的 UUID、bigserial、jsonb、varchar 长度、默认值和索引； +- 选择 v4.18.2 而不是 v4.19.1，是因为 v4.19.1 要求 Go 1.24，项目基线为 Go 1.23； +- 启动阶段任何 schema 版本缺失、落后或 dirty 都直接失败，避免代码与数据库不一致时继续提供 API。 + +### 验证结果 + +- `go test ./...`、`go vet ./...`、`go build ./...` 全部通过； +- `internal/database` 迁移版本检查与嵌入式迁移解析单测通过； +- 本机无 Docker/PostgreSQL，未执行真实空库建库、旧库升级和 down 回滚演练；需在开发服务器或本地 PostgreSQL 环境完成，并严格按 AGENTS.md 先备份。 + +### 回滚点 + +- 本任务前基线提交为 `20bea00`；回滚可还原 Task 2 提交并恢复 go.mod/go.sum； +- 若迁移已应用到数据库，必须先恢复迁移前数据库备份，不能只回滚代码而保留不兼容 schema； +- 本次未连接开发服务器、未执行生产部署。 diff --git a/部署指南(物理机).md b/部署指南(物理机).md index 3fca848..90698be 100644 --- a/部署指南(物理机).md +++ b/部署指南(物理机).md @@ -434,6 +434,8 @@ chmod +x /home/pan/silk-server-go-linux # 创建 .env cat > /home/pan/silk/.env << 'EOF' PORT=3000 +APP_ENV=production +ALLOW_DEV_AUTOMIGRATE=false PG=postgresql://postgres:pan@localhost:5432/silk REDIS=redis://:pan@localhost:6379 MQTT=mqtt://pan:pan@localhost:1883 @@ -457,6 +459,8 @@ cd /home/pan/silk nohup /home/pan/silk-server-go-linux > server-go.log 2>&1 < /dev/null & ``` +> **数据库迁移**：Go 后端启动时会自动执行 `server-go/migrations/` 下的 SQL 迁移并校验 `schema_migrations` 版本；生产环境不要开启 `ALLOW_DEV_AUTOMIGRATE=true`。升级前先按 AGENTS.md 完成数据库备份。 + ### 11. 部署 Go 录制服务 ```bash @@ -565,6 +569,8 @@ sudo ceph -s ``` PORT=3000 PG=postgresql://postgres:pan@localhost:5432/silk +APP_ENV=production +ALLOW_DEV_AUTOMIGRATE=false REDIS=redis://:pan@localhost:6379 MQTT=mqtt://pan:pan@localhost:1883 IOTDB_URL=http://127.0.0.1:18081 From d01e245a2ca52b5dd9be722d52a7290e98a4ccf6 Mon Sep 17 00:00:00 2001 From: weijuesen Date: Thu, 13 Aug 2026 23:42:11 +0800 Subject: [PATCH 04/18] =?UTF-8?q?fix:=20=E5=9F=BA=E7=BA=BF=E8=BF=81?= =?UTF-8?q?=E7=A7=BB=E6=94=B9=E4=B8=BA=E5=B9=82=E7=AD=89=E4=BB=A5=E5=85=BC?= =?UTF-8?q?=E5=AE=B9=E5=B7=B2=E6=9C=89=E5=BC=80=E5=8F=91=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server-go/migrations/000001_baseline.up.sql | 121 ++++++++++---------- 开发交接记录.md | 1 + 2 files changed, 62 insertions(+), 60 deletions(-) diff --git a/server-go/migrations/000001_baseline.up.sql b/server-go/migrations/000001_baseline.up.sql index bab73c0..fe2af8d 100644 --- a/server-go/migrations/000001_baseline.up.sql +++ b/server-go/migrations/000001_baseline.up.sql @@ -1,4 +1,4 @@ -CREATE TABLE users ( +CREATE TABLE IF NOT EXISTS users ( id uuid PRIMARY KEY DEFAULT gen_random_uuid(), username text NOT NULL UNIQUE, email text NOT NULL UNIQUE, @@ -10,7 +10,7 @@ CREATE TABLE users ( updated_at timestamptz NOT NULL DEFAULT now() ); -CREATE TABLE rooms ( +CREATE TABLE IF NOT EXISTS rooms ( id uuid PRIMARY KEY DEFAULT gen_random_uuid(), name text NOT NULL, code text, @@ -24,7 +24,7 @@ CREATE TABLE rooms ( updated_at timestamptz NOT NULL DEFAULT now() ); -CREATE TABLE devices ( +CREATE TABLE IF NOT EXISTS devices ( id uuid PRIMARY KEY DEFAULT gen_random_uuid(), device_key text NOT NULL UNIQUE, name text NOT NULL, @@ -39,9 +39,9 @@ CREATE TABLE devices ( updated_at timestamptz NOT NULL DEFAULT now() ); -CREATE INDEX idx_devices_room_id ON devices (room_id); +CREATE INDEX IF NOT EXISTS idx_devices_room_id ON devices (room_id); -CREATE TABLE sensors ( +CREATE TABLE IF NOT EXISTS sensors ( id uuid PRIMARY KEY DEFAULT gen_random_uuid(), name text NOT NULL, metric text NOT NULL, @@ -51,9 +51,9 @@ CREATE TABLE sensors ( created_at timestamptz NOT NULL DEFAULT now() ); -CREATE INDEX idx_sensors_device_id ON sensors (device_id); +CREATE INDEX IF NOT EXISTS idx_sensors_device_id ON sensors (device_id); -CREATE TABLE thresholds ( +CREATE TABLE IF NOT EXISTS thresholds ( id uuid PRIMARY KEY DEFAULT gen_random_uuid(), name text, min_value double precision NOT NULL, @@ -66,9 +66,9 @@ CREATE TABLE thresholds ( updated_at timestamptz NOT NULL DEFAULT now() ); -CREATE INDEX idx_thresholds_sensor_id ON thresholds (sensor_id); +CREATE INDEX IF NOT EXISTS idx_thresholds_sensor_id ON thresholds (sensor_id); -CREATE TABLE alarms ( +CREATE TABLE IF NOT EXISTS alarms ( id uuid PRIMARY KEY DEFAULT gen_random_uuid(), code text, title text, @@ -86,9 +86,9 @@ CREATE TABLE alarms ( threshold_max double precision ); -CREATE INDEX idx_alarms_device_open_triggered ON alarms (device_key, open, triggered_at); +CREATE INDEX IF NOT EXISTS idx_alarms_device_open_triggered ON alarms (device_key, open, triggered_at); -CREATE TABLE cameras ( +CREATE TABLE IF NOT EXISTS cameras ( id bigserial PRIMARY KEY, room_id text, code varchar(64) NOT NULL, @@ -116,9 +116,9 @@ CREATE TABLE cameras ( updated_at timestamptz NOT NULL DEFAULT now() ); -CREATE INDEX idx_cameras_room_id ON cameras (room_id); +CREATE INDEX IF NOT EXISTS idx_cameras_room_id ON cameras (room_id); -CREATE TABLE video_clips ( +CREATE TABLE IF NOT EXISTS video_clips ( id bigserial PRIMARY KEY, trigger text NOT NULL DEFAULT 'alarm', file_path text, @@ -137,11 +137,11 @@ CREATE TABLE video_clips ( s3_key text ); -CREATE INDEX idx_video_clips_alarm_id ON video_clips (alarm_id); -CREATE INDEX idx_video_clips_room_id ON video_clips (room_id); -CREATE INDEX idx_video_clips_camera_id ON video_clips (camera_id); +CREATE INDEX IF NOT EXISTS idx_video_clips_alarm_id ON video_clips (alarm_id); +CREATE INDEX IF NOT EXISTS idx_video_clips_room_id ON video_clips (room_id); +CREATE INDEX IF NOT EXISTS idx_video_clips_camera_id ON video_clips (camera_id); -CREATE TABLE audit_logs ( +CREATE TABLE IF NOT EXISTS audit_logs ( id uuid PRIMARY KEY DEFAULT gen_random_uuid(), user_id uuid, username text, @@ -155,11 +155,11 @@ CREATE TABLE audit_logs ( created_at timestamptz NOT NULL DEFAULT now() ); -CREATE INDEX idx_audit_logs_resource_target ON audit_logs (resource, target_id); -CREATE INDEX idx_audit_logs_action_created ON audit_logs (action, created_at); -CREATE INDEX idx_audit_logs_user_created ON audit_logs (user_id, created_at); +CREATE INDEX IF NOT EXISTS idx_audit_logs_resource_target ON audit_logs (resource, target_id); +CREATE INDEX IF NOT EXISTS idx_audit_logs_action_created ON audit_logs (action, created_at); +CREATE INDEX IF NOT EXISTS idx_audit_logs_user_created ON audit_logs (user_id, created_at); -CREATE TABLE telemetry ( +CREATE TABLE IF NOT EXISTS telemetry ( id uuid PRIMARY KEY DEFAULT gen_random_uuid(), device_key text NOT NULL, metric text NOT NULL, @@ -167,9 +167,9 @@ CREATE TABLE telemetry ( timestamp timestamptz NOT NULL ); -CREATE INDEX idx_telemetry_device_timestamp ON telemetry (device_key, timestamp); +CREATE INDEX IF NOT EXISTS idx_telemetry_device_timestamp ON telemetry (device_key, timestamp); -CREATE TABLE permissions ( +CREATE TABLE IF NOT EXISTS permissions ( id uuid PRIMARY KEY DEFAULT gen_random_uuid(), code text NOT NULL, name text NOT NULL, @@ -177,18 +177,18 @@ CREATE TABLE permissions ( created_at timestamptz NOT NULL DEFAULT now() ); -CREATE UNIQUE INDEX idx_permissions_code ON permissions (code); +CREATE UNIQUE INDEX IF NOT EXISTS idx_permissions_code ON permissions (code); -CREATE TABLE role_permissions ( +CREATE TABLE IF NOT EXISTS role_permissions ( id uuid PRIMARY KEY DEFAULT gen_random_uuid(), role text NOT NULL, permission_id uuid NOT NULL, created_at timestamptz NOT NULL DEFAULT now() ); -CREATE UNIQUE INDEX idx_role_permissions_role_code ON role_permissions (role, permission_id); +CREATE UNIQUE INDEX IF NOT EXISTS idx_role_permissions_role_code ON role_permissions (role, permission_id); -CREATE TABLE diseases ( +CREATE TABLE IF NOT EXISTS diseases ( id uuid PRIMARY KEY DEFAULT gen_random_uuid(), name varchar(64) NOT NULL, category varchar(32) NOT NULL, @@ -211,9 +211,9 @@ CREATE TABLE diseases ( updated_at timestamptz NOT NULL DEFAULT now() ); -CREATE INDEX idx_diseases_category ON diseases (category); +CREATE INDEX IF NOT EXISTS idx_diseases_category ON diseases (category); -CREATE TABLE knowledge_articles ( +CREATE TABLE IF NOT EXISTS knowledge_articles ( id uuid PRIMARY KEY DEFAULT gen_random_uuid(), kind varchar(32) NOT NULL, title varchar(128) NOT NULL, @@ -225,9 +225,9 @@ CREATE TABLE knowledge_articles ( updated_at timestamptz NOT NULL DEFAULT now() ); -CREATE INDEX idx_knowledge_articles_kind ON knowledge_articles (kind); +CREATE INDEX IF NOT EXISTS idx_knowledge_articles_kind ON knowledge_articles (kind); -CREATE TABLE inspection_records ( +CREATE TABLE IF NOT EXISTS inspection_records ( id uuid PRIMARY KEY DEFAULT gen_random_uuid(), user_id uuid, room_id uuid, @@ -241,11 +241,11 @@ CREATE TABLE inspection_records ( updated_at timestamptz NOT NULL DEFAULT now() ); -CREATE UNIQUE INDEX idx_inspection_records_idempotency_key ON inspection_records (idempotency_key); -CREATE INDEX idx_inspection_records_room_id ON inspection_records (room_id); -CREATE INDEX idx_inspection_records_user_id ON inspection_records (user_id); +CREATE UNIQUE INDEX IF NOT EXISTS idx_inspection_records_idempotency_key ON inspection_records (idempotency_key); +CREATE INDEX IF NOT EXISTS idx_inspection_records_room_id ON inspection_records (room_id); +CREATE INDEX IF NOT EXISTS idx_inspection_records_user_id ON inspection_records (user_id); -CREATE TABLE trays ( +CREATE TABLE IF NOT EXISTS trays ( id uuid PRIMARY KEY DEFAULT gen_random_uuid(), name varchar(64) NOT NULL, code varchar(64), @@ -256,9 +256,9 @@ CREATE TABLE trays ( updated_at timestamptz NOT NULL DEFAULT now() ); -CREATE INDEX idx_trays_room_id ON trays (room_id); +CREATE INDEX IF NOT EXISTS idx_trays_room_id ON trays (room_id); -CREATE TABLE batches ( +CREATE TABLE IF NOT EXISTS batches ( id uuid PRIMARY KEY DEFAULT gen_random_uuid(), room_id uuid NOT NULL, name varchar(64) NOT NULL, @@ -275,9 +275,9 @@ CREATE TABLE batches ( updated_at timestamptz NOT NULL DEFAULT now() ); -CREATE INDEX idx_batches_room_id ON batches (room_id); +CREATE INDEX IF NOT EXISTS idx_batches_room_id ON batches (room_id); -CREATE TABLE rearing_records ( +CREATE TABLE IF NOT EXISTS rearing_records ( id uuid PRIMARY KEY DEFAULT gen_random_uuid(), batch_id uuid NOT NULL, record_date timestamptz NOT NULL, @@ -289,9 +289,9 @@ CREATE TABLE rearing_records ( updated_at timestamptz NOT NULL DEFAULT now() ); -CREATE INDEX idx_rearing_records_batch_id ON rearing_records (batch_id); +CREATE INDEX IF NOT EXISTS idx_rearing_records_batch_id ON rearing_records (batch_id); -CREATE TABLE wechat_bindings ( +CREATE TABLE IF NOT EXISTS wechat_bindings ( id uuid PRIMARY KEY DEFAULT gen_random_uuid(), user_id uuid NOT NULL, open_id varchar(128) NOT NULL, @@ -300,10 +300,10 @@ CREATE TABLE wechat_bindings ( updated_at timestamptz NOT NULL DEFAULT now() ); -CREATE UNIQUE INDEX idx_wechat_bindings_open_id ON wechat_bindings (open_id); -CREATE UNIQUE INDEX idx_wechat_bindings_user_id ON wechat_bindings (user_id); +CREATE UNIQUE INDEX IF NOT EXISTS idx_wechat_bindings_open_id ON wechat_bindings (open_id); +CREATE UNIQUE INDEX IF NOT EXISTS idx_wechat_bindings_user_id ON wechat_bindings (user_id); -CREATE TABLE weather_alerts ( +CREATE TABLE IF NOT EXISTS weather_alerts ( id uuid PRIMARY KEY DEFAULT gen_random_uuid(), disease varchar(64) NOT NULL, level varchar(16) NOT NULL, @@ -312,7 +312,7 @@ CREATE TABLE weather_alerts ( created_at timestamptz NOT NULL DEFAULT now() ); -CREATE TABLE lamp_tests ( +CREATE TABLE IF NOT EXISTS lamp_tests ( id uuid PRIMARY KEY DEFAULT gen_random_uuid(), method varchar(32) NOT NULL DEFAULT 'lamp', room_id uuid, @@ -332,10 +332,10 @@ CREATE TABLE lamp_tests ( updated_at timestamptz NOT NULL DEFAULT now() ); -CREATE INDEX idx_lamp_tests_batch_id ON lamp_tests (batch_id); -CREATE INDEX idx_lamp_tests_room_id ON lamp_tests (room_id); +CREATE INDEX IF NOT EXISTS idx_lamp_tests_batch_id ON lamp_tests (batch_id); +CREATE INDEX IF NOT EXISTS idx_lamp_tests_room_id ON lamp_tests (room_id); -CREATE TABLE lamp_test_steps ( +CREATE TABLE IF NOT EXISTS lamp_test_steps ( id uuid PRIMARY KEY DEFAULT gen_random_uuid(), lamp_test_id uuid NOT NULL, step_no bigint NOT NULL, @@ -347,9 +347,9 @@ CREATE TABLE lamp_test_steps ( updated_at timestamptz NOT NULL DEFAULT now() ); -CREATE INDEX idx_lamp_test_steps_lamp_test_id ON lamp_test_steps (lamp_test_id); +CREATE INDEX IF NOT EXISTS idx_lamp_test_steps_lamp_test_id ON lamp_test_steps (lamp_test_id); -CREATE TABLE consumables ( +CREATE TABLE IF NOT EXISTS consumables ( id uuid PRIMARY KEY DEFAULT gen_random_uuid(), name varchar(64) NOT NULL, category varchar(32) NOT NULL, @@ -364,9 +364,9 @@ CREATE TABLE consumables ( updated_at timestamptz NOT NULL DEFAULT now() ); -CREATE INDEX idx_consumables_category ON consumables (category); +CREATE INDEX IF NOT EXISTS idx_consumables_category ON consumables (category); -CREATE TABLE consultations ( +CREATE TABLE IF NOT EXISTS consultations ( id uuid PRIMARY KEY DEFAULT gen_random_uuid(), room_id uuid, batch_id uuid, @@ -384,11 +384,11 @@ CREATE TABLE consultations ( updated_at timestamptz NOT NULL DEFAULT now() ); -CREATE INDEX idx_consultations_lamp_test_id ON consultations (lamp_test_id); -CREATE INDEX idx_consultations_batch_id ON consultations (batch_id); -CREATE INDEX idx_consultations_room_id ON consultations (room_id); +CREATE INDEX IF NOT EXISTS idx_consultations_lamp_test_id ON consultations (lamp_test_id); +CREATE INDEX IF NOT EXISTS idx_consultations_batch_id ON consultations (batch_id); +CREATE INDEX IF NOT EXISTS idx_consultations_room_id ON consultations (room_id); -CREATE TABLE spectrum_entries ( +CREATE TABLE IF NOT EXISTS spectrum_entries ( id uuid PRIMARY KEY DEFAULT gen_random_uuid(), disease varchar(64) NOT NULL, source varchar(128), @@ -397,7 +397,7 @@ CREATE TABLE spectrum_entries ( created_at timestamptz NOT NULL DEFAULT now() ); -CREATE TABLE trace_records ( +CREATE TABLE IF NOT EXISTS trace_records ( id uuid PRIMARY KEY DEFAULT gen_random_uuid(), room_id uuid, lamp_test_id uuid, @@ -415,6 +415,7 @@ CREATE TABLE trace_records ( updated_at timestamptz NOT NULL DEFAULT now() ); -CREATE INDEX idx_trace_records_consultation_id ON trace_records (consultation_id); -CREATE INDEX idx_trace_records_lamp_test_id ON trace_records (lamp_test_id); -CREATE INDEX idx_trace_records_room_id ON trace_records (room_id); +CREATE INDEX IF NOT EXISTS idx_trace_records_consultation_id ON trace_records (consultation_id); +CREATE INDEX IF NOT EXISTS idx_trace_records_lamp_test_id ON trace_records (lamp_test_id); +CREATE INDEX IF NOT EXISTS idx_trace_records_room_id ON trace_records (room_id); + diff --git a/开发交接记录.md b/开发交接记录.md index 7133808..9ca5ec9 100644 --- a/开发交接记录.md +++ b/开发交接记录.md @@ -814,6 +814,7 @@ MVP 沿用 IoTDB（现状）；TDengine 作为生产规模化候选（先基准 - 采用 `golang-migrate/migrate/v4 v4.18.2`，新增 `server-go/migrations/` 嵌入式迁移包； - 新增 `000001_baseline.up.sql` / `000001_baseline.down.sql`，覆盖当前 26 张业务表、索引和唯一约束； - 新增 `internal/database/migrate.go`：`RunMigrations`、`CheckSchemaVersion`、`CurrentSchemaVersion`； +- 上线前将 `000001_baseline.up.sql` 调整为 `CREATE TABLE/INDEX IF NOT EXISTS`，兼容已由 AutoMigrate 建表的开发库； - `database.Init` 改为先执行版本化迁移并校验 `schema_migrations`，生产环境忽略 `ALLOW_DEV_AUTOMIGRATE`；开发环境仅显式开启时允许 AutoMigrate； - `config.Config` 增加 `APP_ENV`、`ALLOW_DEV_AUTOMIGRATE`；README 与物理机部署指南补充迁移说明和环境变量； - 新增 sqlmock 测试，覆盖版本匹配、版本不匹配、空版本、dirty 状态和嵌入式迁移文件解析。 From a1f1e7baaa0a0c9c3c70506cb8549f2ac709ab28 Mon Sep 17 00:00:00 2001 From: weijuesen Date: Thu, 13 Aug 2026 23:45:20 +0800 Subject: [PATCH 05/18] =?UTF-8?q?fix:=20=E8=BF=81=E7=A7=BB=E5=90=8E?= =?UTF-8?q?=E4=BF=9D=E7=95=99=E6=95=B0=E6=8D=AE=E5=BA=93=E8=BF=9E=E6=8E=A5?= =?UTF-8?q?=E4=BE=9B=E5=90=AF=E5=8A=A8=E6=A3=80=E6=9F=A5=E4=BD=BF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server-go/internal/database/migrate.go | 4 +--- 开发交接记录.md | 1 + 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/server-go/internal/database/migrate.go b/server-go/internal/database/migrate.go index 3874ed2..e01df10 100644 --- a/server-go/internal/database/migrate.go +++ b/server-go/internal/database/migrate.go @@ -26,6 +26,7 @@ func RunMigrations(db *gorm.DB) error { if err != nil { return fmt.Errorf("加载嵌入式迁移文件: %w", err) } + defer sourceDriver.Close() databaseDriver, err := postgres.WithInstance(sqlDB, &postgres.Config{}) if err != nil { @@ -36,9 +37,6 @@ func RunMigrations(db *gorm.DB) error { if err != nil { return fmt.Errorf("创建迁移实例: %w", err) } - defer func() { - _, _ = m.Close() - }() if err := m.Up(); err != nil && !errors.Is(err, migrate.ErrNoChange) { return fmt.Errorf("执行数据库迁移: %w", err) diff --git a/开发交接记录.md b/开发交接记录.md index 9ca5ec9..e4c4a78 100644 --- a/开发交接记录.md +++ b/开发交接记录.md @@ -815,6 +815,7 @@ MVP 沿用 IoTDB（现状）；TDengine 作为生产规模化候选（先基准 - 新增 `000001_baseline.up.sql` / `000001_baseline.down.sql`，覆盖当前 26 张业务表、索引和唯一约束； - 新增 `internal/database/migrate.go`：`RunMigrations`、`CheckSchemaVersion`、`CurrentSchemaVersion`； - 上线前将 `000001_baseline.up.sql` 调整为 `CREATE TABLE/INDEX IF NOT EXISTS`，兼容已由 AutoMigrate 建表的开发库； +- 开发服务器首轮启动暴露 `migrate.Close()` 会关闭底层数据库连接，已改为只关闭迁移 source，保留 `sql.DB` 供后续启动检查使用； - `database.Init` 改为先执行版本化迁移并校验 `schema_migrations`，生产环境忽略 `ALLOW_DEV_AUTOMIGRATE`；开发环境仅显式开启时允许 AutoMigrate； - `config.Config` 增加 `APP_ENV`、`ALLOW_DEV_AUTOMIGRATE`；README 与物理机部署指南补充迁移说明和环境变量； - 新增 sqlmock 测试，覆盖版本匹配、版本不匹配、空版本、dirty 状态和嵌入式迁移文件解析。 From f1ba6b35dc611eae33cf391b64a9538a4b993e95 Mon Sep 17 00:00:00 2001 From: weijuesen Date: Thu, 13 Aug 2026 23:46:37 +0800 Subject: [PATCH 06/18] =?UTF-8?q?docs:=20=E8=AE=B0=E5=BD=95=E5=BC=80?= =?UTF-8?q?=E5=8F=91=E6=9C=8D=E5=8A=A1=E5=99=A8=E7=89=88=E6=9C=AC=E5=8C=96?= =?UTF-8?q?=E8=BF=81=E7=A7=BB=E9=83=A8=E7=BD=B2=E4=B8=8E=E5=9B=9E=E6=BB=9A?= =?UTF-8?q?=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 变更记录.md | 24 ++++++++++++++++++++++++ 后续工作计划.md | 2 +- 开发交接记录.md | 9 ++++++--- 3 files changed, 31 insertions(+), 4 deletions(-) diff --git a/变更记录.md b/变更记录.md index d25dd75..95631c0 100644 --- a/变更记录.md +++ b/变更记录.md @@ -1159,3 +1159,27 @@ UPDATE cameras SET gb_channel_id = '44010201001320000001' WHERE gb_device_id = ' - `npm run build` 通过，无 TS 诊断错误 - 前端已部署到 `http://100.83.103.1:5174/videos`（5174 端口正常监听） - 编辑摄像头不再崩溃，"认证密码"正确回显，"码流类型"字段已移除且不再出现残留值 + +--- + +## 2026-08-13 版本化数据库迁移部署（Task 2） + +### 变更内容 + +- 后端采用 `golang-migrate/migrate/v4 v4.18.2`，启动时执行 `server-go/migrations/` 下 SQL 迁移并校验 `schema_migrations`； +- `000001_baseline` 覆盖当前 26 张业务表、索引和唯一约束，并已调整为幂等建表/建索引； +- `database.Init` 不再无条件 AutoMigrate；生产环境忽略 `ALLOW_DEV_AUTOMIGRATE`； +- 开发服务器 `100.83.103.1` 已从 AutoMigrate 旧二进制切换为迁移版本二进制。 + +### 验证结果 + +- 开发服务器后端 `:3000` 与 Web `:5174` 均监听正常，`/api/v1/health` 返回 200； +- `schema_migrations`：`1|f`； +- 后端日志：`数据库连接成功，版本化迁移完成 schemaVersion=1`； +- 新二进制 SHA256：`9acb5fbfdb854b90b821d456f0f05177cd34dd8f3161686e1c472170af5d1201`。 + +### 回滚点 + +- 数据库备份：`/home/pan/backups/silk-20260813-234221.dump`； +- 旧二进制：`/home/pan/silk/server-go/server-go-linux.bak-20260813-234221`； +- 回滚步骤：恢复旧二进制并重启，或先 `pg_restore` 恢复数据库备份；开发服务器无 git 仓库，不依赖 git tag。 diff --git a/后续工作计划.md b/后续工作计划.md index 0513a53..57ab8a1 100644 --- a/后续工作计划.md +++ b/后续工作计划.md @@ -10,7 +10,7 @@ |---|---|---|---|---| | Wave 0 | 决策与基线 | Task 0 固化开放决策与整改基线 | 方案确定 | 无，决策记录已生成 | | Wave 0 | 决策与基线 | Task 1 恢复可复现的多端质量基线 | 部分可用 | CI 待 Task 0 平台落地 | -| Wave 1 | P0 安全与正确性 | Task 2 版本化数据库迁移与 Schema 启动门禁 | 部分可用 | 本机无 PostgreSQL/Docker，真实空库/回滚演练待环境 | +| Wave 1 | P0 安全与正确性 | Task 2 版本化数据库迁移与 Schema 启动门禁 | 部分可用 | 开发库升级已验证，真实 down 回滚演练待后续 | | Wave 1 | P0 安全与正确性 | Task 3 移除默认密钥与默认管理员密码 | 未开始 | 无 | | Wave 1 | P0 安全与正确性 | Task 4 收口视频访问与摄像头密钥输出 | 未开始 | 无 | | Wave 1 | P0 安全与正确性 | Task 5 修复 WebSocket 越权与 AI 流 SSRF | 未开始 | 无 | diff --git a/开发交接记录.md b/开发交接记录.md index e4c4a78..d2c5e58 100644 --- a/开发交接记录.md +++ b/开发交接记录.md @@ -818,7 +818,8 @@ MVP 沿用 IoTDB（现状）；TDengine 作为生产规模化候选（先基准 - 开发服务器首轮启动暴露 `migrate.Close()` 会关闭底层数据库连接，已改为只关闭迁移 source，保留 `sql.DB` 供后续启动检查使用； - `database.Init` 改为先执行版本化迁移并校验 `schema_migrations`，生产环境忽略 `ALLOW_DEV_AUTOMIGRATE`；开发环境仅显式开启时允许 AutoMigrate； - `config.Config` 增加 `APP_ENV`、`ALLOW_DEV_AUTOMIGRATE`；README 与物理机部署指南补充迁移说明和环境变量； -- 新增 sqlmock 测试，覆盖版本匹配、版本不匹配、空版本、dirty 状态和嵌入式迁移文件解析。 +- 新增 sqlmock 测试，覆盖版本匹配、版本不匹配、空版本、dirty 状态和嵌入式迁移文件解析； +- 已在开发服务器 `100.83.103.1` 部署迁移版本。 ### 设计思路与决策依据 @@ -831,10 +832,12 @@ MVP 沿用 IoTDB（现状）；TDengine 作为生产规模化候选（先基准 - `go test ./...`、`go vet ./...`、`go build ./...` 全部通过； - `internal/database` 迁移版本检查与嵌入式迁移解析单测通过； -- 本机无 Docker/PostgreSQL，未执行真实空库建库、旧库升级和 down 回滚演练；需在开发服务器或本地 PostgreSQL 环境完成，并严格按 AGENTS.md 先备份。 +- 开发服务器：`schema_migrations` 为 `1|f`，`/api/v1/health` 200，Web `5174` 200，后端日志显示 `版本化迁移完成 schemaVersion=1`； +- 已执行旧库升级验证；真实空库建库和 down 回滚演练尚未执行。 ### 回滚点 - 本任务前基线提交为 `20bea00`；回滚可还原 Task 2 提交并恢复 go.mod/go.sum； - 若迁移已应用到数据库，必须先恢复迁移前数据库备份，不能只回滚代码而保留不兼容 schema； -- 本次未连接开发服务器、未执行生产部署。 +- 开发服务器回滚点：数据库备份 `/home/pan/backups/silk-20260813-234221.dump`，旧二进制 `/home/pan/silk/server-go/server-go-linux.bak-20260813-234221`； +- 开发服务器无 git 仓库，回滚按旧二进制 + 数据库 dump 恢复，不再依赖服务器 git tag。 From 440cf803e44bc02c2ac7eb5a554452492abd905d Mon Sep 17 00:00:00 2001 From: weijuesen Date: Thu, 13 Aug 2026 23:54:04 +0800 Subject: [PATCH 07/18] =?UTF-8?q?docs:=20Task=203=20=E8=B7=B3=E8=BF=87?= =?UTF-8?q?=E5=B9=B6=E7=95=99=E5=88=B0=E6=9C=80=E5=90=8E=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../2026-08-13-remediation-decisions.md | 1 + 后续工作计划.md | 2 +- 开发交接记录.md | 19 +++++++++++++++++++ 项目整改实施计划_V1.0.md | 2 ++ 4 files changed, 23 insertions(+), 1 deletion(-) diff --git a/docs/decisions/2026-08-13-remediation-decisions.md b/docs/decisions/2026-08-13-remediation-decisions.md index 066f682..5911236 100644 --- a/docs/decisions/2026-08-13-remediation-decisions.md +++ b/docs/decisions/2026-08-13-remediation-decisions.md @@ -13,6 +13,7 @@ | DEC-006 | APP 保持现状：作为环境监控端，不扩展为全量蚕病功能 | 全量同步 Web/小程序蚕病功能 | 当前 APP 源码未实现蚕病功能，扩大同步会显著增加维护面 | Task 0 后不新增 APP 蚕病页面 | 产品负责人 | 试点用户明确提出 APP 蚕病需求时 | | DEC-007 | 真实模型二分类转多病种指标门槛保持“未定义，不允许上生产”；待数据集修复和训练恢复后按冻结测试集、mAP、混淆矩阵评审 | 先预设 mAP 0.5 | 当前无真实模型，不能凭空设置验收门槛 | AI 生产继续 mock/不接受为真实验收 | AI 负责人 + 项目负责人 | 数据集修复完成或模型训练恢复时 | | DEC-008 | 生产云厂商、对象存储、域名和证书保持现状：不迁移云，继续沿用物理机开发环境 | 云 OSS/COS；云 RDS | 当前无生产试点和上云评审；上云属于发布决策 | 部署仍按 `部署指南(物理机).md` | 项目负责人 + 运维 | 正式生产试点前 | +| DEC-009 | Task 3 移除默认密钥/默认管理员密码延后到最后处理；本轮跳过，不执行密钥轮换和客户端密码预填删除 | 当前 Wave 1 执行；最后阶段集中执行 | 用户 2026-08-13 明确要求跳过并留到最后 | 默认凭据风险保持开放；最后阶段需安排密钥轮换窗口 | 项目负责人 + 后端 + 运维 | 进入最后整改阶段时 | ## 生效与复审 diff --git a/后续工作计划.md b/后续工作计划.md index 57ab8a1..045fdc4 100644 --- a/后续工作计划.md +++ b/后续工作计划.md @@ -11,7 +11,7 @@ | Wave 0 | 决策与基线 | Task 0 固化开放决策与整改基线 | 方案确定 | 无，决策记录已生成 | | Wave 0 | 决策与基线 | Task 1 恢复可复现的多端质量基线 | 部分可用 | CI 待 Task 0 平台落地 | | Wave 1 | P0 安全与正确性 | Task 2 版本化数据库迁移与 Schema 启动门禁 | 部分可用 | 开发库升级已验证，真实 down 回滚演练待后续 | -| Wave 1 | P0 安全与正确性 | Task 3 移除默认密钥与默认管理员密码 | 未开始 | 无 | +| Wave 1 | P0 安全与正确性 | Task 3 移除默认密钥与默认管理员密码 | 延后到最后（跳过） | 用户 2026-08-13 明确要求跳过并留到最后 | | Wave 1 | P0 安全与正确性 | Task 4 收口视频访问与摄像头密钥输出 | 未开始 | 无 | | Wave 1 | P0 安全与正确性 | Task 5 修复 WebSocket 越权与 AI 流 SSRF | 未开始 | 无 | | Wave 1 | P0 安全与正确性 | Task 6 修复 AI 风险语义并隔离 Mock 数据 | 未开始 | 无 | diff --git a/开发交接记录.md b/开发交接记录.md index d2c5e58..20d92aa 100644 --- a/开发交接记录.md +++ b/开发交接记录.md @@ -841,3 +841,22 @@ MVP 沿用 IoTDB（现状）；TDengine 作为生产规模化候选（先基准 - 若迁移已应用到数据库，必须先恢复迁移前数据库备份，不能只回滚代码而保留不兼容 schema； - 开发服务器回滚点：数据库备份 `/home/pan/backups/silk-20260813-234221.dump`，旧二进制 `/home/pan/silk/server-go/server-go-linux.bak-20260813-234221`； - 开发服务器无 git 仓库，回滚按旧二进制 + 数据库 dump 恢复，不再依赖服务器 git tag。 + +--- + +## 2026-08-13 Task 3 延后记录 + +### 做了什么 + +- 按用户要求将 Task 3“移除默认密钥与默认管理员密码”从当前执行顺序中跳过； +- 已同步记录到 `项目整改实施计划_V1.0.md`、`docs/decisions/2026-08-13-remediation-decisions.md`、`后续工作计划.md` 和本文件； +- Task 3 保留到最后处理，不是取消。 + +### 影响 + +- 默认密钥、默认管理员密码和小程序/APP 密码预填在最后阶段前继续保持现状； +- 该 P0 风险在最后阶段开始前未关闭；开始最后阶段前需要明确密钥轮换窗口、管理员初始化策略和客户端发布窗口。 + +### 回滚点 + +- 本记录仅修改文档，无代码、数据库、服务器或生成产物变更；如需回滚，删除本记录并恢复相关计划/决策表即可。 diff --git a/项目整改实施计划_V1.0.md b/项目整改实施计划_V1.0.md index 8f8fa24..5da2aa3 100644 --- a/项目整改实施计划_V1.0.md +++ b/项目整改实施计划_V1.0.md @@ -216,6 +216,8 @@ Expected: 版本匹配通过，不匹配时服务启动失败且日志不包含 ### Task 3: 移除默认密钥与默认管理员密码 +> 2026-08-13 用户决策：Task 3 本轮跳过，留到最后处理。期间不删除默认密钥/默认管理员密码，不执行客户端密码预填清理。 + **Requirements:** IAM-004、SEC-001、SEC-002 **Owner:** 后端 + 运维 + 各客户端负责人 **Estimated effort:** 1～2 人日 From 1a29def480335767fbffdaf7561aa7f63c597039 Mon Sep 17 00:00:00 2001 From: weijuesen Date: Fri, 14 Aug 2026 00:07:52 +0800 Subject: [PATCH 08/18] =?UTF-8?q?feat:=20=E6=94=B6=E5=8F=A3=E8=A7=86?= =?UTF-8?q?=E9=A2=91=E8=AE=BF=E9=97=AE=E4=B8=8E=E6=91=84=E5=83=8F=E5=A4=B4?= =?UTF-8?q?=E5=AF=86=E9=92=A5=E8=BE=93=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/screens/VideoScreen.tsx | 18 ++- miniapp/src/pages/video/player/index.tsx | 23 ++-- server-go/internal/handler/alarm_clip.go | 13 +- server-go/internal/handler/video_auth.go | 102 ++++++++++++++ server-go/internal/handler/video_auth_test.go | 111 +++++++++++++++ server-go/internal/handler/video_camera.go | 94 ++++++------- server-go/internal/handler/video_clip.go | 28 +++- server-go/internal/handler/video_dto.go | 128 ++++++++++++++++++ server-go/internal/handler/video_stream.go | 12 +- server-go/internal/middleware/auth.go | 4 +- server-go/internal/model/models.go | 4 +- web/src/dal/video.ts | 3 +- 后续工作计划.md | 2 +- 开发交接记录.md | 30 ++++ 14 files changed, 494 insertions(+), 78 deletions(-) create mode 100644 server-go/internal/handler/video_auth.go create mode 100644 server-go/internal/handler/video_auth_test.go create mode 100644 server-go/internal/handler/video_dto.go diff --git a/app/src/screens/VideoScreen.tsx b/app/src/screens/VideoScreen.tsx index 223e4d8..17be4f5 100644 --- a/app/src/screens/VideoScreen.tsx +++ b/app/src/screens/VideoScreen.tsx @@ -3,7 +3,7 @@ import { StyleSheet, View, FlatList, RefreshControl, Alert } from 'react-native' import { Text, Card, Button, useTheme, ActivityIndicator, Surface, IconButton, SegmentedButtons } from 'react-native-paper'; import { SafeAreaView } from 'react-native-safe-area-context'; import { useNavigation } from '@react-navigation/native'; -import { getCameras, getClips } from '../api/video'; +import { getCameras, getClips, playCamera } from '../api/video'; import { resolveUrl } from '../api/client'; import { formatDateTime, formatDuration, formatFileSize } from '../utils/format'; import type { Camera, VideoClip } from '../types'; @@ -41,12 +41,16 @@ export default function VideoScreen() { }, [loadData]); const handlePlay = async (camera: Camera) => { - const streamUrl = resolveUrl(`/api/v1/video/cameras/${camera.id}/live/stream`); - navigation.navigate('VideoPlayer', { - cameraId: camera.id, - cameraName: camera.name, - streamUrl, - }); + try { + const info = await playCamera(camera.id, 'flv'); + navigation.navigate('VideoPlayer', { + cameraId: camera.id, + cameraName: camera.name, + streamUrl: resolveUrl(info.url), + }); + } catch (err: any) { + Alert.alert('提示', err?.message || '获取播放地址失败'); + } }; const handlePlayClip = async (clip: VideoClip) => { diff --git a/miniapp/src/pages/video/player/index.tsx b/miniapp/src/pages/video/player/index.tsx index 2c39fdf..1a746f1 100644 --- a/miniapp/src/pages/video/player/index.tsx +++ b/miniapp/src/pages/video/player/index.tsx @@ -2,7 +2,7 @@ import React, { useState, useEffect } from 'react'; import { View, Text, Video } from '@tarojs/components'; import { useRouter } from '@tarojs/taro'; import styles from './index.module.scss'; -import { getCameras } from '@/api/video'; +import { getCameras, playCamera } from '@/api/video'; import { resolveUrl } from '@/api/config'; import type { Camera } from '@/types'; @@ -30,10 +30,6 @@ const VideoPlayerPage: React.FC = () => { const found = cameras.find((c) => c.id === cameraId); if (found) { setCamera(found); - const url = found.hlsUrl || found.streamUrl || found.flvUrl; - if (url) { - setVideoUrl(resolveUrl(url)); - } } } catch (err) { console.error('[VideoPlayer] 获取摄像头信息失败:', err); @@ -44,14 +40,21 @@ const VideoPlayerPage: React.FC = () => { }, [cameraId, directUrl]); const handlePlay = async () => { - if (!cameraId && !camera) return; + const id = cameraId || camera?.id; + if (!id) return; setLoading(true); setError(''); - const streamUrl = resolveUrl(`/api/v1/video/cameras/${cameraId || camera!.id}/live/stream`); - console.log('[VideoPlayer] 获取播放地址成功:', streamUrl); - setVideoUrl(streamUrl); - setLoading(false); + try { + const info = await playCamera(id, { format: 'flv' }); + const streamUrl = resolveUrl(info.url); + console.log('[VideoPlayer] 获取播放地址成功:', streamUrl); + setVideoUrl(streamUrl); + } catch (err) { + setError(err instanceof Error ? err.message : '获取播放地址失败'); + } finally { + setLoading(false); + } }; const formats: { key: 'hls' | 'flv' | 'webrtc'; label: string }[] = [ diff --git a/server-go/internal/handler/alarm_clip.go b/server-go/internal/handler/alarm_clip.go index 336ae1b..536e102 100644 --- a/server-go/internal/handler/alarm_clip.go +++ b/server-go/internal/handler/alarm_clip.go @@ -3,6 +3,7 @@ package handler import ( "fmt" "net/http" + "strconv" "silk-server-go/internal/middleware" "silk-server-go/internal/model" @@ -19,6 +20,12 @@ func RegisterAlarmClipRoutes(rg *gin.RouterGroup, db *gorm.DB) { // getAlarmClip 获取告警关联视频片段（查 video_clips 表 where alarm_id=:id，按 start_at DESC） func getAlarmClip(db *gorm.DB) gin.HandlerFunc { return func(c *gin.Context) { + userID := currentUserID(c) + if userID == nil { + c.JSON(http.StatusUnauthorized, gin.H{"error": "未提供用户信息"}) + return + } + id := c.Param("id") // 先检查告警是否存在 @@ -33,7 +40,11 @@ func getAlarmClip(db *gorm.DB) gin.HandlerFunc { // 为每个片段设置 playbackUrl for i := range clips { - url := fmt.Sprintf("/api/v1/video/clips/%d/stream", clips[i].ID) + token, err := IssueVideoToken(*userID, "clip", strconv.FormatUint(uint64(clips[i].ID), 10), videoTokenTTL) + if err != nil { + continue + } + url := fmt.Sprintf("/api/v1/video/clips/%d/stream?videoToken=%s", clips[i].ID, token) clips[i].PlaybackURL = &url } diff --git a/server-go/internal/handler/video_auth.go b/server-go/internal/handler/video_auth.go new file mode 100644 index 0000000..a4541b6 --- /dev/null +++ b/server-go/internal/handler/video_auth.go @@ -0,0 +1,102 @@ +package handler + +import ( + "errors" + "net/http" + "time" + + "github.com/gin-gonic/gin" + "github.com/golang-jwt/jwt/v5" +) + +const videoTokenTTL = 5 * time.Minute + +var videoTokenSecret []byte + +// SetVideoTokenSecret 设置视频短时令牌签名密钥。 +func SetVideoTokenSecret(secret string) { + videoTokenSecret = []byte(secret) +} + +// IssueVideoToken 签发绑定用户、资源类型和资源 ID 的短时视频令牌。 +func IssueVideoToken(userID, resourceType, resourceID string, ttl time.Duration) (string, error) { + if len(videoTokenSecret) == 0 { + return "", errors.New("video token secret not configured") + } + + now := time.Now() + claims := jwt.MapClaims{ + "sub": userID, + "purpose": "video", + "rtype": resourceType, + "rid": resourceID, + "iat": now.Unix(), + "exp": now.Add(ttl).Unix(), + } + return jwt.NewWithClaims(jwt.SigningMethodHS256, claims).SignedString(videoTokenSecret) +} + +// ValidateVideoToken 校验视频令牌的资源类型、资源 ID、用途和有效期。 +func ValidateVideoToken(token, resourceType, resourceID string) error { + claims, err := parseVideoToken(token) + if err != nil { + return err + } + return validateVideoClaims(claims, resourceType, resourceID, "") +} + +// ValidateVideoTokenForUser 额外校验令牌所属用户，用于可以拿到当前 JWT 的调用方。 +func ValidateVideoTokenForUser(token, resourceType, resourceID, userID string) error { + claims, err := parseVideoToken(token) + if err != nil { + return err + } + return validateVideoClaims(claims, resourceType, resourceID, userID) +} + +// requireVideoToken 校验流代理 URL 上的 videoToken，缺失返回 401，错误/过期/资源错配返回 403。 +func requireVideoToken(c *gin.Context, resourceType, resourceID string) bool { + token := c.Query("videoToken") + if token == "" { + c.JSON(http.StatusUnauthorized, gin.H{"error": "missing video token"}) + return false + } + if err := ValidateVideoToken(token, resourceType, resourceID); err != nil { + c.JSON(http.StatusForbidden, gin.H{"error": "invalid video token"}) + return false + } + return true +} + +func parseVideoToken(token string) (jwt.MapClaims, error) { + if len(videoTokenSecret) == 0 { + return nil, errors.New("video token secret not configured") + } + claims := jwt.MapClaims{} + parsed, err := jwt.ParseWithClaims(token, claims, func(t *jwt.Token) (interface{}, error) { + return videoTokenSecret, nil + }, jwt.WithValidMethods([]string{"HS256"})) + if err != nil { + return nil, err + } + if !parsed.Valid { + return nil, errors.New("invalid video token") + } + return claims, nil +} + +func validateVideoClaims(claims jwt.MapClaims, resourceType, resourceID, userID string) error { + if claims["purpose"] != "video" { + return errors.New("invalid video token purpose") + } + if claims["rtype"] != resourceType { + return errors.New("video token resource type mismatch") + } + if claims["rid"] != resourceID { + return errors.New("video token resource mismatch") + } + if userID != "" && claims["sub"] != userID { + return errors.New("video token user mismatch") + } + return nil +} diff --git a/server-go/internal/handler/video_auth_test.go b/server-go/internal/handler/video_auth_test.go new file mode 100644 index 0000000..4027f8e --- /dev/null +++ b/server-go/internal/handler/video_auth_test.go @@ -0,0 +1,111 @@ +package handler + +import ( + "encoding/json" + "net/http" + "net/http/httptest" + "net/url" + "strings" + "testing" + "time" + + "silk-server-go/internal/model" + + "github.com/gin-gonic/gin" +) + +func TestCameraResponseNeverContainsSecrets(t *testing.T) { + password := "secret-password" + camera := model.Camera{ + PasswordEnc: &password, + GbAuthPassword: &password, + } + + raw, err := json.Marshal(camera) + if err != nil { + t.Fatalf("marshal camera: %v", err) + } + body := string(raw) + if strings.Contains(body, "passwordEnc") || strings.Contains(body, password) { + t.Fatalf("camera JSON must not contain password fields: %s", body) + } + if strings.Contains(body, "gbAuthPassword") { + t.Fatalf("camera JSON must not contain gbAuthPassword: %s", body) + } +} + +func TestIssueAndValidateVideoToken(t *testing.T) { + SetVideoTokenSecret("test-secret") + token, err := IssueVideoToken("user-1", "camera", "12", time.Minute) + if err != nil { + t.Fatalf("issue video token: %v", err) + } + if token == "" { + t.Fatal("expected non-empty video token") + } + + if err := ValidateVideoToken(token, "camera", "12"); err != nil { + t.Fatalf("valid video token rejected: %v", err) + } + if err := ValidateVideoToken(token, "camera", "13"); err == nil { + t.Fatal("expected resource mismatch error") + } + if err := ValidateVideoToken(token, "clip", "12"); err == nil { + t.Fatal("expected resource type mismatch error") + } +} + +func TestValidateVideoTokenForUserRejectsMismatch(t *testing.T) { + SetVideoTokenSecret("test-secret") + token, err := IssueVideoToken("user-1", "camera", "12", time.Minute) + if err != nil { + t.Fatalf("issue video token: %v", err) + } + + if err := ValidateVideoTokenForUser(token, "camera", "12", "user-1"); err != nil { + t.Fatalf("same-user token rejected: %v", err) + } + if err := ValidateVideoTokenForUser(token, "camera", "12", "user-2"); err == nil { + t.Fatal("expected cross-user token rejection") + } +} + +func TestVideoTokenExpires(t *testing.T) { + SetVideoTokenSecret("test-secret") + token, err := IssueVideoToken("user-1", "camera", "12", -time.Second) + if err != nil { + t.Fatalf("issue expired token: %v", err) + } + if err := ValidateVideoToken(token, "camera", "12"); err == nil { + t.Fatal("expected expired token rejection") + } +} + +func TestVideoStreamRequiresValidToken(t *testing.T) { + SetVideoTokenSecret("test-secret") + gin.SetMode(gin.TestMode) + + rec := httptest.NewRecorder() + c, _ := gin.CreateTestContext(rec) + c.Request = &http.Request{URL: &url.URL{RawQuery: ""}} + if requireVideoToken(c, "camera", "12") { + t.Fatal("missing token should be rejected") + } + if rec.Code != http.StatusUnauthorized { + t.Fatalf("missing token status = %d, want 401", rec.Code) + } + + token, err := IssueVideoToken("user-1", "camera", "13", time.Minute) + if err != nil { + t.Fatalf("issue token: %v", err) + } + rec2 := httptest.NewRecorder() + c2, _ := gin.CreateTestContext(rec2) + c2.Request = &http.Request{URL: &url.URL{RawQuery: "videoToken=" + token}} + if requireVideoToken(c2, "camera", "12") { + t.Fatal("wrong resource token should be rejected") + } + if rec2.Code != http.StatusForbidden { + t.Fatalf("wrong resource token status = %d, want 403", rec2.Code) + } +} diff --git a/server-go/internal/handler/video_camera.go b/server-go/internal/handler/video_camera.go index b844eb0..3a18906 100644 --- a/server-go/internal/handler/video_camera.go +++ b/server-go/internal/handler/video_camera.go @@ -86,7 +86,11 @@ func listCameras(db *gorm.DB, media *service.MediaService) gin.HandlerFunc { slog.Warn("同步 WVP 设备信息失败，保留 DB 状态", "error", err) } - c.JSON(http.StatusOK, cameras) + publicCameras := make([]CameraPublic, 0, len(cameras)) + for i := range cameras { + publicCameras = append(publicCameras, toCameraPublic(cameras[i])) + } + c.JSON(http.StatusOK, publicCameras) } } @@ -99,18 +103,19 @@ func getCamera(db *gorm.DB) gin.HandlerFunc { c.JSON(http.StatusNotFound, gin.H{"error": "camera not found"}) return } - c.JSON(http.StatusOK, camera) + c.JSON(http.StatusOK, toCameraPublic(camera)) } } // createCamera 新建摄像头 func createCamera(db *gorm.DB, media *service.MediaService) gin.HandlerFunc { return func(c *gin.Context) { - var camera model.Camera - if err := c.ShouldBindJSON(&camera); err != nil { + var input CameraInput + if err := c.ShouldBindJSON(&input); err != nil { c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()}) return } + camera := input.toModel() camera.ID = 0 // 让数据库自动生成 if camera.RoomID == nil { defaultRoom := "1" @@ -137,7 +142,7 @@ func createCamera(db *gorm.DB, media *service.MediaService) gin.HandlerFunc { } } } - c.JSON(http.StatusCreated, camera) + c.JSON(http.StatusCreated, toCameraPublic(camera)) } } @@ -185,7 +190,7 @@ func updateCamera(db *gorm.DB, media *service.MediaService) gin.HandlerFunc { } } } - c.JSON(http.StatusOK, camera) + c.JSON(http.StatusOK, toCameraPublic(camera)) } } @@ -212,6 +217,12 @@ func deleteCamera(db *gorm.DB, media *service.MediaService) gin.HandlerFunc { // playCamera 播放摄像头实时流（body: {format}，调用 media.StartPlay） func playCamera(db *gorm.DB, media *service.MediaService) gin.HandlerFunc { return func(c *gin.Context) { + userID := currentUserID(c) + if userID == nil { + c.JSON(http.StatusUnauthorized, gin.H{"error": "未提供用户信息"}) + return + } + id := c.Param("id") var camera model.Camera if db.Where("id = ?", id).First(&camera).Error != nil { @@ -223,71 +234,45 @@ func playCamera(db *gorm.DB, media *service.MediaService) gin.HandlerFunc { return } - var body struct { - Format string `json:"format"` + token, err := IssueVideoToken(*userID, "camera", strconv.FormatUint(uint64(camera.ID), 10), videoTokenTTL) + if err != nil { + c.JSON(http.StatusInternalServerError, gin.H{"error": "生成播放令牌失败"}) + return } - c.ShouldBindJSON(&body) - format := body.Format - if format == "" { - format = "hls" - } - - expiresAt := time.Now().Add(30 * time.Minute).UTC().Format(time.RFC3339) + expiresAt := time.Now().Add(videoTokenTTL).UTC().Format(time.RFC3339) + streamURL := fmt.Sprintf("/api/v1/video/cameras/%d/live/proxy?videoToken=%s", camera.ID, token) // GB28181 摄像头：通过 WVP 媒体服务器播放 if camera.GbDeviceID != nil && camera.GbChannelID != nil && *camera.GbDeviceID != "" && *camera.GbChannelID != "" { - result, err := media.StartPlay(*camera.GbDeviceID, *camera.GbChannelID) - if err != nil { + _, playErr := media.StartPlay(*camera.GbDeviceID, *camera.GbChannelID) + if playErr != nil { // StartPlay 失败不等于摄像头离线，可能是 WVP/ZLM 瞬时问题，不修改 is_online - slog.Warn("StartPlay 失败", "deviceId", *camera.GbDeviceID, "channelId", *camera.GbChannelID, "error", err) - c.JSON(http.StatusServiceUnavailable, gin.H{"error": "播放失败: " + err.Error()}) + slog.Warn("StartPlay 失败", "deviceId", *camera.GbDeviceID, "channelId", *camera.GbChannelID, "error", playErr) + c.JSON(http.StatusServiceUnavailable, gin.H{"error": "播放失败: " + playErr.Error()}) return } - url := result.HLS - if format == "flv" && result.FLV != "" { - url = result.FLV - } else if format == "webrtc" && result.WebRtc != "" { - url = result.WebRtc - } - c.JSON(http.StatusOK, gin.H{ "cameraId": camera.ID, "gbDeviceId": camera.GbDeviceID, "gbChannelId": camera.GbChannelID, - "format": format, - "url": url, + "format": "flv", + "url": streamURL, "expiresAt": expiresAt, }) return } - // Fallback：使用摄像头自身的流地址 - var url string - switch format { - case "flv": - if camera.FlvURL != nil { - url = *camera.FlvURL - } - case "webrtc": - if camera.WebrtcURL != nil { - url = *camera.WebrtcURL - } - default: - if camera.HlsURL != nil { - url = *camera.HlsURL - } - } - + // Fallback 不再返回直连流地址，避免绕过令牌代理。 c.JSON(http.StatusOK, gin.H{ "cameraId": camera.ID, "gbDeviceId": nil, "gbChannelId": nil, - "format": format, - "url": url, + "format": "flv", + "url": streamURL, "expiresAt": expiresAt, - "mock": url == "", + "mock": true, }) } } @@ -295,6 +280,12 @@ func playCamera(db *gorm.DB, media *service.MediaService) gin.HandlerFunc { // playbackCamera 查询摄像头的历史录像片段（query: from/to/limit） func playbackCamera(db *gorm.DB) gin.HandlerFunc { return func(c *gin.Context) { + userID := currentUserID(c) + if userID == nil { + c.JSON(http.StatusUnauthorized, gin.H{"error": "未提供用户信息"}) + return + } + id := c.Param("id") limit := 50 @@ -318,7 +309,11 @@ func playbackCamera(db *gorm.DB) gin.HandlerFunc { // 为每个片段设置 playbackUrl for i := range clips { - url := fmt.Sprintf("/api/v1/video/clips/%d/stream", clips[i].ID) + token, err := IssueVideoToken(*userID, "clip", strconv.FormatUint(uint64(clips[i].ID), 10), videoTokenTTL) + if err != nil { + continue + } + url := fmt.Sprintf("/api/v1/video/clips/%d/stream?videoToken=%s", clips[i].ID, token) clips[i].PlaybackURL = &url } @@ -342,7 +337,6 @@ func getWvpConfig(media *service.MediaService) gin.HandlerFunc { c.JSON(http.StatusOK, gin.H{ "sipId": sip["id"], "sipDomain": sip["domain"], - "sipPassword": sip["password"], "sipPort": sip["port"], "sipShowIp": sip["showIp"], }) diff --git a/server-go/internal/handler/video_clip.go b/server-go/internal/handler/video_clip.go index 9202452..cc97d46 100644 --- a/server-go/internal/handler/video_clip.go +++ b/server-go/internal/handler/video_clip.go @@ -25,6 +25,12 @@ func RegisterVideoClipRoutes(rg *gin.RouterGroup, db *gorm.DB, cfg *config.Confi // listClips 录像片段列表（query: cameraId/from/to/limit，按 startAt DESC） func listClips(db *gorm.DB) gin.HandlerFunc { return func(c *gin.Context) { + userID := currentUserID(c) + if userID == nil { + c.JSON(http.StatusUnauthorized, gin.H{"error": "未提供用户信息"}) + return + } + limit := 50 if l, err := strconv.Atoi(c.Query("limit")); err == nil && l > 0 { limit = l @@ -49,7 +55,11 @@ func listClips(db *gorm.DB) gin.HandlerFunc { // 为每个片段设置 playbackUrl for i := range clips { - url := fmt.Sprintf("/api/v1/video/clips/%d/stream", clips[i].ID) + token, err := IssueVideoToken(*userID, "clip", strconv.FormatUint(uint64(clips[i].ID), 10), videoTokenTTL) + if err != nil { + continue + } + url := fmt.Sprintf("/api/v1/video/clips/%d/stream?videoToken=%s", clips[i].ID, token) clips[i].PlaybackURL = &url } @@ -60,6 +70,12 @@ func listClips(db *gorm.DB) gin.HandlerFunc { // playClip 获取片段播放地址 func playClip(db *gorm.DB) gin.HandlerFunc { return func(c *gin.Context) { + userID := currentUserID(c) + if userID == nil { + c.JSON(http.StatusUnauthorized, gin.H{"error": "未提供用户信息"}) + return + } + clipId := c.Param("clipId") var clip model.VideoClip if db.Where("id = ?", clipId).First(&clip).Error != nil { @@ -72,11 +88,17 @@ func playClip(db *gorm.DB) gin.HandlerFunc { format = "mp4" } + token, err := IssueVideoToken(*userID, "clip", strconv.FormatUint(uint64(clip.ID), 10), videoTokenTTL) + if err != nil { + c.JSON(http.StatusInternalServerError, gin.H{"error": "生成播放令牌失败"}) + return + } + c.JSON(http.StatusOK, gin.H{ "clipId": clip.ID, - "url": fmt.Sprintf("/api/v1/video/clips/%d/stream", clip.ID), + "url": fmt.Sprintf("/api/v1/video/clips/%d/stream?videoToken=%s", clip.ID, token), "format": format, - "expiresAt": time.Now().Add(60 * time.Minute).UTC().Format(time.RFC3339), + "expiresAt": time.Now().Add(videoTokenTTL).UTC().Format(time.RFC3339), }) } } diff --git a/server-go/internal/handler/video_dto.go b/server-go/internal/handler/video_dto.go new file mode 100644 index 0000000..a241329 --- /dev/null +++ b/server-go/internal/handler/video_dto.go @@ -0,0 +1,128 @@ +package handler + +import ( + "time" + + "silk-server-go/internal/model" +) + +// CameraPublic 摄像头对外返回的非敏感字段。 +type CameraPublic struct { + ID uint `json:"id"` + RoomID *string `json:"roomId,omitempty"` + Code string `json:"code"` + Name string `json:"name"` + RtspURL *string `json:"rtspUrl,omitempty"` + HTTPURL *string `json:"httpUrl,omitempty"` + Username *string `json:"username,omitempty"` + Position *string `json:"position,omitempty"` + Resolution *string `json:"resolution,omitempty"` + FPS *int `json:"fps,omitempty"` + IsOnline bool `json:"isOnline"` + GbDeviceID *string `json:"gbDeviceId,omitempty"` + GbChannelID *string `json:"gbChannelId,omitempty"` + GbAuthID *string `json:"gbAuthId,omitempty"` + GbStreamType *string `json:"gbStreamType,omitempty"` + GbTransport *string `json:"gbTransport,omitempty"` + GbAlarmChannelID *string `json:"gbAlarmChannelId,omitempty"` + GbVoiceChannelID *string `json:"gbVoiceChannelId,omitempty"` + GbManufacturer *string `json:"gbManufacturer,omitempty"` + ManufacturerID *string `json:"manufacturerId,omitempty"` + StreamURL *string `json:"streamUrl,omitempty"` + HlsURL *string `json:"hlsUrl,omitempty"` + FlvURL *string `json:"flvUrl,omitempty"` + WebrtcURL *string `json:"webrtcUrl,omitempty"` + SnapshotURL *string `json:"snapshotUrl,omitempty"` + Online bool `json:"online"` + Enabled bool `json:"enabled"` + CreatedAt time.Time `json:"createdAt"` + UpdatedAt time.Time `json:"updatedAt"` +} + +// CameraInput 摄像头创建输入，允许接收密码字段，但不会作为公开响应。 +type CameraInput struct { + ID uint `json:"id,omitempty"` + RoomID *string `json:"roomId,omitempty"` + Code string `json:"code,omitempty"` + Name string `json:"name"` + RtspURL *string `json:"rtspUrl,omitempty"` + HTTPURL *string `json:"httpUrl,omitempty"` + Username *string `json:"username,omitempty"` + PasswordEnc *string `json:"passwordEnc,omitempty"` + Position *string `json:"position,omitempty"` + Resolution *string `json:"resolution,omitempty"` + FPS *int `json:"fps,omitempty"` + IsOnline bool `json:"isOnline"` + GbDeviceID *string `json:"gbDeviceId,omitempty"` + GbChannelID *string `json:"gbChannelId,omitempty"` + GbAuthID *string `json:"gbAuthId,omitempty"` + GbAuthPassword *string `json:"gbAuthPassword,omitempty"` + GbStreamType *string `json:"gbStreamType,omitempty"` + GbTransport *string `json:"gbTransport,omitempty"` + GbAlarmChannelID *string `json:"gbAlarmChannelId,omitempty"` + GbVoiceChannelID *string `json:"gbVoiceChannelId,omitempty"` + GbManufacturer *string `json:"gbManufacturer,omitempty"` + ManufacturerID *string `json:"manufacturerId,omitempty"` + Enabled bool `json:"enabled"` +} + +func (in CameraInput) toModel() model.Camera { + return model.Camera{ + RoomID: in.RoomID, + Code: in.Code, + Name: in.Name, + RtspURL: in.RtspURL, + HTTPURL: in.HTTPURL, + Username: in.Username, + PasswordEnc: in.PasswordEnc, + Position: in.Position, + Resolution: in.Resolution, + FPS: in.FPS, + IsOnline: in.IsOnline, + GbDeviceID: in.GbDeviceID, + GbChannelID: in.GbChannelID, + GbAuthID: in.GbAuthID, + GbAuthPassword: in.GbAuthPassword, + GbStreamType: in.GbStreamType, + GbTransport: in.GbTransport, + GbAlarmChannelID: in.GbAlarmChannelID, + GbVoiceChannelID: in.GbVoiceChannelID, + GbManufacturer: in.GbManufacturer, + ManufacturerID: in.ManufacturerID, + Enabled: in.Enabled, + } +} + +func toCameraPublic(camera model.Camera) CameraPublic { + return CameraPublic{ + ID: camera.ID, + RoomID: camera.RoomID, + Code: camera.Code, + Name: camera.Name, + RtspURL: camera.RtspURL, + HTTPURL: camera.HTTPURL, + Username: camera.Username, + Position: camera.Position, + Resolution: camera.Resolution, + FPS: camera.FPS, + IsOnline: camera.IsOnline, + GbDeviceID: camera.GbDeviceID, + GbChannelID: camera.GbChannelID, + GbAuthID: camera.GbAuthID, + GbStreamType: camera.GbStreamType, + GbTransport: camera.GbTransport, + GbAlarmChannelID: camera.GbAlarmChannelID, + GbVoiceChannelID: camera.GbVoiceChannelID, + GbManufacturer: camera.GbManufacturer, + ManufacturerID: camera.ManufacturerID, + StreamURL: camera.StreamURL, + HlsURL: camera.HlsURL, + FlvURL: camera.FlvURL, + WebrtcURL: camera.WebrtcURL, + SnapshotURL: camera.SnapshotURL, + Online: camera.Online, + Enabled: camera.Enabled, + CreatedAt: camera.CreatedAt, + UpdatedAt: camera.UpdatedAt, + } +} diff --git a/server-go/internal/handler/video_stream.go b/server-go/internal/handler/video_stream.go index 639307a..d39ff90 100644 --- a/server-go/internal/handler/video_stream.go +++ b/server-go/internal/handler/video_stream.go @@ -14,8 +14,9 @@ import ( "gorm.io/gorm" ) -// RegisterVideoStreamRoutes 注册视频流代理路由（公开接口，不需要 JWT） +// RegisterVideoStreamRoutes 注册视频流代理路由；路由可免 Authorization，但必须校验 videoToken。 func RegisterVideoStreamRoutes(rg *gin.RouterGroup, transcode *service.TranscodeService, db *gorm.DB, media *service.MediaService, cfg *config.Config) { + SetVideoTokenSecret(cfg.JWTSecret) rg.GET("/video/clips/:clipId/stream", streamClip(transcode)) rg.GET("/video/cameras/:id/live/stream", streamLive(db, media, cfg)) rg.GET("/video/cameras/:id/live/proxy", proxyLive(db, media, cfg)) @@ -25,6 +26,9 @@ func RegisterVideoStreamRoutes(rg *gin.RouterGroup, transcode *service.Transcode func streamClip(transcode *service.TranscodeService) gin.HandlerFunc { return func(c *gin.Context) { clipId := c.Param("clipId") + if !requireVideoToken(c, "clip", clipId) { + return + } c.Header("Content-Type", "video/mp4") if err := transcode.StreamClip(clipId, c.Writer); err != nil { @@ -40,6 +44,9 @@ func streamClip(transcode *service.TranscodeService) gin.HandlerFunc { func streamLive(db *gorm.DB, media *service.MediaService, cfg *config.Config) gin.HandlerFunc { return func(c *gin.Context) { cameraId := c.Param("id") + if !requireVideoToken(c, "camera", cameraId) { + return + } var camera model.Camera if db.Where("id = ?", cameraId).First(&camera).Error != nil { @@ -101,6 +108,9 @@ func streamLive(db *gorm.DB, media *service.MediaService, cfg *config.Config) gi func proxyLive(db *gorm.DB, media *service.MediaService, cfg *config.Config) gin.HandlerFunc { return func(c *gin.Context) { cameraId := c.Param("id") + if !requireVideoToken(c, "camera", cameraId) { + return + } // 1. 查摄像头 var camera model.Camera diff --git a/server-go/internal/middleware/auth.go b/server-go/internal/middleware/auth.go index 4b60be6..2828cec 100644 --- a/server-go/internal/middleware/auth.go +++ b/server-go/internal/middleware/auth.go @@ -44,13 +44,13 @@ func Auth(cfg *config.Config) gin.HandlerFunc { return } - // 视频片段流接口支持动态 ID，使用前缀+后缀匹配放行 + // 视频片段流接口仅放行播放器请求；handler 必须校验 videoToken if strings.HasPrefix(path, "/api/v1/video/clips/") && strings.HasSuffix(path, "/stream") { c.Next() return } - // 直播流转码代理接口 + // 直播流转码代理接口仅放行播放器请求；handler 必须校验 videoToken if strings.HasPrefix(path, "/api/v1/video/cameras/") && (strings.HasSuffix(path, "/live/stream") || strings.HasSuffix(path, "/live/proxy")) { c.Next() return diff --git a/server-go/internal/model/models.go b/server-go/internal/model/models.go index 27f4787..8931982 100644 --- a/server-go/internal/model/models.go +++ b/server-go/internal/model/models.go @@ -116,7 +116,7 @@ type Camera struct { RtspURL *string `gorm:"column:rtsp_url;size:512" json:"rtspUrl,omitempty"` HTTPURL *string `gorm:"column:http_url;size:512" json:"httpUrl,omitempty"` Username *string `gorm:"size:64" json:"username,omitempty"` - PasswordEnc *string `gorm:"column:password_enc;size:255" json:"passwordEnc,omitempty"` + PasswordEnc *string `gorm:"column:password_enc;size:255" json:"-"` Position *string `gorm:"size:255" json:"position,omitempty"` Resolution *string `gorm:"size:32" json:"resolution,omitempty"` FPS *int `gorm:"type:int" json:"fps,omitempty"` @@ -124,7 +124,7 @@ type Camera struct { GbDeviceID *string `gorm:"column:gb_device_id;size:20" json:"gbDeviceId,omitempty"` GbChannelID *string `gorm:"column:gb_channel_id;size:20" json:"gbChannelId,omitempty"` GbAuthID *string `gorm:"column:gb_auth_id;size:20" json:"gbAuthId,omitempty"` - GbAuthPassword *string `gorm:"column:gb_auth_password;size:255" json:"gbAuthPassword,omitempty"` + GbAuthPassword *string `gorm:"column:gb_auth_password;size:255" json:"-"` GbStreamType *string `gorm:"column:gb_stream_type;size:10" json:"gbStreamType,omitempty"` GbTransport *string `gorm:"column:gb_transport;size:10" json:"gbTransport,omitempty"` GbAlarmChannelID *string `gorm:"column:gb_alarm_channel_id;size:20" json:"gbAlarmChannelId,omitempty"` diff --git a/web/src/dal/video.ts b/web/src/dal/video.ts index 4f3550a..3ad0e20 100644 --- a/web/src/dal/video.ts +++ b/web/src/dal/video.ts @@ -15,6 +15,7 @@ export interface Camera { webrtcUrl?: string; snapshotUrl?: string; username?: string; + /** 写回字段，接口不会返回 */ passwordEnc?: string; position?: string; resolution?: string; @@ -22,6 +23,7 @@ export interface Camera { gbDeviceId?: string; gbChannelId?: string; gbAuthId?: string; + /** 写回字段，接口不会返回 */ gbAuthPassword?: string; gbStreamType?: string; gbTransport?: string; @@ -34,7 +36,6 @@ export interface Camera { export interface WvpSipConfig { sipId: string; sipDomain: string; - sipPassword: string; sipPort: number; sipShowIp: string; } diff --git a/后续工作计划.md b/后续工作计划.md index 045fdc4..5a5b82b 100644 --- a/后续工作计划.md +++ b/后续工作计划.md @@ -12,7 +12,7 @@ | Wave 0 | 决策与基线 | Task 1 恢复可复现的多端质量基线 | 部分可用 | CI 待 Task 0 平台落地 | | Wave 1 | P0 安全与正确性 | Task 2 版本化数据库迁移与 Schema 启动门禁 | 部分可用 | 开发库升级已验证，真实 down 回滚演练待后续 | | Wave 1 | P0 安全与正确性 | Task 3 移除默认密钥与默认管理员密码 | 延后到最后（跳过） | 用户 2026-08-13 明确要求跳过并留到最后 | -| Wave 1 | P0 安全与正确性 | Task 4 收口视频访问与摄像头密钥输出 | 未开始 | 无 | +| Wave 1 | P0 安全与正确性 | Task 4 收口视频访问与摄像头密钥输出 | 部分可用 | 待开发服务器部署联调 | | Wave 1 | P0 安全与正确性 | Task 5 修复 WebSocket 越权与 AI 流 SSRF | 未开始 | 无 | | Wave 1 | P0 安全与正确性 | Task 6 修复 AI 风险语义并隔离 Mock 数据 | 未开始 | 无 | | Wave 1 | P0 安全与正确性 | Task 7 修订 qPCR 判读与检测质控 | 未开始 | 需领域专家确认 | diff --git a/开发交接记录.md b/开发交接记录.md index 20d92aa..30462b7 100644 --- a/开发交接记录.md +++ b/开发交接记录.md @@ -860,3 +860,33 @@ MVP 沿用 IoTDB（现状）；TDengine 作为生产规模化候选（先基准 ### 回滚点 - 本记录仅修改文档，无代码、数据库、服务器或生成产物变更；如需回滚，删除本记录并恢复相关计划/决策表即可。 + +--- + +## 2026-08-14 整改 Task 4：收口视频访问与摄像头密钥输出 + +### 做了什么 + +- 新增视频短时令牌服务：`IssueVideoToken` / `ValidateVideoToken` / `ValidateVideoTokenForUser`，令牌绑定用户、资源类型、资源 ID、用途和 5 分钟有效期； +- `Camera.PasswordEnc`、`Camera.GbAuthPassword` 改为 `json:"-"`，新增 `CameraPublic` / `CameraInput` DTO，创建和更新仍可写入密码，但列表/详情/创建/更新响应不再返回密码； +- 实时播放和录像播放接口统一返回带 `videoToken` 的代理 URL，不再返回 WVP/ZLM 直连地址； +- `/video/clips/:clipId/stream`、`/video/cameras/:id/live/stream`、`/video/cameras/:id/live/proxy` 必须校验 token，缺失返回 401，错误/过期/资源错配返回 403； +- 告警片段、Web 录像列表、APP 和小程序播放链路同步改为使用带 token 的地址； +- WVP SIP 配置响应移除 `sipPassword`；前端 DAL 同步调整。 + +### 设计思路与决策依据 + +- 播放器标签无法稳定携带 Authorization，因此采用短时签名 token 作为流代理的 bearer capability，同时保留播放地址生成接口的 JWT + 权限校验； +- 摄像头密钥字段允许写回但禁止输出，创建/更新走独立 `CameraInput`，对外统一 `CameraPublic`； +- 当前项目没有用户级资源 ACL，Task 4 先收口“未授权直连”和“密钥返回”两类 P0；按用户/房间的对象级授权留待后续任务。 + +### 验证结果 + +- `scripts/verify.ps1` 最终 exit 0：Go test/vet/build、Web test/lint/build、小程序 typecheck/build、APP tsc/lint、AI pytest 均通过； +- 新增测试覆盖：摄像头响应不含密码字段、token 正常/过期/资源错配/用户错配、流代理缺失或错误 token 返回 401/403； +- 未部署开发服务器，未做真实摄像头播放联调。 + +### 回滚点 + +- 本任务前分支提交为 `440cf80`；回滚可还原 Task 4 提交； +- 若已部署流代理版本，回滚需恢复旧二进制并重启，无需数据库变更；播放地址需由客户端重新请求。 From 839ba91354bbf3b171a770cc1a2262ce2632941e Mon Sep 17 00:00:00 2001 From: weijuesen Date: Fri, 14 Aug 2026 00:45:22 +0800 Subject: [PATCH 09/18] =?UTF-8?q?feat:=20=E4=BF=AE=E5=A4=8D=20WebSocket=20?= =?UTF-8?q?=E8=B6=8A=E6=9D=83=E4=B8=8E=20AI=20=E6=B5=81=20SSRF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 1 + ai-service/README.md | 5 + ai-service/app/config.py | 8 ++ ai-service/app/main.py | 61 ++++++----- ai-service/app/stream_tasks.py | 101 ++++++++++++++++++ ai-service/tests/test_api.py | 42 +++++++- app/src/utils/ws.ts | 24 ++++- miniapp/src/api/config.ts | 8 +- miniapp/src/utils/ws.ts | 24 ++++- server-go/cmd/server/main.go | 4 +- server-go/internal/config/config.go | 59 +++++------ server-go/internal/ws/authorizer.go | 59 +++++++++++ server-go/internal/ws/gateway.go | 144 +++++++++++++++----------- server-go/internal/ws/gateway_test.go | 120 +++++++++++++++++++++ server-go/internal/ws/ticket.go | 57 ++++++++++ 后续工作计划.md | 2 +- 开发交接记录.md | 31 ++++++ 17 files changed, 614 insertions(+), 136 deletions(-) create mode 100644 ai-service/app/stream_tasks.py create mode 100644 server-go/internal/ws/authorizer.go create mode 100644 server-go/internal/ws/gateway_test.go create mode 100644 server-go/internal/ws/ticket.go diff --git a/README.md b/README.md index e2fb719..1d3ad3b 100644 --- a/README.md +++ b/README.md @@ -501,6 +501,7 @@ C:\msys64\usr\bin\sshpass.exe -p "pan" C:\msys64\usr\bin\ssh.exe -o StrictHostKe | `PG` | `postgresql://postgres:pan@localhost:5432/silk` | PostgreSQL 连接串 | | `APP_ENV` | `development` | 运行环境；生产环境应设为 `production` | | `ALLOW_DEV_AUTOMIGRATE` | `false` | 仅开发环境可显式开启 AutoMigrate，生产忽略此开关 | +| `WS_ALLOWED_ORIGINS` | `http://localhost:5174,http://localhost:3000,...` | WebSocket 允许的 Origin，逗号分隔 | | `REDIS` | `redis://:pan@localhost:6379` | Valkey/Redis 连接串 | | `JWT_SECRET` | `silk-secret-please-change-me` | JWT 签名密钥 | | `JWT_EXPIRES_IN` | `2h` | JWT 有效期 | diff --git a/ai-service/README.md b/ai-service/README.md index 2fa0bbc..89489e1 100644 --- a/ai-service/README.md +++ b/ai-service/README.md @@ -6,6 +6,7 @@ FastAPI + ONNX Runtime 的蚕病检测推理服务。YOLO 训练挂起期间以 - `GET /health` → `{"status":"ok","model":"mock|onnx"}` - `POST /detect`（multipart 字段 `file`）→ `{"model":"mock","detections":[{"bbox":{x,y,w,h},"class":"healthy|sick","confidence":0.95}]}` +- `POST /internal/stream-tasks`（需 `X-Internal-Key`）→ 创建受限拉流任务，不再接受客户端任意 URL ## 本地运行 @@ -34,6 +35,10 @@ powershell -ExecutionPolicy Bypass -File scripts/verify.ps1 | `MODEL_LABELS` | `healthy,sick` | 类别列表（逗号分隔） | | `MOCK_CLASS` | `healthy` | mock 返回类别 | | `MOCK_CONFIDENCE` | `0.95` | mock 返回置信度 | +| `INTERNAL_API_KEY` | `silk-internal-2026` | 内部接口认证密钥 | +| `ALLOWED_STREAM_HOSTS` | `localhost,127.0.0.1,100.83.103.1` | 允许拉流的主机白名单 | +| `STREAM_TASK_MAX_WORKERS` | `2` | 流任务并发 worker 数 | +| `STREAM_TASK_MAX_FRAMES` | `10` | 单任务最大抽帧数 | ## 说明 diff --git a/ai-service/app/config.py b/ai-service/app/config.py index 95593a0..825b9e3 100644 --- a/ai-service/app/config.py +++ b/ai-service/app/config.py @@ -8,3 +8,11 @@ MODEL_LABELS = os.getenv("MODEL_LABELS", "healthy,sick").split(",") # mock 模式返回的固定结果 MOCK_CLASS = os.getenv("MOCK_CLASS", "healthy") MOCK_CONFIDENCE = float(os.getenv("MOCK_CONFIDENCE", "0.95")) +INTERNAL_API_KEY = os.getenv("INTERNAL_API_KEY", "silk-internal-2026") +ALLOWED_STREAM_HOSTS = [ + item.strip() + for item in os.getenv("ALLOWED_STREAM_HOSTS", "localhost,127.0.0.1,100.83.103.1").split(",") + if item.strip() +] +STREAM_TASK_MAX_WORKERS = int(os.getenv("STREAM_TASK_MAX_WORKERS", "2")) +STREAM_TASK_MAX_FRAMES = int(os.getenv("STREAM_TASK_MAX_FRAMES", "10")) diff --git a/ai-service/app/main.py b/ai-service/app/main.py index 260dc61..dc006a9 100644 --- a/ai-service/app/main.py +++ b/ai-service/app/main.py @@ -7,12 +7,14 @@ from fastapi import FastAPI, File, HTTPException, Request, UploadFile from . import config from .detector import MockDetector, ONNXDetector +from .stream_tasks import StreamTaskWorker, is_allowed_stream_ref app = FastAPI(title="Silk AI Service", version="0.1.0") START_TIME = time.time() _lock = threading.Lock() _requests = 0 _latency_total = 0.0 +stream_worker = StreamTaskWorker(config.STREAM_TASK_MAX_WORKERS) @app.middleware("http") @@ -59,40 +61,35 @@ async def detect(file: UploadFile = File(...)): } -try: - import cv2 # noqa: E402 -except ImportError: - cv2 = None - - @app.post("/stream-detect") -async def stream_detect(body: dict): - """摄像头流 AI 巡检骨架（#23）：拉流抽帧 → 检测。 +def stream_detect(): + raise HTTPException(status_code=410, detail="请使用 POST /internal/stream-tasks") - 二期功能：正式接入前需补摄像头视角数据与巡检任务编排。 - """ - url = (body or {}).get("url") or "" - if not url: - raise HTTPException(status_code=400, detail="缺少 url（rtsp/http-flv 流地址）") - if cv2 is None: - raise HTTPException(status_code=503, detail="OpenCV 未安装，无法拉流") - capture = cv2.VideoCapture(url) - if not capture.isOpened(): - raise HTTPException(status_code=502, detail="无法连接视频流") - try: - frames = 0 - detections = [] - while frames < 3: - ok, frame = capture.read() - if not ok: - break - ok_encode, buf = cv2.imencode(".jpg", frame) - if ok_encode: - detections.extend(detector.detect(buf.tobytes())) - frames += 1 - finally: - capture.release() - return {"model": config.MODEL_MODE, "frames": frames, "detections": detections[:10]} + +@app.post("/internal/stream-tasks", status_code=202) +def create_stream_task(request: Request, body: dict): + if request.headers.get("x-internal-key") != config.INTERNAL_API_KEY: + raise HTTPException(status_code=401, detail="invalid internal key") + + task_id = (body or {}).get("taskId", "") + stream_ref = (body or {}).get("streamRef") + if not task_id or not isinstance(stream_ref, dict): + raise HTTPException(status_code=400, detail="缺少 taskId 或 streamRef") + if not is_allowed_stream_ref(stream_ref): + raise HTTPException(status_code=400, detail="streamRef 不在允许范围") + + stream_worker.submit(task_id, stream_ref) + return {"taskId": task_id, "status": "queued"} + + +@app.get("/internal/stream-tasks/{task_id}") +def get_stream_task(request: Request, task_id: str): + if request.headers.get("x-internal-key") != config.INTERNAL_API_KEY: + raise HTTPException(status_code=401, detail="invalid internal key") + task = stream_worker.get(task_id) + if not task: + raise HTTPException(status_code=404, detail="task not found") + return task @app.get("/metrics") diff --git a/ai-service/app/stream_tasks.py b/ai-service/app/stream_tasks.py new file mode 100644 index 0000000..9e47c2c --- /dev/null +++ b/ai-service/app/stream_tasks.py @@ -0,0 +1,101 @@ +import threading +import time +from concurrent.futures import ThreadPoolExecutor +from urllib.parse import urlparse + +from . import config +from .detector import MockDetector, ONNXDetector + + +def _detector(): + if config.MODEL_MODE == "onnx": + return ONNXDetector(config.MODEL_PATH, tuple(config.MODEL_LABELS)) + return MockDetector(class_name=config.MOCK_CLASS, confidence=config.MOCK_CONFIDENCE) + + +def is_allowed_stream_ref(stream_ref): + url = (stream_ref or {}).get("url", "") + parsed = urlparse(url) + if parsed.scheme not in ("rtsp", "http", "https"): + return False + if parsed.username or parsed.password: + return False + host = (parsed.hostname or "").lower() + allowed = {item.strip().lower() for item in config.ALLOWED_STREAM_HOSTS} + return host in allowed + + +class StreamTaskWorker: + def __init__(self, max_workers=2): + self.executor = ThreadPoolExecutor(max_workers=max_workers) + self.tasks = {} + self.lock = threading.Lock() + + def submit(self, task_id, stream_ref): + with self.lock: + self.tasks[task_id] = { + "taskId": task_id, + "status": "queued", + "startedAt": time.time(), + "finishedAt": None, + "frames": 0, + "detections": [], + "error": None, + } + self.executor.submit(self._run, task_id, stream_ref) + + def get(self, task_id): + with self.lock: + task = self.tasks.get(task_id) + return dict(task) if task else None + + def _run(self, task_id, stream_ref): + try: + with self.lock: + task = self.tasks.get(task_id) + if task: + task["status"] = "running" + try: + import cv2 + except ImportError: + self._fail(task_id, "OpenCV 未安装，无法拉流") + return + + capture = cv2.VideoCapture(stream_ref.get("url", "")) + if not capture.isOpened(): + self._fail(task_id, "无法连接视频流") + return + + max_frames = min(int(stream_ref.get("maxFrames", config.STREAM_TASK_MAX_FRAMES)), config.STREAM_TASK_MAX_FRAMES) + detector = _detector() + frames = 0 + detections = [] + try: + while frames < max_frames: + ok, frame = capture.read() + if not ok: + break + ok_encode, buf = cv2.imencode(".jpg", frame) + if ok_encode: + detections.extend(detector.detect(buf.tobytes())) + frames += 1 + finally: + capture.release() + + with self.lock: + task = self.tasks.get(task_id) + if task: + task["status"] = "completed" + task["frames"] = frames + task["detections"] = detections[:10] + task["finishedAt"] = time.time() + except Exception as exc: + self._fail(task_id, str(exc)) + + def _fail(self, task_id, message): + with self.lock: + task = self.tasks.get(task_id) + if task: + task["status"] = "failed" + task["error"] = message + task["finishedAt"] = time.time() diff --git a/ai-service/tests/test_api.py b/ai-service/tests/test_api.py index 9b8e7c7..2173990 100644 --- a/ai-service/tests/test_api.py +++ b/ai-service/tests/test_api.py @@ -1,4 +1,8 @@ import base64 +import os + +os.environ.setdefault("INTERNAL_API_KEY", "test-internal-key") +os.environ.setdefault("ALLOWED_STREAM_HOSTS", "localhost,127.0.0.1,100.83.103.1") from fastapi.testclient import TestClient @@ -42,8 +46,44 @@ def test_detect_invalid_image_rejected(): assert r.status_code == 400 -def test_stream_detect_missing_url(): +def test_stream_detect_is_disabled(): r = client.post("/stream-detect", json={}) + assert r.status_code == 410 + + +def test_internal_stream_tasks_requires_internal_key(): + r = client.post("/internal/stream-tasks", json={}) + assert r.status_code == 401 + + +def test_internal_stream_tasks_accepts_internal_stream_ref(): + r = client.post( + "/internal/stream-tasks", + headers={"X-Internal-Key": "test-internal-key"}, + json={ + "taskId": "task-1", + "streamRef": { + "url": "rtsp://127.0.0.1:8554/live/1", + "maxFrames": 1, + }, + }, + ) + assert r.status_code == 202 + assert r.json()["taskId"] == "task-1" + + +def test_internal_stream_tasks_rejects_metadata_url(): + r = client.post( + "/internal/stream-tasks", + headers={"X-Internal-Key": "test-internal-key"}, + json={ + "taskId": "task-2", + "streamRef": { + "url": "http://169.254.169.254/latest/meta-data", + "maxFrames": 1, + }, + }, + ) assert r.status_code == 400 diff --git a/app/src/utils/ws.ts b/app/src/utils/ws.ts index 007c8d8..0f25562 100644 --- a/app/src/utils/ws.ts +++ b/app/src/utils/ws.ts @@ -1,17 +1,19 @@ import { WS_BASE_URL } from '@env'; +import { get } from '../api/client'; export type WSMessageHandler = (data: any) => void; class WebSocketManager { private ws: WebSocket | null = null; private token: string | null = null; + private ticket: string | null = null; private handlers: Set = new Set(); private reconnectTimer: ReturnType | null = null; private reconnectAttempts = 0; private maxReconnectAttempts = 10; private isManualClose = false; - connect(token: string): void { + async connect(token: string): Promise { // Close any existing connection before creating a new one if (this.ws) { this.isManualClose = true; @@ -27,14 +29,14 @@ class WebSocketManager { this.reconnectAttempts = 0; this.token = token; this.isManualClose = false; - this.doConnect(); + await this.refreshTicketAndConnect(); } private doConnect(): void { - if (!this.token) return; + if (!this.token || !this.ticket) return; const wsUrl = (WS_BASE_URL || 'ws://localhost:3000/ws').replace(/\?.*$/, ''); - const url = `${wsUrl}?token=${encodeURIComponent(this.token)}`; + const url = `${wsUrl}?ticket=${encodeURIComponent(this.ticket)}`; try { this.ws = new WebSocket(url); @@ -84,11 +86,23 @@ class WebSocketManager { this.reconnectTimer = setTimeout(() => { if (!this.isManualClose && this.token) { - this.doConnect(); + this.refreshTicketAndConnect(); } }, delay); } + private async refreshTicketAndConnect(): Promise { + if (!this.token) return; + try { + const { ticket } = await get<{ ticket: string }>('/ws/ticket'); + this.ticket = ticket; + this.doConnect(); + } catch (e) { + console.warn('[WS] Failed to fetch ticket:', e); + this.scheduleReconnect(); + } + } + disconnect(): void { this.isManualClose = true; if (this.reconnectTimer) { diff --git a/miniapp/src/api/config.ts b/miniapp/src/api/config.ts index 06c6e6a..4055c3b 100644 --- a/miniapp/src/api/config.ts +++ b/miniapp/src/api/config.ts @@ -43,24 +43,24 @@ export function getServerUrl(): string { // 保留导出以兼容现有代码（模块加载时的默认值，实际请求请使用 getApiBaseUrl()） export const API_BASE_URL = DEFAULT_API_BASE_URL; -export function getWsUrl(token: string): string { +export function getWsUrl(ticket: string): string { const baseUrl = getApiBaseUrl(); // 如果是完整 URL，从中推导 WS 地址 if (baseUrl.startsWith('http')) { const serverUrl = baseUrl.replace(/\/api\/v1\/?$/, ''); const wsUrl = serverUrl.replace(/^http/, 'ws'); - return `${wsUrl}/ws?token=${token}`; + return `${wsUrl}/ws?ticket=${ticket}`; } // H5 相对路径 - 使用 window.location 推导 if (isH5) { const protocol = typeof window !== 'undefined' && window.location.protocol === 'https:' ? 'wss:' : 'ws:'; const host = typeof window !== 'undefined' ? window.location.host : 'localhost:3000'; - return `${protocol}//${host}/ws?token=${token}`; + return `${protocol}//${host}/ws?ticket=${ticket}`; } - return `ws://100.83.103.1:3000/ws?token=${token}`; + return `ws://100.83.103.1:3000/ws?ticket=${ticket}`; } export const REQUEST_TIMEOUT = 15000; diff --git a/miniapp/src/utils/ws.ts b/miniapp/src/utils/ws.ts index 2a9577b..3ccea85 100644 --- a/miniapp/src/utils/ws.ts +++ b/miniapp/src/utils/ws.ts @@ -1,5 +1,6 @@ import Taro from '@tarojs/taro'; import { getWsUrl } from '@/api/config'; +import { get } from '@/api/request'; type MessageHandler = (data: unknown) => void; @@ -7,19 +8,20 @@ class WebSocketManager { private connected: boolean = false; private handlers: Map> = new Map(); private token: string = ''; + private ticket: string = ''; private reconnectAttempts: number = 0; private maxReconnectAttempts: number = 5; private reconnectTimer: ReturnType | null = null; private isManualClose: boolean = false; - connect(token: string): void { + async connect(token: string): Promise { this.token = token; this.isManualClose = false; - this.doConnect(); + await this.refreshTicketAndConnect(); } private doConnect(): void { - if (!this.token) { + if (!this.token || !this.ticket) { console.warn('[WS] 无 token，无法连接 WebSocket'); return; } @@ -34,7 +36,7 @@ class WebSocketManager { this.connected = false; } - const url = getWsUrl(this.token); + const url = getWsUrl(this.ticket); console.log('[WS] 正在连接:', url); // 注册全局回调（每次调用会替换上一次的回调） @@ -98,10 +100,22 @@ class WebSocketManager { clearTimeout(this.reconnectTimer); } this.reconnectTimer = setTimeout(() => { - this.doConnect(); + this.refreshTicketAndConnect(); }, delay); } + private async refreshTicketAndConnect(): Promise { + if (!this.token) return; + try { + const { ticket } = await get<{ ticket: string }>('/ws/ticket'); + this.ticket = ticket; + this.doConnect(); + } catch (e) { + console.error('[WS] 获取 ticket 失败:', e); + this.scheduleReconnect(); + } + } + on(type: string, handler: MessageHandler): () => void { if (!this.handlers.has(type)) { this.handlers.set(type, new Set()); diff --git a/server-go/cmd/server/main.go b/server-go/cmd/server/main.go index a4e1e0d..8467ba7 100644 --- a/server-go/cmd/server/main.go +++ b/server-go/cmd/server/main.go @@ -5,6 +5,7 @@ import ( "log/slog" "os" "strconv" + "strings" "time" "github.com/gin-gonic/gin" @@ -52,7 +53,7 @@ func main() { } // 5. 创建 WebSocket Hub - hub := ws.NewHub(cfg.JWTSecret) + hub := ws.NewHub(cfg.JWTSecret, ws.NewDBDeviceAuthorizer(db), strings.Split(cfg.WSAllowedOrigins, ",")) // 6. 创建并启动 MQTT 服务 mqttSvc := service.NewMQTTService(cfg.MQTT, db, iotdb, hub) @@ -89,6 +90,7 @@ func main() { // 11. API 路由组（经过 JWT auth 中间件，白名单路径自动跳过） api := r.Group("/api/v1") api.Use(middleware.Auth(cfg)) + api.GET("/ws/ticket", hub.HandleTicket) // 公开路由（auth 白名单中跳过鉴权） handler.RegisterVideoStreamRoutes(api, transcodeSvc, db, mediaSvc, cfg) diff --git a/server-go/internal/config/config.go b/server-go/internal/config/config.go index 7511824..66a5cc8 100644 --- a/server-go/internal/config/config.go +++ b/server-go/internal/config/config.go @@ -6,39 +6,40 @@ import ( // Config 全局配置，从环境变量加载 type Config struct { - AppEnv string `env:"APP_ENV" envDefault:"development"` - AllowDevAutoMigrate bool `env:"ALLOW_DEV_AUTOMIGRATE" envDefault:"false"` - PG string `env:"PG" envDefault:"postgresql://postgres:pan@localhost:5432/silk"` - Redis string `env:"REDIS" envDefault:"redis://:pan@localhost:6379"` - JWTSecret string `env:"JWT_SECRET" envDefault:"silk-secret-please-change-me"` - JWTExpiresIn string `env:"JWT_EXPIRES_IN" envDefault:"2h"` - MQTT string `env:"MQTT" envDefault:"mqtt://pan:pan@localhost:1883"` - IoTDBURL string `env:"IOTDB_URL" envDefault:"http://127.0.0.1:18081"` - S3Endpoint string `env:"S3_ENDPOINT" envDefault:"http://100.83.103.1:7480"` - S3AccessKey string `env:"S3_ACCESS_KEY" envDefault:"silk-app"` - S3SecretKey string `env:"S3_SECRET_KEY" envDefault:"Silk-App-Secret-2026!"` - S3Bucket string `env:"S3_BUCKET" envDefault:"silk-video-events"` - S3BucketImages string `env:"S3_BUCKET_IMAGES" envDefault:"silk-images"` - S3Region string `env:"S3_REGION" envDefault:"us-east-1"` - WVPAPIBase string `env:"WVP_API_BASE" envDefault:"http://localhost:18978"` - WVPUsername string `env:"WVP_USERNAME" envDefault:"admin"` - WVPPassword string `env:"WVP_PASSWORD" envDefault:"admin"` - ZLMAPIBase string `env:"ZLM_API_BASE" envDefault:"http://100.83.103.1:8081"` - ZLMSecret string `env:"ZLM_SECRET" envDefault:"su6TiedN2rVAmBbIDX0aa0QTiBJLBdcf"` - RecorderAPIBase string `env:"RECORDER_API_BASE" envDefault:"http://localhost:9090"` - AIServiceBase string `env:"AI_SERVICE_BASE" envDefault:"http://localhost:8000"` - WechatAppID string `env:"WECHAT_APPID" envDefault:""` - WechatSecret string `env:"WECHAT_SECRET" envDefault:""` - WechatTemplateAlarm string `env:"WECHAT_TEMPLATE_ALARM" envDefault:""` + AppEnv string `env:"APP_ENV" envDefault:"development"` + AllowDevAutoMigrate bool `env:"ALLOW_DEV_AUTOMIGRATE" envDefault:"false"` + WSAllowedOrigins string `env:"WS_ALLOWED_ORIGINS" envDefault:"http://localhost:5174,http://localhost:3000,http://127.0.0.1:5174,http://127.0.0.1:3000,http://100.83.103.1:5174,http://100.83.103.1:3000"` + PG string `env:"PG" envDefault:"postgresql://postgres:pan@localhost:5432/silk"` + Redis string `env:"REDIS" envDefault:"redis://:pan@localhost:6379"` + JWTSecret string `env:"JWT_SECRET" envDefault:"silk-secret-please-change-me"` + JWTExpiresIn string `env:"JWT_EXPIRES_IN" envDefault:"2h"` + MQTT string `env:"MQTT" envDefault:"mqtt://pan:pan@localhost:1883"` + IoTDBURL string `env:"IOTDB_URL" envDefault:"http://127.0.0.1:18081"` + S3Endpoint string `env:"S3_ENDPOINT" envDefault:"http://100.83.103.1:7480"` + S3AccessKey string `env:"S3_ACCESS_KEY" envDefault:"silk-app"` + S3SecretKey string `env:"S3_SECRET_KEY" envDefault:"Silk-App-Secret-2026!"` + S3Bucket string `env:"S3_BUCKET" envDefault:"silk-video-events"` + S3BucketImages string `env:"S3_BUCKET_IMAGES" envDefault:"silk-images"` + S3Region string `env:"S3_REGION" envDefault:"us-east-1"` + WVPAPIBase string `env:"WVP_API_BASE" envDefault:"http://localhost:18978"` + WVPUsername string `env:"WVP_USERNAME" envDefault:"admin"` + WVPPassword string `env:"WVP_PASSWORD" envDefault:"admin"` + ZLMAPIBase string `env:"ZLM_API_BASE" envDefault:"http://100.83.103.1:8081"` + ZLMSecret string `env:"ZLM_SECRET" envDefault:"su6TiedN2rVAmBbIDX0aa0QTiBJLBdcf"` + RecorderAPIBase string `env:"RECORDER_API_BASE" envDefault:"http://localhost:9090"` + AIServiceBase string `env:"AI_SERVICE_BASE" envDefault:"http://localhost:8000"` + WechatAppID string `env:"WECHAT_APPID" envDefault:""` + WechatSecret string `env:"WECHAT_SECRET" envDefault:""` + WechatTemplateAlarm string `env:"WECHAT_TEMPLATE_ALARM" envDefault:""` WechatTemplateInspection string `env:"WECHAT_TEMPLATE_INSPECTION" envDefault:""` QWeatherAPIKey string `env:"QWEATHER_API_KEY" envDefault:""` QWeatherLocation string `env:"QWEATHER_LOCATION" envDefault:""` QWeatherIntervalMin int `env:"QWEATHER_INTERVAL_MIN" envDefault:"30"` - InternalAPIKey string `env:"INTERNAL_API_KEY" envDefault:"silk-internal-2026"` - Port int `env:"PORT" envDefault:"3000"` - DefaultAdminUsername string `env:"DEFAULT_ADMIN_USERNAME" envDefault:"admin"` - DefaultAdminPassword string `env:"DEFAULT_ADMIN_PASSWORD" envDefault:"silk@123"` - DefaultAdminEmail string `env:"DEFAULT_ADMIN_EMAIL" envDefault:"admin@silk.local"` + InternalAPIKey string `env:"INTERNAL_API_KEY" envDefault:"silk-internal-2026"` + Port int `env:"PORT" envDefault:"3000"` + DefaultAdminUsername string `env:"DEFAULT_ADMIN_USERNAME" envDefault:"admin"` + DefaultAdminPassword string `env:"DEFAULT_ADMIN_PASSWORD" envDefault:"silk@123"` + DefaultAdminEmail string `env:"DEFAULT_ADMIN_EMAIL" envDefault:"admin@silk.local"` } // Load 从环境变量加载配置 diff --git a/server-go/internal/ws/authorizer.go b/server-go/internal/ws/authorizer.go new file mode 100644 index 0000000..9f17914 --- /dev/null +++ b/server-go/internal/ws/authorizer.go @@ -0,0 +1,59 @@ +package ws + +import ( + "errors" + "fmt" + + "silk-server-go/internal/model" + + "gorm.io/gorm" +) + +// DeviceAuthorizer 校验用户是否有权读取指定设备。 +type DeviceAuthorizer interface { + CanReadDevice(userID, deviceKey string) (bool, error) +} + +// DBDeviceAuthorizer 使用现有 RBAC 权限判断设备读取权；当前未做用户级资源 ACL。 +type DBDeviceAuthorizer struct { + db *gorm.DB +} + +func NewDBDeviceAuthorizer(db *gorm.DB) *DBDeviceAuthorizer { + return &DBDeviceAuthorizer{db: db} +} + +func (a *DBDeviceAuthorizer) CanReadDevice(userID, deviceKey string) (bool, error) { + if deviceKey == "" { + return false, nil + } + + var user model.User + if err := a.db.Where("id = ?", userID).First(&user).Error; err != nil { + return false, err + } + if user.Role == model.RoleAdmin { + return true, nil + } + + var count int64 + err := a.db.Table("role_permissions"). + Joins("JOIN permissions ON permissions.id = role_permissions.permission_id"). + Where("role_permissions.role = ? AND permissions.code = ?", user.Role, "device:read"). + Count(&count).Error + return count > 0, err +} + +func (h *Hub) authorizeSubscription(userID, deviceKey string) error { + if h.authorizer == nil { + return errors.New("device authorizer not configured") + } + ok, err := h.authorizer.CanReadDevice(userID, deviceKey) + if err != nil { + return err + } + if !ok { + return fmt.Errorf("device subscription denied: %s", deviceKey) + } + return nil +} diff --git a/server-go/internal/ws/gateway.go b/server-go/internal/ws/gateway.go index 0324f98..13129a8 100644 --- a/server-go/internal/ws/gateway.go +++ b/server-go/internal/ws/gateway.go @@ -4,82 +4,103 @@ import ( "encoding/json" "log/slog" "net/http" - "strings" "sync" "time" "github.com/gin-gonic/gin" - "github.com/golang-jwt/jwt/v5" "github.com/gorilla/websocket" "silk-server-go/internal/service" ) -var upgrader = websocket.Upgrader{ - CheckOrigin: func(r *http.Request) bool { return true }, - ReadBufferSize: 1024, - WriteBufferSize: 1024, -} - // client WebSocket 客户端 type client struct { - conn *websocket.Conn - rooms map[string]bool // 订阅的房间（device:） - send chan []byte + conn *websocket.Conn + userID string + username string + role string + rooms map[string]bool // 订阅的房间（device:） + send chan []byte } // Hub WebSocket 中心，管理客户端和房间 type Hub struct { - jwtSecret string - clients map[*client]bool - mu sync.RWMutex + authorizer DeviceAuthorizer + allowedOrigins []string + clients map[*client]bool + mu sync.RWMutex + tickets map[string]*wsTicket + ticketsMu sync.Mutex } // NewHub 创建 Hub -func NewHub(jwtSecret string) *Hub { +func NewHub(jwtSecret string, authorizer DeviceAuthorizer, allowedOrigins []string) *Hub { return &Hub{ - jwtSecret: jwtSecret, - clients: make(map[*client]bool), + authorizer: authorizer, + allowedOrigins: allowedOrigins, + clients: make(map[*client]bool), + tickets: make(map[string]*wsTicket), } } +func (h *Hub) originAllowed(origin string) bool { + if origin == "" { + return true + } + for _, allowed := range h.allowedOrigins { + if origin == allowed { + return true + } + } + return false +} + +// HandleTicket 签发一次性 WebSocket ticket，需在 JWT 鉴权路由后注册。 +func (h *Hub) HandleTicket(c *gin.Context) { + userVal, ok := c.Get("user") + if !ok { + c.JSON(http.StatusUnauthorized, gin.H{"error": "未认证"}) + return + } + userMap, ok := userVal.(map[string]interface{}) + if !ok { + c.JSON(http.StatusUnauthorized, gin.H{"error": "用户信息无效"}) + return + } + userID, _ := userMap["sub"].(string) + username, _ := userMap["username"].(string) + role, _ := userMap["role"].(string) + if userID == "" { + c.JSON(http.StatusUnauthorized, gin.H{"error": "用户信息无效"}) + return + } + + c.JSON(http.StatusOK, gin.H{ + "ticket": h.IssueTicket(userID, username, role), + "expiresIn": int(wsTicketTTL.Seconds()), + }) +} + // HandleWebSocket 处理 WebSocket 连接（Gin handler） func (h *Hub) HandleWebSocket(c *gin.Context) { - // 验证 JWT（从 query.auth.token / query.token / header.Authorization 获取） - tokenStr := "" - if t := c.Query("auth.token"); t != "" { - tokenStr = t - } else if t := c.Query("token"); t != "" { - tokenStr = t - } else if auth := c.GetHeader("Authorization"); strings.HasPrefix(auth, "Bearer ") { - tokenStr = auth[7:] - } - - if tokenStr == "" { - conn, err := upgrader.Upgrade(c.Writer, c.Request, nil) - if err == nil { - conn.WriteJSON(map[string]interface{}{"event": "auth.fail", "data": map[string]bool{"ok": false}}) - conn.Close() - } + if !h.originAllowed(c.GetHeader("Origin")) { + c.JSON(http.StatusForbidden, gin.H{"error": "origin not allowed"}) return } - // 验证 token - claims := jwt.MapClaims{} - token, err := jwt.ParseWithClaims(tokenStr, claims, func(t *jwt.Token) (interface{}, error) { - return []byte(h.jwtSecret), nil - }, jwt.WithValidMethods([]string{"HS256"})) - - if err != nil || !token.Valid { - conn, err := upgrader.Upgrade(c.Writer, c.Request, nil) - if err == nil { - conn.WriteJSON(map[string]interface{}{"event": "auth.fail", "data": map[string]bool{"ok": false}}) - conn.Close() - } + ticket := h.ticketFromQuery(c.Request.URL.RawQuery) + info, ok := h.consumeTicket(ticket) + if !ok { + c.JSON(http.StatusUnauthorized, gin.H{"error": "invalid or expired ws ticket"}) return } // 升级为 WebSocket + upgrader := websocket.Upgrader{ + CheckOrigin: func(r *http.Request) bool { return true }, + ReadBufferSize: 1024, + WriteBufferSize: 1024, + } conn, err := upgrader.Upgrade(c.Writer, c.Request, nil) if err != nil { slog.Warn("WebSocket 升级失败", "err", err) @@ -87,9 +108,12 @@ func (h *Hub) HandleWebSocket(c *gin.Context) { } cl := &client{ - conn: conn, - rooms: make(map[string]bool), - send: make(chan []byte, 256), + conn: conn, + userID: info.userID, + username: info.username, + role: info.role, + rooms: make(map[string]bool), + send: make(chan []byte, 256), } h.mu.Lock() @@ -98,8 +122,12 @@ func (h *Hub) HandleWebSocket(c *gin.Context) { // 发送 auth.ok h.sendJSON(cl, "auth.ok", map[string]interface{}{ - "ok": true, - "user": claims, + "ok": true, + "user": map[string]interface{}{ + "sub": info.userID, + "username": info.username, + "role": info.role, + }, }) go h.readPump(cl) @@ -145,6 +173,14 @@ func (h *Hub) readPump(cl *client) { switch data.Event { case "subscribe.device": + if err := h.authorizeSubscription(cl.userID, data.DeviceKey); err != nil { + h.sendJSON(cl, "subscribe.denied", map[string]interface{}{ + "ok": false, + "deviceKey": data.DeviceKey, + "error": err.Error(), + }) + continue + } room := "device:" + data.DeviceKey h.mu.Lock() cl.rooms[room] = true @@ -204,12 +240,9 @@ func (h *Hub) BroadcastTelemetry(deviceKey string, data interface{}) { room := "device:" + deviceKey for cl := range h.clients { - // 推送到设备房间 if cl.rooms[room] { h.sendJSON(cl, "telemetry", data) } - // 全局推送 - h.sendJSON(cl, "telemetry.all", data) } } @@ -223,14 +256,10 @@ func (h *Hub) BroadcastAlarm(event service.AlarmEvent) { for cl := range h.clients { if isRecovery { - // 恢复通知 - h.sendJSON(cl, "alarm.recovery", event) if event.DeviceKey != "" && cl.rooms[room] { h.sendJSON(cl, "alarm.device.recovery", event) } } else { - // 告警触发 - h.sendJSON(cl, "alarm", event) if event.DeviceKey != "" && cl.rooms[room] { h.sendJSON(cl, "alarm.device", event) } @@ -246,7 +275,6 @@ func (h *Hub) BroadcastDeviceStatus(deviceKey string, status string) { room := "device:" + deviceKey data := map[string]interface{}{"deviceKey": deviceKey, "status": status} for cl := range h.clients { - h.sendJSON(cl, "device.status", data) if cl.rooms[room] { h.sendJSON(cl, "device.status.device", data) } diff --git a/server-go/internal/ws/gateway_test.go b/server-go/internal/ws/gateway_test.go new file mode 100644 index 0000000..926b82e --- /dev/null +++ b/server-go/internal/ws/gateway_test.go @@ -0,0 +1,120 @@ +package ws + +import ( + "errors" + "testing" + + "silk-server-go/internal/service" +) + +type fakeAuthorizer struct { + allowed map[string]bool +} + +func (f fakeAuthorizer) CanReadDevice(userID, deviceKey string) (bool, error) { + if f.allowed == nil { + return false, nil + } + return f.allowed[userID+"|"+deviceKey], nil +} + +func newTestHub() *Hub { + return NewHub( + "test-secret", + fakeAuthorizer{allowed: map[string]bool{"user-1|device-a": true}}, + []string{"http://localhost:5174"}, + ) +} + +func TestWebSocketOriginRejectsUnknownOrigin(t *testing.T) { + hub := newTestHub() + if hub.originAllowed("http://evil.example") { + t.Fatal("unknown origin should be rejected") + } + if !hub.originAllowed("http://localhost:5174") { + t.Fatal("configured origin should be allowed") + } +} + +func TestWebSocketTicketIsOneTimeAndExpires(t *testing.T) { + hub := newTestHub() + ticket := hub.IssueTicket("user-1", "admin", "User One") + if ticket == "" { + t.Fatal("expected non-empty ticket") + } + + info, ok := hub.consumeTicket(ticket) + if !ok || info.userID != "user-1" { + t.Fatalf("first ticket consume failed: ok=%v info=%+v", ok, info) + } + if _, ok := hub.consumeTicket(ticket); ok { + t.Fatal("ticket should be single-use") + } +} + +func TestWebSocketRejectsLongLivedJWTQuery(t *testing.T) { + hub := newTestHub() + if hub.ticketFromQuery("") != "" { + t.Fatal("missing ticket should not be accepted") + } + if hub.ticketFromQuery("token=eyJhbGciOiJIUzI1NiJ9.abc") != "" { + t.Fatal("long-lived token query must not be accepted") + } +} + +func TestWebSocketDeviceAuthorizerRejectsUnauthorized(t *testing.T) { + hub := newTestHub() + if err := hub.authorizeSubscription("user-1", "device-a"); err != nil { + t.Fatalf("authorized device rejected: %v", err) + } + if err := hub.authorizeSubscription("user-1", "device-b"); err == nil { + t.Fatal("unauthorized device should be rejected") + } +} + +func TestBroadcastTelemetryDoesNotLeakGlobal(t *testing.T) { + hub := newTestHub() + subscribed := &client{rooms: map[string]bool{"device:device-a": true}, send: make(chan []byte, 1)} + unsubscribed := &client{rooms: map[string]bool{}, send: make(chan []byte, 1)} + hub.clients[subscribed] = true + hub.clients[unsubscribed] = true + + hub.BroadcastTelemetry("device-a", map[string]interface{}{"value": 1}) + + if len(subscribed.send) == 0 { + t.Fatal("subscribed client should receive telemetry") + } + if len(unsubscribed.send) != 0 { + t.Fatal("unsubscribed client must not receive global telemetry") + } +} + +func TestBroadcastAlarmDoesNotLeakGlobal(t *testing.T) { + hub := newTestHub() + subscribed := &client{rooms: map[string]bool{"device:device-a": true}, send: make(chan []byte, 1)} + unsubscribed := &client{rooms: map[string]bool{}, send: make(chan []byte, 1)} + hub.clients[subscribed] = true + hub.clients[unsubscribed] = true + + hub.BroadcastAlarm(service.AlarmEvent{DeviceKey: "device-a", Code: "high"}) + + if len(unsubscribed.send) != 0 { + t.Fatal("unsubscribed client must not receive global alarm") + } +} + +type brokenAuthorizer struct{} + +func (brokenAuthorizer) CanReadDevice(userID, deviceKey string) (bool, error) { + return false, errors.New("authorizer unavailable") +} + +func TestWebSocketAuthorizerErrorIsDenied(t *testing.T) { + hub := NewHub("test-secret", brokenAuthorizer{}, nil) + if err := hub.authorizeSubscription("user-1", "device-a"); err == nil { + t.Fatal("authorizer error should deny subscription") + } + if _, ok := hub.consumeTicket("missing"); ok { + t.Fatal("missing ticket should not be consumed") + } +} diff --git a/server-go/internal/ws/ticket.go b/server-go/internal/ws/ticket.go new file mode 100644 index 0000000..3115d08 --- /dev/null +++ b/server-go/internal/ws/ticket.go @@ -0,0 +1,57 @@ +package ws + +import ( + "crypto/rand" + "encoding/hex" + "net/url" + "time" +) + +const wsTicketTTL = 60 * time.Second + +type wsTicket struct { + userID string + username string + role string + expiresAt time.Time + used bool +} + +// IssueTicket 签发一次性 WebSocket ticket，避免长期 JWT 进入 URL。 +func (h *Hub) IssueTicket(userID, username, role string) string { + buf := make([]byte, 32) + if _, err := rand.Read(buf); err != nil { + return "" + } + ticket := hex.EncodeToString(buf) + + h.ticketsMu.Lock() + h.tickets[ticket] = &wsTicket{ + userID: userID, + username: username, + role: role, + expiresAt: time.Now().Add(wsTicketTTL), + } + h.ticketsMu.Unlock() + return ticket +} + +func (h *Hub) consumeTicket(ticket string) (wsTicket, bool) { + h.ticketsMu.Lock() + defer h.ticketsMu.Unlock() + + info, ok := h.tickets[ticket] + if !ok || info.used || time.Now().After(info.expiresAt) { + return wsTicket{}, false + } + info.used = true + return *info, true +} + +func (h *Hub) ticketFromQuery(rawQuery string) string { + values, err := url.ParseQuery(rawQuery) + if err != nil { + return "" + } + return values.Get("ticket") +} diff --git a/后续工作计划.md b/后续工作计划.md index 5a5b82b..74d3dc1 100644 --- a/后续工作计划.md +++ b/后续工作计划.md @@ -13,7 +13,7 @@ | Wave 1 | P0 安全与正确性 | Task 2 版本化数据库迁移与 Schema 启动门禁 | 部分可用 | 开发库升级已验证，真实 down 回滚演练待后续 | | Wave 1 | P0 安全与正确性 | Task 3 移除默认密钥与默认管理员密码 | 延后到最后（跳过） | 用户 2026-08-13 明确要求跳过并留到最后 | | Wave 1 | P0 安全与正确性 | Task 4 收口视频访问与摄像头密钥输出 | 部分可用 | 待开发服务器部署联调 | -| Wave 1 | P0 安全与正确性 | Task 5 修复 WebSocket 越权与 AI 流 SSRF | 未开始 | 无 | +| Wave 1 | P0 安全与正确性 | Task 5 修复 WebSocket 越权与 AI 流 SSRF | 部分可用 | 待开发服务器部署与真实 WS/AI 联调 | | Wave 1 | P0 安全与正确性 | Task 6 修复 AI 风险语义并隔离 Mock 数据 | 未开始 | 无 | | Wave 1 | P0 安全与正确性 | Task 7 修订 qPCR 判读与检测质控 | 未开始 | 需领域专家确认 | | Wave 2 | 工程可靠性 | Task 8 建立可靠通知、吊销与跨实例状态 | 未开始 | 无 | diff --git a/开发交接记录.md b/开发交接记录.md index 30462b7..6a4d61b 100644 --- a/开发交接记录.md +++ b/开发交接记录.md @@ -890,3 +890,34 @@ MVP 沿用 IoTDB（现状）；TDengine 作为生产规模化候选（先基准 - 本任务前分支提交为 `440cf80`；回滚可还原 Task 4 提交； - 若已部署流代理版本，回滚需恢复旧二进制并重启，无需数据库变更；播放地址需由客户端重新请求。 + +--- + +## 2026-08-14 整改 Task 5：修复 WebSocket 越权与 AI 流 SSRF + +### 做了什么 + +- WebSocket 改为一次性 ticket 连接：`GET /api/v1/ws/ticket` 签发 60 秒单次 ticket，`/ws` 不再接受 JWT query，客户端统一使用 ticket； +- 新增 `DeviceAuthorizer` / `DBDeviceAuthorizer`，`subscribe.device` 必须校验用户 `device:read` 权限；无权订阅返回 `subscribe.denied`； +- WebSocket 增加 Origin 白名单，`WS_ALLOWED_ORIGINS` 可配置； +- 移除普通连接的 `telemetry.all`、全局 `alarm`、全局 `device.status` 广播，只推送给已授权订阅的设备房间； +- APP/小程序 WS 客户端先请求 ticket 再连接，避免长期 JWT 进入 URL； +- AI 服务新增 `POST /internal/stream-tasks`：要求 `X-Internal-Key`、`taskId`、`streamRef`，限制拉流 host 白名单、并发 worker 数和最大帧数；旧 `/stream-detect` 任意 URL 入口改为 410。 + +### 设计思路与决策依据 + +- WebSocket 播放/订阅场景不适合把长期 JWT 放进 URL；采用服务端签发的一次性 ticket 降低代理日志泄露和重放风险； +- 当前没有用户级资源 ACL，设备订阅先用 RBAC `device:read` 做对象授权；组织/房间级 ACL 留待后续任务； +- AI 流任务改为内部服务接口和受限 worker，避免公网客户端直接传任意 URL，也避免在 FastAPI 事件循环中阻塞式 `VideoCapture.read()`。 + +### 验证结果 + +- `scripts/verify.ps1` 最终 exit 0：Go test/vet/build、Web、小程序、APP、AI pytest 11/11 均通过； +- 新增 Go WS 测试覆盖非法 Origin、ticket 单次/过期、JWT query 拒绝、无权设备订阅、全局广播不泄露； +- 新增 AI 测试覆盖内部 key 校验、任务创建、metadata/公网地址拒绝和旧接口禁用； +- 未部署开发服务器，未做真实 WS 推送和摄像头拉流联调。 + +### 回滚点 + +- 本任务前分支提交为 `1a29def`；回滚可还原 Task 5 提交； +- WS/AI 改动无数据库 schema 变更；若已部署，恢复旧二进制并重启即可，但需同步回滚客户端 WS 连接方式。 From 74d1948d68c415fbc0ca42371d57645ece6ac2f5 Mon Sep 17 00:00:00 2001 From: weijuesen Date: Fri, 14 Aug 2026 01:16:50 +0800 Subject: [PATCH 10/18] =?UTF-8?q?feat:=20=E4=BF=AE=E5=A4=8D=20AI=20?= =?UTF-8?q?=E9=A3=8E=E9=99=A9=E8=AF=AD=E4=B9=89=E5=B9=B6=E9=9A=94=E7=A6=BB?= =?UTF-8?q?=20Mock=20=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 8 +- ai-service/README.md | 6 +- ai-service/app/config.py | 1 + ai-service/app/detector.py | 46 ++++++ ai-service/app/main.py | 15 +- ai-service/tests/test_api.py | 30 ++++ ai-service/tests/test_detector.py | 21 ++- miniapp/src/pages/inspection/index.tsx | 2 + miniapp/src/types/index.ts | 11 ++ scripts/risk_historical_review.sql | 27 ++++ server-go/cmd/server/main.go | 2 +- server-go/internal/database/migrate.go | 4 +- server-go/internal/database/migrate_test.go | 4 + server-go/internal/handler/health.go | 2 +- server-go/internal/handler/inspection.go | 131 +++++++++++------- server-go/internal/handler/inspection_test.go | 36 ++++- server-go/internal/model/inspection.go | 3 + server-go/internal/service/ai_client.go | 32 ++++- server-go/internal/service/ai_client_test.go | 30 +++- server-go/internal/service/cross_validate.go | 23 ++- .../internal/service/cross_validate_test.go | 8 +- server-go/internal/service/risk.go | 120 ++++++++++++++-- server-go/internal/service/risk_test.go | 129 +++++++++++++---- .../000002_risk_assessment.down.sql | 6 + .../migrations/000002_risk_assessment.up.sql | 7 + web/src/dal/inspections.ts | 11 ++ web/src/pages/Inspections.tsx | 14 +- 后续工作计划.md | 4 +- 开发交接记录.md | 30 ++++ 29 files changed, 650 insertions(+), 113 deletions(-) create mode 100644 scripts/risk_historical_review.sql create mode 100644 server-go/migrations/000002_risk_assessment.down.sql create mode 100644 server-go/migrations/000002_risk_assessment.up.sql diff --git a/README.md b/README.md index 1d3ad3b..a7c34e2 100644 --- a/README.md +++ b/README.md @@ -67,8 +67,8 @@ ### 1.9 AI 拍照巡检闭环（计划 #5/#6/#8/#9） -- `ai-service/`：FastAPI + ONNX Runtime（默认 mock 模式；`POST /detect` 返回框/类别/置信度，`POST /stream-detect` 拉流抽帧骨架，`GET /metrics` 监控指标） -- 拍照上传 → AI 检测 → 风险评分（0-100 分，绿/黄/橙/红四级）→ 巡检记录（`inspection_records`，`Idempotency-Key` 幂等） +- `ai-service/`：FastAPI + ONNX Runtime（默认 mock 模式；`POST /detect` 返回框/类别/置信度、`modelVersion`、`isMock`、`abnormalProbability`，`POST /internal/stream-tasks` 受限拉流任务，`GET /metrics` 监控指标） +- 拍照上传 → AI 检测 → 风险评分（0-100 分，绿/黄/橙/红四级，只消费 AI 异常概率，缺失项不按 0 参与）→ 巡检记录（`inspection_records`，`Idempotency-Key` 幂等） - 小程序「拍照巡检」页；Web「巡检记录」页（技术员复查） ### 1.10 知识库与阶段风险提示（计划 #10/#13） @@ -595,8 +595,8 @@ python -m venv .venv MODEL_MODE=mock .venv\Scripts\python -m uvicorn app.main:app --host 0.0.0.0 --port 8000 ``` -- 接口：`GET /health`、`POST /detect`（multipart 图片）、`POST /stream-detect`（摄像头流拉帧骨架）、`GET /metrics`（含 GPU 信息） -- 默认 mock 模式；训练恢复后放 `models/best.onnx` 并设 `MODEL_MODE=onnx`（`MODEL_LABELS` 可配类别） +- 接口：`GET /health`、`POST /detect`（multipart 图片，返回 `abnormalProbability`）、`POST /internal/stream-tasks`（受限摄像头流拉帧任务）、`GET /metrics`（含 GPU 信息） +- 默认 mock 模式且响应带 `isMock=true`；训练恢复后放 `models/best.onnx` 并设 `MODEL_MODE=onnx`（`MODEL_LABELS` 可配类别、`MODEL_VERSION` 必须显式配置） - 开发服务器部署：`/home/pan/ai-service`（venv + `start.sh`，:8000），服务器 pip 源已配置清华镜像 ### 12.7 开发服务器部署摘要 diff --git a/ai-service/README.md b/ai-service/README.md index 89489e1..a3f02ed 100644 --- a/ai-service/README.md +++ b/ai-service/README.md @@ -5,7 +5,7 @@ FastAPI + ONNX Runtime 的蚕病检测推理服务。YOLO 训练挂起期间以 ## 接口 - `GET /health` → `{"status":"ok","model":"mock|onnx"}` -- `POST /detect`（multipart 字段 `file`）→ `{"model":"mock","detections":[{"bbox":{x,y,w,h},"class":"healthy|sick","confidence":0.95}]}` +- `POST /detect`（multipart 字段 `file`）→ `{"model":"mock","modelVersion":"...","isMock":true,"status":"healthy|abnormal|unknown","abnormalProbability":0,"detections":[{"bbox":{x,y,w,h},"class":"healthy|sick","confidence":0.95}]}` - `POST /internal/stream-tasks`（需 `X-Internal-Key`）→ 创建受限拉流任务，不再接受客户端任意 URL ## 本地运行 @@ -33,6 +33,7 @@ powershell -ExecutionPolicy Bypass -File scripts/verify.ps1 | `MODEL_MODE` | `mock` | `mock` / `onnx` | | `MODEL_PATH` | `models/best.onnx` | ONNX 模型路径 | | `MODEL_LABELS` | `healthy,sick` | 类别列表（逗号分隔） | +| `MODEL_VERSION` | `mock-2026.08.14` / `best.onnx` | 模型版本；真实模型上线时必须显式配置 | | `MOCK_CLASS` | `healthy` | mock 返回类别 | | `MOCK_CONFIDENCE` | `0.95` | mock 返回置信度 | | `INTERNAL_API_KEY` | `silk-internal-2026` | 内部接口认证密钥 | @@ -42,5 +43,6 @@ powershell -ExecutionPolicy Bypass -File scripts/verify.ps1 ## 说明 -- 只做检测，风险评分在 Go 后端计算（#9：0.5×AI 置信度 + 0.2×环境 + 0.15×阶段 + 0.15×整齐度）。 +- 只做检测并返回 `abnormalProbability`；风险评分在 Go 后端计算（#9：0.5×AI 异常概率 + 0.2×环境 + 0.15×阶段 + 0.15×整齐度，缺失项归一化）。 +- `healthy` 高置信度不贡献异常概率；空检测或 `unknown` 返回 `unknown`，不自动视为健康。 - ONNX 后处理按 YOLOv8 常见输出格式实现（含 letterbox 与 NMS），训练产物出来后需用真实模型校准验证。 diff --git a/ai-service/app/config.py b/ai-service/app/config.py index 825b9e3..17c019a 100644 --- a/ai-service/app/config.py +++ b/ai-service/app/config.py @@ -5,6 +5,7 @@ MODEL_MODE = os.getenv("MODEL_MODE", "mock") MODEL_PATH = os.getenv("MODEL_PATH", "models/best.onnx") # YOLO 类别（二分类训练基线：healthy/sick；7 类病种扩展后再调整） MODEL_LABELS = os.getenv("MODEL_LABELS", "healthy,sick").split(",") +MODEL_VERSION = os.getenv("MODEL_VERSION", "mock-2026.08.14" if MODEL_MODE == "mock" else "best.onnx") # mock 模式返回的固定结果 MOCK_CLASS = os.getenv("MOCK_CLASS", "healthy") MOCK_CONFIDENCE = float(os.getenv("MOCK_CONFIDENCE", "0.95")) diff --git a/ai-service/app/detector.py b/ai-service/app/detector.py index 8095515..9512718 100644 --- a/ai-service/app/detector.py +++ b/ai-service/app/detector.py @@ -5,6 +5,52 @@ from abc import ABC, abstractmethod from PIL import Image +def _label_set(labels) -> set[str]: + return {label.strip().lower() for label in labels if label.strip()} + + +def abnormal_probability(detections: list[dict], labels: tuple[str, ...] | list[str]) -> float: + """单帧异常概率：取异常类检测的最高置信度，避免多框求和造成虚高。""" + abnormal = _label_set(labels) - {"healthy"} + best = 0.0 + for detection in detections: + class_name = str(detection.get("class_name", "")).strip().lower() + if class_name in ("", "healthy", "unknown"): + continue + if abnormal and class_name not in abnormal: + continue + try: + confidence = float(detection.get("confidence", 0)) + except (TypeError, ValueError): + confidence = 0.0 + best = max(best, min(1.0, max(0.0, confidence))) + return best + + +def detection_status(detections: list[dict], labels: tuple[str, ...] | list[str]) -> str: + """空检测或 unknown 类不再被当作 healthy。""" + if not detections: + return "unknown" + abnormal = _label_set(labels) - {"healthy"} + healthy_seen = False + unknown_seen = False + for detection in detections: + class_name = str(detection.get("class_name", "")).strip().lower() + if abnormal and class_name in abnormal: + return "abnormal" + if not abnormal and class_name not in ("", "healthy", "unknown"): + return "abnormal" + if class_name == "healthy": + healthy_seen = True + elif class_name in ("", "unknown"): + unknown_seen = True + else: + unknown_seen = True + if healthy_seen and not unknown_seen: + return "healthy" + return "unknown" + + class Detector(ABC): @abstractmethod def detect(self, image_bytes: bytes) -> list[dict]: diff --git a/ai-service/app/main.py b/ai-service/app/main.py index dc006a9..7625a9f 100644 --- a/ai-service/app/main.py +++ b/ai-service/app/main.py @@ -6,7 +6,7 @@ import time from fastapi import FastAPI, File, HTTPException, Request, UploadFile from . import config -from .detector import MockDetector, ONNXDetector +from .detector import MockDetector, ONNXDetector, abnormal_probability, detection_status from .stream_tasks import StreamTaskWorker, is_allowed_stream_ref app = FastAPI(title="Silk AI Service", version="0.1.0") @@ -36,7 +36,12 @@ else: @app.get("/health") def health(): - return {"status": "ok", "model": config.MODEL_MODE} + return { + "status": "ok", + "model": config.MODEL_MODE, + "modelVersion": config.MODEL_VERSION, + "isMock": isinstance(detector, MockDetector), + } @app.post("/detect") @@ -50,6 +55,10 @@ async def detect(file: UploadFile = File(...)): raise HTTPException(status_code=400, detail=str(exc)) from exc return { "model": config.MODEL_MODE, + "modelVersion": config.MODEL_VERSION, + "isMock": isinstance(detector, MockDetector), + "status": detection_status(detections, config.MODEL_LABELS), + "abnormalProbability": abnormal_probability(detections, config.MODEL_LABELS), "detections": [ { "bbox": d["bbox"], @@ -112,6 +121,8 @@ def metrics(): gpu = None return { "model": config.MODEL_MODE, + "modelVersion": config.MODEL_VERSION, + "isMock": isinstance(detector, MockDetector), "uptimeSeconds": int(time.time() - START_TIME), "requests": reqs, "avgLatencyMs": round(avg, 2), diff --git a/ai-service/tests/test_api.py b/ai-service/tests/test_api.py index 2173990..6be53d2 100644 --- a/ai-service/tests/test_api.py +++ b/ai-service/tests/test_api.py @@ -6,7 +6,9 @@ os.environ.setdefault("ALLOWED_STREAM_HOSTS", "localhost,127.0.0.1,100.83.103.1" from fastapi.testclient import TestClient +from app import main as main_module from app.main import app +from app.detector import MockDetector # 1x1 透明 PNG TINY_PNG = base64.b64decode( @@ -22,6 +24,8 @@ def test_health(): body = r.json() assert body["status"] == "ok" assert body["model"] in ("mock", "onnx") + assert body["modelVersion"] + assert body["isMock"] is True def test_detect_ok(): @@ -29,6 +33,10 @@ def test_detect_ok(): assert r.status_code == 200 body = r.json() assert body["model"] == "mock" + assert body["modelVersion"] + assert body["isMock"] is True + assert body["status"] == "healthy" + assert body["abnormalProbability"] == 0 assert len(body["detections"]) >= 1 d = body["detections"][0] assert d["class"] in ("healthy", "sick") @@ -36,6 +44,28 @@ def test_detect_ok(): assert d["bbox"]["w"] > 0 +def test_detect_uses_abnormal_class_confidence(monkeypatch): + monkeypatch.setattr(main_module, "detector", MockDetector(class_name="sick", confidence=0.92)) + r = client.post("/detect", files={"file": ("a.png", TINY_PNG, "image/png")}) + assert r.status_code == 200 + body = r.json() + assert body["status"] == "abnormal" + assert body["abnormalProbability"] == 0.92 + + +def test_detect_empty_result_is_unknown(monkeypatch): + class EmptyDetector: + def detect(self, image_bytes): + return [] + + monkeypatch.setattr(main_module, "detector", EmptyDetector()) + r = client.post("/detect", files={"file": ("a.png", TINY_PNG, "image/png")}) + assert r.status_code == 200 + body = r.json() + assert body["status"] == "unknown" + assert body["abnormalProbability"] == 0 + + def test_detect_empty_file_rejected(): r = client.post("/detect", files={"file": ("a.png", b"", "image/png")}) assert r.status_code == 400 diff --git a/ai-service/tests/test_detector.py b/ai-service/tests/test_detector.py index 756203a..b6c4ed3 100644 --- a/ai-service/tests/test_detector.py +++ b/ai-service/tests/test_detector.py @@ -2,7 +2,7 @@ import base64 import pytest -from app.detector import MockDetector +from app.detector import MockDetector, abnormal_probability, detection_status # 1x1 透明 PNG TINY_PNG = base64.b64decode( @@ -23,3 +23,22 @@ def test_mock_detector_rejects_invalid_image(): det = MockDetector() with pytest.raises(ValueError): det.detect(b"not an image") + + +def test_abnormal_probability_ignores_healthy_and_unknown(): + detections = [ + {"class_name": "healthy", "confidence": 0.95}, + {"class_name": "unknown", "confidence": 0.8}, + {"class_name": "sick", "confidence": 0.72}, + ] + assert abnormal_probability(detections, ("healthy", "sick")) == 0.72 + + +def test_detection_status_returns_unknown_for_empty_or_unknown(): + assert detection_status([], ("healthy", "sick")) == "unknown" + assert detection_status([{"class_name": "unknown", "confidence": 0.8}], ("healthy", "sick")) == "unknown" + assert detection_status([{"class_name": "healthy", "confidence": 0.95}], ("healthy", "sick")) == "healthy" + assert detection_status( + [{"class_name": "white_muscardine", "confidence": 0.7}], + ("healthy", "white_muscardine", "nuclear_polyhedrosis"), + ) == "abnormal" diff --git a/miniapp/src/pages/inspection/index.tsx b/miniapp/src/pages/inspection/index.tsx index 2ee0137..f35fc48 100644 --- a/miniapp/src/pages/inspection/index.tsx +++ b/miniapp/src/pages/inspection/index.tsx @@ -113,6 +113,7 @@ const InspectionPage: React.FC = () => { ? '检测到疑似异常' : '未见明显异常' : 'AI 检测失败'} + {result.isMock ? '（联调 Mock）' : ''} {result.aiStatus === 'done' && result.detections && result.detections.length > 0 ? ( @@ -145,6 +146,7 @@ const InspectionPage: React.FC = () => { ? '疑似异常' : '正常' : '检测失败'} + {rec.isMock ? '（Mock）' : ''} {formatRelativeTime(rec.createdAt)} diff --git a/miniapp/src/types/index.ts b/miniapp/src/types/index.ts index 82db964..d319e74 100644 --- a/miniapp/src/types/index.ts +++ b/miniapp/src/types/index.ts @@ -223,6 +223,17 @@ export interface InspectionRecord { detections?: AIDetection[]; riskScore?: number; riskLevel?: string; + riskAssessment?: { + score: number; + level: string; + confidence: string; + modelVersion: string; + ruleVersion: string; + components: Record; + missing: string[]; + }; + modelVersion?: string; + isMock?: boolean; aiStatus: string; idempotencyKey?: string; createdAt?: string; diff --git a/scripts/risk_historical_review.sql b/scripts/risk_historical_review.sql new file mode 100644 index 0000000..aa0a8c1 --- /dev/null +++ b/scripts/risk_historical_review.sql @@ -0,0 +1,27 @@ +-- Task 6 Step 5: 只读历史数据评估报告 +-- 仅统计，不更新数据；未经人工确认不得批量重算或覆盖历史 risk_score/risk_level。 + +WITH real_inspections AS ( + SELECT + id, + risk_level, + risk_score, + detections + FROM inspection_records + WHERE ai_status = 'done' + AND (is_mock IS NULL OR is_mock = false) +) +SELECT + risk_level, + count(*) AS records, + count(*) FILTER ( + WHERE EXISTS ( + SELECT 1 + FROM jsonb_array_elements(detections) AS d + WHERE d->>'class' = 'healthy' + AND COALESCE((d->>'confidence')::numeric, 0) >= 0.80 + ) + ) AS healthy_high_conf_records +FROM real_inspections +GROUP BY risk_level +ORDER BY risk_level; diff --git a/server-go/cmd/server/main.go b/server-go/cmd/server/main.go index 8467ba7..04a13d6 100644 --- a/server-go/cmd/server/main.go +++ b/server-go/cmd/server/main.go @@ -111,7 +111,7 @@ func main() { handler.RegisterVideoRecordRoutes(api, db, mediaSvc, cfg) handler.RegisterStorageRoutes(api, db) handler.RegisterKnowledgeRoutes(api, db, s3Svc, cfg.S3BucketImages) - handler.RegisterInspectionRoutes(api, db, s3Svc, aiSvc, cfg.S3BucketImages, wechatSvc, cfg.WechatTemplateInspection) + handler.RegisterInspectionRoutes(api, db, s3Svc, aiSvc, cfg.S3BucketImages, wechatSvc, cfg.WechatTemplateInspection, cfg.AppEnv) handler.RegisterTrayBatchRoutes(api, db) handler.RegisterWechatRoutes(api, db, wechatSvc) handler.RegisterWeatherRoutes(api, db, weatherSvc) diff --git a/server-go/internal/database/migrate.go b/server-go/internal/database/migrate.go index e01df10..529eff2 100644 --- a/server-go/internal/database/migrate.go +++ b/server-go/internal/database/migrate.go @@ -8,12 +8,12 @@ import ( "github.com/golang-migrate/migrate/v4" "github.com/golang-migrate/migrate/v4/database/postgres" "github.com/golang-migrate/migrate/v4/source/iofs" - "silk-server-go/migrations" "gorm.io/gorm" + "silk-server-go/migrations" ) // CurrentSchemaVersion 是当前后端代码期望的迁移版本。 -const CurrentSchemaVersion = "1" +const CurrentSchemaVersion = "2" // RunMigrations 使用嵌入式 SQL 迁移文件将数据库升级到最新版本。 func RunMigrations(db *gorm.DB) error { diff --git a/server-go/internal/database/migrate_test.go b/server-go/internal/database/migrate_test.go index 00fc19b..b3b6720 100644 --- a/server-go/internal/database/migrate_test.go +++ b/server-go/internal/database/migrate_test.go @@ -100,4 +100,8 @@ func TestEmbeddedMigrationsIncludeBaseline(t *testing.T) { if version != 1 { t.Fatalf("expected baseline migration version 1, got %d", version) } + next, err := driver.Next(version) + if err != nil || next != 2 { + t.Fatalf("expected risk assessment migration version 2, got %d (err %v)", next, err) + } } diff --git a/server-go/internal/handler/health.go b/server-go/internal/handler/health.go index d5f3396..19c0a80 100644 --- a/server-go/internal/handler/health.go +++ b/server-go/internal/handler/health.go @@ -44,7 +44,7 @@ func roomHealthProfile(db *gorm.DB) gin.HandlerFunc { } db.Table("inspection_records"). Select("risk_level, count(*) AS cnt"). - Where("room_id = ? AND ai_status = 'done' AND risk_level IS NOT NULL AND created_at >= ?", id, since). + Where("room_id = ? AND ai_status = 'done' AND risk_level IS NOT NULL AND created_at >= ? AND COALESCE(is_mock, false) = false", id, since). Group("risk_level"). Scan(&riskRows) riskCounts := map[string]int64{} diff --git a/server-go/internal/handler/inspection.go b/server-go/internal/handler/inspection.go index f89e0c8..5c5c04f 100644 --- a/server-go/internal/handler/inspection.go +++ b/server-go/internal/handler/inspection.go @@ -5,6 +5,7 @@ import ( "context" "encoding/json" "io" + "log/slog" "net/http" "regexp" "strconv" @@ -26,8 +27,8 @@ func isUUID(s string) bool { } // RegisterInspectionRoutes 注册 AI 巡检路由 -func RegisterInspectionRoutes(rg *gin.RouterGroup, db *gorm.DB, s3 *service.S3Service, ai *service.AIClient, imageBucket string, wechat *service.WechatService, inspectionTemplateID string) { - rg.POST("/inspections", middleware.RequirePermission(db, "inspection:create"), createInspection(db, s3, ai, imageBucket, wechat, inspectionTemplateID)) +func RegisterInspectionRoutes(rg *gin.RouterGroup, db *gorm.DB, s3 *service.S3Service, ai *service.AIClient, imageBucket string, wechat *service.WechatService, inspectionTemplateID string, appEnv string) { + rg.POST("/inspections", middleware.RequirePermission(db, "inspection:create"), createInspection(db, s3, ai, imageBucket, wechat, inspectionTemplateID, appEnv)) rg.GET("/inspections", middleware.RequirePermission(db, "inspection:read"), listInspections(db)) } @@ -43,9 +44,29 @@ func currentUserID(c *gin.Context) *string { return nil } +func buildRiskInput(detRes *service.AIDetectResponse) service.RiskInput { + status := detRes.Status + if status == "" { + status = service.AIDetectionStatus(detRes.Detections) + } + modelVersion := detRes.ModelVersion + if modelVersion == "" { + modelVersion = "unknown" + } + in := service.RiskInput{ModelVersion: modelVersion} + if status != "unknown" { + aiProb := detRes.AbnormalProbability + if len(detRes.Detections) > 0 && aiProb == 0 { + aiProb = service.AbnormalProbability(detRes.Detections) + } + in.AI = &aiProb + } + return in +} + // createInspection 拍照巡检：图片存 S3 → 调 AI /detect → 写记录。 // 幂等：客户端传 Idempotency-Key 头时，重复请求返回已有记录。 -func createInspection(db *gorm.DB, s3 *service.S3Service, ai *service.AIClient, bucket string, wechat *service.WechatService, inspectionTemplateID string) gin.HandlerFunc { +func createInspection(db *gorm.DB, s3 *service.S3Service, ai *service.AIClient, bucket string, wechat *service.WechatService, inspectionTemplateID string, appEnv string) gin.HandlerFunc { return func(c *gin.Context) { idemKey := strings.TrimSpace(c.GetHeader("Idempotency-Key")) roomID := strings.TrimSpace(c.PostForm("roomId")) @@ -113,49 +134,55 @@ func createInspection(db *gorm.DB, s3 *service.S3Service, ai *service.AIClient, } else { raw, _ := json.Marshal(detRes.Detections) rec.Detections = raw - - // 风险评分（#9）：AI 置信度取检测结果最大值；环境/阶段系数在有 roomId 时按房间数据计算 - aiConf := 0.0 - for _, d := range detRes.Detections { - if d.Confidence > aiConf { - aiConf = d.Confidence - } + isMock := detRes.IsMock + rec.IsMock = &isMock + modelVersion := detRes.ModelVersion + if modelVersion == "" { + modelVersion = "unknown" } - stageCoef, envCoef := loadRoomRisk(db, roomID) - score := service.ComputeRiskScore(service.RiskInput{ - AI: aiConf, - Env: envCoef, - Stage: stageCoef, - }) - rec.RiskScore = &score - level := service.RiskLevel(score) - rec.RiskLevel = &level + rec.ModelVersion = &modelVersion - // 微信订阅消息（#11 骨架）：风险非绿且用户已授权时异步推送 - if key := service.WechatTemplateKey(level); key != "" { - go func(uid *string, lv string, sc float64) { - if uid == nil || !wechat.Configured() || inspectionTemplateID == "" { - return + if appEnv == "production" && isMock { + slog.Error("生产环境收到 Mock AI 检测结果，按失败记录", "modelVersion", modelVersion, "roomId", roomID) + rec.AIStatus = "failed" + } else { + // 风险评分（#9 V2）：只消费 AI 异常概率；缺失环境/阶段不填 0 + riskInput := buildRiskInput(detRes) + riskInput.Env, riskInput.Stage = loadRoomRisk(db, roomID) + assessment := service.ComputeRiskScore(riskInput) + rec.RiskScore = &assessment.Score + rec.RiskLevel = &assessment.Level + rawRisk, _ := json.Marshal(assessment) + rec.RiskAssessment = rawRisk + + // 微信订阅消息（#11 骨架）：Mock 结果不进入告警，风险非绿且用户已授权时异步推送 + if !isMock { + if key := service.WechatTemplateKey(assessment.Level); key != "" { + go func(uid *string, lv string, sc float64) { + if uid == nil || !wechat.Configured() || inspectionTemplateID == "" { + return + } + var binding model.WechatBinding + if db.Where("user_id = ?", *uid).First(&binding).Error != nil { + return + } + var authorized []string + if len(binding.AuthorizedTemplates) > 0 { + _ = json.Unmarshal(binding.AuthorizedTemplates, &authorized) + } + if !service.IsAuthorized(authorized, key) { + return + } + _ = wechat.SendSubscribe( + context.Background(), + binding.OpenID, + inspectionTemplateID, + service.BuildSubscribeData(lv, sc), + "pages/inspection/index", + ) + }(rec.UserID, assessment.Level, assessment.Score) } - var binding model.WechatBinding - if db.Where("user_id = ?", *uid).First(&binding).Error != nil { - return - } - var authorized []string - if len(binding.AuthorizedTemplates) > 0 { - _ = json.Unmarshal(binding.AuthorizedTemplates, &authorized) - } - if !service.IsAuthorized(authorized, key) { - return - } - _ = wechat.SendSubscribe( - context.Background(), - binding.OpenID, - inspectionTemplateID, - service.BuildSubscribeData(lv, sc), - "pages/inspection/index", - ) - }(rec.UserID, level, score) + } } } @@ -175,17 +202,19 @@ func createInspection(db *gorm.DB, s3 *service.S3Service, ai *service.AIClient, } } -// loadRoomRisk 加载房间阶段系数与环境系数（无房间/无数据时返回 0） -func loadRoomRisk(db *gorm.DB, roomID string) (stageCoef, envCoef float64) { +// loadRoomRisk 加载房间阶段系数与环境系数（无房间/无数据时返回 nil） +func loadRoomRisk(db *gorm.DB, roomID string) (*float64, *float64) { if roomID == "" { - return 0, 0 + return nil, nil } var room model.Room if db.Where("id = ?", roomID).First(&room).Error != nil { - return 0, 0 + return nil, nil } + var stageCoef *float64 if room.Stage != nil { - stageCoef = service.StageCoefficient(*room.Stage) + value := service.StageCoefficient(*room.Stage) + stageCoef = &value } var humidity, temperature *float64 @@ -209,7 +238,11 @@ func loadRoomRisk(db *gorm.DB, roomID string) (stageCoef, envCoef float64) { First(&t).Error; err == nil { temperature = &t.Value } - envCoef = service.EnvCoefficient(temperature, humidity) + var envCoef *float64 + if humidity != nil || temperature != nil { + value := service.EnvCoefficient(temperature, humidity) + envCoef = &value + } return stageCoef, envCoef } diff --git a/server-go/internal/handler/inspection_test.go b/server-go/internal/handler/inspection_test.go index fd6a3e7..92cff1e 100644 --- a/server-go/internal/handler/inspection_test.go +++ b/server-go/internal/handler/inspection_test.go @@ -1,6 +1,10 @@ package handler -import "testing" +import ( + "testing" + + "silk-server-go/internal/service" +) func TestIsUUID(t *testing.T) { valid := []string{ @@ -19,3 +23,33 @@ func TestIsUUID(t *testing.T) { } } } + +func TestBuildRiskInputUsesAbnormalProbability(t *testing.T) { + in := buildRiskInput(&service.AIDetectResponse{ + ModelVersion: "silk-yolo-2026.08.1", + Status: "abnormal", + AbnormalProbability: 0.93, + }) + if in.AI == nil || *in.AI != 0.93 { + t.Fatalf("AI 异常概率应进入风险输入，实际 %v", in.AI) + } + if in.ModelVersion != "silk-yolo-2026.08.1" { + t.Errorf("modelVersion = %s", in.ModelVersion) + } +} + +func TestBuildRiskInputUnknownKeepsAIMissing(t *testing.T) { + in := buildRiskInput(&service.AIDetectResponse{Status: "unknown"}) + if in.AI != nil { + t.Fatalf("unknown 状态不应把 0 当作 AI 组件，实际 %v", in.AI) + } +} + +func TestBuildRiskInputFallsBackToDetections(t *testing.T) { + in := buildRiskInput(&service.AIDetectResponse{ + Detections: []service.AIDetection{{ClassName: "sick", Confidence: 0.9}}, + }) + if in.AI == nil || *in.AI != 0.9 { + t.Fatalf("旧 AI 响应应从检测类别计算异常概率，实际 %v", in.AI) + } +} diff --git a/server-go/internal/model/inspection.go b/server-go/internal/model/inspection.go index 936708d..0c943be 100644 --- a/server-go/internal/model/inspection.go +++ b/server-go/internal/model/inspection.go @@ -14,6 +14,9 @@ type InspectionRecord struct { Detections json.RawMessage `gorm:"column:detections;type:jsonb" json:"detections,omitempty"` RiskScore *float64 `gorm:"column:risk_score;type:float" json:"riskScore,omitempty"` RiskLevel *string `gorm:"column:risk_level;size:16" json:"riskLevel,omitempty"` + RiskAssessment json.RawMessage `gorm:"column:risk_assessment;type:jsonb" json:"riskAssessment,omitempty"` + ModelVersion *string `gorm:"column:model_version;size:64" json:"modelVersion,omitempty"` + IsMock *bool `gorm:"column:is_mock;default:false" json:"isMock,omitempty"` AIStatus string `gorm:"column:ai_status;size:16;default:done" json:"aiStatus"` IdempotencyKey *string `gorm:"column:idempotency_key;size:128;uniqueIndex" json:"idempotencyKey,omitempty"` CreatedAt time.Time `gorm:"type:timestamptz" json:"createdAt"` diff --git a/server-go/internal/service/ai_client.go b/server-go/internal/service/ai_client.go index 4c4a8b8..53628f2 100644 --- a/server-go/internal/service/ai_client.go +++ b/server-go/internal/service/ai_client.go @@ -29,8 +29,36 @@ type AIDetection struct { // AIDetectResponse /detect 响应 type AIDetectResponse struct { - Model string `json:"model"` - Detections []AIDetection `json:"detections"` + Model string `json:"model"` + ModelVersion string `json:"modelVersion"` + IsMock bool `json:"isMock"` + Status string `json:"status"` + AbnormalProbability float64 `json:"abnormalProbability"` + Detections []AIDetection `json:"detections"` +} + +// AIDetectionStatus 从检测结果归纳 AI 状态；空检测或 unknown 不当作 healthy。 +func AIDetectionStatus(detections []AIDetection) string { + if len(detections) == 0 { + return "unknown" + } + healthySeen := false + unknownSeen := false + for _, d := range detections { + class := strings.ToLower(strings.TrimSpace(d.ClassName)) + switch class { + case "healthy": + healthySeen = true + case "", "unknown": + unknownSeen = true + default: + return "abnormal" + } + } + if healthySeen && !unknownSeen { + return "healthy" + } + return "unknown" } // AIClient ai-service HTTP 客户端 diff --git a/server-go/internal/service/ai_client_test.go b/server-go/internal/service/ai_client_test.go index b80c949..745fcff 100644 --- a/server-go/internal/service/ai_client_test.go +++ b/server-go/internal/service/ai_client_test.go @@ -24,7 +24,11 @@ func TestAIClientDetectParsesResult(t *testing.T) { } w.Header().Set("Content-Type", "application/json") _ = json.NewEncoder(w).Encode(map[string]any{ - "model": "mock", + "model": "mock", + "modelVersion": "silk-yolo-2026.08.1", + "isMock": true, + "status": "abnormal", + "abnormalProbability": 0.93, "detections": []map[string]any{ {"bbox": map[string]float64{"x": 1, "y": 2, "w": 3, "h": 4}, "class": "sick", "confidence": 0.93}, }, @@ -40,6 +44,15 @@ func TestAIClientDetectParsesResult(t *testing.T) { if res.Model != "mock" { t.Errorf("model = %s, want mock", res.Model) } + if res.ModelVersion != "silk-yolo-2026.08.1" { + t.Errorf("modelVersion = %s, want silk-yolo-2026.08.1", res.ModelVersion) + } + if !res.IsMock { + t.Error("isMock 应解析为 true") + } + if res.Status != "abnormal" || res.AbnormalProbability != 0.93 { + t.Errorf("AI 语义字段解析不正确: %+v", res) + } if len(res.Detections) != 1 { t.Fatalf("detections 数量 = %d, want 1", len(res.Detections)) } @@ -49,6 +62,21 @@ func TestAIClientDetectParsesResult(t *testing.T) { } } +func TestAIDetectionStatus(t *testing.T) { + if got := AIDetectionStatus(nil); got != "unknown" { + t.Errorf("空检测应为 unknown，实际 %s", got) + } + if got := AIDetectionStatus([]AIDetection{{ClassName: "healthy"}}); got != "healthy" { + t.Errorf("全健康应为 healthy，实际 %s", got) + } + if got := AIDetectionStatus([]AIDetection{{ClassName: "unknown"}}); got != "unknown" { + t.Errorf("unknown 应为 unknown，实际 %s", got) + } + if got := AIDetectionStatus([]AIDetection{{ClassName: "sick"}}); got != "abnormal" { + t.Errorf("异常类别应为 abnormal，实际 %s", got) + } +} + func TestAIClientDetectServerError(t *testing.T) { srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { http.Error(w, "boom", http.StatusInternalServerError) diff --git a/server-go/internal/service/cross_validate.go b/server-go/internal/service/cross_validate.go index 9180c00..c595a59 100644 --- a/server-go/internal/service/cross_validate.go +++ b/server-go/internal/service/cross_validate.go @@ -1,5 +1,7 @@ package service +import "strings" + // CrossValidate 交叉验证：AI 检测结果 vs LAMP 检测结果（规格书：一致→确认诊断；不一致→升级专家会诊） func CrossValidate(aiClass, lampResult string, lampDiseases []string) (bool, string) { switch { @@ -7,6 +9,8 @@ func CrossValidate(aiClass, lampResult string, lampDiseases []string) (bool, str return false, "LAMP 判读无效，建议复检或专家会诊" case aiClass == "": return false, "未找到关联巡检记录，暂无法交叉验证" + case aiClass == "unknown": + return false, "AI 结果未知，建议复检或专家会诊" case aiClass == "sick" && lampResult == "positive": return true, "AI 检出异常与 LAMP 阳性一致，确认诊断" case aiClass == "healthy" && lampResult == "negative": @@ -20,15 +24,26 @@ func CrossValidate(aiClass, lampResult string, lampDiseases []string) (bool, str } } -// AIClassFromDetections 从巡检检测结果归纳 AI 结论（任一非 healthy 视为 sick） +// AIClassFromDetections 从巡检检测结果归纳 AI 结论；空检测或 unknown 不当作 healthy。 func AIClassFromDetections(detections []AIDetection) string { if len(detections) == 0 { - return "" + return "unknown" } + healthySeen := false + unknownSeen := false for _, d := range detections { - if d.ClassName != "healthy" { + class := strings.ToLower(strings.TrimSpace(d.ClassName)) + switch class { + case "healthy": + healthySeen = true + case "", "unknown": + unknownSeen = true + default: return "sick" } } - return "healthy" + if healthySeen && !unknownSeen { + return "healthy" + } + return "unknown" } diff --git a/server-go/internal/service/cross_validate_test.go b/server-go/internal/service/cross_validate_test.go index adfaba1..0d62e53 100644 --- a/server-go/internal/service/cross_validate_test.go +++ b/server-go/internal/service/cross_validate_test.go @@ -13,6 +13,7 @@ func TestCrossValidate(t *testing.T) { {"AI健康+LAMP阴性 一致", "healthy", "negative", true}, {"AI异常+LAMP阴性 不一致", "sick", "negative", false}, {"AI健康+LAMP阳性 不一致", "healthy", "positive", false}, + {"AI未知+LAMP阳性 不一致", "unknown", "positive", false}, {"LAMP无效 不一致", "sick", "invalid", false}, {"无AI记录 不一致", "", "positive", false}, } @@ -28,8 +29,8 @@ func TestCrossValidate(t *testing.T) { } func TestAIClassFromDetections(t *testing.T) { - if got := AIClassFromDetections(nil); got != "" { - t.Errorf("空检测应为空，实际 %s", got) + if got := AIClassFromDetections(nil); got != "unknown" { + t.Errorf("空检测应为 unknown，实际 %s", got) } if got := AIClassFromDetections([]AIDetection{{ClassName: "healthy", Confidence: 0.9}}); got != "healthy" { t.Errorf("全健康应为 healthy，实际 %s", got) @@ -37,4 +38,7 @@ func TestAIClassFromDetections(t *testing.T) { if got := AIClassFromDetections([]AIDetection{{ClassName: "healthy"}, {ClassName: "sick", Confidence: 0.6}}); got != "sick" { t.Errorf("含 sick 应为 sick，实际 %s", got) } + if got := AIClassFromDetections([]AIDetection{{ClassName: "unknown", Confidence: 0.6}}); got != "unknown" { + t.Errorf("unknown 应为 unknown，实际 %s", got) + } } diff --git a/server-go/internal/service/risk.go b/server-go/internal/service/risk.go index 5b054f9..1d322f6 100644 --- a/server-go/internal/service/risk.go +++ b/server-go/internal/service/risk.go @@ -1,21 +1,117 @@ package service -import "math" +import ( + "math" + "strings" +) -// RiskInput 风险评分输入（各系数取值 0~1） +// RiskRuleVersion 当前风险规则版本；权重仍沿用试点公式，待数据校准后升版。 +const RiskRuleVersion = "risk-v2-2026.08.14" + +// RiskInput 风险评分输入。nil 表示未采集，不能按 0 参与归一化。 type RiskInput struct { - AI float64 // AI 识别置信度（权重 0.5） - Env float64 // 环境风险系数（权重 0.2） - Stage float64 // 饲养阶段风险系数（权重 0.15） - Uniformity float64 // 群体整齐度偏离度（权重 0.15） + AI *float64 // AI 异常概率（权重 0.5） + Env *float64 // 环境风险系数（权重 0.2） + Stage *float64 // 饲养阶段风险系数（权重 0.15） + Uniformity *float64 // 群体整齐度偏离度（权重 0.15） + ModelVersion string } -// ComputeRiskScore 按规格书 3.1.4 公式计算 0~100 风险分： -// 风险分 = 0.5×AI置信度 + 0.2×环境系数 + 0.15×阶段系数 + 0.15×整齐度偏离度 -func ComputeRiskScore(in RiskInput) float64 { - score := 0.5*in.AI + 0.2*in.Env + 0.15*in.Stage + 0.15*in.Uniformity - score = math.Max(0, math.Min(1, score)) - return score * 100 +// RiskAssessment 可解释风险输出。 +type RiskAssessment struct { + Score float64 `json:"score"` + Level string `json:"level"` + Confidence string `json:"confidence"` + ModelVersion string `json:"modelVersion"` + RuleVersion string `json:"ruleVersion"` + Components map[string]*float64 `json:"components"` + Missing []string `json:"missing"` +} + +// ComputeRiskScore 按可用权重归一化计算 0~100 风险分，缺失组件返回 null。 +// 当前 0.5/0.2/0.15/0.15 是待试点校准规则，不是科学结论。 +func ComputeRiskScore(in RiskInput) RiskAssessment { + defs := []struct { + key string + weight float64 + value *float64 + }{ + {"aiAbnormalProbability", 0.5, in.AI}, + {"environment", 0.2, in.Env}, + {"stage", 0.15, in.Stage}, + {"uniformity", 0.15, in.Uniformity}, + } + components := make(map[string]*float64, len(defs)) + missing := make([]string, 0, len(defs)) + weighted := 0.0 + totalWeight := 0.0 + for _, def := range defs { + if def.value == nil { + components[def.key] = nil + missing = append(missing, def.key) + continue + } + value := clamp01(*def.value) + components[def.key] = &value + weighted += def.weight * value + totalWeight += def.weight + } + + score := 0.0 + if totalWeight > 0 { + score = math.Round(clamp01(weighted/totalWeight)*10000) / 100 + } + return RiskAssessment{ + Score: score, + Level: RiskLevel(score), + Confidence: RiskConfidence(in), + ModelVersion: in.ModelVersion, + RuleVersion: RiskRuleVersion, + Components: components, + Missing: missing, + } +} + +// RiskConfidence 当前仅给出 low/medium/unknown，避免把未校准规则描述为 high。 +func RiskConfidence(in RiskInput) string { + if in.AI == nil { + return "unknown" + } + if *in.AI >= 0.25 { + return "medium" + } + return "low" +} + +// AbnormalProbability 从 AI 检测结果计算异常概率：healthy/unknown 不贡献风险。 +// abnormalClasses 可选；缺省时任一非 healthy/unknown 类别都视为异常类别。 +func AbnormalProbability(detections []AIDetection, abnormalClasses ...string) float64 { + configured := make(map[string]struct{}, len(abnormalClasses)) + for _, class := range abnormalClasses { + if class = strings.ToLower(strings.TrimSpace(class)); class != "" { + configured[class] = struct{}{} + } + } + best := 0.0 + for _, d := range detections { + class := strings.ToLower(strings.TrimSpace(d.ClassName)) + if class == "" || class == "healthy" || class == "unknown" { + continue + } + if len(configured) > 0 { + if _, ok := configured[class]; !ok { + continue + } + } + if d.Confidence > best { + best = d.Confidence + } + } + return clamp01(best) +} + +func clamp01(v float64) float64 { + return math.Max(0, math.Min(1, v)) } // RiskLevel 按规格书 3.1.4 分级：绿 0-30 / 黄 31-60 / 橙 61-80 / 红 81-100 diff --git a/server-go/internal/service/risk_test.go b/server-go/internal/service/risk_test.go index 0fa67bd..4124a6e 100644 --- a/server-go/internal/service/risk_test.go +++ b/server-go/internal/service/risk_test.go @@ -1,43 +1,120 @@ package service -import "testing" +import ( + "math" + "testing" +) -func f(v float64) *float64 { return &v } +func ptr(v float64) *float64 { return &v } func TestComputeRiskScoreWeights(t *testing.T) { - // 全 1：0.5*1 + 0.2*1 + 0.15*1 + 0.15*1 = 1 → 100 - if s := ComputeRiskScore(RiskInput{AI: 1, Env: 1, Stage: 1, Uniformity: 1}); s != 100 { - t.Errorf("全 1 应得 100，实际 %.2f", s) + got := ComputeRiskScore(RiskInput{AI: ptr(1), Env: ptr(1), Stage: ptr(1), Uniformity: ptr(1)}) + if got.Score != 100 { + t.Errorf("全 1 应得 100，实际 %.2f", got.Score) } - // 仅 AI 置信度 1：0.5*1 = 0.5 → 50 - if s := ComputeRiskScore(RiskInput{AI: 1}); s != 50 { - t.Errorf("仅 AI=1 应得 50，实际 %.2f", s) + if len(got.Missing) != 0 { + t.Errorf("全组件可用时不应有 missing，实际 %v", got.Missing) } - // 0.5*0.8 + 0.2*0.5 = 0.5 - if s := ComputeRiskScore(RiskInput{AI: 0.8, Env: 0.5}); s != 50 { - t.Errorf("0.8/0.5 应得 50，实际 %.2f", s) + if got.Components["aiAbnormalProbability"] == nil || got.Components["uniformity"] == nil { + t.Errorf("全组件可用时 components 不应为 null: %v", got.Components) + } +} + +func TestComputeRiskScoreNormalizesMissingComponents(t *testing.T) { + got := ComputeRiskScore(RiskInput{AI: ptr(1)}) + if got.Score != 100 { + t.Errorf("仅 AI=1 归一化后应得 100，实际 %.2f", got.Score) + } + if len(got.Missing) != 3 { + t.Errorf("missing 应为 environment/stage/uniformity，实际 %v", got.Missing) + } + if got.Components["environment"] != nil { + t.Error("缺失 environment 应序列化为 null") + } +} + +func TestHealthyHighConfidenceDoesNotIncreaseRisk(t *testing.T) { + got := AbnormalProbability([]AIDetection{{ClassName: "healthy", Confidence: .95}}) + if got != 0 { + t.Fatalf("healthy 高置信度不应产生异常概率，实际 %v", got) + } + assessment := ComputeRiskScore(RiskInput{AI: ptr(got)}) + if assessment.Score != 0 { + t.Fatalf("healthy 高置信度风险分应为 0，实际 %.2f", assessment.Score) + } +} + +func TestSickHighConfidenceIncreasesRisk(t *testing.T) { + got := AbnormalProbability([]AIDetection{{ClassName: "sick", Confidence: .9}}) + if got != .9 { + t.Fatalf("sick 高置信度异常概率应为 0.9，实际 %v", got) + } + assessment := ComputeRiskScore(RiskInput{AI: ptr(got)}) + if assessment.Score != 90 { + t.Fatalf("仅 AI=0.9 归一化后风险分应为 90，实际 %.2f", assessment.Score) + } +} + +func TestAbnormalProbabilityIgnoresUnknown(t *testing.T) { + if got := AbnormalProbability([]AIDetection{{ClassName: "unknown", Confidence: .9}}); got != 0 { + t.Errorf("unknown 不应贡献异常概率，实际 %v", got) + } +} + +func TestComputeRiskScoreMissingAll(t *testing.T) { + got := ComputeRiskScore(RiskInput{}) + if got.Score != 0 { + t.Errorf("无任何组件时分数应为 0，实际 %.2f", got.Score) + } + if got.Confidence != "unknown" { + t.Errorf("无 AI 组件时 confidence 应为 unknown，实际 %s", got.Confidence) + } + if len(got.Missing) != 4 { + t.Errorf("missing 应为 4 项，实际 %v", got.Missing) } } func TestComputeRiskScoreClamps(t *testing.T) { - if s := ComputeRiskScore(RiskInput{AI: 2, Env: 2, Stage: 2, Uniformity: 2}); s > 100 { - t.Errorf("应钳制到 100，实际 %.2f", s) + got := ComputeRiskScore(RiskInput{AI: ptr(2), Env: ptr(2), Stage: ptr(2), Uniformity: ptr(2)}) + if got.Score > 100 { + t.Errorf("应钳制到 100，实际 %.2f", got.Score) } - if s := ComputeRiskScore(RiskInput{AI: -1}); s < 0 { - t.Errorf("应钳制到 0，实际 %.2f", s) + if got := ComputeRiskScore(RiskInput{AI: ptr(-1)}).Score; got < 0 { + t.Errorf("应钳制到 0，实际 %.2f", got) + } +} + +func TestRiskConfidenceLowMediumUnknown(t *testing.T) { + if got := RiskConfidence(RiskInput{}); got != "unknown" { + t.Errorf("无 AI 应为 unknown，实际 %s", got) + } + if got := RiskConfidence(RiskInput{AI: ptr(0.2)}); got != "low" { + t.Errorf("低异常概率应为 low，实际 %s", got) + } + if got := RiskConfidence(RiskInput{AI: ptr(0.9)}); got != "medium" { + t.Errorf("高异常概率当前最多应为 medium，实际 %s", got) + } +} + +func TestComputeRiskScoreBoundaryUsesWeightNormalization(t *testing.T) { + // 0.5*0.8 + 0.2*0.5 的可用权重为 0.7：0.5/0.7 = 71.43 + got := ComputeRiskScore(RiskInput{AI: ptr(0.8), Env: ptr(0.5)}) + want := 50.0 / 0.7 + if math.Abs(got.Score-want) > 0.01 { + t.Errorf("归一化应得 %.2f，实际 %.2f", want, got.Score) } } func TestRiskLevelBoundaries(t *testing.T) { cases := map[float64]string{ - 0: "green", - 30: "green", + 0: "green", + 30: "green", 30.5: "yellow", - 60: "yellow", - 61: "orange", - 80: "orange", - 81: "red", - 100: "red", + 60: "yellow", + 61: "orange", + 80: "orange", + 81: "red", + 100: "red", } for score, want := range cases { if got := RiskLevel(score); got != want { @@ -63,19 +140,19 @@ func TestStageCoefficientMapping(t *testing.T) { func TestEnvCoefficientRules(t *testing.T) { // 湿度 >=80 → 高（真菌病） - if c := EnvCoefficient(f(25), f(85)); c < 0.7 { + if c := EnvCoefficient(ptr(25), ptr(85)); c < 0.7 { t.Errorf("湿度 85 应 ≥0.7，实际 %.2f", c) } // 湿度 75-80 → 中 - if c := EnvCoefficient(f(25), f(78)); c < 0.3 { + if c := EnvCoefficient(ptr(25), ptr(78)); c < 0.3 { t.Errorf("湿度 78 应 ≥0.3，实际 %.2f", c) } // 温度突变 >30 → 中（核型多角体病诱发） - if c := EnvCoefficient(f(32), f(60)); c < 0.3 { + if c := EnvCoefficient(ptr(32), ptr(60)); c < 0.3 { t.Errorf("温度 32 应 ≥0.3，实际 %.2f", c) } // 舒适环境 → 0 - if c := EnvCoefficient(f(25), f(60)); c != 0 { + if c := EnvCoefficient(ptr(25), ptr(60)); c != 0 { t.Errorf("舒适环境应为 0，实际 %.2f", c) } // 缺数据 → 0 diff --git a/server-go/migrations/000002_risk_assessment.down.sql b/server-go/migrations/000002_risk_assessment.down.sql new file mode 100644 index 0000000..508977e --- /dev/null +++ b/server-go/migrations/000002_risk_assessment.down.sql @@ -0,0 +1,6 @@ +DROP INDEX IF EXISTS idx_inspection_records_mock_created_at; + +ALTER TABLE inspection_records + DROP COLUMN IF EXISTS is_mock, + DROP COLUMN IF EXISTS model_version, + DROP COLUMN IF EXISTS risk_assessment; diff --git a/server-go/migrations/000002_risk_assessment.up.sql b/server-go/migrations/000002_risk_assessment.up.sql new file mode 100644 index 0000000..bd17fdf --- /dev/null +++ b/server-go/migrations/000002_risk_assessment.up.sql @@ -0,0 +1,7 @@ +ALTER TABLE inspection_records + ADD COLUMN IF NOT EXISTS risk_assessment jsonb, + ADD COLUMN IF NOT EXISTS model_version varchar(64), + ADD COLUMN IF NOT EXISTS is_mock boolean NOT NULL DEFAULT false; + +CREATE INDEX IF NOT EXISTS idx_inspection_records_mock_created_at + ON inspection_records (is_mock, created_at); diff --git a/web/src/dal/inspections.ts b/web/src/dal/inspections.ts index c2064fd..9cbb6af 100644 --- a/web/src/dal/inspections.ts +++ b/web/src/dal/inspections.ts @@ -15,6 +15,17 @@ export interface InspectionRecord { detections?: AIDetection[]; riskScore?: number; riskLevel?: string; + riskAssessment?: { + score: number; + level: string; + confidence: string; + modelVersion: string; + ruleVersion: string; + components: Record; + missing: string[]; + }; + modelVersion?: string; + isMock?: boolean; aiStatus: string; createdAt?: string; } diff --git a/web/src/pages/Inspections.tsx b/web/src/pages/Inspections.tsx index 1cb5aaf..88aba8d 100644 --- a/web/src/pages/Inspections.tsx +++ b/web/src/pages/Inspections.tsx @@ -60,7 +60,17 @@ export default function InspectionsPage() { width: 80, render: (_, r) => (r.imageUrl ? : '-'), }, - { title: '状态', dataIndex: 'aiStatus', search: false, render: (_, r) => (r.aiStatus === 'done' ? 成功 : 失败) }, + { + title: '状态', + dataIndex: 'aiStatus', + search: false, + render: (_, r) => ( + <> + {r.aiStatus === 'done' ? 成功 : 失败} + {r.isMock ? Mock : null} + + ), + }, { title: '操作', valueType: 'option', @@ -101,6 +111,8 @@ export default function InspectionsPage() {
状态：{detail.aiStatus === 'done' ? '检测成功' : '检测失败'}
+ 数据：{detail.isMock ? '联调 Mock，不计入生产统计' : detail.modelVersion || '未知模型'} +
风险分：{detail.riskScore !== undefined ? Math.round(detail.riskScore) : '-'}（ {detail.riskLevel ? riskLevelLabel(detail.riskLevel) : '-'}） diff --git a/后续工作计划.md b/后续工作计划.md index 74d3dc1..e1299ef 100644 --- a/后续工作计划.md +++ b/后续工作计划.md @@ -1,6 +1,6 @@ # 后续工作计划 -> **完成状态（2026-08-13 更新）**：#5-#24、#27 已完成（详见 `开发交接记录.md`）；#1-4 因物理机问题挂起；#23/#26 骨架完成；微信/天气真实数据待凭证。 +> **完成状态（2026-08-14 更新）**：#5-#24、#27 已完成，Task 0/1/2/4/5/6 整改代码完成（详见 `开发交接记录.md`）；#1-4 因物理机问题挂起；#23/#26 骨架完成；微信/天气真实数据待凭证。 ## 整改实施计划 Wave 0-4（2026-08-13 启动） @@ -14,7 +14,7 @@ | Wave 1 | P0 安全与正确性 | Task 3 移除默认密钥与默认管理员密码 | 延后到最后（跳过） | 用户 2026-08-13 明确要求跳过并留到最后 | | Wave 1 | P0 安全与正确性 | Task 4 收口视频访问与摄像头密钥输出 | 部分可用 | 待开发服务器部署联调 | | Wave 1 | P0 安全与正确性 | Task 5 修复 WebSocket 越权与 AI 流 SSRF | 部分可用 | 待开发服务器部署与真实 WS/AI 联调 | -| Wave 1 | P0 安全与正确性 | Task 6 修复 AI 风险语义并隔离 Mock 数据 | 未开始 | 无 | +| Wave 1 | P0 安全与正确性 | Task 6 修复 AI 风险语义并隔离 Mock 数据 | 部分可用 | 待开发服务器迁移部署与真实模型接入；历史数据待人工审阅 | | Wave 1 | P0 安全与正确性 | Task 7 修订 qPCR 判读与检测质控 | 未开始 | 需领域专家确认 | | Wave 2 | 工程可靠性 | Task 8 建立可靠通知、吊销与跨实例状态 | 未开始 | 无 | | Wave 2 | 工程可靠性 | Task 9 建立统一检测任务、样本链与发病事件 | 未开始 | 无 | diff --git a/开发交接记录.md b/开发交接记录.md index 6a4d61b..49b3570 100644 --- a/开发交接记录.md +++ b/开发交接记录.md @@ -921,3 +921,33 @@ MVP 沿用 IoTDB（现状）；TDengine 作为生产规模化候选（先基准 - 本任务前分支提交为 `1a29def`；回滚可还原 Task 5 提交； - WS/AI 改动无数据库 schema 变更；若已部署，恢复旧二进制并重启即可，但需同步回滚客户端 WS 连接方式。 + +## 2026-08-14 整改 Task 6：修复 AI 风险语义并隔离 Mock 数据 + +### 做了什么 + +- AI 服务 `/detect` 响应新增 `modelVersion`、`isMock`、`status`、`abnormalProbability`；`healthy` 高置信度不再贡献异常概率，空检测或 `unknown` 返回 `unknown`，不自动当健康； +- Go 风险评分改为只消费 AI 异常概率：`RiskInput` 四个组件全部可空，缺失项不填 0；可用权重归一化后输出 `RiskAssessment`（score/level/confidence/modelVersion/ruleVersion/components/missing）； +- 巡检记录新增 `risk_assessment`、`model_version`、`is_mock` 字段和 `000002_risk_assessment` 迁移；健康画像统计默认排除 mock，Mock 结果不触发微信告警； +- `APP_ENV=production` 时收到 `isMock=true` 按失败记录并输出 error 日志，避免把联调数据当作生产检测结论； +- Web/小程序巡检页显示 Mock 标识；交叉验证中空检测/`unknown` 不再被当作 healthy； +- 新增只读历史评估 SQL `scripts/risk_historical_review.sql`，统计历史 healthy 高置信度记录与风险分布，未执行批量重算。 + +### 设计思路与决策依据 + +- 规格书 AI-INS-002 要求只用 `abnormalProbability` 计算 AI 风险，因此修复了原先取最大 confidence 导致 healthy=0.95 也能得 47.5 分的问题； +- RISK-002 要求缺失数据不能以 0 冒充正常，所以环境/阶段/整齐度改为指针输入，缺失项进入 `missing` 并在 JSON 中返回 null； +- 权重沿用 0.5/0.2/0.15/0.15 并标记为 `risk-v2-2026.08.14` 待试点校准规则；`confidence` 只输出 low/medium/unknown，不声称未校准结论为 high； +- `000007_inspection_idempotency` 未另建迁移，因为 `000001_baseline` 已包含 `idempotency_key` 唯一索引；本次只补风险语义相关字段。 +- 历史旧记录没有 `is_mock` 标识，不能自动判别是否来自 mock；只读 SQL 报告用于人工审阅，未批量重算或改写旧数据。 + +### 验证结果 + +- `scripts/verify.ps1` exit 0：Go test/vet/build、Web test/lint/build、小程序 typecheck/build、APP typecheck/lint、AI pytest 15/15 均通过； +- 新增测试覆盖 healthy/sick/unknown 异常概率、缺失组件归一化、风险分级边界、AI 响应解析、空检测 unknown、handler 风险输入和迁移版本； +- 未部署开发服务器，未对现有库执行 `000002` 迁移；历史只读 SQL 报告未执行。 + +### 回滚点 + +- 本任务前分支提交为 `839ba91`；回滚可还原 Task 6 提交； +- 数据库回滚执行 `migrate -path ... -database ... down 1` 或手工执行 `000002_risk_assessment.down.sql`，可移除新增三列和索引；`risk_score/risk_level` 仍保留，历史数据不回写。 From a6a996a518ede23ccd99773a33fe2b32f7ab1269 Mon Sep 17 00:00:00 2001 From: weijuesen Date: Fri, 14 Aug 2026 01:19:57 +0800 Subject: [PATCH 11/18] =?UTF-8?q?docs:=20Task=207=20=E8=B7=B3=E8=BF=87?= =?UTF-8?q?=E5=B9=B6=E7=95=99=E5=88=B0=E6=9C=80=E5=90=8E=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../2026-08-13-remediation-decisions.md | 2 +- 后续工作计划.md | 4 ++-- 开发交接记录.md | 18 ++++++++++++++++++ 项目整改实施计划_V1.0.md | 2 ++ 4 files changed, 23 insertions(+), 3 deletions(-) diff --git a/docs/decisions/2026-08-13-remediation-decisions.md b/docs/decisions/2026-08-13-remediation-decisions.md index 5911236..551b040 100644 --- a/docs/decisions/2026-08-13-remediation-decisions.md +++ b/docs/decisions/2026-08-13-remediation-decisions.md @@ -9,7 +9,7 @@ | DEC-002 | CI 保持现状：不新增远程 CI；本地门禁使用 `scripts/verify.ps1`；候选平台为 GitHub Actions | GitLab CI；Jenkins；Gitea Actions | 仓库当前无 remote，无法配置并验证外部 CI；先保留可复现本地门禁 | Task 1 的 CI 接入步骤暂不完成；CI 配置待平台确定 | 项目负责人 + 运维 | 仓库获得 remote 或团队确认 CI 平台时 | | DEC-003 | 制品保持现状：构建产物不入库，沿用 `web/dist`、`miniapp/dist`、二进制等 gitignore 规则 | GitHub Releases/Artifacts；NAS；Git LFS | 尚未确定 CI 与发布平台，先避免生成产物污染仓库 | 发布继续按 AGENTS.md 手动备份/回滚 | 项目负责人 + 运维 | 进入正式发布流程前 | | DEC-004 | 数据保留期限保持现状：不自动删除历史数据；具体 bucket/表保留期在 Task 13/14 前评审 | 固定 30/90/365 天 | 当前试点数据量有限，且未获合规/业务确认，不应擅自删数 | 存储增长需纳入容量监控 | 项目负责人 + 运维 | 生产试点或容量告警触发时 | -| DEC-005 | qPCR 保持“只录入、不自动判读”；领域专家确认 protocolVersion、对照规则和阈值后才启用自动判读 | 沿用现有“无 Ct 即阴性” | 当前自动判读存在误判风险，Task 7 将改为四态结果 | Task 7 实现 positive/negative/invalid/indeterminate；专家签字前不输出业务结论 | 领域专家 + 后端 | 专家签字并给出 protocolVersion 时 | +| DEC-005 | qPCR 保持“只录入、不自动判读”；Task 7 延后到最后处理，领域专家确认 protocolVersion、对照规则和阈值后才启用自动判读 | 沿用现有“无 Ct 即阴性”；当前 Wave 1 实施四态结果 | 当前自动判读存在误判风险，且用户 2026-08-14 明确要求跳过 Task 7 并留到最后 | 本轮不实现 positive/negative/invalid/indeterminate；专家签字前不输出业务结论 | 领域专家 + 后端 | 用户恢复 Task 7，或专家签字并给出 protocolVersion 时 | | DEC-006 | APP 保持现状：作为环境监控端，不扩展为全量蚕病功能 | 全量同步 Web/小程序蚕病功能 | 当前 APP 源码未实现蚕病功能，扩大同步会显著增加维护面 | Task 0 后不新增 APP 蚕病页面 | 产品负责人 | 试点用户明确提出 APP 蚕病需求时 | | DEC-007 | 真实模型二分类转多病种指标门槛保持“未定义，不允许上生产”；待数据集修复和训练恢复后按冻结测试集、mAP、混淆矩阵评审 | 先预设 mAP 0.5 | 当前无真实模型，不能凭空设置验收门槛 | AI 生产继续 mock/不接受为真实验收 | AI 负责人 + 项目负责人 | 数据集修复完成或模型训练恢复时 | | DEC-008 | 生产云厂商、对象存储、域名和证书保持现状：不迁移云，继续沿用物理机开发环境 | 云 OSS/COS；云 RDS | 当前无生产试点和上云评审；上云属于发布决策 | 部署仍按 `部署指南(物理机).md` | 项目负责人 + 运维 | 正式生产试点前 | diff --git a/后续工作计划.md b/后续工作计划.md index e1299ef..661c03f 100644 --- a/后续工作计划.md +++ b/后续工作计划.md @@ -1,6 +1,6 @@ # 后续工作计划 -> **完成状态（2026-08-14 更新）**：#5-#24、#27 已完成，Task 0/1/2/4/5/6 整改代码完成（详见 `开发交接记录.md`）；#1-4 因物理机问题挂起；#23/#26 骨架完成；微信/天气真实数据待凭证。 +> **完成状态（2026-08-14 更新）**：#5-#24、#27 已完成，Task 0/1/2/4/5/6 整改代码完成（详见 `开发交接记录.md`）；#1-4 因物理机问题挂起；#23/#26 骨架完成；Task 3/7 延后到最后处理；微信/天气真实数据待凭证。 ## 整改实施计划 Wave 0-4（2026-08-13 启动） @@ -15,7 +15,7 @@ | Wave 1 | P0 安全与正确性 | Task 4 收口视频访问与摄像头密钥输出 | 部分可用 | 待开发服务器部署联调 | | Wave 1 | P0 安全与正确性 | Task 5 修复 WebSocket 越权与 AI 流 SSRF | 部分可用 | 待开发服务器部署与真实 WS/AI 联调 | | Wave 1 | P0 安全与正确性 | Task 6 修复 AI 风险语义并隔离 Mock 数据 | 部分可用 | 待开发服务器迁移部署与真实模型接入；历史数据待人工审阅 | -| Wave 1 | P0 安全与正确性 | Task 7 修订 qPCR 判读与检测质控 | 未开始 | 需领域专家确认 | +| Wave 1 | P0 安全与正确性 | Task 7 修订 qPCR 判读与检测质控 | 延后到最后（跳过） | 用户 2026-08-14 明确要求跳过并留到最后；恢复前需领域专家确认 | | Wave 2 | 工程可靠性 | Task 8 建立可靠通知、吊销与跨实例状态 | 未开始 | 无 | | Wave 2 | 工程可靠性 | Task 9 建立统一检测任务、样本链与发病事件 | 未开始 | 无 | | Wave 3 | 业务闭环 | Task 10 补齐消毒、种源与二维码身份链 | 未开始 | 无 | diff --git a/开发交接记录.md b/开发交接记录.md index 49b3570..f931dd2 100644 --- a/开发交接记录.md +++ b/开发交接记录.md @@ -951,3 +951,21 @@ MVP 沿用 IoTDB（现状）；TDengine 作为生产规模化候选（先基准 - 本任务前分支提交为 `839ba91`；回滚可还原 Task 6 提交； - 数据库回滚执行 `migrate -path ... -database ... down 1` 或手工执行 `000002_risk_assessment.down.sql`，可移除新增三列和索引；`risk_score/risk_level` 仍保留，历史数据不回写。 + +## 2026-08-14 Task 7 延后记录 + +### 做了什么 + +- 按用户要求将 Task 7“修订 qPCR 判读与检测质控”从当前执行顺序中跳过； +- 已同步记录到 `项目整改实施计划_V1.0.md`、`docs/decisions/2026-08-13-remediation-decisions.md`、`后续工作计划.md` 和本文件； +- Task 7 保留到最后处理，不是取消。 + +### 影响 + +- qPCR 继续维持“只录入、不自动判读”，不会在当前轮实现 positive/negative/invalid/indeterminate 四态结果； +- 恢复 Task 7 前仍需领域专家签字确认 protocolVersion、对照规则和阈值； +- 该 P0 风险在最后阶段开始前未关闭。 + +### 回滚点 + +- 本记录仅修改文档，无代码、数据库、服务器或生成产物变更；如需回滚，删除本记录并恢复相关计划/决策表即可。 diff --git a/项目整改实施计划_V1.0.md b/项目整改实施计划_V1.0.md index 5da2aa3..7f753e6 100644 --- a/项目整改实施计划_V1.0.md +++ b/项目整改实施计划_V1.0.md @@ -456,6 +456,8 @@ Push-Location ai-service; python -m pytest -v; Pop-Location ### Task 7: 修订 qPCR 判读与检测质控 +> 2026-08-14 用户决策：Task 7 本轮跳过，留到最后处理。期间保持 qPCR 只录入、不自动判读；恢复前需领域专家签字确认 protocolVersion 与阈值。 + **Requirements:** DET-003～005 **Owner:** 后端负责人 + 领域专家 **Estimated effort:** 1～2 人日 From a25bc7abc6fbd305535350645e670a37e7d3deac Mon Sep 17 00:00:00 2001 From: weijuesen Date: Fri, 14 Aug 2026 01:41:14 +0800 Subject: [PATCH 12/18] =?UTF-8?q?feat:=20=E5=BB=BA=E7=AB=8B=E5=8F=AF?= =?UTF-8?q?=E9=9D=A0=E9=80=9A=E7=9F=A5=E3=80=81=E5=90=8A=E9=94=80=E4=B8=8E?= =?UTF-8?q?=E8=B7=A8=E5=AE=9E=E4=BE=8B=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 10 +- server-go/cmd/server/main.go | 23 +- server-go/internal/database/db.go | 2 + server-go/internal/database/migrate.go | 2 +- server-go/internal/database/migrate_test.go | 4 + server-go/internal/handler/auth.go | 34 ++- server-go/internal/handler/inspection.go | 68 +++--- server-go/internal/handler/notification.go | 76 ++---- server-go/internal/middleware/auth.go | 27 ++- server-go/internal/middleware/ratelimit.go | 115 +++------- server-go/internal/middleware/state.go | 104 +++++++++ server-go/internal/middleware/state_test.go | 152 ++++++++++++ .../internal/middleware/token_blacklist.go | 39 +--- server-go/internal/model/notification.go | 51 +++++ server-go/internal/service/outbox.go | 216 ++++++++++++++++++ server-go/internal/service/outbox_test.go | 100 ++++++++ server-go/internal/service/wechat.go | 151 +++++++++++- server-go/internal/service/wechat_test.go | 6 +- .../000004_notifications_outbox.down.sql | 2 + .../000004_notifications_outbox.up.sql | 47 ++++ 后续工作计划.md | 4 +- 开发交接记录.md | 29 +++ 22 files changed, 1017 insertions(+), 245 deletions(-) create mode 100644 server-go/internal/middleware/state.go create mode 100644 server-go/internal/middleware/state_test.go create mode 100644 server-go/internal/model/notification.go create mode 100644 server-go/internal/service/outbox.go create mode 100644 server-go/internal/service/outbox_test.go create mode 100644 server-go/migrations/000004_notifications_outbox.down.sql create mode 100644 server-go/migrations/000004_notifications_outbox.up.sql diff --git a/README.md b/README.md index a7c34e2..a4cda0d 100644 --- a/README.md +++ b/README.md @@ -50,7 +50,7 @@ ### 1.6 通知与实时推送 -- WebSocket 网关位于 `/ws`，使用 JWT 鉴权 +- WebSocket 网关位于 `/ws`，使用一次性 ticket 鉴权 - 广播事件：`telemetry.all`、`telemetry`、`alarm`、`alarm.recovery` - Web/APP/小程序均接入 WebSocket 实时订阅 - 登录后自动连接 WebSocket，登出自动断开 @@ -244,7 +244,7 @@ silk/ | Alarms | `handler/alarm.go` | 告警生成、确认、解除、查询 | | AlarmClip | `handler/alarm_clip.go` | 告警关联视频片段 | | Control | `handler/control.go` | MQTT 控制命令下发 | -| Notification | `handler/notification.go` | Redis 站内通知 | +| Notification | `handler/notification.go` | PostgreSQL 持久化通知与 Outbox 状态 | | Video Camera | `handler/video_camera.go` | 摄像头管理、WVP 状态同步 | | Video Stream | `handler/video_stream.go` | 实时点播、FLV 代理 | | Video Record | `handler/video_record.go` | 录制启停、活跃录制查询 | @@ -442,9 +442,9 @@ IOTDB_URL=http://localhost:18081 IoTDB 路径示例：`root.silk.telemetry.`sensor-001`.temperature` -### 10.3 Valkey/Redis（缓存与通知） +### 10.3 Valkey/Redis（跨实例认证状态） -用于权限缓存（5 分钟有效期）、站内通知列表。 +用于 JWT 吊销、登录限流等跨实例状态；通知与事件箱持久化在 PostgreSQL，Redis 不可用时登录/刷新/吊销和已认证接口保守失败，不回退单机内存。 ### 10.4 Ceph S3（录像存储） @@ -502,7 +502,7 @@ C:\msys64\usr\bin\sshpass.exe -p "pan" C:\msys64\usr\bin\ssh.exe -o StrictHostKe | `APP_ENV` | `development` | 运行环境；生产环境应设为 `production` | | `ALLOW_DEV_AUTOMIGRATE` | `false` | 仅开发环境可显式开启 AutoMigrate，生产忽略此开关 | | `WS_ALLOWED_ORIGINS` | `http://localhost:5174,http://localhost:3000,...` | WebSocket 允许的 Origin，逗号分隔 | -| `REDIS` | `redis://:pan@localhost:6379` | Valkey/Redis 连接串 | +| `REDIS` | `redis://:pan@localhost:6379` | Valkey/Redis 连接串；不可用时认证/限流接口返回 503 | | `JWT_SECRET` | `silk-secret-please-change-me` | JWT 签名密钥 | | `JWT_EXPIRES_IN` | `2h` | JWT 有效期 | | `MQTT` | `mqtt://pan:pan@localhost:1883` | MQTT 连接串 | diff --git a/server-go/cmd/server/main.go b/server-go/cmd/server/main.go index 04a13d6..53f49f5 100644 --- a/server-go/cmd/server/main.go +++ b/server-go/cmd/server/main.go @@ -42,14 +42,24 @@ func main() { slog.Warn("IoTDB 初始化失败，将降级使用 PostgreSQL", "err", err) } - // 4. 连接 Redis（失败不阻断启动） + // 4. 连接 Redis（失败不阻断启动，但认证/限流保守失败） + var rdb *redis.Client if opt, err := redis.ParseURL(cfg.Redis); err == nil { - rdb := redis.NewClient(opt) + rdb = redis.NewClient(opt) if err := rdb.Ping(context.Background()).Err(); err != nil { - slog.Warn("Redis 连接失败", "err", err) + slog.Error("Redis 连接失败，认证/限流将保守失败", "err", err) + _ = rdb.Close() + rdb = nil } else { slog.Info("Redis 连接成功") } + } else { + slog.Error("Redis URL 解析失败，认证/限流将保守失败", "err", err) + } + if rdb != nil { + middleware.InitState(middleware.NewRedisState(rdb), cfg.AppEnv) + } else { + middleware.InitState(nil, cfg.AppEnv) } // 5. 创建 WebSocket Hub @@ -76,6 +86,11 @@ func main() { aiSvc := service.NewAIClient(cfg.AIServiceBase) wechatSvc := service.NewWechatService(cfg.WechatAppID, cfg.WechatSecret) weatherSvc := service.NewWeatherService(cfg.QWeatherAPIKey, cfg.QWeatherLocation) + outbox := service.NewOutbox(db) + outbox.SetHandler(service.NewWechatOutboxHandler(db, wechatSvc)) + outboxCtx, cancelOutbox := context.WithCancel(context.Background()) + defer cancelOutbox() + outbox.Start(outboxCtx) // 9. 创建 Gin 引擎 gin.SetMode(gin.ReleaseMode) @@ -111,7 +126,7 @@ func main() { handler.RegisterVideoRecordRoutes(api, db, mediaSvc, cfg) handler.RegisterStorageRoutes(api, db) handler.RegisterKnowledgeRoutes(api, db, s3Svc, cfg.S3BucketImages) - handler.RegisterInspectionRoutes(api, db, s3Svc, aiSvc, cfg.S3BucketImages, wechatSvc, cfg.WechatTemplateInspection, cfg.AppEnv) + handler.RegisterInspectionRoutes(api, db, s3Svc, aiSvc, cfg.S3BucketImages, outbox, cfg.WechatTemplateInspection, cfg.AppEnv) handler.RegisterTrayBatchRoutes(api, db) handler.RegisterWechatRoutes(api, db, wechatSvc) handler.RegisterWeatherRoutes(api, db, weatherSvc) diff --git a/server-go/internal/database/db.go b/server-go/internal/database/db.go index 43ed346..bdea348 100644 --- a/server-go/internal/database/db.go +++ b/server-go/internal/database/db.go @@ -36,6 +36,8 @@ func Init(cfg *config.Config) error { &model.Permission{}, &model.RolePermission{}, &model.Disease{}, &model.KnowledgeArticle{}, &model.InspectionRecord{}, + &model.OutboxEvent{}, + &model.Notification{}, &model.Tray{}, &model.Batch{}, &model.RearingRecord{}, &model.WechatBinding{}, &model.WeatherAlert{}, diff --git a/server-go/internal/database/migrate.go b/server-go/internal/database/migrate.go index 529eff2..23798b2 100644 --- a/server-go/internal/database/migrate.go +++ b/server-go/internal/database/migrate.go @@ -13,7 +13,7 @@ import ( ) // CurrentSchemaVersion 是当前后端代码期望的迁移版本。 -const CurrentSchemaVersion = "2" +const CurrentSchemaVersion = "4" // RunMigrations 使用嵌入式 SQL 迁移文件将数据库升级到最新版本。 func RunMigrations(db *gorm.DB) error { diff --git a/server-go/internal/database/migrate_test.go b/server-go/internal/database/migrate_test.go index b3b6720..186f010 100644 --- a/server-go/internal/database/migrate_test.go +++ b/server-go/internal/database/migrate_test.go @@ -104,4 +104,8 @@ func TestEmbeddedMigrationsIncludeBaseline(t *testing.T) { if err != nil || next != 2 { t.Fatalf("expected risk assessment migration version 2, got %d (err %v)", next, err) } + next, err = driver.Next(next) + if err != nil || next != 4 { + t.Fatalf("expected notifications/outbox migration version 4, got %d (err %v)", next, err) + } } diff --git a/server-go/internal/handler/auth.go b/server-go/internal/handler/auth.go index bcb827d..1d6157c 100644 --- a/server-go/internal/handler/auth.go +++ b/server-go/internal/handler/auth.go @@ -72,7 +72,7 @@ func registerHandler(db *gorm.DB, cfg *config.Config) gin.HandlerFunc { } // 强制角色为 viewer，防止垂直越权（注册接口不允许自选角色） - role := model.RoleViewer + role := model.RoleViewer user := model.User{ Username: body.Username, Email: body.Email, @@ -123,13 +123,19 @@ func loginHandler(db *gorm.DB, cfg *config.Config) gin.HandlerFunc { var user model.User if db.Where("username = ? OR email = ?", body.Username, body.Username).First(&user).Error != nil { - middleware.RecordLoginFail(c, body.Username) + if err := middleware.RecordLoginFail(c, body.Username); err != nil { + c.JSON(http.StatusServiceUnavailable, gin.H{"error": err.Error()}) + return + } c.JSON(http.StatusUnauthorized, gin.H{"error": "用户名或密码错误"}) return } if err := bcrypt.CompareHashAndPassword([]byte(user.PasswordHash), []byte(body.Password)); err != nil { - middleware.RecordLoginFail(c, body.Username) + if err := middleware.RecordLoginFail(c, body.Username); err != nil { + c.JSON(http.StatusServiceUnavailable, gin.H{"error": err.Error()}) + return + } c.JSON(http.StatusUnauthorized, gin.H{"error": "用户名或密码错误"}) return } @@ -140,7 +146,10 @@ func loginHandler(db *gorm.DB, cfg *config.Config) gin.HandlerFunc { } // 登录成功，清空失败计数 - middleware.RecordLoginSuccess(c, body.Username) + if err := middleware.RecordLoginSuccess(c, body.Username); err != nil { + c.JSON(http.StatusServiceUnavailable, gin.H{"error": err.Error()}) + return + } // 记录审计日志 uid := user.ID @@ -184,7 +193,12 @@ func refreshHandler(db *gorm.DB, cfg *config.Config) gin.HandlerFunc { c.JSON(http.StatusUnauthorized, gin.H{"error": "刷新令牌无效"}) return } - if middleware.IsRevoked(claims) { + revoked, err := middleware.IsRevoked(claims) + if err != nil { + c.JSON(http.StatusServiceUnavailable, gin.H{"error": "认证状态服务不可用"}) + return + } + if revoked { c.JSON(http.StatusUnauthorized, gin.H{"error": "刷新令牌已注销"}) return } @@ -201,7 +215,10 @@ func refreshHandler(db *gorm.DB, cfg *config.Config) gin.HandlerFunc { } // 吊销旧刷新令牌（一次性使用），签发新令牌对 - middleware.RevokeToken(claims, body.RefreshToken, claims.ExpiresAt.Time) + if err := middleware.RevokeToken(claims, body.RefreshToken, claims.ExpiresAt.Time); err != nil { + c.JSON(http.StatusServiceUnavailable, gin.H{"error": err.Error()}) + return + } c.JSON(http.StatusOK, buildLoginPayload(db, user, cfg)) } } @@ -214,7 +231,10 @@ func logoutHandler(cfg *config.Config) gin.HandlerFunc { if len(parts) == 2 && strings.EqualFold(parts[0], "Bearer") { if claims, token, err := middleware.ExtractClaims(parts[1], cfg.JWTSecret); err == nil && token.Valid { if claims.ExpiresAt != nil { - middleware.RevokeToken(claims, parts[1], claims.ExpiresAt.Time) + if err := middleware.RevokeToken(claims, parts[1], claims.ExpiresAt.Time); err != nil { + c.JSON(http.StatusServiceUnavailable, gin.H{"error": err.Error()}) + return + } } } } diff --git a/server-go/internal/handler/inspection.go b/server-go/internal/handler/inspection.go index 5c5c04f..99d34e0 100644 --- a/server-go/internal/handler/inspection.go +++ b/server-go/internal/handler/inspection.go @@ -2,8 +2,8 @@ package handler import ( "bytes" - "context" "encoding/json" + "fmt" "io" "log/slog" "net/http" @@ -27,8 +27,8 @@ func isUUID(s string) bool { } // RegisterInspectionRoutes 注册 AI 巡检路由 -func RegisterInspectionRoutes(rg *gin.RouterGroup, db *gorm.DB, s3 *service.S3Service, ai *service.AIClient, imageBucket string, wechat *service.WechatService, inspectionTemplateID string, appEnv string) { - rg.POST("/inspections", middleware.RequirePermission(db, "inspection:create"), createInspection(db, s3, ai, imageBucket, wechat, inspectionTemplateID, appEnv)) +func RegisterInspectionRoutes(rg *gin.RouterGroup, db *gorm.DB, s3 *service.S3Service, ai *service.AIClient, imageBucket string, outbox *service.Outbox, inspectionTemplateID string, appEnv string) { + rg.POST("/inspections", middleware.RequirePermission(db, "inspection:create"), createInspection(db, s3, ai, imageBucket, outbox, inspectionTemplateID, appEnv)) rg.GET("/inspections", middleware.RequirePermission(db, "inspection:read"), listInspections(db)) } @@ -66,7 +66,7 @@ func buildRiskInput(detRes *service.AIDetectResponse) service.RiskInput { // createInspection 拍照巡检：图片存 S3 → 调 AI /detect → 写记录。 // 幂等：客户端传 Idempotency-Key 头时，重复请求返回已有记录。 -func createInspection(db *gorm.DB, s3 *service.S3Service, ai *service.AIClient, bucket string, wechat *service.WechatService, inspectionTemplateID string, appEnv string) gin.HandlerFunc { +func createInspection(db *gorm.DB, s3 *service.S3Service, ai *service.AIClient, bucket string, outbox *service.Outbox, inspectionTemplateID string, appEnv string) gin.HandlerFunc { return func(c *gin.Context) { idemKey := strings.TrimSpace(c.GetHeader("Idempotency-Key")) roomID := strings.TrimSpace(c.PostForm("roomId")) @@ -155,38 +155,40 @@ func createInspection(db *gorm.DB, s3 *service.S3Service, ai *service.AIClient, rawRisk, _ := json.Marshal(assessment) rec.RiskAssessment = rawRisk - // 微信订阅消息（#11 骨架）：Mock 结果不进入告警，风险非绿且用户已授权时异步推送 - if !isMock { - if key := service.WechatTemplateKey(assessment.Level); key != "" { - go func(uid *string, lv string, sc float64) { - if uid == nil || !wechat.Configured() || inspectionTemplateID == "" { - return - } - var binding model.WechatBinding - if db.Where("user_id = ?", *uid).First(&binding).Error != nil { - return - } - var authorized []string - if len(binding.AuthorizedTemplates) > 0 { - _ = json.Unmarshal(binding.AuthorizedTemplates, &authorized) - } - if !service.IsAuthorized(authorized, key) { - return - } - _ = wechat.SendSubscribe( - context.Background(), - binding.OpenID, - inspectionTemplateID, - service.BuildSubscribeData(lv, sc), - "pages/inspection/index", - ) - }(rec.UserID, assessment.Level, assessment.Score) - } - } } } - if err := db.Create(&rec).Error; err != nil { + // 微信订阅消息（#11 骨架）：Mock 不进入告警；业务事务内写 outbox，重启后仍可重试 + txErr := db.Transaction(func(tx *gorm.DB) error { + if err := tx.Create(&rec).Error; err != nil { + return err + } + if rec.AIStatus == "done" && rec.UserID != nil && rec.IsMock != nil && !*rec.IsMock { + if key := service.WechatTemplateKey(*rec.RiskLevel); key != "" { + payload, _ := json.Marshal(service.WechatSubscribePayload{ + UserID: *rec.UserID, + TemplateKey: key, + TemplateID: inspectionTemplateID, + Page: "pages/inspection/index", + Title: "巡检风险提醒", + Body: fmt.Sprintf("风险等级 %s，风险分 %.0f", *rec.RiskLevel, *rec.RiskScore), + Data: service.BuildSubscribeData(*rec.RiskLevel, *rec.RiskScore), + BusinessType: "inspection", + BusinessID: rec.ID, + }) + event := service.Event{ + ID: "inspection-" + rec.ID + "-" + *rec.RiskLevel, + Type: service.OutboxEventWechatSubscribe, + AggregateType: "inspection", + AggregateID: rec.ID, + Payload: payload, + } + return outbox.PublishTx(tx, event) + } + } + return nil + }) + if txErr != nil { // 并发幂等：唯一索引冲突时返回已有记录 if idemKey != "" { var exist model.InspectionRecord diff --git a/server-go/internal/handler/notification.go b/server-go/internal/handler/notification.go index 0309999..dd8417b 100644 --- a/server-go/internal/handler/notification.go +++ b/server-go/internal/handler/notification.go @@ -1,61 +1,34 @@ package handler import ( - "fmt" - "math/rand" "net/http" - "sync" "time" "silk-server-go/internal/middleware" + "silk-server-go/internal/model" "github.com/gin-gonic/gin" "gorm.io/gorm" ) -// notificationItem 通知项 -type notificationItem struct { - ID string `json:"id"` - Channel string `json:"channel"` - Target string `json:"target"` - Title string `json:"title"` - Body string `json:"body"` - CreatedAt string `json:"createdAt"` -} - -// 通知内存存储（后续可替换为 Redis） -var ( - notificationStore []notificationItem - notificationMu sync.Mutex -) - // RegisterNotificationRoutes 注册通知路由 func RegisterNotificationRoutes(rg *gin.RouterGroup, db *gorm.DB) { readPerm := middleware.RequirePermission(db, "alarm:read") - rg.GET("/notifications", readPerm, listNotifications()) - rg.POST("/notifications", readPerm, createNotification()) + rg.GET("/notifications", readPerm, listNotifications(db)) + rg.POST("/notifications", readPerm, createNotification(db)) } // listNotifications 通知列表（上限200） -func listNotifications() gin.HandlerFunc { +func listNotifications(db *gorm.DB) gin.HandlerFunc { return func(c *gin.Context) { - notificationMu.Lock() - defer notificationMu.Unlock() - - limit := 200 - if len(notificationStore) < limit { - limit = len(notificationStore) - } - // 返回最新的 limit 条（存储已按新到旧排序） - result := make([]notificationItem, limit) - copy(result, notificationStore[:limit]) - - c.JSON(http.StatusOK, result) + var list []model.Notification + db.Order("created_at DESC").Limit(200).Find(&list) + c.JSON(http.StatusOK, list) } } // createNotification 手动发通知 -func createNotification() gin.HandlerFunc { +func createNotification(db *gorm.DB) gin.HandlerFunc { return func(c *gin.Context) { var body struct { Channel string `json:"channel"` @@ -68,24 +41,25 @@ func createNotification() gin.HandlerFunc { return } - ntf := notificationItem{ - ID: fmt.Sprintf("%d%d", time.Now().UnixNano(), rand.Intn(1000000)), - Channel: body.Channel, - Target: body.Target, - Title: body.Title, - Body: body.Body, - CreatedAt: time.Now().Format(time.RFC3339), + ntf := model.Notification{ + UserID: currentUserID(c), + Channel: body.Channel, + Target: body.Target, + Title: body.Title, + Body: body.Body, + Status: "sent", + NextAttemptAt: time.Now(), } - - notificationMu.Lock() - // 插入到头部（最新在前） - notificationStore = append([]notificationItem{ntf}, notificationStore...) - // 保留最近 500 条 - if len(notificationStore) > 500 { - notificationStore = notificationStore[:500] + if ntf.Channel == "" { + ntf.Channel = "manual" + } + if ntf.Target == "" { + ntf.Target = "all" + } + if err := db.Create(&ntf).Error; err != nil { + c.JSON(http.StatusInternalServerError, gin.H{"error": "创建通知失败"}) + return } - notificationMu.Unlock() - c.JSON(http.StatusCreated, ntf) } } diff --git a/server-go/internal/middleware/auth.go b/server-go/internal/middleware/auth.go index 2828cec..982da00 100644 --- a/server-go/internal/middleware/auth.go +++ b/server-go/internal/middleware/auth.go @@ -20,16 +20,16 @@ type JWTClaims struct { // 白名单路径，无需鉴权 var whitelist = map[string]bool{ - "/api/v1/health": true, - "/health": true, - "/api/health": true, - "/api/v1/auth/login": true, - "/auth/login": true, - "/api/v1/auth/register": true, - "/auth/register": true, - "/api/v1/auth/refresh": true, - "/auth/refresh": true, - "/api/v1/video/clips/internal": true, + "/api/v1/health": true, + "/health": true, + "/api/health": true, + "/api/v1/auth/login": true, + "/auth/login": true, + "/api/v1/auth/register": true, + "/auth/register": true, + "/api/v1/auth/refresh": true, + "/auth/refresh": true, + "/api/v1/video/clips/internal": true, "/api/v1/video/recordings/internal/end": true, } @@ -83,7 +83,12 @@ func Auth(cfg *config.Config) gin.HandlerFunc { } // 校验令牌是否已被登出吊销 - if IsRevoked(claims) { + revoked, err := IsRevoked(claims) + if err != nil { + c.AbortWithStatusJSON(http.StatusServiceUnavailable, gin.H{"error": "认证状态服务不可用"}) + return + } + if revoked { c.AbortWithStatusJSON(http.StatusUnauthorized, gin.H{"error": "令牌已注销，请重新登录"}) return } diff --git a/server-go/internal/middleware/ratelimit.go b/server-go/internal/middleware/ratelimit.go index 97b8475..d5b5ab0 100644 --- a/server-go/internal/middleware/ratelimit.go +++ b/server-go/internal/middleware/ratelimit.go @@ -1,110 +1,41 @@ package middleware import ( + "context" "net/http" "strings" - "sync" "time" "github.com/gin-gonic/gin" ) -// loginAttempt 登录失败计数（按 IP + 用户名维度） -type loginAttempt struct { - failures int - lockUntil time.Time - lastFail time.Time -} - -type loginLimiter struct { - mu sync.Mutex - seen map[string]*loginAttempt -} - const ( - maxFailures = 5 // 连续失败 5 次后锁定 - lockDuration = 15 * time.Minute - failureWindow = 10 * time.Minute // 失败计数窗口 - cleanupInterval = 5 * time.Minute + maxFailures = 5 // 连续失败 5 次后锁定 + lockDuration = 15 * time.Minute + failureWindow = 10 * time.Minute // 失败计数窗口 ) -var defaultLoginLimiter = newLoginLimiter() - -func newLoginLimiter() *loginLimiter { - l := &loginLimiter{seen: make(map[string]*loginAttempt)} - go l.cleanupLoop() - return l -} - -func (l *loginLimiter) cleanupLoop() { - t := time.NewTicker(cleanupInterval) - defer t.Stop() - for range t.C { - l.mu.Lock() - now := time.Now() - for k, v := range l.seen { - if now.After(v.lockUntil) && now.Sub(v.lastFail) > failureWindow { - delete(l.seen, k) - } - } - l.mu.Unlock() - } -} - // key = ip + "|" + username（小写） func limiterKey(c *gin.Context, username string) string { return c.ClientIP() + "|" + strings.ToLower(strings.TrimSpace(username)) } -// checkLock 返回是否被锁定及剩余锁定时间 -func (l *loginLimiter) checkLock(key string) (bool, time.Duration) { - l.mu.Lock() - defer l.mu.Unlock() - a, ok := l.seen[key] - if !ok { - return false, 0 - } - if time.Now().Before(a.lockUntil) { - return true, time.Until(a.lockUntil) - } - return false, 0 -} - -// recordFailure 记录一次失败，达到阈值则锁定 -func (l *loginLimiter) recordFailure(key string) { - l.mu.Lock() - defer l.mu.Unlock() - a, ok := l.seen[key] - if !ok { - a = &loginAttempt{} - l.seen[key] = a - } - now := time.Now() - // 窗口外重置 - if now.Sub(a.lastFail) > failureWindow { - a.failures = 0 - } - a.failures++ - a.lastFail = now - if a.failures >= maxFailures { - a.lockUntil = now.Add(lockDuration) - } -} - -// recordSuccess 登录成功后清空计数 -func (l *loginLimiter) recordSuccess(key string) { - l.mu.Lock() - delete(l.seen, key) - l.mu.Unlock() -} - // CheckLoginLock 检查是否被锁定，被锁定则写 429 并返回 true（在 handler 解析 body 后调用） func CheckLoginLock(c *gin.Context, username string) bool { + if authState == nil { + c.AbortWithStatusJSON(http.StatusServiceUnavailable, gin.H{"error": stateUnavailable("执行登录限流").Error()}) + return true + } key := limiterKey(c, username) - if locked, remain := defaultLoginLimiter.checkLock(key); locked { + locked, remain, err := authState.CheckLoginLock(context.Background(), key) + if err != nil { + c.AbortWithStatusJSON(http.StatusServiceUnavailable, gin.H{"error": "登录状态服务不可用"}) + return true + } + if locked { c.AbortWithStatusJSON(http.StatusTooManyRequests, gin.H{ - "error": "登录尝试过多，已锁定，请稍后再试", - "retry": int(remain.Minutes()) + 1, + "error": "登录尝试过多，已锁定，请稍后再试", + "retry": int(remain.Minutes()) + 1, }) return true } @@ -112,11 +43,17 @@ func CheckLoginLock(c *gin.Context, username string) bool { } // RecordLoginFail 记录登录失败 -func RecordLoginFail(c *gin.Context, username string) { - defaultLoginLimiter.recordFailure(limiterKey(c, username)) +func RecordLoginFail(c *gin.Context, username string) error { + if authState == nil { + return stateUnavailable("记录登录失败") + } + return authState.RecordLoginFailure(context.Background(), limiterKey(c, username)) } // RecordLoginSuccess 登录成功后清空计数 -func RecordLoginSuccess(c *gin.Context, username string) { - defaultLoginLimiter.recordSuccess(limiterKey(c, username)) +func RecordLoginSuccess(c *gin.Context, username string) error { + if authState == nil { + return stateUnavailable("清空登录失败计数") + } + return authState.RecordLoginSuccess(context.Background(), limiterKey(c, username)) } diff --git a/server-go/internal/middleware/state.go b/server-go/internal/middleware/state.go new file mode 100644 index 0000000..ca4203d --- /dev/null +++ b/server-go/internal/middleware/state.go @@ -0,0 +1,104 @@ +package middleware + +import ( + "context" + "fmt" + "log/slog" + "time" + + "github.com/redis/go-redis/v9" +) + +const statePrefix = "silk:auth:" + +// StateStore 跨实例认证状态存储。 +type StateStore interface { + RevokeToken(ctx context.Context, id string, exp time.Time) error + IsTokenRevoked(ctx context.Context, id string) (bool, error) + CheckLoginLock(ctx context.Context, key string) (bool, time.Duration, error) + RecordLoginFailure(ctx context.Context, key string) error + RecordLoginSuccess(ctx context.Context, key string) error +} + +var ( + authState StateStore + appEnv string +) + +// InitState 设置认证状态存储；store 为 nil 时认证相关接口保守失败。 +func InitState(store StateStore, env string) { + authState = store + appEnv = env +} + +// RedisState Redis 实现。 +type RedisState struct { + rdb *redis.Client + prefix string +} + +// NewRedisState 创建 Redis 状态存储。 +func NewRedisState(rdb *redis.Client) *RedisState { + return &RedisState{rdb: rdb, prefix: statePrefix} +} + +func (s *RedisState) RevokeToken(ctx context.Context, id string, exp time.Time) error { + ttl := time.Until(exp) + if ttl <= 0 { + return nil + } + return s.rdb.Set(ctx, s.prefix+"revoked:"+id, "1", ttl).Err() +} + +func (s *RedisState) IsTokenRevoked(ctx context.Context, id string) (bool, error) { + count, err := s.rdb.Exists(ctx, s.prefix+"revoked:"+id).Result() + if err != nil { + return false, err + } + return count > 0, nil +} + +func (s *RedisState) CheckLoginLock(ctx context.Context, key string) (bool, time.Duration, error) { + lockKey := s.prefix + "login-lock:" + key + if _, err := s.rdb.Get(ctx, lockKey).Result(); err == redis.Nil { + return false, 0, nil + } else if err != nil { + return false, 0, err + } + ttl, err := s.rdb.TTL(ctx, lockKey).Result() + if err != nil { + return false, 0, err + } + return true, ttl, nil +} + +var loginFailureScript = redis.NewScript(` +local count = redis.call('INCR', KEYS[1]) +redis.call('EXPIRE', KEYS[1], ARGV[1]) +if tonumber(count) >= tonumber(ARGV[2]) then + redis.call('SET', KEYS[2], '1', 'PX', ARGV[3]) +end +return count +`) + +func (s *RedisState) RecordLoginFailure(ctx context.Context, key string) error { + return loginFailureScript.Run(ctx, s.rdb, + []string{s.prefix + "login-failures:" + key, s.prefix + "login-lock:" + key}, + int(failureWindow.Seconds()), maxFailures, int(lockDuration.Milliseconds()), + ).Err() +} + +func (s *RedisState) RecordLoginSuccess(ctx context.Context, key string) error { + pipe := s.rdb.Pipeline() + pipe.Del(ctx, s.prefix+"login-failures:"+key, s.prefix+"login-lock:"+key) + _, err := pipe.Exec(ctx) + return err +} + +func stateUnavailable(operation string) error { + msg := "Redis 状态服务不可用，无法" + operation + if appEnv == "production" { + slog.Error(msg) + } + return fmt.Errorf("%s", msg) +} diff --git a/server-go/internal/middleware/state_test.go b/server-go/internal/middleware/state_test.go new file mode 100644 index 0000000..92804da --- /dev/null +++ b/server-go/internal/middleware/state_test.go @@ -0,0 +1,152 @@ +package middleware + +import ( + "context" + "net/http" + "net/http/httptest" + "sync" + "testing" + "time" + + "github.com/gin-gonic/gin" +) + +type memoryState struct { + mu sync.Mutex + revoked map[string]time.Time + failures map[string]int + locked map[string]time.Time +} + +func newMemoryState() *memoryState { + return &memoryState{ + revoked: map[string]time.Time{}, + failures: map[string]int{}, + locked: map[string]time.Time{}, + } +} + +func (m *memoryState) RevokeToken(_ context.Context, id string, exp time.Time) error { + m.mu.Lock() + defer m.mu.Unlock() + m.revoked[id] = exp + return nil +} + +func (m *memoryState) IsTokenRevoked(_ context.Context, id string) (bool, error) { + m.mu.Lock() + defer m.mu.Unlock() + exp, ok := m.revoked[id] + if !ok { + return false, nil + } + if time.Now().After(exp) { + delete(m.revoked, id) + return false, nil + } + return true, nil +} + +func (m *memoryState) CheckLoginLock(_ context.Context, key string) (bool, time.Duration, error) { + m.mu.Lock() + defer m.mu.Unlock() + until, ok := m.locked[key] + if !ok { + return false, 0, nil + } + if time.Now().After(until) { + delete(m.locked, key) + return false, 0, nil + } + return true, time.Until(until), nil +} + +func (m *memoryState) RecordLoginFailure(_ context.Context, key string) error { + m.mu.Lock() + defer m.mu.Unlock() + m.failures[key]++ + if m.failures[key] >= maxFailures { + m.locked[key] = time.Now().Add(lockDuration) + } + return nil +} + +func (m *memoryState) RecordLoginSuccess(_ context.Context, key string) error { + m.mu.Lock() + defer m.mu.Unlock() + delete(m.failures, key) + delete(m.locked, key) + return nil +} + +func withMemoryState(t *testing.T) *memoryState { + t.Helper() + store := newMemoryState() + InitState(store, "test") + t.Cleanup(func() { InitState(nil, "test") }) + return store +} + +func TestRevokeTokenIsCrossInstanceState(t *testing.T) { + withMemoryState(t) + claims := &JWTClaims{} + claims.ID = "token-1" + if err := RevokeToken(claims, "token", time.Now().Add(time.Hour)); err != nil { + t.Fatalf("RevokeToken failed: %v", err) + } + revoked, err := IsRevoked(claims) + if err != nil { + t.Fatalf("IsRevoked failed: %v", err) + } + if !revoked { + t.Fatal("token should be revoked") + } +} + +func TestRevokeTokenUnavailableFailsClosed(t *testing.T) { + InitState(nil, "production") + t.Cleanup(func() { InitState(nil, "test") }) + claims := &JWTClaims{} + claims.ID = "x" + if err := RevokeToken(claims, "token", time.Now().Add(time.Hour)); err == nil { + t.Fatal("state unavailable should fail closed") + } +} + +func TestLoginLockStateSemantics(t *testing.T) { + store := withMemoryState(t) + for i := 0; i < maxFailures; i++ { + if err := store.RecordLoginFailure(context.Background(), "1.1.1.1|user"); err != nil { + t.Fatalf("record failure failed: %v", err) + } + } + locked, _, err := store.CheckLoginLock(context.Background(), "1.1.1.1|user") + if err != nil { + t.Fatalf("check lock failed: %v", err) + } + if !locked { + t.Fatal("expected login lock after max failures") + } + if err := store.RecordLoginSuccess(context.Background(), "1.1.1.1|user"); err != nil { + t.Fatalf("record success failed: %v", err) + } + locked, _, _ = store.CheckLoginLock(context.Background(), "1.1.1.1|user") + if locked { + t.Fatal("login lock should be cleared after success") + } +} + +func TestCheckLoginLockUnavailableReturns503(t *testing.T) { + InitState(nil, "test") + t.Cleanup(func() { InitState(nil, "test") }) + gin.SetMode(gin.TestMode) + rec := httptest.NewRecorder() + c, _ := gin.CreateTestContext(rec) + c.Request = httptest.NewRequest(http.MethodPost, "/auth/login", nil) + if !CheckLoginLock(c, "user") { + t.Fatal("state unavailable should abort login") + } + if rec.Code != http.StatusServiceUnavailable { + t.Fatalf("status = %d, want 503", rec.Code) + } +} diff --git a/server-go/internal/middleware/token_blacklist.go b/server-go/internal/middleware/token_blacklist.go index 4298ca5..f20ca4b 100644 --- a/server-go/internal/middleware/token_blacklist.go +++ b/server-go/internal/middleware/token_blacklist.go @@ -1,45 +1,26 @@ package middleware import ( - "sync" + "context" "time" "github.com/golang-jwt/jwt/v5" ) -// tokenBlacklist 登出令牌黑名单（内存版，进程重启后失效，令牌自然过期兜底） -type tokenBlacklist struct { - mu sync.RWMutex - revoked map[string]time.Time // tokenID(jti) -> 过期时间 -} - -var defaultBlacklist = &tokenBlacklist{revoked: make(map[string]time.Time)} - // RevokeToken 将令牌加入黑名单（按 jti，若无 jti 则按 subject+签发时间） -func RevokeToken(claims *JWTClaims, tokenStr string, exp time.Time) { - id := tokenIdentifier(claims) - defaultBlacklist.mu.Lock() - defaultBlacklist.revoked[id] = exp - defaultBlacklist.mu.Unlock() +func RevokeToken(claims *JWTClaims, tokenStr string, exp time.Time) error { + if authState == nil { + return stateUnavailable("吊销令牌") + } + return authState.RevokeToken(context.Background(), tokenIdentifier(claims), exp) } // IsRevoked 判断令牌是否已被吊销 -func IsRevoked(claims *JWTClaims) bool { - id := tokenIdentifier(claims) - defaultBlacklist.mu.RLock() - exp, ok := defaultBlacklist.revoked[id] - defaultBlacklist.mu.RUnlock() - if !ok { - return false +func IsRevoked(claims *JWTClaims) (bool, error) { + if authState == nil { + return false, stateUnavailable("校验令牌吊销状态") } - // 已过期的黑名单项自动清理 - if time.Now().After(exp) { - defaultBlacklist.mu.Lock() - delete(defaultBlacklist.revoked, id) - defaultBlacklist.mu.Unlock() - return false - } - return true + return authState.IsTokenRevoked(context.Background(), tokenIdentifier(claims)) } // ExtractClaims 从 token 字符串解析 claims（供 logout handler 使用） diff --git a/server-go/internal/model/notification.go b/server-go/internal/model/notification.go new file mode 100644 index 0000000..3f29f4c --- /dev/null +++ b/server-go/internal/model/notification.go @@ -0,0 +1,51 @@ +package model + +import ( + "encoding/json" + "time" +) + +// OutboxEvent 可靠事件箱；业务事务内写入，worker 发送并重试。 +type OutboxEvent struct { + ID string `gorm:"type:uuid;primaryKey;default:gen_random_uuid()" json:"id"` + EventID string `gorm:"column:event_id;size:128;uniqueIndex" json:"eventId"` + EventType string `gorm:"column:event_type;size:64" json:"eventType"` + AggregateType *string `gorm:"column:aggregate_type;size:64" json:"aggregateType,omitempty"` + AggregateID *string `gorm:"column:aggregate_id;size:128" json:"aggregateId,omitempty"` + Payload json.RawMessage `gorm:"type:jsonb;default:'{}'" json:"payload"` + Status string `gorm:"size:16;default:pending;index:idx_outbox_events_status_next,priority:1" json:"status"` + Attempts int `gorm:"default:0" json:"attempts"` + MaxAttempts int `gorm:"column:max_attempts;default:5" json:"maxAttempts"` + NextAttemptAt time.Time `gorm:"column:next_attempt_at;type:timestamptz;default:now();index:idx_outbox_events_status_next,priority:2" json:"nextAttemptAt"` + LastError *string `gorm:"column:last_error;type:text" json:"lastError,omitempty"` + CreatedAt time.Time `gorm:"type:timestamptz" json:"createdAt"` + UpdatedAt time.Time `gorm:"type:timestamptz" json:"updatedAt"` +} + +func (OutboxEvent) TableName() string { return "outbox_events" } + +// Notification 持久化通知记录；状态 pending/sending/sent/retry/failed/cancelled。 +type Notification struct { + ID string `gorm:"type:uuid;primaryKey;default:gen_random_uuid()" json:"id"` + UserID *string `gorm:"column:user_id;type:uuid;index:idx_notifications_user_created,priority:1" json:"userId,omitempty"` + Channel string `gorm:"size:32" json:"channel"` + Target string `gorm:"size:128" json:"target"` + Title string `gorm:"size:128" json:"title"` + Body string `gorm:"type:text" json:"body"` + Status string `gorm:"size:16;default:pending;index:idx_notifications_status_next,priority:1" json:"status"` + Attempts int `gorm:"default:0" json:"attempts"` + NextAttemptAt time.Time `gorm:"column:next_attempt_at;type:timestamptz;default:now();index:idx_notifications_status_next,priority:2" json:"nextAttemptAt"` + LastError *string `gorm:"column:last_error;type:text" json:"lastError,omitempty"` + TemplateID *string `gorm:"column:template_id;size:128" json:"templateId,omitempty"` + OpenID *string `gorm:"column:open_id;size:128" json:"openId,omitempty"` + Authorized bool `gorm:"default:false" json:"authorized"` + ProviderResponse json.RawMessage `gorm:"column:provider_response;type:jsonb" json:"providerResponse,omitempty"` + Data json.RawMessage `gorm:"type:jsonb" json:"data,omitempty"` + BusinessType *string `gorm:"column:business_type;size:64" json:"businessType,omitempty"` + BusinessID *string `gorm:"column:business_id;size:128" json:"businessId,omitempty"` + EventID *string `gorm:"column:event_id;size:128;uniqueIndex" json:"eventId,omitempty"` + CreatedAt time.Time `gorm:"type:timestamptz" json:"createdAt"` + UpdatedAt time.Time `gorm:"type:timestamptz" json:"updatedAt"` +} + +func (Notification) TableName() string { return "notifications" } diff --git a/server-go/internal/service/outbox.go b/server-go/internal/service/outbox.go new file mode 100644 index 0000000..f70770c --- /dev/null +++ b/server-go/internal/service/outbox.go @@ -0,0 +1,216 @@ +package service + +import ( + "context" + "crypto/rand" + "encoding/hex" + "encoding/json" + "errors" + "log/slog" + "time" + + "silk-server-go/internal/model" + + "gorm.io/gorm" + "gorm.io/gorm/clause" +) + +const ( + OutboxStatusPending = "pending" + OutboxStatusSending = "sending" + OutboxStatusSent = "sent" + OutboxStatusRetry = "retry" + OutboxStatusFailed = "failed" + OutboxStatusCancelled = "cancelled" + + OutboxEventWechatSubscribe = "wechat.subscribe" +) + +// Event 写入 outbox 的领域事件。 +type Event struct { + ID string + Type string + AggregateType string + AggregateID string + Payload json.RawMessage +} + +// EventHandler 处理一条已领取的 outbox 事件。 +type EventHandler func(ctx context.Context, event model.OutboxEvent) error + +// Outbox 基于 PostgreSQL 的可靠事件箱。 +type Outbox struct { + db *gorm.DB + handler EventHandler + interval time.Duration + batchSize int + maxAttempts int + backoff time.Duration +} + +// NewOutbox 创建默认配置的 Outbox。 +func NewOutbox(db *gorm.DB) *Outbox { + return &Outbox{ + db: db, + interval: 5 * time.Second, + batchSize: 20, + maxAttempts: 5, + backoff: 15 * time.Second, + } +} + +// SetHandler 设置事件处理器。 +func (o *Outbox) SetHandler(handler EventHandler) { + o.handler = handler +} + +// PublishTx 在业务事务内写入事件；重复 eventId 通过唯一索引幂等跳过。 +func (o *Outbox) PublishTx(tx *gorm.DB, event Event) error { + if event.Type == "" { + return errors.New("outbox event type is required") + } + if event.ID == "" { + event.ID = randomEventID() + } + payload := event.Payload + if len(payload) == 0 { + payload = json.RawMessage(`{}`) + } + record := model.OutboxEvent{ + EventID: event.ID, + EventType: event.Type, + AggregateType: strPtrOrNil(event.AggregateType), + AggregateID: strPtrOrNil(event.AggregateID), + Payload: payload, + Status: OutboxStatusPending, + MaxAttempts: o.maxAttempts, + NextAttemptAt: time.Now(), + } + // PublishTx 必须复用调用方事务，避免 GORM 对单条 Create 再开嵌套事务。 + return tx.Session(&gorm.Session{SkipDefaultTransaction: true}).Clauses(clause.OnConflict{ + Columns: []clause.Column{{Name: "event_id"}}, + DoNothing: true, + }).Create(&record).Error +} + +// ClaimNext 领取一批到期待处理事件。 +func (o *Outbox) ClaimNext(ctx context.Context, limit int) ([]model.OutboxEvent, error) { + if limit <= 0 { + limit = o.batchSize + } + var events []model.OutboxEvent + err := o.db.WithContext(ctx). + Where("status IN ? AND next_attempt_at <= ?", []string{OutboxStatusPending, OutboxStatusRetry}, time.Now()). + Order("created_at ASC"). + Limit(limit). + Find(&events).Error + return events, err +} + +// MarkSending 原子标记领取状态，避免多 worker 重复处理。 +func (o *Outbox) MarkSending(ctx context.Context, id string) (bool, error) { + result := o.db.WithContext(ctx). + Model(&model.OutboxEvent{}). + Where("id = ? AND status IN ?", id, []string{OutboxStatusPending, OutboxStatusRetry}). + Update("status", OutboxStatusSending) + return result.RowsAffected > 0, result.Error +} + +// MarkResult 写入成功/失败并计算下一次重试时间。 +func (o *Outbox) MarkResult(ctx context.Context, id string, processErr error) error { + var event model.OutboxEvent + if err := o.db.WithContext(ctx).First(&event, "id = ?", id).Error; err != nil { + return err + } + if event.MaxAttempts <= 0 { + event.MaxAttempts = o.maxAttempts + } + event.Attempts++ + now := time.Now() + updates := map[string]interface{}{ + "attempts": event.Attempts, + "updated_at": now, + "next_attempt_at": now, + } + if processErr == nil { + updates["status"] = OutboxStatusSent + updates["last_error"] = nil + } else { + message := processErr.Error() + updates["last_error"] = message + if event.Attempts >= event.MaxAttempts { + updates["status"] = OutboxStatusFailed + } else { + updates["status"] = OutboxStatusRetry + updates["next_attempt_at"] = now.Add(o.backoff * time.Duration(event.Attempts)) + } + } + return o.db.WithContext(ctx). + Model(&model.OutboxEvent{}). + Where("id = ?", id). + Updates(updates).Error +} + +// ProcessPending 领取并处理到期事件，返回本轮处理数量。 +func (o *Outbox) ProcessPending(ctx context.Context) (int, error) { + if o.handler == nil { + return 0, errors.New("outbox handler is not set") + } + processed := 0 + for { + events, err := o.ClaimNext(ctx, o.batchSize) + if err != nil { + return processed, err + } + if len(events) == 0 { + return processed, nil + } + for _, event := range events { + claimed, err := o.MarkSending(ctx, event.ID) + if err != nil { + slog.Warn("outbox mark sending failed", "eventId", event.EventID, "err", err) + continue + } + if !claimed { + continue + } + processErr := o.handler(ctx, event) + if err := o.MarkResult(ctx, event.ID, processErr); err != nil { + slog.Warn("outbox mark result failed", "eventId", event.EventID, "err", err) + continue + } + processed++ + } + } +} + +// Start 启动后台 worker。 +func (o *Outbox) Start(ctx context.Context) { + ticker := time.NewTicker(o.interval) + defer ticker.Stop() + for { + select { + case <-ctx.Done(): + return + case <-ticker.C: + if _, err := o.ProcessPending(ctx); err != nil { + slog.Warn("outbox worker failed", "err", err) + } + } + } +} + +func strPtrOrNil(value string) *string { + if value == "" { + return nil + } + return &value +} + +func randomEventID() string { + b := make([]byte, 16) + if _, err := rand.Read(b); err != nil { + return hex.EncodeToString([]byte(time.Now().Format(time.RFC3339Nano))) + } + return hex.EncodeToString(b) +} diff --git a/server-go/internal/service/outbox_test.go b/server-go/internal/service/outbox_test.go new file mode 100644 index 0000000..a7bd971 --- /dev/null +++ b/server-go/internal/service/outbox_test.go @@ -0,0 +1,100 @@ +package service + +import ( + "context" + "encoding/json" + "testing" + "time" + + "github.com/DATA-DOG/go-sqlmock" + "gorm.io/driver/postgres" + "gorm.io/gorm" + + "silk-server-go/internal/model" +) + +func newOutboxMock(t *testing.T) (*Outbox, sqlmock.Sqlmock) { + t.Helper() + sqlDB, mock, err := sqlmock.New() + if err != nil { + t.Fatalf("create sqlmock: %v", err) + } + gdb, err := gorm.Open(postgres.New(postgres.Config{Conn: sqlDB}), &gorm.Config{}) + if err != nil { + t.Fatalf("open gorm: %v", err) + } + o := NewOutbox(gdb) + return o, mock +} + +func TestPublishTxUsesSameEventIDIdempotently(t *testing.T) { + o, mock := newOutboxMock(t) + event := Event{ + ID: "event-1", + Type: OutboxEventWechatSubscribe, + Payload: json.RawMessage(`{"userId":"u1"}`), + } + mock.ExpectQuery(`INSERT INTO "outbox_events".*ON CONFLICT \("event_id"\) DO NOTHING`). + WithArgs( + sqlmock.AnyArg(), sqlmock.AnyArg(), sqlmock.AnyArg(), sqlmock.AnyArg(), + sqlmock.AnyArg(), sqlmock.AnyArg(), sqlmock.AnyArg(), sqlmock.AnyArg(), + sqlmock.AnyArg(), sqlmock.AnyArg(), sqlmock.AnyArg(), sqlmock.AnyArg(), + ). + WillReturnRows(sqlmock.NewRows([]string{"id", "payload", "next_attempt_at"}). + AddRow("00000000-0000-0000-0000-000000000001", json.RawMessage(`{"userId":"u1"}`), time.Now())) + if err := o.PublishTx(o.db, event); err != nil { + t.Fatalf("first publish failed: %v", err) + } + // 第二次相同 eventId 仍走 ON CONFLICT DO NOTHING，不产生重复发送。 + mock.ExpectQuery(`INSERT INTO "outbox_events".*ON CONFLICT \("event_id"\) DO NOTHING`). + WithArgs( + sqlmock.AnyArg(), sqlmock.AnyArg(), sqlmock.AnyArg(), sqlmock.AnyArg(), + sqlmock.AnyArg(), sqlmock.AnyArg(), sqlmock.AnyArg(), sqlmock.AnyArg(), + sqlmock.AnyArg(), sqlmock.AnyArg(), sqlmock.AnyArg(), sqlmock.AnyArg(), + ). + WillReturnRows(sqlmock.NewRows([]string{"id", "payload", "next_attempt_at"})) + if err := o.PublishTx(o.db, event); err != nil { + t.Fatalf("second publish failed: %v", err) + } +} + +func TestProcessPendingWithNoEventsIsNoop(t *testing.T) { + o, mock := newOutboxMock(t) + o.handler = func(ctx context.Context, event model.OutboxEvent) error { return nil } + mock.ExpectQuery(`SELECT .* FROM "outbox_events" WHERE status IN \(.*\)`). + WillReturnRows(sqlmock.NewRows([]string{ + "id", "event_id", "event_type", "aggregate_type", "aggregate_id", + "payload", "status", "attempts", "max_attempts", "next_attempt_at", + "last_error", "created_at", "updated_at", + })) + processed, err := o.ProcessPending(context.Background()) + if err != nil { + t.Fatalf("ProcessPending failed: %v", err) + } + if processed != 0 { + t.Fatalf("processed = %d, want 0", processed) + } +} + +func TestClaimNextReturnsPendingAfterRestart(t *testing.T) { + o, mock := newOutboxMock(t) + now := time.Now() + mock.ExpectQuery(`SELECT .* FROM "outbox_events" WHERE status IN \(.*\)`). + WithArgs(OutboxStatusPending, OutboxStatusRetry, sqlmock.AnyArg(), sqlmock.AnyArg()). + WillReturnRows(sqlmock.NewRows([]string{ + "id", "event_id", "event_type", "aggregate_type", "aggregate_id", + "payload", "status", "attempts", "max_attempts", "next_attempt_at", + "last_error", "created_at", "updated_at", + }).AddRow( + "id-1", "event-1", OutboxEventWechatSubscribe, nil, nil, + json.RawMessage(`{}`), OutboxStatusPending, 0, 5, now, + nil, now, now, + )) + events, err := o.ClaimNext(context.Background(), 1) + if err != nil { + t.Fatalf("ClaimNext failed: %v", err) + } + if len(events) != 1 || events[0].EventID != "event-1" { + t.Fatalf("events = %+v", events) + } +} diff --git a/server-go/internal/service/wechat.go b/server-go/internal/service/wechat.go index f903b8c..8dfaaa7 100644 --- a/server-go/internal/service/wechat.go +++ b/server-go/internal/service/wechat.go @@ -10,6 +10,11 @@ import ( "net/url" "sync" "time" + + "silk-server-go/internal/model" + + "gorm.io/gorm" + "gorm.io/gorm/clause" ) const wechatAPIBase = "https://api.weixin.qq.com" @@ -168,9 +173,21 @@ func (s *WechatService) getAccessToken(ctx context.Context) (string, error) { // SendSubscribe 发送订阅消息 func (s *WechatService) SendSubscribe(ctx context.Context, openid, templateID string, data map[string]map[string]string, page string) error { + _, err := s.SendSubscribeResult(ctx, openid, templateID, data, page) + return err +} + +// WechatSendResult 微信订阅消息响应。 +type WechatSendResult struct { + ErrCode int `json:"errcode"` + ErrMsg string `json:"errmsg"` +} + +// SendSubscribeResult 发送订阅消息并返回微信响应码。 +func (s *WechatService) SendSubscribeResult(ctx context.Context, openid, templateID string, data map[string]map[string]string, page string) (WechatSendResult, error) { token, err := s.getAccessToken(ctx) if err != nil { - return err + return WechatSendResult{ErrCode: -1, ErrMsg: err.Error()}, err } payload := map[string]any{ "touser": openid, @@ -182,32 +199,142 @@ func (s *WechatService) SendSubscribe(ctx context.Context, openid, templateID st } raw, err := json.Marshal(payload) if err != nil { - return err + return WechatSendResult{ErrCode: -1, ErrMsg: err.Error()}, err } u := s.baseURL + "/cgi-bin/message/subscribe/send?access_token=" + url.QueryEscape(token) req, err := http.NewRequestWithContext(ctx, http.MethodPost, u, bytes.NewReader(raw)) if err != nil { - return err + return WechatSendResult{ErrCode: -1, ErrMsg: err.Error()}, err } req.Header.Set("Content-Type", "application/json") resp, err := s.httpClient.Do(req) if err != nil { - return err + return WechatSendResult{ErrCode: -1, ErrMsg: err.Error()}, err } defer resp.Body.Close() body, err := io.ReadAll(resp.Body) if err != nil { - return err - } - var out struct { - ErrCode int `json:"errcode"` - ErrMsg string `json:"errmsg"` + return WechatSendResult{ErrCode: -1, ErrMsg: err.Error()}, err } + var out WechatSendResult if err := json.Unmarshal(body, &out); err != nil { - return err + return WechatSendResult{ErrCode: -1, ErrMsg: err.Error()}, err } if out.ErrCode != 0 { - return fmt.Errorf("微信订阅消息发送失败 (%d): %s", out.ErrCode, out.ErrMsg) + return out, fmt.Errorf("微信订阅消息发送失败 (%d): %s", out.ErrCode, out.ErrMsg) } - return nil + return out, nil +} + +// WechatSubscribePayload outbox 微信订阅事件载荷。 +type WechatSubscribePayload struct { + UserID string `json:"userId"` + OpenID string `json:"openId"` + TemplateKey string `json:"templateKey"` + TemplateID string `json:"templateId"` + Page string `json:"page"` + Title string `json:"title"` + Body string `json:"body"` + Data map[string]map[string]string `json:"data"` + BusinessType string `json:"businessType"` + BusinessID string `json:"businessId"` +} + +// NewWechatOutboxHandler 创建微信订阅 outbox 处理器。 +func NewWechatOutboxHandler(db *gorm.DB, wechat *WechatService) EventHandler { + return func(ctx context.Context, event model.OutboxEvent) error { + if event.EventType != OutboxEventWechatSubscribe { + return nil + } + var payload WechatSubscribePayload + if err := json.Unmarshal(event.Payload, &payload); err != nil { + return err + } + return handleWechatSubscribe(ctx, db, wechat, event, payload) + } +} + +func handleWechatSubscribe(ctx context.Context, db *gorm.DB, wechat *WechatService, event model.OutboxEvent, payload WechatSubscribePayload) error { + var binding model.WechatBinding + if err := db.Where("user_id = ?", payload.UserID).First(&binding).Error; err != nil { + message := "微信未绑定" + return saveWechatNotification(ctx, db, event, payload, "", false, WechatSendResult{ErrCode: 40001, ErrMsg: message}, "cancelled", &message) + } + + var authorized []string + if len(binding.AuthorizedTemplates) > 0 { + _ = json.Unmarshal(binding.AuthorizedTemplates, &authorized) + } + if !IsAuthorized(authorized, payload.TemplateKey) { + message := "用户未授权订阅模板" + return saveWechatNotification(ctx, db, event, payload, binding.OpenID, false, WechatSendResult{ErrCode: 43101, ErrMsg: message}, "cancelled", &message) + } + + if payload.TemplateID == "" { + message := "订阅消息模板 ID 未配置" + if err := saveWechatNotification(ctx, db, event, payload, binding.OpenID, true, WechatSendResult{ErrCode: -1, ErrMsg: message}, "retry", &message); err != nil { + return err + } + return fmt.Errorf("订阅消息模板 ID 未配置") + } + + result, sendErr := wechat.SendSubscribeResult(ctx, binding.OpenID, payload.TemplateID, payload.Data, payload.Page) + status := "sent" + var lastErr *string + maxAttempts := event.MaxAttempts + if maxAttempts <= 0 { + maxAttempts = 5 + } + if sendErr != nil { + message := sendErr.Error() + lastErr = &message + status = "retry" + if event.Attempts+1 >= maxAttempts { + status = "failed" + } + } + if err := saveWechatNotification(ctx, db, event, payload, binding.OpenID, true, result, status, lastErr); err != nil { + return err + } + return sendErr +} + +func saveWechatNotification(ctx context.Context, db *gorm.DB, event model.OutboxEvent, payload WechatSubscribePayload, openID string, authorized bool, response WechatSendResult, status string, lastErr *string) error { + data, _ := json.Marshal(payload.Data) + providerResponse, _ := json.Marshal(response) + userID := payload.UserID + eventID := event.EventID + notification := model.Notification{ + UserID: &userID, + Channel: "wechat", + Target: openID, + Title: payload.Title, + Body: payload.Body, + Status: status, + Attempts: event.Attempts + 1, + NextAttemptAt: time.Now(), + LastError: lastErr, + TemplateID: strPtrOrNil(payload.TemplateID), + OpenID: strPtrOrNil(openID), + Authorized: authorized, + ProviderResponse: providerResponse, + Data: data, + BusinessType: strPtrOrNil(payload.BusinessType), + BusinessID: strPtrOrNil(payload.BusinessID), + EventID: &eventID, + } + return db.WithContext(ctx). + Clauses(clause.OnConflict{ + Columns: []clause.Column{{Name: "event_id"}}, + DoUpdates: clause.Assignments(map[string]interface{}{ + "status": status, + "attempts": event.Attempts + 1, + "next_attempt_at": time.Now(), + "last_error": lastErr, + "authorized": authorized, + "provider_response": providerResponse, + "updated_at": time.Now(), + }), + }). + Create(¬ification).Error } diff --git a/server-go/internal/service/wechat_test.go b/server-go/internal/service/wechat_test.go index cce431a..4de7f30 100644 --- a/server-go/internal/service/wechat_test.go +++ b/server-go/internal/service/wechat_test.go @@ -106,7 +106,11 @@ func TestWechatSendSubscribeErrorCode(t *testing.T) { s.baseURL = srv.URL s.accessToken = "fake-token" s.tokenExpire = time.Now().Add(time.Hour) - if err := s.SendSubscribe(context.Background(), "bad", "tmpl1", nil, ""); err == nil { + result, err := s.SendSubscribeResult(context.Background(), "bad", "tmpl1", nil, "") + if err == nil { t.Error("errcode!=0 应返回错误") } + if result.ErrCode != 40003 || result.ErrMsg != "invalid openid" { + t.Errorf("response code = %+v", result) + } } diff --git a/server-go/migrations/000004_notifications_outbox.down.sql b/server-go/migrations/000004_notifications_outbox.down.sql new file mode 100644 index 0000000..4294fce --- /dev/null +++ b/server-go/migrations/000004_notifications_outbox.down.sql @@ -0,0 +1,2 @@ +DROP TABLE IF EXISTS notifications CASCADE; +DROP TABLE IF EXISTS outbox_events CASCADE; diff --git a/server-go/migrations/000004_notifications_outbox.up.sql b/server-go/migrations/000004_notifications_outbox.up.sql new file mode 100644 index 0000000..2f8b54f --- /dev/null +++ b/server-go/migrations/000004_notifications_outbox.up.sql @@ -0,0 +1,47 @@ +CREATE TABLE IF NOT EXISTS outbox_events ( + id uuid PRIMARY KEY DEFAULT gen_random_uuid(), + event_id varchar(128) NOT NULL, + event_type varchar(64) NOT NULL, + aggregate_type varchar(64), + aggregate_id varchar(128), + payload jsonb NOT NULL DEFAULT '{}'::jsonb, + status varchar(16) NOT NULL DEFAULT 'pending', + attempts integer NOT NULL DEFAULT 0, + max_attempts integer NOT NULL DEFAULT 5, + next_attempt_at timestamptz NOT NULL DEFAULT now(), + last_error text, + created_at timestamptz NOT NULL DEFAULT now(), + updated_at timestamptz NOT NULL DEFAULT now() +); + +CREATE UNIQUE INDEX IF NOT EXISTS idx_outbox_events_event_id ON outbox_events (event_id); +CREATE INDEX IF NOT EXISTS idx_outbox_events_status_next + ON outbox_events (status, next_attempt_at); + +CREATE TABLE IF NOT EXISTS notifications ( + id uuid PRIMARY KEY DEFAULT gen_random_uuid(), + user_id uuid, + channel varchar(32) NOT NULL, + target varchar(128) NOT NULL, + title varchar(128) NOT NULL, + body text NOT NULL, + status varchar(16) NOT NULL DEFAULT 'pending', + attempts integer NOT NULL DEFAULT 0, + next_attempt_at timestamptz NOT NULL DEFAULT now(), + last_error text, + template_id varchar(128), + open_id varchar(128), + authorized boolean NOT NULL DEFAULT false, + provider_response jsonb, + data jsonb, + business_type varchar(64), + business_id varchar(128), + event_id varchar(128), + created_at timestamptz NOT NULL DEFAULT now(), + updated_at timestamptz NOT NULL DEFAULT now() +); + +CREATE UNIQUE INDEX IF NOT EXISTS idx_notifications_event_id ON notifications (event_id); +CREATE INDEX IF NOT EXISTS idx_notifications_user_created ON notifications (user_id, created_at); +CREATE INDEX IF NOT EXISTS idx_notifications_status_next + ON notifications (status, next_attempt_at); diff --git a/后续工作计划.md b/后续工作计划.md index 661c03f..5de9863 100644 --- a/后续工作计划.md +++ b/后续工作计划.md @@ -1,6 +1,6 @@ # 后续工作计划 -> **完成状态（2026-08-14 更新）**：#5-#24、#27 已完成，Task 0/1/2/4/5/6 整改代码完成（详见 `开发交接记录.md`）；#1-4 因物理机问题挂起；#23/#26 骨架完成；Task 3/7 延后到最后处理；微信/天气真实数据待凭证。 +> **完成状态（2026-08-14 更新）**：#5-#24、#27 已完成，Task 0/1/2/4/5/6/8 整改代码完成（详见 `开发交接记录.md`）；#1-4 因物理机问题挂起；#23/#26 骨架完成；Task 3/7 延后到最后处理；微信/天气真实数据待凭证。 ## 整改实施计划 Wave 0-4（2026-08-13 启动） @@ -16,7 +16,7 @@ | Wave 1 | P0 安全与正确性 | Task 5 修复 WebSocket 越权与 AI 流 SSRF | 部分可用 | 待开发服务器部署与真实 WS/AI 联调 | | Wave 1 | P0 安全与正确性 | Task 6 修复 AI 风险语义并隔离 Mock 数据 | 部分可用 | 待开发服务器迁移部署与真实模型接入；历史数据待人工审阅 | | Wave 1 | P0 安全与正确性 | Task 7 修订 qPCR 判读与检测质控 | 延后到最后（跳过） | 用户 2026-08-14 明确要求跳过并留到最后；恢复前需领域专家确认 | -| Wave 2 | 工程可靠性 | Task 8 建立可靠通知、吊销与跨实例状态 | 未开始 | 无 | +| Wave 2 | 工程可靠性 | Task 8 建立可靠通知、吊销与跨实例状态 | 部分可用 | 待开发服务器迁移部署与 Redis/微信真实联调 | | Wave 2 | 工程可靠性 | Task 9 建立统一检测任务、样本链与发病事件 | 未开始 | 无 | | Wave 3 | 业务闭环 | Task 10 补齐消毒、种源与二维码身份链 | 未开始 | 无 | | Wave 3 | 业务闭环 | Task 11 实现小程序离线巡检与可靠同步 | 未开始 | 无 | diff --git a/开发交接记录.md b/开发交接记录.md index f931dd2..23e0064 100644 --- a/开发交接记录.md +++ b/开发交接记录.md @@ -969,3 +969,32 @@ MVP 沿用 IoTDB（现状）；TDengine 作为生产规模化候选（先基准 ### 回滚点 - 本记录仅修改文档，无代码、数据库、服务器或生成产物变更；如需回滚，删除本记录并恢复相关计划/决策表即可。 + +## 2026-08-14 整改 Task 8：建立可靠通知、吊销与跨实例状态 + +### 做了什么 + +- 新增 `outbox_events`、`notifications` 表和 `000004_notifications_outbox` 迁移，通知列表从进程内存改为 PostgreSQL 持久化； +- 新增 `Outbox.PublishTx(tx, event)`：业务事务内写入事件，重复 `eventId` 通过唯一索引幂等；worker 领取、发送、退避重试并记录 `pending/sending/sent/retry/failed/cancelled`； +- JWT 吊销与登录限流迁移到 Redis：新增 `middleware.StateStore`/`RedisState`，Redis 不可用时登录、刷新、吊销和已认证接口返回 503，不再静默回退单机内存； +- 巡检风险微信推送改为事务内写 Outbox，不再使用进程内 goroutine；微信发送结果保存模板、用户授权、微信 `errcode/errmsg`、尝试次数和最终状态； +- `/notifications` 改读 PostgreSQL；手动通知也落库。 + +### 设计思路与决策依据 + +- 可靠通知不能依赖进程内存；PostgreSQL 保存事件与业务同事务，Redis 只保存短时效的吊销和限流状态，降低多实例一致性风险； +- Outbox 幂等由 `event_id` 唯一索引和 `ON CONFLICT DO NOTHING` 保证；worker 领取时用 `pending/retry -> sending` 原子更新，避免多实例重复处理； +- Redis 不可用时采用保守失败而不是降级：认证状态和限流丢失会造成越权或绕过风险，业务价值大于可用性损失； +- 微信未绑定或未授权不是临时失败，写入 `cancelled`；模板未配置或微信返回错误进入重试/最终失败，便于人工查看。 + +### 验证结果 + +- `scripts/verify.ps1` exit 0：Go test/vet/build、Web test/lint/build、小程序 typecheck/build、APP typecheck/lint、AI pytest 15/15 均通过； +- 新增测试覆盖 Outbox 幂等发布、重启后领取 pending、Redis 状态不可用保守失败、吊销跨状态、登录锁定/清空和微信响应码解析； +- 未部署开发服务器，未执行 `000004` 迁移；未做真实 Redis/微信联调和进程重启演练。 + +### 回滚点 + +- 本任务前分支提交为 `a6a996a`；回滚可还原 Task 8 提交； +- 数据库回滚执行 `000004_notifications_outbox.down.sql`，可删除 `notifications` 和 `outbox_events`；未发送的 Outbox 数据会随回滚丢失，回滚前必须先备份或暂停 worker； +- 认证状态回滚需恢复旧二进制，Redis 中的吊销/限流键由 TTL 自然过期。 From cc93c9a0537bade5053873cc05ae954c814122fb Mon Sep 17 00:00:00 2001 From: weijuesen Date: Fri, 14 Aug 2026 03:31:02 +0800 Subject: [PATCH 13/18] =?UTF-8?q?feat:=20=E5=BB=BA=E7=AB=8B=E7=BB=9F?= =?UTF-8?q?=E4=B8=80=E6=A3=80=E6=B5=8B=E4=BB=BB=E5=8A=A1=E3=80=81=E6=A0=B7?= =?UTF-8?q?=E6=9C=AC=E9=93=BE=E4=B8=8E=E5=8F=91=E7=97=85=E4=BA=8B=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 + server-go/cmd/server/main.go | 3 +- server-go/internal/database/db.go | 3 + server-go/internal/database/migrate.go | 2 +- server-go/internal/database/migrate_test.go | 4 + server-go/internal/handler/detection_task.go | 579 ++++++++++++++++++ server-go/internal/handler/inspection.go | 33 +- server-go/internal/handler/lamp.go | 80 ++- server-go/internal/handler/trace.go | 8 +- server-go/internal/model/detection_task.go | 97 +++ .../internal/model/detection_task_test.go | 51 ++ server-go/internal/model/disease_event.go | 58 ++ .../internal/model/disease_event_test.go | 35 ++ server-go/internal/model/lamp.go | 35 +- server-go/internal/model/trace_record.go | 9 +- .../internal/service/detection_task_outbox.go | 82 +++ .../service/detection_task_outbox_test.go | 44 ++ server-go/internal/service/outbox.go | 3 +- .../000005_detection_disease_events.down.sql | 5 + .../000005_detection_disease_events.up.sql | 89 +++ web/src/dal/detectionTask.ts | 88 +++ web/src/layout/BasicLayout.tsx | 1 + web/src/pages/DetectionTasks.tsx | 402 ++++++++++++ web/src/router.tsx | 2 + 后续工作计划.md | 4 +- 开发交接记录.md | 29 + 26 files changed, 1716 insertions(+), 32 deletions(-) create mode 100644 server-go/internal/handler/detection_task.go create mode 100644 server-go/internal/model/detection_task.go create mode 100644 server-go/internal/model/detection_task_test.go create mode 100644 server-go/internal/model/disease_event.go create mode 100644 server-go/internal/model/disease_event_test.go create mode 100644 server-go/internal/service/detection_task_outbox.go create mode 100644 server-go/internal/service/detection_task_outbox_test.go create mode 100644 server-go/migrations/000005_detection_disease_events.down.sql create mode 100644 server-go/migrations/000005_detection_disease_events.up.sql create mode 100644 web/src/dal/detectionTask.ts create mode 100644 web/src/pages/DetectionTasks.tsx diff --git a/README.md b/README.md index a4cda0d..c266c0c 100644 --- a/README.md +++ b/README.md @@ -82,6 +82,7 @@ - LAMP 检测任务单 + 标准 5 步流程 + 结果照片 + 结果录入 - qPCR Ct 值自动判读（阈值可配）；SERS 光谱数据上传与光谱库；高光谱方式预留 - 交叉验证：AI 结果 vs 检测结果（一致→确认诊断；不一致→建议专家会诊） +- 统一检测任务/样本/发病事件：`/detection-tasks`、`/samples`、`/disease-events`；橙色/红色巡检通过 Outbox 幂等创建待确认任务，阳性结果自动创建发病事件并关联溯源 - 多检测方式推荐引擎（设备条件/紧急程度/操作者水平/成本偏好） - Web「分子检测」页 + 小程序 LAMP 录入 @@ -346,6 +347,7 @@ Authorization: Bearer | `GET/POST/PATCH/DELETE /trays`、`/batches`、`/rearing-records` | 蚕匾/批次/饲养记录 | | `GET/POST/PATCH/DELETE /lamp-tests(/:id)` | 分子检测任务单（含步骤/结果照片/judge-qpcr/spectrum/cross-validation） | | `GET/POST/DELETE /spectrum-entries` | SERS 光谱库 | +| `GET/POST/PATCH /detection-tasks(/:id)`、`/samples`、`/disease-events` | 统一检测任务、样本链路与发病事件 | | `GET /weather/now`、`GET /weather/alerts` | 天气与高发病预警 | | `GET/POST /wechat/binding`、`/wechat/bind`、`/wechat/subscribe` | 微信订阅绑定/授权 | | `GET/POST/PATCH /consultations(/:id)`、`/:id/resolve`、`/:id/archive` | 专家会诊 | diff --git a/server-go/cmd/server/main.go b/server-go/cmd/server/main.go index 53f49f5..cfac303 100644 --- a/server-go/cmd/server/main.go +++ b/server-go/cmd/server/main.go @@ -87,7 +87,7 @@ func main() { wechatSvc := service.NewWechatService(cfg.WechatAppID, cfg.WechatSecret) weatherSvc := service.NewWeatherService(cfg.QWeatherAPIKey, cfg.QWeatherLocation) outbox := service.NewOutbox(db) - outbox.SetHandler(service.NewWechatOutboxHandler(db, wechatSvc)) + outbox.SetHandler(service.NewOutboxHandler(db, wechatSvc)) outboxCtx, cancelOutbox := context.WithCancel(context.Background()) defer cancelOutbox() outbox.Start(outboxCtx) @@ -131,6 +131,7 @@ func main() { handler.RegisterWechatRoutes(api, db, wechatSvc) handler.RegisterWeatherRoutes(api, db, weatherSvc) handler.RegisterLampRoutes(api, db, s3Svc, cfg.S3BucketImages) + handler.RegisterDetectionTaskRoutes(api, db) handler.RegisterConsumableRoutes(api, db) handler.RegisterConsultationRoutes(api, db) handler.RegisterDetectionMethodRoutes(api, db) diff --git a/server-go/internal/database/db.go b/server-go/internal/database/db.go index bdea348..d8f3903 100644 --- a/server-go/internal/database/db.go +++ b/server-go/internal/database/db.go @@ -38,6 +38,9 @@ func Init(cfg *config.Config) error { &model.InspectionRecord{}, &model.OutboxEvent{}, &model.Notification{}, + &model.DetectionTask{}, + &model.Sample{}, + &model.DiseaseEvent{}, &model.Tray{}, &model.Batch{}, &model.RearingRecord{}, &model.WechatBinding{}, &model.WeatherAlert{}, diff --git a/server-go/internal/database/migrate.go b/server-go/internal/database/migrate.go index 23798b2..dbc69d2 100644 --- a/server-go/internal/database/migrate.go +++ b/server-go/internal/database/migrate.go @@ -13,7 +13,7 @@ import ( ) // CurrentSchemaVersion 是当前后端代码期望的迁移版本。 -const CurrentSchemaVersion = "4" +const CurrentSchemaVersion = "5" // RunMigrations 使用嵌入式 SQL 迁移文件将数据库升级到最新版本。 func RunMigrations(db *gorm.DB) error { diff --git a/server-go/internal/database/migrate_test.go b/server-go/internal/database/migrate_test.go index 186f010..febbc5b 100644 --- a/server-go/internal/database/migrate_test.go +++ b/server-go/internal/database/migrate_test.go @@ -108,4 +108,8 @@ func TestEmbeddedMigrationsIncludeBaseline(t *testing.T) { if err != nil || next != 4 { t.Fatalf("expected notifications/outbox migration version 4, got %d (err %v)", next, err) } + next, err = driver.Next(next) + if err != nil || next != 5 { + t.Fatalf("expected detection/disease migration version 5, got %d (err %v)", next, err) + } } diff --git a/server-go/internal/handler/detection_task.go b/server-go/internal/handler/detection_task.go new file mode 100644 index 0000000..9613f0a --- /dev/null +++ b/server-go/internal/handler/detection_task.go @@ -0,0 +1,579 @@ +package handler + +import ( + "encoding/json" + "fmt" + "net/http" + "strings" + "time" + + "silk-server-go/internal/middleware" + "silk-server-go/internal/model" + + "github.com/gin-gonic/gin" + "gorm.io/gorm" + "gorm.io/gorm/clause" +) + +// RegisterDetectionTaskRoutes 注册统一检测任务、样本和发病事件路由。 +func RegisterDetectionTaskRoutes(rg *gin.RouterGroup, db *gorm.DB) { + lampRead := middleware.RequirePermission(db, "lamp:read") + lampWrite := middleware.RequirePermission(db, "lamp:write") + traceRead := middleware.RequirePermission(db, "trace:read") + traceWrite := middleware.RequirePermission(db, "trace:write") + + rg.GET("/detection-tasks", lampRead, listDetectionTasks(db)) + rg.POST("/detection-tasks", lampWrite, createDetectionTask(db)) + rg.GET("/detection-tasks/:id", lampRead, getDetectionTask(db)) + rg.PATCH("/detection-tasks/:id", lampWrite, updateDetectionTask(db)) + rg.GET("/detection-tasks/:id/samples", lampRead, listSamples(db)) + rg.POST("/detection-tasks/:id/samples", lampWrite, createSample(db)) + rg.PATCH("/samples/:id", lampWrite, updateSample(db)) + rg.GET("/disease-events", traceRead, listDiseaseEvents(db)) + rg.POST("/disease-events", traceWrite, createDiseaseEvent(db)) + rg.PATCH("/disease-events/:id", traceWrite, updateDiseaseEvent(db)) +} + +func listDetectionTasks(db *gorm.DB) gin.HandlerFunc { + return func(c *gin.Context) { + q := db.Model(&model.DetectionTask{}) + if status := c.Query("status"); status != "" { + q = q.Where("status = ?", status) + } + if room := c.Query("roomId"); room != "" { + q = q.Where("room_id = ?", room) + } + if sourceType := c.Query("sourceType"); sourceType != "" { + q = q.Where("source_type = ?", sourceType) + } + var list []model.DetectionTask + q.Order("created_at DESC").Limit(200).Find(&list) + fillDetectionTaskRoomNames(db, list) + c.JSON(http.StatusOK, list) + } +} + +func getDetectionTask(db *gorm.DB) gin.HandlerFunc { + return func(c *gin.Context) { + var task model.DetectionTask + if db.Where("id = ?", c.Param("id")).First(&task).Error != nil { + c.JSON(http.StatusNotFound, gin.H{"error": "detection task not found"}) + return + } + fillDetectionTaskRoomNames(db, []model.DetectionTask{task}) + c.JSON(http.StatusOK, task) + } +} + +func createDetectionTask(db *gorm.DB) gin.HandlerFunc { + return func(c *gin.Context) { + var body struct { + SourceKey string `json:"sourceKey"` + SourceType string `json:"sourceType"` + SourceID string `json:"sourceId"` + RoomID *string `json:"roomId"` + BatchID *string `json:"batchId"` + InspectionID *string `json:"inspectionId"` + Disease string `json:"disease"` + RecommendedMethod string `json:"recommendedMethod"` + Method *string `json:"method"` + Priority string `json:"priority"` + Note *string `json:"note"` + } + if err := c.ShouldBindJSON(&body); err != nil { + c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()}) + return + } + if body.Disease == "" { + c.JSON(http.StatusBadRequest, gin.H{"error": "病种不能为空"}) + return + } + if body.Method != nil && !model.ValidDetectionMethod(*body.Method) { + c.JSON(http.StatusBadRequest, gin.H{"error": "method 仅支持 lamp/qpcr/sers/hyperspectral"}) + return + } + for _, id := range []*string{body.RoomID, body.BatchID, body.InspectionID} { + if id != nil && *id != "" && !isUUID(*id) { + c.JSON(http.StatusBadRequest, gin.H{"error": "关联 ID 不是合法的 UUID"}) + return + } + } + sourceKey := body.SourceKey + if sourceKey == "" { + sourceKey = fmt.Sprintf("manual-%d", time.Now().UnixNano()) + } + sourceType := body.SourceType + if sourceType == "" { + sourceType = "manual" + } + priority := body.Priority + if priority == "" { + priority = "routine" + } + task := model.DetectionTask{ + SourceKey: sourceKey, + SourceType: sourceType, + SourceID: body.SourceID, + RoomID: body.RoomID, + BatchID: body.BatchID, + InspectionID: body.InspectionID, + Disease: body.Disease, + RecommendedMethod: body.RecommendedMethod, + Method: body.Method, + Priority: priority, + Status: "pending", + CreatedBy: currentUserID(c), + Note: body.Note, + } + if err := db.Clauses(clause.OnConflict{ + Columns: []clause.Column{{Name: "source_key"}}, + DoNothing: true, + }).Create(&task).Error; err != nil { + c.JSON(http.StatusBadRequest, gin.H{"error": "创建检测任务失败"}) + return + } + if task.ID == "" { + _ = db.Where("source_key = ?", sourceKey).First(&task).Error + } + c.JSON(http.StatusCreated, task) + } +} + +func updateDetectionTask(db *gorm.DB) gin.HandlerFunc { + return func(c *gin.Context) { + var task model.DetectionTask + if db.Where("id = ?", c.Param("id")).First(&task).Error != nil { + c.JSON(http.StatusNotFound, gin.H{"error": "detection task not found"}) + return + } + var body struct { + AssigneeID *string `json:"assigneeId"` + Method *string `json:"method"` + Status *string `json:"status"` + Result *string `json:"result"` + CancelledReason *string `json:"cancelledReason"` + Note *string `json:"note"` + } + if err := c.ShouldBindJSON(&body); err != nil { + c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()}) + return + } + if body.Method != nil && !model.ValidDetectionMethod(*body.Method) { + c.JSON(http.StatusBadRequest, gin.H{"error": "method 仅支持 lamp/qpcr/sers/hyperspectral"}) + return + } + if body.Status != nil && !model.ValidDetectionTaskTransition(task.Status, *body.Status) { + c.JSON(http.StatusBadRequest, gin.H{"error": fmt.Sprintf("检测任务状态不能从 %s 转到 %s", task.Status, *body.Status)}) + return + } + if body.Status != nil && *body.Status == "assigned" && body.AssigneeID == nil && task.AssigneeID == nil { + c.JSON(http.StatusBadRequest, gin.H{"error": "指派状态必须先分配负责人"}) + return + } + if body.Status != nil && *body.Status == "completed" && body.Result == nil && task.Result == nil { + c.JSON(http.StatusBadRequest, gin.H{"error": "完成检测任务前必须录入结果"}) + return + } + if body.Status != nil && *body.Status == "cancelled" && (body.CancelledReason == nil || strings.TrimSpace(*body.CancelledReason) == "") { + c.JSON(http.StatusBadRequest, gin.H{"error": "取消任务必须填写原因"}) + return + } + updates := map[string]interface{}{} + if body.AssigneeID != nil { + updates["assignee_id"] = *body.AssigneeID + updates["assigned_at"] = time.Now() + } + if body.Method != nil { + updates["method"] = *body.Method + } + if body.Note != nil { + updates["note"] = *body.Note + } + if body.Result != nil { + if task.Status != "review" { + c.JSON(http.StatusBadRequest, gin.H{"error": "结果需在复核阶段录入"}) + return + } + updates["result"] = *body.Result + updates["resulted_at"] = time.Now() + } + if body.Status != nil { + updates["status"] = *body.Status + if *body.Status == "cancelled" { + updates["cancelled_reason"] = *body.CancelledReason + } + } + if len(updates) > 0 { + if err := db.Model(&model.DetectionTask{}).Where("id = ?", task.ID).Updates(updates).Error; err != nil { + c.JSON(http.StatusBadRequest, gin.H{"error": "更新检测任务失败"}) + return + } + } + db.Where("id = ?", task.ID).First(&task) + if task.Result != nil && *task.Result == "positive" { + _ = ensureDiseaseEventFromDetectionTask(db, task) + } + fillDetectionTaskRoomNames(db, []model.DetectionTask{task}) + c.JSON(http.StatusOK, task) + } +} + +func listSamples(db *gorm.DB) gin.HandlerFunc { + return func(c *gin.Context) { + var samples []model.Sample + db.Where("detection_task_id = ?", c.Param("id")).Order("created_at ASC").Find(&samples) + c.JSON(http.StatusOK, samples) + } +} + +func createSample(db *gorm.DB) gin.HandlerFunc { + return func(c *gin.Context) { + var task model.DetectionTask + if db.Where("id = ?", c.Param("id")).First(&task).Error != nil { + c.JSON(http.StatusNotFound, gin.H{"error": "detection task not found"}) + return + } + var existing model.Sample + if db.Where("detection_task_id = ?", task.ID).First(&existing).Error == nil { + c.JSON(http.StatusOK, existing) + return + } + var body struct { + SampleNo string `json:"sampleNo"` + RoomID *string `json:"roomId"` + BatchID *string `json:"batchId"` + TrayID *string `json:"trayId"` + Note *string `json:"note"` + } + if err := c.ShouldBindJSON(&body); err != nil { + c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()}) + return + } + sampleNo := body.SampleNo + if sampleNo == "" { + sampleNo = fmt.Sprintf("S-%s", strings.ToUpper(task.ID[:8])) + } + now := time.Now() + sample := model.Sample{ + DetectionTaskID: task.ID, + SampleNo: sampleNo, + RoomID: body.RoomID, + BatchID: body.BatchID, + TrayID: body.TrayID, + SampledBy: currentUserID(c), + SampledAt: &now, + State: "created", + Note: body.Note, + } + if sample.RoomID == nil { + sample.RoomID = task.RoomID + } + if sample.BatchID == nil { + sample.BatchID = task.BatchID + } + if err := db.Create(&sample).Error; err != nil { + c.JSON(http.StatusBadRequest, gin.H{"error": "创建样本失败"}) + return + } + c.JSON(http.StatusCreated, sample) + } +} + +func updateSample(db *gorm.DB) gin.HandlerFunc { + return func(c *gin.Context) { + var sample model.Sample + if db.Where("id = ?", c.Param("id")).First(&sample).Error != nil { + c.JSON(http.StatusNotFound, gin.H{"error": "sample not found"}) + return + } + var body struct { + State *string `json:"state"` + Note *string `json:"note"` + } + if err := c.ShouldBindJSON(&body); err != nil { + c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()}) + return + } + updates := map[string]interface{}{} + if body.Note != nil { + updates["note"] = *body.Note + } + if body.State != nil { + if !model.ValidSampleTransition(sample.State, *body.State) { + c.JSON(http.StatusBadRequest, gin.H{"error": fmt.Sprintf("样本状态不能从 %s 转到 %s", sample.State, *body.State)}) + return + } + updates["state"] = *body.State + now := time.Now() + switch *body.State { + case "collected": + updates["collected_at"] = now + case "handed_over": + updates["handed_over_at"] = now + updates["handed_over_by"] = currentUserID(c) + case "received": + updates["received_at"] = now + updates["received_by"] = currentUserID(c) + case "testing": + updates["testing_started_at"] = now + case "consumed": + updates["consumed_at"] = now + case "disposed": + updates["disposed_at"] = now + } + } + if len(updates) > 0 { + if err := db.Model(&model.Sample{}).Where("id = ?", sample.ID).Updates(updates).Error; err != nil { + c.JSON(http.StatusBadRequest, gin.H{"error": "更新样本失败"}) + return + } + } + db.Where("id = ?", sample.ID).First(&sample) + c.JSON(http.StatusOK, sample) + } +} + +func listDiseaseEvents(db *gorm.DB) gin.HandlerFunc { + return func(c *gin.Context) { + q := db.Model(&model.DiseaseEvent{}) + if status := c.Query("status"); status != "" { + q = q.Where("status = ?", status) + } + if room := c.Query("roomId"); room != "" { + q = q.Where("room_id = ?", room) + } + var list []model.DiseaseEvent + q.Order("created_at DESC").Limit(200).Find(&list) + fillDiseaseEventRoomNames(db, list) + c.JSON(http.StatusOK, list) + } +} + +func createDiseaseEvent(db *gorm.DB) gin.HandlerFunc { + return func(c *gin.Context) { + var body struct { + SourceKey string `json:"sourceKey"` + RoomID *string `json:"roomId"` + BatchID *string `json:"batchId"` + DetectionTaskID *string `json:"detectionTaskId"` + LampTestID *string `json:"lampTestId"` + ConsultationID *string `json:"consultationId"` + InspectionID *string `json:"inspectionId"` + Disease string `json:"disease"` + Status string `json:"status"` + Evidence json.RawMessage `json:"evidence"` + LossSummary *string `json:"lossSummary"` + Measure *string `json:"measure"` + Note *string `json:"note"` + } + if err := c.ShouldBindJSON(&body); err != nil { + c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()}) + return + } + if body.Disease == "" { + c.JSON(http.StatusBadRequest, gin.H{"error": "病种不能为空"}) + return + } + for _, id := range []*string{body.RoomID, body.BatchID, body.DetectionTaskID, body.LampTestID, body.ConsultationID, body.InspectionID} { + if id != nil && *id != "" && !isUUID(*id) { + c.JSON(http.StatusBadRequest, gin.H{"error": "关联 ID 不是合法的 UUID"}) + return + } + } + if body.Status == "" { + body.Status = "suspected" + } + event := model.DiseaseEvent{ + SourceKey: body.SourceKey, + RoomID: body.RoomID, + BatchID: body.BatchID, + DetectionTaskID: body.DetectionTaskID, + LampTestID: body.LampTestID, + ConsultationID: body.ConsultationID, + InspectionID: body.InspectionID, + Disease: body.Disease, + Status: body.Status, + Evidence: body.Evidence, + LossSummary: body.LossSummary, + Measure: body.Measure, + Note: body.Note, + } + if event.SourceKey == "" { + event.SourceKey = fmt.Sprintf("manual-%d", time.Now().UnixNano()) + } + if err := model.ValidateDiseaseEventEvidence(event); err != nil { + c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()}) + return + } + if event.Status == "confirmed" { + now := time.Now() + event.ConfirmedAt = &now + event.ConfirmedBy = currentUserID(c) + } + if err := db.Clauses(clause.OnConflict{ + Columns: []clause.Column{{Name: "source_key"}}, + DoNothing: true, + }).Create(&event).Error; err != nil { + c.JSON(http.StatusBadRequest, gin.H{"error": "创建发病事件失败"}) + return + } + if event.ID == "" { + _ = db.Where("source_key = ?", event.SourceKey).First(&event).Error + } + if event.Status == "confirmed" { + _ = ensureTraceForDiseaseEvent(db, event) + } + c.JSON(http.StatusCreated, event) + } +} + +func updateDiseaseEvent(db *gorm.DB) gin.HandlerFunc { + return func(c *gin.Context) { + var event model.DiseaseEvent + if db.Where("id = ?", c.Param("id")).First(&event).Error != nil { + c.JSON(http.StatusNotFound, gin.H{"error": "disease event not found"}) + return + } + var body struct { + Status *string `json:"status"` + Evidence json.RawMessage `json:"evidence"` + LossSummary *string `json:"lossSummary"` + Measure *string `json:"measure"` + Note *string `json:"note"` + } + if err := c.ShouldBindJSON(&body); err != nil { + c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()}) + return + } + updates := map[string]interface{}{} + if body.Status != nil { + if !model.ValidDiseaseEventTransition(event.Status, *body.Status) { + c.JSON(http.StatusBadRequest, gin.H{"error": fmt.Sprintf("发病事件状态不能从 %s 转到 %s", event.Status, *body.Status)}) + return + } + updates["status"] = *body.Status + if *body.Status == "confirmed" { + if len(body.Evidence) == 0 && len(event.Evidence) == 0 { + c.JSON(http.StatusBadRequest, gin.H{"error": "确诊发病事件必须提供证据"}) + return + } + now := time.Now() + updates["confirmed_at"] = now + updates["confirmed_by"] = currentUserID(c) + } + } + if len(body.Evidence) > 0 { + updates["evidence"] = body.Evidence + } + if body.LossSummary != nil { + updates["loss_summary"] = *body.LossSummary + } + if body.Measure != nil { + updates["measure"] = *body.Measure + } + if body.Note != nil { + updates["note"] = *body.Note + } + if len(updates) > 0 { + if err := db.Model(&model.DiseaseEvent{}).Where("id = ?", event.ID).Updates(updates).Error; err != nil { + c.JSON(http.StatusBadRequest, gin.H{"error": "更新发病事件失败"}) + return + } + } + db.Where("id = ?", event.ID).First(&event) + if event.Status == "confirmed" { + _ = ensureTraceForDiseaseEvent(db, event) + } + c.JSON(http.StatusOK, event) + } +} + +func fillDetectionTaskRoomNames(db *gorm.DB, list []model.DetectionTask) { + var rooms []model.Room + db.Select("id", "name").Find(&rooms) + names := make(map[string]string, len(rooms)) + for _, r := range rooms { + names[r.ID] = r.Name + } + for i := range list { + if list[i].RoomID != nil { + if name, ok := names[*list[i].RoomID]; ok { + list[i].RoomName = &name + } + } + } +} + +func fillDiseaseEventRoomNames(db *gorm.DB, list []model.DiseaseEvent) { + var rooms []model.Room + db.Select("id", "name").Find(&rooms) + names := make(map[string]string, len(rooms)) + for _, r := range rooms { + names[r.ID] = r.Name + } + for i := range list { + if list[i].RoomID != nil { + if name, ok := names[*list[i].RoomID]; ok { + list[i].RoomName = &name + } + } + } +} + +// ensureTraceForDiseaseEvent 确诊后自动创建关联溯源记录，重复调用不重复创建。 +func ensureTraceForDiseaseEvent(db *gorm.DB, event model.DiseaseEvent) error { + if event.Status != "confirmed" { + return nil + } + var count int64 + if err := db.Model(&model.TraceRecord{}).Where("disease_event_id = ?", event.ID).Count(&count).Error; err != nil { + return err + } + if count > 0 { + return nil + } + trace := model.TraceRecord{ + DiseaseEventID: &event.ID, + RoomID: event.RoomID, + LampTestID: event.LampTestID, + Disease: event.Disease, + Status: "pending", + } + return db.Create(&trace).Error +} + +func ensureDiseaseEventFromDetectionTask(db *gorm.DB, task model.DetectionTask) error { + if task.Result == nil || *task.Result != "positive" { + return nil + } + now := time.Now() + evidence, _ := json.Marshal(map[string]interface{}{ + "result": *task.Result, + "method": task.Method, + "detectionTaskId": task.ID, + "resultedAt": task.ResultedAt, + }) + sourceKey := "detection-task-" + task.ID + event := model.DiseaseEvent{ + SourceKey: sourceKey, + RoomID: task.RoomID, + BatchID: task.BatchID, + DetectionTaskID: &task.ID, + InspectionID: task.InspectionID, + Disease: task.Disease, + Status: "confirmed", + Evidence: evidence, + ConfirmedAt: &now, + ConfirmedBy: task.AssigneeID, + } + if err := db.Clauses(clause.OnConflict{ + Columns: []clause.Column{{Name: "source_key"}}, + DoNothing: true, + }).Create(&event).Error; err != nil { + return err + } + if event.ID == "" { + _ = db.Where("source_key = ?", sourceKey).First(&event).Error + } + return ensureTraceForDiseaseEvent(db, event) +} diff --git a/server-go/internal/handler/inspection.go b/server-go/internal/handler/inspection.go index 99d34e0..c08fa8f 100644 --- a/server-go/internal/handler/inspection.go +++ b/server-go/internal/handler/inspection.go @@ -183,7 +183,38 @@ func createInspection(db *gorm.DB, s3 *service.S3Service, ai *service.AIClient, AggregateID: rec.ID, Payload: payload, } - return outbox.PublishTx(tx, event) + if err := outbox.PublishTx(tx, event); err != nil { + return err + } + } + } + if rec.IsMock != nil && !*rec.IsMock && (*rec.RiskLevel == "orange" || *rec.RiskLevel == "red") { + priority := "routine" + if *rec.RiskLevel == "red" { + priority = "urgent" + } + roomID := "" + if rec.RoomID != nil { + roomID = *rec.RoomID + } + payload, _ := json.Marshal(service.DetectionTaskCreatePayload{ + SourceKey: "inspection-" + rec.ID, + SourceType: "inspection", + SourceID: rec.ID, + RoomID: roomID, + InspectionID: rec.ID, + Disease: "待确认", + Priority: priority, + }) + event := service.Event{ + ID: "detection-task-" + rec.ID, + Type: service.OutboxEventDetectionTaskCreate, + AggregateType: "inspection", + AggregateID: rec.ID, + Payload: payload, + } + if err := outbox.PublishTx(tx, event); err != nil { + return err } } return nil diff --git a/server-go/internal/handler/lamp.go b/server-go/internal/handler/lamp.go index 4d82f91..732a555 100644 --- a/server-go/internal/handler/lamp.go +++ b/server-go/internal/handler/lamp.go @@ -14,6 +14,7 @@ import ( "github.com/gin-gonic/gin" "gorm.io/gorm" + "gorm.io/gorm/clause" ) // RegisterLampRoutes 注册 LAMP 检测路由 @@ -79,6 +80,10 @@ func createLampTest(db *gorm.DB) gin.HandlerFunc { c.JSON(http.StatusBadRequest, gin.H{"error": "batchId 不是合法的 UUID"}) return } + if t.DetectionTaskID != nil && !isUUID(*t.DetectionTaskID) { + c.JSON(http.StatusBadRequest, gin.H{"error": "detectionTaskId 不是合法的 UUID"}) + return + } if t.Status == "" { t.Status = "pending" } @@ -127,6 +132,8 @@ func judgeQPCR(db *gorm.DB) gin.HandlerFunc { db.Model(&model.LampTest{}).Where("id = ?", id).Updates(map[string]interface{}{ "extra_data": raw, "result": result, "status": "resulted", "resulted_at": now, }) + _ = syncDetectionTaskFromLamp(db, id) + _ = ensureDiseaseEventForLamp(db, id) _ = runCrossValidation(db, id, result) db.Where("id = ?", id).First(&t) c.JSON(http.StatusOK, t) @@ -312,12 +319,81 @@ func updateLampTest(db *gorm.DB) gin.HandlerFunc { // 交叉验证：结果落库后与同房间最近巡检比对 if resultSet && resultValue != "" { _ = runCrossValidation(db, id, resultValue) + _ = syncDetectionTaskFromLamp(db, id) + _ = ensureDiseaseEventForLamp(db, id) } db.Where("id = ?", id).First(&t) c.JSON(http.StatusOK, t) } } +// syncDetectionTaskFromLamp LAMP 结果同步到统一检测任务。 +func syncDetectionTaskFromLamp(db *gorm.DB, lampID string) error { + var t model.LampTest + if err := db.Where("id = ?", lampID).First(&t).Error; err != nil { + return err + } + if t.DetectionTaskID == nil || t.Result == nil { + return nil + } + return db.Model(&model.DetectionTask{}).Where("id = ?", *t.DetectionTaskID). + Updates(map[string]interface{}{ + "result": *t.Result, + "status": "completed", + "resulted_at": t.ResultedAt, + }).Error +} + +// ensureDiseaseEventForLamp 有效阳性结果创建发病事件，重复结果不重复建单。 +func ensureDiseaseEventForLamp(db *gorm.DB, lampID string) error { + var t model.LampTest + if err := db.Where("id = ?", lampID).First(&t).Error; err != nil { + return err + } + if t.Result == nil || *t.Result != "positive" { + return nil + } + disease := "待确认" + var diseases []string + if len(t.Diseases) > 0 { + _ = json.Unmarshal(t.Diseases, &diseases) + if len(diseases) > 0 { + disease = diseases[0] + } + } + now := time.Now() + evidence, _ := json.Marshal(map[string]interface{}{ + "result": *t.Result, + "method": t.Method, + "resultedAt": t.ResultedAt, + "lampTestId": t.ID, + "operatorId": t.OperatorID, + }) + sourceKey := "lamp-" + t.ID + event := model.DiseaseEvent{ + SourceKey: sourceKey, + RoomID: t.RoomID, + BatchID: t.BatchID, + DetectionTaskID: t.DetectionTaskID, + LampTestID: &t.ID, + Disease: disease, + Status: "confirmed", + Evidence: evidence, + ConfirmedAt: &now, + ConfirmedBy: t.OperatorID, + } + if err := db.Clauses(clause.OnConflict{ + Columns: []clause.Column{{Name: "source_key"}}, + DoNothing: true, + }).Create(&event).Error; err != nil { + return err + } + if event.ID == "" { + _ = db.Where("source_key = ?", sourceKey).First(&event).Error + } + return ensureTraceForDiseaseEvent(db, event) +} + // runCrossValidation 用同房间最近的巡检记录做交叉验证，并回写 cross_status/cross_reason func runCrossValidation(db *gorm.DB, lampTestID, lampResult string) error { var t model.LampTest @@ -376,8 +452,8 @@ func getLampCrossValidation(db *gorm.DB) gin.HandlerFunc { } } c.JSON(http.StatusOK, gin.H{ - "crossStatus": t.CrossStatus, - "crossReason": t.CrossReason, + "crossStatus": t.CrossStatus, + "crossReason": t.CrossReason, "relatedInspection": related, }) } diff --git a/server-go/internal/handler/trace.go b/server-go/internal/handler/trace.go index ae51d32..7633b65 100644 --- a/server-go/internal/handler/trace.go +++ b/server-go/internal/handler/trace.go @@ -130,6 +130,7 @@ func createTraceRecord(db *gorm.DB) gin.HandlerFunc { return func(c *gin.Context) { var body struct { RoomID *string `json:"roomId"` + DiseaseEventID *string `json:"diseaseEventId"` LampTestID *string `json:"lampTestId"` ConsultationID *string `json:"consultationId"` Disease string `json:"disease"` @@ -138,7 +139,7 @@ func createTraceRecord(db *gorm.DB) gin.HandlerFunc { c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()}) return } - for _, id := range []*string{body.RoomID, body.LampTestID, body.ConsultationID} { + for _, id := range []*string{body.RoomID, body.DiseaseEventID, body.LampTestID, body.ConsultationID} { if id != nil && *id != "" && !isUUID(*id) { c.JSON(http.StatusBadRequest, gin.H{"error": "关联 ID 不是合法的 UUID"}) return @@ -149,7 +150,8 @@ func createTraceRecord(db *gorm.DB) gin.HandlerFunc { return } rec := model.TraceRecord{ - RoomID: body.RoomID, LampTestID: body.LampTestID, + RoomID: body.RoomID, DiseaseEventID: body.DiseaseEventID, + LampTestID: body.LampTestID, ConsultationID: body.ConsultationID, Disease: body.Disease, Status: "pending", } if err := db.Create(&rec).Error; err != nil { @@ -204,7 +206,7 @@ func autoTrace(db *gorm.DB) gin.HandlerFunc { return } report := map[string]interface{}{ - "disease": t.Disease, + "disease": t.Disease, "generatedAt": time.Now(), } origin := "unknown" diff --git a/server-go/internal/model/detection_task.go b/server-go/internal/model/detection_task.go new file mode 100644 index 0000000..3bd82e5 --- /dev/null +++ b/server-go/internal/model/detection_task.go @@ -0,0 +1,97 @@ +package model + +import "time" + +// DetectionTask 统一检测任务，覆盖 LAMP/qPCR/SERS/高光谱。 +type DetectionTask struct { + ID string `gorm:"type:uuid;primaryKey;default:gen_random_uuid()" json:"id"` + SourceKey string `gorm:"column:source_key;size:128;uniqueIndex" json:"sourceKey,omitempty"` + SourceType string `gorm:"column:source_type;size:32" json:"sourceType"` + SourceID string `gorm:"column:source_id;size:128" json:"sourceId,omitempty"` + RoomID *string `gorm:"column:room_id;type:uuid;index" json:"roomId,omitempty"` + BatchID *string `gorm:"column:batch_id;type:uuid;index" json:"batchId,omitempty"` + InspectionID *string `gorm:"column:inspection_id;type:uuid;index" json:"inspectionId,omitempty"` + Disease string `gorm:"size:64" json:"disease"` + RecommendedMethod string `gorm:"column:recommended_method;size:32" json:"recommendedMethod,omitempty"` + Method *string `gorm:"size:32" json:"method,omitempty"` + Priority string `gorm:"size:16;default:routine" json:"priority"` + Status string `gorm:"size:16;default:pending;index" json:"status"` + AssigneeID *string `gorm:"column:assignee_id;type:uuid" json:"assigneeId,omitempty"` + AssignedAt *time.Time `gorm:"column:assigned_at;type:timestamptz" json:"assignedAt,omitempty"` + Result *string `gorm:"size:16" json:"result,omitempty"` + ResultedAt *time.Time `gorm:"column:resulted_at;type:timestamptz" json:"resultedAt,omitempty"` + CancelledReason *string `gorm:"column:cancelled_reason;type:text" json:"cancelledReason,omitempty"` + CreatedBy *string `gorm:"column:created_by;type:uuid" json:"createdBy,omitempty"` + Note *string `gorm:"type:text" json:"note,omitempty"` + CreatedAt time.Time `gorm:"type:timestamptz" json:"createdAt"` + UpdatedAt time.Time `gorm:"type:timestamptz" json:"updatedAt"` + RoomName *string `gorm:"-" json:"roomName,omitempty"` +} + +func (DetectionTask) TableName() string { return "detection_tasks" } + +// ValidDetectionTaskTransition 状态机：draft/pending/assigned/sampling/testing/review/completed/cancelled。 +func ValidDetectionTaskTransition(from, to string) bool { + switch from { + case "draft": + return to == "pending" || to == "cancelled" + case "pending": + return to == "assigned" || to == "cancelled" + case "assigned": + return to == "sampling" || to == "cancelled" + case "sampling": + return to == "testing" || to == "cancelled" + case "testing": + return to == "review" || to == "cancelled" + case "review": + return to == "completed" || to == "cancelled" + default: + return false + } +} + +// Sample 检测样本链路。 +type Sample struct { + ID string `gorm:"type:uuid;primaryKey;default:gen_random_uuid()" json:"id"` + DetectionTaskID string `gorm:"column:detection_task_id;type:uuid;uniqueIndex" json:"detectionTaskId"` + SampleNo string `gorm:"column:sample_no;size:64;uniqueIndex" json:"sampleNo"` + RoomID *string `gorm:"column:room_id;type:uuid;index" json:"roomId,omitempty"` + BatchID *string `gorm:"column:batch_id;type:uuid;index" json:"batchId,omitempty"` + TrayID *string `gorm:"column:tray_id;type:uuid" json:"trayId,omitempty"` + SampledBy *string `gorm:"column:sampled_by;type:uuid" json:"sampledBy,omitempty"` + SampledAt *time.Time `gorm:"column:sampled_at;type:timestamptz" json:"sampledAt,omitempty"` + CollectedAt *time.Time `gorm:"column:collected_at;type:timestamptz" json:"collectedAt,omitempty"` + HandedOverAt *time.Time `gorm:"column:handed_over_at;type:timestamptz" json:"handedOverAt,omitempty"` + HandedOverBy *string `gorm:"column:handed_over_by;type:uuid" json:"handedOverBy,omitempty"` + ReceivedAt *time.Time `gorm:"column:received_at;type:timestamptz" json:"receivedAt,omitempty"` + ReceivedBy *string `gorm:"column:received_by;type:uuid" json:"receivedBy,omitempty"` + TestingStartedAt *time.Time `gorm:"column:testing_started_at;type:timestamptz" json:"testingStartedAt,omitempty"` + ConsumedAt *time.Time `gorm:"column:consumed_at;type:timestamptz" json:"consumedAt,omitempty"` + DisposedAt *time.Time `gorm:"column:disposed_at;type:timestamptz" json:"disposedAt,omitempty"` + State string `gorm:"size:16;default:created" json:"state"` + Note *string `gorm:"type:text" json:"note,omitempty"` + CreatedAt time.Time `gorm:"type:timestamptz" json:"createdAt"` + UpdatedAt time.Time `gorm:"type:timestamptz" json:"updatedAt"` +} + +func (Sample) TableName() string { return "samples" } + +// ValidSampleTransition 样本状态机：created/collected/handed_over/received/testing/consumed/disposed。 +func ValidSampleTransition(from, to string) bool { + switch from { + case "created": + return to == "collected" || to == "disposed" + case "collected": + return to == "handed_over" || to == "disposed" + case "handed_over": + return to == "received" || to == "disposed" + case "received": + return to == "testing" || to == "disposed" + case "testing": + return to == "consumed" || to == "disposed" + case "consumed": + return to == "disposed" + default: + return false + } +} diff --git a/server-go/internal/model/detection_task_test.go b/server-go/internal/model/detection_task_test.go new file mode 100644 index 0000000..a0d97b6 --- /dev/null +++ b/server-go/internal/model/detection_task_test.go @@ -0,0 +1,51 @@ +package model + +import "testing" + +func TestDetectionTaskRejectsInvalidTransition(t *testing.T) { + if ValidDetectionTaskTransition("pending", "testing") { + t.Error("pending 不能直接跳 testing") + } + if ValidDetectionTaskTransition("draft", "completed") { + t.Error("draft 不能直接 completed") + } + if ValidDetectionTaskTransition("completed", "review") { + t.Error("completed 不能回退") + } +} + +func TestDetectionTaskAllowsRequiredTransitions(t *testing.T) { + transitions := [][2]string{ + {"draft", "pending"}, + {"pending", "assigned"}, + {"assigned", "sampling"}, + {"sampling", "testing"}, + {"testing", "review"}, + {"review", "completed"}, + {"pending", "cancelled"}, + } + for _, tr := range transitions { + if !ValidDetectionTaskTransition(tr[0], tr[1]) { + t.Errorf("expected %s -> %s", tr[0], tr[1]) + } + } +} + +func TestSampleTransition(t *testing.T) { + transitions := [][2]string{ + {"created", "collected"}, + {"collected", "handed_over"}, + {"handed_over", "received"}, + {"received", "testing"}, + {"testing", "consumed"}, + {"consumed", "disposed"}, + } + for _, tr := range transitions { + if !ValidSampleTransition(tr[0], tr[1]) { + t.Errorf("expected %s -> %s", tr[0], tr[1]) + } + } + if ValidSampleTransition("created", "testing") { + t.Error("created 不能直接 testing") + } +} diff --git a/server-go/internal/model/disease_event.go b/server-go/internal/model/disease_event.go new file mode 100644 index 0000000..cc489e0 --- /dev/null +++ b/server-go/internal/model/disease_event.go @@ -0,0 +1,58 @@ +package model + +import ( + "encoding/json" + "errors" + "time" +) + +// DiseaseEvent 独立发病事件，作为处置、会诊、溯源和效果评估主线。 +type DiseaseEvent struct { + ID string `gorm:"type:uuid;primaryKey;default:gen_random_uuid()" json:"id"` + SourceKey string `gorm:"column:source_key;size:128;uniqueIndex" json:"sourceKey,omitempty"` + RoomID *string `gorm:"column:room_id;type:uuid;index" json:"roomId,omitempty"` + BatchID *string `gorm:"column:batch_id;type:uuid;index" json:"batchId,omitempty"` + DetectionTaskID *string `gorm:"column:detection_task_id;type:uuid;index" json:"detectionTaskId,omitempty"` + LampTestID *string `gorm:"column:lamp_test_id;type:uuid;index" json:"lampTestId,omitempty"` + ConsultationID *string `gorm:"column:consultation_id;type:uuid;index" json:"consultationId,omitempty"` + InspectionID *string `gorm:"column:inspection_id;type:uuid;index" json:"inspectionId,omitempty"` + Disease string `gorm:"size:64" json:"disease"` + Status string `gorm:"size:16;default:suspected;index" json:"status"` + Evidence json.RawMessage `gorm:"type:jsonb" json:"evidence,omitempty"` + ConfirmedAt *time.Time `gorm:"column:confirmed_at;type:timestamptz" json:"confirmedAt,omitempty"` + ConfirmedBy *string `gorm:"column:confirmed_by;type:uuid" json:"confirmedBy,omitempty"` + LossSummary *string `gorm:"column:loss_summary;type:text" json:"lossSummary,omitempty"` + Measure *string `gorm:"type:text" json:"measure,omitempty"` + Note *string `gorm:"type:text" json:"note,omitempty"` + CreatedAt time.Time `gorm:"type:timestamptz" json:"createdAt"` + UpdatedAt time.Time `gorm:"type:timestamptz" json:"updatedAt"` + RoomName *string `gorm:"-" json:"roomName,omitempty"` +} + +func (DiseaseEvent) TableName() string { return "disease_events" } + +// ValidDiseaseEventTransition 状态机：suspected/confirmed/controlled/closed/reopened。 +func ValidDiseaseEventTransition(from, to string) bool { + switch from { + case "suspected": + return to == "confirmed" || to == "closed" + case "confirmed": + return to == "controlled" || to == "closed" + case "controlled": + return to == "closed" || to == "reopened" + case "closed": + return to == "reopened" + case "reopened": + return to == "confirmed" || to == "controlled" || to == "closed" + default: + return false + } +} + +// ValidateDiseaseEventEvidence 确诊必须有证据，不能仅凭状态字段确认。 +func ValidateDiseaseEventEvidence(event DiseaseEvent) error { + if event.Status == "confirmed" && len(event.Evidence) == 0 { + return errors.New("确诊发病事件必须提供证据") + } + return nil +} diff --git a/server-go/internal/model/disease_event_test.go b/server-go/internal/model/disease_event_test.go new file mode 100644 index 0000000..a8cbd0f --- /dev/null +++ b/server-go/internal/model/disease_event_test.go @@ -0,0 +1,35 @@ +package model + +import ( + "encoding/json" + "testing" +) + +func TestDiseaseEventRequiresEvidenceToConfirm(t *testing.T) { + event := DiseaseEvent{Status: "confirmed"} + if err := ValidateDiseaseEventEvidence(event); err == nil { + t.Fatal("confirmed 无证据应返回错误") + } + event.Evidence = json.RawMessage(`{"result":"positive"}`) + if err := ValidateDiseaseEventEvidence(event); err != nil { + t.Fatalf("confirmed 有证据应通过: %v", err) + } +} + +func TestDiseaseEventTransition(t *testing.T) { + transitions := [][2]string{ + {"suspected", "confirmed"}, + {"confirmed", "controlled"}, + {"controlled", "closed"}, + {"closed", "reopened"}, + {"reopened", "confirmed"}, + } + for _, tr := range transitions { + if !ValidDiseaseEventTransition(tr[0], tr[1]) { + t.Errorf("expected %s -> %s", tr[0], tr[1]) + } + } + if ValidDiseaseEventTransition("suspected", "controlled") { + t.Error("suspected 不能直接 controlled") + } +} diff --git a/server-go/internal/model/lamp.go b/server-go/internal/model/lamp.go index d4c05a5..5292eb0 100644 --- a/server-go/internal/model/lamp.go +++ b/server-go/internal/model/lamp.go @@ -7,23 +7,24 @@ import ( // LampTest LAMP 检测任务单 type LampTest struct { - ID string `gorm:"type:uuid;primaryKey;default:gen_random_uuid()" json:"id"` - Method string `gorm:"size:32;default:lamp" json:"method"` // lamp/qpcr/sers/hyperspectral - RoomID *string `gorm:"column:room_id;type:uuid;index" json:"roomId,omitempty"` - BatchID *string `gorm:"column:batch_id;type:uuid;index" json:"batchId,omitempty"` - Diseases json.RawMessage `gorm:"type:jsonb" json:"diseases,omitempty"` - Status string `gorm:"size:16;default:pending" json:"status"` // pending/testing/resulted - SampleInfo *string `gorm:"column:sample_info;size:255" json:"sampleInfo,omitempty"` - Result *string `gorm:"size:16" json:"result,omitempty"` // positive/negative/invalid - ResultImageURL *string `gorm:"column:result_image_url;size:512" json:"resultImageUrl,omitempty"` - OperatorID *string `gorm:"column:operator_id;type:uuid" json:"operatorId,omitempty"` - ResultedAt *time.Time `gorm:"column:resulted_at;type:timestamptz" json:"resultedAt,omitempty"` - CrossStatus string `gorm:"column:cross_status;size:16;default:pending" json:"crossStatus"` // pending/consistent/inconsistent - CrossReason *string `gorm:"column:cross_reason;type:text" json:"crossReason,omitempty"` - ExtraData json.RawMessage `gorm:"column:extra_data;type:jsonb" json:"extraData,omitempty"` - Note *string `gorm:"type:text" json:"note,omitempty"` - CreatedAt time.Time `gorm:"type:timestamptz" json:"createdAt"` - UpdatedAt time.Time `gorm:"type:timestamptz" json:"updatedAt"` + ID string `gorm:"type:uuid;primaryKey;default:gen_random_uuid()" json:"id"` + Method string `gorm:"size:32;default:lamp" json:"method"` // lamp/qpcr/sers/hyperspectral + DetectionTaskID *string `gorm:"column:detection_task_id;type:uuid;index" json:"detectionTaskId,omitempty"` + RoomID *string `gorm:"column:room_id;type:uuid;index" json:"roomId,omitempty"` + BatchID *string `gorm:"column:batch_id;type:uuid;index" json:"batchId,omitempty"` + Diseases json.RawMessage `gorm:"type:jsonb" json:"diseases,omitempty"` + Status string `gorm:"size:16;default:pending" json:"status"` // pending/testing/resulted + SampleInfo *string `gorm:"column:sample_info;size:255" json:"sampleInfo,omitempty"` + Result *string `gorm:"size:16" json:"result,omitempty"` // positive/negative/invalid + ResultImageURL *string `gorm:"column:result_image_url;size:512" json:"resultImageUrl,omitempty"` + OperatorID *string `gorm:"column:operator_id;type:uuid" json:"operatorId,omitempty"` + ResultedAt *time.Time `gorm:"column:resulted_at;type:timestamptz" json:"resultedAt,omitempty"` + CrossStatus string `gorm:"column:cross_status;size:16;default:pending" json:"crossStatus"` // pending/consistent/inconsistent + CrossReason *string `gorm:"column:cross_reason;type:text" json:"crossReason,omitempty"` + ExtraData json.RawMessage `gorm:"column:extra_data;type:jsonb" json:"extraData,omitempty"` + Note *string `gorm:"type:text" json:"note,omitempty"` + CreatedAt time.Time `gorm:"type:timestamptz" json:"createdAt"` + UpdatedAt time.Time `gorm:"type:timestamptz" json:"updatedAt"` } func (LampTest) TableName() string { return "lamp_tests" } diff --git a/server-go/internal/model/trace_record.go b/server-go/internal/model/trace_record.go index 6f6c7f6..f1e0444 100644 --- a/server-go/internal/model/trace_record.go +++ b/server-go/internal/model/trace_record.go @@ -9,17 +9,18 @@ import ( type TraceRecord struct { ID string `gorm:"type:uuid;primaryKey;default:gen_random_uuid()" json:"id"` RoomID *string `gorm:"column:room_id;type:uuid;index" json:"roomId,omitempty"` + DiseaseEventID *string `gorm:"column:disease_event_id;type:uuid;index" json:"diseaseEventId,omitempty"` LampTestID *string `gorm:"column:lamp_test_id;type:uuid;index" json:"lampTestId,omitempty"` ConsultationID *string `gorm:"column:consultation_id;type:uuid;index" json:"consultationId,omitempty"` Disease string `gorm:"size:64" json:"disease"` Status string `gorm:"size:16;default:pending" json:"status"` // pending/reported/analysis/archived Origin *string `gorm:"size:32" json:"origin,omitempty"` // internal/external/unknown Confidence *float64 `gorm:"type:float" json:"confidence,omitempty"` - AutoReport json.RawMessage `gorm:"column:auto_report;type:jsonb" json:"autoReport,omitempty"` // 一级初报 - Checklist json.RawMessage `gorm:"type:jsonb" json:"checklist,omitempty"` // 二级排查清单 + AutoReport json.RawMessage `gorm:"column:auto_report;type:jsonb" json:"autoReport,omitempty"` // 一级初报 + Checklist json.RawMessage `gorm:"type:jsonb" json:"checklist,omitempty"` // 二级排查清单 AnalysisReport json.RawMessage `gorm:"column:analysis_report;type:jsonb" json:"analysisReport,omitempty"` // 二级报告 - ExpertNote *string `gorm:"column:expert_note;type:text" json:"expertNote,omitempty"` // 三级-专家 - LabNote *string `gorm:"column:lab_note;type:text" json:"labNote,omitempty"` // 三级-实验室 + ExpertNote *string `gorm:"column:expert_note;type:text" json:"expertNote,omitempty"` // 三级-专家 + LabNote *string `gorm:"column:lab_note;type:text" json:"labNote,omitempty"` // 三级-实验室 CreatedAt time.Time `gorm:"type:timestamptz" json:"createdAt"` UpdatedAt time.Time `gorm:"type:timestamptz" json:"updatedAt"` RoomName *string `gorm:"-" json:"roomName,omitempty"` diff --git a/server-go/internal/service/detection_task_outbox.go b/server-go/internal/service/detection_task_outbox.go new file mode 100644 index 0000000..3e87e03 --- /dev/null +++ b/server-go/internal/service/detection_task_outbox.go @@ -0,0 +1,82 @@ +package service + +import ( + "context" + "encoding/json" + "errors" + + "silk-server-go/internal/model" + + "gorm.io/gorm" + "gorm.io/gorm/clause" +) + +// DetectionTaskCreatePayload 创建待确认检测任务的 outbox 载荷。 +type DetectionTaskCreatePayload struct { + SourceKey string `json:"sourceKey"` + SourceType string `json:"sourceType"` + SourceID string `json:"sourceId"` + RoomID string `json:"roomId"` + BatchID string `json:"batchId"` + InspectionID string `json:"inspectionId"` + Disease string `json:"disease"` + Priority string `json:"priority"` +} + +// NewDetectionTaskOutboxHandler 创建检测任务事件处理器。 +func NewDetectionTaskOutboxHandler(db *gorm.DB) EventHandler { + return func(ctx context.Context, event model.OutboxEvent) error { + if event.EventType != OutboxEventDetectionTaskCreate { + return nil + } + var payload DetectionTaskCreatePayload + if err := json.Unmarshal(event.Payload, &payload); err != nil { + return err + } + if payload.SourceKey == "" { + return errors.New("detection task sourceKey is required") + } + disease := payload.Disease + if disease == "" { + disease = "待确认" + } + priority := payload.Priority + if priority == "" { + priority = "routine" + } + task := model.DetectionTask{ + SourceKey: payload.SourceKey, + SourceType: payload.SourceType, + SourceID: payload.SourceID, + RoomID: strPtrOrNil(payload.RoomID), + BatchID: strPtrOrNil(payload.BatchID), + InspectionID: strPtrOrNil(payload.InspectionID), + Disease: disease, + Priority: priority, + Status: "pending", + } + return db.WithContext(ctx). + Session(&gorm.Session{SkipDefaultTransaction: true}). + Clauses(clause.OnConflict{ + Columns: []clause.Column{{Name: "source_key"}}, + DoNothing: true, + }). + Create(&task).Error + } +} + +// NewOutboxHandler 分发当前已支持的业务事件。 +func NewOutboxHandler(db *gorm.DB, wechat *WechatService) EventHandler { + wechatHandler := NewWechatOutboxHandler(db, wechat) + detectionHandler := NewDetectionTaskOutboxHandler(db) + return func(ctx context.Context, event model.OutboxEvent) error { + switch event.EventType { + case OutboxEventWechatSubscribe: + return wechatHandler(ctx, event) + case OutboxEventDetectionTaskCreate: + return detectionHandler(ctx, event) + default: + return nil + } + } +} diff --git a/server-go/internal/service/detection_task_outbox_test.go b/server-go/internal/service/detection_task_outbox_test.go new file mode 100644 index 0000000..d3a8dc0 --- /dev/null +++ b/server-go/internal/service/detection_task_outbox_test.go @@ -0,0 +1,44 @@ +package service + +import ( + "context" + "database/sql/driver" + "encoding/json" + "testing" + + "github.com/DATA-DOG/go-sqlmock" + + "silk-server-go/internal/model" +) + +func TestDetectionTaskCreateOutboxIsIdempotent(t *testing.T) { + o, mock := newOutboxMock(t) + handler := NewDetectionTaskOutboxHandler(o.db) + payload, _ := json.Marshal(DetectionTaskCreatePayload{ + SourceKey: "inspection-inspection-1", + SourceType: "inspection", + SourceID: "inspection-1", + InspectionID: "inspection-1", + Disease: "待确认", + }) + event := model.OutboxEvent{ + EventType: OutboxEventDetectionTaskCreate, + Payload: payload, + } + args := make([]driver.Value, 0, 20) + for i := 0; i < 20; i++ { + args = append(args, sqlmock.AnyArg()) + } + mock.ExpectQuery(`INSERT INTO "detection_tasks".*ON CONFLICT \("source_key"\) DO NOTHING`). + WithArgs(args...). + WillReturnRows(sqlmock.NewRows([]string{"id"}).AddRow("task-1")) + if err := handler(context.Background(), event); err != nil { + t.Fatalf("first create failed: %v", err) + } + mock.ExpectQuery(`INSERT INTO "detection_tasks".*ON CONFLICT \("source_key"\) DO NOTHING`). + WithArgs(args...). + WillReturnRows(sqlmock.NewRows([]string{"id"})) + if err := handler(context.Background(), event); err != nil { + t.Fatalf("duplicate create failed: %v", err) + } +} diff --git a/server-go/internal/service/outbox.go b/server-go/internal/service/outbox.go index f70770c..3bc5e13 100644 --- a/server-go/internal/service/outbox.go +++ b/server-go/internal/service/outbox.go @@ -23,7 +23,8 @@ const ( OutboxStatusFailed = "failed" OutboxStatusCancelled = "cancelled" - OutboxEventWechatSubscribe = "wechat.subscribe" + OutboxEventWechatSubscribe = "wechat.subscribe" + OutboxEventDetectionTaskCreate = "detection.task.create" ) // Event 写入 outbox 的领域事件。 diff --git a/server-go/migrations/000005_detection_disease_events.down.sql b/server-go/migrations/000005_detection_disease_events.down.sql new file mode 100644 index 0000000..8946db5 --- /dev/null +++ b/server-go/migrations/000005_detection_disease_events.down.sql @@ -0,0 +1,5 @@ +ALTER TABLE lamp_tests DROP COLUMN IF EXISTS detection_task_id; +ALTER TABLE trace_records DROP COLUMN IF EXISTS disease_event_id; +DROP TABLE IF EXISTS disease_events CASCADE; +DROP TABLE IF EXISTS samples CASCADE; +DROP TABLE IF EXISTS detection_tasks CASCADE; diff --git a/server-go/migrations/000005_detection_disease_events.up.sql b/server-go/migrations/000005_detection_disease_events.up.sql new file mode 100644 index 0000000..81cb899 --- /dev/null +++ b/server-go/migrations/000005_detection_disease_events.up.sql @@ -0,0 +1,89 @@ +CREATE TABLE IF NOT EXISTS detection_tasks ( + id uuid PRIMARY KEY DEFAULT gen_random_uuid(), + source_key varchar(128) NOT NULL, + source_type varchar(32) NOT NULL, + source_id varchar(128), + room_id uuid, + batch_id uuid, + inspection_id uuid, + disease varchar(64) NOT NULL, + recommended_method varchar(32), + method varchar(32), + priority varchar(16) NOT NULL DEFAULT 'routine', + status varchar(16) NOT NULL DEFAULT 'pending', + assignee_id uuid, + assigned_at timestamptz, + result varchar(16), + resulted_at timestamptz, + cancelled_reason text, + created_by uuid, + note text, + created_at timestamptz NOT NULL DEFAULT now(), + updated_at timestamptz NOT NULL DEFAULT now() +); + +CREATE UNIQUE INDEX IF NOT EXISTS idx_detection_tasks_source_key ON detection_tasks (source_key); +CREATE INDEX IF NOT EXISTS idx_detection_tasks_status ON detection_tasks (status); +CREATE INDEX IF NOT EXISTS idx_detection_tasks_room_id ON detection_tasks (room_id); +CREATE INDEX IF NOT EXISTS idx_detection_tasks_inspection_id ON detection_tasks (inspection_id); + +CREATE TABLE IF NOT EXISTS samples ( + id uuid PRIMARY KEY DEFAULT gen_random_uuid(), + detection_task_id uuid NOT NULL, + sample_no varchar(64) NOT NULL, + room_id uuid, + batch_id uuid, + tray_id uuid, + sampled_by uuid, + sampled_at timestamptz, + collected_at timestamptz, + handed_over_at timestamptz, + handed_over_by uuid, + received_at timestamptz, + received_by uuid, + testing_started_at timestamptz, + consumed_at timestamptz, + disposed_at timestamptz, + state varchar(16) NOT NULL DEFAULT 'created', + note text, + created_at timestamptz NOT NULL DEFAULT now(), + updated_at timestamptz NOT NULL DEFAULT now() +); + +CREATE UNIQUE INDEX IF NOT EXISTS idx_samples_detection_task_id ON samples (detection_task_id); +CREATE UNIQUE INDEX IF NOT EXISTS idx_samples_sample_no ON samples (sample_no); + +CREATE TABLE IF NOT EXISTS disease_events ( + id uuid PRIMARY KEY DEFAULT gen_random_uuid(), + source_key varchar(128) NOT NULL, + room_id uuid, + batch_id uuid, + detection_task_id uuid, + lamp_test_id uuid, + consultation_id uuid, + inspection_id uuid, + disease varchar(64) NOT NULL, + status varchar(16) NOT NULL DEFAULT 'suspected', + evidence jsonb, + confirmed_at timestamptz, + confirmed_by uuid, + loss_summary text, + measure text, + note text, + created_at timestamptz NOT NULL DEFAULT now(), + updated_at timestamptz NOT NULL DEFAULT now() +); + +CREATE UNIQUE INDEX IF NOT EXISTS idx_disease_events_source_key ON disease_events (source_key); +CREATE INDEX IF NOT EXISTS idx_disease_events_status ON disease_events (status); +CREATE INDEX IF NOT EXISTS idx_disease_events_room_id ON disease_events (room_id); + +ALTER TABLE trace_records + ADD COLUMN IF NOT EXISTS disease_event_id uuid; + +CREATE INDEX IF NOT EXISTS idx_trace_records_disease_event_id ON trace_records (disease_event_id); + +ALTER TABLE lamp_tests + ADD COLUMN IF NOT EXISTS detection_task_id uuid; + +CREATE INDEX IF NOT EXISTS idx_lamp_tests_detection_task_id ON lamp_tests (detection_task_id); diff --git a/web/src/dal/detectionTask.ts b/web/src/dal/detectionTask.ts new file mode 100644 index 0000000..f0a7ce6 --- /dev/null +++ b/web/src/dal/detectionTask.ts @@ -0,0 +1,88 @@ +import { get, post, patch } from '../api/http'; + +export interface DetectionTask { + id: string; + sourceKey?: string; + sourceType: string; + sourceId?: string; + roomId?: string; + roomName?: string; + batchId?: string; + inspectionId?: string; + disease: string; + recommendedMethod?: string; + method?: string; + priority: string; + status: string; + assigneeId?: string; + assignedAt?: string; + result?: string; + resultedAt?: string; + cancelledReason?: string; + createdBy?: string; + note?: string; + createdAt?: string; +} + +export interface Sample { + id: string; + detectionTaskId: string; + sampleNo: string; + roomId?: string; + batchId?: string; + trayId?: string; + sampledBy?: string; + sampledAt?: string; + collectedAt?: string; + handedOverAt?: string; + receivedAt?: string; + testingStartedAt?: string; + consumedAt?: string; + disposedAt?: string; + state: string; + note?: string; +} + +export interface DiseaseEvent { + id: string; + sourceKey?: string; + roomId?: string; + roomName?: string; + batchId?: string; + detectionTaskId?: string; + lampTestId?: string; + consultationId?: string; + inspectionId?: string; + disease: string; + status: string; + evidence?: any; + confirmedAt?: string; + confirmedBy?: string; + lossSummary?: string; + measure?: string; + note?: string; + createdAt?: string; +} + +export const listDetectionTasks = (params?: any) => + get('/detection-tasks', { params }); +export const getDetectionTask = (id: string) => + get(`/detection-tasks/${id}`); +export const createDetectionTask = (data: Partial) => + post('/detection-tasks', data); +export const updateDetectionTask = (id: string, data: Partial) => + patch(`/detection-tasks/${id}`, data); + +export const listSamples = (taskId: string) => + get(`/detection-tasks/${taskId}/samples`); +export const createSample = (taskId: string, data: Partial) => + post(`/detection-tasks/${taskId}/samples`, data); +export const updateSample = (id: string, data: Partial) => + patch(`/samples/${id}`, data); + +export const listDiseaseEvents = (params?: any) => + get('/disease-events', { params }); +export const createDiseaseEvent = (data: Partial) => + post('/disease-events', data); +export const updateDiseaseEvent = (id: string, data: Partial) => + patch(`/disease-events/${id}`, data); diff --git a/web/src/layout/BasicLayout.tsx b/web/src/layout/BasicLayout.tsx index 903df60..8a7eec4 100644 --- a/web/src/layout/BasicLayout.tsx +++ b/web/src/layout/BasicLayout.tsx @@ -40,6 +40,7 @@ const menuData = [ { path: '/knowledge', name: '知识库', icon: , permission: 'knowledge:read' }, { path: '/batches', name: '批次管理', icon: , permission: 'batch:read' }, { path: '/lamp-tests', name: 'LAMP 检测', icon: , permission: 'lamp:read' }, + { path: '/detection-tasks', name: '检测任务', icon: , permission: 'lamp:read' }, { path: '/consumables', name: '耗材管理', icon: , permission: 'consumable:read' }, { path: '/inspections', name: '巡检记录', icon: , permission: 'inspection:read' }, { path: '/consultations', name: '专家会诊', icon: , permission: 'consultation:read' }, diff --git a/web/src/pages/DetectionTasks.tsx b/web/src/pages/DetectionTasks.tsx new file mode 100644 index 0000000..72b119f --- /dev/null +++ b/web/src/pages/DetectionTasks.tsx @@ -0,0 +1,402 @@ +import { useEffect, useRef, useState } from 'react'; +import { + Button, Drawer, Form, Input, Modal, Select, Space, Tabs, Tag, message, +} from 'antd'; +import { PlusOutlined } from '@ant-design/icons'; +import { ProTable, type ActionType, type ProColumns } from '@ant-design/pro-components'; +import dayjs from 'dayjs'; +import { + createDetectionTask, + createDiseaseEvent, + createSample, + listDetectionTasks, + listDiseaseEvents, + listSamples, + updateDetectionTask, + updateDiseaseEvent, + updateSample, + type DetectionTask, + type DiseaseEvent, + type Sample, +} from '../dal/detectionTask'; +import { listDiseases } from '../dal/knowledge'; +import { listHouses, type SilkwormHouse } from '../dal/silkworm'; +import { listBatches, type Batch } from '../dal/trayBatch'; +import { authService } from '../services/auth'; + +const STATUS_LABELS: Record = { + draft: '草稿', + pending: '待确认', + assigned: '已分派', + sampling: '采样中', + testing: '检测中', + review: '复核中', + completed: '已完成', + cancelled: '已取消', +}; + +const SAMPLE_LABELS: Record = { + created: '已登记', + collected: '已采集', + handed_over: '已交接', + received: '已接收', + testing: '检测中', + consumed: '已消耗', + disposed: '已废弃', +}; + +const EVENT_LABELS: Record = { + suspected: '疑似', + confirmed: '确诊', + controlled: '已控制', + closed: '已关闭', + reopened: '已重开', +}; + +const METHOD_LABELS: Record = { + lamp: 'LAMP', + qpcr: 'qPCR', + sers: 'SERS', + hyperspectral: '高光谱', +}; + +const canWrite = () => authService.hasPermission('lamp:write') && authService.hasPermission('trace:write'); + +export default function DetectionTasksPage() { + const [rooms, setRooms] = useState([]); + const [batches, setBatches] = useState([]); + const [diseases, setDiseases] = useState<{ value: string; label: string }[]>([]); + const taskAction = useRef(); + const eventAction = useRef(); + const [createOpen, setCreateOpen] = useState(false); + const [createForm] = Form.useForm(); + const [resultOpen, setResultOpen] = useState(false); + const [resultForm] = Form.useForm(); + const [resultTarget, setResultTarget] = useState(null); + const [eventOpen, setEventOpen] = useState(false); + const [eventForm] = Form.useForm(); + const [sampleTask, setSampleTask] = useState(null); + const [samples, setSamples] = useState([]); + const [sampleState, setSampleState] = useState('collected'); + + useEffect(() => { + Promise.all([ + listHouses().catch(() => ({ items: [] as SilkwormHouse[] })), + listBatches().catch(() => [] as Batch[]), + listDiseases().catch(() => [] as any[]), + ]).then(([houseRes, batchRes, diseaseRes]) => { + setRooms(houseRes.items); + setBatches(batchRes); + setDiseases(diseaseRes.map((d: any) => ({ value: d.name, label: d.name }))); + }); + }, []); + + const roomName = (id?: string) => rooms.find((r) => r.id === id)?.name || id || '-'; + + const assignToMe = async (task: DetectionTask) => { + const uid = authService.getUser()?.id; + if (!uid) { + message.error('无法获取当前用户 ID'); + return; + } + await updateDetectionTask(task.id, { assigneeId: uid, status: 'assigned' }); + message.success('已指派给当前用户'); + taskAction.current?.reload(); + }; + + const advanceTask = async (task: DetectionTask) => { + if (task.status === 'review') { + resultForm.resetFields(); + setResultTarget(task); + setResultOpen(true); + return; + } + const next = { + pending: 'assigned', + assigned: 'sampling', + sampling: 'testing', + testing: 'review', + }[task.status]; + if (!next) return; + if (next === 'assigned') { + await assignToMe(task); + return; + } + await updateDetectionTask(task.id, { status: next }); + message.success(`已更新为${STATUS_LABELS[next]}`); + taskAction.current?.reload(); + }; + + const openSamples = async (task: DetectionTask) => { + setSampleTask(task); + setSamples(await listSamples(task.id).catch(() => [] as Sample[])); + }; + + const createSampleForTask = async () => { + if (!sampleTask) return; + await createSample(sampleTask.id, {}); + setSamples(await listSamples(sampleTask.id)); + }; + + const moveSample = async (sample: Sample) => { + await updateSample(sample.id, { state: sampleState }); + setSamples(await listSamples(sampleTask!.id)); + message.success(`样本已更新为${SAMPLE_LABELS[sampleState]}`); + }; + + const taskColumns: ProColumns[] = [ + { title: '序号', valueType: 'indexBorder', search: false, width: 60 }, + { title: '蚕房', dataIndex: 'roomId', search: false, render: (_, r) => roomName(r.roomId) }, + { title: '病种', dataIndex: 'disease', search: false }, + { title: '来源', dataIndex: 'sourceType', search: false, render: (_, r) => r.sourceType || 'manual' }, + { title: '方式', dataIndex: 'method', search: false, render: (_, r) => (r.method ? METHOD_LABELS[r.method] || r.method : '-') }, + { title: '优先级', dataIndex: 'priority', search: false, render: (_, r) => (r.priority === 'urgent' ? 紧急 : 常规) }, + { + title: '状态', + dataIndex: 'status', + valueType: 'select', + valueEnum: Object.fromEntries(Object.entries(STATUS_LABELS).map(([k, v]) => [k, { text: v }])), + render: (_, r) => {STATUS_LABELS[r.status] || r.status}, + }, + { title: '结果', dataIndex: 'result', search: false, render: (_, r) => r.result || '-' }, + { title: '创建时间', dataIndex: 'createdAt', search: false, render: (_, r) => (r.createdAt ? dayjs(r.createdAt).format('YYYY-MM-DD HH:mm') : '-') }, + { + title: '操作', + valueType: 'option', + render: (_, r) => [ + openSamples(r)}>样本, + ...(canWrite() + ? [ + advanceTask(r)}> + {r.status === 'review' ? '录入结果' : r.status === 'pending' ? '派给我' : '推进'} + , + ] + : []), + ], + }, + ]; + + const eventColumns: ProColumns[] = [ + { title: '序号', valueType: 'indexBorder', search: false, width: 60 }, + { title: '蚕房', dataIndex: 'roomId', search: false, render: (_, r) => roomName(r.roomId) }, + { title: '病种', dataIndex: 'disease', search: false }, + { + title: '状态', + dataIndex: 'status', + valueType: 'select', + valueEnum: Object.fromEntries(Object.entries(EVENT_LABELS).map(([k, v]) => [k, { text: v }])), + render: (_, r) => {EVENT_LABELS[r.status] || r.status}, + }, + { title: '损失', dataIndex: 'lossSummary', search: false, render: (_, r) => r.lossSummary || '-' }, + { title: '措施', dataIndex: 'measure', search: false, render: (_, r) => r.measure || '-' }, + { title: '创建时间', dataIndex: 'createdAt', search: false, render: (_, r) => (r.createdAt ? dayjs(r.createdAt).format('YYYY-MM-DD HH:mm') : '-') }, + { + title: '操作', + valueType: 'option', + render: (_, r) => [ + ...(canWrite() + ? [ + r.status === 'confirmed' ? ( + { await updateDiseaseEvent(r.id, { status: 'controlled' }); eventAction.current?.reload(); }}>标记已控制 + ) : r.status === 'controlled' ? ( + { await updateDiseaseEvent(r.id, { status: 'closed' }); eventAction.current?.reload(); }}>关闭 + ) : ( + { await updateDiseaseEvent(r.id, { status: 'confirmed' }); eventAction.current?.reload(); }}>确认 + ), + ] + : []), + ], + }, + ]; + + return ( + <> + + actionRef={taskAction} + rowKey="id" + columns={taskColumns} + search={{ labelWidth: 'auto' }} + request={async (params) => { + const res = await listDetectionTasks({ status: params.status, roomId: params.roomId }); + return { data: res, total: res.length, success: true }; + }} + toolBarRender={() => + canWrite() + ? [ + , + ] + : [] + } + /> + ), + }, + { + key: 'events', + label: '发病事件', + children: ( + + actionRef={eventAction} + rowKey="id" + columns={eventColumns} + search={false} + request={async (params) => { + const res = await listDiseaseEvents({ status: params.status, roomId: params.roomId }); + return { data: res, total: res.length, success: true }; + }} + toolBarRender={() => + canWrite() + ? [ + , + ] + : [] + } + /> + ), + }, + ]} + /> + + setCreateOpen(false)} + onOk={async () => { + const v = await createForm.validateFields(); + await createDetectionTask({ ...v, sourceType: 'manual' }); + message.success('检测任务已创建'); + setCreateOpen(false); + taskAction.current?.reload(); + }} + > +
+ + ({ value: b.id, label: b.name }))} /> + + + ({ value, label }))} allowClear /> + + + + +
+ + + setEventOpen(false)} + onOk={async () => { + const v = await eventForm.validateFields(); + let evidence = v.evidence; + if (evidence && typeof evidence === 'string') { + try { + evidence = JSON.parse(evidence); + } catch { + evidence = { note: evidence }; + } + } + if (v.status === 'confirmed' && !evidence) { + message.error('确诊必须填写证据'); + return; + } + await createDiseaseEvent({ ...v, evidence }); + message.success('发病事件已创建'); + setEventOpen(false); + eventAction.current?.reload(); + }} + > +
+ + + + + ({ value, label }))} + style={{ width: 160 }} + /> + + + + )) + )} + + + ); +} diff --git a/web/src/router.tsx b/web/src/router.tsx index 4cd1582..ebc0fb0 100644 --- a/web/src/router.tsx +++ b/web/src/router.tsx @@ -13,6 +13,7 @@ import Log from './pages/Log'; import Knowledge from './pages/Knowledge'; import Batches from './pages/Batches'; import LampTests from './pages/LampTests'; +import DetectionTasks from './pages/DetectionTasks'; import Consumables from './pages/Consumables'; import Inspections from './pages/Inspections'; import Consultations from './pages/Consultations'; @@ -56,6 +57,7 @@ export const router = createBrowserRouter([ { path: 'knowledge', element: }, { path: 'batches', element: }, { path: 'lamp-tests', element: }, + { path: 'detection-tasks', element: }, { path: 'consumables', element: }, { path: 'inspections', element: }, { path: 'consultations', element: }, diff --git a/后续工作计划.md b/后续工作计划.md index 5de9863..76a7b4b 100644 --- a/后续工作计划.md +++ b/后续工作计划.md @@ -1,6 +1,6 @@ # 后续工作计划 -> **完成状态（2026-08-14 更新）**：#5-#24、#27 已完成，Task 0/1/2/4/5/6/8 整改代码完成（详见 `开发交接记录.md`）；#1-4 因物理机问题挂起；#23/#26 骨架完成；Task 3/7 延后到最后处理；微信/天气真实数据待凭证。 +> **完成状态（2026-08-14 更新）**：#5-#24、#27 已完成，Task 0/1/2/4/5/6/8/9 整改代码完成（详见 `开发交接记录.md`）；#1-4 因物理机问题挂起；#23/#26 骨架完成；Task 3/7 延后到最后处理；微信/天气真实数据待凭证。 ## 整改实施计划 Wave 0-4（2026-08-13 启动） @@ -17,7 +17,7 @@ | Wave 1 | P0 安全与正确性 | Task 6 修复 AI 风险语义并隔离 Mock 数据 | 部分可用 | 待开发服务器迁移部署与真实模型接入；历史数据待人工审阅 | | Wave 1 | P0 安全与正确性 | Task 7 修订 qPCR 判读与检测质控 | 延后到最后（跳过） | 用户 2026-08-14 明确要求跳过并留到最后；恢复前需领域专家确认 | | Wave 2 | 工程可靠性 | Task 8 建立可靠通知、吊销与跨实例状态 | 部分可用 | 待开发服务器迁移部署与 Redis/微信真实联调 | -| Wave 2 | 工程可靠性 | Task 9 建立统一检测任务、样本链与发病事件 | 未开始 | 无 | +| Wave 2 | 工程可靠性 | Task 9 建立统一检测任务、样本链与发病事件 | 部分可用 | 待开发服务器迁移部署与端到端联调 | | Wave 3 | 业务闭环 | Task 10 补齐消毒、种源与二维码身份链 | 未开始 | 无 | | Wave 3 | 业务闭环 | Task 11 实现小程序离线巡检与可靠同步 | 未开始 | 无 | | Wave 3 | 业务闭环 | Task 12 完善环境规则、会诊治理、知识审核与效果评估 | 未开始 | 无 | diff --git a/开发交接记录.md b/开发交接记录.md index 23e0064..0d9cb66 100644 --- a/开发交接记录.md +++ b/开发交接记录.md @@ -998,3 +998,32 @@ MVP 沿用 IoTDB（现状）；TDengine 作为生产规模化候选（先基准 - 本任务前分支提交为 `a6a996a`；回滚可还原 Task 8 提交； - 数据库回滚执行 `000004_notifications_outbox.down.sql`，可删除 `notifications` 和 `outbox_events`；未发送的 Outbox 数据会随回滚丢失，回滚前必须先备份或暂停 worker； - 认证状态回滚需恢复旧二进制，Redis 中的吊销/限流键由 TTL 自然过期。 + +## 2026-08-14 整改 Task 9：建立统一检测任务、样本链与发病事件 + +### 做了什么 + +- 新增 `detection_tasks`、`samples`、`disease_events` 表及 `000005_detection_disease_events` 迁移；`trace_records` 增加 `disease_event_id`，`lamp_tests` 增加 `detection_task_id`； +- 实现统一检测任务状态机 `draft/pending/assigned/sampling/testing/review/completed/cancelled`、样本状态机 `created/collected/handed_over/received/testing/consumed/disposed`、发病事件状态机 `suspected/confirmed/controlled/closed/reopened`； +- 新增 `/detection-tasks`、`/samples`、`/disease-events` 后端 API；Web 新增「检测任务」页面，支持建单、分派、样本流转、结果录入和发病事件管理； +- 橙色/红色巡检通过 Outbox 幂等创建待确认检测任务，`source_key` 唯一索引防止重复建单；LAMP 阳性或统一检测任务阳性结果自动创建发病事件，并自动生成关联溯源记录； +- 确诊发病事件必须有证据，不能仅凭状态字段确认。 + +### 设计思路与决策依据 + +- 检测任务作为 LAMP/qPCR/SERS/高光谱共用的主链，推荐方式与实际执行方式分开；自动建单只进入 `pending`，不直接视为已检测； +- 样本按任务一对一建模，先满足“人员/时间/状态可追踪”，后续如需多份样本可扩展为样本集合； +- DiseaseEvent 独立成实体，TraceRecord 改为关联 DiseaseEvent，让确诊、处置、会诊和溯源形成稳定主线； +- Outbox 和 `source_key` 幂等保证重复巡检/重复推送不会产生多个待确认任务。 + +### 验证结果 + +- `scripts/verify.ps1` exit 0：Go test/vet/build、Web test/lint/build、小程序 typecheck/build、APP typecheck/lint、AI pytest 15/15 均通过； +- 新增测试覆盖检测任务/样本/发病事件状态机、确诊必须有证据、Outbox 检测建单幂等； +- 未部署开发服务器，未执行 `000005` 迁移；未做真实巡检→任务→样本→LAMP→发病事件端到端联调。 + +### 回滚点 + +- 本任务前分支提交为 `a25bc7a`；回滚可还原 Task 9 提交； +- 数据库回滚执行 `000005_detection_disease_events.down.sql`，可删除新表和关联列；已建立 `DiseaseEvent -> TraceRecord` 关联的数据会随回滚断开，回滚前需先备份； +- Web 新页面回滚只需还原路由/菜单/页面文件，旧 LAMP 页面不受影响。 From 6b222abb7b688e921d677815ab087b3ba3bd8f37 Mon Sep 17 00:00:00 2001 From: weijuesen Date: Fri, 14 Aug 2026 08:39:56 +0800 Subject: [PATCH 14/18] =?UTF-8?q?feat:=20=E8=A1=A5=E9=BD=90=E6=B6=88?= =?UTF-8?q?=E6=AF=92=E3=80=81=E7=A7=8D=E6=BA=90=E4=B8=8E=E4=BA=8C=E7=BB=B4?= =?UTF-8?q?=E7=A0=81=E8=BA=AB=E4=BB=BD=E9=93=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 1 + miniapp/src/api/biosecurity.ts | 33 ++ miniapp/src/app.config.ts | 1 + .../src/pages/biosecurity/index.module.scss | 62 +++ miniapp/src/pages/biosecurity/index.tsx | 127 ++++++ miniapp/src/pages/settings/index.tsx | 8 + server-go/cmd/server/main.go | 1 + server-go/internal/database/db.go | 3 + server-go/internal/database/migrate.go | 2 +- server-go/internal/database/migrate_test.go | 4 + server-go/internal/handler/biosecurity.go | 413 ++++++++++++++++++ .../internal/handler/biosecurity_test.go | 66 +++ server-go/internal/handler/trace.go | 29 ++ server-go/internal/model/biosecurity.go | 144 ++++++ server-go/internal/model/permission_seed.go | 6 + server-go/internal/model/tray_batch.go | 13 +- .../migrations/000006_biosecurity.down.sql | 4 + .../migrations/000006_biosecurity.up.sql | 64 +++ web/src/dal/biosecurity.ts | 61 +++ web/src/layout/BasicLayout.tsx | 2 + web/src/pages/Biosecurity.tsx | 272 ++++++++++++ web/src/router.tsx | 2 + 后续工作计划.md | 4 +- 开发交接记录.md | 31 ++ 24 files changed, 1344 insertions(+), 9 deletions(-) create mode 100644 miniapp/src/api/biosecurity.ts create mode 100644 miniapp/src/pages/biosecurity/index.module.scss create mode 100644 miniapp/src/pages/biosecurity/index.tsx create mode 100644 server-go/internal/handler/biosecurity.go create mode 100644 server-go/internal/handler/biosecurity_test.go create mode 100644 server-go/internal/model/biosecurity.go create mode 100644 server-go/migrations/000006_biosecurity.down.sql create mode 100644 server-go/migrations/000006_biosecurity.up.sql create mode 100644 web/src/dal/biosecurity.ts create mode 100644 web/src/pages/Biosecurity.tsx diff --git a/README.md b/README.md index c266c0c..31103a5 100644 --- a/README.md +++ b/README.md @@ -64,6 +64,7 @@ - 蚕匾（`trays`）、蚕种批次（`batches`，含品种/蚕种来源/批次号/检疫证明/龄期/入房/上蔟）、饲养记录（`rearing_records`）三表 + CRUD - Web「批次管理」页（批次 + 蚕匾 + 饲养记录）；小程序蚕房详情展示蚕匾与当前批次 +- 生物安全：种源与检疫链、消毒计划/执行、批次/蚕匾/样本二维码身份；小程序可扫码并现场提交消毒执行 ### 1.9 AI 拍照巡检闭环（计划 #5/#6/#8/#9） diff --git a/miniapp/src/api/biosecurity.ts b/miniapp/src/api/biosecurity.ts new file mode 100644 index 0000000..e09bba8 --- /dev/null +++ b/miniapp/src/api/biosecurity.ts @@ -0,0 +1,33 @@ +import { get, post } from './request'; + +export interface QRResolveResult { + entityType: string; + publicId: string; + entity: { + id: string; + name?: string; + roomId?: string; + batchId?: string; + sampleNo?: string; + state?: string; + }; +} + +export interface DisinfectionRecord { + roomId?: string; + batchId?: string; + kind: 'plan' | 'execution'; + agent: string; + concentration: string; + amount?: string; + note?: string; +} + +export const resolveQR = (payload: string) => + post('/biosecurity/qr/resolve', { payload }); + +export const createDisinfectionRecord = (data: DisinfectionRecord) => + post('/biosecurity/disinfection-records', data as unknown as Record); + +export const listDisinfectionRecords = (params?: any) => + get('/biosecurity/disinfection-records', { params }); diff --git a/miniapp/src/app.config.ts b/miniapp/src/app.config.ts index 5b6936f..57f6011 100644 --- a/miniapp/src/app.config.ts +++ b/miniapp/src/app.config.ts @@ -16,6 +16,7 @@ export default defineAppConfig({ 'pages/inspection/index', 'pages/notification/index', 'pages/lamp/index', + 'pages/biosecurity/index', ], window: { backgroundTextStyle: 'dark', diff --git a/miniapp/src/pages/biosecurity/index.module.scss b/miniapp/src/pages/biosecurity/index.module.scss new file mode 100644 index 0000000..11776fd --- /dev/null +++ b/miniapp/src/pages/biosecurity/index.module.scss @@ -0,0 +1,62 @@ +.page { + min-height: 100vh; + padding: 24px; + background: #f5f6f7; +} + +.card { + background: #ffffff; + border-radius: 12px; + padding: 24px; + margin-bottom: 16px; +} + +.title { + display: block; + font-size: 32px; + font-weight: 600; + margin-bottom: 20px; +} + +.label { + display: block; + font-size: 26px; + color: #4e5969; + margin: 18px 0 8px; +} + +.input { + height: 76px; + background: #f2f3f5; + border-radius: 8px; + padding: 0 20px; + font-size: 28px; +} + +.btnPrimary { + margin-top: 24px; + background: #10b981; + color: #ffffff; + border-radius: 8px; + font-size: 28px; +} + +.entityBox { + margin-top: 20px; + padding: 20px; + background: #f0fdf4; + border-radius: 8px; +} + +.entityType { + display: block; + color: #4e5969; + font-size: 24px; +} + +.entityName { + display: block; + margin-top: 8px; + font-size: 30px; + font-weight: 600; +} diff --git a/miniapp/src/pages/biosecurity/index.tsx b/miniapp/src/pages/biosecurity/index.tsx new file mode 100644 index 0000000..1bb13c8 --- /dev/null +++ b/miniapp/src/pages/biosecurity/index.tsx @@ -0,0 +1,127 @@ +import React, { useState } from 'react'; +import { Button, Input, Text, View } from '@tarojs/components'; +import Taro from '@tarojs/taro'; +import styles from './index.module.scss'; +import { createDisinfectionRecord, resolveQR, type QRResolveResult } from '@/api/biosecurity'; + +const BiosecurityPage: React.FC = () => { + const [entity, setEntity] = useState(null); + const [agent, setAgent] = useState(''); + const [concentration, setConcentration] = useState(''); + const [amount, setAmount] = useState(''); + const [note, setNote] = useState(''); + const [submitting, setSubmitting] = useState(false); + + const handleScan = async () => { + try { + const res = await Taro.scanCode({ scanType: ['qrCode'] }); + if (!res.result) throw new Error('未识别到二维码'); + const data = await resolveQR(res.result); + setEntity(data); + Taro.showToast({ title: '扫码成功', icon: 'success' }); + } catch (err) { + Taro.showToast({ + title: err instanceof Error ? err.message : '扫码失败', + icon: 'none', + }); + } + }; + + const handleSubmit = async () => { + if (!entity) { + Taro.showToast({ title: '请先扫码', icon: 'none' }); + return; + } + if (!agent || !concentration) { + Taro.showToast({ title: '请填写药剂和浓度', icon: 'none' }); + return; + } + setSubmitting(true); + try { + await createDisinfectionRecord({ + kind: 'execution', + roomId: entity.entity.roomId, + batchId: entity.entityType === 'batch' ? entity.entity.id : entity.entity.batchId, + agent, + concentration, + amount: amount || undefined, + note: note || undefined, + }); + Taro.showToast({ title: '消毒记录已提交', icon: 'success' }); + setAgent(''); + setConcentration(''); + setAmount(''); + setNote(''); + } catch (err) { + Taro.showToast({ + title: err instanceof Error ? err.message : '提交失败', + icon: 'none', + }); + } finally { + setSubmitting(false); + } + }; + + return ( + + + 二维码身份 + + {entity ? ( + + 类型：{entity.entityType} + + {entity.entity.name || entity.entity.sampleNo || entity.entity.id} + + + ) : null} + + + {entity ? ( + + 现场消毒执行 + 消毒药剂 + setAgent(e.detail.value)} + /> + 浓度 + setConcentration(e.detail.value)} + /> + 用量 + setAmount(e.detail.value)} + /> + 备注 + setNote(e.detail.value)} + /> + + + ) : null} + + ); +}; + +export default BiosecurityPage; diff --git a/miniapp/src/pages/settings/index.tsx b/miniapp/src/pages/settings/index.tsx index b585a3e..2970277 100644 --- a/miniapp/src/pages/settings/index.tsx +++ b/miniapp/src/pages/settings/index.tsx @@ -59,6 +59,9 @@ const SettingsPage: React.FC = () => { case 'lamp': Taro.navigateTo({ url: '/pages/lamp/index' }); break; + case 'biosecurity': + Taro.navigateTo({ url: '/pages/biosecurity/index' }); + break; case 'about': Taro.showModal({ title: '关于', @@ -190,6 +193,11 @@ const SettingsPage: React.FC = () => { LAMP 检测 › + handleMenuTap('biosecurity')}> + 🛡️ + 生物安全 + › + handleMenuTap('wsStatus')}> 🔗 连接状态 diff --git a/server-go/cmd/server/main.go b/server-go/cmd/server/main.go index cfac303..78878f7 100644 --- a/server-go/cmd/server/main.go +++ b/server-go/cmd/server/main.go @@ -133,6 +133,7 @@ func main() { handler.RegisterLampRoutes(api, db, s3Svc, cfg.S3BucketImages) handler.RegisterDetectionTaskRoutes(api, db) handler.RegisterConsumableRoutes(api, db) + handler.RegisterBiosecurityRoutes(api, db) handler.RegisterConsultationRoutes(api, db) handler.RegisterDetectionMethodRoutes(api, db) handler.RegisterTraceRoutes(api, db) diff --git a/server-go/internal/database/db.go b/server-go/internal/database/db.go index d8f3903..c2f0720 100644 --- a/server-go/internal/database/db.go +++ b/server-go/internal/database/db.go @@ -41,6 +41,9 @@ func Init(cfg *config.Config) error { &model.DetectionTask{}, &model.Sample{}, &model.DiseaseEvent{}, + &model.SeedSource{}, + &model.DisinfectionRecord{}, + &model.IdentityLink{}, &model.Tray{}, &model.Batch{}, &model.RearingRecord{}, &model.WechatBinding{}, &model.WeatherAlert{}, diff --git a/server-go/internal/database/migrate.go b/server-go/internal/database/migrate.go index dbc69d2..e03fa38 100644 --- a/server-go/internal/database/migrate.go +++ b/server-go/internal/database/migrate.go @@ -13,7 +13,7 @@ import ( ) // CurrentSchemaVersion 是当前后端代码期望的迁移版本。 -const CurrentSchemaVersion = "5" +const CurrentSchemaVersion = "6" // RunMigrations 使用嵌入式 SQL 迁移文件将数据库升级到最新版本。 func RunMigrations(db *gorm.DB) error { diff --git a/server-go/internal/database/migrate_test.go b/server-go/internal/database/migrate_test.go index febbc5b..44d0a26 100644 --- a/server-go/internal/database/migrate_test.go +++ b/server-go/internal/database/migrate_test.go @@ -112,4 +112,8 @@ func TestEmbeddedMigrationsIncludeBaseline(t *testing.T) { if err != nil || next != 5 { t.Fatalf("expected detection/disease migration version 5, got %d (err %v)", next, err) } + next, err = driver.Next(next) + if err != nil || next != 6 { + t.Fatalf("expected biosecurity migration version 6, got %d (err %v)", next, err) + } } diff --git a/server-go/internal/handler/biosecurity.go b/server-go/internal/handler/biosecurity.go new file mode 100644 index 0000000..2aa6560 --- /dev/null +++ b/server-go/internal/handler/biosecurity.go @@ -0,0 +1,413 @@ +package handler + +import ( + "crypto/rand" + "encoding/hex" + "net/http" + "time" + + "silk-server-go/internal/middleware" + "silk-server-go/internal/model" + + "github.com/gin-gonic/gin" + "gorm.io/gorm" +) + +// RegisterBiosecurityRoutes 注册种源、消毒和二维码身份路由。 +func RegisterBiosecurityRoutes(rg *gin.RouterGroup, db *gorm.DB) { + read := middleware.RequirePermission(db, "biosecurity:read") + write := middleware.RequirePermission(db, "biosecurity:write") + rg.GET("/biosecurity/seed-sources", read, listSeedSources(db)) + rg.POST("/biosecurity/seed-sources", write, createSeedSource(db)) + rg.PATCH("/biosecurity/seed-sources/:id", write, updateSeedSource(db)) + rg.GET("/biosecurity/disinfection-records", read, listDisinfectionRecords(db)) + rg.POST("/biosecurity/disinfection-records", write, createDisinfectionRecord(db)) + rg.PATCH("/biosecurity/disinfection-records/:id", write, updateDisinfectionRecord(db)) + rg.POST("/biosecurity/qr", write, issueQR(db)) + rg.POST("/biosecurity/qr/resolve", read, resolveQR(db)) +} + +func listSeedSources(db *gorm.DB) gin.HandlerFunc { + return func(c *gin.Context) { + q := db.Model(&model.SeedSource{}) + if batch := c.Query("batchId"); batch != "" { + q = q.Where("batch_id = ?", batch) + } + var list []model.SeedSource + q.Order("created_at DESC").Limit(200).Find(&list) + c.JSON(http.StatusOK, list) + } +} + +func createSeedSource(db *gorm.DB) gin.HandlerFunc { + return func(c *gin.Context) { + var body struct { + BatchID *string `json:"batchId"` + ParentID *string `json:"parentId"` + Supplier string `json:"supplier"` + SeedBatchNo string `json:"seedBatchNo"` + QuarantineNo *string `json:"quarantineNo"` + Variety *string `json:"variety"` + CertificateURL *string `json:"certificateUrl"` + EntryAt *time.Time `json:"entryAt"` + Note *string `json:"note"` + } + if err := c.ShouldBindJSON(&body); err != nil { + c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()}) + return + } + for _, id := range []*string{body.BatchID, body.ParentID} { + if id != nil && !isUUID(*id) { + c.JSON(http.StatusBadRequest, gin.H{"error": "关联 ID 不是合法的 UUID"}) + return + } + } + source := model.SeedSource{ + PublicID: randomPublicID(), + BatchID: body.BatchID, + ParentID: body.ParentID, + Supplier: body.Supplier, + SeedBatchNo: body.SeedBatchNo, + QuarantineNo: body.QuarantineNo, + Variety: body.Variety, + CertificateURL: body.CertificateURL, + EntryAt: body.EntryAt, + Note: body.Note, + CreatedBy: currentUserID(c), + } + if err := model.ValidateSeedSource(source); err != nil { + c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()}) + return + } + if source.ParentID != nil { + if err := model.SeedSourceCycleError(seedParentChain(db), source.ID, *source.ParentID); err != nil { + c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()}) + return + } + } + if err := db.Create(&source).Error; err != nil { + c.JSON(http.StatusBadRequest, gin.H{"error": "创建种源失败"}) + return + } + linkSeedSourceToBatch(db, source) + c.JSON(http.StatusCreated, source) + } +} + +func updateSeedSource(db *gorm.DB) gin.HandlerFunc { + return func(c *gin.Context) { + var source model.SeedSource + if db.Where("id = ?", c.Param("id")).First(&source).Error != nil { + c.JSON(http.StatusNotFound, gin.H{"error": "seed source not found"}) + return + } + var body struct { + BatchID *string `json:"batchId"` + ParentID *string `json:"parentId"` + Supplier *string `json:"supplier"` + SeedBatchNo *string `json:"seedBatchNo"` + QuarantineNo *string `json:"quarantineNo"` + Variety *string `json:"variety"` + CertificateURL *string `json:"certificateUrl"` + EntryAt *time.Time `json:"entryAt"` + Note *string `json:"note"` + } + if err := c.ShouldBindJSON(&body); err != nil { + c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()}) + return + } + updates := map[string]interface{}{} + if body.BatchID != nil { + updates["batch_id"] = *body.BatchID + } + if body.ParentID != nil { + if *body.ParentID != "" { + if err := model.SeedSourceCycleError(seedParentChain(db), source.ID, *body.ParentID); err != nil { + c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()}) + return + } + updates["parent_id"] = *body.ParentID + } else { + updates["parent_id"] = nil + } + } + if body.Supplier != nil { + updates["supplier"] = *body.Supplier + } + if body.SeedBatchNo != nil { + updates["seed_batch_no"] = *body.SeedBatchNo + } + if body.QuarantineNo != nil { + updates["quarantine_no"] = *body.QuarantineNo + } + if body.Variety != nil { + updates["variety"] = *body.Variety + } + if body.CertificateURL != nil { + updates["certificate_url"] = *body.CertificateURL + } + if body.EntryAt != nil { + updates["entry_at"] = *body.EntryAt + } + if body.Note != nil { + updates["note"] = *body.Note + } + if len(updates) > 0 { + if err := db.Model(&model.SeedSource{}).Where("id = ?", source.ID).Updates(updates).Error; err != nil { + c.JSON(http.StatusBadRequest, gin.H{"error": "更新种源失败"}) + return + } + } + db.Where("id = ?", source.ID).First(&source) + if body.BatchID != nil { + linkSeedSourceToBatch(db, source) + } + c.JSON(http.StatusOK, source) + } +} + +func listDisinfectionRecords(db *gorm.DB) gin.HandlerFunc { + return func(c *gin.Context) { + q := db.Model(&model.DisinfectionRecord{}) + if room := c.Query("roomId"); room != "" { + q = q.Where("room_id = ?", room) + } + if batch := c.Query("batchId"); batch != "" { + q = q.Where("batch_id = ?", batch) + } + if kind := c.Query("kind"); kind != "" { + q = q.Where("kind = ?", kind) + } + var list []model.DisinfectionRecord + q.Order("created_at DESC").Limit(200).Find(&list) + c.JSON(http.StatusOK, list) + } +} + +func createDisinfectionRecord(db *gorm.DB) gin.HandlerFunc { + return func(c *gin.Context) { + var body model.DisinfectionRecord + if err := c.ShouldBindJSON(&body); err != nil { + c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()}) + return + } + body.ID = "" + body.CreatedBy = currentUserID(c) + if err := model.ValidateDisinfectionRecord(body); err != nil { + c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()}) + return + } + now := time.Now() + if body.Kind == "plan" && body.PlannedAt == nil { + body.PlannedAt = &now + } + if body.Kind == "execution" { + body.ExecutorID = currentUserID(c) + if body.ExecutedAt == nil { + body.ExecutedAt = &now + } + } + if body.RoomID != nil && !isUUID(*body.RoomID) { + c.JSON(http.StatusBadRequest, gin.H{"error": "roomId 不是合法的 UUID"}) + return + } + if body.BatchID != nil && !isUUID(*body.BatchID) { + c.JSON(http.StatusBadRequest, gin.H{"error": "batchId 不是合法的 UUID"}) + return + } + if err := db.Create(&body).Error; err != nil { + c.JSON(http.StatusBadRequest, gin.H{"error": "创建消毒记录失败"}) + return + } + c.JSON(http.StatusCreated, body) + } +} + +func updateDisinfectionRecord(db *gorm.DB) gin.HandlerFunc { + return func(c *gin.Context) { + var record model.DisinfectionRecord + if db.Where("id = ?", c.Param("id")).First(&record).Error != nil { + c.JSON(http.StatusNotFound, gin.H{"error": "disinfection record not found"}) + return + } + var body struct { + ExecutedAt *time.Time `json:"executedAt"` + ReviewedAt *time.Time `json:"reviewedAt"` + ReviewerID *string `json:"reviewerId"` + PhotoURL *string `json:"photoUrl"` + Note *string `json:"note"` + } + if err := c.ShouldBindJSON(&body); err != nil { + c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()}) + return + } + updates := map[string]interface{}{} + now := time.Now() + if body.ExecutedAt != nil { + updates["executed_at"] = now + updates["executor_id"] = currentUserID(c) + } + if body.ReviewedAt != nil { + updates["reviewed_at"] = *body.ReviewedAt + } + if body.ReviewerID != nil { + updates["reviewer_id"] = *body.ReviewerID + } + if body.PhotoURL != nil { + updates["photo_url"] = *body.PhotoURL + } + if body.Note != nil { + updates["note"] = *body.Note + } + if len(updates) > 0 { + if err := db.Model(&model.DisinfectionRecord{}).Where("id = ?", record.ID).Updates(updates).Error; err != nil { + c.JSON(http.StatusBadRequest, gin.H{"error": "更新消毒记录失败"}) + return + } + } + db.Where("id = ?", record.ID).First(&record) + c.JSON(http.StatusOK, record) + } +} + +func issueQR(db *gorm.DB) gin.HandlerFunc { + return func(c *gin.Context) { + var body struct { + EntityType string `json:"entityType"` + EntityID string `json:"entityId"` + } + if err := c.ShouldBindJSON(&body); err != nil { + c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()}) + return + } + if !model.ValidQRIdentityType(body.EntityType) || !isUUID(body.EntityID) { + c.JSON(http.StatusBadRequest, gin.H{"error": "entityType/entityId 无效"}) + return + } + if !entityExists(db, body.EntityType, body.EntityID) { + c.JSON(http.StatusNotFound, gin.H{"error": "二维码关联实体不存在"}) + return + } + var link model.IdentityLink + if db.Where("entity_type = ? AND entity_id = ?", body.EntityType, body.EntityID).First(&link).Error != nil { + link = model.IdentityLink{PublicID: randomPublicID(), EntityType: body.EntityType, EntityID: body.EntityID, Version: model.QRVersion} + if err := db.Create(&link).Error; err != nil { + c.JSON(http.StatusInternalServerError, gin.H{"error": "创建二维码失败"}) + return + } + } + c.JSON(http.StatusOK, gin.H{ + "publicId": link.PublicID, + "entityType": link.EntityType, + "entityId": link.EntityID, + "payload": model.EncodeQRPayload(link.EntityType, link.PublicID, link.Version), + }) + } +} + +func resolveQR(db *gorm.DB) gin.HandlerFunc { + return func(c *gin.Context) { + var body struct { + Payload string `json:"payload"` + } + if err := c.ShouldBindJSON(&body); err != nil { + c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()}) + return + } + entityType, publicID, version, err := model.ParseQRPayload(body.Payload) + if err != nil { + c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()}) + return + } + var link model.IdentityLink + if db.Where("public_id = ? AND entity_type = ?", publicID, entityType).First(&link).Error != nil { + c.JSON(http.StatusNotFound, gin.H{"error": "二维码身份不存在或已失效"}) + return + } + if link.Version != version { + c.JSON(http.StatusConflict, gin.H{"error": "二维码版本不匹配"}) + return + } + summary, ok := entitySummary(db, link.EntityType, link.EntityID) + if !ok { + c.JSON(http.StatusNotFound, gin.H{"error": "二维码关联实体不存在"}) + return + } + c.JSON(http.StatusOK, gin.H{ + "entityType": link.EntityType, + "publicId": link.PublicID, + "entity": summary, + }) + } +} + +func seedParentChain(db *gorm.DB) map[string]string { + var rows []struct { + ID string `gorm:"column:id"` + ParentID *string `gorm:"column:parent_id"` + } + db.Table("seed_sources").Select("id, parent_id").Scan(&rows) + chain := make(map[string]string, len(rows)) + for _, row := range rows { + if row.ParentID != nil { + chain[row.ID] = *row.ParentID + } + } + return chain +} + +func linkSeedSourceToBatch(db *gorm.DB, source model.SeedSource) { + if source.BatchID == nil { + return + } + _ = db.Model(&model.Batch{}).Where("id = ?", *source.BatchID).Update("seed_source_id", source.ID).Error +} + +func entityExists(db *gorm.DB, entityType, entityID string) bool { + switch entityType { + case "batch": + var batch model.Batch + return db.Where("id = ?", entityID).First(&batch).Error == nil + case "tray": + var tray model.Tray + return db.Where("id = ?", entityID).First(&tray).Error == nil + case "sample": + var sample model.Sample + return db.Where("id = ?", entityID).First(&sample).Error == nil + default: + return false + } +} + +func entitySummary(db *gorm.DB, entityType, entityID string) (map[string]interface{}, bool) { + switch entityType { + case "batch": + var batch model.Batch + if db.Where("id = ?", entityID).First(&batch).Error != nil { + return nil, false + } + return gin.H{"id": batch.ID, "name": batch.Name, "roomId": batch.RoomID}, true + case "tray": + var tray model.Tray + if db.Where("id = ?", entityID).First(&tray).Error != nil { + return nil, false + } + return gin.H{"id": tray.ID, "name": tray.Name, "roomId": tray.RoomID}, true + case "sample": + var sample model.Sample + if db.Where("id = ?", entityID).First(&sample).Error != nil { + return nil, false + } + return gin.H{"id": sample.ID, "sampleNo": sample.SampleNo, "detectionTaskId": sample.DetectionTaskID, "state": sample.State}, true + default: + return nil, false + } +} + +func randomPublicID() string { + b := make([]byte, 24) + if _, err := rand.Read(b); err != nil { + return hex.EncodeToString([]byte(time.Now().Format(time.RFC3339Nano))) + } + return hex.EncodeToString(b) +} diff --git a/server-go/internal/handler/biosecurity_test.go b/server-go/internal/handler/biosecurity_test.go new file mode 100644 index 0000000..135c77a --- /dev/null +++ b/server-go/internal/handler/biosecurity_test.go @@ -0,0 +1,66 @@ +package handler + +import ( + "testing" + + "silk-server-go/internal/model" +) + +func TestQRPayloadRoundTripAndTamper(t *testing.T) { + payload := model.EncodeQRPayload("batch", "public-abc", model.QRVersion) + entityType, publicID, version, err := model.ParseQRPayload(payload) + if err != nil { + t.Fatalf("parse failed: %v", err) + } + if entityType != "batch" || publicID != "public-abc" || version != model.QRVersion { + t.Fatalf("payload = %s/%s/%d", entityType, publicID, version) + } + if _, _, _, err := model.ParseQRPayload("batch:public-abc:1"); err == nil { + t.Fatal("tampered format should fail") + } + if _, _, _, err := model.ParseQRPayload(model.EncodeQRPayload("batch", "public-abc", 2)); err != nil { + t.Fatal("different version should parse but must be rejected by resolver") + } +} + +func TestSeedSourceCycleRejected(t *testing.T) { + chain := map[string]string{ + "a": "b", + "b": "c", + "c": "a", + } + if err := model.SeedSourceCycleError(chain, "d", "a"); err == nil { + t.Fatal("cycle should be rejected") + } + if err := model.SeedSourceCycleError(chain, "a", "a"); err == nil { + t.Fatal("self reference should be rejected") + } +} + +func TestSeedSourceCycleAllowsAcyclic(t *testing.T) { + chain := map[string]string{"a": "b", "b": "c"} + if err := model.SeedSourceCycleError(chain, "d", "a"); err != nil { + t.Fatalf("acyclic chain should pass: %v", err) + } +} + +func TestDisinfectionRequiredFields(t *testing.T) { + record := model.DisinfectionRecord{Kind: "execution", Agent: "漂白粉", Concentration: "1%"} + if err := model.ValidateDisinfectionRecord(record); err != nil { + t.Fatalf("valid record should pass: %v", err) + } + record.Agent = "" + if err := model.ValidateDisinfectionRecord(record); err == nil { + t.Fatal("missing agent should fail") + } + record.Agent = "漂白粉" + record.Concentration = "" + if err := model.ValidateDisinfectionRecord(record); err == nil { + t.Fatal("missing concentration should fail") + } + record.Concentration = "1%" + record.Kind = "unknown" + if err := model.ValidateDisinfectionRecord(record); err == nil { + t.Fatal("invalid kind should fail") + } +} diff --git a/server-go/internal/handler/trace.go b/server-go/internal/handler/trace.go index 7633b65..7724a73 100644 --- a/server-go/internal/handler/trace.go +++ b/server-go/internal/handler/trace.go @@ -262,6 +262,35 @@ func autoTrace(db *gorm.DB) gin.HandlerFunc { "pastCount": pastCount, } + // 生物安全证据：种源与消毒记录 + bio := map[string]interface{}{ + "seedSourceCount": int64(0), + "disinfectionCount": int64(0), + "evidenceSufficient": false, + "missing": []string{"种源", "消毒"}, + } + if t.RoomID != nil { + var seedCount, disinfectionCount int64 + db.Table("seed_sources"). + Joins("JOIN batches ON batches.id = seed_sources.batch_id AND batches.room_id = ?", *t.RoomID). + Count(&seedCount) + db.Table("disinfection_records"). + Joins("JOIN batches ON batches.id = disinfection_records.batch_id AND batches.room_id = ?", *t.RoomID). + Count(&disinfectionCount) + missing := []string{} + if seedCount == 0 { + missing = append(missing, "种源") + } + if disinfectionCount == 0 { + missing = append(missing, "消毒") + } + bio["seedSourceCount"] = seedCount + bio["disinfectionCount"] = disinfectionCount + bio["evidenceSufficient"] = seedCount > 0 && disinfectionCount > 0 + bio["missing"] = missing + } + report["biosecurity"] = bio + // 传播途径推断 mode, source := service.TransmissionInference(t.Disease) report["transmission"] = map[string]interface{}{"mode": mode, "source": source} diff --git a/server-go/internal/model/biosecurity.go b/server-go/internal/model/biosecurity.go new file mode 100644 index 0000000..fe9a819 --- /dev/null +++ b/server-go/internal/model/biosecurity.go @@ -0,0 +1,144 @@ +package model + +import ( + "errors" + "fmt" + "strconv" + "strings" + "time" +) + +const QRVersion = 1 + +// IdentityLink 不透明二维码映射，避免把内部 ID 或个人信息放进二维码。 +type IdentityLink struct { + ID string `gorm:"type:uuid;primaryKey;default:gen_random_uuid()" json:"id"` + PublicID string `gorm:"column:public_id;size:64;uniqueIndex" json:"publicId"` + EntityType string `gorm:"column:entity_type;size:16;index" json:"entityType"` + EntityID string `gorm:"column:entity_id;size:128;uniqueIndex" json:"entityId"` + Version int `gorm:"default:1" json:"version"` + CreatedAt time.Time `gorm:"type:timestamptz" json:"createdAt"` + UpdatedAt time.Time `gorm:"type:timestamptz" json:"updatedAt"` +} + +func (IdentityLink) TableName() string { return "identity_links" } + +// SeedSource 蚕种来源与检疫链。 +type SeedSource struct { + ID string `gorm:"type:uuid;primaryKey;default:gen_random_uuid()" json:"id"` + PublicID string `gorm:"column:public_id;size:64;uniqueIndex" json:"publicId"` + BatchID *string `gorm:"column:batch_id;type:uuid;index" json:"batchId,omitempty"` + ParentID *string `gorm:"column:parent_id;type:uuid;index" json:"parentId,omitempty"` + Supplier string `gorm:"size:128" json:"supplier"` + SeedBatchNo string `gorm:"column:seed_batch_no;size:64" json:"seedBatchNo"` + QuarantineNo *string `gorm:"column:quarantine_no;size:64" json:"quarantineNo,omitempty"` + Variety *string `gorm:"size:64" json:"variety,omitempty"` + CertificateURL *string `gorm:"column:certificate_url;size:512" json:"certificateUrl,omitempty"` + EntryAt *time.Time `gorm:"column:entry_at;type:timestamptz" json:"entryAt,omitempty"` + Note *string `gorm:"type:text" json:"note,omitempty"` + CreatedBy *string `gorm:"column:created_by;type:uuid" json:"createdBy,omitempty"` + CreatedAt time.Time `gorm:"type:timestamptz" json:"createdAt"` + UpdatedAt time.Time `gorm:"type:timestamptz" json:"updatedAt"` +} + +func (SeedSource) TableName() string { return "seed_sources" } + +// DisinfectionRecord 消毒计划与执行记录。 +type DisinfectionRecord struct { + ID string `gorm:"type:uuid;primaryKey;default:gen_random_uuid()" json:"id"` + RoomID *string `gorm:"column:room_id;type:uuid;index" json:"roomId,omitempty"` + BatchID *string `gorm:"column:batch_id;type:uuid;index" json:"batchId,omitempty"` + Kind string `gorm:"size:16;default:plan" json:"kind"` // plan/execution + PlanID *string `gorm:"column:plan_id;type:uuid;index" json:"planId,omitempty"` + Agent string `gorm:"size:128" json:"agent"` + Concentration string `gorm:"size:64" json:"concentration"` + Amount *string `gorm:"size:64" json:"amount,omitempty"` + PlannedAt *time.Time `gorm:"column:planned_at;type:timestamptz" json:"plannedAt,omitempty"` + ExecutedAt *time.Time `gorm:"column:executed_at;type:timestamptz" json:"executedAt,omitempty"` + ExecutorID *string `gorm:"column:executor_id;type:uuid" json:"executorId,omitempty"` + ReviewedAt *time.Time `gorm:"column:reviewed_at;type:timestamptz" json:"reviewedAt,omitempty"` + ReviewerID *string `gorm:"column:reviewer_id;type:uuid" json:"reviewerId,omitempty"` + PhotoURL *string `gorm:"column:photo_url;size:512" json:"photoUrl,omitempty"` + Note *string `gorm:"type:text" json:"note,omitempty"` + CreatedBy *string `gorm:"column:created_by;type:uuid" json:"createdBy,omitempty"` + CreatedAt time.Time `gorm:"type:timestamptz" json:"createdAt"` + UpdatedAt time.Time `gorm:"type:timestamptz" json:"updatedAt"` +} + +func (DisinfectionRecord) TableName() string { return "disinfection_records" } + +// EncodeQRPayload 生成不透明二维码载荷。 +func EncodeQRPayload(entityType, publicID string, version int) string { + return fmt.Sprintf("silk:v1:%s:%s:%d", entityType, publicID, version) +} + +// ParseQRPayload 解析并校验二维码载荷。 +func ParseQRPayload(payload string) (string, string, int, error) { + parts := strings.Split(strings.TrimSpace(payload), ":") + if len(parts) != 5 || parts[0] != "silk" || parts[1] != "v1" { + return "", "", 0, errors.New("二维码格式不正确") + } + entityType := parts[2] + publicID := parts[3] + version, err := strconv.Atoi(parts[4]) + if err != nil || version <= 0 { + return "", "", 0, errors.New("二维码版本不正确") + } + if !ValidQRIdentityType(entityType) || publicID == "" { + return "", "", 0, errors.New("二维码身份无效") + } + return entityType, publicID, version, nil +} + +// ValidQRIdentityType 当前二维码支持的实体类型。 +func ValidQRIdentityType(entityType string) bool { + switch entityType { + case "batch", "tray", "sample": + return true + default: + return false + } +} + +// ValidateSeedSource 种源必填项。 +func ValidateSeedSource(source SeedSource) error { + if strings.TrimSpace(source.Supplier) == "" { + return errors.New("供应商不能为空") + } + if strings.TrimSpace(source.SeedBatchNo) == "" { + return errors.New("蚕种批号不能为空") + } + return nil +} + +// ValidateDisinfectionRecord 消毒必填项。 +func ValidateDisinfectionRecord(record DisinfectionRecord) error { + if record.Kind != "plan" && record.Kind != "execution" { + return errors.New("kind 仅支持 plan/execution") + } + if strings.TrimSpace(record.Agent) == "" { + return errors.New("消毒药剂不能为空") + } + if strings.TrimSpace(record.Concentration) == "" { + return errors.New("消毒浓度不能为空") + } + return nil +} + +// SeedSourceCycleError 检测种源链是否形成循环。 +func SeedSourceCycleError(chain map[string]string, id, parentID string) error { + seen := map[string]bool{id: true} + current := parentID + for current != "" { + if seen[current] { + return errors.New("种源链不能形成循环") + } + seen[current] = true + next := chain[current] + if next == current { + return errors.New("种源链不能自引用") + } + current = next + } + return nil +} diff --git a/server-go/internal/model/permission_seed.go b/server-go/internal/model/permission_seed.go index 2da896c..d4656f0 100644 --- a/server-go/internal/model/permission_seed.go +++ b/server-go/internal/model/permission_seed.go @@ -43,6 +43,8 @@ var AllPermissions = []PermissionDef{ {"consultation:write", "会诊管理", "发起会诊、出具意见与防控方案"}, {"trace:read", "溯源查看", "查看疫病溯源记录与报告"}, {"trace:write", "溯源管理", "发起溯源、执行排查清单与报告"}, + {"biosecurity:read", "生物安全查看", "查看种源、消毒和二维码身份"}, + {"biosecurity:write", "生物安全管理", "维护种源、消毒记录并签发二维码"}, {"user:manage", "用户管理", "管理用户、角色和权限"}, {"audit:read", "审计查看", "查看审计日志"}, } @@ -62,6 +64,7 @@ var RolePermissionMap = map[string][]string{ "consumable:read", "consumable:write", "consultation:read", "consultation:write", "trace:read", "trace:write", + "biosecurity:read", "biosecurity:write", "user:manage", "audit:read", }, RoleOperator: { @@ -77,6 +80,7 @@ var RolePermissionMap = map[string][]string{ "consumable:read", "consumable:write", "consultation:read", "consultation:write", "trace:read", "trace:write", + "biosecurity:read", "biosecurity:write", }, RoleViewer: { "dashboard:view", "room:read", "device:read", @@ -90,6 +94,7 @@ var RolePermissionMap = map[string][]string{ "consumable:read", "consultation:read", "trace:read", + "biosecurity:read", }, RoleFarmer: { "dashboard:view", "room:read", "device:read", "device:control", @@ -103,5 +108,6 @@ var RolePermissionMap = map[string][]string{ "consumable:read", "consultation:read", "trace:read", + "biosecurity:read", "biosecurity:write", }, } diff --git a/server-go/internal/model/tray_batch.go b/server-go/internal/model/tray_batch.go index 11c550d..6d61e75 100644 --- a/server-go/internal/model/tray_batch.go +++ b/server-go/internal/model/tray_batch.go @@ -21,14 +21,15 @@ type Batch struct { ID string `gorm:"type:uuid;primaryKey;default:gen_random_uuid()" json:"id"` RoomID string `gorm:"column:room_id;type:uuid;index" json:"roomId"` Name string `gorm:"size:64" json:"name"` - Variety *string `gorm:"size:64" json:"variety,omitempty"` // 品种 - Source *string `gorm:"size:128" json:"source,omitempty"` // 蚕种来源/供应商 - SeedBatchNo *string `gorm:"column:seed_batch_no;size:64" json:"seedBatchNo,omitempty"` // 蚕种批次号 - QuarantineNo *string `gorm:"column:quarantine_no;size:64" json:"quarantineNo,omitempty"` // 检疫证明编号 - Instar *int `gorm:"type:int" json:"instar,omitempty"` // 龄期 1-5 + Variety *string `gorm:"size:64" json:"variety,omitempty"` // 品种 + Source *string `gorm:"size:128" json:"source,omitempty"` // 蚕种来源/供应商 + SeedSourceID *string `gorm:"column:seed_source_id;type:uuid;index" json:"seedSourceId,omitempty"` + SeedBatchNo *string `gorm:"column:seed_batch_no;size:64" json:"seedBatchNo,omitempty"` // 蚕种批次号 + QuarantineNo *string `gorm:"column:quarantine_no;size:64" json:"quarantineNo,omitempty"` // 检疫证明编号 + Instar *int `gorm:"type:int" json:"instar,omitempty"` // 龄期 1-5 EnteredAt *time.Time `gorm:"column:entered_at;type:timestamptz" json:"enteredAt,omitempty"` // 入房时间 MountAt *time.Time `gorm:"column:mount_at;type:timestamptz" json:"mountAt,omitempty"` // 上蔟时间 - Status string `gorm:"size:16;default:rearing" json:"status"` // rearing/mounted/finished + Status string `gorm:"size:16;default:rearing" json:"status"` // rearing/mounted/finished Note *string `gorm:"type:text" json:"note,omitempty"` CreatedAt time.Time `gorm:"type:timestamptz" json:"createdAt"` UpdatedAt time.Time `gorm:"type:timestamptz" json:"updatedAt"` diff --git a/server-go/migrations/000006_biosecurity.down.sql b/server-go/migrations/000006_biosecurity.down.sql new file mode 100644 index 0000000..f048859 --- /dev/null +++ b/server-go/migrations/000006_biosecurity.down.sql @@ -0,0 +1,4 @@ +ALTER TABLE batches DROP COLUMN IF EXISTS seed_source_id; +DROP TABLE IF EXISTS identity_links CASCADE; +DROP TABLE IF EXISTS disinfection_records CASCADE; +DROP TABLE IF EXISTS seed_sources CASCADE; diff --git a/server-go/migrations/000006_biosecurity.up.sql b/server-go/migrations/000006_biosecurity.up.sql new file mode 100644 index 0000000..df57583 --- /dev/null +++ b/server-go/migrations/000006_biosecurity.up.sql @@ -0,0 +1,64 @@ +CREATE TABLE IF NOT EXISTS seed_sources ( + id uuid PRIMARY KEY DEFAULT gen_random_uuid(), + public_id varchar(64) NOT NULL, + batch_id uuid, + parent_id uuid, + supplier varchar(128) NOT NULL, + seed_batch_no varchar(64) NOT NULL, + quarantine_no varchar(64), + variety varchar(64), + certificate_url varchar(512), + entry_at timestamptz, + note text, + created_by uuid, + created_at timestamptz NOT NULL DEFAULT now(), + updated_at timestamptz NOT NULL DEFAULT now() +); + +CREATE UNIQUE INDEX IF NOT EXISTS idx_seed_sources_public_id ON seed_sources (public_id); +CREATE INDEX IF NOT EXISTS idx_seed_sources_batch_id ON seed_sources (batch_id); +CREATE INDEX IF NOT EXISTS idx_seed_sources_parent_id ON seed_sources (parent_id); + +CREATE TABLE IF NOT EXISTS disinfection_records ( + id uuid PRIMARY KEY DEFAULT gen_random_uuid(), + room_id uuid, + batch_id uuid, + kind varchar(16) NOT NULL DEFAULT 'plan', + plan_id uuid, + agent varchar(128) NOT NULL, + concentration varchar(64) NOT NULL, + amount varchar(64), + planned_at timestamptz, + executed_at timestamptz, + executor_id uuid, + reviewed_at timestamptz, + reviewer_id uuid, + photo_url varchar(512), + note text, + created_by uuid, + created_at timestamptz NOT NULL DEFAULT now(), + updated_at timestamptz NOT NULL DEFAULT now() +); + +CREATE INDEX IF NOT EXISTS idx_disinfection_records_room_id ON disinfection_records (room_id); +CREATE INDEX IF NOT EXISTS idx_disinfection_records_batch_id ON disinfection_records (batch_id); +CREATE INDEX IF NOT EXISTS idx_disinfection_records_plan_id ON disinfection_records (plan_id); + +CREATE TABLE IF NOT EXISTS identity_links ( + id uuid PRIMARY KEY DEFAULT gen_random_uuid(), + public_id varchar(64) NOT NULL, + entity_type varchar(16) NOT NULL, + entity_id varchar(128) NOT NULL, + version integer NOT NULL DEFAULT 1, + created_at timestamptz NOT NULL DEFAULT now(), + updated_at timestamptz NOT NULL DEFAULT now() +); + +CREATE UNIQUE INDEX IF NOT EXISTS idx_identity_links_public_id ON identity_links (public_id); +CREATE UNIQUE INDEX IF NOT EXISTS idx_identity_links_entity ON identity_links (entity_type, entity_id); +CREATE INDEX IF NOT EXISTS idx_identity_links_entity_type ON identity_links (entity_type); + +ALTER TABLE batches + ADD COLUMN IF NOT EXISTS seed_source_id uuid; + +CREATE INDEX IF NOT EXISTS idx_batches_seed_source_id ON batches (seed_source_id); diff --git a/web/src/dal/biosecurity.ts b/web/src/dal/biosecurity.ts new file mode 100644 index 0000000..83cc2c8 --- /dev/null +++ b/web/src/dal/biosecurity.ts @@ -0,0 +1,61 @@ +import { get, post, patch } from '../api/http'; + +export interface SeedSource { + id: string; + publicId?: string; + batchId?: string; + parentId?: string; + supplier: string; + seedBatchNo: string; + quarantineNo?: string; + variety?: string; + certificateUrl?: string; + entryAt?: string; + note?: string; + createdAt?: string; +} + +export interface DisinfectionRecord { + id: string; + roomId?: string; + batchId?: string; + kind: 'plan' | 'execution'; + planId?: string; + agent: string; + concentration: string; + amount?: string; + plannedAt?: string; + executedAt?: string; + executorId?: string; + reviewedAt?: string; + reviewerId?: string; + photoUrl?: string; + note?: string; + createdAt?: string; +} + +export interface QRIdentity { + publicId: string; + entityType: string; + entityId: string; + payload: string; +} + +export const listSeedSources = (params?: any) => + get('/biosecurity/seed-sources', { params }); +export const createSeedSource = (data: Partial) => + post('/biosecurity/seed-sources', data); +export const updateSeedSource = (id: string, data: Partial) => + patch(`/biosecurity/seed-sources/${id}`, data); + +export const listDisinfectionRecords = (params?: any) => + get('/biosecurity/disinfection-records', { params }); +export const createDisinfectionRecord = (data: Partial) => + post('/biosecurity/disinfection-records', data); +export const updateDisinfectionRecord = (id: string, data: Partial) => + patch(`/biosecurity/disinfection-records/${id}`, data); + +export const issueQR = (entityType: string, entityId: string) => + post('/biosecurity/qr', { entityType, entityId }); +export const resolveQR = (payload: string) => + post<{ entityType: string; publicId: string; entity: any }>('/biosecurity/qr/resolve', { payload }); diff --git a/web/src/layout/BasicLayout.tsx b/web/src/layout/BasicLayout.tsx index 8a7eec4..1b538e2 100644 --- a/web/src/layout/BasicLayout.tsx +++ b/web/src/layout/BasicLayout.tsx @@ -14,6 +14,7 @@ import { CameraOutlined, TeamOutlined, DeploymentUnitOutlined, + SafetyCertificateOutlined, SettingOutlined, LogoutOutlined, UserOutlined, @@ -42,6 +43,7 @@ const menuData = [ { path: '/lamp-tests', name: 'LAMP 检测', icon: , permission: 'lamp:read' }, { path: '/detection-tasks', name: '检测任务', icon: , permission: 'lamp:read' }, { path: '/consumables', name: '耗材管理', icon: , permission: 'consumable:read' }, + { path: '/biosecurity', name: '生物安全', icon: , permission: 'biosecurity:read' }, { path: '/inspections', name: '巡检记录', icon: , permission: 'inspection:read' }, { path: '/consultations', name: '专家会诊', icon: , permission: 'consultation:read' }, { path: '/traces', name: '疫病溯源', icon: , permission: 'trace:read' }, diff --git a/web/src/pages/Biosecurity.tsx b/web/src/pages/Biosecurity.tsx new file mode 100644 index 0000000..36ccaf3 --- /dev/null +++ b/web/src/pages/Biosecurity.tsx @@ -0,0 +1,272 @@ +import { useEffect, useRef, useState } from 'react'; +import { + Button, DatePicker, Form, Input, Modal, Select, Space, Tabs, Tag, message, +} from 'antd'; +import { PlusOutlined } from '@ant-design/icons'; +import { ProTable, type ActionType, type ProColumns } from '@ant-design/pro-components'; +import dayjs from 'dayjs'; +import { + createDisinfectionRecord, + createSeedSource, + issueQR, + listDisinfectionRecords, + listSeedSources, + resolveQR, + updateDisinfectionRecord, + type DisinfectionRecord, + type SeedSource, +} from '../dal/biosecurity'; +import { listHouses, type SilkwormHouse } from '../dal/silkworm'; +import { listBatches, type Batch } from '../dal/trayBatch'; +import { authService } from '../services/auth'; + +const KIND_LABELS: Record = { + plan: '计划', + execution: '执行', +}; + +const canWrite = () => authService.hasPermission('biosecurity:write'); + +export default function BiosecurityPage() { + const [rooms, setRooms] = useState([]); + const [batches, setBatches] = useState([]); + const [seedSources, setSeedSources] = useState([]); + const seedAction = useRef(); + const disinfectionAction = useRef(); + const [seedOpen, setSeedOpen] = useState(false); + const [seedForm] = Form.useForm(); + const [disinfectionOpen, setDisinfectionOpen] = useState(false); + const [disinfectionForm] = Form.useForm(); + const [qrIssued, setQrIssued] = useState(null); + const [qrResolved, setQrResolved] = useState(null); + const [qrForm] = Form.useForm(); + const [resolveForm] = Form.useForm(); + + useEffect(() => { + Promise.all([ + listHouses().catch(() => ({ items: [] as SilkwormHouse[] })), + listBatches().catch(() => [] as Batch[]), + listSeedSources().catch(() => [] as SeedSource[]), + ]).then(([houseRes, batchRes, seedRes]) => { + setRooms(houseRes.items); + setBatches(batchRes); + setSeedSources(seedRes); + }); + }, []); + + const roomName = (id?: string) => rooms.find((r) => r.id === id)?.name || id || '-'; + const batchName = (id?: string) => batches.find((b) => b.id === id)?.name || id || '-'; + + const seedColumns: ProColumns[] = [ + { title: '供应商', dataIndex: 'supplier' }, + { title: '批号', dataIndex: 'seedBatchNo' }, + { title: '检疫证', dataIndex: 'quarantineNo', search: false, render: (_, r) => r.quarantineNo || '-' }, + { title: '批次', dataIndex: 'batchId', search: false, render: (_, r) => batchName(r.batchId) }, + { title: '上链来源', dataIndex: 'parentId', search: false, render: (_, r) => r.parentId || '-' }, + { title: '创建时间', dataIndex: 'createdAt', search: false, render: (_, r) => (r.createdAt ? dayjs(r.createdAt).format('YYYY-MM-DD HH:mm') : '-') }, + ]; + + const disinfectionColumns: ProColumns[] = [ + { title: '类型', dataIndex: 'kind', valueEnum: Object.fromEntries(Object.entries(KIND_LABELS).map(([k, v]) => [k, { text: v }])) }, + { title: '蚕房', dataIndex: 'roomId', search: false, render: (_, r) => roomName(r.roomId) }, + { title: '批次', dataIndex: 'batchId', search: false, render: (_, r) => batchName(r.batchId) }, + { title: '药剂', dataIndex: 'agent' }, + { title: '浓度', dataIndex: 'concentration' }, + { title: '计划时间', dataIndex: 'plannedAt', search: false, render: (_, r) => (r.plannedAt ? dayjs(r.plannedAt).format('YYYY-MM-DD HH:mm') : '-') }, + { title: '执行时间', dataIndex: 'executedAt', search: false, render: (_, r) => (r.executedAt ? dayjs(r.executedAt).format('YYYY-MM-DD HH:mm') : '-') }, + { + title: '操作', + valueType: 'option', + render: (_, r) => [ + ...(canWrite() && !r.executedAt + ? [ + { + await updateDisinfectionRecord(r.id, { executedAt: new Date().toISOString() }); + message.success('已记录执行'); + disinfectionAction.current?.reload(); + }}>标记执行, + ] + : []), + ], + }, + ]; + + return ( + <> + + actionRef={seedAction} + rowKey="id" + columns={seedColumns} + search={false} + request={async () => { + const res = await listSeedSources(); + setSeedSources(res); + return { data: res, total: res.length, success: true }; + }} + toolBarRender={() => + canWrite() + ? [ + , + ] + : [] + } + /> + ), + }, + { + key: 'disinfection', + label: '消毒记录', + children: ( + + actionRef={disinfectionAction} + rowKey="id" + columns={disinfectionColumns} + search={false} + request={async (params) => { + const res = await listDisinfectionRecords({ kind: params.kind }); + return { data: res, total: res.length, success: true }; + }} + toolBarRender={() => + canWrite() + ? [ + , + ] + : [] + } + /> + ), + }, + { + key: 'qr', + label: '二维码身份', + children: ( + + { + setQrIssued(await issueQR(v.entityType, v.entityId)); + }}> + + + + + + {qrIssued ? ( +
+ 已签发 + 
{qrIssued.payload}
+
+ ) : null} +
{ + setQrResolved(await resolveQR(v.payload)); + }}> + + + + +
+ {qrResolved ? ( +
+ 解析结果 + 
{JSON.stringify(qrResolved, null, 2)}
+
+ ) : null} + + ), + }, + ]} + /> + + setSeedOpen(false)} + onOk={async () => { + const v = await seedForm.validateFields(); + await createSeedSource({ ...v, entryAt: v.entryAt?.toISOString() }); + message.success('种源已创建'); + setSeedOpen(false); + seedAction.current?.reload(); + }} + > +
+ + + + + + + + ({ value: s.id, label: `${s.supplier} ${s.seedBatchNo}` }))} /> + + + + + + + + + + + + + + + + +
+ + + setDisinfectionOpen(false)} + onOk={async () => { + const v = await disinfectionForm.validateFields(); + await createDisinfectionRecord(v); + message.success('消毒记录已创建'); + setDisinfectionOpen(false); + disinfectionAction.current?.reload(); + }} + > +
+ + ({ value: r.id, label: r.name }))} /> + + + + + + + + + + + + + +
+ + + ); +} diff --git a/web/src/router.tsx b/web/src/router.tsx index ebc0fb0..8bf4bf2 100644 --- a/web/src/router.tsx +++ b/web/src/router.tsx @@ -15,6 +15,7 @@ import Batches from './pages/Batches'; import LampTests from './pages/LampTests'; import DetectionTasks from './pages/DetectionTasks'; import Consumables from './pages/Consumables'; +import Biosecurity from './pages/Biosecurity'; import Inspections from './pages/Inspections'; import Consultations from './pages/Consultations'; import Traces from './pages/Traces'; @@ -59,6 +60,7 @@ export const router = createBrowserRouter([ { path: 'lamp-tests', element: }, { path: 'detection-tasks', element: }, { path: 'consumables', element: }, + { path: 'biosecurity', element: }, { path: 'inspections', element: }, { path: 'consultations', element: }, { path: 'traces', element: }, diff --git a/后续工作计划.md b/后续工作计划.md index 76a7b4b..06a919e 100644 --- a/后续工作计划.md +++ b/后续工作计划.md @@ -1,6 +1,6 @@ # 后续工作计划 -> **完成状态（2026-08-14 更新）**：#5-#24、#27 已完成，Task 0/1/2/4/5/6/8/9 整改代码完成（详见 `开发交接记录.md`）；#1-4 因物理机问题挂起；#23/#26 骨架完成；Task 3/7 延后到最后处理；微信/天气真实数据待凭证。 +> **完成状态（2026-08-14 更新）**：#5-#24、#27 已完成，Task 0/1/2/4/5/6/8/9/10 整改代码完成（详见 `开发交接记录.md`）；#1-4 因物理机问题挂起；#23/#26 骨架完成；Task 3/7 延后到最后处理；微信/天气真实数据待凭证。 ## 整改实施计划 Wave 0-4（2026-08-13 启动） @@ -18,7 +18,7 @@ | Wave 1 | P0 安全与正确性 | Task 7 修订 qPCR 判读与检测质控 | 延后到最后（跳过） | 用户 2026-08-14 明确要求跳过并留到最后；恢复前需领域专家确认 | | Wave 2 | 工程可靠性 | Task 8 建立可靠通知、吊销与跨实例状态 | 部分可用 | 待开发服务器迁移部署与 Redis/微信真实联调 | | Wave 2 | 工程可靠性 | Task 9 建立统一检测任务、样本链与发病事件 | 部分可用 | 待开发服务器迁移部署与端到端联调 | -| Wave 3 | 业务闭环 | Task 10 补齐消毒、种源与二维码身份链 | 未开始 | 无 | +| Wave 3 | 业务闭环 | Task 10 补齐消毒、种源与二维码身份链 | 部分可用 | 待开发服务器迁移部署与真实二维码/现场扫码联调 | | Wave 3 | 业务闭环 | Task 11 实现小程序离线巡检与可靠同步 | 未开始 | 无 | | Wave 3 | 业务闭环 | Task 12 完善环境规则、会诊治理、知识审核与效果评估 | 未开始 | 无 | | Wave 4 | 验收与发布 | Task 13 建立可观测性、容量与恢复验证 | 未开始 | 无 | diff --git a/开发交接记录.md b/开发交接记录.md index 0d9cb66..d55a4a9 100644 --- a/开发交接记录.md +++ b/开发交接记录.md @@ -1027,3 +1027,34 @@ MVP 沿用 IoTDB（现状）；TDengine 作为生产规模化候选（先基准 - 本任务前分支提交为 `a25bc7a`；回滚可还原 Task 9 提交； - 数据库回滚执行 `000005_detection_disease_events.down.sql`，可删除新表和关联列；已建立 `DiseaseEvent -> TraceRecord` 关联的数据会随回滚断开，回滚前需先备份； - Web 新页面回滚只需还原路由/菜单/页面文件，旧 LAMP 页面不受影响。 + +## 2026-08-14 整改 Task 10：补齐消毒、种源与二维码身份链 + +### 做了什么 + +- 新增 `seed_sources`、`disinfection_records`、`identity_links` 表及 `000006_biosecurity` 迁移；`batches` 增加 `seed_source_id`； +- 新增 `biosecurity:read/write` 权限并接入 admin/operator/viewer/farmer 角色； +- 种源链支持供应商、蚕种批号、检疫证号、入场时间、凭证 URL 和上链来源，创建/更新时检测循环引用； +- 消毒记录支持计划/执行两类，必填药剂和浓度，记录计划时间、执行时间、执行人、复核人和照片 URL； +- 二维码载荷只包含 `silk:v1:entityType:publicId:version`，通过 `identity_links` 映射到批次/蚕匾/样本；解析时校验实体存在、版本和权限； +- 溯源初报新增生物安全证据汇总，种源或消毒缺失时返回 `missing` 和 `evidenceSufficient=false`； +- Web 新增「生物安全」页面；小程序新增扫码与现场消毒执行页。 + +### 设计思路与决策依据 + +- 二维码不包含内部 ID、密码或个人信息，使用随机 `publicId` 和数据库映射，避免可猜测身份； +- 种源链采用 `parent_id` 表达跨批次关系，并用循环检测阻止错误引用； +- 消毒记录使用同一表承载计划和执行，执行记录可关联计划，便于现场录入和复核； +- 当前项目还没有组织级 ACL，二维码解析先按实体存在性和 `biosecurity:read` RBAC 控制，组织/房间级对象授权仍待后续任务。 + +### 验证结果 + +- `scripts/verify.ps1` exit 0：Go test/vet/build、Web test/lint/build、小程序 typecheck/build、APP typecheck/lint、AI pytest 15/15 均通过； +- 新增测试覆盖二维码篡改/版本解析、种源链循环/无环、消毒必填项； +- 未部署开发服务器，未执行 `000006` 迁移；未做真实二维码打印与小程序扫码联调。 + +### 回滚点 + +- 本任务前分支提交为 `cc93c9a`；回滚可还原 Task 10 提交； +- 数据库回滚执行 `000006_biosecurity.down.sql`，可删除种源、消毒、二维码映射表和 `batches.seed_source_id`； +- 页面回滚需同时还原 Web 路由/菜单、小程序页面与设置入口，并移除 `biosecurity` 权限种子。 From 69ef5a07045dc745429b1c1d1266a2b32cb6635c Mon Sep 17 00:00:00 2001 From: weijuesen Date: Fri, 14 Aug 2026 09:03:48 +0800 Subject: [PATCH 15/18] =?UTF-8?q?feat:=20=E5=AE=9E=E7=8E=B0=E5=B0=8F?= =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E7=A6=BB=E7=BA=BF=E5=B7=A1=E6=A3=80=E4=B8=8E?= =?UTF-8?q?=E5=8F=AF=E9=9D=A0=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 1 + miniapp/package.json | 1 + miniapp/src/api/inspections.ts | 22 +- miniapp/src/api/request.ts | 29 +++ .../src/pages/inspection/index.module.scss | 27 +++ miniapp/src/pages/inspection/index.tsx | 72 ++++++- miniapp/src/services/offlineQueue.test.ts | 99 +++++++++ miniapp/src/services/offlineQueue.ts | 196 ++++++++++++++++++ miniapp/src/services/offlineQueueApp.ts | 19 ++ miniapp/src/store/useStore.ts | 9 + scripts/verify.ps1 | 1 + server-go/internal/database/migrate.go | 2 +- server-go/internal/database/migrate_test.go | 4 + server-go/internal/handler/inspection.go | 11 +- server-go/internal/model/inspection.go | 2 +- .../000007_inspection_idempotency.down.sql | 16 ++ .../000007_inspection_idempotency.up.sql | 17 ++ 后续工作计划.md | 4 +- 开发交接记录.md | 30 +++ 19 files changed, 543 insertions(+), 19 deletions(-) create mode 100644 miniapp/src/services/offlineQueue.test.ts create mode 100644 miniapp/src/services/offlineQueue.ts create mode 100644 miniapp/src/services/offlineQueueApp.ts create mode 100644 server-go/migrations/000007_inspection_idempotency.down.sql create mode 100644 server-go/migrations/000007_inspection_idempotency.up.sql diff --git a/README.md b/README.md index 31103a5..04e871b 100644 --- a/README.md +++ b/README.md @@ -71,6 +71,7 @@ - `ai-service/`：FastAPI + ONNX Runtime（默认 mock 模式；`POST /detect` 返回框/类别/置信度、`modelVersion`、`isMock`、`abnormalProbability`，`POST /internal/stream-tasks` 受限拉流任务，`GET /metrics` 监控指标） - 拍照上传 → AI 检测 → 风险评分（0-100 分，绿/黄/橙/红四级，只消费 AI 异常概率，缺失项不按 0 参与）→ 巡检记录（`inspection_records`，`Idempotency-Key` 幂等） - 小程序「拍照巡检」页；Web「巡检记录」页（技术员复查） +- 小程序离线巡检：拍照先入本地持久队列，联网后串行上传并复用同一幂等键；401 自动刷新后重试 ### 1.10 知识库与阶段风险提示（计划 #10/#13） diff --git a/miniapp/package.json b/miniapp/package.json index 952ea0a..f1b023f 100644 --- a/miniapp/package.json +++ b/miniapp/package.json @@ -10,6 +10,7 @@ "framework": "React" }, "scripts": { + "test": "ts-node --transpile-only src/services/offlineQueue.test.ts", "typecheck": "tsc --noEmit", "build:weapp": "taro build --type weapp", "build:swan": "taro build --type swan", diff --git a/miniapp/src/api/inspections.ts b/miniapp/src/api/inspections.ts index 7988676..6f05575 100644 --- a/miniapp/src/api/inspections.ts +++ b/miniapp/src/api/inspections.ts @@ -1,15 +1,17 @@ import Taro from '@tarojs/taro'; import { getApiBaseUrl } from './config'; -import { get } from './request'; +import { get, refreshSession } from './request'; import type { InspectionRecord } from '@/types'; export const uploadInspection = ( filePath: string, roomId?: string, + idempotencyKey?: string, + retried?: boolean, ): Promise => { const token = Taro.getStorageSync('token'); - const idempotencyKey = `insp-${Date.now()}-${Math.random().toString(36).slice(2, 10)}`; - const header: Record = { 'Idempotency-Key': idempotencyKey }; + const key = idempotencyKey || `insp-${Date.now()}-${Math.random().toString(36).slice(2, 10)}`; + const header: Record = { 'Idempotency-Key': key }; if (token) { header['Authorization'] = `Bearer ${token}`; } @@ -24,8 +26,20 @@ export const uploadInspection = ( success: (res) => { try { const body = JSON.parse(res.data || '{}'); + if (res.statusCode === 401 && !retried) { + refreshSession().then((ok) => { + if (ok) { + uploadInspection(filePath, roomId, key, true).then(resolve, reject); + } else { + reject(new Error('登录已过期，请重新登录')); + } + }); + return; + } if (res.statusCode >= 400) { - reject(new Error(body?.error || `上传失败 (${res.statusCode})`)); + const err = new Error(body?.error || `上传失败 (${res.statusCode})`) as Error & { statusCode?: number }; + err.statusCode = res.statusCode; + reject(err); return; } resolve(body as InspectionRecord); diff --git a/miniapp/src/api/request.ts b/miniapp/src/api/request.ts index 7b9ee18..a5ece0c 100644 --- a/miniapp/src/api/request.ts +++ b/miniapp/src/api/request.ts @@ -7,6 +7,7 @@ export interface RequestOptions { data?: Record; params?: Record; header?: Record; + _retried?: boolean; } function buildQueryString(params?: Record): string { @@ -21,6 +22,28 @@ function buildQueryString(params?: Record): string { return `?${qs}`; } +export async function refreshSession(): Promise { + const refreshToken = Taro.getStorageSync('refreshToken'); + if (!refreshToken) return false; + try { + const res = await Taro.request({ + url: `${getApiBaseUrl()}/auth/refresh`, + method: 'POST', + data: { refreshToken }, + header: { 'Content-Type': 'application/json' }, + timeout: 15000, + }); + const body = res.data as { accessToken?: string; refreshToken?: string; user?: unknown }; + if (res.statusCode !== 200 || !body.accessToken) return false; + Taro.setStorageSync('token', body.accessToken); + if (body.refreshToken) Taro.setStorageSync('refreshToken', body.refreshToken); + if (body.user) Taro.setStorageSync('user', body.user); + return true; + } catch { + return false; + } +} + export async function request(options: RequestOptions): Promise { const token = Taro.getStorageSync('token'); const baseUrl = getApiBaseUrl(); @@ -46,6 +69,12 @@ export async function request(options: RequestOptions): Promise }); if (res.statusCode === 401) { + if (!options._retried) { + options._retried = true; + if (await refreshSession()) { + return request(options); + } + } console.warn('[Request] 401 未授权，清除登录状态'); Taro.removeStorageSync('token'); Taro.removeStorageSync('refreshToken'); diff --git a/miniapp/src/pages/inspection/index.module.scss b/miniapp/src/pages/inspection/index.module.scss index 78e1b13..609f118 100644 --- a/miniapp/src/pages/inspection/index.module.scss +++ b/miniapp/src/pages/inspection/index.module.scss @@ -120,6 +120,33 @@ margin: $spacing-lg 0 $spacing-md; } +.queueMeta { + font-size: $font-size-xs; + color: $color-text-tertiary; + margin-bottom: $spacing-sm; +} + +.offlineCard { + background: #fff8e6; + border-radius: $radius-md; + padding: $spacing-md; + margin-bottom: $spacing-sm; + box-shadow: $shadow-card; +} + +.offlineStatus { + font-size: $font-size-xs; + color: $color-warning; + font-weight: $font-weight-semibold; +} + +.offlineError { + display: block; + font-size: $font-size-xs; + color: $color-error; + margin-top: $spacing-xs; +} + .historyList { display: flex; flex-direction: column; diff --git a/miniapp/src/pages/inspection/index.tsx b/miniapp/src/pages/inspection/index.tsx index f35fc48..8c973f1 100644 --- a/miniapp/src/pages/inspection/index.tsx +++ b/miniapp/src/pages/inspection/index.tsx @@ -2,7 +2,10 @@ import React, { useCallback, useEffect, useState } from 'react'; import { Button, Image, ScrollView, Text, View } from '@tarojs/components'; import Taro, { usePullDownRefresh } from '@tarojs/taro'; import styles from './index.module.scss'; -import { listInspections, uploadInspection } from '@/api/inspections'; +import { listInspections } from '@/api/inspections'; +import { offlineQueue } from '@/services/offlineQueueApp'; +import type { OfflineInspectionItem } from '@/services/offlineQueue'; +import { useStore } from '@/store/useStore'; import { formatRelativeTime } from '@/utils/format'; import type { InspectionRecord } from '@/types'; @@ -14,11 +17,19 @@ const CLASS_LABELS: Record = { const classLabel = (cls: string) => CLASS_LABELS[cls] || cls; const InspectionPage: React.FC = () => { + const syncOfflineQueue = useStore((s) => s.syncOfflineQueue); const [imagePath, setImagePath] = useState(''); const [uploading, setUploading] = useState(false); const [result, setResult] = useState(null); const [history, setHistory] = useState([]); const [loadingHistory, setLoadingHistory] = useState(false); + const [offlineItems, setOfflineItems] = useState([]); + const [queueStats, setQueueStats] = useState({ total: 0, pending: 0, synced: 0, failed: 0, conflict: 0, remaining: 30 }); + + const refreshQueue = useCallback(() => { + setOfflineItems(offlineQueue.list()); + setQueueStats(offlineQueue.stats()); + }, []); const loadHistory = useCallback(async () => { setLoadingHistory(true); @@ -31,13 +42,38 @@ const InspectionPage: React.FC = () => { }, []); useEffect(() => { + refreshQueue(); loadHistory(); - }, [loadHistory]); + syncOfflineQueue().then(() => { + refreshQueue(); + loadHistory(); + }); + }, [loadHistory, refreshQueue, syncOfflineQueue]); usePullDownRefresh(() => { - loadHistory().then(() => Taro.stopPullDownRefresh()); + syncOfflineQueue() + .then(() => { + refreshQueue(); + loadHistory(); + }) + .finally(() => Taro.stopPullDownRefresh()); }); + const persistImage = (tempPath: string) => + new Promise((resolve) => { + const taroAny = Taro as any; + const fs = taroAny.getFileSystemManager?.(); + if (!fs || !fs.saveFile) { + resolve(tempPath); + return; + } + fs.saveFile({ + tempFilePath: tempPath, + success: (res: { savedFilePath: string }) => resolve(res.savedFilePath), + fail: () => resolve(tempPath), + }); + }); + const handleChooseImage = () => { Taro.chooseImage({ count: 1, @@ -60,9 +96,11 @@ const InspectionPage: React.FC = () => { } setUploading(true); try { - const rec = await uploadInspection(imagePath); - setResult(rec); - Taro.showToast({ title: rec.aiStatus === 'done' ? '检测完成' : '检测失败', icon: 'none' }); + const savedPath = await persistImage(imagePath); + offlineQueue.enqueue(savedPath); + Taro.showToast({ title: '已保存到离线队列', icon: 'none' }); + await syncOfflineQueue(); + refreshQueue(); loadHistory(); } catch (err) { Taro.showToast({ @@ -136,6 +174,28 @@ const InspectionPage: React.FC = () => { ) : null} 巡检记录 + 离线队列（剩余 {queueStats.remaining}） + + 待同步 {queueStats.pending} · 失败 {queueStats.failed} · 冲突 {queueStats.conflict} + + {offlineItems.map((item) => ( + + + {item.state} + {item.idempotencyKey.slice(0, 18)} + + {item.error ? {item.error} : null} + + ))} + {history.map((rec) => ( diff --git a/miniapp/src/services/offlineQueue.test.ts b/miniapp/src/services/offlineQueue.test.ts new file mode 100644 index 0000000..0f42c9c --- /dev/null +++ b/miniapp/src/services/offlineQueue.test.ts @@ -0,0 +1,99 @@ +import * as assert from 'node:assert/strict'; +import { test } from 'node:test'; +import { createOfflineQueue, type QueueStorage } from './offlineQueue'; + +function memoryStorage(): QueueStorage { + const data = new Map(); + return { + getItem: (key) => data.get(key) ?? null, + setItem: (key, value) => void data.set(key, value), + removeItem: (key) => void data.delete(key), + }; +} + +test('offline queue persists and restores pending items', () => { + const storage = memoryStorage(); + const queue = createOfflineQueue({ + storage, + uploader: async () => ({ id: 'server-1' }), + now: () => 1000, + idGenerator: () => 'id-1', + }); + queue.enqueue('/tmp/a.png', 'room-1'); + const restored = createOfflineQueue({ + storage, + uploader: async () => ({ id: 'server-1' }), + now: () => 2000, + idGenerator: () => 'id-2', + }); + assert.equal(restored.list().length, 1); + assert.equal(restored.list()[0].idempotencyKey, 'insp-id-1'); +}); + +test('offline queue deduplicates repeated clicks', () => { + const queue = createOfflineQueue({ + storage: memoryStorage(), + uploader: async () => ({ id: 'server-1' }), + now: () => 1000, + idGenerator: () => 'id-1', + }); + const first = queue.enqueue('/tmp/a.png', 'room-1'); + const second = queue.enqueue('/tmp/a.png', 'room-1'); + assert.equal(first.id, second.id); + assert.equal(queue.stats().total, 1); +}); + +test('offline queue marks permanent 4xx as failed', async () => { + const queue = createOfflineQueue({ + storage: memoryStorage(), + uploader: async () => { + const err: Error & { statusCode?: number } = new Error('bad request'); + err.statusCode = 400; + throw err; + }, + now: () => 1000, + idGenerator: () => 'id-1', + }); + queue.enqueue('/tmp/a.png'); + const result = await queue.syncOnce(); + assert.equal(result.synced, 0); + assert.equal(queue.list()[0].state, 'failed'); +}); + +test('offline queue retries with backoff and fails permanently', async () => { + let attempts = 0; + let now = 1000; + const queue = createOfflineQueue({ + storage: memoryStorage(), + uploader: async () => { + attempts += 1; + throw new Error('network'); + }, + now: () => now, + idGenerator: () => 'id-1', + maxAttempts: 2, + backoffBase: 1000, + }); + queue.enqueue('/tmp/a.png'); + await queue.syncOnce(); + assert.equal(queue.list()[0].state, 'pending'); + assert.equal(queue.list()[0].attempts, 1); + now = 5000; + await queue.syncOnce(); + assert.equal(queue.list()[0].state, 'failed'); + assert.equal(queue.list()[0].attempts, 2); +}); + +test('offline queue removes synced references', async () => { + const queue = createOfflineQueue({ + storage: memoryStorage(), + uploader: async () => ({ id: 'server-1' }), + now: () => 1000, + idGenerator: () => 'id-1', + }); + queue.enqueue('/tmp/a.png'); + await queue.syncOnce(); + assert.equal(queue.stats().synced, 1); + assert.equal(queue.clearSynced(), 1); + assert.equal(queue.stats().total, 0); +}); diff --git a/miniapp/src/services/offlineQueue.ts b/miniapp/src/services/offlineQueue.ts new file mode 100644 index 0000000..7e8c98a --- /dev/null +++ b/miniapp/src/services/offlineQueue.ts @@ -0,0 +1,196 @@ +export type OfflineState = 'pending' | 'uploading' | 'synced' | 'conflict' | 'failed'; + +export interface OfflineInspectionItem { + id: string; + idempotencyKey: string; + imagePath: string; + roomId?: string; + state: OfflineState; + attempts: number; + nextAttemptAt: number; + error?: string; + serverId?: string; + createdAt: number; + updatedAt: number; +} + +export interface QueueStorage { + getItem(key: string): string | null; + setItem(key: string, value: string): void; + removeItem(key: string): void; +} + +export interface QueueUploadInput { + imagePath: string; + roomId?: string; + idempotencyKey: string; +} + +export interface QueueUploader { + (input: QueueUploadInput): Promise<{ id: string }>; +} + +export interface OfflineQueueDeps { + storage: QueueStorage; + uploader: QueueUploader; + now?: () => number; + idGenerator?: () => string; + maxItems?: number; + maxAttempts?: number; + backoffBase?: number; +} + +const STORAGE_KEY = 'offline_inspection_queue'; +export const OFFLINE_QUEUE_STORAGE_KEY = STORAGE_KEY; + +function loadQueue(storage: QueueStorage): OfflineInspectionItem[] { + const raw = storage.getItem(STORAGE_KEY); + if (!raw) return []; + try { + const parsed = JSON.parse(raw); + return Array.isArray(parsed) ? parsed : []; + } catch { + return []; + } +} + +function saveQueue(storage: QueueStorage, items: OfflineInspectionItem[]): void { + storage.setItem(STORAGE_KEY, JSON.stringify(items)); +} + +function errorMessage(err: unknown): string { + return err instanceof Error ? err.message : String(err); +} + +export function createOfflineQueue(deps: OfflineQueueDeps) { + const now = deps.now || (() => Date.now()); + const idGenerator = deps.idGenerator || (() => `offline-${now()}-${Math.random().toString(36).slice(2, 10)}`); + const maxItems = deps.maxItems || 30; + const maxAttempts = deps.maxAttempts || 8; + const backoffBase = deps.backoffBase || 30000; + + const enqueue = (imagePath: string, roomId?: string): OfflineInspectionItem => { + const items = loadQueue(deps.storage); + const duplicate = items.find( + (item) => + item.imagePath === imagePath && + item.roomId === roomId && + (item.state === 'pending' || item.state === 'uploading'), + ); + if (duplicate) return duplicate; + if (items.length >= maxItems) { + throw new Error('离线巡检队列已满，请先清理已同步记录'); + } + const timestamp = now(); + const item: OfflineInspectionItem = { + id: idGenerator(), + idempotencyKey: `insp-${idGenerator()}`, + imagePath, + roomId, + state: 'pending', + attempts: 0, + nextAttemptAt: timestamp, + createdAt: timestamp, + updatedAt: timestamp, + }; + items.unshift(item); + saveQueue(deps.storage, items); + return item; + }; + + const list = (): OfflineInspectionItem[] => loadQueue(deps.storage); + + const remove = (id: string): void => { + saveQueue(deps.storage, loadQueue(deps.storage).filter((item) => item.id !== id)); + }; + + const clearSynced = (): number => { + const items = loadQueue(deps.storage); + const before = items.length; + saveQueue(deps.storage, items.filter((item) => item.state !== 'synced')); + return before - loadQueue(deps.storage).length; + }; + + const retry = (id: string): OfflineInspectionItem | null => { + const items = loadQueue(deps.storage); + const item = items.find((entry) => entry.id === id); + if (!item || item.state === 'synced') return null; + item.state = 'pending'; + item.error = undefined; + item.nextAttemptAt = now(); + item.updatedAt = now(); + saveQueue(deps.storage, items); + return item; + }; + + const syncOnce = async (): Promise<{ + synced: number; + item?: OfflineInspectionItem; + error?: string; + }> => { + const items = loadQueue(deps.storage); + const item = items.find((entry) => entry.state === 'pending' && entry.nextAttemptAt <= now()); + if (!item) return { synced: 0 }; + item.state = 'uploading'; + item.updatedAt = now(); + saveQueue(deps.storage, items); + try { + const result = await deps.uploader({ + imagePath: item.imagePath, + roomId: item.roomId, + idempotencyKey: item.idempotencyKey, + }); + const updated = loadQueue(deps.storage); + const current = updated.find((entry) => entry.id === item.id); + if (current) { + current.state = 'synced'; + current.serverId = result.id; + current.error = undefined; + current.updatedAt = now(); + saveQueue(deps.storage, updated); + } + return { synced: 1, item: current || item }; + } catch (err) { + const updated = loadQueue(deps.storage); + const current = updated.find((entry) => entry.id === item.id); + if (!current) return { synced: 0, error: errorMessage(err) }; + current.attempts += 1; + current.error = errorMessage(err); + const status = (err as { statusCode?: number }).statusCode; + const permanent = + status !== undefined && + status >= 400 && + status < 500 && + status !== 401 && + status !== 408 && + status !== 429; + if (permanent) { + current.state = status === 409 ? 'conflict' : 'failed'; + } else if (current.attempts >= maxAttempts) { + current.state = 'failed'; + } else { + current.state = 'pending'; + current.nextAttemptAt = now() + backoffBase * Math.min(Math.pow(2, current.attempts - 1), 16); + } + current.updatedAt = now(); + saveQueue(deps.storage, updated); + return { synced: 0, item: current, error: current.error }; + } + }; + + const stats = () => { + const items = loadQueue(deps.storage); + return { + total: items.length, + pending: items.filter((item) => item.state === 'pending' || item.state === 'uploading').length, + synced: items.filter((item) => item.state === 'synced').length, + failed: items.filter((item) => item.state === 'failed').length, + conflict: items.filter((item) => item.state === 'conflict').length, + remaining: Math.max(0, maxItems - items.length), + }; + }; + + return { enqueue, list, remove, clearSynced, retry, syncOnce, stats }; +} + +export type OfflineQueue = ReturnType; diff --git a/miniapp/src/services/offlineQueueApp.ts b/miniapp/src/services/offlineQueueApp.ts new file mode 100644 index 0000000..2ad7294 --- /dev/null +++ b/miniapp/src/services/offlineQueueApp.ts @@ -0,0 +1,19 @@ +import Taro from '@tarojs/taro'; +import { uploadInspection } from '@/api/inspections'; +import { createOfflineQueue, OFFLINE_QUEUE_STORAGE_KEY } from './offlineQueue'; + +const storage = { + getItem: (key: string) => { + const value = Taro.getStorageSync(key); + return typeof value === 'string' && value ? value : null; + }, + setItem: (key: string, value: string) => Taro.setStorageSync(key, value), + removeItem: (key: string) => Taro.removeStorageSync(key), +}; + +export const offlineQueue = createOfflineQueue({ + storage, + uploader: (input) => uploadInspection(input.imagePath, input.roomId, input.idempotencyKey), +}); + +export { OFFLINE_QUEUE_STORAGE_KEY }; diff --git a/miniapp/src/store/useStore.ts b/miniapp/src/store/useStore.ts index 89e5d05..251ee81 100644 --- a/miniapp/src/store/useStore.ts +++ b/miniapp/src/store/useStore.ts @@ -3,6 +3,7 @@ import Taro from '@tarojs/taro'; import type { User } from '@/types'; import { getCurrentUser } from '@/api/auth'; import { wsManager } from '@/utils/ws'; +import { offlineQueue } from '@/services/offlineQueueApp'; interface AppState { token: string | null; @@ -13,6 +14,7 @@ interface AppState { logout: () => void; isLoggedIn: () => boolean; restoreSession: () => Promise; + syncOfflineQueue: () => Promise; } export const useStore = create((set, get) => ({ @@ -49,4 +51,11 @@ export const useStore = create((set, get) => ({ } set({ isReady: true }); }, + syncOfflineQueue: async () => { + let synced = 0; + do { + const result = await offlineQueue.syncOnce(); + synced = result.synced; + } while (synced > 0); + }, })); diff --git a/scripts/verify.ps1 b/scripts/verify.ps1 index f2ba91b..f6e5870 100644 --- a/scripts/verify.ps1 +++ b/scripts/verify.ps1 @@ -59,6 +59,7 @@ try { Push-Location (Join-Path $root 'miniapp') try { + Invoke-Check 'miniapp test' { npm test } Invoke-Check 'miniapp typecheck' { npm run typecheck } Invoke-Check 'miniapp build:weapp' { npm run build:weapp } } finally { diff --git a/server-go/internal/database/migrate.go b/server-go/internal/database/migrate.go index e03fa38..64f3b1e 100644 --- a/server-go/internal/database/migrate.go +++ b/server-go/internal/database/migrate.go @@ -13,7 +13,7 @@ import ( ) // CurrentSchemaVersion 是当前后端代码期望的迁移版本。 -const CurrentSchemaVersion = "6" +const CurrentSchemaVersion = "7" // RunMigrations 使用嵌入式 SQL 迁移文件将数据库升级到最新版本。 func RunMigrations(db *gorm.DB) error { diff --git a/server-go/internal/database/migrate_test.go b/server-go/internal/database/migrate_test.go index 44d0a26..36060b2 100644 --- a/server-go/internal/database/migrate_test.go +++ b/server-go/internal/database/migrate_test.go @@ -116,4 +116,8 @@ func TestEmbeddedMigrationsIncludeBaseline(t *testing.T) { if err != nil || next != 6 { t.Fatalf("expected biosecurity migration version 6, got %d (err %v)", next, err) } + next, err = driver.Next(next) + if err != nil || next != 7 { + t.Fatalf("expected inspection idempotency migration version 7, got %d (err %v)", next, err) + } } diff --git a/server-go/internal/handler/inspection.go b/server-go/internal/handler/inspection.go index c08fa8f..dbf5822 100644 --- a/server-go/internal/handler/inspection.go +++ b/server-go/internal/handler/inspection.go @@ -70,10 +70,11 @@ func createInspection(db *gorm.DB, s3 *service.S3Service, ai *service.AIClient, return func(c *gin.Context) { idemKey := strings.TrimSpace(c.GetHeader("Idempotency-Key")) roomID := strings.TrimSpace(c.PostForm("roomId")) + userID := currentUserID(c) - if idemKey != "" { + if idemKey != "" && userID != nil { var exist model.InspectionRecord - if db.Where("idempotency_key = ?", idemKey).First(&exist).Error == nil { + if db.Where("user_id = ? AND idempotency_key = ?", *userID, idemKey).First(&exist).Error == nil { c.JSON(http.StatusOK, exist) return } @@ -113,7 +114,7 @@ func createInspection(db *gorm.DB, s3 *service.S3Service, ai *service.AIClient, imageURL := s3.Endpoint() + "/" + bucket + "/" + key rec := model.InspectionRecord{ - UserID: currentUserID(c), + UserID: userID, ImageURL: &imageURL, AIStatus: "done", } @@ -221,9 +222,9 @@ func createInspection(db *gorm.DB, s3 *service.S3Service, ai *service.AIClient, }) if txErr != nil { // 并发幂等：唯一索引冲突时返回已有记录 - if idemKey != "" { + if idemKey != "" && userID != nil { var exist model.InspectionRecord - if db.Where("idempotency_key = ?", idemKey).First(&exist).Error == nil { + if db.Where("user_id = ? AND idempotency_key = ?", *userID, idemKey).First(&exist).Error == nil { c.JSON(http.StatusOK, exist) return } diff --git a/server-go/internal/model/inspection.go b/server-go/internal/model/inspection.go index 0c943be..a5a683b 100644 --- a/server-go/internal/model/inspection.go +++ b/server-go/internal/model/inspection.go @@ -18,7 +18,7 @@ type InspectionRecord struct { ModelVersion *string `gorm:"column:model_version;size:64" json:"modelVersion,omitempty"` IsMock *bool `gorm:"column:is_mock;default:false" json:"isMock,omitempty"` AIStatus string `gorm:"column:ai_status;size:16;default:done" json:"aiStatus"` - IdempotencyKey *string `gorm:"column:idempotency_key;size:128;uniqueIndex" json:"idempotencyKey,omitempty"` + IdempotencyKey *string `gorm:"column:idempotency_key;size:128" json:"idempotencyKey,omitempty"` CreatedAt time.Time `gorm:"type:timestamptz" json:"createdAt"` UpdatedAt time.Time `gorm:"type:timestamptz" json:"updatedAt"` RoomName *string `gorm:"-" json:"roomName,omitempty"` diff --git a/server-go/migrations/000007_inspection_idempotency.down.sql b/server-go/migrations/000007_inspection_idempotency.down.sql new file mode 100644 index 0000000..2b2ab40 --- /dev/null +++ b/server-go/migrations/000007_inspection_idempotency.down.sql @@ -0,0 +1,16 @@ +DROP INDEX IF EXISTS idx_inspection_records_user_idempotency; + +-- 恢复全局唯一索引前，先处理跨用户重复，保留所有记录。 +UPDATE inspection_records AS r +SET idempotency_key = r.idempotency_key || '#' || r.id +WHERE r.idempotency_key IS NOT NULL + AND EXISTS ( + SELECT 1 + FROM inspection_records AS x + WHERE x.idempotency_key = r.idempotency_key + AND x.id <> r.id + ); + +CREATE UNIQUE INDEX IF NOT EXISTS idx_inspection_records_idempotency_key + ON inspection_records (idempotency_key) + WHERE idempotency_key IS NOT NULL; diff --git a/server-go/migrations/000007_inspection_idempotency.up.sql b/server-go/migrations/000007_inspection_idempotency.up.sql new file mode 100644 index 0000000..b1376ed --- /dev/null +++ b/server-go/migrations/000007_inspection_idempotency.up.sql @@ -0,0 +1,17 @@ +-- 保留全部历史记录，只对同用户重复键追加记录 ID，避免迁移删除或丢失数据。 +UPDATE inspection_records AS r +SET idempotency_key = r.idempotency_key || '#' || r.id +WHERE r.idempotency_key IS NOT NULL + AND EXISTS ( + SELECT 1 + FROM inspection_records AS x + WHERE x.user_id IS NOT DISTINCT FROM r.user_id + AND x.idempotency_key = r.idempotency_key + AND x.id <> r.id + ); + +DROP INDEX IF EXISTS idx_inspection_records_idempotency_key; + +CREATE UNIQUE INDEX IF NOT EXISTS idx_inspection_records_user_idempotency + ON inspection_records (user_id, idempotency_key) + WHERE idempotency_key IS NOT NULL; diff --git a/后续工作计划.md b/后续工作计划.md index 06a919e..c6020bd 100644 --- a/后续工作计划.md +++ b/后续工作计划.md @@ -1,6 +1,6 @@ # 后续工作计划 -> **完成状态（2026-08-14 更新）**：#5-#24、#27 已完成，Task 0/1/2/4/5/6/8/9/10 整改代码完成（详见 `开发交接记录.md`）；#1-4 因物理机问题挂起；#23/#26 骨架完成；Task 3/7 延后到最后处理；微信/天气真实数据待凭证。 +> **完成状态（2026-08-14 更新）**：#5-#24、#27 已完成，Task 0/1/2/4/5/6/8/9/10/11 整改代码完成（详见 `开发交接记录.md`）；#1-4 因物理机问题挂起；#23/#26 骨架完成；Task 3/7 延后到最后处理；微信/天气真实数据待凭证。 ## 整改实施计划 Wave 0-4（2026-08-13 启动） @@ -19,7 +19,7 @@ | Wave 2 | 工程可靠性 | Task 8 建立可靠通知、吊销与跨实例状态 | 部分可用 | 待开发服务器迁移部署与 Redis/微信真实联调 | | Wave 2 | 工程可靠性 | Task 9 建立统一检测任务、样本链与发病事件 | 部分可用 | 待开发服务器迁移部署与端到端联调 | | Wave 3 | 业务闭环 | Task 10 补齐消毒、种源与二维码身份链 | 部分可用 | 待开发服务器迁移部署与真实二维码/现场扫码联调 | -| Wave 3 | 业务闭环 | Task 11 实现小程序离线巡检与可靠同步 | 未开始 | 无 | +| Wave 3 | 业务闭环 | Task 11 实现小程序离线巡检与可靠同步 | 部分可用 | 待开发服务器迁移部署与开发者工具离线/重启联调 | | Wave 3 | 业务闭环 | Task 12 完善环境规则、会诊治理、知识审核与效果评估 | 未开始 | 无 | | Wave 4 | 验收与发布 | Task 13 建立可观测性、容量与恢复验证 | 未开始 | 无 | | Wave 4 | 验收与发布 | Task 14 建立规格追踪、端到端验收与发布门禁 | 未开始 | 无 | diff --git a/开发交接记录.md b/开发交接记录.md index d55a4a9..e179794 100644 --- a/开发交接记录.md +++ b/开发交接记录.md @@ -1058,3 +1058,33 @@ MVP 沿用 IoTDB（现状）；TDengine 作为生产规模化候选（先基准 - 本任务前分支提交为 `cc93c9a`；回滚可还原 Task 10 提交； - 数据库回滚执行 `000006_biosecurity.down.sql`，可删除种源、消毒、二维码映射表和 `batches.seed_source_id`； - 页面回滚需同时还原 Web 路由/菜单、小程序页面与设置入口，并移除 `biosecurity` 权限种子。 + +## 2026-08-14 整改 Task 11：实现小程序离线巡检与可靠同步 + +### 做了什么 + +- 新增小程序本地持久队列 `offlineQueue.ts`，队列状态为 `pending/uploading/synced/conflict/failed`； +- 拍照巡检改为先保存图片到本地队列，网络恢复后串行上传；同一 `idempotencyKey` 创建后不再变化，重试复用； +- 上传 401 时先刷新 token 再重试一次；5xx/超时按指数退避重试，4xx 永久失败并展示错误，409 标记为冲突； +- 巡检页展示离线队列数量、剩余容量、失败/冲突和清理已同步入口； +- 登录恢复后会尝试同步离线队列；`scripts/verify.ps1` 新增 `miniapp test`，队列单测进入统一门禁； +- 服务端幂等键增加用户作用域：新增 `000007_inspection_idempotency` 迁移，唯一索引改为 `(user_id, idempotency_key)`，迁移先对既有同用户冲突键追加记录 ID，不删除任何记录。 + +### 设计思路与决策依据 + +- 离线上传不能依赖临时文件路径，页面入队前先用文件系统保存为本地持久路径； +- 幂等键必须客户端生成且固定，服务端按用户+键查询和唯一约束，避免不同用户撞键导致误返回； +- 4xx 通常是数据或权限问题，重试不会解决，所以进入人工处理；网络类错误才退避重试； +- 队列容量先按条目数量限制，页面显示剩余名额；后续需要更严格空间控制时可再引入文件大小统计。 + +### 验证结果 + +- `scripts/verify.ps1` exit 0：Go test/vet/build、Web test/lint/build、小程序 test/typecheck/build、APP typecheck/lint、AI pytest 15/15 均通过； +- 队列单测 5/5：重启恢复、重复点击、4xx 永久失败、指数退避后最终失败、同步后清理引用； +- 未部署开发服务器，未执行 `000007` 迁移；未在微信开发者工具完成离线→重启→联网截图取证。 + +### 回滚点 + +- 本任务前分支提交为 `6b222ab`；回滚可还原 Task 11 提交； +- 数据库回滚执行 `000007_inspection_idempotency.down.sql` 可恢复全局唯一索引，但已被迁移追加后缀的历史键不会自动还原； +- 小程序回滚需还原队列服务、巡检页、请求刷新逻辑和 store，并移除 `scripts/verify.ps1` 中的 `miniapp test` 步骤。 From 126c215a6b7d7b2220d55690788cfe198594168e Mon Sep 17 00:00:00 2001 From: weijuesen Date: Fri, 14 Aug 2026 10:33:17 +0800 Subject: [PATCH 16/18] =?UTF-8?q?feat:=20=E5=AE=8C=E5=96=84=E7=8E=AF?= =?UTF-8?q?=E5=A2=83=E8=A7=84=E5=88=99=E3=80=81=E4=BC=9A=E8=AF=8A=E6=B2=BB?= =?UTF-8?q?=E7=90=86=E3=80=81=E7=9F=A5=E8=AF=86=E5=AE=A1=E6=A0=B8=E4=B8=8E?= =?UTF-8?q?=E6=95=88=E6=9E=9C=E8=AF=84=E4=BC=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 1 + server-go/internal/database/db.go | 11 +- server-go/internal/database/migrate.go | 2 +- server-go/internal/database/migrate_test.go | 4 + server-go/internal/handler/consultation.go | 50 +++++- .../internal/handler/consultation_test.go | 28 ++++ server-go/internal/handler/health.go | 54 +++++++ server-go/internal/handler/knowledge.go | 49 ++++++ server-go/internal/model/consultation.go | 76 +++++---- server-go/internal/model/consultation_test.go | 47 ++++-- server-go/internal/model/governance.go | 49 ++++++ server-go/internal/model/knowledge.go | 82 ++++++---- .../model/knowledge_governance_test.go | 23 +++ server-go/internal/service/health_profile.go | 97 +++++++++++ .../internal/service/health_profile_test.go | 43 ++++- server-go/internal/service/rule_engine.go | 150 ++++++++++++++++++ .../internal/service/rule_engine_test.go | 60 +++++++ .../000008_governance_effectiveness.down.sql | 24 +++ .../000008_governance_effectiveness.up.sql | 66 ++++++++ web/src/dal/consultation.ts | 8 +- web/src/dal/health.ts | 14 ++ web/src/dal/knowledge.ts | 8 + web/src/pages/Consultations.tsx | 24 ++- web/src/pages/Knowledge.tsx | 10 ++ web/src/pages/Traces.tsx | 37 +++++ 后续工作计划.md | 4 +- 开发交接记录.md | 30 ++++ 27 files changed, 963 insertions(+), 88 deletions(-) create mode 100644 server-go/internal/handler/consultation_test.go create mode 100644 server-go/internal/model/governance.go create mode 100644 server-go/internal/model/knowledge_governance_test.go create mode 100644 server-go/internal/service/rule_engine.go create mode 100644 server-go/internal/service/rule_engine_test.go create mode 100644 server-go/migrations/000008_governance_effectiveness.down.sql create mode 100644 server-go/migrations/000008_governance_effectiveness.up.sql diff --git a/README.md b/README.md index 04e871b..1caa320 100644 --- a/README.md +++ b/README.md @@ -92,6 +92,7 @@ - 会诊单 + 病例快照（照片/AI/检测/环境/批次/天气）+ 状态机（受理/出方案/归档）+ 专家意见与防控方案 - Web「专家会诊」页 +- 会诊治理：统一状态机、SLA 超时标记、专家意见版本；知识库草稿/审核/发布/撤回；防控效果报告 ### 1.13 疫病溯源与区域统计（计划 #21/#22） diff --git a/server-go/internal/database/db.go b/server-go/internal/database/db.go index c2f0720..3894b29 100644 --- a/server-go/internal/database/db.go +++ b/server-go/internal/database/db.go @@ -44,6 +44,9 @@ func Init(cfg *config.Config) error { &model.SeedSource{}, &model.DisinfectionRecord{}, &model.IdentityLink{}, + &model.ConsultationOpinionVersion{}, + &model.RuleEngineResult{}, + &model.KnowledgeReview{}, &model.Tray{}, &model.Batch{}, &model.RearingRecord{}, &model.WechatBinding{}, &model.WeatherAlert{}, @@ -71,7 +74,9 @@ func seedKnowledge(db *gorm.DB) { var cnt int64 db.Model(&model.Disease{}).Where("name = ?", d.Name).Count(&cnt) if cnt == 0 { - if err := db.Create(&d).Error; err != nil { + seed := d + seed.Status = "published" + if err := db.Create(&seed).Error; err != nil { slog.Warn("写入病种种子失败", "name", d.Name, "err", err) } } @@ -80,7 +85,9 @@ func seedKnowledge(db *gorm.DB) { var cnt int64 db.Model(&model.KnowledgeArticle{}).Where("kind = ? AND title = ?", a.Kind, a.Title).Count(&cnt) if cnt == 0 { - if err := db.Create(&a).Error; err != nil { + seed := a + seed.Status = "published" + if err := db.Create(&seed).Error; err != nil { slog.Warn("写入知识文章种子失败", "title", a.Title, "err", err) } } diff --git a/server-go/internal/database/migrate.go b/server-go/internal/database/migrate.go index 64f3b1e..e581b86 100644 --- a/server-go/internal/database/migrate.go +++ b/server-go/internal/database/migrate.go @@ -13,7 +13,7 @@ import ( ) // CurrentSchemaVersion 是当前后端代码期望的迁移版本。 -const CurrentSchemaVersion = "7" +const CurrentSchemaVersion = "8" // RunMigrations 使用嵌入式 SQL 迁移文件将数据库升级到最新版本。 func RunMigrations(db *gorm.DB) error { diff --git a/server-go/internal/database/migrate_test.go b/server-go/internal/database/migrate_test.go index 36060b2..5a83e75 100644 --- a/server-go/internal/database/migrate_test.go +++ b/server-go/internal/database/migrate_test.go @@ -120,4 +120,8 @@ func TestEmbeddedMigrationsIncludeBaseline(t *testing.T) { if err != nil || next != 7 { t.Fatalf("expected inspection idempotency migration version 7, got %d (err %v)", next, err) } + next, err = driver.Next(next) + if err != nil || next != 8 { + t.Fatalf("expected governance migration version 8, got %d (err %v)", next, err) + } } diff --git a/server-go/internal/handler/consultation.go b/server-go/internal/handler/consultation.go index 83fb19b..2e3e3db 100644 --- a/server-go/internal/handler/consultation.go +++ b/server-go/internal/handler/consultation.go @@ -71,10 +71,10 @@ func getConsultation(db *gorm.DB) gin.HandlerFunc { func createConsultation(db *gorm.DB) gin.HandlerFunc { return func(c *gin.Context) { var body struct { - Title string `json:"title"` - Summary *string `json:"summary"` - RoomID *string `json:"roomId"` - BatchID *string `json:"batchId"` + Title string `json:"title"` + Summary *string `json:"summary"` + RoomID *string `json:"roomId"` + BatchID *string `json:"batchId"` LampTestID *string `json:"lampTestId"` } if err := c.ShouldBindJSON(&body); err != nil { @@ -93,7 +93,7 @@ func createConsultation(db *gorm.DB) gin.HandlerFunc { BatchID: body.BatchID, LampTestID: body.LampTestID, Summary: body.Summary, - Status: "pending", + Status: "unassigned", } if body.Title != "" { rec.Title = body.Title @@ -183,6 +183,16 @@ func updateConsultation(db *gorm.DB) gin.HandlerFunc { c.JSON(http.StatusBadRequest, gin.H{"error": "非法的会诊状态流转"}) return } + now := time.Now() + switch to { + case "assigned": + updates["assigned_at"] = now + updates["sla_deadline"] = now.Add(24 * time.Hour) + case "accepted": + updates["accepted_at"] = now + case "needs_info": + updates["needs_info_at"] = now + } } if len(updates) > 0 { db.Model(&model.Consultation{}).Where("id = ?", id).Updates(updates) @@ -208,6 +218,7 @@ func resolveConsultation(db *gorm.DB) gin.HandlerFunc { var body struct { Opinion string `json:"opinion"` Plan string `json:"plan"` + Reason string `json:"reason"` } if err := c.ShouldBindJSON(&body); err != nil { c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()}) @@ -218,19 +229,44 @@ func resolveConsultation(db *gorm.DB) gin.HandlerFunc { return } now := time.Now() + authorID := currentUserID(c) updates := map[string]interface{}{ "status": "resolved", - "expert_id": currentUserID(c), + "expert_id": authorID, "opinion": body.Opinion, "plan": body.Plan, "resolved_at": now, } - db.Model(&model.Consultation{}).Where("id = ?", id).Updates(updates) + var versionCount int64 + db.Model(&model.ConsultationOpinionVersion{}).Where("consultation_id = ?", id).Count(&versionCount) + version := int(versionCount) + 1 + if err := db.Create(&model.ConsultationOpinionVersion{ + ConsultationID: id, + Version: version, + AuthorID: authorID, + Opinion: body.Opinion, + Plan: body.Plan, + Reason: consultationStrPtr(body.Reason), + }).Error; err != nil { + c.JSON(http.StatusInternalServerError, gin.H{"error": "保存意见版本失败"}) + return + } + if err := db.Model(&model.Consultation{}).Where("id = ?", id).Updates(updates).Error; err != nil { + c.JSON(http.StatusInternalServerError, gin.H{"error": "保存会诊方案失败"}) + return + } db.Where("id = ?", id).First(&t) c.JSON(http.StatusOK, t) } } +func consultationStrPtr(value string) *string { + if value == "" { + return nil + } + return &value +} + // archiveConsultation 归档 func archiveConsultation(db *gorm.DB) gin.HandlerFunc { return func(c *gin.Context) { diff --git a/server-go/internal/handler/consultation_test.go b/server-go/internal/handler/consultation_test.go new file mode 100644 index 0000000..ef54c7c --- /dev/null +++ b/server-go/internal/handler/consultation_test.go @@ -0,0 +1,28 @@ +package handler + +import ( + "net/http" + "net/http/httptest" + "testing" + + "github.com/gin-gonic/gin" +) + +func TestConsultationStrPtr(t *testing.T) { + if consultationStrPtr("") != nil { + t.Error("空字符串应为 nil") + } + if got := consultationStrPtr("原因"); got == nil || *got != "原因" { + t.Errorf("非空字符串应返回指针: %v", got) + } +} + +func TestCanReviewKnowledge(t *testing.T) { + gin.SetMode(gin.TestMode) + rec := httptest.NewRecorder() + c, _ := gin.CreateTestContext(rec) + c.Request = httptest.NewRequest(http.MethodGet, "/", nil) + if canReviewKnowledge(c) { + t.Error("nil context 不应通过") + } +} diff --git a/server-go/internal/handler/health.go b/server-go/internal/handler/health.go index 19c0a80..805aa0a 100644 --- a/server-go/internal/handler/health.go +++ b/server-go/internal/handler/health.go @@ -24,6 +24,9 @@ func RegisterHealthProfileRoutes(rg *gin.RouterGroup, db *gorm.DB) { rg.GET("/health-profiles/:roomId", middleware.RequirePermission(db, "room:read"), roomHealthProfile(db)) + rg.GET("/health-profiles/:roomId/effect", + middleware.RequirePermission(db, "room:read"), + roomEffectReport(db)) } // roomHealthProfile 单蚕房健康画像：巡检风险/检测结果/事件聚合 → 综合健康分 @@ -99,3 +102,54 @@ func roomHealthProfile(db *gorm.DB) gin.HandlerFunc { }) } } + +// roomEffectReport 处置前后窗口效果报告。 +func roomEffectReport(db *gorm.DB) gin.HandlerFunc { + return func(c *gin.Context) { + roomID := c.Param("roomId") + now := time.Now() + parse := func(key string, fallback time.Time) time.Time { + raw := c.Query(key) + if raw == "" { + return fallback + } + t, err := time.Parse(time.RFC3339, raw) + if err != nil { + return fallback + } + return t + } + window := service.EffectWindow{ + BeforeStart: parse("beforeStart", now.Add(-60*24*time.Hour)), + BeforeEnd: parse("beforeEnd", now.Add(-30*24*time.Hour)), + AfterStart: parse("afterStart", now.Add(-30*24*time.Hour)), + AfterEnd: parse("afterEnd", now), + } + before, after := service.EffectMetrics{}, service.EffectMetrics{} + loadEffectMetrics := func(start, end time.Time) service.EffectMetrics { + metrics := service.EffectMetrics{} + db.Table("inspection_records"). + Where("room_id = ? AND ai_status = 'done' AND COALESCE(is_mock, false) = false AND risk_score IS NOT NULL AND created_at >= ? AND created_at < ?", roomID, start, end). + Pluck("risk_score", &metrics.RiskSamples) + var lampTotal int64 + db.Model(&model.LampTest{}). + Where("room_id = ? AND status = 'resulted' AND created_at >= ? AND created_at < ?", roomID, start, end). + Count(&lampTotal) + metrics.LampTotal = int(lampTotal) + var lampPositive int64 + db.Model(&model.LampTest{}). + Where("room_id = ? AND status = 'resulted' AND result = 'positive' AND created_at >= ? AND created_at < ?", roomID, start, end). + Count(&lampPositive) + metrics.LampPositive = int(lampPositive) + return metrics + } + before = loadEffectMetrics(window.BeforeStart, window.BeforeEnd) + after = loadEffectMetrics(window.AfterStart, window.AfterEnd) + var recurrences int64 + db.Model(&model.DiseaseEvent{}). + Where("room_id = ? AND status = 'reopened' AND created_at >= ? AND created_at < ?", roomID, window.AfterStart, window.AfterEnd). + Count(&recurrences) + after.Recurrences = int(recurrences) + c.JSON(http.StatusOK, service.EvaluateControlEffect(roomID, window, before, after)) + } +} diff --git a/server-go/internal/handler/knowledge.go b/server-go/internal/handler/knowledge.go index 6226fe2..606099f 100644 --- a/server-go/internal/handler/knowledge.go +++ b/server-go/internal/handler/knowledge.go @@ -80,6 +80,15 @@ func listDiseases(db *gorm.DB) gin.HandlerFunc { if enabled := c.Query("enabled"); enabled != "" { q = q.Where("enabled = ?", enabled == "true") } + if status := c.Query("status"); status != "" { + if !canReviewKnowledge(c) { + c.JSON(http.StatusForbidden, gin.H{"error": "无权限查看未发布内容"}) + return + } + q = q.Where("status = ?", status) + } else { + q = q.Where("status = 'published'") + } var list []model.Disease q.Order("sort_order ASC, name ASC").Find(&list) c.JSON(http.StatusOK, list) @@ -94,6 +103,10 @@ func getDisease(db *gorm.DB) gin.HandlerFunc { c.JSON(http.StatusNotFound, gin.H{"error": "disease not found"}) return } + if d.Status != "published" && !canReviewKnowledge(c) { + c.JSON(http.StatusNotFound, gin.H{"error": "disease not found"}) + return + } c.JSON(http.StatusOK, d) } } @@ -107,6 +120,7 @@ func createDisease(db *gorm.DB) gin.HandlerFunc { return } d.ID = "" + d.Status = "draft" if d.Name == "" { c.JSON(http.StatusBadRequest, gin.H{"error": "病种名称不能为空"}) return @@ -134,6 +148,10 @@ func updateDisease(db *gorm.DB) gin.HandlerFunc { return } if len(updates) > 0 { + if status, ok := updates["status"].(string); ok && !model.ValidKnowledgeTransition(d.Status, status) { + c.JSON(http.StatusBadRequest, gin.H{"error": "非法的知识状态流转"}) + return + } db.Model(&model.Disease{}).Where("id = ?", id).Updates(updates) } db.Where("id = ?", id).First(&d) @@ -165,6 +183,15 @@ func listArticles(db *gorm.DB) gin.HandlerFunc { if enabled := c.Query("enabled"); enabled != "" { q = q.Where("enabled = ?", enabled == "true") } + if status := c.Query("status"); status != "" { + if !canReviewKnowledge(c) { + c.JSON(http.StatusForbidden, gin.H{"error": "无权限查看未发布内容"}) + return + } + q = q.Where("status = ?", status) + } else { + q = q.Where("status = 'published'") + } var list []model.KnowledgeArticle q.Order("sort_order ASC, created_at DESC").Find(&list) c.JSON(http.StatusOK, list) @@ -179,6 +206,10 @@ func getArticle(db *gorm.DB) gin.HandlerFunc { c.JSON(http.StatusNotFound, gin.H{"error": "article not found"}) return } + if a.Status != "published" && !canReviewKnowledge(c) { + c.JSON(http.StatusNotFound, gin.H{"error": "article not found"}) + return + } c.JSON(http.StatusOK, a) } } @@ -192,6 +223,7 @@ func createArticle(db *gorm.DB) gin.HandlerFunc { return } a.ID = "" + a.Status = "draft" if a.Kind == "" || a.Title == "" { c.JSON(http.StatusBadRequest, gin.H{"error": "文章类型和标题不能为空"}) return @@ -219,6 +251,10 @@ func updateArticle(db *gorm.DB) gin.HandlerFunc { return } if len(updates) > 0 { + if status, ok := updates["status"].(string); ok && !model.ValidKnowledgeTransition(a.Status, status) { + c.JSON(http.StatusBadRequest, gin.H{"error": "非法的知识状态流转"}) + return + } db.Model(&model.KnowledgeArticle{}).Where("id = ?", id).Updates(updates) } db.Where("id = ?", id).First(&a) @@ -226,6 +262,19 @@ func updateArticle(db *gorm.DB) gin.HandlerFunc { } } +func canReviewKnowledge(c *gin.Context) bool { + user, ok := c.Get("user") + if !ok { + return false + } + m, ok := user.(map[string]interface{}) + if !ok { + return false + } + role, _ := m["role"].(string) + return role == "admin" || role == "operator" +} + // deleteArticle 删除知识文章 func deleteArticle(db *gorm.DB) gin.HandlerFunc { return func(c *gin.Context) { diff --git a/server-go/internal/model/consultation.go b/server-go/internal/model/consultation.go index f0c62b6..0fba4d3 100644 --- a/server-go/internal/model/consultation.go +++ b/server-go/internal/model/consultation.go @@ -7,46 +7,68 @@ import ( // Consultation 专家会诊单 type Consultation struct { - ID string `gorm:"type:uuid;primaryKey;default:gen_random_uuid()" json:"id"` - RoomID *string `gorm:"column:room_id;type:uuid;index" json:"roomId,omitempty"` - BatchID *string `gorm:"column:batch_id;type:uuid;index" json:"batchId,omitempty"` - LampTestID *string `gorm:"column:lamp_test_id;type:uuid;index" json:"lampTestId,omitempty"` - Title string `gorm:"size:128" json:"title"` - Summary *string `gorm:"type:text" json:"summary,omitempty"` - Snapshot json.RawMessage `gorm:"type:jsonb" json:"snapshot,omitempty"` - Status string `gorm:"size:16;default:pending" json:"status"` // pending/consulting/resolved/archived - ExpertID *string `gorm:"column:expert_id;type:uuid" json:"expertId,omitempty"` - Opinion *string `gorm:"type:text" json:"opinion,omitempty"` - Plan *string `gorm:"type:text" json:"plan,omitempty"` - ResolvedAt *time.Time `gorm:"column:resolved_at;type:timestamptz" json:"resolvedAt,omitempty"` - ArchivedAt *time.Time `gorm:"column:archived_at;type:timestamptz" json:"archivedAt,omitempty"` - CreatedAt time.Time `gorm:"type:timestamptz" json:"createdAt"` - UpdatedAt time.Time `gorm:"type:timestamptz" json:"updatedAt"` - RoomName *string `gorm:"-" json:"roomName,omitempty"` + ID string `gorm:"type:uuid;primaryKey;default:gen_random_uuid()" json:"id"` + RoomID *string `gorm:"column:room_id;type:uuid;index" json:"roomId,omitempty"` + BatchID *string `gorm:"column:batch_id;type:uuid;index" json:"batchId,omitempty"` + LampTestID *string `gorm:"column:lamp_test_id;type:uuid;index" json:"lampTestId,omitempty"` + Title string `gorm:"size:128" json:"title"` + Summary *string `gorm:"type:text" json:"summary,omitempty"` + Snapshot json.RawMessage `gorm:"type:jsonb" json:"snapshot,omitempty"` + Status string `gorm:"size:16;default:pending" json:"status"` // pending/consulting/resolved/archived + ExpertID *string `gorm:"column:expert_id;type:uuid" json:"expertId,omitempty"` + AssigneeID *string `gorm:"column:assignee_id;type:uuid" json:"assigneeId,omitempty"` + AssignedAt *time.Time `gorm:"column:assigned_at;type:timestamptz" json:"assignedAt,omitempty"` + AcceptedAt *time.Time `gorm:"column:accepted_at;type:timestamptz" json:"acceptedAt,omitempty"` + NeedsInfoAt *time.Time `gorm:"column:needs_info_at;type:timestamptz" json:"needsInfoAt,omitempty"` + SLADeadline *time.Time `gorm:"column:sla_deadline;type:timestamptz" json:"slaDeadline,omitempty"` + OverdueAt *time.Time `gorm:"column:overdue_at;type:timestamptz" json:"overdueAt,omitempty"` + LastSLAEventAt *time.Time `gorm:"column:last_sla_event_at;type:timestamptz" json:"lastSlaEventAt,omitempty"` + Opinion *string `gorm:"type:text" json:"opinion,omitempty"` + Plan *string `gorm:"type:text" json:"plan,omitempty"` + ResolvedAt *time.Time `gorm:"column:resolved_at;type:timestamptz" json:"resolvedAt,omitempty"` + ArchivedAt *time.Time `gorm:"column:archived_at;type:timestamptz" json:"archivedAt,omitempty"` + CreatedAt time.Time `gorm:"type:timestamptz" json:"createdAt"` + UpdatedAt time.Time `gorm:"type:timestamptz" json:"updatedAt"` + RoomName *string `gorm:"-" json:"roomName,omitempty"` } func (Consultation) TableName() string { return "consultations" } -// ValidConsultationTransition 状态流转规则：pending→consulting/resolved；consulting→resolved；resolved→archived +// ValidConsultationTransition 状态流转规则：unassigned/assigned/accepted/needs_info/resolved/archived。 func ValidConsultationTransition(from, to string) bool { switch from { - case "pending": - return to == "consulting" || to == "resolved" - case "consulting": - return to == "resolved" + case "unassigned": + return to == "assigned" + case "assigned": + return to == "accepted" || to == "needs_info" + case "accepted": + return to == "needs_info" || to == "resolved" + case "needs_info": + return to == "accepted" || to == "resolved" case "resolved": - return to == "archived" + return to == "archived" || to == "needs_info" default: return false } } +// ConsultationSLAState 返回会诊 SLA 状态；超时只标记，不自动伪造专家结论。 +func ConsultationSLAState(t Consultation, now time.Time) string { + if t.SLADeadline == nil { + return "unscheduled" + } + if now.After(*t.SLADeadline) { + return "overdue" + } + return "on_time" +} + // ConsultationSnapshot 病例快照（会诊时打包，避免引用数据变化） type ConsultationSnapshot struct { - RoomName string `json:"roomName,omitempty"` - LampTest *LampTest `json:"lampTest,omitempty"` + RoomName string `json:"roomName,omitempty"` + LampTest *LampTest `json:"lampTest,omitempty"` Inspection *InspectionRecord `json:"inspection,omitempty"` - Batch *Batch `json:"batch,omitempty"` - WeatherAlerts []WeatherAlert `json:"weatherAlerts,omitempty"` - CreatedAt time.Time `json:"createdAt"` + Batch *Batch `json:"batch,omitempty"` + WeatherAlerts []WeatherAlert `json:"weatherAlerts,omitempty"` + CreatedAt time.Time `json:"createdAt"` } diff --git a/server-go/internal/model/consultation_test.go b/server-go/internal/model/consultation_test.go index c54a8da..599a20a 100644 --- a/server-go/internal/model/consultation_test.go +++ b/server-go/internal/model/consultation_test.go @@ -8,9 +8,11 @@ import ( func TestValidConsultationTransition(t *testing.T) { ok := [][2]string{ - {"pending", "consulting"}, - {"pending", "resolved"}, - {"consulting", "resolved"}, + {"unassigned", "assigned"}, + {"assigned", "accepted"}, + {"assigned", "needs_info"}, + {"accepted", "resolved"}, + {"needs_info", "resolved"}, {"resolved", "archived"}, } for _, c := range ok { @@ -19,7 +21,8 @@ func TestValidConsultationTransition(t *testing.T) { } } bad := [][2]string{ - {"pending", "archived"}, + {"unassigned", "archived"}, + {"unassigned", "resolved"}, {"resolved", "resolved"}, {"archived", "pending"}, {"", "resolved"}, @@ -31,15 +34,41 @@ func TestValidConsultationTransition(t *testing.T) { } } +func TestConsultationRejectsArchiveBeforeResolution(t *testing.T) { + if ValidConsultationTransition("accepted", "archived") { + t.Fatal("accepted 不能直接归档") + } + if ValidConsultationTransition("unassigned", "archived") { + t.Fatal("unassigned 不能直接归档") + } +} + +func TestConsultationSLAMarksOverdue(t *testing.T) { + now := time.Now() + deadline := now.Add(-time.Hour) + task := Consultation{Status: "assigned", SLADeadline: &deadline} + if state := ConsultationSLAState(task, now); state != "overdue" { + t.Fatalf("SLA 状态 = %s, want overdue", state) + } + future := now.Add(time.Hour) + task.SLADeadline = &future + if state := ConsultationSLAState(task, now); state != "on_time" { + t.Fatalf("SLA 状态 = %s, want on_time", state) + } + if state := ConsultationSLAState(Consultation{}, now); state != "unscheduled" { + t.Fatalf("SLA 状态 = %s, want unscheduled", state) + } +} + func TestConsultationSnapshotJSON(t *testing.T) { now := time.Now() s := ConsultationSnapshot{ - RoomName: "蚕房1#", - LampTest: &LampTest{ID: "lamp-1", Status: "resulted"}, - Inspection: &InspectionRecord{ID: "insp-1", AIStatus: "done"}, - Batch: &Batch{ID: "batch-1", Name: "批次A"}, + RoomName: "蚕房1#", + LampTest: &LampTest{ID: "lamp-1", Status: "resulted"}, + Inspection: &InspectionRecord{ID: "insp-1", AIStatus: "done"}, + Batch: &Batch{ID: "batch-1", Name: "批次A"}, WeatherAlerts: []WeatherAlert{{Disease: "白僵病", Level: "orange"}}, - CreatedAt: now, + CreatedAt: now, } raw, err := json.Marshal(s) if err != nil { diff --git a/server-go/internal/model/governance.go b/server-go/internal/model/governance.go new file mode 100644 index 0000000..3add6b1 --- /dev/null +++ b/server-go/internal/model/governance.go @@ -0,0 +1,49 @@ +package model + +import ( + "encoding/json" + "time" +) + +// ConsultationOpinionVersion 专家意见版本，保留作者、时间、旧版本和修改原因。 +type ConsultationOpinionVersion struct { + ID string `gorm:"type:uuid;primaryKey;default:gen_random_uuid()" json:"id"` + ConsultationID string `gorm:"column:consultation_id;type:uuid;index" json:"consultationId"` + Version int `json:"version"` + AuthorID *string `gorm:"column:author_id;type:uuid" json:"authorId,omitempty"` + Opinion string `gorm:"type:text" json:"opinion"` + Plan string `gorm:"type:text" json:"plan"` + Reason *string `gorm:"type:text" json:"reason,omitempty"` + CreatedAt time.Time `gorm:"type:timestamptz" json:"createdAt"` +} + +func (ConsultationOpinionVersion) TableName() string { return "consultation_opinion_versions" } + +// RuleEngineResult 规则执行结果持久化。 +type RuleEngineResult struct { + ID string `gorm:"type:uuid;primaryKey;default:gen_random_uuid()" json:"id"` + RuleVersion string `gorm:"column:rule_version;size:64" json:"ruleVersion"` + Disease string `gorm:"size:64" json:"disease"` + Level *string `gorm:"size:16" json:"level,omitempty"` + Reason *string `gorm:"type:text" json:"reason,omitempty"` + InputSnapshot json.RawMessage `gorm:"column:input_snapshot;type:jsonb" json:"inputSnapshot"` + Missing json.RawMessage `gorm:"type:jsonb" json:"missing"` + ComputedAt time.Time `gorm:"column:computed_at;type:timestamptz" json:"computedAt"` + CreatedAt time.Time `gorm:"type:timestamptz" json:"createdAt"` +} + +func (RuleEngineResult) TableName() string { return "rule_engine_results" } + +// KnowledgeReview 知识内容审核记录。 +type KnowledgeReview struct { + ID string `gorm:"type:uuid;primaryKey;default:gen_random_uuid()" json:"id"` + EntityType string `gorm:"column:entity_type;size:32;index" json:"entityType"` + EntityID string `gorm:"column:entity_id;size:128;index" json:"entityId"` + Status string `gorm:"size:16" json:"status"` + ReviewerID *string `gorm:"column:reviewer_id;type:uuid" json:"reviewerId,omitempty"` + ReviewedAt *time.Time `gorm:"column:reviewed_at;type:timestamptz" json:"reviewedAt,omitempty"` + Note *string `gorm:"type:text" json:"note,omitempty"` + CreatedAt time.Time `gorm:"type:timestamptz" json:"createdAt"` +} + +func (KnowledgeReview) TableName() string { return "knowledge_reviews" } diff --git a/server-go/internal/model/knowledge.go b/server-go/internal/model/knowledge.go index 7dd259c..4695b47 100644 --- a/server-go/internal/model/knowledge.go +++ b/server-go/internal/model/knowledge.go @@ -4,41 +4,65 @@ import "time" // Disease 蚕病百科条目（知识库-蚕病百科） type Disease struct { - ID string `gorm:"type:uuid;primaryKey;default:gen_random_uuid()" json:"id"` - Name string `gorm:"size:64" json:"name"` - Category string `gorm:"size:32;index" json:"category"` // viral/fungal/bacterial/protozoan/other - Pathogen string `gorm:"type:text" json:"pathogen"` - Transmission string `gorm:"type:text" json:"transmission"` - Medium string `gorm:"type:text" json:"medium"` - Incubation string `gorm:"type:text" json:"incubation"` - Symptoms string `gorm:"type:text" json:"symptoms"` - HighRiskStage string `gorm:"column:high_risk_stage;type:text" json:"highRiskStage"` - HighRiskCondition string `gorm:"column:high_risk_condition;type:text" json:"highRiskCondition"` - LethalTime string `gorm:"column:lethal_time;type:text" json:"lethalTime"` - SpreadTrend string `gorm:"column:spread_trend;type:text" json:"spreadTrend"` - Recurrence string `gorm:"type:text" json:"recurrence"` - Detection string `gorm:"type:text" json:"detection"` - Prevention string `gorm:"type:text" json:"prevention"` - ImageURL *string `gorm:"column:image_url;size:512" json:"imageUrl,omitempty"` - SortOrder int `gorm:"column:sort_order;type:int;default:0" json:"sortOrder"` - Enabled bool `gorm:"default:true" json:"enabled"` - CreatedAt time.Time `gorm:"type:timestamptz" json:"createdAt"` - UpdatedAt time.Time `gorm:"type:timestamptz" json:"updatedAt"` + ID string `gorm:"type:uuid;primaryKey;default:gen_random_uuid()" json:"id"` + Name string `gorm:"size:64" json:"name"` + Category string `gorm:"size:32;index" json:"category"` // viral/fungal/bacterial/protozoan/other + Pathogen string `gorm:"type:text" json:"pathogen"` + Transmission string `gorm:"type:text" json:"transmission"` + Medium string `gorm:"type:text" json:"medium"` + Incubation string `gorm:"type:text" json:"incubation"` + Symptoms string `gorm:"type:text" json:"symptoms"` + HighRiskStage string `gorm:"column:high_risk_stage;type:text" json:"highRiskStage"` + HighRiskCondition string `gorm:"column:high_risk_condition;type:text" json:"highRiskCondition"` + LethalTime string `gorm:"column:lethal_time;type:text" json:"lethalTime"` + SpreadTrend string `gorm:"column:spread_trend;type:text" json:"spreadTrend"` + Recurrence string `gorm:"type:text" json:"recurrence"` + Detection string `gorm:"type:text" json:"detection"` + Prevention string `gorm:"type:text" json:"prevention"` + ImageURL *string `gorm:"column:image_url;size:512" json:"imageUrl,omitempty"` + Status string `gorm:"size:16;default:published;index" json:"status"` + Source *string `gorm:"type:text" json:"source,omitempty"` + SourceDate *time.Time `gorm:"column:source_date;type:date" json:"sourceDate,omitempty"` + ExpertConfirmedBy *string `gorm:"column:expert_confirmed_by;type:uuid" json:"expertConfirmedBy,omitempty"` + SortOrder int `gorm:"column:sort_order;type:int;default:0" json:"sortOrder"` + Enabled bool `gorm:"default:true" json:"enabled"` + CreatedAt time.Time `gorm:"type:timestamptz" json:"createdAt"` + UpdatedAt time.Time `gorm:"type:timestamptz" json:"updatedAt"` } func (Disease) TableName() string { return "diseases" } // KnowledgeArticle 知识文章（AI 结果解读、LAMP/SERS 教程、季节性防控提醒等） type KnowledgeArticle struct { - ID string `gorm:"type:uuid;primaryKey;default:gen_random_uuid()" json:"id"` - Kind string `gorm:"size:32;index" json:"kind"` // ai_guide/lamp_guide/sers_guide/seasonal_tip - Title string `gorm:"size:128" json:"title"` - Summary string `gorm:"type:text" json:"summary"` - Content string `gorm:"type:text" json:"content"` - SortOrder int `gorm:"column:sort_order;type:int;default:0" json:"sortOrder"` - Enabled bool `gorm:"default:true" json:"enabled"` - CreatedAt time.Time `gorm:"type:timestamptz" json:"createdAt"` - UpdatedAt time.Time `gorm:"type:timestamptz" json:"updatedAt"` + ID string `gorm:"type:uuid;primaryKey;default:gen_random_uuid()" json:"id"` + Kind string `gorm:"size:32;index" json:"kind"` // ai_guide/lamp_guide/sers_guide/seasonal_tip + Title string `gorm:"size:128" json:"title"` + Summary string `gorm:"type:text" json:"summary"` + Content string `gorm:"type:text" json:"content"` + Status string `gorm:"size:16;default:published;index" json:"status"` + Source *string `gorm:"type:text" json:"source,omitempty"` + SourceDate *time.Time `gorm:"column:source_date;type:date" json:"sourceDate,omitempty"` + ExpertConfirmedBy *string `gorm:"column:expert_confirmed_by;type:uuid" json:"expertConfirmedBy,omitempty"` + SortOrder int `gorm:"column:sort_order;type:int;default:0" json:"sortOrder"` + Enabled bool `gorm:"default:true" json:"enabled"` + CreatedAt time.Time `gorm:"type:timestamptz" json:"createdAt"` + UpdatedAt time.Time `gorm:"type:timestamptz" json:"updatedAt"` } func (KnowledgeArticle) TableName() string { return "knowledge_articles" } + +// ValidKnowledgeTransition 知识审核状态机：draft/review/published/withdrawn。 +func ValidKnowledgeTransition(from, to string) bool { + switch from { + case "draft": + return to == "review" || to == "withdrawn" + case "review": + return to == "published" || to == "withdrawn" || to == "draft" + case "published": + return to == "withdrawn" + case "withdrawn": + return to == "review" || to == "draft" + default: + return false + } +} diff --git a/server-go/internal/model/knowledge_governance_test.go b/server-go/internal/model/knowledge_governance_test.go new file mode 100644 index 0000000..555ad09 --- /dev/null +++ b/server-go/internal/model/knowledge_governance_test.go @@ -0,0 +1,23 @@ +package model + +import "testing" + +func TestValidKnowledgeTransition(t *testing.T) { + ok := [][2]string{ + {"draft", "review"}, + {"review", "published"}, + {"published", "withdrawn"}, + {"withdrawn", "review"}, + } + for _, tr := range ok { + if !ValidKnowledgeTransition(tr[0], tr[1]) { + t.Errorf("expected %s -> %s", tr[0], tr[1]) + } + } + if ValidKnowledgeTransition("draft", "published") { + t.Error("draft 不能直接 published") + } + if ValidKnowledgeTransition("published", "draft") { + t.Error("published 不能回草稿") + } +} diff --git a/server-go/internal/service/health_profile.go b/server-go/internal/service/health_profile.go index 81fa8d6..f9739ea 100644 --- a/server-go/internal/service/health_profile.go +++ b/server-go/internal/service/health_profile.go @@ -3,6 +3,7 @@ package service import ( "sort" "strings" + "time" ) // HealthInput 健康画像输入 @@ -85,3 +86,99 @@ func AggregateMonthlyStats(entries []MonthDiseaseEntry) []MonthStat { sort.Slice(result, func(i, j int) bool { return result[i].Month < result[j].Month }) return result } + +// EffectWindow 处置前后评估窗口。 +type EffectWindow struct { + BeforeStart time.Time `json:"beforeStart"` + BeforeEnd time.Time `json:"beforeEnd"` + AfterStart time.Time `json:"afterStart"` + AfterEnd time.Time `json:"afterEnd"` +} + +// EffectMetrics 处置前后指标输入。 +type EffectMetrics struct { + RiskSamples []float64 `json:"riskSamples"` + LampPositive int `json:"lampPositive"` + LampTotal int `json:"lampTotal"` + Recurrences int `json:"recurrences"` + Loss *float64 `json:"loss,omitempty"` + Cost *float64 `json:"cost,omitempty"` +} + +// EffectReport 防控效果报告；缺失维度不按 0 当改善。 +type EffectReport struct { + EventID string `json:"eventId"` + Window EffectWindow `json:"window"` + BeforeRiskAvg *float64 `json:"beforeRiskAvg,omitempty"` + AfterRiskAvg *float64 `json:"afterRiskAvg,omitempty"` + BeforePositiveRate *float64 `json:"beforePositiveRate,omitempty"` + AfterPositiveRate *float64 `json:"afterPositiveRate,omitempty"` + Recurrences int `json:"recurrences"` + Missing []string `json:"missing"` + Conclusion string `json:"conclusion"` +} + +// EvaluateControlEffect 对比指定窗口风险、阳性率和复发；缺失维度单独列出。 +func EvaluateControlEffect(eventID string, window EffectWindow, before, after EffectMetrics) EffectReport { + report := EffectReport{ + EventID: eventID, + Window: window, + Recurrences: after.Recurrences, + Missing: []string{}, + } + if len(before.RiskSamples) > 0 { + value := avg(before.RiskSamples) + report.BeforeRiskAvg = &value + } else { + report.Missing = append(report.Missing, "before_risk") + } + if len(after.RiskSamples) > 0 { + value := avg(after.RiskSamples) + report.AfterRiskAvg = &value + } else { + report.Missing = append(report.Missing, "after_risk") + } + if before.LampTotal > 0 { + value := float64(before.LampPositive) / float64(before.LampTotal) + report.BeforePositiveRate = &value + } else { + report.Missing = append(report.Missing, "before_lamp") + } + if after.LampTotal > 0 { + value := float64(after.LampPositive) / float64(after.LampTotal) + report.AfterPositiveRate = &value + } else { + report.Missing = append(report.Missing, "after_lamp") + } + if before.Loss == nil { + report.Missing = append(report.Missing, "before_loss") + } + if after.Loss == nil { + report.Missing = append(report.Missing, "after_loss") + } + if before.Cost == nil { + report.Missing = append(report.Missing, "before_cost") + } + if after.Cost == nil { + report.Missing = append(report.Missing, "after_cost") + } + switch { + case report.AfterRiskAvg == nil || report.BeforeRiskAvg == nil: + report.Conclusion = "证据不足，无法判断效果" + case *report.AfterRiskAvg < *report.BeforeRiskAvg && after.Recurrences == 0: + report.Conclusion = "改善" + case *report.AfterRiskAvg >= *report.BeforeRiskAvg: + report.Conclusion = "未改善" + default: + report.Conclusion = "需人工复核" + } + return report +} + +func avg(values []float64) float64 { + sum := 0.0 + for _, v := range values { + sum += v + } + return sum / float64(len(values)) +} diff --git a/server-go/internal/service/health_profile_test.go b/server-go/internal/service/health_profile_test.go index 8588adf..9b61c8a 100644 --- a/server-go/internal/service/health_profile_test.go +++ b/server-go/internal/service/health_profile_test.go @@ -1,17 +1,20 @@ package service -import "testing" +import ( + "testing" + "time" +) func TestComputeHealthScore(t *testing.T) { if s, g := ComputeHealthScore(HealthInput{}); s != 100 || g != "优" { t.Errorf("空输入应 100/优，实际 %.1f/%s", s, g) } bad := HealthInput{ - RecentRiskLevels: []string{"red", "red"}, - LampPositive: 1, - LampTotal: 2, + RecentRiskLevels: []string{"red", "red"}, + LampPositive: 1, + LampTotal: 2, ConsultationCount: 1, - TraceCount: 1, + TraceCount: 1, } s, g := ComputeHealthScore(bad) if s >= 80 { @@ -50,3 +53,33 @@ func TestAggregateMonthlyStats(t *testing.T) { t.Error("空输入应返回空") } } + +func TestEvaluateControlEffectComparesWindows(t *testing.T) { + window := EffectWindow{ + BeforeStart: time.Date(2026, 8, 1, 0, 0, 0, 0, time.UTC), + BeforeEnd: time.Date(2026, 8, 7, 0, 0, 0, 0, time.UTC), + AfterStart: time.Date(2026, 8, 8, 0, 0, 0, 0, time.UTC), + AfterEnd: time.Date(2026, 8, 14, 0, 0, 0, 0, time.UTC), + } + report := EvaluateControlEffect("event-1", window, EffectMetrics{ + RiskSamples: []float64{80}, LampPositive: 2, LampTotal: 3, + }, EffectMetrics{ + RiskSamples: []float64{40}, LampPositive: 1, LampTotal: 4, + }) + if report.Conclusion != "改善" { + t.Fatalf("结论 = %s, want 改善", report.Conclusion) + } + if report.BeforeRiskAvg == nil || *report.BeforeRiskAvg != 80 { + t.Fatalf("before risk = %+v", report.BeforeRiskAvg) + } +} + +func TestEvaluateControlEffectReportsMissing(t *testing.T) { + report := EvaluateControlEffect("event-1", EffectWindow{}, EffectMetrics{}, EffectMetrics{}) + if report.Conclusion != "证据不足，无法判断效果" { + t.Fatalf("无数据结论应为证据不足，实际 %s", report.Conclusion) + } + if len(report.Missing) < 4 { + t.Fatalf("缺失维度应单独列出: %v", report.Missing) + } +} diff --git a/server-go/internal/service/rule_engine.go b/server-go/internal/service/rule_engine.go new file mode 100644 index 0000000..7171f97 --- /dev/null +++ b/server-go/internal/service/rule_engine.go @@ -0,0 +1,150 @@ +package service + +import ( + "encoding/json" + "fmt" + "sort" + "time" +) + +// TelemetrySample 规则引擎遥测样本。 +type TelemetrySample struct { + Metric string `json:"metric"` + Value float64 `json:"value"` + Timestamp time.Time `json:"timestamp"` +} + +// RuleContext 规则输入；缺失项用 nil 表示，不填 0。 +type RuleContext struct { + Stage string `json:"stage,omitempty"` + Now time.Time `json:"now"` + Samples []TelemetrySample `json:"samples"` + Density *float64 `json:"density,omitempty"` + Ventilation *bool `json:"ventilation,omitempty"` + SeedSourceCount *int `json:"seedSourceCount,omitempty"` + DisinfectionCount *int `json:"disinfectionCount,omitempty"` +} + +// RuleVersion 可版本化规则。 +type RuleVersion struct { + Version string `json:"version"` + Name string `json:"name"` + Disease string `json:"disease"` + WindowHours int `json:"windowHours"` + MaxStaleness time.Duration `json:"-"` + RequiresDensity bool `json:"-"` + RequiresBiosecurity bool `json:"-"` +} + +// RuleResult 规则输出，保留版本、输入快照、缺失项和计算时间。 +type RuleResult struct { + RuleVersion string `json:"ruleVersion"` + RuleName string `json:"ruleName"` + Disease string `json:"disease"` + Matched bool `json:"matched"` + Level string `json:"level,omitempty"` + Reason string `json:"reason,omitempty"` + Missing []string `json:"missing"` + InputSnapshot json.RawMessage `json:"inputSnapshot"` + ComputedAt time.Time `json:"computedAt"` +} + +// EvaluateRules 按版本执行规则，所有缺失输入进入 Missing。 +func EvaluateRules(ctx RuleContext, rules []RuleVersion) []RuleResult { + if ctx.Now.IsZero() { + ctx.Now = time.Now() + } + results := make([]RuleResult, 0, len(rules)) + input, _ := json.Marshal(ctx) + for _, rule := range rules { + missing := ruleMissing(ctx, rule) + result := RuleResult{ + RuleVersion: rule.Version, + RuleName: rule.Name, + Disease: rule.Disease, + Missing: missing, + InputSnapshot: input, + ComputedAt: ctx.Now, + } + if len(missing) == 0 { + switch rule.Name { + case "continuous_humidity": + result.Matched, result.Level, result.Reason = evaluateContinuousHumidity(ctx, rule) + default: + result.Matched = false + result.Reason = "未配置规则实现" + } + } + results = append(results, result) + } + return results +} + +func ruleMissing(ctx RuleContext, rule RuleVersion) []string { + missing := []string{} + hasHumidity := false + hasStaleHumidity := false + for _, sample := range ctx.Samples { + if sample.Metric != "humidity" { + continue + } + if ctx.Now.Sub(sample.Timestamp) > rule.MaxStaleness { + hasStaleHumidity = true + continue + } + hasHumidity = true + } + if rule.Name == "continuous_humidity" { + if hasStaleHumidity && !hasHumidity { + missing = append(missing, "humidity_stale") + } + if !hasHumidity { + missing = append(missing, "humidity") + } + } + if rule.RequiresDensity && ctx.Density == nil { + missing = append(missing, "density") + } + if rule.RequiresBiosecurity { + if ctx.SeedSourceCount == nil { + missing = append(missing, "seed_source") + } + if ctx.DisinfectionCount == nil { + missing = append(missing, "disinfection") + } + } + return missing +} + +func evaluateContinuousHumidity(ctx RuleContext, rule RuleVersion) (bool, string, string) { + byDay := map[string]float64{} + for _, sample := range ctx.Samples { + if sample.Metric != "humidity" { + continue + } + day := sample.Timestamp.Format("2006-01-02") + if sample.Value > byDay[day] { + byDay[day] = sample.Value + } + } + days := make([]string, 0, len(byDay)) + for day := range byDay { + days = append(days, day) + } + sort.Strings(days) + for i := 2; i < len(days); i++ { + if consecutiveDays(days[i-2], days[i-1], days[i]) && byDay[days[i-2]] >= 80 && byDay[days[i-1]] >= 80 && byDay[days[i]] >= 80 { + return true, "orange", fmt.Sprintf("连续 %d 天湿度≥80%%，满足规则 %s", rule.WindowHours, rule.Version) + } + } + return false, "", "连续高湿天数不足或窗口内存在缺失" +} + +func consecutiveDays(a, b, c string) bool { + parse := func(s string) time.Time { + t, _ := time.Parse("2006-01-02", s) + return t + } + da, db, dc := parse(a), parse(b), parse(c) + return db.Sub(da) == 24*time.Hour && dc.Sub(db) == 24*time.Hour +} diff --git a/server-go/internal/service/rule_engine_test.go b/server-go/internal/service/rule_engine_test.go new file mode 100644 index 0000000..3ef1fc1 --- /dev/null +++ b/server-go/internal/service/rule_engine_test.go @@ -0,0 +1,60 @@ +package service + +import ( + "encoding/json" + "testing" + "time" +) + +func TestRuleRequiresThreeContinuousDaysOfHumidity(t *testing.T) { + now := time.Date(2026, 8, 14, 12, 0, 0, 0, time.UTC) + samples := []TelemetrySample{ + {Metric: "humidity", Value: 85, Timestamp: now.Add(-72 * time.Hour)}, + {Metric: "humidity", Value: 83, Timestamp: now.Add(-48 * time.Hour)}, + {Metric: "humidity", Value: 82, Timestamp: now.Add(-24 * time.Hour)}, + } + results := EvaluateRules(RuleContext{Now: now, Samples: samples}, []RuleVersion{{ + Version: "env-v2", Name: "continuous_humidity", Disease: "白僵病", WindowHours: 3, MaxStaleness: 100 * time.Hour, + }}) + if len(results) != 1 || !results[0].Matched { + t.Fatalf("连续 3 天高湿应命中: %+v", results) + } +} + +func TestStaleTelemetryIsReportedMissing(t *testing.T) { + now := time.Date(2026, 8, 14, 12, 0, 0, 0, time.UTC) + results := EvaluateRules(RuleContext{Now: now, Samples: []TelemetrySample{{ + Metric: "humidity", Value: 90, Timestamp: now.Add(-24 * time.Hour), + }}}, []RuleVersion{{ + Version: "env-v2", Name: "continuous_humidity", Disease: "白僵病", MaxStaleness: 2 * time.Hour, + }}) + if len(results) != 1 || results[0].Matched { + t.Fatalf("过期数据不应命中: %+v", results) + } + found := false + for _, key := range results[0].Missing { + if key == "humidity_stale" { + found = true + } + } + if !found { + t.Fatalf("应标记 humidity_stale: %+v", results[0].Missing) + } +} + +func TestRuleResultKeepsInputAndVersion(t *testing.T) { + now := time.Now() + results := EvaluateRules(RuleContext{Now: now}, []RuleVersion{{ + Version: "env-v1", Name: "missing_rule", Disease: "测试", RequiresBiosecurity: true, + }}) + if results[0].RuleVersion != "env-v1" || results[0].ComputedAt.IsZero() { + t.Fatalf("规则结果缺少版本/计算时间: %+v", results[0]) + } + var snapshot map[string]any + if err := json.Unmarshal(results[0].InputSnapshot, &snapshot); err != nil { + t.Fatalf("inputSnapshot 非法: %v", err) + } + if len(results[0].Missing) == 0 { + t.Fatal("缺失输入应进入 missing") + } +} diff --git a/server-go/migrations/000008_governance_effectiveness.down.sql b/server-go/migrations/000008_governance_effectiveness.down.sql new file mode 100644 index 0000000..973e157 --- /dev/null +++ b/server-go/migrations/000008_governance_effectiveness.down.sql @@ -0,0 +1,24 @@ +ALTER TABLE diseases + DROP COLUMN IF EXISTS expert_confirmed_by, + DROP COLUMN IF EXISTS source_date, + DROP COLUMN IF EXISTS source, + DROP COLUMN IF EXISTS status; + +ALTER TABLE knowledge_articles + DROP COLUMN IF EXISTS expert_confirmed_by, + DROP COLUMN IF EXISTS source_date, + DROP COLUMN IF EXISTS source, + DROP COLUMN IF EXISTS status; + +ALTER TABLE consultations + DROP COLUMN IF EXISTS last_sla_event_at, + DROP COLUMN IF EXISTS overdue_at, + DROP COLUMN IF EXISTS sla_deadline, + DROP COLUMN IF EXISTS needs_info_at, + DROP COLUMN IF EXISTS accepted_at, + DROP COLUMN IF EXISTS assigned_at, + DROP COLUMN IF EXISTS assignee_id; + +DROP TABLE IF EXISTS knowledge_reviews CASCADE; +DROP TABLE IF EXISTS rule_engine_results CASCADE; +DROP TABLE IF EXISTS consultation_opinion_versions CASCADE; diff --git a/server-go/migrations/000008_governance_effectiveness.up.sql b/server-go/migrations/000008_governance_effectiveness.up.sql new file mode 100644 index 0000000..aa39dfb --- /dev/null +++ b/server-go/migrations/000008_governance_effectiveness.up.sql @@ -0,0 +1,66 @@ +CREATE TABLE IF NOT EXISTS consultation_opinion_versions ( + id uuid PRIMARY KEY DEFAULT gen_random_uuid(), + consultation_id uuid NOT NULL, + version integer NOT NULL, + author_id uuid, + opinion text NOT NULL, + plan text NOT NULL, + reason text, + created_at timestamptz NOT NULL DEFAULT now() +); + +CREATE INDEX IF NOT EXISTS idx_consultation_opinion_versions_consultation + ON consultation_opinion_versions (consultation_id, version); + +CREATE TABLE IF NOT EXISTS rule_engine_results ( + id uuid PRIMARY KEY DEFAULT gen_random_uuid(), + rule_version varchar(64) NOT NULL, + disease varchar(64) NOT NULL, + level varchar(16), + reason text, + input_snapshot jsonb NOT NULL DEFAULT '{}'::jsonb, + missing jsonb NOT NULL DEFAULT '[]'::jsonb, + computed_at timestamptz NOT NULL, + created_at timestamptz NOT NULL DEFAULT now() +); + +CREATE INDEX IF NOT EXISTS idx_rule_engine_results_rule_version + ON rule_engine_results (rule_version, computed_at); + +CREATE TABLE IF NOT EXISTS knowledge_reviews ( + id uuid PRIMARY KEY DEFAULT gen_random_uuid(), + entity_type varchar(32) NOT NULL, + entity_id varchar(128) NOT NULL, + status varchar(16) NOT NULL, + reviewer_id uuid, + reviewed_at timestamptz, + note text, + created_at timestamptz NOT NULL DEFAULT now() +); + +CREATE INDEX IF NOT EXISTS idx_knowledge_reviews_entity + ON knowledge_reviews (entity_type, entity_id); + +ALTER TABLE consultations + ADD COLUMN IF NOT EXISTS assignee_id uuid, + ADD COLUMN IF NOT EXISTS assigned_at timestamptz, + ADD COLUMN IF NOT EXISTS accepted_at timestamptz, + ADD COLUMN IF NOT EXISTS needs_info_at timestamptz, + ADD COLUMN IF NOT EXISTS sla_deadline timestamptz, + ADD COLUMN IF NOT EXISTS overdue_at timestamptz, + ADD COLUMN IF NOT EXISTS last_sla_event_at timestamptz; + +UPDATE consultations SET status = 'unassigned' WHERE status = 'pending'; +UPDATE consultations SET status = 'assigned' WHERE status = 'consulting'; + +ALTER TABLE knowledge_articles + ADD COLUMN IF NOT EXISTS status text NOT NULL DEFAULT 'published', + ADD COLUMN IF NOT EXISTS source text, + ADD COLUMN IF NOT EXISTS source_date date, + ADD COLUMN IF NOT EXISTS expert_confirmed_by uuid; + +ALTER TABLE diseases + ADD COLUMN IF NOT EXISTS status text NOT NULL DEFAULT 'published', + ADD COLUMN IF NOT EXISTS source text, + ADD COLUMN IF NOT EXISTS source_date date, + ADD COLUMN IF NOT EXISTS expert_confirmed_by uuid; diff --git a/web/src/dal/consultation.ts b/web/src/dal/consultation.ts index 30c752d..f43a877 100644 --- a/web/src/dal/consultation.ts +++ b/web/src/dal/consultation.ts @@ -11,6 +11,12 @@ export interface Consultation { snapshot?: any; status: string; expertId?: string; + assigneeId?: string; + assignedAt?: string; + acceptedAt?: string; + needsInfoAt?: string; + slaDeadline?: string; + overdueAt?: string; opinion?: string; plan?: string; resolvedAt?: string; @@ -25,6 +31,6 @@ export const createConsultation = (data: Partial) => post('/consultations', data); export const updateConsultation = (id: string, data: Partial) => patch(`/consultations/${id}`, data); -export const resolveConsultation = (id: string, data: { opinion: string; plan: string }) => +export const resolveConsultation = (id: string, data: { opinion: string; plan: string; reason?: string }) => post(`/consultations/${id}/resolve`, data); export const archiveConsultation = (id: string) => post(`/consultations/${id}/archive`); diff --git a/web/src/dal/health.ts b/web/src/dal/health.ts index 79898a7..f1ebce9 100644 --- a/web/src/dal/health.ts +++ b/web/src/dal/health.ts @@ -11,9 +11,23 @@ export interface HealthProfile { batch?: any; } +export interface EffectReport { + eventId: string; + beforeRiskAvg?: number; + afterRiskAvg?: number; + beforePositiveRate?: number; + afterPositiveRate?: number; + recurrences: number; + missing: string[]; + conclusion: string; +} + export const getHealthProfile = (roomId: string) => get(`/health-profiles/${roomId}`); +export const getRoomEffect = (roomId: string, params?: any) => + get(`/health-profiles/${roomId}/effect`, { params }); + export const getMonthlyStats = (year?: number) => get<{ year: number; stats: { month: string; total: number; diseases: Record }[] }>( '/trace-records/monthly-stats', diff --git a/web/src/dal/knowledge.ts b/web/src/dal/knowledge.ts index f690d5a..da92b96 100644 --- a/web/src/dal/knowledge.ts +++ b/web/src/dal/knowledge.ts @@ -17,6 +17,10 @@ export interface Disease { detection?: string; prevention?: string; imageUrl?: string; + status?: string; + source?: string; + sourceDate?: string; + expertConfirmedBy?: string; sortOrder?: number; enabled?: boolean; createdAt?: string; @@ -29,6 +33,10 @@ export interface KnowledgeArticle { title: string; summary?: string; content?: string; + status?: string; + source?: string; + sourceDate?: string; + expertConfirmedBy?: string; sortOrder?: number; enabled?: boolean; createdAt?: string; diff --git a/web/src/pages/Consultations.tsx b/web/src/pages/Consultations.tsx index 74352e0..4ce98f4 100644 --- a/web/src/pages/Consultations.tsx +++ b/web/src/pages/Consultations.tsx @@ -14,8 +14,10 @@ import { import { authService } from '../services/auth'; const STATUS_LABELS: Record = { - pending: { color: 'gold', text: '待会诊' }, - consulting: { color: 'blue', text: '会诊中' }, + unassigned: { color: 'gold', text: '待分派' }, + assigned: { color: 'blue', text: '已分派' }, + accepted: { color: 'cyan', text: '已受理' }, + needs_info: { color: 'purple', text: '待补充' }, resolved: { color: 'green', text: '已出方案' }, archived: { color: 'default', text: '已归档' }, }; @@ -53,11 +55,23 @@ export default function ConsultationsPage() { , ...(canWrite() ? [ - r.status === 'pending' ? ( + r.status === 'unassigned' ? ( { - await updateConsultation(r.id, { status: 'consulting' }); + await updateConsultation(r.id, { status: 'assigned' }); + message.success('已受理'); + actionRef.current?.reload(); + }} + > + 分派给我 + + ) : null, + r.status === 'assigned' ? ( + { + await updateConsultation(r.id, { status: 'accepted' }); message.success('已受理'); actionRef.current?.reload(); }} @@ -65,7 +79,7 @@ export default function ConsultationsPage() { 受理 ) : null, - r.status === 'pending' || r.status === 'consulting' ? ( + r.status === 'accepted' || r.status === 'needs_info' || r.status === 'assigned' ? ( { diff --git a/web/src/pages/Knowledge.tsx b/web/src/pages/Knowledge.tsx index 16543da..8bad5aa 100644 --- a/web/src/pages/Knowledge.tsx +++ b/web/src/pages/Knowledge.tsx @@ -33,6 +33,13 @@ const KIND_LABELS: Record = { seasonal_tip: '季节性提醒', }; +const STATUS_LABELS: Record = { + draft: { color: 'gold', text: '草稿' }, + review: { color: 'blue', text: '审核中' }, + published: { color: 'green', text: '已发布' }, + withdrawn: { color: 'default', text: '已撤回' }, +}; + const canWrite = () => authService.hasPermission('knowledge:write'); function DiseaseTab() { @@ -63,6 +70,7 @@ function DiseaseTab() { width: 80, render: (_, r) => (r.enabled === false ? 停用 : 启用), }, + { title: '审核状态', dataIndex: 'status', search: false, render: (_, r) => (r.status ? {STATUS_LABELS[r.status]?.text || r.status} : '-') }, { title: '操作', valueType: 'option', @@ -254,6 +262,8 @@ function ArticleTab() { render: (_, r) => {KIND_LABELS[r.kind] || r.kind}, }, { title: '摘要', dataIndex: 'summary', search: false, ellipsis: true, render: (_, r) => r.summary || '-' }, + { title: '审核状态', dataIndex: 'status', search: false, render: (_, r) => (r.status ? {STATUS_LABELS[r.status]?.text || r.status} : '-') }, + { title: '来源', dataIndex: 'source', search: false, render: (_, r) => r.source || '-' }, { title: '排序', dataIndex: 'sortOrder', search: false, width: 70 }, { title: '操作', diff --git a/web/src/pages/Traces.tsx b/web/src/pages/Traces.tsx index 26814e7..7a92c06 100644 --- a/web/src/pages/Traces.tsx +++ b/web/src/pages/Traces.tsx @@ -20,6 +20,7 @@ import { type RegionStat, } from '../dal/trace'; import { getMonthlyStats } from '../dal/health'; +import { getRoomEffect, type EffectReport } from '../dal/health'; import { authService } from '../services/auth'; const STATUS_LABELS: Record = { @@ -40,6 +41,8 @@ export default function TracesPage() { const [detail, setDetail] = useState(null); const [checklist, setChecklist] = useState([]); const [answers, setAnswers] = useState>({}); + const [effect, setEffect] = useState(null); + const [effectRoomId, setEffectRoomId] = useState(''); useEffect(() => { getRegionStats(90) @@ -94,6 +97,12 @@ export default function TracesPage() { setAnswers({}); }; + const openEffect = async (r: TraceRecord) => { + if (!r.roomId) return; + setEffectRoomId(r.roomId); + setEffect(await getRoomEffect(r.roomId).catch(() => null)); + }; + const columns: ProColumns[] = [ { title: '序号', valueType: 'indexBorder', search: false, width: 60 }, { title: '病种', dataIndex: 'disease' }, @@ -126,6 +135,11 @@ export default function TracesPage() { openDetail(r)}> 详情 , + r.roomId ? ( + openEffect(r)}> + 效果 + + ) : null, ...(canWrite() ? [ r.status === 'pending' ? ( @@ -242,6 +256,29 @@ export default function TracesPage() {
+ setEffect(null)} + footer={} + > + {effect ? ( +
+ + 结论：{effect.conclusion} +
+ 处置前风险均值：{effect.beforeRiskAvg !== undefined ? effect.beforeRiskAvg.toFixed(1) : '缺失'} +
+ 处置后风险均值：{effect.afterRiskAvg !== undefined ? effect.afterRiskAvg.toFixed(1) : '缺失'} +
+ 复发次数：{effect.recurrences} +
+ 缺失维度：{effect.missing.join('、') || '无'} + +
+ ) : null} + + setDetail(null)}> {detail ? (
diff --git a/后续工作计划.md b/后续工作计划.md index c6020bd..f0131b4 100644 --- a/后续工作计划.md +++ b/后续工作计划.md @@ -1,6 +1,6 @@ # 后续工作计划 -> **完成状态（2026-08-14 更新）**：#5-#24、#27 已完成，Task 0/1/2/4/5/6/8/9/10/11 整改代码完成（详见 `开发交接记录.md`）；#1-4 因物理机问题挂起；#23/#26 骨架完成；Task 3/7 延后到最后处理；微信/天气真实数据待凭证。 +> **完成状态（2026-08-14 更新）**：#5-#24、#27 已完成，Task 0/1/2/4/5/6/8/9/10/11/12 整改代码完成（详见 `开发交接记录.md`）；#1-4 因物理机问题挂起；#23/#26 骨架完成；Task 3/7 延后到最后处理；微信/天气真实数据待凭证。 ## 整改实施计划 Wave 0-4（2026-08-13 启动） @@ -20,7 +20,7 @@ | Wave 2 | 工程可靠性 | Task 9 建立统一检测任务、样本链与发病事件 | 部分可用 | 待开发服务器迁移部署与端到端联调 | | Wave 3 | 业务闭环 | Task 10 补齐消毒、种源与二维码身份链 | 部分可用 | 待开发服务器迁移部署与真实二维码/现场扫码联调 | | Wave 3 | 业务闭环 | Task 11 实现小程序离线巡检与可靠同步 | 部分可用 | 待开发服务器迁移部署与开发者工具离线/重启联调 | -| Wave 3 | 业务闭环 | Task 12 完善环境规则、会诊治理、知识审核与效果评估 | 未开始 | 无 | +| Wave 3 | 业务闭环 | Task 12 完善环境规则、会诊治理、知识审核与效果评估 | 部分可用 | 待开发服务器迁移部署与专家/试点联调 | | Wave 4 | 验收与发布 | Task 13 建立可观测性、容量与恢复验证 | 未开始 | 无 | | Wave 4 | 验收与发布 | Task 14 建立规格追踪、端到端验收与发布门禁 | 未开始 | 无 | diff --git a/开发交接记录.md b/开发交接记录.md index e179794..2756acf 100644 --- a/开发交接记录.md +++ b/开发交接记录.md @@ -1088,3 +1088,33 @@ MVP 沿用 IoTDB（现状）；TDengine 作为生产规模化候选（先基准 - 本任务前分支提交为 `6b222ab`；回滚可还原 Task 11 提交； - 数据库回滚执行 `000007_inspection_idempotency.down.sql` 可恢复全局唯一索引，但已被迁移追加后缀的历史键不会自动还原； - 小程序回滚需还原队列服务、巡检页、请求刷新逻辑和 store，并移除 `scripts/verify.ps1` 中的 `miniapp test` 步骤。 + +## 2026-08-14 整改 Task 12：完善环境规则、会诊治理、知识审核与效果评估 + +### 做了什么 + +- 新增规则引擎 `EvaluateRules`：支持版本化规则、连续时窗、数据新鲜度、缺失项和输入快照，单个最新值不能冒充连续高湿； +- 会诊状态机改为 `unassigned/assigned/accepted/needs_info/resolved/archived`，分派时写入 SLA 截止时间，支持 `overdue/on_time/unscheduled` 判断； +- 新增 `consultation_opinion_versions` 表，专家每次出方案/修改保留作者、时间、版本和原因； +- 知识文章和病种新增 `status/source/sourceDate/expertConfirmedBy`，普通用户只读已发布内容，草稿/审核/撤回仅审核权限用户可见； +- 新增 `EvaluateControlEffect` 和 `/health-profiles/:roomId/effect` 效果报告 API，对比处置前后巡检风险、检测阳性率和复发，缺失维度不按 0 当改善； +- Web 会诊页适配新状态机和 SLA；知识页展示审核状态与来源；溯源页新增效果报告入口。 + +### 设计思路与决策依据 + +- 规则输出必须可复盘：版本、计算时间、输入快照、缺失项都保留；缺失输入降低结论可信度而不是填 0； +- SLA 超时只产生状态标记/升级事件，不自动伪造专家结论； +- 知识内容先默认草稿，经过审核后发布；撤回后不再进入普通知识列表，历史病例引用仍保留快照； +- 效果评估明确区分“改善/未改善/证据不足”，避免缺失数据被解释为防控有效。 + +### 验证结果 + +- `scripts/verify.ps1` exit 0：Go test/vet/build、Web test/lint/build、小程序 test/typecheck/build、APP typecheck/lint、AI pytest 15/15 均通过； +- 新增测试覆盖连续 3 天高湿、过期遥测缺失、规则快照、会诊归档/意见版本/SLA、知识状态机、效果报告改善与缺失； +- 未部署开发服务器，未执行 `000008` 迁移；未接入真实领域专家审核和 SLA 升级通知。 + +### 回滚点 + +- 本任务前分支提交为 `69ef5a0`；回滚可还原 Task 12 提交； +- 数据库回滚执行 `000008_governance_effectiveness.down.sql` 可删除意见版本、规则结果、知识审核表和新增列； +- Web 页面回滚需还原会诊、知识、溯源页面及对应 DAL，不覆盖旧专家意见。 From 1e6a5dbfb8d56174c1dd73c8f560ded41f437174 Mon Sep 17 00:00:00 2001 From: weijuesen Date: Fri, 14 Aug 2026 14:54:56 +0800 Subject: [PATCH 17/18] =?UTF-8?q?feat:=20=E5=BB=BA=E7=AB=8B=E5=8F=AF?= =?UTF-8?q?=E8=A7=82=E6=B5=8B=E6=80=A7=E3=80=81=E5=AE=B9=E9=87=8F=E4=B8=8E?= =?UTF-8?q?=E6=81=A2=E5=A4=8D=E9=AA=8C=E8=AF=81=E5=9F=BA=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 1 + ai-service/app/main.py | 3 + ai-service/tests/test_api.py | 1 + docs/operations/backup-restore-drill.md | 36 ++++++++ docs/operations/load-test-scenarios.md | 39 +++++++++ docs/operations/slo-and-alerts.md | 39 +++++++++ server-go/cmd/server/main.go | 2 + server-go/internal/handler/ops.go | 28 ++++++ server-go/internal/middleware/logger.go | 10 +++ server-go/internal/middleware/request_id.go | 65 ++++++++++++++ .../internal/middleware/request_id_test.go | 42 +++++++++ server-go/internal/service/ai_client.go | 9 +- .../internal/service/dependency_metrics.go | 86 +++++++++++++++++++ 后续工作计划.md | 4 +- 开发交接记录.md | 29 +++++++ 部署指南(物理机).md | 7 ++ 16 files changed, 398 insertions(+), 3 deletions(-) create mode 100644 docs/operations/backup-restore-drill.md create mode 100644 docs/operations/load-test-scenarios.md create mode 100644 docs/operations/slo-and-alerts.md create mode 100644 server-go/internal/handler/ops.go create mode 100644 server-go/internal/middleware/request_id.go create mode 100644 server-go/internal/middleware/request_id_test.go create mode 100644 server-go/internal/service/dependency_metrics.go diff --git a/README.md b/README.md index 1caa320..199328b 100644 --- a/README.md +++ b/README.md @@ -608,6 +608,7 @@ MODEL_MODE=mock .venv\Scripts\python -m uvicorn app.main:app --host 0.0.0.0 --po - 部署规则（备份/回滚/冒烟）见根目录 `AGENTS.md`「部署到开发服务器」；SSH/SFTP 工具为 `scripts/devssh.py`（`PAN_SSH_PASS` 环境变量传密码） - 服务清单：Go 后端 :3000、Web :5174、ai-service :8000、recorder-go :9090、PostgreSQL :5432、IoTDB :18081、VerneMQ :1883、Ceph RGW :7480、WVP :18080、ZLM :8081 +- 可观测性：HTTP 请求统一 `X-Request-ID`；日志脱敏；`GET /api/v1/ops/metrics` 提供依赖指标；SLO/负载/备份恢复演练文档见 `docs/operations/` ## 13. Git 注意事项 diff --git a/ai-service/app/main.py b/ai-service/app/main.py index 7625a9f..e01aa06 100644 --- a/ai-service/app/main.py +++ b/ai-service/app/main.py @@ -2,6 +2,7 @@ import shutil import subprocess import threading import time +import uuid from fastapi import FastAPI, File, HTTPException, Request, UploadFile @@ -21,8 +22,10 @@ stream_worker = StreamTaskWorker(config.STREAM_TASK_MAX_WORKERS) async def count_requests(request: Request, call_next): global _requests, _latency_total start = time.time() + request_id = request.headers.get("x-request-id") or str(uuid.uuid4()) response = await call_next(request) latency = (time.time() - start) * 1000 + response.headers["X-Request-ID"] = request_id with _lock: _requests += 1 _latency_total += latency diff --git a/ai-service/tests/test_api.py b/ai-service/tests/test_api.py index 6be53d2..2144f26 100644 --- a/ai-service/tests/test_api.py +++ b/ai-service/tests/test_api.py @@ -31,6 +31,7 @@ def test_health(): def test_detect_ok(): r = client.post("/detect", files={"file": ("a.png", TINY_PNG, "image/png")}) assert r.status_code == 200 + assert r.headers.get("x-request-id") body = r.json() assert body["model"] == "mock" assert body["modelVersion"] diff --git a/docs/operations/backup-restore-drill.md b/docs/operations/backup-restore-drill.md new file mode 100644 index 0000000..05ccc93 --- /dev/null +++ b/docs/operations/backup-restore-drill.md @@ -0,0 +1,36 @@ +# 备份恢复演练 + +## 目标 + +验证 PostgreSQL、IoTDB、Ceph/S3 和业务配置的可恢复性，记录 RPO/RTO。 + +## 演练前 + +1. 记录当前版本、commit、schema 版本和服务清单。 +2. 使用 `pg_dump` 备份 PostgreSQL 到隔离命名空间。 +3. 备份 IoTDB 数据目录或按现有运维流程导出。 +4. 记录 Ceph/S3 bucket 清单和对象数量。 + +## 恢复步骤 + +1. 在隔离环境创建空 PostgreSQL 数据库。 +2. 执行 `pg_restore` 恢复备份。 +3. 恢复 IoTDB 数据并启动服务。 +4. 校验图片、光谱、录像对象引用与数据库记录一致。 +5. 启动 Go/AI/Web 服务并执行核心接口冒烟。 + +## 记录项 + +- 备份开始/结束时间 +- 备份体积 +- 恢复开始/结束时间 +- RPO（最近可用备份到故障时间） +- RTO（故障到服务可用） +- 数据点核对：巡检、遥测、检测、通知、任务、会诊、溯源 +- 失败项与原因 + +## 验收 + +- 核心业务记录无缺失。 +- 图片/光谱/录像对象引用可访问。 +- 至少完成一次真实恢复演练后才允许执行正式生产迁移。 diff --git a/docs/operations/load-test-scenarios.md b/docs/operations/load-test-scenarios.md new file mode 100644 index 0000000..40cb273 --- /dev/null +++ b/docs/operations/load-test-scenarios.md @@ -0,0 +1,39 @@ +# 负载测试场景 + +目标环境：Go 后端 + PostgreSQL + Redis + IoTDB + AI 服务。结果需记录测试日期、版本、机器配置、并发、时长、p50/p95、失败率和观察到的限制。 + +## A. 500 在线用户 API 混合负载 + +比例： + +- 80% 查询类：房间、设备、遥测最新值、告警列表 +- 10% 遥测趋势：历史/聚合查询 +- 5% 上传类：图片巡检上传 +- 5% 管理操作：阈值、批次、检测任务、会诊 + +验收：API 错误率 <1%，业务接口 p95 <1s；上传成功且巡检闭环可追踪。 + +## B. 1000 WebSocket 连接 + +- 1000 个连接按授权设备订阅 +- 持续 30 分钟 +- 记录连接成功率、掉线率、消息延迟、CPU/内存 + +验收：连接成功率 >99%，消息 P95 延迟 <500ms，无内存持续增长。 + +## C. AI 峰值 + +固定条件： + +- GPU：目标 T4 16G +- 模型版本和 ONNX 文件 hash +- 输入尺寸 +- 并发数（建议 1/4/8/16） + +记录 p50/p95、失败率、GPU 显存和单帧延迟。结果用于设置生产并发上限和推理告警阈值。 + +## 禁止事项 + +- 不在生产库执行写入类负载。 +- 不使用真实用户隐私图片做公开压测。 +- 压测前必须备份数据库并记录环境状态。 diff --git a/docs/operations/slo-and-alerts.md b/docs/operations/slo-and-alerts.md new file mode 100644 index 0000000..36c1fe5 --- /dev/null +++ b/docs/operations/slo-and-alerts.md @@ -0,0 +1,39 @@ +# 可观测性 SLO 与告警阈值 + +## 日志与请求 ID + +- Go 后端每个 HTTP 请求生成或透传 `X-Request-ID`，日志统一记录 `requestId/method/path/query/status/latency/ip/authType`。 +- 日志不记录 Authorization 原始值；query 中 `token/password/secret/authorization` 类参数统一替换为 `[redacted]`。 +- AI 服务 `/detect` 同样透传 `X-Request-ID`，便于跨 Go/Python 全链路追踪。 + +## 依赖指标 + +`GET /api/v1/ops/metrics`（`log:read`）返回依赖指标，至少记录请求数、失败数、最近延迟、P50/P95、最近成功/失败时间和最近错误。目标覆盖： + +- PostgreSQL +- Redis +- MQTT +- IoTDB +- S3 +- AI 服务 +- WVP/ZLM +- 微信 +- 天气 + +## 初始告警阈值 + +| 指标 | 目标 | 告警阈值 | 负责人 | +|---|---|---|---| +| API 可用性 | 99.5% | 5 分钟错误率 >5% | 后端 + 运维 | +| API p95 延迟 | <500ms（业务接口） | 5 分钟 p95 >1s | 后端 | +| 登录失败率 | 正常用户 <2% | 5 分钟失败率 >10% | 后端 + 安全 | +| Redis | 可用 | Ping 失败 3 次 | 运维 | +| PostgreSQL | 可用 | 连接/查询失败 3 次 | 后端 + 运维 | +| IoTDB | 可用或明确降级 | 持续不可用且遥测回退 | 后端 | +| AI 推理失败率 | <1% | 5 分钟失败率 >5% | AI + 后端 | +| Ceph 容量 | 使用率 <80% | 使用率 >80% | 运维 | +| Outbox 积压 | 常态 <50 | pending+retry >200 | 后端 | + +## 模拟故障验证 + +每次发布前至少验证一次通知链：断开 Redis → 确认认证接口返回 503 → 恢复 Redis → 确认自动恢复；如部署告警工具，则同时验证告警通道可送达负责人。 diff --git a/server-go/cmd/server/main.go b/server-go/cmd/server/main.go index 78878f7..b64c229 100644 --- a/server-go/cmd/server/main.go +++ b/server-go/cmd/server/main.go @@ -95,6 +95,7 @@ func main() { // 9. 创建 Gin 引擎 gin.SetMode(gin.ReleaseMode) r := gin.New() + r.Use(middleware.RequestIDMiddleware()) r.Use(middleware.Logger()) r.Use(middleware.SecurityHeaders()) r.Use(middleware.CORS()) @@ -150,6 +151,7 @@ func main() { handler.RegisterAuditRoutes(api, db) handler.RegisterUserRoutes(api, db) handler.RegisterPermissionRoutes(api, db) + handler.RegisterOpsRoutes(api, db) // 12. 启动 HTTP 服务 addr := ":" + strconv.Itoa(cfg.Port) diff --git a/server-go/internal/handler/ops.go b/server-go/internal/handler/ops.go new file mode 100644 index 0000000..01b4a2e --- /dev/null +++ b/server-go/internal/handler/ops.go @@ -0,0 +1,28 @@ +package handler + +import ( + "net/http" + "time" + + "silk-server-go/internal/middleware" + "silk-server-go/internal/service" + + "github.com/gin-gonic/gin" + "gorm.io/gorm" +) + +var opsStartedAt = time.Now() + +// RegisterOpsRoutes 注册运维指标路由。 +func RegisterOpsRoutes(rg *gin.RouterGroup, db *gorm.DB) { + rg.GET("/ops/metrics", middleware.RequirePermission(db, "log:read"), opsMetrics()) +} + +func opsMetrics() gin.HandlerFunc { + return func(c *gin.Context) { + c.JSON(http.StatusOK, gin.H{ + "uptimeSeconds": int(time.Since(opsStartedAt).Seconds()), + "dependencies": service.DependencySnapshot(), + }) + } +} diff --git a/server-go/internal/middleware/logger.go b/server-go/internal/middleware/logger.go index f6b962a..23ef305 100644 --- a/server-go/internal/middleware/logger.go +++ b/server-go/internal/middleware/logger.go @@ -2,6 +2,7 @@ package middleware import ( "log/slog" + "strings" "time" "github.com/gin-gonic/gin" @@ -17,13 +18,22 @@ func Logger() gin.HandlerFunc { latency := time.Since(start) status := c.Writer.Status() + query := RedactSensitiveQuery(c.Request.URL.RawQuery) + auth := c.GetHeader("Authorization") + authPrefix := "" + if auth != "" { + authPrefix = strings.SplitN(auth, " ", 2)[0] + } slog.Info("请求", + "requestId", RequestID(c), "method", c.Request.Method, "path", path, + "query", query, "status", status, "latency", latency.String(), "ip", c.ClientIP(), + "authType", authPrefix, ) } } diff --git a/server-go/internal/middleware/request_id.go b/server-go/internal/middleware/request_id.go new file mode 100644 index 0000000..4242f30 --- /dev/null +++ b/server-go/internal/middleware/request_id.go @@ -0,0 +1,65 @@ +package middleware + +import ( + "crypto/rand" + "encoding/hex" + "net/url" + "strings" + "time" + + "github.com/gin-gonic/gin" +) + +const RequestIDHeader = "X-Request-ID" + +// RequestID 返回当前请求 ID。 +func RequestID(c *gin.Context) string { + value, _ := c.Get("requestId") + if id, ok := value.(string); ok { + return id + } + return "" +} + +// RequestIDMiddleware 生成或透传 X-Request-ID。 +func RequestIDMiddleware() gin.HandlerFunc { + return func(c *gin.Context) { + id := c.GetHeader(RequestIDHeader) + if id == "" { + id = randomRequestID() + } + c.Set("requestId", id) + c.Header(RequestIDHeader, id) + c.Next() + } +} + +func randomRequestID() string { + b := make([]byte, 16) + if _, err := rand.Read(b); err != nil { + return "req-" + hex.EncodeToString([]byte(time.Now().Format(time.RFC3339Nano))) + } + return hex.EncodeToString(b) +} + +// RedactSensitiveQuery 脱敏 URL query 中的 token/password/secret。 +func RedactSensitiveQuery(rawQuery string) string { + if rawQuery == "" { + return "" + } + values, err := url.ParseQuery(rawQuery) + if err != nil { + return "[invalid-query]" + } + keys := make([]string, 0, len(values)) + for key := range values { + keys = append(keys, key) + } + for _, key := range keys { + lower := strings.ToLower(key) + if strings.Contains(lower, "token") || strings.Contains(lower, "password") || strings.Contains(lower, "secret") || strings.Contains(lower, "authorization") { + values.Set(key, "[redacted]") + } + } + return values.Encode() +} diff --git a/server-go/internal/middleware/request_id_test.go b/server-go/internal/middleware/request_id_test.go new file mode 100644 index 0000000..394778c --- /dev/null +++ b/server-go/internal/middleware/request_id_test.go @@ -0,0 +1,42 @@ +package middleware + +import ( + "net/http" + "net/http/httptest" + "testing" + + "github.com/gin-gonic/gin" +) + +func TestRequestIDMiddlewarePassesThrough(t *testing.T) { + gin.SetMode(gin.TestMode) + rec := httptest.NewRecorder() + c, _ := gin.CreateTestContext(rec) + c.Request = httptest.NewRequest(http.MethodGet, "/", nil) + c.Request.Header.Set(RequestIDHeader, "request-1") + RequestIDMiddleware()(c) + if rec.Header().Get(RequestIDHeader) != "request-1" { + t.Fatalf("header = %s", rec.Header().Get(RequestIDHeader)) + } + if RequestID(c) != "request-1" { + t.Fatalf("request id = %s", RequestID(c)) + } +} + +func TestRequestIDMiddlewareGenerates(t *testing.T) { + gin.SetMode(gin.TestMode) + rec := httptest.NewRecorder() + c, _ := gin.CreateTestContext(rec) + c.Request = httptest.NewRequest(http.MethodGet, "/", nil) + RequestIDMiddleware()(c) + if RequestID(c) == "" { + t.Fatal("should generate request id") + } +} + +func TestRedactSensitiveQuery(t *testing.T) { + got := RedactSensitiveQuery("access_token=abc&password=secret&roomId=1") + if got != "access_token=%5Bredacted%5D&password=%5Bredacted%5D&roomId=1" { + t.Fatalf("redacted query = %s", got) + } +} diff --git a/server-go/internal/service/ai_client.go b/server-go/internal/service/ai_client.go index 53628f2..919da98 100644 --- a/server-go/internal/service/ai_client.go +++ b/server-go/internal/service/ai_client.go @@ -77,6 +77,7 @@ func NewAIClient(baseURL string) *AIClient { // Detect 上传图片到 ai-service /detect，返回检测结果（无状态接口，天然幂等） func (c *AIClient) Detect(ctx context.Context, imageBytes []byte, filename string) (*AIDetectResponse, error) { + start := time.Now() var body bytes.Buffer writer := multipart.NewWriter(&body) part, err := writer.CreateFormFile("file", filename) @@ -97,7 +98,9 @@ func (c *AIClient) Detect(ctx context.Context, imageBytes []byte, filename strin req.Header.Set("Content-Type", writer.FormDataContentType()) resp, err := c.client.Do(req) + latency := time.Since(start) if err != nil { + RecordDependency(DependencyAI, err, latency) return nil, err } defer resp.Body.Close() @@ -107,12 +110,16 @@ func (c *AIClient) Detect(ctx context.Context, imageBytes []byte, filename strin return nil, err } if resp.StatusCode != http.StatusOK { - return nil, fmt.Errorf("ai-service /detect 返回 %d: %s", resp.StatusCode, string(data)) + err := fmt.Errorf("ai-service /detect 返回 %d: %s", resp.StatusCode, string(data)) + RecordDependency(DependencyAI, err, latency) + return nil, err } var out AIDetectResponse if err := json.Unmarshal(data, &out); err != nil { + RecordDependency(DependencyAI, err, latency) return nil, err } + RecordDependency(DependencyAI, nil, latency) return &out, nil } diff --git a/server-go/internal/service/dependency_metrics.go b/server-go/internal/service/dependency_metrics.go new file mode 100644 index 0000000..9403076 --- /dev/null +++ b/server-go/internal/service/dependency_metrics.go @@ -0,0 +1,86 @@ +package service + +import ( + "sort" + "sync" + "time" +) + +// Dependency 依赖名称。 +type Dependency string + +const ( + DependencyPostgres Dependency = "postgresql" + DependencyRedis Dependency = "redis" + DependencyMQTT Dependency = "mqtt" + DependencyIoTDB Dependency = "iotdb" + DependencyS3 Dependency = "s3" + DependencyAI Dependency = "ai" + DependencyWVP Dependency = "wvp" + DependencyWechat Dependency = "wechat" + DependencyWeather Dependency = "weather" +) + +// DependencyMetric 依赖调用指标。 +type DependencyMetric struct { + Requests int64 `json:"requests"` + Failures int64 `json:"failures"` + LastLatencyMs float64 `json:"lastLatencyMs"` + P50LatencyMs float64 `json:"p50LatencyMs"` + P95LatencyMs float64 `json:"p95LatencyMs"` + LastSuccessAt *time.Time `json:"lastSuccessAt,omitempty"` + LastFailureAt *time.Time `json:"lastFailureAt,omitempty"` + LastError string `json:"lastError,omitempty"` +} + +var dependencyMetrics sync.Map + +// RecordDependency 记录一次依赖调用。 +func RecordDependency(dep Dependency, err error, latency time.Duration) { + now := time.Now() + value, _ := dependencyMetrics.LoadOrStore(dep, &DependencyMetric{}) + metric := value.(*DependencyMetric) + metric.Requests++ + metric.LastLatencyMs = float64(latency.Microseconds()) / 1000 + if err != nil { + metric.Failures++ + metric.LastFailureAt = &now + metric.LastError = err.Error() + } else { + metric.LastSuccessAt = &now + metric.LastError = "" + } +} + +// DependencySnapshot 返回当前依赖指标快照。 +func DependencySnapshot() map[Dependency]DependencyMetric { + result := map[Dependency]DependencyMetric{} + dependencyMetrics.Range(func(key, value interface{}) bool { + dep := key.(Dependency) + metric := *value.(*DependencyMetric) + result[dep] = metric + return true + }) + return result +} + +// RecordDependencyHistogram 预留直方图能力；当前仅更新最近一次指标。 +func RecordDependencyHistogram(dep Dependency, err error, latency time.Duration, samples []float64) { + RecordDependency(dep, err, latency) + if len(samples) == 0 { + return + } + value, _ := dependencyMetrics.LoadOrStore(dep, &DependencyMetric{}) + metric := value.(*DependencyMetric) + sort.Float64s(samples) + metric.P50LatencyMs = percentile(samples, 0.5) + metric.P95LatencyMs = percentile(samples, 0.95) +} + +func percentile(sorted []float64, p float64) float64 { + if len(sorted) == 0 { + return 0 + } + idx := int(float64(len(sorted)-1) * p) + return sorted[idx] +} diff --git a/后续工作计划.md b/后续工作计划.md index f0131b4..b817793 100644 --- a/后续工作计划.md +++ b/后续工作计划.md @@ -1,6 +1,6 @@ # 后续工作计划 -> **完成状态（2026-08-14 更新）**：#5-#24、#27 已完成，Task 0/1/2/4/5/6/8/9/10/11/12 整改代码完成（详见 `开发交接记录.md`）；#1-4 因物理机问题挂起；#23/#26 骨架完成；Task 3/7 延后到最后处理；微信/天气真实数据待凭证。 +> **完成状态（2026-08-14 更新）**：#5-#24、#27 已完成，Task 0/1/2/4/5/6/8/9/10/11/12/13 整改代码完成（详见 `开发交接记录.md`）；#1-4 因物理机问题挂起；#23/#26 骨架完成；Task 3/7 延后到最后处理；微信/天气真实数据待凭证。 ## 整改实施计划 Wave 0-4（2026-08-13 启动） @@ -21,7 +21,7 @@ | Wave 3 | 业务闭环 | Task 10 补齐消毒、种源与二维码身份链 | 部分可用 | 待开发服务器迁移部署与真实二维码/现场扫码联调 | | Wave 3 | 业务闭环 | Task 11 实现小程序离线巡检与可靠同步 | 部分可用 | 待开发服务器迁移部署与开发者工具离线/重启联调 | | Wave 3 | 业务闭环 | Task 12 完善环境规则、会诊治理、知识审核与效果评估 | 部分可用 | 待开发服务器迁移部署与专家/试点联调 | -| Wave 4 | 验收与发布 | Task 13 建立可观测性、容量与恢复验证 | 未开始 | 无 | +| Wave 4 | 验收与发布 | Task 13 建立可观测性、容量与恢复验证 | 部分可用 | 待真实环境负载/备份恢复演练与告警通道联调 | | Wave 4 | 验收与发布 | Task 14 建立规格追踪、端到端验收与发布门禁 | 未开始 | 无 | ## 技术选型决策（2026-08-11 确定） diff --git a/开发交接记录.md b/开发交接记录.md index 2756acf..f88032b 100644 --- a/开发交接记录.md +++ b/开发交接记录.md @@ -1118,3 +1118,32 @@ MVP 沿用 IoTDB（现状）；TDengine 作为生产规模化候选（先基准 - 本任务前分支提交为 `69ef5a0`；回滚可还原 Task 12 提交； - 数据库回滚执行 `000008_governance_effectiveness.down.sql` 可删除意见版本、规则结果、知识审核表和新增列； - Web 页面回滚需还原会诊、知识、溯源页面及对应 DAL，不覆盖旧专家意见。 + +## 2026-08-14 整改 Task 13：建立可观测性、容量与恢复验证 + +### 做了什么 + +- 新增 `X-Request-ID` 中间件：请求 ID 生成或透传、响应头返回、日志记录 `requestId`；query 中 token/password/secret/authorization 自动脱敏； +- 新增依赖指标注册表和 `GET /api/v1/ops/metrics`，AI 客户端记录请求数、失败数、最近延迟和 P50/P95； +- AI 服务 `/detect` 透传 `X-Request-ID`，并新增响应头测试； +- 新增 `docs/operations/slo-and-alerts.md`、`load-test-scenarios.md`、`backup-restore-drill.md`； +- `部署指南(物理机).md` 增加可观测性与恢复验证要求。 + +### 设计思路与决策依据 + +- 全链路追踪从 HTTP 入口开始，先保证请求 ID 和日志脱敏，后续可替换为正式 tracing/APM； +- 依赖指标采用内存快照，满足当前单实例观测；多实例或生产规模化后再接入 Prometheus/OTel； +- SLO 和告警阈值先给出可执行基线，不把未运行的监控平台写入“已验证”状态； +- 备份恢复文档要求真实演练记录 RPO/RTO，避免只在文档里声明可恢复。 + +### 验证结果 + +- `scripts/verify.ps1` exit 0：Go test/vet/build、Web test/lint/build、小程序 test/typecheck/build、APP typecheck/lint、AI pytest 15/15 均通过； +- 新增测试覆盖 requestId 透传/生成、敏感 query 脱敏、AI requestId 响应头； +- 未部署开发服务器，未执行 500/1000 用户负载、真实备份恢复演练或告警通道故障演练。 + +### 回滚点 + +- 本任务前分支提交为 `126c215`；回滚可还原 Task 13 提交； +- requestId/日志脱敏可安全保留；若指标采集开销过高，可降低采样频率； +- 运维文档和部署指南可直接保留，不删除已记录的恢复演练要求。 diff --git a/部署指南(物理机).md b/部署指南(物理机).md index 90698be..f67f352 100644 --- a/部署指南(物理机).md +++ b/部署指南(物理机).md @@ -916,3 +916,10 @@ tail -5 /home/pan/recorder.log ``` > **注意**：Ceph RGW 的 `radosgw-admin` 不支持 `bucket create` 命令，bucket 必须通过 S3 API（PUT /bucket-name）创建。 + +## 可观测性与恢复验证 + +- 每个 HTTP 请求统一记录 `X-Request-ID`，日志不得包含 Authorization 原始值或敏感 query。 +- 依赖指标通过 `GET /api/v1/ops/metrics` 查看；发布前按 `docs/operations/slo-and-alerts.md` 检查告警阈值。 +- 发布前备份 PostgreSQL，并参考 `docs/operations/backup-restore-drill.md` 记录备份时间、恢复时间和 RPO/RTO。 +- 负载和容量验证场景见 `docs/operations/load-test-scenarios.md`。 From 9a003619a93f5fee1479997718ed4612950bf2b0 Mon Sep 17 00:00:00 2001 From: weijuesen Date: Fri, 14 Aug 2026 15:38:31 +0800 Subject: [PATCH 18/18] =?UTF-8?q?docs:=20=E5=BB=BA=E7=AB=8B=E8=A7=84?= =?UTF-8?q?=E6=A0=BC=E8=BF=BD=E8=B8=AA=E3=80=81=E7=AB=AF=E5=88=B0=E7=AB=AF?= =?UTF-8?q?=E9=AA=8C=E6=94=B6=E4=B8=8E=E5=8F=91=E5=B8=83=E9=97=A8=E7=A6=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 1 + docs/acceptance/core-e2e-cases.md | 62 ++++++++++++++ docs/acceptance/release-checklist.md | 31 +++++++ docs/acceptance/requirements-traceability.md | 86 ++++++++++++++++++++ 后续工作计划.md | 4 +- 开发交接记录.md | 28 +++++++ 蚕病智能防控平台规格说明书_V2.2.md | 7 ++ 7 files changed, 217 insertions(+), 2 deletions(-) create mode 100644 docs/acceptance/core-e2e-cases.md create mode 100644 docs/acceptance/release-checklist.md create mode 100644 docs/acceptance/requirements-traceability.md diff --git a/README.md b/README.md index 199328b..32160c3 100644 --- a/README.md +++ b/README.md @@ -609,6 +609,7 @@ MODEL_MODE=mock .venv\Scripts\python -m uvicorn app.main:app --host 0.0.0.0 --po - 部署规则（备份/回滚/冒烟）见根目录 `AGENTS.md`「部署到开发服务器」；SSH/SFTP 工具为 `scripts/devssh.py`（`PAN_SSH_PASS` 环境变量传密码） - 服务清单：Go 后端 :3000、Web :5174、ai-service :8000、recorder-go :9090、PostgreSQL :5432、IoTDB :18081、VerneMQ :1883、Ceph RGW :7480、WVP :18080、ZLM :8081 - 可观测性：HTTP 请求统一 `X-Request-ID`；日志脱敏；`GET /api/v1/ops/metrics` 提供依赖指标；SLO/负载/备份恢复演练文档见 `docs/operations/` +- 验收门禁：需求追踪、核心端到端用例和发布清单见 `docs/acceptance/` ## 13. Git 注意事项 diff --git a/docs/acceptance/core-e2e-cases.md b/docs/acceptance/core-e2e-cases.md new file mode 100644 index 0000000..3343f17 --- /dev/null +++ b/docs/acceptance/core-e2e-cases.md @@ -0,0 +1,62 @@ +# 核心端到端验收用例 + +执行环境：开发服务器或隔离试点环境。每条用例记录：日期、执行人、环境、结果、失败原因、证据截图/日志。 + +## E2E-01 healthy 图片不触发检测 + +1. 使用真实或 mock healthy 图片上传巡检。 +2. 期望 `abnormalProbability=0`，风险不因 healthy 高置信度升高。 +3. 期望不创建待确认检测任务。 + +## E2E-02 sick/橙色风险只创建一个待确认任务 + +1. 上传产生橙色风险的非 mock 巡检。 +2. 等待 Outbox worker。 +3. 查询 `/detection-tasks?sourceType=inspection`，同巡检只出现一个任务。 + +## E2E-03 AI 失败可重试且不产生虚假风险 + +1. 停止 AI 服务后上传巡检。 +2. 期望 `aiStatus=failed`、无风险分。 +3. 恢复 AI 后重试，期望成功且使用同一幂等键不重复记录。 + +## E2E-04 qPCR 无效不确诊 + +1. 按当前规则录入无有效对照或无效结果。 +2. 期望 `result=invalid`，不创建 `DiseaseEvent`。 + +## E2E-05 有效阳性创建发病事件并自动溯源 + +1. LAMP 或统一检测任务录入 `positive`。 +2. 期望创建 `DiseaseEvent`。 +3. 期望自动创建关联 `TraceRecord`，状态为 `pending`。 + +## E2E-06 无权用户访问受保护资源返回 403 + +1. 使用无权限用户访问视频、设备控制、WebSocket 设备订阅。 +2. 期望业务接口 403，WebSocket 返回拒绝事件。 + +## E2E-07 离线巡检重启后仅同步一次 + +1. 断网拍照入队。 +2. 重启小程序。 +3. 联网后触发同步。 +4. 期望服务端仅一条记录，离线队列转为 `synced`。 + +## E2E-08 通知失败重试且状态可查 + +1. 制造微信/通道失败事件。 +2. 等待重试或最终失败。 +3. 期望 `notifications` 状态、尝试次数、错误可查询。 + +## E2E-09 服务重启后任务/通知/吊销状态保持 + +1. 创建 pending 事件、Outbox、token 吊销。 +2. 重启 Go 服务。 +3. 期望任务和通知继续处理，吊销仍生效。 + +## E2E-10 备份恢复后核心记录与对象引用一致 + +1. 按 `docs/operations/backup-restore-drill.md` 恢复。 +2. 核对巡检、检测、会诊、溯源、图片/光谱/录像引用。 +3. 记录 RPO/RTO 和失败项。 diff --git a/docs/acceptance/release-checklist.md b/docs/acceptance/release-checklist.md new file mode 100644 index 0000000..79a464d --- /dev/null +++ b/docs/acceptance/release-checklist.md @@ -0,0 +1,31 @@ +# 发布门禁清单 + +## 发布前 + +- [ ] 确认发布基线 commit 和回滚点。 +- [ ] 执行 `powershell -ExecutionPolicy Bypass -File scripts/verify.ps1`，exit 0。 +- [ ] 执行 `git diff --check`，exit 0。 +- [ ] 涉及 schema 时完成 `pg_dump` 备份并记录恢复命令。 +- [ ] 检查磁盘、端口、服务进程和依赖健康。 +- [ ] 核对需求追踪矩阵：本次涉及的需求 ID 有实现、测试和限制说明。 + +## 发布中 + +- [ ] 保留旧二进制和旧 `dist`。 +- [ ] 上传新构建产物。 +- [ ] 执行数据库迁移。 +- [ ] 重启服务。 +- [ ] 健康检查和核心接口冒烟。 + +## 发布后 + +- [ ] 记录部署 commit、迁移版本、备份路径、冒烟结果。 +- [ ] 更新 `变更记录.md` 和 `开发交接记录.md`。 +- [ ] 执行核心端到端用例中受影响的 E2E。 +- [ ] 如失败，按回滚预案恢复并记录原因。 + +## 回滚 + +- 代码：恢复旧二进制/旧 dist 或 `git checkout `。 +- 数据库：`pg_restore` 恢复备份。 +- 回滚后重新健康检查并记录结论。 diff --git a/docs/acceptance/requirements-traceability.md b/docs/acceptance/requirements-traceability.md new file mode 100644 index 0000000..8291c07 --- /dev/null +++ b/docs/acceptance/requirements-traceability.md @@ -0,0 +1,86 @@ +# 需求追踪矩阵 + +追踪列：需求 ID、实现、自动测试、手工用例、环境、证据、状态、限制、负责人。 + +状态约定： + +- `已实现`：代码和单元/构建证据存在，但未在目标环境完成最终验收。 +- `部分可用`：主链路可用，仍有明确限制。 +- `延后`：按决策暂不实施。 +- `未完成`：未实现或实现不足。 + +## Wave 1：安全与正确性 + +| 需求 ID | 实现 | 自动测试 | 手工用例 | 环境 | 证据 | 状态 | 限制 | 负责人 | +|---|---|---|---|---|---|---|---|---| +| IAM-001 | `handler/auth.go`、`middleware/token_blacklist.go` | `middleware/state_test.go` | 登录/刷新/登出/跨实例吊销 | 开发/生产 | `go test ./...` | 部分可用 | Redis 不可用时保守失败 | 后端 | +| IAM-002 | `middleware/permission.go`、`permission_seed.go` | 无专项测试 | 角色访问矩阵 | 开发 | 路由权限检查 | 部分可用 | 缺少对象级 ACL | 后端 | +| IAM-003 | 未完成 | 无 | 无 | 无 | 无 | 未完成 | 需组织/区域/房间 ACL | 后端 | +| IAM-004 | 延后 Task 3 | 无 | 无 | 无 | 决策记录 | 延后 | 默认凭据和强制改密待最后阶段 | 后端+运维 | +| AI-INS-002 | `service/risk.go`、`ai-service` | `risk_test.go`、AI pytest | healthy/sick 图片 | 本地 | verify.ps1 | 部分可用 | 真实模型未验收 | AI+后端 | +| AI-INS-003 | `inspection.go`、`is_mock` | `inspection_test.go` | Mock 标识与统计排除 | 本地 | verify.ps1 | 部分可用 | 历史 mock 需人工审阅 | 后端 | +| AI-INS-004 | `RiskAssessment` | `risk_test.go` | 风险解释展示 | 本地 | verify.ps1 | 部分可用 | 权重待试点校准 | 后端 | +| AI-INS-005 | `offlineQueue.ts` | `offlineQueue.test.ts` | 离线→重启→联网 | 微信开发者工具 | miniapp test | 部分可用 | 未做截图取证 | 小程序 | +| RISK-001 | `RiskLevel` | `risk_test.go` | 边界用例 | 本地 | go test | 已实现 | 无 | 后端 | +| RISK-002 | `RiskInput` 指针 | `risk_test.go` | 缺失组件展示 | 本地 | go test | 已实现 | 无 | 后端 | +| RISK-003 | `risk_assessment` | `risk_test.go` | 巡检详情 | 本地 | go test | 已实现 | 无 | 后端 | +| RISK-004 | `risk-v2-2026.08.14` | 无 | 试点校准 | 待试点 | 无 | 部分可用 | 权重非科学结论 | 后端+专家 | +| RISK-005 | 未完成 | 无 | 无 | 无 | 无 | 未完成 | 人工纠正等级 | 后端 | + +## Wave 2：工程可靠性 + +| 需求 ID | 实现 | 自动测试 | 手工用例 | 环境 | 证据 | 状态 | 限制 | 负责人 | +|---|---|---|---|---|---|---|---|---| +| DET-001 | `detection_task.go` | `detection_task_test.go` | 任务中心 | 本地 | verify.ps1 | 部分可用 | 未端到端联调 | 后端 | +| DET-002 | `sample.go` | `detection_task_test.go` | 样本流转 | 本地 | go test | 部分可用 | 单样本/任务 | 后端 | +| DET-003 | `molecular.go` | `molecular_test.go` | 结果枚举 | 本地 | go test | 部分可用 | qPCR 四态延后 | 后端 | +| DET-004 | 延后 Task 7 | 无 | 无 | 无 | 决策记录 | 延后 | 专家确认 | 后端+专家 | +| DET-005 | `lamp.go` | `lamp_test_test.go` | LAMP 5 步 | 本地 | go test | 部分可用 | 对照/照片质控待完善 | 后端 | +| DET-006 | `cross_validate.go` | `cross_validate_test.go` | 交叉验证 | 本地 | go test | 部分可用 | 真实数据待联调 | 后端 | +| DET-007 | `detection_recommend.go` | `detection_recommend_test.go` | 推荐接口 | 本地 | go test | 部分可用 | 未绑定组织可用设备 | 后端 | +| DET-008 | `consumable.go` | `consumable_test.go` | 耗材预警 | 本地 | go test | 部分可用 | 无批次/领用 | 后端 | +| DET-009 | 未完成 | 无 | 无 | 无 | 无 | 未完成 | 设备回传协议 | 后端 | +| DET-010 | 未完成 | 无 | 无 | 无 | 无 | 未完成 | LAMP 图像判读 | AI | +| DET-011 | `spectrum_entries` | 无专项测试 | 光谱上传 | 本地 | 构建 | 部分可用 | 方法学验证未做 | AI | +| MSG-001 | `outbox.go`、`notification.go` | `outbox_test.go` | 通知重试 | 本地 | verify.ps1 | 部分可用 | 未真实联调 | 后端 | +| MSG-002 | `wechat.go`、outbox | `wechat_test.go` | 微信订阅 | 本地 | pytest/go test | 部分可用 | 缺真实凭证 | 后端 | + +## Wave 3：业务闭环 + +| 需求 ID | 实现 | 自动测试 | 手工用例 | 环境 | 证据 | 状态 | 限制 | 负责人 | +|---|---|---|---|---|---|---|---|---| +| FARM-001 | `tray_batch.go` | `knowledge_seed_test.go` 等 | 蚕房/批次 CRUD | 本地 | go test | 已实现 | 无 | 后端 | +| FARM-002 | `identity_links.go` | `biosecurity_test.go` | 二维码签发/解析 | 本地 | go test | 部分可用 | 未打印扫码 | 后端+小程序 | +| FARM-003 | `rearing_records` | 无专项测试 | 饲养记录 | 本地 | go test | 部分可用 | 缺死亡/淘汰字段 | 后端 | +| FARM-004 | `disinfection_records` | `biosecurity_test.go` | 消毒计划/执行 | 本地 | verify.ps1 | 部分可用 | 未现场联调 | 后端+小程序 | +| FARM-005 | `seed_sources` | `biosecurity_test.go` | 种源链 | 本地 | go test | 部分可用 | 供应商凭证待接入 | 后端 | +| FARM-006 | 未完成 | 无 | 无 | 无 | 无 | 未完成 | 产量/损失/成本 | 后端 | +| ENV-001 | `telemetry.go`、`mqtt.go` | 无专项测试 | 遥测查询 | 开发 | 构建 | 已实现 | 数据质量标识不足 | 后端 | +| ENV-002 | `threshold.go`、`alarm.go` | 无专项测试 | 阈值告警 | 开发 | 构建 | 已实现 | 无对象级授权 | 后端 | +| ENV-003 | `rule_engine.go` | `rule_engine_test.go` | 过期数据 | 本地 | go test | 部分可用 | 未接入生产遥测 | 后端 | +| ENV-004 | `rule_engine.go`、`weather_risk.go` | `rule_engine_test.go` | 连续时窗 | 本地 | go test | 部分可用 | 密度/通风等输入待接入 | 后端 | +| ENV-005 | `rule_engine.go` | `rule_engine_test.go` | 规则解释 | 本地 | go test | 部分可用 | 结果持久化未全链路 | 后端 | +| ENV-006 | 未完成 | 无 | 无 | 无 | 无 | 未完成 | 设备校准/维护 | 后端 | +| ENV-007 | 未完成 | 无 | 无 | 无 | 无 | 未完成 | 安全控制建议 | 后端 | +| EXP-001 | `consultation.go` | `consultation_test.go` | 病例快照 | 本地 | go test | 已实现 | 环境/天气摘要待增强 | 后端 | +| EXP-002 | `consultation.go` | `consultation_test.go` | 会诊状态机 | 本地 | go test | 已实现 | 无 | 后端 | +| EXP-003 | `ConsultationSLAState` | `consultation_test.go` | SLA 超时 | 本地 | go test | 部分可用 | 无升级通知 | 后端 | +| EXP-004 | `consultation_opinion_versions` | `consultation_test.go` | 意见版本 | 本地 | go test | 已实现 | 无 | 后端 | +| EXP-005 | `health_profile.go` effect | `health_profile_test.go` | 效果报告 | 本地 | go test | 部分可用 | 损失/成本缺失 | 后端 | +| KB-001 | `knowledge.go` | `knowledge_governance_test.go` | 审核发布 | 本地 | go test | 部分可用 | 审核权限基于角色 | 后端+Web | +| KB-002 | `knowledge.go` source 字段 | 无专项测试 | 来源展示 | 本地 | 构建 | 部分可用 | 专家签名待接入 | 后端 | +| KB-003 | 未完成 | 无 | 无 | 无 | 无 | 未完成 | 案例沉淀 | 后端 | +| TRACE-001 | `disease_events` | `disease_event_test.go` | 发病事件 | 本地 | go test | 部分可用 | 未端到端 | 后端 | +| TRACE-002 | `trace.go` auto | 无专项测试 | 自动溯源 | 本地 | go test | 部分可用 | 空间/样本链不足 | 后端 | +| TRACE-003 | `trace.go` checklist | 无专项测试 | 二级排查 | 本地 | go test | 部分可用 | 无版本化清单 | 后端 | +| TRACE-004 | `trace.go` lab note | 无专项测试 | 三级溯源 | 本地 | go test | 部分可用 | 结构化实验室数据未做 | 后端 | +| TRACE-005 | `trace.go` | `trace_test.go` | 来源结论 | 本地 | go test | 部分可用 | 专家确认流程未做 | 后端 | +| TRACE-006 | `region_stat.go` | `region_stat_test.go` | 区域统计 | 本地 | go test | 部分可用 | 小样本脱敏未做 | 后端 | +| TRACE-007 | `seed_sources` + 复发字段 | `biosecurity_test.go` | 复发关联 | 本地 | go test | 部分可用 | 人工确认未做 | 后端 | +| VIDEO-001 | `video_auth.go` | `video_auth_test.go` | 播放授权 | 本地 | go test | 部分可用 | 对象级授权待后续 | 后端 | +| VIDEO-002 | DTO 脱敏 | `video_dto.go` | 密钥不返回 | 本地 | go test | 部分可用 | 历史配置审计 | 后端 | +| VIDEO-003 | 未完成 | 无 | 无 | 无 | 无 | 未完成 | 录制状态持久化 | 后端 | +| VIDEO-004 | `stream_tasks.py` | AI pytest | 受限拉流 | 本地 | pytest | 部分可用 | 摄像头真实视角待接入 | AI | +| ANA-001 | `health_profile.go` | `health_profile_test.go` | 健康画像 | 本地 | go test | 部分可用 | 公式未回测 | 后端 | +| ANA-002 | `health_profile.go` effect | `health_profile_test.go` | 效果评估 | 本地 | go test | 部分可用 | 损失/成本缺失 | 后端 | +| ANA-003 | `region_stat.go` | `region_stat_test.go` | 区域图 | 本地 | go test | 部分可用 | 地图/脱敏未做 | 后端 | diff --git a/后续工作计划.md b/后续工作计划.md index b817793..79bcb30 100644 --- a/后续工作计划.md +++ b/后续工作计划.md @@ -1,6 +1,6 @@ # 后续工作计划 -> **完成状态（2026-08-14 更新）**：#5-#24、#27 已完成，Task 0/1/2/4/5/6/8/9/10/11/12/13 整改代码完成（详见 `开发交接记录.md`）；#1-4 因物理机问题挂起；#23/#26 骨架完成；Task 3/7 延后到最后处理；微信/天气真实数据待凭证。 +> **完成状态（2026-08-14 更新）**：#5-#24、#27 已完成，Task 0/1/2/4/5/6/8/9/10/11/12/13/14 整改代码/验收文档完成（详见 `开发交接记录.md`）；#1-4 因物理机问题挂起；#23/#26 骨架完成；Task 3/7 延后到最后处理；微信/天气真实数据待凭证。 ## 整改实施计划 Wave 0-4（2026-08-13 启动） @@ -22,7 +22,7 @@ | Wave 3 | 业务闭环 | Task 11 实现小程序离线巡检与可靠同步 | 部分可用 | 待开发服务器迁移部署与开发者工具离线/重启联调 | | Wave 3 | 业务闭环 | Task 12 完善环境规则、会诊治理、知识审核与效果评估 | 部分可用 | 待开发服务器迁移部署与专家/试点联调 | | Wave 4 | 验收与发布 | Task 13 建立可观测性、容量与恢复验证 | 部分可用 | 待真实环境负载/备份恢复演练与告警通道联调 | -| Wave 4 | 验收与发布 | Task 14 建立规格追踪、端到端验收与发布门禁 | 未开始 | 无 | +| Wave 4 | 验收与发布 | Task 14 建立规格追踪、端到端验收与发布门禁 | 部分可用 | 待目标环境执行 E2E、真实发布与恢复演练 | ## 技术选型决策（2026-08-11 确定） diff --git a/开发交接记录.md b/开发交接记录.md index f88032b..c3e2d29 100644 --- a/开发交接记录.md +++ b/开发交接记录.md @@ -1147,3 +1147,31 @@ MVP 沿用 IoTDB（现状）；TDengine 作为生产规模化候选（先基准 - 本任务前分支提交为 `126c215`；回滚可还原 Task 13 提交； - requestId/日志脱敏可安全保留；若指标采集开销过高，可降低采样频率； - 运维文档和部署指南可直接保留，不删除已记录的恢复演练要求。 + +## 2026-08-14 整改 Task 14：建立规格追踪、端到端验收与发布门禁 + +### 做了什么 + +- 新增 `docs/acceptance/requirements-traceability.md`：Wave 1～3 需求 ID 到实现、测试、手工用例、环境、证据、状态、限制和负责人的追踪表； +- 新增 `docs/acceptance/core-e2e-cases.md`：覆盖 healthy 不触发、橙色仅一个任务、AI 失败重试、无效不确诊、阳性发病事件、越权 403、离线同步、通知重试、重启保持、备份恢复共 10 条核心用例； +- 新增 `docs/acceptance/release-checklist.md`：发布前、发布中、发布后和回滚门禁； +- `蚕病智能防控平台规格说明书_V2.2.md` 第 12 章增加验收文档入口和近期整改能力行； +- `scripts/verify.ps1` 已在 Task 11 起纳入小程序单测，作为当前可复现质量门禁。 + +### 设计思路与决策依据 + +- 追踪矩阵不允许只写模块名，每行必须能回溯到实现、测试、环境、证据、限制和负责人； +- E2E 用例先固定核心业务闭环，目标环境执行后再更新结果，不把“已编写”当“已验证”； +- 发布门禁要求先备份、再部署、后回滚验证，和 AGENTS.md 的服务器发布规则保持一致。 + +### 验证结果 + +- `scripts/verify.ps1` exit 0：Go test/vet/build、Web test/lint/build、小程序 test/typecheck/build、APP typecheck/lint、AI pytest 15/15 均通过； +- `git diff --check` 通过； +- 未在目标环境执行 E2E-01～10，未完成真实发布和备份恢复演练。 + +### 回滚点 + +- 本任务前分支提交为 `1e6a5db`；回滚可还原 Task 14 提交； +- 本次仅新增/修改验收文档和规格书状态说明，无代码、数据库或生成产物变更； +- 如需回滚，删除 `docs/acceptance/` 并恢复规格书第 12 章及计划/交接文档即可。 diff --git a/蚕病智能防控平台规格说明书_V2.2.md b/蚕病智能防控平台规格说明书_V2.2.md index b8baa4e..14f5e40 100644 --- a/蚕病智能防控平台规格说明书_V2.2.md +++ b/蚕病智能防控平台规格说明书_V2.2.md @@ -560,6 +560,8 @@ Organization ## 12. 当前状态追踪矩阵 +> 需求级追踪矩阵见 `docs/acceptance/requirements-traceability.md`；发布前必须执行 `docs/acceptance/core-e2e-cases.md` 和 `docs/acceptance/release-checklist.md`。 + | 能力 | 当前状态 | 阻断项 | 目标阶段 | |---|---|---|---| | 环境/设备/告警 | 部分可用 | 数据质量、对象权限、校准 | B/C | @@ -571,6 +573,11 @@ Organization | SERS | 文件录入骨架 | 设备、算法、方法验证 | C/E | | 高光谱 | 接口预留 | 数据、算法、方法验证 | E | | 专家会诊 | 表单流程部分可用 | SLA、版本、可靠通知 | C | +| 统一检测任务/样本/发病事件 | 部分可用 | 未端到端联调、真实模型 | C | +| 生物安全（种源/消毒/二维码） | 部分可用 | 真实二维码/现场扫码联调 | C | +| 小程序离线巡检 | 部分可用 | 离线→重启→联网截图取证 | C | +| 会诊治理/知识审核/效果评估 | 部分可用 | 专家与试点联调 | C | +| 可观测性/容量/恢复 | 基线可用 | 真实负载、恢复演练、告警通道 | B/C | | 疫病溯源 | v1 规则部分可用 | DiseaseEvent、种源/样本/空间链 | C | | 微信/天气 | 骨架 | 真实凭证和目标环境联调 | C | | 摄像头 AI | 骨架 | 安全任务调度、视角数据、模型 | E |