From 41b2368c2a5ce6f4bf76e1c32e1e60fd84a310b5 Mon Sep 17 00:00:00 2001
From: yeg <1347747024@qq.com>
Date: 星期五, 09 十月 2026 14:17:20 +0800
Subject: [PATCH] 工步页说明工步名称是判定出的方向

---
 src/api/deviceCollectors.ts |   49 +++++--------------------------------------------
 1 files changed, 5 insertions(+), 44 deletions(-)

diff --git a/src/api/deviceCollectors.ts b/src/api/deviceCollectors.ts
index 960697d..be8b245 100644
--- a/src/api/deviceCollectors.ts
+++ b/src/api/deviceCollectors.ts
@@ -1,7 +1,6 @@
 import type {
   CollectorOnlineStatus,
   CollectorStatus,
-  CollectorPayload,
   DeviceCollectorRecord,
 } from '@/stores/deviceCollectors'
 import { request, type ApiResponse } from './request'
@@ -20,6 +19,7 @@
 
 interface CollectorDto {
   collectorId: number
+  adapterId: number | null
   collectorCode: string | null
   collectorName: string | null
   ipAddress: string | null
@@ -43,23 +43,8 @@
   data: CollectorDto
 }
 
-interface DiscoveredCollectorDto {
-  deviceCode: string
-  ip: string
-  mac: string
-  name: string
-  manufacturer: string
-  model: string
-  channelCount: number
-  onlineStatus: CollectorOnlineStatus
-}
-
-interface DiscoveredCollectorListResponse extends ApiResponse {
-  total: number
-  rows: DiscoveredCollectorDto[]
-}
-
 export interface DeviceCollectorInput {
+  adapterId: number | null
   deviceCode: string
   ip: string
   mac: string
@@ -73,6 +58,7 @@
 
 interface CollectorSaveDto {
   collectorId?: number
+  adapterId: number | null
   collectorCode: string
   ipAddress: string
   macAddress: string
@@ -89,17 +75,13 @@
   rows: DeviceCollectorRecord[]
 }
 
-export interface DiscoveredCollectorListResult {
-  total: number
-  rows: CollectorPayload[]
-}
-
 const onlineStatusMap: Record<string, CollectorOnlineStatus> = { '0': '离线', '1': '在线' }
 const statusMap: Record<string, CollectorStatus> = { '0': '启用', '1': '禁用' }
 
 function mapCollector(item: CollectorDto): DeviceCollectorRecord {
   return {
     id: item.collectorId,
+    adapterId: item.adapterId ?? null,
     deviceCode: item.collectorCode || '-',
     ip: item.ipAddress || '-',
     mac: item.macAddress || '-',
@@ -118,6 +100,7 @@
 function toSaveDto(input: DeviceCollectorInput, collectorId?: number): CollectorSaveDto {
   return {
     collectorId,
+    adapterId: input.adapterId,
     collectorCode: input.deviceCode.trim(),
     ipAddress: input.ip.trim(),
     macAddress: input.mac.trim(),
@@ -146,28 +129,6 @@
 export async function getDeviceCollector(collectorId: number): Promise<DeviceCollectorRecord> {
   const result = await request<CollectorDetailResponse>(`/system/collector/${collectorId}`)
   return mapCollector(result.data)
-}
-
-export async function getDiscoveredCollectorList(pageNum: number, pageSize: number): Promise<DiscoveredCollectorListResult> {
-  const result = await request<DiscoveredCollectorListResponse>(
-    `/system/collector/discovered/list?pageNum=${pageNum}&pageSize=${pageSize}`,
-  )
-  return {
-    total: Number(result.total) || 0,
-    rows: (result.rows || []).map(item => ({
-      deviceCode: item.deviceCode,
-      ip: item.ip,
-      mac: item.mac,
-      name: item.name || '',
-      manufacturer: item.manufacturer || '',
-      model: item.model || '',
-      channelCount: item.channelCount || 1,
-      onlineStatus: item.onlineStatus || '离线',
-      relatedTests: [],
-      status: '启用',
-      remark: '',
-    })),
-  }
 }
 
 export function createDeviceCollector(input: DeviceCollectorInput): Promise<ApiResponse> {

--
Gitblit v1.7.1