.changeset/.prettierrc.json

@@ -1,3 +0,0 @@
-{
-  "singleQuote": true
-}

.changeset/fancy-ears-walk.md

@@ -1,7 +0,0 @@
----
-'@vben/styles': patch
-'@vben-core/form-ui': patch
-'@vben/web-naive': patch
----
-
-feat(@core/form-ui): 新增 useVbenForm 数组编辑器 VbenFormFieldArray

.github/actions/setup-node/action.yml

@@ -6,7 +6,7 @@ runs:
   using: 'composite'
   steps:
     - name: Install pnpm
-      uses: pnpm/action-setup@v6
+      uses: pnpm/action-setup@v4
 
     - name: Install Node.js
       uses: actions/setup-node@v6

.github/workflows/ci.yml

@@ -33,7 +33,7 @@ jobs:
           fetch-depth: 0
 
       - name: Install pnpm
-        uses: pnpm/action-setup@v6
+        uses: pnpm/action-setup@v5
         with:
           run_install: false
 

.github/workflows/codeql.yml

@@ -61,7 +61,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v4
+        uses: github/codeql-action/init@v3
         with:
           languages: ${{ matrix.language }}
           build-mode: ${{ matrix.build-mode }}
@@ -89,6 +89,6 @@ jobs:
           exit 1
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v4
+        uses: github/codeql-action/analyze@v3
         with:
           category: '/language:${{matrix.language}}'

.github/workflows/deploy.yml

@@ -30,7 +30,7 @@ jobs:
         run: pnpm build:play
 
       - name: Sync Playground files
-        uses: SamKirkland/FTP-Deploy-Action@v4.4.0
+        uses: SamKirkland/FTP-Deploy-Action@v4.3.6
         with:
           server: ${{ secrets.PRO_FTP_HOST }}
           username: ${{ secrets.WEB_PLAYGROUND_FTP_ACCOUNT }}
@@ -54,7 +54,7 @@ jobs:
         run: pnpm build:docs
 
       - name: Sync Docs files
-        uses: SamKirkland/FTP-Deploy-Action@v4.4.0
+        uses: SamKirkland/FTP-Deploy-Action@v4.3.6
         with:
           server: ${{ secrets.PRO_FTP_HOST }}
           username: ${{ secrets.WEBSITE_FTP_ACCOUNT }}
@@ -85,7 +85,7 @@ jobs:
         run: pnpm run build:antd
 
       - name: Sync files
-        uses: SamKirkland/FTP-Deploy-Action@v4.4.0
+        uses: SamKirkland/FTP-Deploy-Action@v4.3.6
         with:
           server: ${{ secrets.PRO_FTP_HOST }}
           username: ${{ secrets.WEB_ANTD_FTP_ACCOUNT }}
@@ -116,7 +116,7 @@ jobs:
         run: pnpm run build:ele
 
       - name: Sync files
-        uses: SamKirkland/FTP-Deploy-Action@v4.4.0
+        uses: SamKirkland/FTP-Deploy-Action@v4.3.6
         with:
           server: ${{ secrets.PRO_FTP_HOST }}
           username: ${{ secrets.WEB_ELE_FTP_ACCOUNT }}
@@ -147,7 +147,7 @@ jobs:
         run: pnpm run build:naive
 
       - name: Sync files
-        uses: SamKirkland/FTP-Deploy-Action@v4.4.0
+        uses: SamKirkland/FTP-Deploy-Action@v4.3.6
         with:
           server: ${{ secrets.PRO_FTP_HOST }}
           username: ${{ secrets.WEB_NAIVE_FTP_ACCOUNT }}

.github/workflows/issue-close-require.yml

@@ -19,7 +19,7 @@ jobs:
     steps:
       # 关闭未活动的 Issues
       - name: Close Inactive Issues
-        uses: actions/stale@v10
+        uses: actions/stale@v9
         with:
           days-before-stale: -1 # Issues and PR will never be flagged stale automatically.
           stale-issue-label: needs-reproduction # Label that flags an issue as stale.

.github/workflows/issue-labeled.yml

@@ -18,7 +18,7 @@ jobs:
     steps:
       - name: remove enhancement pending
         if: github.event.label.name == 'enhancement'
-        uses: actions-cool/issues-helper-backup@d65454423c6fbbd20026b9b499d403f79422ac69
+        uses: actions-cool/issues-helper@v3
         with:
           actions: 'remove-labels'
           token: ${{ secrets.GITHUB_TOKEN }}
@@ -27,7 +27,7 @@ jobs:
 
       - name: remove bug pending
         if: github.event.label.name == 'bug'
-        uses: actions-cool/issues-helper-backup@d65454423c6fbbd20026b9b499d403f79422ac69
+        uses: actions-cool/issues-helper@v3
         with:
           actions: 'remove-labels'
           token: ${{ secrets.GITHUB_TOKEN }}
@@ -36,7 +36,7 @@ jobs:
 
       - name: needs reproduction
         if: github.event.label.name == 'needs reproduction'
-        uses: actions-cool/issues-helper-backup@d65454423c6fbbd20026b9b499d403f79422ac69
+        uses: actions-cool/issues-helper@v3
         with:
           actions: 'create-comment, remove-labels'
           token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/lock.yml

@@ -14,7 +14,7 @@ jobs:
     if: github.repository == 'vbenjs/vue-vben-admin'
     runs-on: ubuntu-latest
     steps:
-      - uses: dessant/lock-threads@v6
+      - uses: dessant/lock-threads@v5
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           issue-inactive-days: '14'

.github/workflows/release-tag.yml

@@ -3,44 +3,60 @@ name: Create Release Tag
 on:
   push:
     tags:
-      - 'v*.*.*'
+      - 'v*.*.*' # Push events to matching v*, i.e. v1.0, v20.15.10
-  workflow_dispatch:
+
-    inputs:
+env:
-      tag:
+  HUSKY: '0'
-        description: 'Tag to create (e.g. v1.2.3)'
-        required: true
-        type: string
 
 permissions:
+  pull-requests: write
   contents: write
 
 jobs:
-  release:
+  build:
     name: Create Release
     if: github.repository == 'vbenjs/vue-vben-admin'
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version: [22]
     steps:
       - name: Checkout code
         uses: actions/checkout@v6
         with:
           fetch-depth: 0
 
-      - name: Extract version
+      # - name: Checkout code
+      #   uses: actions/checkout@v6
+      #   with:
+      #     fetch-depth: 0
+
+      # - name: Install pnpm
+      #   uses: pnpm/action-setup@v4
+
+      # - name: Use Node.js ${{ matrix.node-version }}
+      #   uses: actions/setup-node@v4
+      #   with:
+      #     node-version: ${{ matrix.node-version }}
+      #     cache: "pnpm"
+
+      # - name: Install dependencies
+      #   run: pnpm install --frozen-lockfile
+
+      # - name: Test and Build
+      #   run: |
+      #     pnpm run test
+      #     pnpm run build
+
+      - name: version
         id: version
         run: |
