fix: 统一 9 个 API 文件的泛型类型为 ApiResponse<T> 格式 (49处修复)

This commit is contained in:
chiguyong 2026-04-13 08:50:05 +08:00
parent c2429614fe
commit 367d638f58
8 changed files with 66 additions and 58 deletions

View File

@ -1,4 +1,5 @@
import request from '@/utils/request'
import type { ApiResponse } from '@/types'
// ==================== 设备健康度类型 ====================
@ -66,24 +67,24 @@ const BASE_URL = '/api/asset/equipment-health'
// 获取设备健康度
export function getEquipmentHealth(equipmentId: string) {
return request.get<EquipmentHealth>(`${BASE_URL}/${equipmentId}`)
return request.get<ApiResponse<EquipmentHealth>>(`${BASE_URL}/${equipmentId}`)
}
// 获取健康度历史
export function getHealthHistory(equipmentId: string, days: number = 30) {
return request.get<HealthHistory[]>(`${BASE_URL}/${equipmentId}/history`, {
return request.get<ApiResponse<HealthHistory[]>>(`${BASE_URL}/${equipmentId}/history`, {
params: { days }
})
}
// 计算设备健康度
export function calculateHealth(equipmentId: string) {
return request.post<EquipmentHealth>(`${BASE_URL}/calculate`, { equipmentId })
return request.post<ApiResponse<EquipmentHealth>>(`${BASE_URL}/calculate`, { equipmentId })
}
// 获取故障历史列表
export function getFailureHistory(equipmentId: string) {
return request.get<EquipmentFailure[]>(`${BASE_URL}/failure-history/${equipmentId}`)
return request.get<ApiResponse<EquipmentFailure[]>>(`${BASE_URL}/failure-history/${equipmentId}`)
}
// 记录故障
@ -99,10 +100,10 @@ export function recordFailure(data: {
// 获取 MTBF
export function getEquipmentMTBF(equipmentId: string) {
return request.get<MTBFData>(`${BASE_URL}/mtbf/${equipmentId}`)
return request.get<ApiResponse<MTBFData>>(`${BASE_URL}/mtbf/${equipmentId}`)
}
// 获取 MTTR
export function getEquipmentMTTR(equipmentId: string) {
return request.get<MTTRData>(`${BASE_URL}/mttr/${equipmentId}`)
return request.get<ApiResponse<MTTRData>>(`${BASE_URL}/mttr/${equipmentId}`)
}

View File

@ -1,4 +1,5 @@
import request from '@/utils/request'
import type { ApiResponse } from '@/types'
// ==================== 系统类型枚举8大系统分类===================
export type SystemType =
@ -243,22 +244,22 @@ export interface FireInfo {
// 获取设备列表(按项目)
export function getEquipmentList(projectId: string) {
return request.get<Equipment[]>(`/api/asset/equipment/by-project/${projectId}`)
return request.get<ApiResponse<Equipment[]>>(`/api/asset/equipment/by-project/${projectId}`)
}
// 获取设备详情
export function getEquipmentDetail(id: string) {
return request.get<Equipment>(`/api/asset/equipment/${id}`)
return request.get<ApiResponse<Equipment>>(`/api/asset/equipment/${id}`)
}
// 获取设备(按位置)
export function getEquipmentBySpace(spaceNodeId: string) {
return request.get<Equipment[]>(`/api/asset/equipment/by-space/${spaceNodeId}`)
return request.get<ApiResponse<Equipment[]>>(`/api/asset/equipment/by-space/${spaceNodeId}`)
}
// 获取设备(按类型)
export function getEquipmentByType(projectId: string, type: EquipmentType) {
return request.get<Equipment[]>('/api/asset/equipment/by-type', {
return request.get<ApiResponse<Equipment[]>>('/api/asset/equipment/by-type', {
params: { projectId, type }
})
}
@ -272,7 +273,7 @@ export function getEquipmentByOwnership(projectId: string, ownership: OwnershipT
// 创建设备
export function createEquipment(data: EquipmentForm) {
return request.post<Equipment>('/api/asset/equipment', data)
return request.post<ApiResponse<Equipment>>('/api/asset/equipment', data)
}
// 更新设备
@ -282,19 +283,20 @@ export function updateEquipment(id: string, data: EquipmentForm) {
// 删除设备
export function deleteEquipment(id: string) {
return request.delete<void>(`/api/asset/equipment/${id}`)
return request.delete<ApiResponse<void>>(`/api/asset/equipment/${id}`)
}
// 批量删除设备
export function deleteEquipmentBatch(ids: string[]) {
return request.post<void>(`/api/asset/equipment/batch-delete`, ids)
return request.post<ApiResponse<void>>(`/api/asset/equipment/batch-delete`, ids)
}
// 导入设备
export function importEquipment(file: File, projectId: string) {
const formData = new FormData()
formData.append('file', file)
return request.post<{ successCount: number; failCount: number; failDetails: string[] }>(`/api/asset/equipment/import`, formData, {
formData.append('projectId', projectId)
return request.post<ApiResponse<{ successCount: number; failCount: number; failDetails: string[] }>>(`/api/asset/equipment/import`, formData, {
headers: { 'Content-Type': 'multipart/form-data' }
})
}
@ -311,12 +313,12 @@ export function exportEquipment(projectId: string) {
// 按类型统计设备
export function getEquipmentStatsByType(projectId: string) {
return request.get<EquipmentStatsByType[]>(`/api/asset/equipment/stats/by-type/${projectId}`)
return request.get<ApiResponse<EquipmentStatsByType[]>>(`/api/asset/equipment/stats/by-type/${projectId}`)
}
// 按归属统计设备
export function getEquipmentStatsByOwnership(projectId: string) {
return request.get<EquipmentStatsByOwnership[]>(`/api/asset/equipment/stats/by-ownership/${projectId}`)
return request.get<ApiResponse<EquipmentStatsByOwnership[]>>(`/api/asset/equipment/stats/by-ownership/${projectId}`)
}
// 设备总数统计
@ -328,12 +330,12 @@ export function getEquipmentCountStats(projectId: string) {
// 获取所有归属主体
export function getOwnershipEntityList() {
return request.get<OwnershipEntity[]>('/api/asset/ownership-entity')
return request.get<ApiResponse<OwnershipEntity[]>>('/api/asset/ownership-entity')
}
// 按类型获取归属主体
export function getOwnershipEntityByType(type: OwnershipEntityType) {
return request.get<OwnershipEntity[]>('/api/asset/ownership-entity/by-type', {
return request.get<ApiResponse<OwnershipEntity[]>>('/api/asset/ownership-entity/by-type', {
params: { type }
})
}
@ -342,42 +344,42 @@ export function getOwnershipEntityByType(type: OwnershipEntityType) {
// 获取电梯扩展信息
export function getElevatorInfo(equipmentId: string) {
return request.get<ElevatorInfo>(`/api/asset/equipment/${equipmentId}/elevator`)
return request.get<ApiResponse<ElevatorInfo>>(`/api/asset/equipment/${equipmentId}/elevator`)
}
// 更新电梯扩展信息
export function updateElevatorInfo(equipmentId: string, data: ElevatorInfo) {
return request.put<ElevatorInfo>(`/api/asset/equipment/${equipmentId}/elevator`, data)
return request.put<ApiResponse<ElevatorInfo>>(`/api/asset/equipment/${equipmentId}/elevator`, data)
}
// 获取暖通扩展信息
export function getHvacInfo(equipmentId: string) {
return request.get<HvacInfo>(`/api/asset/equipment/${equipmentId}/hvac`)
return request.get<ApiResponse<HvacInfo>>(`/api/asset/equipment/${equipmentId}/hvac`)
}
// 更新暖通扩展信息
export function updateHvacInfo(equipmentId: string, data: HvacInfo) {
return request.put<HvacInfo>(`/api/asset/equipment/${equipmentId}/hvac`, data)
return request.put<ApiResponse<HvacInfo>>(`/api/asset/equipment/${equipmentId}/hvac`, data)
}
// 获取能源计量扩展信息
export function getEnergyInfo(equipmentId: string) {
return request.get<EnergyInfo>(`/api/asset/equipment/${equipmentId}/energy`)
return request.get<ApiResponse<EnergyInfo>>(`/api/asset/equipment/${equipmentId}/energy`)
}
// 更新能源计量扩展信息
export function updateEnergyInfo(equipmentId: string, data: EnergyInfo) {
return request.put<EnergyInfo>(`/api/asset/equipment/${equipmentId}/energy`, data)
return request.put<ApiResponse<EnergyInfo>>(`/api/asset/equipment/${equipmentId}/energy`, data)
}
// 获取消防扩展信息
export function getFireInfo(equipmentId: string) {
return request.get<FireInfo>(`/api/asset/equipment/${equipmentId}/fire`)
return request.get<ApiResponse<FireInfo>>(`/api/asset/equipment/${equipmentId}/fire`)
}
// 更新消防扩展信息
export function updateFireInfo(equipmentId: string, data: FireInfo) {
return request.put<FireInfo>(`/api/asset/equipment/${equipmentId}/fire`, data)
return request.put<ApiResponse<FireInfo>>(`/api/asset/equipment/${equipmentId}/fire`, data)
}
// ==================== 设备类型映射 ====================

View File

@ -1,4 +1,5 @@
import request from '@/utils/request'
import type { ApiResponse } from '@/types'
// ==================== 巡检标准项类型 ====================
export interface InspectionItem {
@ -29,22 +30,22 @@ export interface InspectionItemForm {
// 获取巡检标准项列表
export function getInspectionItems() {
return request.get<InspectionItem[]>('/api/mdm/inspection-items')
return request.get<ApiResponse<InspectionItem[]>>('/api/mdm/inspection-items')
}
// 创建巡检标准项
export function createInspectionItem(data: InspectionItemForm) {
return request.post<InspectionItem>('/api/mdm/inspection-items', data)
return request.post<ApiResponse<InspectionItem>>('/api/mdm/inspection-items', data)
}
// 更新巡检标准项
export function updateInspectionItem(id: string, data: InspectionItemForm) {
return request.put<InspectionItem>(`/api/mdm/inspection-items/${id}`, data)
return request.put<ApiResponse<InspectionItem>>(`/api/mdm/inspection-items/${id}`, data)
}
// 删除巡检标准项
export function deleteInspectionItem(id: string) {
return request.delete<void>(`/api/mdm/inspection-items/${id}`)
return request.delete<ApiResponse<void>>(`/api/mdm/inspection-items/${id}`)
}
// ==================== 设备类型和系统类型选项 ====================

View File

@ -1,4 +1,5 @@
import request from '@/utils/request'
import type { ApiResponse } from '@/types'
// ==================== 巡检记录类型 ====================
export type InspectionStatus = 'NORMAL' | 'WARNING' | 'ABNORMAL'
@ -47,24 +48,24 @@ export interface InspectionRecordForm {
// 获取巡检记录列表
export function getInspectionRecords(projectId: string, equipmentId?: string) {
return request.get<InspectionRecord[]>('/api/mdm/inspection-records', {
return request.get<ApiResponse<InspectionRecord[]>>('/api/mdm/inspection-records', {
params: { projectId, equipmentId }
})
}
// 获取巡检记录详情
export function getInspectionRecord(id: string) {
return request.get<InspectionRecord>(`/api/mdm/inspection-records/${id}`)
return request.get<ApiResponse<InspectionRecord>>(`/api/mdm/inspection-records/${id}`)
}
// 创建巡检记录
export function createInspectionRecord(data: InspectionRecordForm) {
return request.post<InspectionRecord>('/api/mdm/inspection-records', data)
return request.post<ApiResponse<InspectionRecord>>('/api/mdm/inspection-records', data)
}
// 更新巡检记录
export function updateInspectionRecord(id: string, data: InspectionRecordForm) {
return request.put<InspectionRecord>(`/api/mdm/inspection-records/${id}`, data)
return request.put<ApiResponse<InspectionRecord>>(`/api/mdm/inspection-records/${id}`, data)
}
// 完成巡检

View File

@ -1,4 +1,5 @@
import request from '@/utils/request'
import type { ApiResponse } from '@/types'
// ==================== 维保计划类型 ====================
export type PlanType = 'PREVENTIVE' | 'CORRECTIVE'
@ -37,29 +38,29 @@ export interface MaintenancePlanForm {
// 获取维保计划列表
export function getMaintenancePlans(projectId: string) {
return request.get<MaintenancePlan[]>(`/api/mdm/maintenance-plans`, {
return request.get<ApiResponse<MaintenancePlan[]>>(`/api/mdm/maintenance-plans`, {
params: { projectId }
})
}
// 获取维保计划详情
export function getMaintenancePlan(id: string) {
return request.get<MaintenancePlan>(`/api/mdm/maintenance-plans/${id}`)
return request.get<ApiResponse<MaintenancePlan>>(`/api/mdm/maintenance-plans/${id}`)
}
// 创建维保计划
export function createMaintenancePlan(data: MaintenancePlanForm) {
return request.post<MaintenancePlan>('/api/mdm/maintenance-plans', data)
return request.post<ApiResponse<MaintenancePlan>>('/api/mdm/maintenance-plans', data)
}
// 更新维保计划
export function updateMaintenancePlan(id: string, data: MaintenancePlanForm) {
return request.put<MaintenancePlan>(`/api/mdm/maintenance-plans/${id}`, data)
return request.put<ApiResponse<MaintenancePlan>>(`/api/mdm/maintenance-plans/${id}`, data)
}
// 删除维保计划
export function deleteMaintenancePlan(id: string) {
return request.delete<void>(`/api/mdm/maintenance-plans/${id}`)
return request.delete<ApiResponse<void>>(`/api/mdm/maintenance-plans/${id}`)
}
// ==================== 常量选项 ====================

View File

@ -1,4 +1,5 @@
import request from '@/utils/request'
import type { ApiResponse } from '@/types'
// ==================== 维保工单类型 ====================
export type TaskType = 'PREVENTIVE' | 'CORRECTIVE' | 'EMERGENCY'
@ -90,36 +91,36 @@ export interface VerifyTaskData {
// 获取维保工单列表
export function getMaintenanceTasks(projectId?: string) {
return request.get<MaintenanceTask[]>(`/api/ops/maintenance-tasks`, {
return request.get<ApiResponse<MaintenanceTask[]>>(`/api/ops/maintenance-tasks`, {
params: { projectId }
})
}
// 根据状态获取维保工单列表
export function getMaintenanceTasksByStatus(status: TaskStatus) {
return request.get<MaintenanceTask[]>(`/api/ops/maintenance-tasks`, {
return request.get<ApiResponse<MaintenanceTask[]>>(`/api/ops/maintenance-tasks`, {
params: { status }
})
}
// 获取维保工单详情
export function getMaintenanceTask(id: string) {
return request.get<MaintenanceTask>(`/api/ops/maintenance-tasks/${id}`)
return request.get<ApiResponse<MaintenanceTask>>(`/api/ops/maintenance-tasks/${id}`)
}
// 创建维保工单
export function createMaintenanceTask(data: MaintenanceTaskForm) {
return request.post<MaintenanceTask>('/api/ops/maintenance-tasks', data)
return request.post<ApiResponse<MaintenanceTask>>('/api/ops/maintenance-tasks', data)
}
// 更新维保工单
export function updateMaintenanceTask(id: string, data: Partial<MaintenanceTaskForm>) {
return request.put<MaintenanceTask>(`/api/ops/maintenance-tasks/${id}`, data)
return request.put<ApiResponse<MaintenanceTask>>(`/api/ops/maintenance-tasks/${id}`, data)
}
// 删除维保工单
export function deleteMaintenanceTask(id: string) {
return request.delete<void>(`/api/ops/maintenance-tasks/${id}`)
return request.delete<ApiResponse<void>>(`/api/ops/maintenance-tasks/${id}`)
}
// 状态流转 API

View File

@ -1,19 +1,19 @@
import request from '@/utils/request'
import type { User } from '@/types'
import type { User, ApiResponse, PageResponse } from '@/types'
// 获取企业员工列表(用于项目管理添加成员)
export const getEnterpriseUsers = (params?: { keyword?: string }) => {
return request.get<{ code: number; message: string; data: User[] }>('/api/auth/users/enterprise', { params })
return request.get<ApiResponse<User[]>>('/api/auth/users/enterprise', { params })
}
// 获取项目成员列表
export const getProjectMembers = (projectId: string, params?: { page?: number; size?: number }) => {
return request.get<{ code: number; message: string; data: { content: User[]; total: number } }>(`/api/auth/projects/${projectId}/members`, { params })
return request.get<ApiResponse<PageResponse<User>>>(`/api/auth/projects/${projectId}/members`, { params })
}
// 获取可添加的成员列表(排除已添加的)
export const getAvailableMembers = (projectId: string) => {
return request.get<{ code: number; message: string; data: User[] }>(`/api/auth/projects/${projectId}/available-members`)
return request.get<ApiResponse<User[]>>(`/api/auth/projects/${projectId}/available-members`)
}
// 添加项目成员
@ -28,7 +28,7 @@ export const removeProjectMember = (projectId: string, userId: string) => {
// 获取部门树
export const getDeptTree = () => {
return request.get<{ code: number; message: string; data: DeptTreeNode[] }>('/api/auth/depts/tree')
return request.get<ApiResponse<DeptTreeNode[]>>('/api/auth/depts/tree')
}
// 创建部门
@ -38,7 +38,7 @@ export const createDept = (data: { deptName: string; deptCode?: string; parentId
// 获取部门成员
export const getDeptMembers = (deptId: string) => {
return request.get<{ code: number; message: string; data: User[] }>(`/api/auth/depts/${deptId}/members`)
return request.get<ApiResponse<User[]>>(`/api/auth/depts/${deptId}/members`)
}
export interface DeptTreeNode {

View File

@ -1,4 +1,5 @@
import request from '@/utils/request'
import type { ApiResponse } from '@/types'
// ==================== 工单类型 ====================
export type WorkOrderSource = 'OWNER' | 'MAINTENANCE' | 'INSPECTION' | 'FAULT' | 'REGULATORY' | 'MANUAL'
@ -88,23 +89,23 @@ export function getWorkOrders(params?: {
status?: WorkOrderStatus
assignedTo?: string
}) {
return request.get<WorkOrder[]>('/api/wo/work-orders', { params })
return request.get<ApiResponse<WorkOrder[]>>('/api/wo/work-orders', { params })
}
export function getWorkOrder(id: string) {
return request.get<WorkOrder>(`/api/wo/work-orders/${id}`)
return request.get<ApiResponse<WorkOrder>>(`/api/wo/work-orders/${id}`)
}
export function createWorkOrder(data: Partial<WorkOrder>) {
return request.post<WorkOrder>('/api/wo/work-orders', data)
return request.post<ApiResponse<WorkOrder>>('/api/wo/work-orders', data)
}
export function updateWorkOrder(id: string, data: Partial<WorkOrder>) {
return request.put<WorkOrder>(`/api/wo/work-orders/${id}`, data)
return request.put<ApiResponse<WorkOrder>>(`/api/wo/work-orders/${id}`, data)
}
export function deleteWorkOrder(id: string) {
return request.delete<void>(`/api/wo/work-orders/${id}`)
return request.delete<ApiResponse<void>>(`/api/wo/work-orders/${id}`)
}
export function assignWorkOrder(id: string, data: { assignedTo: string; assignedVendor?: string; assignedDate?: string }) {
@ -128,11 +129,11 @@ export function cancelWorkOrder(id: string) {
}
export function getWorkOrderStats() {
return request.get<WorkOrderStats>('/api/wo/work-orders/stats')
return request.get<ApiResponse<WorkOrderStats>>('/api/wo/work-orders/stats')
}
export function getWorkOrderItems(workOrderId: string) {
return request.get<WorkOrderItem[]>(`/api/wo/work-orders/${workOrderId}/items`)
return request.get<ApiResponse<WorkOrderItem[]>>(`/api/wo/work-orders/${workOrderId}/items`)
}
export function addWorkOrderItems(workOrderId: string, items: WorkOrderItem[]) {