-          if [[ "${{ github.event_name }}" == "workflow_dispatch" ]]; then
+          tag=${GITHUB_REF/refs\/tags\//}
-            raw_tag="${{ inputs.tag }}"
+          version=${tag#v}
-          else
+          major=${version%%.*}
-            raw_tag="${GITHUB_REF_NAME}"
+          echo "tag=${tag}" >> $GITHUB_OUTPUT
-          fi
+          echo "version=${version}" >> $GITHUB_OUTPUT
-          # Normalize: ensure v prefix
+          echo "major=${major}" >> $GITHUB_OUTPUT
-          tag="${raw_tag}"
-          [[ "${tag:0:1}" != "v" ]] && tag="v${tag}"
-          version="${tag#v}"
-          major="${version%%.*}"
-          echo "tag=${tag}" >> "${GITHUB_OUTPUT}"
-          echo "version=${version}" >> "${GITHUB_OUTPUT}"
-          echo "major=${major}" >> "${GITHUB_OUTPUT}"
 
       - uses: release-drafter/release-drafter@v7
         with:
@@ -48,3 +64,17 @@ jobs:
           publish: true
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      # - name: force update major tag
+      #   run: |
+      #     git tag v${{ steps.version.outputs.major }} ${{ steps.version.outputs.tag }} -f
+      #     git push origin refs/tags/v${{ steps.version.outputs.major }} -f
+
+      # - name: Create Release for Tag
+      #   id: release_tag
+      #   uses: ncipollo/release-action@v1
+      #   with:
+      #     token: ${{ secrets.GITHUB_TOKEN }}
+      #     generateReleaseNotes: "true"
+      #     body: |
+      #       > Please refer to [CHANGELOG.md](https://github.com/vbenjs/vue-vben-admin/blob/main/CHANGELOG.md) for details.

.github/workflows/semantic-pull-request.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Validate PR title
-        uses: amannn/action-semantic-pull-request@v6
+        uses: amannn/action-semantic-pull-request@v5
         with:
           wip: true
           subjectPattern: ^(?![A-Z]).+$

.github/workflows/stale.yml

@@ -9,7 +9,7 @@ jobs:
     if: github.repository == 'vbenjs/vue-vben-admin'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v10
+      - uses: actions/stale@v9
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           stale-issue-message: 'This issue is stale because it has been open 60 days with no activity. Remove stale label or comment or this will be closed in 7 days'

.gitignore

@@ -23,7 +23,6 @@ package-lock.json
 .VSCodeCounter
 **/backend-mock/data
 .omx
-.pnpm-store
 # local env files
 .env.local
 .env.*.local
@@ -58,8 +57,3 @@ vite.config.ts.*
 .claude
 .codex
 skills-lock.json
-.atomcode
-datalog
-
-# Playwright CLI 录制产物（本地调试，不入库）
-.playwright-cli

.node-version

@@ -1 +1 @@
-24.16.0
+22.22.0

.npmrc

@@ -1 +1,13 @@
 registry=https://registry.npmmirror.com
+public-hoist-pattern[]=lefthook
+public-hoist-pattern[]=eslint
+public-hoist-pattern[]=oxfmt
+public-hoist-pattern[]=oxlint
+public-hoist-pattern[]=stylelint
+public-hoist-pattern[]=*postcss*
+public-hoist-pattern[]=@commitlint/*
+public-hoist-pattern[]=czg
+
+strict-peer-dependencies=false
+auto-install-peers=true
+dedupe-peer-dependents=true

.vscode/launch.json

@@ -2,15 +2,6 @@
   "$schema": "https://json.schemastore.org/launchsettings.json",
   "version": "0.2.0",
   "configurations": [
-    {
-      "type": "chrome",
-      "name": "vben admin antd dev",
-      "request": "launch",
-      "url": "http://localhost:5999",
-      "env": { "NODE_ENV": "development" },
-      "sourceMaps": true,
-      "webRoot": "${workspaceFolder}/apps/web-antdv-next"
-    },
     {
       "type": "chrome",
       "name": "vben admin antd dev",

.vscode/settings.json

@@ -38,7 +38,7 @@
 
   // lint && format
   "oxc.enable": true,
-  "oxc.typeAware": false,
+  "oxc.typeAware": true,
   "oxc.configPath": "oxlint.config.ts",
   "oxc.fmt.configPath": "oxfmt.config.ts",
   "eslint.useFlatConfig": true,

README.md

@@ -9,7 +9,7 @@
 
 ## 🐶 新手必读
 
-- nodejs >= v22.18.0（推荐v24） && pnpm >= 11.0.0（强制使用 pnpm）
+- nodejs >= v20.19.0（推荐 v22 / v24） && pnpm >= 10.32.1（强制使用 pnpm）
 - 演示地址【Vue3 + element-plus】：<http://dashboard-vue3.yudao.iocoder.cn>
 - 演示地址【Vue3 + vben5(ant-design-vue)】：<http://dashboard-vben.yudao.iocoder.cn>
 - 演示地址【Vue2 + element-ui】：<http://dashboard.yudao.iocoder.cn>
@@ -41,24 +41,24 @@
 
 | 框架 | 说明 | 版本 |
 | --- | --- | --- |
-| [Vue](https://staging-cn.vuejs.org/) | vue框架 | 3.5.35 |
+| [Vue](https://staging-cn.vuejs.org/) | vue框架 | 3.5.30 |
-| [Vite](https://cn.vitejs.dev//) | 开发与构建工具 | 8.0.10 |
+| [Vite](https://cn.vitejs.dev//) | 开发与构建工具 | 8.0.0 |
 | [Ant Design Vue](https://www.antdv.com/) | Ant Design Vue | 4.2.6 |
-| [Element Plus](https://element-plus.org/zh-CN/) | Element Plus | 2.14.1 |
+| [Element Plus](https://element-plus.org/zh-CN/) | Element Plus | 2.13.5 |
 | [Naive UI](https://www.naiveui.com/) | Naive UI | 2.44.1 |
-| [TDesign](https://tdesign.tencent.com/) | TDesign | 1.20.0 |
+| [TDesign](https://tdesign.tencent.com/) | TDesign | 1.18.5 |
-| [TypeScript](https://www.typescriptlang.org/docs/) | JavaScript 超集 | 6.0.3 |
+| [TypeScript](https://www.typescriptlang.org/docs/) | JavaScript 超集 | 5.9.3 |
 | [pinia](https://pinia.vuejs.org/) | Vue 存储库替代 vuex5 | 3.0.4 |
-| [vueuse](https://vueuse.org/) | 常用工具集 | 14.3.0 |
+| [vueuse](https://vueuse.org/) | 常用工具集 | 14.2.1 |
-| [vue-i18n](https://kazupon.github.io/vue-i18n/zh/introduction.html/) | 国际化 | 11.4.4 |
+| [vue-i18n](https://kazupon.github.io/vue-i18n/zh/introduction.html/) | 国际化 | 11.3.0 |
-| [vue-router](https://router.vuejs.org/) | Vue 路由 | 5.1.0 |
+| [vue-router](https://router.vuejs.org/) | Vue 路由 | 5.0.3 |
-| [Tailwind CSS](https://tailwindcss.com/) | 原子 CSS | 4.3.0 |
+| [Tailwind CSS](https://tailwindcss.com/) | 原子 CSS | 4.2.1 |
-| [Iconify](https://iconify.design/) | 图标组件 | 5.0.1 |
+| [Iconify](https://iconify.design/) | 图标组件 | 5.0.0 |
-| [Iconify](https://icon-sets.iconify.design/) | 在线图标库 | 2.2.481 |
+| [Iconify](https://icon-sets.iconify.design/) | 在线图标库 | 2.2.449 |
 | [TinyMCE](https://www.tiny.cloud/) | 富文本编辑器 | 7.3.0 |
-| [Echarts](https://echarts.apache.org/) | 图表库 | 6.1.0 |
+| [Echarts](https://echarts.apache.org/) | 图表库 | 6.0.0 |
-| [axios](https://axios-http.com/) | http客户端 | 1.16.1 |
+| [axios](https://axios-http.com/) | http客户端 | 1.13.6 |
-| [dayjs](https://day.js.org/) | 日期处理库 | 1.11.21 |
+| [dayjs](https://day.js.org/) | 日期处理库 | 1.11.20 |
 | [vee-validate](https://vee-validate.logaretm.com/) | 表单验证 | 4.15.1 |
 | [zod](https://zod.dev/) | 数据验证 | 3.25.76 |
 
@@ -82,9 +82,9 @@
 
 ![功能分层](/.gitee/image/common/ruoyi-vue-pro-biz.png)
 
-- 通用模块（必选）：系统功能、基础设施
+* 通用模块（必选）：系统功能、基础设施
-- 通用模块（可选）：工作流程、支付系统、数据报表、会员中心
+* 通用模块（可选）：工作流程、支付系统、数据报表、会员中心
-- 业务系统（按需）：Mall 电子商城、OA 办公自动化、ERP 企业资源计划系统、WMS 仓库管理系统、CRM 客户关系管理、CMS 内容管理系统、MES 执行制造系统、AI 大模型平台、IoT 物联网系统、IM 即时通讯系统、Mobile 手机移动端、Report 数据大屏
+* 业务系统（按需）：ERP 系统、CRM 系统、MES 系统、商城系统、微信公众号、AI 大模型、IoT 物联网
 
 ### 系统功能
 
@@ -222,7 +222,7 @@
 ### 会员中心
 
 |     | 功能   | 描述                               |
-| --- | --- | --- |
+|-----|------|----------------------------------|
 | 🚀  | 会员管理 | 会员是 C 端的消费者，该功能用于会员的搜索与管理        |
 | 🚀  | 会员标签 | 对会员的标签进行创建、查询、修改、删除等操作           |
 | 🚀  | 会员等级 | 对会员的等级、成长值进行管理，可用于订单折扣等会员权益      |
@@ -235,14 +235,6 @@
 
 ![功能图](/.gitee/image/common/erp-feature.png)
 
-### WMS 系统
-
-演示地址：<https://doc.iocoder.cn/wms-preview/>
-
-![功能图](/.gitee/image/common/wms-feature.png)
-
-![预览图](/.gitee/image/common/wms-preview.png)
-
 ### CRM 系统
 
 演示地址：<https://doc.iocoder.cn/crm-preview/>
@@ -272,15 +264,3 @@
 ![功能图](/.gitee/image/common/iot-feature.png)
 
 ![预览图](/.gitee/image/common/iot-preview.png)
-
-### IM 即时通讯
-
-演示地址（Vue3 + Vben5）：<http://dashboard-vben.yudao.iocoder.cn>
-
-使用文档：<https://doc.iocoder.cn/im-preview/>
-
-![功能图](/.gitee/image/common/im-feature.png)
-
-| 聊天界面 | 聊天管理 |
-| --- | --- |
-| ![聊天界面](/.gitee/image/common/im-preview-home.png) | ![聊天管理](/.gitee/image/common/im-preview-manager.png) |

apps/web-antd/package.json

@@ -20,7 +20,7 @@
     "build:analyze": "pnpm vite build --mode analyze",
     "dev": "pnpm vite --mode development",
     "preview": "vite preview",
-    "typecheck": "cross-env NODE_OPTIONS=--max-old-space-size=8192 vue-tsc --noEmit --skipLibCheck --incremental --tsBuildInfoFile node_modules/.cache/vue-tsc/tsconfig.tsbuildinfo"
+    "typecheck": "vue-tsc --noEmit --skipLibCheck"
   },
   "imports": {
     "#/*": "./src/*"
@@ -54,15 +54,12 @@
     "camunda-bpmn-moddle": "catalog:",
     "cropperjs": "catalog:",
     "dayjs": "catalog:",
-    "dhtmlx-gantt": "catalog:",
     "diagram-js": "catalog:",
     "fast-xml-parser": "catalog:",
     "highlight.js": "catalog:",
-    "livekit-client": "catalog:",
     "pinia": "catalog:",
     "steady-xml": "catalog:",
     "tinymce": "catalog:",
-    "tyme4ts": "catalog:",
     "video.js": "catalog:",
     "vue": "catalog:",
     "vue-dompurify-html": "catalog:",

apps/web-antd/src/adapter/component/index.ts

@@ -136,8 +136,8 @@ const PreviewGroup = defineAsyncComponent(() =>
   import('ant-design-vue/es/image').then((res) => res.ImagePreviewGroup),
 );
 
-const withDefaultPlaceholder = (
+const withDefaultPlaceholder = <T extends Component>(
-  component: Component,
+  component: T,
   type: 'input' | 'select',
   componentProps: Recordable<any> = {},
 ) => {
@@ -711,9 +711,7 @@ async function initComponentAdapter() {
       modelValueProp: 'value',
     }),
     Input: withDefaultPlaceholder(Input, 'input'),
-    InputNumber: withDefaultPlaceholder(InputNumber, 'input', {
+    InputNumber: withDefaultPlaceholder(InputNumber, 'input'),
-      style: { width: '100%' },
-    }),
     InputPassword: withDefaultPlaceholder(InputPassword, 'input'),
     Mentions: withDefaultPlaceholder(Mentions, 'input'),
     // 自定义主要按钮

apps/web-antd/src/adapter/form.ts

@@ -65,6 +65,5 @@ const useVbenForm = useForm<ComponentType, ComponentPropsMap>;
 
 export { initSetupVbenForm, useVbenForm, z };
 
-export type VbenFormApi = ReturnType<typeof useVbenForm>[1]; // add by 芋艿：用于 data.ts 表单 schema 内调用 setFieldValue
 export type VbenFormSchema = FormSchema<ComponentType, ComponentPropsMap>;
 export type VbenFormProps = FormProps<ComponentType, ComponentPropsMap>;

apps/web-antd/src/api/ai/chat/conversation/index.ts

@@ -14,7 +14,7 @@ export namespace AiChatConversationApi {
     temperature: number; // 温度参数
     maxTokens: number; // 单条回复的最大 Token 数量
     maxContexts: number; // 上下文的最大 Message 数量
-    createTime: Date; // 创建时间
+    createTime?: Date; // 创建时间
     systemMessage?: string; // 角色设定
     modelName?: string; // 模型名字
     roleAvatar?: string; // 角色头像

apps/web-antd/src/api/ai/image/index.ts

@@ -34,15 +34,15 @@ export namespace AiImageApi {
     prompt: string; // 提示词
     modelId: number; // 模型
     style: string; // 图像生成的风格
-    width: number; // 图片宽度
+    width: string; // 图片宽度
-    height: number; // 图片高度
+    height: string; // 图片高度
     options: object; // 绘制参数，Map<String, String>
   }
 
   export interface ImageMidjourneyImagineReqVO {
     prompt: string; // 提示词
     modelId: number; // 模型
-    base64Array: string[]; // 参考图 base64 列表
+    base64Array?: string[]; // size不能为空
     width: string; // 图片宽度
     height: string; // 图片高度
     version: string; // 版本

apps/web-antd/src/api/bpm/oa/leave/index.ts

@@ -12,6 +12,7 @@ export namespace BpmOALeaveApi {
     startTime: number;
     endTime: number;
     createTime: Date;
+    startUserSelectAssignees?: Record<string, string[]>;
   }
 }
 
@@ -20,6 +21,11 @@ export async function createLeave(data: BpmOALeaveApi.Leave) {
   return requestClient.post('/bpm/oa/leave/create', data);
 }
 
+/** 更新请假申请 */
+export async function updateLeave(data: BpmOALeaveApi.Leave) {
+  return requestClient.post('/bpm/oa/leave/update', data);
+}
+
 /** 获得请假申请 */
 export async function getLeave(id: number) {
   return requestClient.get<BpmOALeaveApi.Leave>(`/bpm/oa/leave/get?id=${id}`);

apps/web-antd/src/api/bpm/processInstance/index.ts

@@ -83,7 +83,6 @@ export namespace BpmProcessInstanceApi {
     reason: string;
     signPicUrl: string;
     status: number;
-    attachments?: string[];
   }
 
   /** 抄送流程实例 */

apps/web-antd/src/api/crm/business/status/index.ts

@@ -11,16 +11,15 @@ export namespace CrmBusinessStatusApi {
     deptNames?: string[];
     creator?: string;
     createTime?: Date;
-    statuses: BusinessStatusType[];
+    statuses?: BusinessStatusType[];
   }
 
   /** 商机状态信息 */
   export interface BusinessStatusType {
     id?: number;
     name: string;
-    percent?: number;
+    percent: number;
-    endStatus?: number;
+    [x: string]: any;
-    key?: string;
   }
 }
 
@@ -44,7 +43,7 @@ export const DEFAULT_STATUSES = [
     name: '无效',
     percent: 0,
   },
-] satisfies CrmBusinessStatusApi.BusinessStatusType[];
+];
 
 /** 查询商机状态组列表 */
 export function getBusinessStatusPage(params: PageParam) {

apps/web-antd/src/api/crm/receivable/index.ts

@@ -12,7 +12,6 @@ export namespace CrmReceivableApi {
     customerId?: number;
     customerName?: string;
     contractId?: number;
-    contractNo?: string;
     contract?: Contract;
     auditStatus: number;
     processInstanceId: number;
@@ -35,11 +34,6 @@ export namespace CrmReceivableApi {
     no: string;
     totalPrice: number;
   }
-
-  export interface ReceivablePageParam extends PageParam {
-    contractId?: number;
-    customerId?: number;
-  }
 }
 
 /** 查询回款列表 */
@@ -51,9 +45,7 @@ export function getReceivablePage(params: PageParam) {
 }
 
 /** 查询回款列表，基于指定客户 */
-export function getReceivablePageByCustomer(
+export function getReceivablePageByCustomer(params: PageParam) {
-  params: CrmReceivableApi.ReceivablePageParam,
-) {
   return requestClient.get<PageResult<CrmReceivableApi.Receivable>>(
     '/crm/receivable/page-by-customer',
     { params },

apps/web-antd/src/api/crm/receivable/plan/index.ts

@@ -29,10 +29,6 @@ export namespace CrmReceivablePlanApi {
       returnTime: Date;
     };
   }
-  export interface PlanPageParam extends PageParam {
-    customerId?: number;
-    contractId?: number;
-  }
 }
 
 /** 查询回款计划列表 */

apps/web-antd/src/api/erp/purchase/in/index.ts

@@ -28,7 +28,6 @@ export namespace ErpPurchaseInApi {
   export interface PurchaseInItem {
     count?: number;
     id?: number;
-    seq?: number; // 前端行号
     orderItemId?: number;
     productBarCode?: string;
     productId?: number;

apps/web-antd/src/api/erp/purchase/order/index.ts

@@ -34,7 +34,6 @@ export namespace ErpPurchaseOrderApi {
   /** 采购订单项信息 */
   export interface PurchaseOrderItem {
     id?: number; // 订单项编号
-    seq?: number; // 前端行号
     orderId?: number; // 采购订单编号
     productId?: number; // 产品编号
     productName?: string; // 产品名称

apps/web-antd/src/api/erp/purchase/return/index.ts

@@ -11,7 +11,6 @@ export namespace ErpPurchaseReturnApi {
     returnTime?: Date; // 退货时间
     totalCount?: number; // 合计数量
     totalPrice: number; // 合计金额，单位：元
-    refundPrice?: number; // 已退款金额，单位：元
     discountPercent?: number; // 折扣百分比
     discountPrice?: number; // 折扣金额
     status?: number; // 状态
@@ -25,7 +24,6 @@ export namespace ErpPurchaseReturnApi {
   export interface PurchaseReturnItem {
     count?: number;
     id?: number;
-    seq?: number; // 前端行号
     orderItemId?: number;
     productBarCode?: string;
     productId?: number;

apps/web-antd/src/api/erp/sale/order/index.ts

@@ -28,7 +28,6 @@ export namespace ErpSaleOrderApi {
   /** 销售订单项 */
   export interface SaleOrderItem {
     id?: number; // 订单项编号
-    seq?: number; // 前端行号
     orderId?: number; // 采购订单编号
     productId?: number; // 产品编号
     productName?: string; // 产品名称

apps/web-antd/src/api/erp/sale/out/index.ts

@@ -12,7 +12,6 @@ export namespace ErpSaleOutApi {
     outTime?: Date; // 出库时间
     totalCount?: number; // 合计数量
     totalPrice?: number; // 合计金额，单位：元
-    receiptPrice?: number; // 已收款金额，单位：元
     status?: number; // 状态
     remark?: string; // 备注
     discountPercent?: number; // 折扣百分比
@@ -29,7 +28,6 @@ export namespace ErpSaleOutApi {
   export interface SaleOutItem {
     count?: number;
     id?: number;
-    seq?: number; // 前端行号
     orderItemId?: number;
     productBarCode?: string;
     productId?: number;

apps/web-antd/src/api/erp/sale/return/index.ts

@@ -11,7 +11,6 @@ export namespace ErpSaleReturnApi {
     returnTime?: Date; // 退货时间
     totalCount?: number; // 合计数量
     totalPrice?: number; // 合计金额，单位：元
-    refundPrice?: number; // 已退款金额，单位：元
     status?: number; // 状态
     remark?: string; // 备注
     discountPercent?: number; // 折扣百分比
@@ -28,7 +27,6 @@ export namespace ErpSaleReturnApi {
   export interface SaleReturnItem {
     count?: number;
     id?: number;
-    seq?: number; // 前端行号
     orderItemId?: number;
     productBarCode?: string;
     productId?: number;

apps/web-antd/src/api/erp/stock/check/index.ts

@@ -21,7 +21,6 @@ export namespace ErpStockCheckApi {
   /** 库存盘点项 */
   export interface StockCheckItem {
     id?: number; // 编号
-    seq?: number; // 前端行号
     warehouseId?: number; // 仓库编号
     productId?: number; // 产品编号
     productName?: string; // 产品名称

apps/web-antd/src/api/erp/stock/in/index.ts

@@ -23,16 +23,15 @@ export namespace ErpStockInApi {
   /** 其它入库单产品信息 */
   export interface StockInItem {
     id?: number; // 编号
-    seq?: number; // 前端行号
+    warehouseId: number; // 仓库编号
-    warehouseId?: number; // 仓库编号
+    productId: number; // 产品编号
-    productId?: number; // 产品编号
     productName?: string; // 产品名称
     productUnitId?: number; // 产品单位编号
     productUnitName?: string; // 产品单位名称
     productBarCode?: string; // 产品条码
-    count?: number; // 数量
+    count: number; // 数量
-    productPrice?: number; // 产品单价
+    productPrice: number; // 产品单价
-    totalPrice?: number; // 总价
+    totalPrice: number; // 总价
     stockCount?: number; // 库存数量
     remark?: string; // 备注
   }

apps/web-antd/src/api/erp/stock/move/index.ts

@@ -26,7 +26,6 @@ export namespace ErpStockMoveApi {
     count: number; // 数量
     fromWarehouseId?: number; // 来源仓库ID
     id?: number; // ID
-    seq?: number; // 前端行号
     productBarCode: string; // 产品条形码
     productId?: number; // 产品ID
     productName?: string; // 产品名称

apps/web-antd/src/api/erp/stock/out/index.ts

@@ -20,7 +20,6 @@ export namespace ErpStockOutApi {
   /** 其它出库单产品信息 */
   export interface StockOutItem {
     id?: number; // 编号
-    seq?: number; // 前端行号
     warehouseId?: number; // 仓库编号
     productId?: number; // 产品编号
     productName?: string; // 产品名称

apps/web-antd/src/api/im/channel/material/index.ts

@@ -1,24 +0,0 @@
-import { requestClient } from '#/api/request';
-
-export namespace ImChannelMaterialApi {
-  /** 用户端能看到的频道素材详情 */
-  export interface Material {
-    id: number;
-    channelId: number;
-    type: number;
-    title: string;
-    coverUrl?: string;
-    summary?: string;
-    content?: string;
-    url?: string;
-  }
-}
-
-
-/** 获取频道素材详情；用于客户端点击图文卡片渲染详情页 */
-export function getChannelMaterial(id: number) {
-  return requestClient.get<ImChannelMaterialApi.Material>(
-    '/im/channel/material/get',
-    { params: { id } },
-  );
-}

apps/web-antd/src/api/im/conversation/read/index.ts

@@ -1,25 +0,0 @@
-import { requestClient } from '#/api/request';
-
-export namespace ImConversationReadApi {
-  /** IM 会话读位置 Response VO */
-  export interface ConversationReadRespVO {
-    id: number; // 读位置编号（增量拉取游标用）
-    conversationType: number; // 会话类型，参见 ImConversationType
-    targetId: number; // 会话目标编号
-    messageId: number; // 最大已读消息编号
-    updateTime?: number; // 最近更新时间（毫秒时间戳，增量拉取游标用）
-  }
-}
-
-
-/** 增量拉取当前用户的会话读位置（重连 / 离线补偿） */
-export function pullMyConversationReadList(params: {
-  lastId?: number;
-  lastUpdateTime?: number;
-  limit: number;
-}) {
-  return requestClient.get<ImConversationReadApi.ConversationReadRespVO[]>(
-    '/im/conversation-read/pull',
-    { params },
-  );
-}

apps/web-antd/src/api/im/face/pack/index.ts

@@ -1,26 +0,0 @@
-import { requestClient } from '#/api/request';
-
-export namespace ImFacePackApi {
-  /** 用户端表情包项（精简版） */
-  export interface FacePackUserItem {
-    id: number;
-    url: string;
-    name?: string;
-    width: number;
-    height: number;
-  }
-
-  /** 用户端表情包 + 嵌套 items */
-  export interface FacePackUser {
-    id: number;
-    name: string;
-    icon?: string;
-    items: FacePackUserItem[];
-  }
-}
-
-
-/** 拉取所有启用的系统表情包（含表情列表） */
-export function getFacePackList() {
-  return requestClient.get<ImFacePackApi.FacePackUser[]>('/im/face-pack/list');
-}

apps/web-antd/src/api/im/face/userItem/index.ts

@@ -1,38 +0,0 @@
-import { requestClient } from '#/api/request';
-
-export namespace ImFaceUserItemApi {
-  /** 个人表情 */
-  export interface FaceUserItem {
-    id: number;
-    url: string;
-    name?: string;
-    width: number;
-    height: number;
-  }
-
-  /** 添加个人表情请求 */
-  export interface FaceUserItemSaveReqVO {
-    url: string;
-    name?: string;
-    width: number;
-    height: number;
-  }
-}
-
-
-/** 获取我的个人表情列表 */
-export function getFaceUserItemList() {
-  return requestClient.get<ImFaceUserItemApi.FaceUserItem[]>('/im/face-user-item/list');
-}
-
-/** 添加个人表情 */
-export function createFaceUserItem(data: ImFaceUserItemApi.FaceUserItemSaveReqVO) {
-  return requestClient.post<number>('/im/face-user-item/create', data);
-}
-
-/** 删除个人表情 */
-export function deleteFaceUserItem(id: number) {
-  return requestClient.delete<boolean>('/im/face-user-item/delete', {
-    params: { id },
-  });
-}

apps/web-antd/src/api/im/friend/index.ts

@@ -1,78 +0,0 @@
-import { requestClient } from '#/api/request';
-
-export namespace ImFriendApi {
-  /** IM 好友 Response VO */
-  export interface FriendRespVO {
-    id: number; // 关系记录编号
-    friendUserId: number; // 好友的用户编号
-    silent?: boolean; // 是否免打扰
-    displayName?: string; // 好友展示备注（仅自己可见）
-    displayNamePinyin?: string; // 备注的拼音（小写无空格，前端按首字母分桶 / 拼音搜索）
-    addSource?: number; // 添加来源；参见 ImFriendAddSourceEnum
-    pinned?: boolean; // 是否置顶联系人
-    blocked?: boolean; // 是否拉黑
-    status?: number; // 好友状态（0=正常，1=已删除）
-    addTime?: string; // 添加好友时间
-    deleteTime?: string; // 删除好友时间
-    updateTime?: number; // 最近更新时间（毫秒时间戳，增量拉取游标用）
-    nickname?: string; // 好友昵称
-    nicknamePinyin?: string; // 昵称的拼音（小写无空格，前端按首字母分桶 / 拼音搜索）
-    avatar?: string; // 好友头像
-  }
-
-  /** IM 好友更新 Request VO */
-  export interface FriendUpdateReqVO {
-    friendUserId: number; // 好友的用户编号
-    silent?: boolean; // 是否免打扰
-    displayName?: string; // 好友展示备注
-    pinned?: boolean; // 是否置顶联系人
-  }
-}
-
-
-/** 获得当前登录用户的好友列表 */
-export function getMyFriendList() {
-  return requestClient.get<ImFriendApi.FriendRespVO[]>('/im/friend/list');
-}
-
-/** 增量拉取当前用户的好友关系（重连 / 离线补偿） */
-export function pullMyFriendList(params: {
-  lastId?: number;
-  lastUpdateTime?: number;
-  limit: number;
-}) {
-  return requestClient.get<ImFriendApi.FriendRespVO[]>('/im/friend/pull', { params });
-}
-
-/** 获得好友详情 */
-export function getFriend(friendUserId: number | string) {
-  return requestClient.get<ImFriendApi.FriendRespVO>('/im/friend/get', {
-    params: { friendUserId },
-  });
-}
-
-/** 删除好友（单向软删除） */
-export function deleteFriend(friendUserId: number | string, clear: boolean) {
-  return requestClient.delete<boolean>('/im/friend/delete', {
-    params: { friendUserId, clear },
-  });
-}
-
-/** 更新好友信息（备注 / 免打扰 / 联系人置顶） */
-export function updateFriend(data: ImFriendApi.FriendUpdateReqVO) {
-  return requestClient.put<boolean>('/im/friend/update', data);
-}
-
-/** 拉黑好友（必须先是好友；单边屏蔽对方私聊消息） */
-export function blockFriend(friendUserId: number | string) {
-  return requestClient.put<boolean>('/im/friend/block', undefined, {
-    params: { friendUserId },
-  });
-}
-
-/** 移出黑名单 */
-export function unblockFriend(friendUserId: number | string) {
-  return requestClient.put<boolean>('/im/friend/unblock', undefined, {
-    params: { friendUserId },
-  });
-}

apps/web-antd/src/api/im/friend/request/index.ts

@@ -1,84 +0,0 @@
-import { requestClient } from '#/api/request';
-
-export namespace ImFriendRequestApi {
-  /** IM 好友申请 Response VO */
-  export interface FriendRequestRespVO {
-    id: number; // 申请编号
-    fromUserId: number; // 发起方用户编号
-    toUserId: number; // 接收方用户编号
-    handleResult: number; // 处理结果；0=未处理；1=同意；2=拒绝
-    applyContent?: string; // 申请理由
-    handleContent?: string; // 处理理由（接收方拒绝时可选填）
-    addSource?: number; // 添加来源；参见 ImFriendAddSourceEnum
-    handleTime?: string; // 处理时间
-    createTime: string; // 申请创建时间
-    updateTime?: number; // 最近更新时间（毫秒时间戳，增量拉取游标用）
-    fromNickname?: string; // 发起方昵称
-    fromAvatar?: string; // 发起方头像
-    toNickname?: string; // 接收方昵称
-    toAvatar?: string; // 接收方头像
-  }
-
-  /** IM 好友申请发起 Request VO */
-  export interface FriendRequestApplyReqVO {
-    toUserId: number; // 接收方用户编号
-    applyContent?: string; // 申请理由
-    displayName?: string; // 对接收方的备注（仅自己可见）
-    addSource?: number; // 添加来源
-  }
-}
-
-
-/** 发起好友申请 */
-export function applyFriendRequest(data: ImFriendRequestApi.FriendRequestApplyReqVO) {
-  return requestClient.post<null | number>('/im/friend-request/apply', data);
-}
-
-/** 同意好友申请 */
-export function agreeFriendRequest(id: number | string) {
-  return requestClient.put<boolean>('/im/friend-request/agree', undefined, {
-    params: { id },
-  });
-}
-
-/** 拒绝好友申请 */
-export function refuseFriendRequest(
-  id: number | string,
-  handleContent?: string,
-) {
-  return requestClient.put<boolean>('/im/friend-request/refuse', undefined, {
-    params: { id, handleContent },
-  });
-}
-
-/** 查询「我相关」的好友申请列表（游标分页：传 maxId 加载更多） */
-export function getMyFriendRequestList(limit: number, maxId?: number) {
-  const params: Record<string, number> = { limit };
-  if (maxId != null) {
-    params.maxId = maxId;
-  }
-  return requestClient.get<ImFriendRequestApi.FriendRequestRespVO[]>(
-    '/im/friend-request/list',
-    { params },
-  );
-}
-
-/** 增量拉取「我相关」的好友申请变更（重连 / 离线补偿） */
-export function pullMyFriendRequestList(params: {
-  lastId?: number;
-  lastUpdateTime?: number;
-  limit: number;
-}) {
-  return requestClient.get<ImFriendRequestApi.FriendRequestRespVO[]>(
-    '/im/friend-request/pull',
-    { params },
-  );
-}
-
-/** 按 id 单查「我相关」的申请记录（带越权过滤；WebSocket 通知到达后用） */
-export function getMyFriendRequest(id: number) {
-  return requestClient.get<ImFriendRequestApi.FriendRequestRespVO | null>(
-    '/im/friend-request/get',
-    { params: { id } },
-  );
-}

apps/web-antd/src/api/im/group/index.ts

@@ -1,146 +0,0 @@
-import type { ImGroupMessageApi } from '#/api/im/message/group';
-
-import { requestClient } from '#/api/request';
-
-export namespace ImGroupApi {
-  /** 群 Response VO */
-  export interface GroupRespVO {
-    id: number; // 编号
-    name: string; // 群名称
-    ownerUserId: number; // 群主用户编号
-    avatar?: string; // 群头像
-    notice?: string; // 群公告
-    banned?: boolean; // 是否封禁
-    mutedAll?: boolean; // 是否全群禁言
-    joinApproval?: boolean; // 进群是否需群主 / 管理员审批
-    bannedTime?: string; // 封禁时间
-    status: number; // 群状态（0=正常，1=已解散）
-    dissolvedTime?: string; // 解散时间
-    createTime?: string; // 创建时间
-    pinnedMessages?: ImGroupMessageApi.GroupMessageRespVO[]; // 群置顶消息列表（后端关联回填，仅当登录用户是群成员时非空）
-    joinStatus?: number; // 当前登录用户在该群的成员状态（参见 CommonStatusEnum：0 在群 / 1 已退群）；历史退群群仍返回，供展示离线消息的群名 / 头像
-    groupRemark?: string; // 当前登录用户对该群的备注
-    silent?: boolean; // 当前登录用户是否免打扰
-  }
-
-  /** 群消息置顶 / 取消置顶 Request VO */
-  export interface GroupMessagePinReqVO {
-    id: number; // 群编号
-    messageId: number; // 消息编号
-  }
-
-  /** 群创建 Request VO */
-  export interface GroupCreateReqVO {
-    name: string; // 群名称
-    memberUserIds?: number[]; // 初始成员用户编号列表（建群同时邀请的好友，不含创建者自己）
-    joinApproval?: boolean; // 进群是否需审批；不传默认 false 自由进群
-  }
-
-  /** 群更新 Request VO */
-  export interface GroupUpdateReqVO {
-    id: number; // 群编号
-    name?: string; // 群名称
-    avatar?: string; // 群头像
-    notice?: string; // 群公告
-    joinApproval?: boolean; // 进群是否需审批
-  }
-
-  /** 添加 / 撤销群管理员 Request VO */
-  export interface GroupAdminReqVO {
-    id: number; // 群编号
-    userIds: number[]; // 目标用户编号列表
-  }
-
-  /** 群主转让 Request VO */
-  export interface GroupTransferOwnerReqVO {
-    id: number; // 群编号
-    newOwnerUserId: number; // 新群主用户编号
-  }
-
-  /** 全群禁言 / 取消 Request VO */
-  export interface GroupMuteAllReqVO {
-    id: number; // 群编号
-    mutedAll: boolean; // 是否全群禁言
-  }
-
-  /** 成员禁言 Request VO */
-  export interface GroupMuteMemberReqVO {
-    id: number; // 群编号
-    userId: number; // 被禁言的用户编号
-    mutedSeconds: number; // 禁言时长（秒），0 表示永久禁言
-  }
-
-  /** 取消成员禁言 Request VO */
-  export interface GroupCancelMuteMemberReqVO {
-    id: number; // 群编号
-    userId: number; // 被取消禁言的用户编号
-  }
-}
-
-
-/** 获得当前登录用户的群列表 */
-export function getMyGroupList() {
-  return requestClient.get<ImGroupApi.GroupRespVO[]>('/im/group/list');
-}
-
-/** 获得群详情 */
-export function getGroup(id: number | string) {
-  return requestClient.get<ImGroupApi.GroupRespVO>('/im/group/get', { params: { id } });
-}
-
-/** 创建群 */
-export function createGroup(data: ImGroupApi.GroupCreateReqVO) {
-  return requestClient.post<ImGroupApi.GroupRespVO>('/im/group/create', data);
-}
-
-/** 更新群 */
-export function updateGroup(data: ImGroupApi.GroupUpdateReqVO) {
-  return requestClient.put<ImGroupApi.GroupRespVO>('/im/group/update', data);
-}
-
-/** 解散群 */
-export function dissolveGroup(id: number | string) {
-  return requestClient.delete<boolean>('/im/group/dissolve', {
-    params: { id },
-  });
-}
-
-/** 添加群管理员（仅群主可调） */
-export function addGroupAdmin(data: ImGroupApi.GroupAdminReqVO) {
-  return requestClient.put<boolean>('/im/group/add-admin', data);
-}
-
-/** 撤销群管理员（仅群主可调） */
-export function removeGroupAdmin(data: ImGroupApi.GroupAdminReqVO) {
-  return requestClient.put<boolean>('/im/group/remove-admin', data);
-}
-
-/** 转让群主（仅老群主可调；旧群主转让后降为普通成员） */
-export function transferGroupOwner(data: ImGroupApi.GroupTransferOwnerReqVO) {
-  return requestClient.put<boolean>('/im/group/transfer-owner', data);
-}
-
-/** 置顶群消息（仅群主 / 管理员可调） */
-export function pinGroupMessage(data: ImGroupApi.GroupMessagePinReqVO) {
-  return requestClient.put<boolean>('/im/group/pin-message', data);
-}
-
-/** 取消置顶群消息（仅群主 / 管理员可调） */
-export function unpinGroupMessage(data: ImGroupApi.GroupMessagePinReqVO) {
-  return requestClient.put<boolean>('/im/group/unpin-message', data);
-}
-
-/** 全群禁言 / 取消（仅群主 / 管理员可调） */
-export function muteAll(data: ImGroupApi.GroupMuteAllReqVO) {
-  return requestClient.put<boolean>('/im/group/mute-all', data);
-}
-
-/** 禁言成员 */
-export function muteMember(data: ImGroupApi.GroupMuteMemberReqVO) {
-  return requestClient.put<boolean>('/im/group/mute-member', data);
-}
-
-/** 取消成员禁言 */
-export function cancelMuteMember(data: ImGroupApi.GroupCancelMuteMemberReqVO) {
-  return requestClient.put<boolean>('/im/group/cancel-mute-member', data);
-}

apps/web-antd/src/api/im/group/member/index.ts

@@ -1,78 +0,0 @@
-import { requestClient } from '#/api/request';
-
-export namespace ImGroupMemberApi {
-  /** 群成员 Response VO */
-  export interface GroupMemberRespVO {
-    id: number; // 编号
-    groupId: number; // 群编号
-    userId: number; // 用户编号
-    displayUserName?: string; // 组内显示名（群主设置的备注）
-    groupRemark?: string; // 群备注（当前用户对群的备注）
-    silent?: boolean; // 是否免打扰
-    status?: number; // 成员状态（0=在群，1=退群）
-    role?: number; // 成员角色，参见 ImGroupMemberRole 枚举
-    joinTime?: string; // 入群时间
-    quitTime?: string; // 退群时间
-    muteEndTime?: string; // 禁言到期时间
-    createTime?: string; // 创建时间
-    nickname?: string; // 用户昵称
-    avatar?: string; // 用户头像
-  }
-
-  /** 群成员邀请 Request VO */
-  export interface GroupMemberInviteReqVO {
-    groupId: number; // 群编号
-    memberUserIds: number[]; // 被邀请的用户编号列表
-  }
-
-  /** 群成员移除 Request VO */
-  export interface GroupMemberRemoveReqVO {
-    groupId: number; // 群编号
-    memberUserIds: number[]; // 被移除的用户编号列表
-  }
-
-  /** 群成员更新 Request VO */
-  export interface GroupMemberUpdateReqVO {
-    groupId: number; // 群编号
-    displayUserName?: string; // 群内昵称
-    groupRemark?: string; // 群备注
-    silent?: boolean; // 是否免打扰
-  }
-}
-
-
-/** 邀请用户加入群 */
-export function inviteGroupMember(data: ImGroupMemberApi.GroupMemberInviteReqVO) {
-  return requestClient.post<boolean>('/im/group/invite', data);
-}
-
-/** 退出群 */
-export function quitGroup(groupId: number | string) {
-  return requestClient.delete<boolean>('/im/group/quit', {
-    params: { groupId },
-  });
-}
-
-/** 移除群成员 */
-export function removeGroupMember(data: ImGroupMemberApi.GroupMemberRemoveReqVO) {
-  return requestClient.delete<boolean>('/im/group/kicking', { data });
-}
-
-/** 获得群成员详情 */
-export function getGroupMember(groupId: number, userId: number) {
-  return requestClient.get<ImGroupMemberApi.GroupMemberRespVO>('/im/group-member/get', {
-    params: { groupId, userId },
-  });
-}
-
-/** 获得指定群的成员列表（聚合 AdminUser 昵称 / 头像） */
-export function getGroupMemberList(groupId: number | string) {
-  return requestClient.get<ImGroupMemberApi.GroupMemberRespVO[]>('/im/group-member/list', {
-    params: { groupId },
-  });
-}
-
-/** 更新群成员 */
-export function updateGroupMember(data: ImGroupMemberApi.GroupMemberUpdateReqVO) {
-  return requestClient.put<boolean>('/im/group-member/update', data);
-}

apps/web-antd/src/api/im/group/request/index.ts

@@ -1,90 +0,0 @@
-import { requestClient } from '#/api/request';
-
-export namespace ImGroupRequestApi {
-  /** IM 加群申请 Response VO */
-  export interface GroupRequestRespVO {
-    id: number; // 申请编号
-    groupId: number; // 群编号
-    userId: number; // 申请人 / 被邀请人用户编号
-    inviterUserId?: number; // 邀请人；NULL 表示用户主动申请
-    handleResult: number; // 处理结果；0=未处理；1=同意；2=拒绝
-    applyContent?: string; // 申请理由
-    handleContent?: string; // 处理理由（拒绝时可选填）
-    handleUserId?: number; // 处理人用户编号
-    addSource?: number; // 加入来源；参见 ImGroupAddSourceEnum
-    handleTime?: string; // 处理时间
-    createTime: string; // 申请创建时间
-    updateTime?: number; // 最近更新时间（毫秒时间戳，增量拉取游标用）
-    userNickname?: string; // 申请人 / 被邀请人昵称
-    userAvatar?: string; // 申请人 / 被邀请人头像
-    inviterNickname?: string; // 邀请人昵称
-    inviterAvatar?: string; // 邀请人头像
-    groupName?: string; // 群名称
-    groupAvatar?: string; // 群头像
-  }
-
-  /** IM 加群申请发起 Request VO */
-  export interface GroupRequestApplyReqVO {
-    groupId: number; // 群编号
-    applyContent?: string; // 申请理由
-    addSource?: number; // 加入来源
-  }
-}
-
-
-/** 申请加群 */
-export function applyJoinGroup(data: ImGroupRequestApi.GroupRequestApplyReqVO) {
-  return requestClient.post<null | number>('/im/group-request/apply', data);
-}
-
-/** 同意加群申请（群主或管理员） */
-export function agreeGroupRequest(id: number | string) {
-  return requestClient.put<boolean>('/im/group-request/agree', undefined, {
-    params: { id },
-  });
-}
-
-/** 拒绝加群申请（群主或管理员） */
-export function refuseGroupRequest(
-  id: number | string,
-  handleContent?: string,
-) {
-  return requestClient.put<boolean>('/im/group-request/refuse', undefined, {
-    params: { id, handleContent },
-  });
-}
-
-/** 查询「我管理的所有群」下的未处理加群申请列表（不分页）；前端 store 据此派生横幅红点 + Drawer 列表 */
-export function getUnhandledRequestList() {
-  return requestClient.get<ImGroupRequestApi.GroupRequestRespVO[]>(
-    '/im/group-request/unhandled-list',
-  );
-}
-
-/** 查询指定群下的全部加群申请（含已处理）；仅群主 / 管理员可查 */
-export function getGroupRequestListByGroupId(groupId: number) {
-  return requestClient.get<ImGroupRequestApi.GroupRequestRespVO[]>(
-    '/im/group-request/list-by-group',
-    { params: { groupId } },
-  );
-}
-
-/** 按 id 单查申请记录（带越权过滤；WebSocket 通知到达后用） */
-export function getMyGroupRequest(id: number) {
-  return requestClient.get<ImGroupRequestApi.GroupRequestRespVO | null>(
-    '/im/group-request/get',
-    { params: { id } },
-  );
-}
-
-/** 增量拉取我管理的所有群下加群申请变更（重连 / 离线补偿） */
-export function pullMyGroupRequestList(params: {
-  lastId?: number;
-  lastUpdateTime?: number;
-  limit: number;
-}) {
-  return requestClient.get<ImGroupRequestApi.GroupRequestRespVO[]>(
-    '/im/group-request/pull',
-    { params },
-  );
-}

apps/web-antd/src/api/im/manager/channel/index.ts

@@ -1,56 +0,0 @@
-import type { PageParam, PageResult } from '@vben/request';
-
-import { requestClient } from '#/api/request';
-
-export namespace ImManagerChannelApi {
-  /** 频道 */
-  export interface Channel {
-    id: number;
-    code: string;
-    name: string;
-    avatar?: string;
-    sort: number;
-    status: number;
-    createTime?: Date;
-  }
-}
-
-
-/** 获得频道分页 */
-export function getManagerChannelPage(params: PageParam) {
-  return requestClient.get<PageResult<ImManagerChannelApi.Channel>>(
-    '/im/manager/channel/page',
-    { params },
-  );
-}
-
-/** 获得频道详情 */
-export function getManagerChannel(id: number) {
-  return requestClient.get<ImManagerChannelApi.Channel>('/im/manager/channel/get', {
-    params: { id },
-  });
-}
-
-/** 新增频道 */
-export function createManagerChannel(data: ImManagerChannelApi.Channel) {
-  return requestClient.post<number>('/im/manager/channel/create', data);
-}
-
-/** 修改频道 */
-export function updateManagerChannel(data: ImManagerChannelApi.Channel) {
-  return requestClient.put<boolean>('/im/manager/channel/update', data);
-}
-
-/** 删除频道 */
-export function deleteManagerChannel(id: number) {
-  return requestClient.delete<boolean>('/im/manager/channel/delete', {
-    params: { id },
-  });
-}
-
-/** 获得启用的频道精简列表（表单选择用） */
-export function getSimpleChannelList() {
-  return requestClient.get<ImManagerChannelApi.Channel[]>(
-    '/im/manager/channel/simple-list',
-  );
-}

apps/web-antd/src/api/im/manager/channel/material/index.ts

@@ -1,68 +0,0 @@
-import type { PageParam, PageResult } from '@vben/request';
-
-import { requestClient } from '#/api/request';
-
-export namespace ImManagerChannelMaterialApi {
-  /** 频道素材 */
-  export interface Material {
-    id: number;
-    channelId: number;
-    channelName?: string;
-    type: number;
-    title: string;
-    coverUrl?: string;
-    summary?: string;
-    content?: string;
-    url?: string;
-    createTime?: Date;
-  }
-}
-
-
-/** 获得素材分页 */
-export function getManagerChannelMaterialPage(params: PageParam) {
-  return requestClient.get<PageResult<ImManagerChannelMaterialApi.Material>>(
-    '/im/manager/channel-material/page',
-    { params },
-  );
-}
-
-/** 获得指定频道下的素材精简列表 */
-export function getSimpleManagerChannelMaterialList(channelId: number) {
-  return requestClient.get<ImManagerChannelMaterialApi.Material[]>(
-    '/im/manager/channel-material/simple-list',
-    { params: { channelId } },
-  );
-}
-
-/** 获得素材详情 */
-export function getManagerChannelMaterial(id: number) {
-  return requestClient.get<ImManagerChannelMaterialApi.Material>(
-    '/im/manager/channel-material/get',
-    { params: { id } },
-  );
-}
-
-/** 新增素材 */
-export function createManagerChannelMaterial(
-  data: ImManagerChannelMaterialApi.Material,
-) {
-  return requestClient.post<number>('/im/manager/channel-material/create', data);
-}
-
-/** 修改素材 */
-export function updateManagerChannelMaterial(
-  data: ImManagerChannelMaterialApi.Material,
-) {
-  return requestClient.put<boolean>(
-    '/im/manager/channel-material/update',
-    data,
-  );
-}
-
-/** 删除素材 */
-export function deleteManagerChannelMaterial(id: number) {
-  return requestClient.delete<boolean>('/im/manager/channel-material/delete', {
-    params: { id },
-  });
-}

apps/web-antd/src/api/im/manager/channel/message/index.ts

@@ -1,48 +0,0 @@
-import type { PageParam, PageResult } from '@vben/request';
-
-import { requestClient } from '#/api/request';
-
-export namespace ImManagerChannelMessageApi {
-  /** 频道消息 */
-  export interface ChannelMessage {
-    id: number;
-    channelId: number;
-    channelName?: string;
-    materialId: number;
-    materialTitle?: string;
-    materialCoverUrl?: string;
-    type: number;
-    content?: string;
-    receiverUserIds?: number[];
-    sendTime?: Date;
-  }
-
-  /** 频道消息发送请求 */
-  export interface ChannelMessageSendReqVO {
-    materialId: number;
-    receiverUserIds?: number[];
-  }
-}
-
-
-/** 立即推送频道消息 */
-export function sendManagerChannelMessage(
-  data: ImManagerChannelMessageApi.ChannelMessageSendReqVO,
-) {
-  return requestClient.post<number>('/im/manager/channel-message/send', data);
-}
-
-/** 删除频道消息 */
-export function deleteManagerChannelMessage(id: number) {
-  return requestClient.delete<boolean>('/im/manager/channel-message/delete', {
-    params: { id },
-  });
-}
-
-/** 获得频道消息分页 */
-export function getManagerChannelMessagePage(params: PageParam) {
-  return requestClient.get<PageResult<ImManagerChannelMessageApi.ChannelMessage>>(
-    '/im/manager/channel-message/page',
-    { params },
-  );
-}

apps/web-antd/src/api/im/manager/face/item/index.ts

@@ -1,63 +0,0 @@
-import type { PageParam, PageResult } from '@vben/request';
-
-import { requestClient } from '#/api/request';
-
-export namespace ImManagerFacePackItemApi {
-  /** 表情项 */
-  export interface FacePackItem {
-    id: number;
-    packId: number;
-    url: string;
-    name?: string;
-    width: number;
-    height: number;
-    sort: number;
-    status: number;
-    createTime?: Date;
-  }
-}
-
-
-/** 获得表情分页 */
-export function getManagerFacePackItemPage(params: PageParam) {
-  return requestClient.get<PageResult<ImManagerFacePackItemApi.FacePackItem>>(
-    '/im/manager/face-pack-item/page',
-    { params },
-  );
-}
-
-/** 获得表情详情 */
-export function getManagerFacePackItem(id: number) {
-  return requestClient.get<ImManagerFacePackItemApi.FacePackItem>(
-    '/im/manager/face-pack-item/get',
-    { params: { id } },
-  );
-}
-
-/** 新增表情 */
-export function createManagerFacePackItem(data: ImManagerFacePackItemApi.FacePackItem) {
-  return requestClient.post<number>('/im/manager/face-pack-item/create', data);
-}
-
-/** 修改表情 */
-export function updateManagerFacePackItem(data: ImManagerFacePackItemApi.FacePackItem) {
-  return requestClient.put<boolean>(
-    '/im/manager/face-pack-item/update',
-    data,
-  );
-}
-
-/** 删除表情 */
-export function deleteManagerFacePackItem(id: number) {
-  return requestClient.delete<boolean>('/im/manager/face-pack-item/delete', {
-    params: { id },
-  });
-}
-
-/** 批量删除表情 */
-export function deleteManagerFacePackItemList(ids: number[]) {
-  return requestClient.delete<boolean>(
-    '/im/manager/face-pack-item/delete-list',
-    { params: { ids: ids.join(',') } },
-  );
-}

apps/web-antd/src/api/im/manager/face/pack/index.ts

@@ -1,55 +0,0 @@
-import type { PageParam, PageResult } from '@vben/request';
-
-import { requestClient } from '#/api/request';
-
-export namespace ImManagerFacePackApi {
-  /** 表情包 */
-  export interface FacePack {
-    id: number;
-    name: string;
-    icon?: string;
-    sort: number;
-    status: number;
-    createTime?: Date;
-  }
-}
-
-
-/** 获得表情包分页 */
-export function getManagerFacePackPage(params: PageParam) {
-  return requestClient.get<PageResult<ImManagerFacePackApi.FacePack>>(
-    '/im/manager/face-pack/page',
-    { params },
-  );
-}
-
-/** 获得表情包详情 */
-export function getManagerFacePack(id: number) {
-  return requestClient.get<ImManagerFacePackApi.FacePack>('/im/manager/face-pack/get', {
-    params: { id },
-  });
-}
-
-/** 新增表情包 */
-export function createManagerFacePack(data: ImManagerFacePackApi.FacePack) {
-  return requestClient.post<number>('/im/manager/face-pack/create', data);
-}
-
-/** 修改表情包 */
-export function updateManagerFacePack(data: ImManagerFacePackApi.FacePack) {
-  return requestClient.put<boolean>('/im/manager/face-pack/update', data);
-}
-
-/** 删除表情包 */
-export function deleteManagerFacePack(id: number) {
-  return requestClient.delete<boolean>('/im/manager/face-pack/delete', {
-    params: { id },
-  });
-}
-
-/** 批量删除表情包 */
-export function deleteManagerFacePackList(ids: number[]) {
-  return requestClient.delete<boolean>('/im/manager/face-pack/delete-list', {
-    params: { ids: ids.join(',') },
-  });
-}

apps/web-antd/src/api/im/manager/face/userItem/index.ts

@@ -1,33 +0,0 @@
-import type { PageParam, PageResult } from '@vben/request';
-
-import { requestClient } from '#/api/request';
-
-export namespace ImManagerFaceUserItemApi {
-  /** 用户表情 */
-  export interface FaceUserItem {
-    id: number;
-    userId: number;
-    userNickname?: string;
-    url: string;
-    name?: string;
-    width?: number;
-    height?: number;
-    createTime?: Date;
-  }
-}
-
-
-/** 获得用户表情分页 */
-export function getManagerFaceUserItemPage(params: PageParam) {
-  return requestClient.get<PageResult<ImManagerFaceUserItemApi.FaceUserItem>>(
-    '/im/manager/face-user-item/page',
-    { params },
-  );
-}
-
-/** 删除用户表情 */
-export function deleteManagerFaceUserItem(id: number) {
-  return requestClient.delete<boolean>('/im/manager/face-user-item/delete', {
-    params: { id },
-  });
-}

apps/web-antd/src/api/im/manager/friend/index.ts

@@ -1,32 +0,0 @@
-import type { PageParam, PageResult } from '@vben/request';
-
-import { requestClient } from '#/api/request';
-
-export namespace ImManagerFriendApi {
-  /** 好友关系 */
-  export interface Friend {
-    id: number;
-    userId: number;
-    userNickname?: string;
-    friendUserId: number;
-    friendNickname?: string;
-    displayName?: string;
-    addSource?: number;
-    silent: boolean;
-    pinned: boolean;
-    blocked: boolean;
-    status: number;
-    addTime?: Date;
-    deleteTime?: Date;
-    createTime: Date;
-  }
-}
-
-
-/** 获得好友关系分页 */
-export function getManagerFriendPage(params: PageParam) {
-  return requestClient.get<PageResult<ImManagerFriendApi.Friend>>(
-    '/im/manager/friend/page',
-    { params },
-  );
-}

apps/web-antd/src/api/im/manager/friend/request/index.ts

@@ -1,30 +0,0 @@
-import type { PageParam, PageResult } from '@vben/request';
-
-import { requestClient } from '#/api/request';
-
-export namespace ImManagerFriendRequestApi {
-  /** 好友申请 */
-  export interface FriendRequest {
-    id: number;
-    fromUserId: number;
-    fromNickname?: string;
-    toUserId: number;
-    toNickname?: string;
-    applyContent?: string;
-    displayName?: string;
-    addSource?: number;
-    handleResult: number;
-    handleContent?: string;
-    handleTime?: Date;
-    createTime: Date;
-  }
-}
-
-
-/** 获得好友申请分页 */
-export function getManagerFriendRequestPage(params: PageParam) {
-  return requestClient.get<PageResult<ImManagerFriendRequestApi.FriendRequest>>(
-    '/im/manager/friend-request/page',
-    { params },
-  );
-}

apps/web-antd/src/api/im/manager/group/index.ts

@@ -1,87 +0,0 @@
-import type { PageParam, PageResult } from '@vben/request';
-
-import { requestClient } from '#/api/request';
-
-export namespace ImManagerGroupApi {
-  /** 群 */
-  export interface Group {
-    id: number;
-    name: string;
-    avatar?: string;
-    notice?: string;
-    ownerUserId: number;
-    ownerNickname?: string;
-    memberCount?: number;
-    status: number;
-    banned: boolean;
-    mutedAll?: boolean; // 是否全群禁言
-    bannedReason?: string;
-    bannedTime?: Date;
-    dissolvedTime?: Date;
-    createTime: Date;
-  }
-
-  /** 群成员 */
-  export interface GroupMember {
-    userId: number;
-    nickname?: string;
-    avatar?: string;
-    displayUserName?: string;
-    groupRemark?: string;
-    silent?: boolean;
-    status: number;
-    role?: number; // 成员角色，参见 ImGroupMemberRole 枚举
-    joinTime?: Date;
-    quitTime?: Date;
-    muteEndTime?: Date; // 禁言到期时间
-  }
-
-  /** 群封禁请求 */
-  export interface GroupBanReqVO {
-    id: number;
-    reason: string;
-  }
-}
-
-
-/** 获得群分页 */
-export function getManagerGroupPage(params: PageParam) {
-  return requestClient.get<PageResult<ImManagerGroupApi.Group>>(
-    '/im/manager/group/page',
-    { params },
-  );
-}
-
-/** 获得群详情 */
-export function getManagerGroup(id: number) {
-  return requestClient.get<ImManagerGroupApi.Group>('/im/manager/group/get', {
-    params: { id },
-  });
-}
-
-/** 封禁群 */
-export function banManagerGroup(data: ImManagerGroupApi.GroupBanReqVO) {
-  return requestClient.put<boolean>('/im/manager/group/ban', data);
-}
-
-/** 解封群 */
-export function unbanManagerGroup(id: number) {
-  return requestClient.put<boolean>('/im/manager/group/unban', undefined, {
-    params: { id },
-  });
-}
-
-/** 解散群 */
-export function dissolveManagerGroup(id: number) {
-  return requestClient.delete<boolean>('/im/manager/group/dissolve', {
-    params: { id },
-  });
-}
-
-/** 获得群成员列表（含已退群成员，由前端按需过滤） */
-export function getManagerGroupMemberList(groupId: number) {
-  return requestClient.get<ImManagerGroupApi.GroupMember[]>(
-    '/im/manager/group/member/list',
-    { params: { groupId } },
-  );
-}

apps/web-antd/src/api/im/manager/group/request/index.ts

@@ -1,33 +0,0 @@
-import type { PageParam, PageResult } from '@vben/request';
-
-import { requestClient } from '#/api/request';
-
-export namespace ImManagerGroupRequestApi {
-  /** 加群申请 */
-  export interface GroupRequest {
-    id: number;
-    groupId: number;
-    groupName?: string;
-    userId: number;
-    userNickname?: string;
-    inviterUserId?: number;
-    inviterNickname?: string;
-    applyContent?: string;
-    addSource?: number;
-    handleResult: number;
-    handleUserId?: number;
-    handleNickname?: string;
-    handleContent?: string;
-    handleTime?: Date;
-    createTime: Date;
-  }
-}
-
-
-/** 获得加群申请分页 */
-export function getManagerGroupRequestPage(params: PageParam) {
-  return requestClient.get<PageResult<ImManagerGroupRequestApi.GroupRequest>>(
-    '/im/manager/group-request/page',
-    { params },
-  );
-}

apps/web-antd/src/api/im/manager/message/group/index.ts

@@ -1,40 +0,0 @@
-import type { PageParam, PageResult } from '@vben/request';
-
-import { requestClient } from '#/api/request';
-
-export namespace ImManagerGroupMessageApi {
-  /** 群聊消息 */
-  export interface GroupMessage {
-    id: number;
-    clientMessageId?: string;
-    groupId: number;
-    groupName?: string;
-    senderId: number;
-    senderNickname?: string;
-    type: number;
-    content: string;
-    status: number;
-    atUserIds?: number[];
-    atUserNicknames?: (null | string)[];
-    receiptStatus: number;
-    sendTime: Date;
-    createTime: Date;
-  }
-}
-
-
-/** 获得群聊消息分页 */
-export function getManagerGroupMessagePage(params: PageParam) {
-  return requestClient.get<PageResult<ImManagerGroupMessageApi.GroupMessage>>(
-    '/im/manager/message/group/page',
-    { params },
-  );
-}
-
-/** 获得群聊消息详情 */
-export function getManagerGroupMessage(id: number) {
-  return requestClient.get<ImManagerGroupMessageApi.GroupMessage>(
-    '/im/manager/message/group/get',
-    { params: { id } },
-  );
-}

apps/web-antd/src/api/im/manager/message/private/index.ts

@@ -1,38 +0,0 @@
-import type { PageParam, PageResult } from '@vben/request';
-
-import { requestClient } from '#/api/request';
-
-export namespace ImManagerPrivateMessageApi {
-  /** 私聊消息 */
-  export interface PrivateMessage {
-    id: number;
-    clientMessageId?: string;
-    senderId: number;
-    senderNickname?: string;
-    receiverId: number;
-    receiverNickname?: string;
-    type: number;
-    content: string;
-    status: number;
-    receiptStatus?: number;
-    sendTime: Date;
-    createTime: Date;
-  }
-}
-
-
-/** 获得私聊消息分页 */
-export function getManagerPrivateMessagePage(params: PageParam) {
-  return requestClient.get<PageResult<ImManagerPrivateMessageApi.PrivateMessage>>(
-    '/im/manager/message/private/page',
-    { params },
-  );
-}
-
-/** 获得私聊消息详情 */
-export function getManagerPrivateMessage(id: number) {
-  return requestClient.get<ImManagerPrivateMessageApi.PrivateMessage>(
-    '/im/manager/message/private/get',
-    { params: { id } },
-  );
-}

apps/web-antd/src/api/im/manager/rtc/index.ts

@@ -1,53 +0,0 @@
-import type { PageParam, PageResult } from '@vben/request';
-
-import { requestClient } from '#/api/request';
-
-export namespace ImManagerRtcApi {
-  /** RTC 通话 */
-  export interface RtcCall {
-    id: number;
-    room: string;
-    conversationType: number;
-    mediaType: number;
-    inviterUserId: number;
-    inviterNickname?: string;
-    groupId?: number;
-    groupName?: string;
-    status: number;
-    endReason?: number;
-    startTime: Date;
-    acceptTime?: Date;
-    endTime?: Date;
-    createTime: Date;
-  }
-
-  /** RTC 通话参与者 */
-  export interface RtcParticipant {
-    id: number;
-    callId: number;
-    userId: number;
-    userNickname?: string;
-    role: number;
-    status: number;
-    inviteTime: Date;
-    acceptTime?: Date;
-    leaveTime?: Date;
-  }
-}
-
-
-/** 获得通话记录分页 */
-export function getManagerRtcCallPage(params: PageParam) {
-  return requestClient.get<PageResult<ImManagerRtcApi.RtcCall>>(
-    '/im/manager/rtc/page',
-    { params },
-  );
-}
-
-/** 获得通话参与者列表 */
-export function getManagerRtcCallParticipantList(id: number) {
-  return requestClient.get<ImManagerRtcApi.RtcParticipant[]>(
-    '/im/manager/rtc/participant-list',
-    { params: { id } },
-  );
-}

apps/web-antd/src/api/im/manager/sensitiveword/index.ts

@@ -1,60 +0,0 @@
-import type { PageParam, PageResult } from '@vben/request';
-
-import { requestClient } from '#/api/request';
-
-export namespace ImManagerSensitiveWordApi {
-  /** 敏感词 */
-  export interface SensitiveWord {
-    id: number;
-    word: string;
-    status: number;
-    creator?: string;
-    creatorName?: string;
-    createTime?: Date;
-  }
-}
-
-
-/** 获得敏感词分页 */
-export function getManagerSensitiveWordPage(params: PageParam) {
-  return requestClient.get<PageResult<ImManagerSensitiveWordApi.SensitiveWord>>(
-    '/im/manager/sensitive-word/page',
-    { params },
-  );
-}
-
-/** 获得敏感词详情 */
-export function getManagerSensitiveWord(id: number) {
-  return requestClient.get<ImManagerSensitiveWordApi.SensitiveWord>(
-    '/im/manager/sensitive-word/get',
-    { params: { id } },
-  );
-}
-
-/** 新增敏感词 */
-export function createManagerSensitiveWord(data: ImManagerSensitiveWordApi.SensitiveWord) {
-  return requestClient.post<number>('/im/manager/sensitive-word/create', data);
-}
-
-/** 修改敏感词 */
-export function updateManagerSensitiveWord(data: ImManagerSensitiveWordApi.SensitiveWord) {
-  return requestClient.put<boolean>(
-    '/im/manager/sensitive-word/update',
-    data,
-  );
-}
-
-/** 删除敏感词 */
-export function deleteManagerSensitiveWord(id: number) {
-  return requestClient.delete<boolean>('/im/manager/sensitive-word/delete', {
-    params: { id },
-  });
-}
-
-/** 批量删除敏感词 */
-export function deleteManagerSensitiveWordList(ids: number[]) {
-  return requestClient.delete<boolean>(
-    '/im/manager/sensitive-word/delete-list',
-    { params: { ids: ids.join(',') } },
-  );
-}

apps/web-antd/src/api/im/manager/statistics/index.ts

@@ -1,88 +0,0 @@
-import { requestClient } from '#/api/request';
-
-export namespace ImManagerStatisticsApi {
-  /** 统计概览 */
-  export interface Overview {
-    totalUser: number;
-    newUserToday: number;
-    totalGroup: number;
-    newGroupToday: number;
-    activeUserDaily: number;
-    activeUserWeekly: number;
-    activeUserMonthly: number;
-    privateMessageToday: number;
-    groupMessageToday: number;
-    privateMessageYesterday: number;
-    groupMessageYesterday: number;
-  }
-
-  /** 趋势数据 */
-  export interface Trend {
-    dates: string[];
-    series: Record<string, number[]>;
-  }
-
-  /** 消息类型分布 */
-  export interface MessageType {
-    type: number; // 参见 ImContentTypeEnum 枚举类，由前端按 DICT_TYPE.IM_CONTENT_TYPE 翻译
-    value: number;
-  }
-
-  /** 群规模分布 */
-  export interface GroupSize {
-    range: string;
-    count: number;
-  }
-
-  /** 消息发送排行 */
-  export interface TopSender {
-    userId: number;
-    nickname: string;
-    messageCount: number;
-  }
-}
-
-
-/** 获得 KPI 概览 */
-export function getStatisticsOverview() {
-  return requestClient.get<ImManagerStatisticsApi.Overview>(
-    '/im/manager/statistics/overview',
-  );
-}
-
-/** 获得消息趋势（私聊 + 群聊双线） */
-export function getMessageTrend(days: number) {
-  return requestClient.get<ImManagerStatisticsApi.Trend>(
-    '/im/manager/statistics/message-trend',
-    { params: { days } },
-  );
-}
-
-/** 获得用户趋势（新增注册 + 日活双线） */
-export function getUserTrend(days: number) {
-  return requestClient.get<ImManagerStatisticsApi.Trend>(
-    '/im/manager/statistics/user-trend',
-    { params: { days } },
-  );
-}
-
-/** 获得内容类型分布（最近 30 天） */
-export function getMessageTypeDistribution() {
-  return requestClient.get<ImManagerStatisticsApi.MessageType[]>(
-    '/im/manager/statistics/message-type-distribution',
-  );
-}
-
-/** 获得群规模分布 */
-export function getGroupSizeDistribution() {
-  return requestClient.get<ImManagerStatisticsApi.GroupSize[]>(
-    '/im/manager/statistics/group-size-distribution',
-  );
-}
-
-/** 获得消息 TOP 发送者（最近 30 天） */
-export function getTopSenders() {
-  return requestClient.get<ImManagerStatisticsApi.TopSender[]>(
-    '/im/manager/statistics/top-senders',
-  );
-}

apps/web-antd/src/api/im/message/channel/index.ts

@@ -1,34 +0,0 @@
-import { requestClient } from '#/api/request';
-
-export namespace ImChannelMessageApi {
-  /** 频道消息 */
-  export interface ChannelMessageRespVO {
-    id: number;
-    clientMessageId?: string;
-    channelId: number;
-    materialId: number;
-    type: number;
-    content: string;
-    receiptStatus?: number;
-    sendTime: string;
-  }
-}
-
-
-/** 拉取当前用户应收的频道消息（离线增量）；按 minId 游标分页 */
-export function pullChannelMessageList(
-  params: { minId: number; size?: number },
-  signal?: AbortSignal,
-) {
-  return requestClient.get<ImChannelMessageApi.ChannelMessageRespVO[]>(
-    '/im/channel/message/pull',
-    { params, signal },
-  );
-}
-
-/** 上报频道消息已读位置；切到频道会话或拉到新消息后调 */
-export function readChannelMessages(channelId: number, messageId: number) {
-  return requestClient.put<boolean>('/im/channel/message/read', undefined, {
-    params: { channelId, messageId },
-  });
-}

apps/web-antd/src/api/im/message/group/index.ts

@@ -1,92 +0,0 @@
-import { requestClient } from '#/api/request';
-
-export namespace ImGroupMessageApi {
-  /** 群聊消息 Response VO */
-  export interface GroupMessageRespVO {
-    id: number; // 消息编号
-    clientMessageId: string; // 客户端消息编号
-    senderId: number; // 发送人编号
-    groupId: number; // 群编号
-    type: number; // 内容类型
-    content: string; // 消息内容（JSON 格式）
-    status: number; // 消息状态
-    sendTime: string; // 发送时间
-    atUserIds?: number[]; // @ 目标用户编号列表
-    receiverUserIds?: number[]; // 定向接收用户编号列表
-    receiptStatus?: number; // 回执状态
-    readCount?: number; // 已读人数（回执消息、且发送人为当前用户时有值）
-  }
-
-  /** 群聊消息发送 Request VO */
-  export interface GroupMessageSendReqVO {
-    clientMessageId: string; // 客户端消息编号
-    groupId: number; // 群编号
-    type: number; // 内容类型
-    content: string; // 消息内容（JSON 格式）
-    atUserIds?: number[]; // @ 目标用户编号列表
-    receipt?: boolean; // 是否需要回执
-  }
-
-  /** 群聊历史消息列表 Request VO */
-  export interface GroupMessageListReqVO {
-    groupId: number | string; // 群编号
-    maxId?: number | string; // 起始消息编号（不含），为空则从最新消息开始
-    limit: number; // 拉取数量（1 ~ 200）
-  }
-}
-
-
-/** 发送群聊消息 */
-export function sendGroupMessage(data: ImGroupMessageApi.GroupMessageSendReqVO) {
-  return requestClient.post<ImGroupMessageApi.GroupMessageRespVO>(
-    '/im/message/group/send',
-    data,
-  );
-}
-
-/** 拉取群聊消息（增量） */
-export function pullGroupMessageList(
-  params: { minId: number | string; size: number },
-  signal?: AbortSignal,
-) {
-  return requestClient.get<ImGroupMessageApi.GroupMessageRespVO[]>(
-    '/im/message/group/pull',
-    { params, signal },
-  );
-}
-
-/** 查询群聊历史消息 */
-export function getGroupMessageList(params: ImGroupMessageApi.GroupMessageListReqVO) {
-  return requestClient.get<ImGroupMessageApi.GroupMessageRespVO[]>(
-    '/im/message/group/list',
-    { params },
-  );
-}
-
-/** 标记群聊消息已读 */
-export function readGroupMessages(
-  groupId: number | string,
-  messageId: number | string,
-) {
-  return requestClient.put<boolean>('/im/message/group/read', undefined, {
-    params: { groupId, messageId },
-  });
-}
-
-/** 撤回群聊消息 */
-export function recallGroupMessage(id: number | string) {
-  return requestClient.delete<ImGroupMessageApi.GroupMessageRespVO>(
-    '/im/message/group/recall',
-    { params: { id } },
-  );
-}
-
-/** 获取群消息已读用户列表 */
-export function getGroupReadUsers(params: {
-  groupId: number | string;
-  messageId: number | string;
-}) {
-  return requestClient.get<number[]>('/im/message/group/get-read-user-ids', {
-    params,
-  });
-}

apps/web-antd/src/api/im/message/private/index.ts

@@ -1,89 +0,0 @@
-import { requestClient } from '#/api/request';
-
-export namespace ImPrivateMessageApi {
-  /** 私聊消息 Response VO */
-  export interface PrivateMessageRespVO {
-    id: number; // 消息编号
-    clientMessageId: string; // 客户端消息编号
-    senderId: number; // 发送人编号
-    receiverId: number; // 接收人编号
-    type: number; // 内容类型
-    content: string; // 消息内容（JSON 格式）
-    status: number; // 消息状态（正常 / 已撤回）
-    receiptStatus?: number; // 回执状态（不需要 / 待完成 / 已完成），对齐 ImMessageReceiptStatus
-    sendTime: string; // 发送时间
-  }
-
-  /** 私聊消息发送 Request VO */
-  export interface PrivateMessageSendReqVO {
-    clientMessageId: string; // 客户端消息编号
-    receiverId: number; // 接收人编号
-    type: number; // 内容类型
-    content: string; // 消息内容（JSON 格式）
-    receipt?: boolean; // 是否需要回执；不传后端默认 true（普通私聊用户消息）
-  }
-
-  /** 私聊历史消息列表 Request VO */
-  export interface PrivateMessageListReqVO {
-    receiverId: number | string; // 接收人编号（对方）
-    maxId?: number | string; // 起始消息编号（不含），为空则从最新消息开始
-    limit: number; // 拉取数量（1 ~ 200）
-  }
-}
-
-
-/** 发送私聊消息 */
-export function sendPrivateMessage(data: ImPrivateMessageApi.PrivateMessageSendReqVO) {
-  return requestClient.post<ImPrivateMessageApi.PrivateMessageRespVO>(
-    '/im/message/private/send',
-    data,
-  );
-}
-
-/** 拉取私聊消息（增量） */
-export function pullPrivateMessageList(
-  params: { minId: number | string; size: number },
-  signal?: AbortSignal,
-) {
-  return requestClient.get<ImPrivateMessageApi.PrivateMessageRespVO[]>(
-    '/im/message/private/pull',
-    { params, signal },
-  );
-}
-
-/** 查询私聊历史消息 */
-export function getPrivateMessageList(params: ImPrivateMessageApi.PrivateMessageListReqVO) {
-  return requestClient.get<ImPrivateMessageApi.PrivateMessageRespVO[]>(
-    '/im/message/private/list',
-    { params },
-  );
-}
-
-/** 标记私聊消息已读 */
-export function readPrivateMessages(
-  receiverId: number | string,
-  messageId: number | string,
-) {
-  return requestClient.put<boolean>('/im/message/private/read', undefined, {
-    params: { receiverId, messageId },
-  });
-}
-
-/** 查询对方已读到我发的最大消息 id（多端 / 离线后用于补齐已读状态） */
-export function getPrivateMaxReadMessageId(
-  peerId: number | string,
-  signal?: AbortSignal,
-) {
-  return requestClient.get<null | number>(
-    '/im/message/private/max-read-message-id',
-    { params: { peerId }, signal },
-  );
-}
-
-/** 撤回私聊消息 */
-export function recallPrivateMessage(id: number | string) {
-  return requestClient.delete<ImPrivateMessageApi.PrivateMessageRespVO>(
-    '/im/message/private/recall',
-    { params: { id } },
-  );
-}

apps/web-antd/src/api/im/rtc/index.ts

@@ -1,105 +0,0 @@
-import { requestClient } from '#/api/request';
-
-export namespace ImRtcApi {
-  /** 创建新通话请求 VO */
-  export interface RtcCallCreateReqVO {
-    conversationType: number;
-    mediaType: number;
-    groupId?: number;
-    inviteeIds: number[]; // 被邀请的用户编号集合；私聊必传 1 个对端，群聊必传至少 1 人
-  }
-
-  /** 通话中追加邀请请求 VO；仅群通话可用 */
-  export interface RtcCallInviteReqVO {
-    room: string;
-    inviteeIds: number[];
-  }
-
-  /** 通话会话 VO；create / join / accept / refreshToken 共用 */
-  export interface RtcCallRespVO {
-    room: string; // 业务通话编号（同时作为 LiveKit 房间名）
-    livekitUrl: string;
-    token?: string; // ENDED 状态时为 null（无需 connect LiveKit）
-    conversationType: number;
-    mediaType: number;
-    status: number;
-    endReason?: number; // 结束原因；仅 status=ENDED 时有值
-    inviterId: number;
-    groupId?: number;
-    inviteeIds?: number[];
-    joinedUserIds?: number[];
-  }
-
-  /** 群活跃通话查询响应；不含 token */
-  export interface RtcGroupCallRespVO {
-    room: string;
-    groupId: number;
-    mediaType: number;
-    inviterId: number;
-    joinedUserIds?: number[];
-    inviteeIds?: number[];
-  }
-}
-
-
-/** 创建新通话；私聊或群聊根据 conversationType 区分 */
-export function createCall(data: ImRtcApi.RtcCallCreateReqVO) {
-  return requestClient.post<ImRtcApi.RtcCallRespVO>('/im/rtc/create', data);
-}
-
-/** 通话中追加邀请；仅群通话可用 */
-export function inviteCall(data: ImRtcApi.RtcCallInviteReqVO) {
-  return requestClient.post<boolean>('/im/rtc/invite', data);
-}
-
-/** 加入已有群通话；用于胶囊条「加入」按钮 */
-export function joinCall(room: string) {
-  return requestClient.post<ImRtcApi.RtcCallRespVO>('/im/rtc/join', undefined, {
-    params: { room },
-  });
-}
-
-/** 接听通话 */
-export function acceptCall(room: string) {
-  return requestClient.post<ImRtcApi.RtcCallRespVO>('/im/rtc/accept', undefined, {
-    params: { room },
-  });
-}
-
-/** 拒绝通话 */
-export function rejectCall(room: string) {
-  return requestClient.post<boolean>('/im/rtc/reject', undefined, {
-    params: { room },
-  });
-}
-
-/** 取消邀请；主叫接通前调用 */
-export function cancelCall(room: string) {
-  return requestClient.post<boolean>('/im/rtc/cancel', undefined, {
-    params: { room },
-  });
-}
-
-/** 离开通话；接通后调用 */
-export function leaveCall(room: string) {
-  return requestClient.post<boolean>('/im/rtc/leave', undefined, {
-    params: { room },
-  });
-}
-
-/** 振铃超时检查；RUNNING 端 timer 兜底，触发后端立即扫描该 room 的超时 INVITING（接口静默） */
-export function noAnswerCallCheck(room: string) {
-  return requestClient.post<boolean>(
-    '/im/rtc/no-answer-call-check',
-    undefined,
-    { params: { room } },
-  );
-}
-
-/** 查询当前进行中的通话；目前仅群聊场景（胶囊条），返回 null 表示无活跃通话 */
-export function getActiveCall(groupId: number) {
-  return requestClient.get<ImRtcApi.RtcGroupCallRespVO | null>(
-    '/im/rtc/get-active-call',
-    { params: { groupId } },
-  );
-}

apps/web-antd/src/api/infra/codegen/index.ts

@@ -24,18 +24,6 @@ export namespace InfraCodegenApi {
     parentMenuId: number;
   }
 
-  /** 代码生成表保存请求 */
-  export interface CodegenTableSaveReqVO extends CodegenTable {
-    frontType?: null | number;
-    genPath?: string;
-    genType?: string;
-    masterTableId?: number;
-    subJoinColumnId?: number;
-    subJoinMany?: boolean;
-    treeParentColumnId?: number;
-    treeNameColumnId?: number;
-  }
-
   /** 代码生成字段定义 */
   export interface CodegenColumn {
     id: number;
@@ -66,7 +54,7 @@ export namespace InfraCodegenApi {
 
   /** 代码生成详情 */
   export interface CodegenDetail {
-    table: CodegenTableSaveReqVO;
+    table: CodegenTable;
     columns: CodegenColumn[];
   }
 
@@ -78,7 +66,7 @@ export namespace InfraCodegenApi {
 
   /** 更新代码生成请求 */
   export interface CodegenUpdateReqVO {
-    table: CodegenTableSaveReqVO;
+    table: any | CodegenTable;
     columns: CodegenColumn[];
   }
 

apps/web-antd/src/api/infra/demo/demo02/index.ts

@@ -11,7 +11,7 @@ export namespace Demo02CategoryApi {
 }
 
 /** 查询示例分类列表 */
-export function getDemo02CategoryList(params?: any) {
+export function getDemo02CategoryList(params: any) {
   return requestClient.get<Demo02CategoryApi.Demo02Category[]>(
     '/infra/demo02-category/list',
     { params },

apps/web-antd/src/api/infra/demo/demo03/erp/index.ts

@@ -1,3 +1,5 @@
+import type { Dayjs } from 'dayjs';
+
 import type { PageParam, PageResult } from '@vben/request';
 
 import { requestClient } from '#/api/request';
@@ -5,7 +7,7 @@ import { requestClient } from '#/api/request';
 export namespace Demo03StudentApi {
   /** 学生课程信息 */
   export interface Demo03Course {
-    id?: number; // 编号
+    id: number; // 编号
     studentId?: number; // 学生编号
     name?: string; // 名字
     score?: number; // 分数
@@ -13,7 +15,7 @@ export namespace Demo03StudentApi {
 
   /** 学生班级信息 */
   export interface Demo03Grade {
-    id?: number; // 编号
+    id: number; // 编号
     studentId?: number; // 学生编号
     name?: string; // 名字
     teacher?: string; // 班主任
@@ -21,10 +23,10 @@ export namespace Demo03StudentApi {
 
   /** 学生信息 */
   export interface Demo03Student {
-    id?: number; // 编号
+    id: number; // 编号
     name?: string; // 名字
     sex?: number; // 性别
-    birthday?: number | string; // 出生日期
+    birthday?: Dayjs | string; // 出生日期
     description?: string; // 简介
   }
 }

apps/web-antd/src/api/infra/demo/demo03/inner/index.ts

@@ -1,3 +1,5 @@
+import type { Dayjs } from 'dayjs';
+
 import type { PageParam, PageResult } from '@vben/request';
 
 import { requestClient } from '#/api/request';
@@ -5,7 +7,7 @@ import { requestClient } from '#/api/request';
 export namespace Demo03StudentApi {
   /** 学生课程信息 */
   export interface Demo03Course {
-    id?: number; // 编号
+    id: number; // 编号
     studentId?: number; // 学生编号
     name?: string; // 名字
     score?: number; // 分数
@@ -13,7 +15,7 @@ export namespace Demo03StudentApi {
 
   /** 学生班级信息 */
   export interface Demo03Grade {
-    id?: number; // 编号
+    id: number; // 编号
     studentId?: number; // 学生编号
     name?: string; // 名字
     teacher?: string; // 班主任
@@ -21,10 +23,10 @@ export namespace Demo03StudentApi {
 
   /** 学生信息 */
   export interface Demo03Student {
-    id?: number; // 编号
+    id: number; // 编号
     name?: string; // 名字
     sex?: number; // 性别
-    birthday?: number | string; // 出生日期
+    birthday?: Dayjs | string; // 出生日期
     description?: string; // 简介
     demo03courses?: Demo03Course[];
     demo03grade?: Demo03Grade;

apps/web-antd/src/api/infra/demo/demo03/normal/index.ts

@@ -1,3 +1,5 @@
+import type { Dayjs } from 'dayjs';
+
 import type { PageParam, PageResult } from '@vben/request';
 
 import { requestClient } from '#/api/request';
@@ -5,7 +7,7 @@ import { requestClient } from '#/api/request';
 export namespace Demo03StudentApi {
   /** 学生课程信息 */
   export interface Demo03Course {
-    id?: number; // 编号
+    id: number; // 编号
     studentId?: number; // 学生编号
     name?: string; // 名字
     score?: number; // 分数
@@ -13,7 +15,7 @@ export namespace Demo03StudentApi {
 
   /** 学生班级信息 */
   export interface Demo03Grade {
-    id?: number; // 编号
+    id: number; // 编号
     studentId?: number; // 学生编号
     name?: string; // 名字
     teacher?: string; // 班主任
@@ -21,10 +23,10 @@ export namespace Demo03StudentApi {
 
   /** 学生信息 */
   export interface Demo03Student {
-    id?: number; // 编号
+    id: number; // 编号
     name?: string; // 名字
     sex?: number; // 性别
-    birthday?: number | string; // 出生日期
+    birthday?: Dayjs | string; // 出生日期
     description?: string; // 简介
     demo03courses?: Demo03Course[];
     demo03grade?: Demo03Grade;

apps/web-antd/src/api/infra/job/index.ts

@@ -75,8 +75,3 @@ export function runJob(id: number) {
 export function getJobNextTimes(id: number) {
   return requestClient.get(`/infra/job/get_next_times?id=${id}`);
 }
-
-/** 同步定时任务到 Quartz */
-export function syncJob() {
-  return requestClient.post('/infra/job/sync');
-}

apps/web-antd/src/api/iot/alert/config/index.ts

@@ -3,8 +3,24 @@ import type { PageParam, PageResult } from '@vben/request';
 import { requestClient } from '#/api/request';
 
 export namespace AlertConfigApi {
-  /** IoT 告警配置 */
+  /** IoT 告警配置 VO */
   export interface AlertConfig {
+    id?: number;
+    name: string;
+    description?: string;
+    level?: number;
+    status?: number;
+    sceneRuleIds?: number[];
+    receiveUserIds?: number[];
+    receiveUserNames?: string;
+    receiveTypes?: number[];
+    createTime?: Date;
+    updateTime?: Date;
+  }
+}
+
+/** IoT 告警配置 */
+export interface AlertConfig {
   id?: number;
   name?: string;
   description?: string;
@@ -12,13 +28,10 @@ export namespace AlertConfigApi {
   status?: number;
   sceneRuleIds?: number[];
   receiveUserIds?: number[];
-    receiveUserNames?: string[];
+  receiveUserNames?: string;
   receiveTypes?: number[];
-    smsTemplateCode?: string;
-    mailTemplateCode?: string;
-    notifyTemplateCode?: string;
   createTime?: Date;
-  }
+  updateTime?: Date;
 }
 
 /** 查询告警配置分页 */
@@ -36,20 +49,20 @@ export function getAlertConfig(id: number) {
   );
 }
 
-/** 获取告警配置简单列表 */
+/** 查询所有告警配置列表 */
-export function getSimpleAlertConfigList() {
+export function getAlertConfigList() {
   return requestClient.get<AlertConfigApi.AlertConfig[]>(
-    '/iot/alert-config/simple-list',
+    '/iot/alert-config/list',
   );
 }
 
 /** 新增告警配置 */
-export function createAlertConfig(data: AlertConfigApi.AlertConfig) {
+export function createAlertConfig(data: AlertConfig) {
   return requestClient.post('/iot/alert-config/create', data);
 }
 
 /** 修改告警配置 */
-export function updateAlertConfig(data: AlertConfigApi.AlertConfig) {
+export function updateAlertConfig(data: AlertConfig) {
   return requestClient.put('/iot/alert-config/update', data);
 }
 
@@ -57,3 +70,25 @@ export function updateAlertConfig(data: AlertConfigApi.AlertConfig) {
 export function deleteAlertConfig(id: number) {
   return requestClient.delete(`/iot/alert-config/delete?id=${id}`);
 }
+
+/** 批量删除告警配置 */
+export function deleteAlertConfigList(ids: number[]) {
+  return requestClient.delete('/iot/alert-config/delete-list', {
+    params: { ids: ids.join(',') },
+  });
+}
+
+/** 启用/禁用告警配置 */
+export function toggleAlertConfig(id: number, enabled: boolean) {
+  return requestClient.put(`/iot/alert-config/toggle`, {
+    id,
+    enabled,
+  });
+}
+
+/** 获取告警配置简单列表 */
+export function getSimpleAlertConfigList() {
+  return requestClient.get<AlertConfigApi.AlertConfig[]>(
+    '/iot/alert-config/simple-list',
+  );
+}

apps/web-antd/src/api/iot/alert/record/index.ts

@@ -3,21 +3,41 @@ import type { PageParam, PageResult } from '@vben/request';
 import { requestClient } from '#/api/request';
 
 export namespace AlertRecordApi {
-  /** IoT 告警记录 */
+  /** IoT 告警记录 VO */
   export interface AlertRecord {
     id?: number;
     configId?: number;
     configName?: string;
     configLevel?: number;
     deviceId?: number;
+    deviceName?: string;
     productId?: number;
-    deviceMessage?: any;
+    productName?: string;
+    deviceMessage?: string;
     processStatus?: boolean;
     processRemark?: string;
+    processTime?: Date;
     createTime?: Date;
   }
 }
 
+/** IoT 告警记录 */
+export interface AlertRecord {
+  id?: number;
+  configId?: number;
+  configName?: string;
+  configLevel?: number;
+  deviceId?: number;
+  deviceName?: string;
+  productId?: number;
+  productName?: string;
+  deviceMessage?: string;
+  processStatus?: boolean;
+  processRemark?: string;
+  processTime?: Date;
+  createTime?: Date;
+}
+
 /** 查询告警记录分页 */
 export function getAlertRecordPage(params: PageParam) {
   return requestClient.get<PageResult<AlertRecordApi.AlertRecord>>(
@@ -34,9 +54,29 @@ export function getAlertRecord(id: number) {
 }
 
 /** 处理告警记录 */
-export function processAlertRecord(id: number, processRemark?: string) {
+export function processAlertRecord(id: number, remark?: string) {
   return requestClient.put('/iot/alert-record/process', {
     id,
-    processRemark,
+    remark,
+  });
+}
+
+/** 批量处理告警记录 */
+export function batchProcessAlertRecord(ids: number[], remark?: string) {
+  return requestClient.put('/iot/alert-record/batch-process', {
+    ids,
+    remark,
+  });
+}
+
+/** 删除告警记录 */
+export function deleteAlertRecord(id: number) {
+  return requestClient.delete(`/iot/alert-record/delete?id=${id}`);
+}
+
+/** 批量删除告警记录 */
+export function deleteAlertRecordList(ids: number[]) {
+  return requestClient.delete('/iot/alert-record/delete-list', {
+    params: { ids: ids.join(',') },
   });
 }

apps/web-antd/src/api/iot/device/device/index.ts

@@ -150,8 +150,11 @@ export function importDeviceTemplate() {
 /** 导入设备 */
 export function importDevice(file: File, updateSupport: boolean) {
   return requestClient.upload<IotDeviceApi.DeviceImportRespVO>(
-    `/iot/device/import?updateSupport=${updateSupport}`,
+    '/iot/device/import',
-    { file },
+    {
+      file,
+      updateSupport,
+    },
   );
 }
 
@@ -165,7 +168,7 @@ export function getLatestDeviceProperties(params: any) {
 
 /** 获取设备属性历史数据 */
 export function getHistoryDevicePropertyList(params: any) {
-  return requestClient.get<IotDeviceApi.DeviceProperty[]>(
+  return requestClient.get<PageResult<IotDeviceApi.DeviceProperty>>(
     '/iot/device/property/history-list',
     { params },
   );

apps/web-antd/src/api/iot/ota/firmware/index.ts

@@ -3,20 +3,37 @@ import type { PageParam, PageResult } from '@vben/request';
 import { requestClient } from '#/api/request';
 
 export namespace IoTOtaFirmwareApi {
-  /** IoT OTA 固件信息 */
+  /** IoT OTA 固件 VO */
   export interface Firmware {
     id?: number;
-    name?: string;
+    name: string;
+    version: string;
+    productId: number;
+    productName?: string;
     description?: string;
+    fileUrl?: string;
+    fileMd5?: string;
+    fileSize?: number;
+    status?: number;
+    createTime?: Date;
+    updateTime?: Date;
+  }
+}
+
+/** IoT OTA 固件 */
+export interface IoTOtaFirmware {
+  id?: number;
+  name?: string;
   version?: string;
   productId?: number;
   productName?: string;
+  description?: string;
   fileUrl?: string;
+  fileMd5?: string;
   fileSize?: number;
-    fileDigestAlgorithm?: string;
+  status?: number;
-    fileDigestValue?: string;
   createTime?: Date;
-  }
+  updateTime?: Date;
 }
 
 /** 查询 OTA 固件分页 */
@@ -35,12 +52,12 @@ export function getOtaFirmware(id: number) {
 }
 
 /** 新增 OTA 固件 */
-export function createOtaFirmware(data: IoTOtaFirmwareApi.Firmware) {
+export function createOtaFirmware(data: IoTOtaFirmware) {
   return requestClient.post('/iot/ota/firmware/create', data);
 }
 
 /** 修改 OTA 固件 */
-export function updateOtaFirmware(data: IoTOtaFirmwareApi.Firmware) {
+export function updateOtaFirmware(data: IoTOtaFirmware) {
   return requestClient.put('/iot/ota/firmware/update', data);
 }
 
@@ -48,3 +65,26 @@ export function updateOtaFirmware(data: IoTOtaFirmwareApi.Firmware) {
 export function deleteOtaFirmware(id: number) {
   return requestClient.delete(`/iot/ota/firmware/delete?id=${id}`);
 }
+
+/** 批量删除 OTA 固件 */
+export function deleteOtaFirmwareList(ids: number[]) {
+  return requestClient.delete('/iot/ota/firmware/delete-list', {
+    params: { ids: ids.join(',') },
+  });
+}
+
+/** 更新 OTA 固件状态 */
+export function updateOtaFirmwareStatus(id: number, status: number) {
+  return requestClient.put(`/iot/ota/firmware/update-status`, {
+    id,
+    status,
+  });
+}
+
+/** 根据产品 ID 查询固件列表 */
+export function getOtaFirmwareListByProductId(productId: number) {
+  return requestClient.get<IoTOtaFirmwareApi.Firmware[]>(
+    '/iot/ota/firmware/list-by-product-id',
+    { params: { productId } },
+  );
+}

apps/web-antd/src/api/iot/ota/task/index.ts

@@ -3,21 +3,45 @@ import type { PageParam, PageResult } from '@vben/request';
 import { requestClient } from '#/api/request';
 
 export namespace IoTOtaTaskApi {
-  /** IoT OTA 升级任务 */
+  /** IoT OTA 升级任务 VO */
   export interface Task {
     id?: number;
     name: string;
     description?: string;
-    firmwareId?: number;
+    firmwareId: number;
-    status?: number;
+    firmwareName?: string;
-    deviceScope: number;
+    productId?: number;
+    productName?: string;
+    deviceScope?: number;
     deviceIds?: number[];
-    deviceTotalCount?: number;
+    status?: number;
-    deviceSuccessCount?: number;
+    successCount?: number;
+    failureCount?: number;
+    pendingCount?: number;
     createTime?: Date;
+    updateTime?: Date;
   }
 }
 
+/** IoT OTA 升级任务 */
+export interface OtaTask {
+  id?: number;
+  name?: string;
+  description?: string;
+  firmwareId?: number;
+  firmwareName?: string;
+  productId?: number;
+  productName?: string;
+  deviceScope?: number;
+  deviceIds?: number[];
+  status?: number;
+  successCount?: number;
+  failureCount?: number;
+  pendingCount?: number;
+  createTime?: Date;
+  updateTime?: Date;
+}
+
 /** 查询 OTA 升级任务分页 */
 export function getOtaTaskPage(params: PageParam) {
   return requestClient.get<PageResult<IoTOtaTaskApi.Task>>(
@@ -32,11 +56,43 @@ export function getOtaTask(id: number) {
 }
 
 /** 新增 OTA 升级任务 */
-export function createOtaTask(data: IoTOtaTaskApi.Task) {
+export function createOtaTask(data: OtaTask) {
   return requestClient.post('/iot/ota/task/create', data);
 }
 
+/** 修改 OTA 升级任务 */
+export function updateOtaTask(data: OtaTask) {
+  return requestClient.put('/iot/ota/task/update', data);
+}
+
+/** 删除 OTA 升级任务 */
+export function deleteOtaTask(id: number) {
+  return requestClient.delete(`/iot/ota/task/delete?id=${id}`);
+}
+
+/** 批量删除 OTA 升级任务 */
+export function deleteOtaTaskList(ids: number[]) {
+  return requestClient.delete('/iot/ota/task/delete-list', {
+    params: { ids: ids.join(',') },
+  });
+}
+
 /** 取消 OTA 升级任务 */
 export function cancelOtaTask(id: number) {
-  return requestClient.post(`/iot/ota/task/cancel?id=${id}`);
+  return requestClient.put(`/iot/ota/task/cancel?id=${id}`);
+}
+
+/** 启动 OTA 升级任务 */
+export function startOtaTask(id: number) {
+  return requestClient.put(`/iot/ota/task/start?id=${id}`);
+}
+
+/** 暂停 OTA 升级任务 */
+export function pauseOtaTask(id: number) {
+  return requestClient.put(`/iot/ota/task/pause?id=${id}`);
+}
+
+/** 恢复 OTA 升级任务 */
+export function resumeOtaTask(id: number) {
+  return requestClient.put(`/iot/ota/task/resume?id=${id}`);
 }

apps/web-antd/src/api/iot/ota/task/record/index.ts

@@ -3,24 +3,44 @@ import type { PageParam, PageResult } from '@vben/request';
 import { requestClient } from '#/api/request';
 
 export namespace IoTOtaTaskRecordApi {
-  /** IoT OTA 升级任务记录 */
+  /** IoT OTA 升级任务记录 VO */
   export interface TaskRecord {
     id?: number;
-    firmwareId?: number;
+    taskId: number;
-    firmwareVersion?: string;
+    taskName?: string;
-    taskId?: number;
+    deviceId: number;
-    deviceId?: string;
     deviceName?: string;
-    currentVersion?: string;
+    firmwareId?: number;
-    fromFirmwareId?: number;
+    firmwareName?: string;
-    fromFirmwareVersion?: string;
+    firmwareVersion?: string;
     status?: number;
     progress?: number;
-    description?: string;
+    errorMessage?: string;
-    updateTime?: Date;
+    startTime?: Date;
+    endTime?: Date;
+    createTime?: Date;
   }
 }
 
+// TODO @AI：这里应该拿到 IoTOtaTaskRecordApi 里
+/** IoT OTA 升级任务记录 */
+export interface OtaTaskRecord {
+  id?: number;
+  taskId?: number;
+  taskName?: string;
+  deviceId?: number;
+  deviceName?: string;
+  firmwareId?: number;
+  firmwareName?: string;
+  firmwareVersion?: string;
+  status?: number;
+  progress?: number;
+  errorMessage?: string;
+  startTime?: Date;
+  endTime?: Date;
+  createTime?: Date;
+}
+
 /** 查询 OTA 升级任务记录分页 */
 export function getOtaTaskRecordPage(params: PageParam) {
   return requestClient.get<PageResult<IoTOtaTaskRecordApi.TaskRecord>>(
@@ -29,12 +49,48 @@ export function getOtaTaskRecordPage(params: PageParam) {
   );
 }
 
-/** 取消 OTA 升级任务记录 */
+/** 查询 OTA 升级任务记录详情 */
+export function getOtaTaskRecord(id: number) {
+  return requestClient.get<IoTOtaTaskRecordApi.TaskRecord>(
+    `/iot/ota/task/record/get?id=${id}`,
+  );
+}
+
+/** 根据任务 ID 查询记录列表 */
+export function getOtaTaskRecordListByTaskId(taskId: number) {
+  return requestClient.get<IoTOtaTaskRecordApi.TaskRecord[]>(
+    '/iot/ota/task/record/list-by-task-id',
+    { params: { taskId } },
+  );
+}
+
+/** 根据设备 ID 查询记录列表 */
+export function getOtaTaskRecordListByDeviceId(deviceId: number) {
+  return requestClient.get<IoTOtaTaskRecordApi.TaskRecord[]>(
+    '/iot/ota/task/record/list-by-device-id',
+    { params: { deviceId } },
+  );
+}
+
+/** 根据固件 ID 查询记录列表 */
+export function getOtaTaskRecordListByFirmwareId(firmwareId: number) {
+  return requestClient.get<IoTOtaTaskRecordApi.TaskRecord[]>(
+    '/iot/ota/task/record/list-by-firmware-id',
+    { params: { firmwareId } },
+  );
+}
+
+/** 重试升级任务记录 */
+export function retryOtaTaskRecord(id: number) {
+  return requestClient.put(`/iot/ota/task/record/retry?id=${id}`);
+}
+
+/** 取消升级任务记录 */
 export function cancelOtaTaskRecord(id: number) {
   return requestClient.put(`/iot/ota/task/record/cancel?id=${id}`);
 }
 
-/** 获取 OTA 升级任务记录状态统计 */
+/** 获取升级任务记录状态统计 */
 export function getOtaTaskRecordStatusStatistics(
   firmwareId?: number,
   taskId?: number,

apps/web-antd/src/api/iot/product/category/index.ts

@@ -7,10 +7,11 @@ export namespace IotProductCategoryApi {
   export interface ProductCategory {
     id?: number; // 分类 ID
     name: string; // 分类名称
+    parentId?: number; // 父级分类 ID
     sort?: number; // 分类排序
     status?: number; // 分类状态
     description?: string; // 分类描述
-    createTime?: Date; // 创建时间
+    createTime?: string; // 创建时间
   }
 }
 

apps/web-antd/src/api/iot/product/product/index.ts

@@ -20,6 +20,8 @@ export namespace IotProductApi {
     deviceType?: number; // 设备类型
     netType?: number; // 联网方式
     serializeType?: string; // 序列化类型
+    dataFormat?: number; // 数据格式
+    validateType?: number; // 认证方式
     registerEnabled?: boolean; // 是否开启动态注册
     deviceCount?: number; // 设备数量
     createTime?: Date; // 创建时间
@@ -101,10 +103,3 @@ export function getProductByKey(productKey: string) {
     params: { productKey },
   });
 }
-
-/** 同步产品物模型 TDengine 超级表结构 */
-export function syncProductPropertyTable(productId: number) {
-  return requestClient.post(
-    `/iot/product/sync-property-table?productId=${productId}`,
-  );
-}

apps/web-antd/src/api/iot/rule/data/rule/index.ts

@@ -3,21 +3,45 @@ import type { PageParam, PageResult } from '@vben/request';
 import { requestClient } from '#/api/request';
 
 export namespace DataRuleApi {
-  /** IoT 数据流转规则 */
+  /** IoT 数据流转规则 VO */
-  export interface DataRule {
+  export interface Rule {
+    id?: number;
+    name: string;
+    description?: string;
+    status?: number;
+    productId?: number;
+    productKey?: string;
+    sourceConfigs?: SourceConfig[];
+    sinkIds?: number[];
+    createTime?: Date;
+  }
+
+  /** IoT 数据源配置 */
+  export interface SourceConfig {
+    productId?: number;
+    productKey?: string;
+    deviceId?: number;
+    type?: string;
+    topic?: string;
+  }
+}
+
+/** IoT 数据流转规则 */
+export interface DataRule {
   id?: number;
   name?: string;
   description?: string;
   status?: number;
+  productId?: number;
+  productKey?: string;
   sourceConfigs?: any[];
   sinkIds?: number[];
   createTime?: Date;
-  }
 }
 
 /** 查询数据流转规则分页 */
 export function getDataRulePage(params: PageParam) {
-  return requestClient.get<PageResult<DataRuleApi.DataRule>>(
+  return requestClient.get<PageResult<DataRuleApi.Rule>>(
     '/iot/data-rule/page',
     { params },
   );
@@ -25,16 +49,16 @@ export function getDataRulePage(params: PageParam) {
 
 /** 查询数据流转规则详情 */
 export function getDataRule(id: number) {
-  return requestClient.get<DataRuleApi.DataRule>(`/iot/data-rule/get?id=${id}`);
+  return requestClient.get<DataRuleApi.Rule>(`/iot/data-rule/get?id=${id}`);
 }
 
 /** 新增数据流转规则 */
-export function createDataRule(data: DataRuleApi.DataRule) {
+export function createDataRule(data: DataRule) {
   return requestClient.post('/iot/data-rule/create', data);
 }
 
 /** 修改数据流转规则 */
-export function updateDataRule(data: DataRuleApi.DataRule) {
+export function updateDataRule(data: DataRule) {
   return requestClient.put('/iot/data-rule/update', data);
 }
 
@@ -42,3 +66,18 @@ export function updateDataRule(data: DataRuleApi.DataRule) {
 export function deleteDataRule(id: number) {
   return requestClient.delete(`/iot/data-rule/delete?id=${id}`);
 }
+
+/** 批量删除数据流转规则 */
+export function deleteDataRuleList(ids: number[]) {
+  return requestClient.delete('/iot/data-rule/delete-list', {
+    params: { ids: ids.join(',') },
+  });
+}
+
+/** 更新数据流转规则状态 */
+export function updateDataRuleStatus(id: number, status: number) {
+  return requestClient.put(`/iot/data-rule/update-status`, {
+    id,
+    status,
+  });
+}

apps/web-antd/src/api/iot/rule/data/sink/index.ts

@@ -2,147 +2,101 @@ import type { PageParam, PageResult } from '@vben/request';
 
 import { requestClient } from '#/api/request';
 
-interface BaseConfig {
-  type: string;
-}
-
 export namespace DataSinkApi {
   /** IoT 数据流转目的 VO */
-  export interface DataSink {
+  export interface Sink {
+    id?: number;
+    name: string;
+    description?: string;
+    status?: number;
+    type: string;
+    config?: any;
+    createTime?: Date;
+  }
+}
+
+/** IoT 数据流转目的 */
+export interface DataSinkVO {
   id?: number;
   name?: string;
   description?: string;
   status?: number;
-    direction?: number;
+  type?: string;
-    type?: number;
+  config?: any;
-    config?:
-      | DatabaseConfig
-      | HttpConfig
-      | KafkaMQConfig
-      | MqttConfig
-      | RabbitMQConfig
-      | RedisStreamMQConfig
-      | RocketMQConfig
-      | TcpConfig
-      | WebSocketConfig;
   createTime?: Date;
-  }
-
-  /** HTTP 配置 */
-  export interface HttpConfig extends BaseConfig {
-    url: string;
-    method: string;
-    headers: Record<string, string>;
-    query: Record<string, string>;
-    body: string;
-  }
-
-  /** TCP 配置 */
-  export interface TcpConfig extends BaseConfig {
-    host: string;
-    port: number;
-    connectTimeoutMs: number;
-    readTimeoutMs: number;
-    ssl: boolean;
-    sslCertPath: string;
-    dataFormat: string;
-    heartbeatIntervalMs: number;
-    reconnectIntervalMs: number;
-    maxReconnectAttempts: number;
-  }
-
-  /** WebSocket 配置 */
-  export interface WebSocketConfig extends BaseConfig {
-    serverUrl: string;
-    connectTimeoutMs: number;
-    sendTimeoutMs: number;
-    heartbeatIntervalMs: number;
-    heartbeatMessage: string;
-    subprotocols: string;
-    customHeaders: string;
-    verifySslCert: boolean;
-    dataFormat: string;
-    reconnectIntervalMs: number;
-    maxReconnectAttempts: number;
-    enableCompression: boolean;
-    sendRetryCount: number;
-    sendRetryIntervalMs: number;
-  }
-
-  /** MQTT 配置 */
-  export interface MqttConfig extends BaseConfig {
-    url: string;
-    username: string;
-    password: string;
-    clientId: string;
-    topic: string;
-  }
-
-  /** Database 配置 */
-  export interface DatabaseConfig extends BaseConfig {
-    jdbcUrl: string;
-    username: string;
-    password: string;
-    tableName: string;
-  }
-
-  /** RocketMQ 配置 */
-  export interface RocketMQConfig extends BaseConfig {
-    nameServer: string;
-    accessKey: string;
-    secretKey: string;
-    group: string;
-    topic: string;
-    tags: string;
-  }
-
-  /** Kafka 配置 */
-  export interface KafkaMQConfig extends BaseConfig {
-    bootstrapServers: string;
-    username: string;
-    password: string;
-    ssl: boolean;
-    topic: string;
-  }
-
-  /** RabbitMQ 配置 */
-  export interface RabbitMQConfig extends BaseConfig {
-    host: string;
-    port: number;
-    virtualHost: string;
-    username: string;
-    password: string;
-    exchange: string;
-    routingKey: string;
-    queue: string;
-  }
-
-  /** Redis Stream MQ 配置 */
-  export interface RedisStreamMQConfig extends BaseConfig {
-    host: string;
-    port: number;
-    password: string;
-    database: number;
-    topic: string;
-  }
 }
 
-/** 数据流转目的类型 */
+/** IoT 数据目的类型枚举 */
-export const IotDataSinkTypeEnum = {
+export enum IotDataSinkTypeEnum {
-  HTTP: 1,
+  HTTP = 'HTTP',
-  TCP: 2,
+  KAFKA = 'KAFKA',
-  WEBSOCKET: 3,
+  MQTT = 'MQTT',
-  MQTT: 10,
+  RABBITMQ = 'RABBITMQ',
-  DATABASE: 20,
+  REDIS_STREAM = 'REDIS_STREAM',
-  REDIS_STREAM: 21,
+  ROCKETMQ = 'ROCKETMQ',
-  ROCKETMQ: 30,
+}
-  RABBITMQ: 31,
+
-  KAFKA: 32,
+/** HTTP 配置 */
-} as const;
+export interface HttpConfig {
+  url?: string;
+  method?: string;
+  headers?: Record<string, string>;
+  timeout?: number;
+}
+
+/** MQTT 配置 */
+export interface MqttConfig {
+  broker?: string;
+  port?: number;
+  topic?: string;
+  username?: string;
+  password?: string;
+  clientId?: string;
+  qos?: number;
+}
+
+/** Kafka 配置 */
+export interface KafkaMQConfig {
+  bootstrapServers?: string;
+  topic?: string;
+  acks?: string;
+  retries?: number;
+  batchSize?: number;
+}
+
+/** RabbitMQ 配置 */
+export interface RabbitMQConfig {
+  host?: string;
+  port?: number;
+  virtualHost?: string;
+  username?: string;
+  password?: string;
+  exchange?: string;
+  routingKey?: string;
+  queue?: string;
+}
+
+/** RocketMQ 配置 */
+export interface RocketMQConfig {
+  nameServer?: string;
+  topic?: string;
+  tag?: string;
+  producerGroup?: string;
+}
+
+/** Redis Stream 配置 */
+export interface RedisStreamMQConfig {
+  host?: string;
+  port?: number;
+  password?: string;
+  database?: number;
+  streamKey?: string;
+  maxLen?: number;
+}
 
 /** 查询数据流转目的分页 */
 export function getDataSinkPage(params: PageParam) {
-  return requestClient.get<PageResult<DataSinkApi.DataSink>>(
+  return requestClient.get<PageResult<DataSinkApi.Sink>>(
     '/iot/data-sink/page',
     { params },
   );
@@ -150,23 +104,26 @@ export function getDataSinkPage(params: PageParam) {
 
 /** 查询数据流转目的详情 */
 export function getDataSink(id: number) {
-  return requestClient.get<DataSinkApi.DataSink>(`/iot/data-sink/get?id=${id}`);
+  return requestClient.get<DataSinkApi.Sink>(`/iot/data-sink/get?id=${id}`);
 }
 
-/** 查询数据流转目的（精简）列表 */
+/** 查询所有数据流转目的列表 */
+export function getDataSinkList() {
+  return requestClient.get<DataSinkApi.Sink[]>('/iot/data-sink/list');
+}
+
+/** 查询数据流转目的简单列表 */
 export function getDataSinkSimpleList() {
-  return requestClient.get<DataSinkApi.DataSink[]>(
+  return requestClient.get<DataSinkApi.Sink[]>('/iot/data-sink/simple-list');
-    '/iot/data-sink/simple-list',
-  );
 }
 
 /** 新增数据流转目的 */
-export function createDataSink(data: DataSinkApi.DataSink) {
+export function createDataSink(data: DataSinkVO) {
   return requestClient.post('/iot/data-sink/create', data);
 }
 
 /** 修改数据流转目的 */
-export function updateDataSink(data: DataSinkApi.DataSink) {
+export function updateDataSink(data: DataSinkVO) {
   return requestClient.put('/iot/data-sink/update', data);
 }
 
@@ -174,3 +131,18 @@ export function updateDataSink(data: DataSinkApi.DataSink) {
 export function deleteDataSink(id: number) {
   return requestClient.delete(`/iot/data-sink/delete?id=${id}`);
 }
+
+/** 批量删除数据流转目的 */
+export function deleteDataSinkList(ids: number[]) {
+  return requestClient.delete('/iot/data-sink/delete-list', {
+    params: { ids: ids.join(',') },
+  });
+}
+
+/** 更新数据流转目的状态 */
+export function updateDataSinkStatus(id: number, status: number) {
+  return requestClient.put(`/iot/data-sink/update-status`, {
+    id,
+    status,
+  });
+}

apps/web-antd/src/api/iot/rule/scene/index.ts

@@ -11,20 +11,25 @@ export namespace RuleSceneApi {
     status?: number;
     triggers?: Trigger[];
     actions?: Action[];
-    lastTriggerTime?: Date;
     createTime?: Date;
   }
 
   /** 场景联动规则的触发器 */
   export interface Trigger {
-    type?: number;
+    type?: string;
     productId?: number;
     deviceId?: number;
     identifier?: string;
     operator?: string;
     value?: any;
     cronExpression?: string;
-    conditionGroups?: TriggerCondition[][]; // 后端结构：List<List<TriggerCondition>>；外层「或」、组内「且」
+    conditionGroups?: TriggerConditionGroup[];
+  }
+
+  /** 场景联动规则的触发条件组 */
+  export interface TriggerConditionGroup {
+    conditions?: TriggerCondition[];
+    operator?: string;
   }
 
   /**  场景联动规则的触发条件 */
@@ -34,20 +39,70 @@ export namespace RuleSceneApi {
     identifier?: string;
     operator?: string;
     value?: any;
-    type?: number;
+    type?: string;
-    param?: string;
   }
 
   /** 场景联动规则的动作 */
   export interface Action {
-    type?: number;
+    type?: string;
+    productId?: number;
+    deviceId?: number;
+    identifier?: string;
+    value?: any;
+    alertConfigId?: number;
+  }
+}
+
+// TODO @haohao：貌似下面的，和 RuleSceneApi 重复了。
+/** IoT 场景联动规则 */
+export interface IotSceneRule {
+  id?: number;
+  name?: string;
+  description?: string;
+  status?: number;
+  triggers?: Trigger[];
+  actions?: Action[];
+  createTime?: Date;
+}
+
+/** IoT 场景联动规则触发器 */
+export interface Trigger {
+  type?: string;
+  productId?: number;
+  deviceId?: number;
+  identifier?: string;
+  operator?: string;
+  value?: any;
+  cronExpression?: string;
+  conditionGroups?: TriggerConditionGroup[];
+}
+
+/** IoT 场景联动规则触发条件组 */
+export interface TriggerConditionGroup {
+  conditions?: TriggerCondition[];
+  operator?: string;
+}
+
+/** IoT 场景联动规则触发条件 */
+export interface TriggerCondition {
+  productId?: number;
+  deviceId?: number;
+  identifier?: string;
+  operator?: string;
+  value?: any;
+  type?: string;
+  param?: string;
+}
+
+/** IoT 场景联动规则动作 */
+export interface Action {
+  type?: string;
   productId?: number;
   deviceId?: number;
   identifier?: string;
   value?: any;
   alertConfigId?: number;
   params?: string;
-  }
 }
 
 /** 查询场景联动规则分页 */
@@ -66,12 +121,12 @@ export function getSceneRule(id: number) {
 }
 
 /** 新增场景联动规则 */
-export function createSceneRule(data: RuleSceneApi.SceneRule) {
+export function createSceneRule(data: IotSceneRule) {
   return requestClient.post('/iot/scene-rule/create', data);
 }
 
 /** 修改场景联动规则 */
-export function updateSceneRule(data: RuleSceneApi.SceneRule) {
+export function updateSceneRule(data: IotSceneRule) {
   return requestClient.put('/iot/scene-rule/update', data);
 }
 
@@ -80,6 +135,14 @@ export function deleteSceneRule(id: number) {
   return requestClient.delete(`/iot/scene-rule/delete?id=${id}`);
 }
 
+/** 批量删除场景联动规则 */
+// TODO @haohao：貌似用上。
+export function deleteSceneRuleList(ids: number[]) {
+  return requestClient.delete('/iot/scene-rule/delete-list', {
+    params: { ids: ids.join(',') },
+  });
+}
+
 /** 更新场景联动规则状态 */
 export function updateSceneRuleStatus(id: number, status: number) {
   return requestClient.put(`/iot/scene-rule/update-status`, {

apps/web-antd/src/api/iot/statistics/index.ts

@@ -17,6 +17,18 @@ export namespace IotStatisticsApi {
     productCategoryDeviceCounts: Record<string, number>; // 按品类统计的设备数量
   }
 
+  /** 时间戳-数值的键值对类型 */
+  export interface TimeValueItem {
+    [key: string]: number;
+  }
+
+  /** 消息统计数据类型 */
+  export interface DeviceMessageSummary {
+    statType: number;
+    upstreamCounts: TimeValueItem[];
+    downstreamCounts: TimeValueItem[];
+  }
+
   /** 设备消息数量统计（按日期） */
   export interface DeviceMessageSummaryByDateRespVO {
     time: string; // 时间轴

apps/web-antd/src/api/iot/thingmodel/index.ts

@@ -1,225 +1,126 @@
-import type { Rule } from 'ant-design-vue/es/form';
-
 import type { PageParam, PageResult } from '@vben/request';
 
-import { isEmpty } from '@vben/utils';
-
 import { requestClient } from '#/api/request';
 
 export namespace ThingModelApi {
-  /** IoT 物模型数据 */
+  /** IoT 物模型数据 VO */
   export interface ThingModel {
+    id?: number;
+    productId?: number;
+    productKey?: string;
+    identifier: string;
+    name: string;
+    desc?: string;
+    type: string;
+    property?: ThingModelProperty;
+    event?: ThingModelEvent;
+    service?: ThingModelService;
+  }
+
+  /** IoT 物模型属性 */
+  export interface Property {
+    identifier: string;
+    name: string;
+    accessMode: string;
+    dataType: string;
+    dataSpecs?: any;
+    dataSpecsList?: any[];
+    desc?: string;
+  }
+
+  /** IoT 物模型服务 */
+  export interface Service {
+    identifier: string;
+    name: string;
+    callType: string;
+    inputData?: any[];
+    outputData?: any[];
+    desc?: string;
+  }
+
+  /** IoT 物模型事件 */
+  export interface Event {
+    identifier: string;
+    name: string;
+    type: string;
+    outputData?: any[];
+    desc?: string;
+  }
+}
+
+/** IoT 物模型数据 */
+export interface ThingModelData {
   id?: number;
   productId?: number;
   productKey?: string;
   identifier?: string;
   name?: string;
-    description?: string;
+  desc?: string;
-    dataType?: string;
-    type?: number; // 参见 IoTThingModelTypeEnum 枚举类
-    property?: Property;
-    event?: Event;
-    service?: Service;
-  }
-
-  /** IoT 物模型属性 */
-  export interface Property {
-    identifier?: string;
-    name?: string;
-    accessMode?: string;
-    required?: boolean;
-    dataType?: string;
-    description?: string;
-    dataSpecs?: ThingModelDataSpecs;
-    dataSpecsList?: ThingModelPropertyDataSpecs[];
-  }
-
-  /** IoT 物模型服务 */
-  export interface Service {
-    identifier?: string;
-    name?: string;
-    required?: boolean;
-    callType?: string;
-    description?: string;
-    inputParams?: Param[];
-    outputParams?: Param[];
-    method?: string;
-  }
-
-  /** IoT 物模型事件 */
-  export interface Event {
-    identifier?: string;
-    name?: string;
-    required?: boolean;
   type?: string;
-    description?: string;
+  dataType?: string;
-    outputParams?: Param[];
+  property?: ThingModelProperty;
-    method?: string;
+  event?: ThingModelEvent;
-  }
+  service?: ThingModelService;
+}
 
-  /** IoT 物模型参数 */
+/** IoT 物模型属性 */
-  export interface Param {
+export interface ThingModelProperty {
   identifier?: string;
   name?: string;
-    direction?: string;
-    paraOrder?: number;
-    dataType?: string;
-    dataSpecs?: ThingModelDataSpecs;
-    dataSpecsList?: ThingModelPropertyDataSpecs[];
-  }
-
-  /** IoT 物模型 TSL（树形）响应 */
-  export interface ThingModelTSL {
-    productId?: number;
-    productKey?: string;
-    properties?: Property[];
-    events?: Event[];
-    services?: Service[];
-  }
-
-  /** IoT 数据定义（数值型） */
-  export interface ThingModelDataSpecs {
   accessMode?: string;
-    childDataType?: string;
-    dataSpecs?: ThingModelDataSpecs;
-    dataSpecsList?: ThingModelPropertyDataSpecs[];
   dataType?: string;
-    defaultValue?: string;
+  dataSpecs?: any;
-    description?: string;
+  dataSpecsList?: any[];
+  desc?: string;
+}
+
+/** IoT 物模型服务 */
+export interface ThingModelService {
   identifier?: string;
-    length?: number | string;
+  name?: string;
+  callType?: string;
+  inputData?: any[];
+  outputData?: any[];
+  desc?: string;
+}
+
+/** IoT 物模型事件 */
+export interface ThingModelEvent {
+  identifier?: string;
+  name?: string;
+  type?: string;
+  outputData?: any[];
+  desc?: string;
+}
+
+/** IoT 数据定义（数值型） */
+export interface DataSpecsNumberData {
   min?: number | string;
   max?: number | string;
-    name?: string;
-    precise?: string;
-    required?: boolean;
-    size?: number | string;
   step?: number | string;
   unit?: string;
   unitName?: string;
-    value?: number | string;
-  }
-
-  /** IoT 数据定义（数值型） */
-  export type DataSpecsNumberData = ThingModelDataSpecs;
-
-  /** IoT 数据定义（枚举/布尔型） */
-  export type DataSpecsEnumOrBoolData = ThingModelDataSpecs;
-
-  export type ThingModelPropertyDataSpecs = Property & ThingModelDataSpecs;
 }
 
-/** 生成「必填 + 数字」类校验器：拼到 size / length / 枚举值上 */
+/** IoT 数据定义（枚举/布尔型） */
-function buildRequiredNumberValidator(label: string) {
+export interface DataSpecsEnumOrBoolData {
-  return (_rule: any, value: any, callback: any) => {
+  value: number | string;
-    if (isEmpty(value)) {
+  name: string;
-      callback(new Error(`${label}不能为空`));
-      return;
-    }
-    if (Number.isNaN(Number(value))) {
-      callback(new Error(`${label}必须是数字`));
-      return;
-    }
-    callback();
-  };
-}
-
-/** 生成「标识符样式」名称校验器：开头需为中文 / 英文 / 数字，整体仅允许中文、英文、数字、下划线、短划线，长度 ≤ 20 */
-export function buildIdentifierLikeNameValidator(label: string) {
-  return (_rule: any, value: string, callback: any) => {
-    if (isEmpty(value)) {
-      callback(new Error(`${label}不能为空`));
-      return;
-    }
-    if (!/^[一-龥A-Za-z0-9]/.test(value)) {
-      callback(new Error(`${label}必须以中文、英文字母或数字开头`));
-      return;
-    }
-    if (!/^[一-龥A-Za-z0-9][\w一-龥-]*$/.test(value)) {
-      callback(
-        new Error(`${label}只能包含中文、英文字母、数字、下划线和短划线`),
-      );
-      return;
-    }
-    if (value.length > 20) {
-      callback(new Error(`${label}长度不能超过 20 个字符`));
-      return;
-    }
-    callback();
-  };
 }
 
 /** IoT 物模型表单校验规则 */
-export const ThingModelFormRules: Record<string, Rule[]> = {
+export interface ThingModelFormRules {
-  name: [
+  [key: string]: any;
-    { required: true, message: '功能名称不能为空', trigger: 'blur' },
+}
-    {
-      pattern: /^[一-龥A-Za-z0-9][一-龥A-Za-z0-9\-_/.]{0,29}$/,
-      message:
-        '支持中文、大小写字母、日文、数字、短划线、下划线、斜杠和小数点，必须以中文、英文或数字开头，不超过 30 个字符',
-      trigger: 'blur',
-    },
-  ],
-  type: [{ required: true, message: '功能类型不能为空', trigger: 'blur' }],
-  identifier: [
-    { required: true, message: '标识符不能为空', trigger: 'blur' },
-    {
-      pattern: /^[a-zA-Z][a-zA-Z0-9_]{0,31}$/,
-      message: '支持大小写字母、数字和下划线，必须以字母开头，不超过 32 个字符',
-      trigger: 'blur',
-    },
-    {
-      validator: (_rule: any, value: string, callback: any) => {
-        const reservedKeywords = [
-          'set',
-          'get',
-          'post',
-          'property',
-          'event',
-          'time',
-          'value',
-        ];
-        if (reservedKeywords.includes(value)) {
-          callback(
-            new Error(
-              'set, get, post, property, event, time, value 是系统保留字段，不能用于标识符定义',
-            ),
-          );
-          return;
-        }
-        if (/^\d+$/.test(value)) {
-          callback(new Error('标识符不能是纯数字'));
-          return;
-        }
-        callback();
-      },
-      trigger: 'blur',
-    },
-  ],
-  childDataType: [{ required: true, message: '元素类型不能为空' }],
-  size: [
-    {
-      required: true,
-      validator: buildRequiredNumberValidator('元素个数'),
-      trigger: 'blur',
-    },
-  ],
-  length: [
-    {
-      required: true,
-      validator: buildRequiredNumberValidator('文本长度'),
-      trigger: 'blur',
-    },
-  ],
-  accessMode: [
-    { required: true, message: '请选择读写类型', trigger: 'change' },
-  ],
-  callType: [{ required: true, message: '请选择调用方式', trigger: 'change' }],
-  eventType: [{ required: true, message: '请选择事件类型', trigger: 'change' }],
-};
 
-/** 校验布尔值名称 */
+/** 验证布尔型名称 */
-export const validateBoolName = buildIdentifierLikeNameValidator('布尔值名称');
+export function validateBoolName(_rule: any, value: any, callback: any) {
+  if (value) {
+    callback();
+  } else {
+    callback(new Error('枚举描述不能为空'));
+  }
+}
 
 /** 查询产品物模型分页 */
 export function getThingModelPage(params: PageParam) {
@@ -240,19 +141,17 @@ export function getThingModel(id: number) {
 export function getThingModelListByProductId(productId: number) {
   return requestClient.get<ThingModelApi.ThingModel[]>(
     '/iot/thing-model/list',
-    {
+    { params: { productId } },
-      params: { productId },
-    },
   );
 }
 
 /** 新增物模型 */
-export function createThingModel(data: ThingModelApi.ThingModel) {
+export function createThingModel(data: ThingModelData) {
   return requestClient.post('/iot/thing-model/create', data);
 }
 
 /** 修改物模型 */
-export function updateThingModel(data: ThingModelApi.ThingModel) {
+export function updateThingModel(data: ThingModelData) {
   return requestClient.put('/iot/thing-model/update', data);
 }
 
@@ -262,11 +161,26 @@ export function deleteThingModel(id: number) {
 }
 
 /** 获取物模型 TSL */
-export function getThingModelTSLByProductId(productId: number) {
+export function getThingModelTSL(productId: number) {
-  return requestClient.get<ThingModelApi.ThingModelTSL>(
+  return requestClient.get<ThingModelApi.ThingModel[]>(
     '/iot/thing-model/get-tsl',
-    {
+    { params: { productId } },
-      params: { productId },
-    },
   );
 }
+
+/** 导入物模型 TSL
+export function importThingModelTSL(productId: number, tslData: any) {
+  return requestClient.post('/iot/thing-model/import-tsl', {
+    productId,
+    tslData,
+  });
+}
+ */
+
+/** 导出物模型 TSL
+export function exportThingModelTSL(productId: number) {
+  return requestClient.get<any>('/iot/thing-model/export-tsl', {
+    params: { productId },
+  });
+}
+ */

apps/web-antd/src/api/mall/promotion/combination/combinationActivity.ts

@@ -8,7 +8,6 @@ export namespace MallCombinationActivityApi {
     id?: number; // 活动编号
     name?: string; // 活动名称
     spuId?: number; // 商品 SPU 编号
-    spuName?: string; // 商品 SPU 名称
     totalLimitCount?: number; // 总限购数量
     singleLimitCount?: number; // 单次限购数量
     startTime?: Date; // 开始时间
@@ -22,7 +21,7 @@ export namespace MallCombinationActivityApi {
     limitDuration?: number; // 限制时长
     combinationPrice?: number; // 拼团价格
     products: CombinationProduct[]; // 商品列表
-    picUrl?: string; // 商品图片
+    picUrl?: any;
   }
 
   /** 拼团活动所需属性 */

apps/web-antd/src/api/mall/promotion/reward/rewardActivity.ts

@@ -26,9 +26,9 @@ export namespace MallRewardActivityApi {
     conditionType?: number; // 条件类型
     productScope?: number; // 商品范围
     rules: RewardRule[]; // 优惠规则列表
-    productScopeValues: number[]; // 商品范围值（仅表单使用）：值为品类编号列表、商品编号列表
+    productScopeValues?: number[]; // 商品范围值（仅表单使用）：值为品类编号列表、商品编号列表
-    productCategoryIds: number[]; // 商品分类编号列表（仅表单使用）
+    productCategoryIds?: number[]; // 商品分类编号列表（仅表单使用）
-    productSpuIds: number[]; // 商品 SPU 编号列表（仅表单使用）
+    productSpuIds?: number[]; // 商品 SPU 编号列表（仅表单使用）
   }
 }
 

apps/web-antd/src/api/mall/promotion/seckill/seckillActivity.ts

@@ -31,7 +31,7 @@ export namespace MallSeckillActivityApi {
     totalStock?: number; // 秒杀总库存
     seckillPrice?: number; // 秒杀价格
     products?: SeckillProduct[]; // 秒杀商品列表
-    picUrl?: string; // 商品图片
+    picUrl?: any;
   }
 }
 

apps/web-antd/src/api/mall/statistics/trade.ts

@@ -7,7 +7,7 @@ import { requestClient } from '#/api/request';
 export namespace MallTradeStatisticsApi {
   /** 交易状况 Request */
   export interface TradeTrendReqVO {
-    times?: string[];
+    times: [Date, Date];
   }
 
   /** 交易统计 Response */

apps/web-antd/src/api/mall/trade/config/index.ts

@@ -4,21 +4,20 @@ export namespace MallTradeConfigApi {
   /** 交易中心配置 */
   export interface Config {
     id?: number;
-    afterSaleRefundReasons: string[];
+    afterSaleRefundReasons?: string[];
-    afterSaleReturnReasons: string[];
+    afterSaleReturnReasons?: string[];
-    deliveryExpressFreeEnabled: boolean;
+    deliveryExpressFreeEnabled?: boolean;
-    deliveryExpressFreePrice: number;
+    deliveryExpressFreePrice?: number;
-    deliveryPickUpEnabled: boolean;
+    deliveryPickUpEnabled?: boolean;
     brokerageEnabled?: boolean;
     brokerageEnabledCondition?: number;
     brokerageBindMode?: number;
-    brokeragePosterUrls: string[];
+    brokeragePosterUrls?: string;
     brokerageFirstPercent?: number;
     brokerageSecondPercent?: number;
-    brokerageWithdrawMinPrice: number;
+    brokerageWithdrawMinPrice?: number;
-    brokerageFrozenDays: number;
+    brokerageFrozenDays?: number;
-    brokerageWithdrawFeePercent: number;
+    brokerageWithdrawTypes?: string;
-    brokerageWithdrawTypes: number[];
     tencentLbsKey?: string;
   }
 }

apps/web-antd/src/api/member/address/index.ts

@@ -7,7 +7,6 @@ export namespace MemberAddressApi {
     name: string;
     mobile: string;
     areaId: number;
-    areaName?: string;
     detailAddress: string;
     defaultStatus: boolean;
   }

apps/web-antd/src/api/member/config/index.ts

@@ -4,7 +4,7 @@ export namespace MemberConfigApi {
   /** 积分设置信息 */
   export interface Config {
     id?: number;
-    pointTradeDeductEnable: boolean;
+    pointTradeDeductEnable: number;
     pointTradeDeductUnitPrice: number;
     pointTradeDeductMaxPrice: number;
     pointTradeGivePoint: number;

apps/web-antd/src/api/member/user/index.ts

@@ -10,31 +10,26 @@ export namespace MemberUserApi {
     birthday?: number;
     createTime?: number;
     loginDate?: number;
-    loginIp?: string;
+    loginIp: string;
-    mark?: string;
+    mark: string;
-    mobile?: string;
+    mobile: string;
-    email?: string;
     name?: string;
     nickname?: string;
-    registerIp?: string;
+    registerIp: string;
-    sex?: number;
+    sex: number;
-    status?: number;
+    status: number;
     areaId?: number;
     areaName?: string;
-    tagIds?: number[];
+    levelName: string;
-    groupId?: number;
+    point?: number;
-    levelId?: number;
+    totalPoint?: number;
-    levelName?: null | string;
+    experience?: number;
-    point?: null | number;
-    totalPoint?: null | number;
-    experience?: null | number;
   }
 
   /** 会员用户等级更新信息 */
   export interface UserUpdateLevelReqVO {
     id: number;
     levelId: number;
-    reason: string;
   }
 
   /** 会员用户积分更新信息 */

apps/web-antd/src/api/mes/cal/calendar/index.ts

@@ -1,27 +0,0 @@
-import { requestClient } from '#/api/request';
-
-export namespace MesCalCalendarApi {
-  /** 排班日历班组排班项 */
-  export interface CalendarTeamShiftItem {
-    teamId?: number; // 班组编号
-    teamName?: string; // 班组名称
-    shiftId?: number; // 班次编号
-    shiftName?: string; // 班次名称
-    sort?: number; // 排序
-  }
-
-  /** 排班日历天 */
-  export interface CalendarDay {
-    day?: string; // 日期
-    shiftType?: number; // 轮班方式
-    teamShifts?: CalendarTeamShiftItem[]; // 班组班次
-  }
-}
-
-/** 查询排班日历列表 */
-export function getCalendarList(params: any) {
-  return requestClient.get<MesCalCalendarApi.CalendarDay[]>(
-    '/mes/cal/calendar/list',
-    { params },
-  );
-}