OTA管理界面

This commit is contained in:
mmc
2026-10-08 08:55:36 +08:00
parent 52b04105c4
commit 0bc900cb5b
4 changed files with 580 additions and 297 deletions

View File

@@ -1,184 +1,148 @@
// OTA 管理 Mock API 层
// 后端接口就绪后,把每个函数内部的 setTimeout + 内存数据替换为 request 调用即可,页面无需改动。
// 真实接口建议:
// GET /iot/ota/machines → getMachineVersionList
// GET /iot/ota/firmwares → getFirmwarePackageList
// POST /iot/ota/firmwares/upload (multipart) → uploadFirmwarePackage
// POST /iot/ota/upgrade → upgradeMachines
// POST /iot/ota/rollback → rollbackMachines
// DELETE /iot/ota/firmwares/{id} → deleteFirmwarePackage
// OTA 管理 API 层
// 后端接口:
// POST /iot/deviceOta/firmware/save → uploadFirmwarePackage
// GET /iot/deviceOta/firmware/list → getFirmwarePackageList
// GET /iot/deviceOta/firmware/detail → getFirmwareDetail (deviceType)
// POST /iot/deviceOta/firmware/upgrade → operateFirmware (upgrade/rollback/reboot)
// POST /iot/deviceOta/firmware/delete → deleteFirmwarePackage (id)
// GET /iot/deviceOta/record/detail → getRecordDetail (id)
// GET /iot/deviceOta/record/selectByDeviceId → getRecordByDeviceId (deviceId)
// POST /iot/deviceOta/record/select → getRecords (ids)
export interface MachineVersion {
id: number;
code: string;
name: string;
type: string;
online: 'ONLINE' | 'OFFLINE';
currentVersion: string;
previousVersion: string | null;
lastUpgradeTime: string | null;
status: 'IDLE' | 'UPGRADING' | 'FAILED' | 'SUCCESS';
}
import request from './request';
// ====== 类型定义 ======
export type OtaOperateType = 'upload' | 'upgrade' | 'rollback' | 'reboot';
export interface FirmwarePackage {
id: number;
version: string;
fileName: string;
fileSize: number;
description?: string;
uploadTime: string;
id: number | string;
version: string; // 版本号
fileName: string; // 文件名
fileType?: string; // 服务端文件类型
md5?: string; // md5 校验
fileSize?: number; // 文件大小(bytes)
description?: string; // 描述
uploadTime?: string; // 上传时间
deviceType?: string; // 设备类型
}
interface ApiResponse<T> {
code: number;
msg: string;
data: T;
export interface MachineVersion {
id: number | string;
code: string; // 设备编号/SN
name: string; // 设备名称
type: string; // 设备类型
online: 'ONLINE' | 'OFFLINE';
currentVersion: string; // 当前固件版本
previousVersion: string | null;
lastUpgradeTime: string | null;
status: 'IDLE' | 'UPGRADING' | 'FAILED' | 'SUCCESS';
}
function mockResponse<T>(data: T, delay = 300): Promise<ApiResponse<T>> {
return new Promise(resolve => {
setTimeout(() => resolve({ code: 200, msg: 'ok', data }), delay);
});
export interface OtaRecord {
id: number | string;
deviceId?: string;
deviceName?: string;
firmwareId?: number | string;
operateType?: OtaOperateType | string;
fromVersion?: string;
toVersion?: string;
status?: string;
createTime?: string;
finishTime?: string;
message?: string;
}
// ====== 模块级内存数据(刷新即重置) ======
let firmwareIdSeed = 100;
const firmwareStore: FirmwarePackage[] = [
{
id: firmwareIdSeed++,
version: 'v1.0.0',
fileName: 'firmware-v1.0.0.bin',
fileSize: 2_359_296,
description: '初始正式版本',
uploadTime: '2026-08-12 10:23:45',
},
{
id: firmwareIdSeed++,
version: 'v1.1.0',
fileName: 'firmware-v1.1.0.zip',
fileSize: 3_145_728,
description: '新增路径规划算法优化',
uploadTime: '2026-09-05 14:50:12',
},
];
const machineStore: MachineVersion[] = [
{ id: 1, code: 'ROBOT-01', name: '运维机器人 ROBOT-01', type: 'ROBOT', online: 'ONLINE', currentVersion: 'v1.1.0', previousVersion: 'v1.0.0', lastUpgradeTime: '2026-09-06 09:12:33', status: 'SUCCESS' },
{ id: 2, code: 'ROBOT-02', name: '运维机器人 ROBOT-02', type: 'ROBOT', online: 'ONLINE', currentVersion: 'v1.1.0', previousVersion: 'v1.0.0', lastUpgradeTime: '2026-09-06 09:15:10', status: 'SUCCESS' },
{ id: 3, code: 'ROBOT-03', name: '运维机器人 ROBOT-03', type: 'ROBOT', online: 'OFFLINE', currentVersion: 'v1.0.0', previousVersion: null, lastUpgradeTime: null, status: 'IDLE' },
{ id: 4, code: 'DRONE-01', name: '无人机 DRONE-01', type: 'DRONE', online: 'ONLINE', currentVersion: 'v1.1.0', previousVersion: 'v1.0.0', lastUpgradeTime: '2026-09-07 11:08:21', status: 'SUCCESS' },
{ id: 5, code: 'DRONE-02', name: '无人机 DRONE-02', type: 'DRONE', online: 'ONLINE', currentVersion: 'v1.0.0', previousVersion: null, lastUpgradeTime: null, status: 'IDLE' },
{ id: 6, code: 'CAM-01', name: '摄像头 CAM-01', type: 'CAMERA', online: 'ONLINE', currentVersion: 'v1.1.0', previousVersion: 'v1.0.0', lastUpgradeTime: '2026-09-08 16:42:50', status: 'SUCCESS' },
{ id: 7, code: 'CAM-02', name: '摄像头 CAM-02', type: 'CAMERA', online: 'OFFLINE', currentVersion: 'v1.0.0', previousVersion: null, lastUpgradeTime: null, status: 'IDLE' },
{ id: 8, code: 'CLEAN-01', name: '清扫机器人 CLEAN-01', type: 'CLEANING_DEVICE', online: 'ONLINE', currentVersion: 'v1.1.0', previousVersion: 'v1.0.0', lastUpgradeTime: '2026-09-09 08:30:00', status: 'FAILED' },
{ id: 9, code: 'WEATHER-01', name: '气象站 WEATHER-01', type: 'WEATHER_STATION', online: 'ONLINE', currentVersion: 'v1.0.0', previousVersion: null, lastUpgradeTime: null, status: 'IDLE' },
{ id: 10, code: 'INV-A01', name: '逆变器 INV-A01', type: 'INVERTER', online: 'ONLINE', currentVersion: 'v1.1.0', previousVersion: 'v1.0.0', lastUpgradeTime: '2026-09-10 10:15:22', status: 'SUCCESS' },
];
function nowStr(): string {
const d = new Date();
const pad = (n: number) => String(n).padStart(2, '0');
return `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())} ${pad(d.getHours())}:${pad(d.getMinutes())}:${pad(d.getSeconds())}`;
interface ApiResponse<T = any> {
code: number;
msg: string;
data: T;
rows?: T[];
total?: number;
}
// ====== 导出 Mock API 函数 ======
// ====== 固件包相关 ======
export function getMachineVersionList(): Promise<ApiResponse<MachineVersion[]>> {
return mockResponse([...machineStore]);
/** 上传固件包 (multipart/form-data),直接接收已构建好的 FormData */
export function uploadFirmwarePackage(formData: FormData) {
return request({
url: '/iot/deviceOta/firmware/save',
method: 'post',
data: formData,
headers: { 'Content-Type': 'multipart/form-data' },
}) as Promise<ApiResponse<FirmwarePackage>>;
}
export function getFirmwarePackageList(): Promise<ApiResponse<FirmwarePackage[]>> {
return mockResponse([...firmwareStore]);
/** 获取固件包列表 */
export function getFirmwarePackageList(params?: { deviceType?: string }) {
return request({
url: '/iot/deviceOta/firmware/list',
method: 'post',
params,
}) as Promise<ApiResponse<FirmwarePackage[]>>;
}
export function uploadFirmwarePackage(params: {
file: File;
version: string;
description?: string;
}): Promise<ApiResponse<FirmwarePackage>> {
const pkg: FirmwarePackage = {
id: firmwareIdSeed++,
version: params.version,
fileName: params.file.name,
fileSize: params.file.size,
description: params.description || '',
uploadTime: nowStr(),
};
firmwareStore.unshift(pkg);
return mockResponse(pkg, 500);
/** 根据设备类型查询固件详情 */
export function getFirmwareDetail(deviceType: string) {
return request({
url: '/iot/deviceOta/firmware/detail',
method: 'get',
params: { deviceType },
}) as Promise<ApiResponse<FirmwarePackage>>;
}
export function deleteFirmwarePackage(id: number): Promise<ApiResponse<null>> {
const idx = firmwareStore.findIndex(p => p.id === id);
if (idx >= 0) firmwareStore.splice(idx, 1);
return mockResponse(null, 200);
/** 删除固件包 */
export function deleteFirmwarePackage(ids: number[] | string[]) {
return request({
url: '/iot/deviceOta/firmware/delete',
method: 'post',
data: ids
}) as Promise<ApiResponse<null>>;
}
export function upgradeMachines(params: {
machineIds: number[];
targetVersion: string;
}): Promise<ApiResponse<{ upgraded: number[]; skipped: number[] }>> {
const upgraded: number[] = [];
const skipped: number[] = [];
const time = nowStr();
params.machineIds.forEach(id => {
const m = machineStore.find(x => x.id === id);
if (!m) {
skipped.push(id);
return;
}
if (m.currentVersion === params.targetVersion) {
// 目标版本与当前版本一致,跳过
skipped.push(id);
return;
}
m.previousVersion = m.currentVersion;
m.currentVersion = params.targetVersion;
m.lastUpgradeTime = time;
m.status = 'UPGRADING';
upgraded.push(id);
});
// 模拟升级完成
setTimeout(() => {
upgraded.forEach(id => {
const m = machineStore.find(x => x.id === id);
if (m) m.status = 'SUCCESS';
});
}, 1500);
return mockResponse({ upgraded, skipped }, 600);
// ====== 设备升级操作 ======
/**
* 批量操作设备固件(升级 / 回退 / 重启)
* operateType: upgrade-升级, rollback-回退, reboot-重启
*/
export function operateFirmware(params: {
operateType: OtaOperateType;
deviceIds: (string | number)[];
firmwareId?: string | number;
}) {
return request({
url: '/iot/deviceOta/firmware/upgrade',
method: 'post',
data: params,
}) as Promise<ApiResponse<{ upgraded?: (string | number)[]; skipped?: (string | number)[] }>>;
}
export function rollbackMachines(params: {
machineIds: number[];
}): Promise<ApiResponse<{ rolledBack: number[]; skipped: number[]; skippedNames: string[] }>> {
const rolledBack: number[] = [];
const skipped: number[] = [];
const skippedNames: string[] = [];
const time = nowStr();
params.machineIds.forEach(id => {
const m = machineStore.find(x => x.id === id);
if (!m) {
skipped.push(id);
return;
}
if (!m.previousVersion) {
skipped.push(id);
skippedNames.push(m.name);
return;
}
const prev = m.previousVersion;
m.previousVersion = m.currentVersion;
m.currentVersion = prev;
m.lastUpgradeTime = time;
m.status = 'UPGRADING';
rolledBack.push(id);
});
setTimeout(() => {
rolledBack.forEach(id => {
const m = machineStore.find(x => x.id === id);
if (m) m.status = 'SUCCESS';
});
}, 1500);
return mockResponse({ rolledBack, skipped, skippedNames }, 600);
// ====== 操作记录相关 ======
/** 根据记录 id 查询操作记录详情 */
export function getRecordDetail(id: number | string) {
return request({
url: '/iot/deviceOta/record/detail',
method: 'get',
params: { id },
}) as Promise<ApiResponse<OtaRecord>>;
}
/** 根据设备 id 查询升级记录 */
export function getRecordByDeviceId(deviceId: string | number) {
return request({
url: '/iot/deviceOta/record/selectListByDeviceId',
method: 'get',
params: { deviceId },
}) as Promise<ApiResponse<OtaRecord[]>>;
}
/** 根据记录 id 列表批量查询操作记录 */
export function getRecords(ids: (string | number)[]) {
return request({
url: '/iot/deviceOta/record/select',
method: 'post',
data: ids,
}) as Promise<ApiResponse<OtaRecord[]>>;
}

View File

@@ -1,5 +1,7 @@
import React, { useState, useEffect, useMemo } from 'react';
import React, { useState, useEffect } from 'react';
import { useTranslation } from 'react-i18next';
import { useSelector } from 'react-redux';
import { RootState } from '@/src/store';
import {
Typography,
Card,
@@ -15,6 +17,7 @@ import {
Select,
Popconfirm,
Tooltip,
Empty,
} from 'antd';
import {
UploadOutlined,
@@ -23,35 +26,64 @@ import {
ArrowDownOutlined,
DeleteOutlined,
InboxOutlined,
RestOutlined,
HistoryOutlined,
} from '@ant-design/icons';
import type { UploadProps } from 'antd';
import type { ColumnsType } from 'antd/es/table';
import {
getMachineVersionList,
getFirmwarePackageList,
uploadFirmwarePackage,
deleteFirmwarePackage,
upgradeMachines,
rollbackMachines,
operateFirmware,
getRecordByDeviceId,
type MachineVersion,
type FirmwarePackage,
type OtaRecord,
type OtaOperateType,
} from '@/api/ota';
import { getAllDevice } from '@/api/device';
const { Title, Text } = Typography;
const { TextArea } = Input;
const VERSION_PATTERN = /^v\d+\.\d+\.\d+$/;
function formatFileSize(bytes: number): string {
function formatFileSize(bytes?: number): string {
if (!bytes && bytes !== 0) return '—';
if (bytes < 1024) return `${bytes} B`;
if (bytes < 1024 * 1024) return `${(bytes / 1024).toFixed(1)} KB`;
return `${(bytes / 1024 / 1024).toFixed(2)} MB`;
}
/** 把后端设备对象映射为页面使用的 MachineVersion */
function mapDeviceToMachine(d: any): MachineVersion {
const online = d.onlineStatus === 'ONLINE' || d.onlineStatus === 1;
const rawVer = d.firmwareVersion != null ? String(d.firmwareVersion) : '';
const currentVersion = rawVer
? rawVer.startsWith('v') || rawVer.startsWith('V')
? rawVer
: `v${rawVer}`
: '';
return {
id: d.id ?? d.serialNumber,
code: d.serialNumber || d.device_sn || '',
name: d.deviceAlias || d.deviceName || d.serialNumber || '',
type: d.productName || d.deviceType || '',
online: online ? 'ONLINE' : 'OFFLINE',
currentVersion,
previousVersion: null,
lastUpgradeTime: null,
status: 'IDLE',
};
}
export default function OTAManagement() {
const { t } = useTranslation();
const { modal, message } = App.useApp();
const [uploadForm] = Form.useForm();
const { userInfo } = useSelector((state: RootState) => state.user);
const { stationId, currentStation } = useSelector((state: RootState) => state.station);
const [machineList, setMachineList] = useState<MachineVersion[]>([]);
const [firmwareList, setFirmwareList] = useState<FirmwarePackage[]>([]);
@@ -59,13 +91,31 @@ export default function OTAManagement() {
const [loadingFirmwares, setLoadingFirmwares] = useState(false);
const [submitting, setSubmitting] = useState(false);
const [selectedMachineIds, setSelectedMachineIds] = useState<React.Key[]>([]);
const [selectedFirmwareIds, setSelectedFirmwareIds] = useState<React.Key[]>([]);
const [pendingFile, setPendingFile] = useState<File | null>(null);
// 操作记录弹窗
const [recordModalOpen, setRecordModalOpen] = useState(false);
const [recordLoading, setRecordLoading] = useState(false);
const [recordList, setRecordList] = useState<OtaRecord[]>([]);
const [currentRecordDevice, setCurrentRecordDevice] = useState<MachineVersion | null>(null);
const fetchMachines = async () => {
setLoadingMachines(true);
try {
const res = await getMachineVersionList();
if (res.code === 200) setMachineList(res.data);
const params: any = {
pageNum: 1,
pageSize: 9999,
orgId: currentStation?.orgId || '',
siteId: stationId
};
const res: any = await getAllDevice(params);
if (res?.code === 200) {
const rows: any[] = res.rows || res.data || [];
setMachineList(rows.map(mapDeviceToMachine));
}
} catch (err) {
console.error('获取设备列表失败', err);
} finally {
setLoadingMachines(false);
}
@@ -75,7 +125,12 @@ export default function OTAManagement() {
setLoadingFirmwares(true);
try {
const res = await getFirmwarePackageList();
if (res.code === 200) setFirmwareList(res.data);
if (res?.code === 200) {
const list = res.data || res.rows || [];
setFirmwareList(Array.isArray(list) ? list : []);
}
} catch (err) {
console.error('获取固件列表失败', err);
} finally {
setLoadingFirmwares(false);
}
@@ -94,7 +149,7 @@ export default function OTAManagement() {
const hasSelection = selectedMachineIds.length > 0;
// ====== 上传 ======
// ====== 上传固件 ======
const uploadProps: UploadProps = {
accept: '.bin,.zip',
@@ -106,12 +161,12 @@ export default function OTAManagement() {
return Upload.LIST_IGNORE;
}
setPendingFile(file);
return false; // 阻止自动上传
return false;
},
onRemove: () => {
setPendingFile(null);
},
file: pendingFile ? [pendingFile as any] : [],
fileList: pendingFile ? [{ uid: '-1', name: pendingFile.name, status: 'done' as const, originFileObj: pendingFile }] : [],
};
const handleUploadSubmit = async () => {
@@ -122,12 +177,27 @@ export default function OTAManagement() {
return;
}
setSubmitting(true);
const res = await uploadFirmwarePackage({
file: pendingFile,
const formData = new FormData();
formData.append('file', pendingFile);
const workRecord = {
version: values.version,
description: values.description,
});
if (res.code === 200) {
fileName: pendingFile.name,
fileUrl: '',
deviceType: ''
};
formData.append(
"firmware",
new Blob([JSON.stringify(workRecord)], {
type: "application/json"
})
);
const res = await uploadFirmwarePackage(formData);
if (res?.code === 200) {
message.success(t('systemSetting.ota.uploadSuccess'));
uploadForm.resetFields();
setPendingFile(null);
@@ -141,12 +211,43 @@ export default function OTAManagement() {
};
const handleDeleteFirmware = async (record: FirmwarePackage) => {
await deleteFirmwarePackage(record.id);
message.success(t('common.deleteSuccess'));
fetchFirmwares();
try {
const res = await deleteFirmwarePackage([record.id]);
if (res?.code === 200) {
message.success(t('common.deleteSuccess'));
fetchFirmwares();
}
} catch (err) {
console.error(err);
}
};
// ====== 升级 ======
const handleBatchDeleteFirmware = async () => {
try {
const res = await deleteFirmwarePackage(selectedFirmwareIds as (string | number)[]);
if (res?.code === 200) {
message.success(t('common.deleteSuccess'));
setSelectedFirmwareIds([]);
fetchFirmwares();
}
} catch (err) {
console.error(err);
}
};
// ====== 升级 / 回退 / 重启 ======
const handleOperate = (
operateType: OtaOperateType,
deviceModels: (string | number)[],
firmwareId?: string | number,
) => {
return operateFirmware({
operateType,
deviceModels,
firmwareId,
});
};
const showUpgradeModal = () => {
if (!hasSelection) {
@@ -158,19 +259,19 @@ export default function OTAManagement() {
return;
}
let selectedVersion = firmwareList[0].version;
let selectedFirmwareId: string | number = firmwareList[0].id;
const content = (
<Form layout="vertical">
<Form.Item label={t('systemSetting.ota.selectTargetVersion')} required>
<Select
options={firmwareList.map(f => ({ label: `${f.version} (${f.fileName})`, value: f.version }))}
defaultValue={selectedVersion}
onChange={(v) => (selectedVersion = v)}
options={firmwareList.map(f => ({ label: `${f.version} (${f.fileName})`, value: f.id }))}
defaultValue={selectedFirmwareId}
onChange={(v) => (selectedFirmwareId = v)}
style={{ width: '100%' }}
/>
</Form.Item>
<Text type="secondary" style={{ fontSize: 12 }}>
{t('systemSetting.ota.confirmUpgrade', { count: selectedMachineIds.length, version: '—' })}
{t('systemSetting.ota.confirmUpgrade', { count: selectedMachineIds.length, version: firmwareList.find(f => f.id === selectedFirmwareId)?.version || '' })}
</Text>
</Form>
);
@@ -183,16 +284,11 @@ export default function OTAManagement() {
onOk: async () => {
setSubmitting(true);
try {
const res = await upgradeMachines({
machineIds: selectedMachineIds as number[],
targetVersion: selectedVersion,
});
if (res.code === 200) {
const res = await handleOperate('upgrade', selectedMachineIds as (string | number)[], selectedFirmwareId);
if (res?.code === 200) {
message.success(t('systemSetting.ota.upgradeSuccess'));
setSelectedMachineIds([]);
// 立即刷新一次显示 UPGRADING 状态,再延迟刷新为 SUCCESS
fetchMachines();
setTimeout(fetchMachines, 1800);
}
} finally {
setSubmitting(false);
@@ -206,16 +302,16 @@ export default function OTAManagement() {
message.warning(t('systemSetting.ota.noFirmware'));
return;
}
let selectedVersion = firmwareList[0].version;
let selectedFirmwareId: string | number = firmwareList[0].id;
modal.confirm({
title: t('systemSetting.ota.batchUpgrade'),
content: (
<Form layout="vertical">
<Form.Item label={t('systemSetting.ota.selectTargetVersion')} required>
<Select
options={firmwareList.map(f => ({ label: `${f.version} (${f.fileName})`, value: f.version }))}
defaultValue={selectedVersion}
onChange={(v) => (selectedVersion = v)}
options={firmwareList.map(f => ({ label: `${f.version} (${f.fileName})`, value: f.id }))}
defaultValue={selectedFirmwareId}
onChange={(v) => (selectedFirmwareId = v)}
style={{ width: '100%' }}
/>
</Form.Item>
@@ -226,14 +322,10 @@ export default function OTAManagement() {
onOk: async () => {
setSubmitting(true);
try {
const res = await upgradeMachines({
machineIds: [record.id],
targetVersion: selectedVersion,
});
if (res.code === 200) {
const res = await handleOperate('upgrade', [record.id], selectedFirmwareId);
if (res?.code === 200) {
message.success(t('systemSetting.ota.upgradeSuccess'));
fetchMachines();
setTimeout(fetchMachines, 1800);
}
} finally {
setSubmitting(false);
@@ -242,8 +334,6 @@ export default function OTAManagement() {
});
};
// ====== 回退 ======
const handleBatchRollback = () => {
if (!hasSelection) {
message.warning(t('systemSetting.ota.noSelection'));
@@ -257,21 +347,11 @@ export default function OTAManagement() {
onOk: async () => {
setSubmitting(true);
try {
const res = await rollbackMachines({ machineIds: selectedMachineIds as number[] });
if (res.code === 200) {
if (res.data.skippedNames.length > 0) {
message.warning(
res.data.skippedNames
.map(n => t('systemSetting.ota.noPreviousVersion', { name: n }))
.join(';')
);
}
if (res.data.rolledBack.length > 0) {
message.success(t('systemSetting.ota.rollbackSuccess'));
}
const res = await handleOperate('rollback', selectedMachineIds as (string | number)[]);
if (res?.code === 200) {
message.success(t('systemSetting.ota.rollbackSuccess'));
setSelectedMachineIds([]);
fetchMachines();
setTimeout(fetchMachines, 1800);
}
} finally {
setSubmitting(false);
@@ -281,10 +361,6 @@ export default function OTAManagement() {
};
const handleSingleRollback = (record: MachineVersion) => {
if (!record.previousVersion) {
message.warning(t('systemSetting.ota.noPreviousVersion', { name: record.name }));
return;
}
modal.confirm({
title: t('systemSetting.ota.batchRollback'),
content: t('systemSetting.ota.confirmRollback', { count: 1 }),
@@ -293,13 +369,10 @@ export default function OTAManagement() {
onOk: async () => {
setSubmitting(true);
try {
const res = await rollbackMachines({ machineIds: [record.id] });
if (res.code === 200) {
if (res.data.rolledBack.length > 0) {
message.success(t('systemSetting.ota.rollbackSuccess'));
}
const res = await handleOperate('rollback', [record.id]);
if (res?.code === 200) {
message.success(t('systemSetting.ota.rollbackSuccess'));
fetchMachines();
setTimeout(fetchMachines, 1800);
}
} finally {
setSubmitting(false);
@@ -308,6 +381,90 @@ export default function OTAManagement() {
});
};
const handleBatchReboot = () => {
if (!hasSelection) {
message.warning(t('systemSetting.ota.noSelection'));
return;
}
modal.confirm({
title: t('systemSetting.ota.batchReboot'),
content: t('systemSetting.ota.confirmReboot', { count: selectedMachineIds.length }),
okText: t('common.confirm'),
cancelText: t('common.cancel'),
onOk: async () => {
setSubmitting(true);
try {
const res = await handleOperate('reboot', selectedMachineIds as (string | number)[]);
if (res?.code === 200) {
message.success(t('systemSetting.ota.rebootSuccess'));
setSelectedMachineIds([]);
}
} finally {
setSubmitting(false);
}
},
});
};
const handleSingleReboot = (record: MachineVersion) => {
modal.confirm({
title: t('systemSetting.ota.batchReboot'),
content: t('systemSetting.ota.confirmReboot', { count: 1 }),
okText: t('common.confirm'),
cancelText: t('common.cancel'),
onOk: async () => {
setSubmitting(true);
try {
const res = await handleOperate('reboot', [record.id]);
if (res?.code === 200) {
message.success(t('systemSetting.ota.rebootSuccess'));
}
} finally {
setSubmitting(false);
}
},
});
};
// ====== 操作记录 ======
const openRecordModal = async (record: MachineVersion) => {
setCurrentRecordDevice(record);
setRecordModalOpen(true);
setRecordLoading(true);
setRecordList([]);
try {
const res = await getRecordByDeviceId(record.id);
if (res?.code === 200) {
const list = res.data || res.rows || [];
setRecordList(Array.isArray(list) ? list : []);
}
} catch (err) {
console.error('获取操作记录失败', err);
} finally {
setRecordLoading(false);
}
};
const handleRecordRollback = async (record: OtaRecord) => {
if (!currentRecordDevice || !record.firmwareId) return;
setSubmitting(true);
try {
const res = await handleOperate('rollback', [currentRecordDevice.id], record.firmwareId);
if (res?.code === 200) {
message.success(t('systemSetting.ota.rollbackSuccess'));
// 刷新记录列表
const refreshRes = await getRecordByDeviceId(currentRecordDevice.id);
if (refreshRes?.code === 200) {
setRecordList(refreshRes.data || refreshRes.rows || []);
}
fetchMachines();
}
} finally {
setSubmitting(false);
}
};
// ====== 列定义 ======
const firmwareColumns: ColumnsType<FirmwarePackage> = [
@@ -318,10 +475,23 @@ export default function OTAManagement() {
dataIndex: 'fileSize',
key: 'fileSize',
width: 120,
render: (v: number) => formatFileSize(v),
},
{ title: t('systemSetting.ota.description'), dataIndex: 'description', key: 'description', ellipsis: true },
{ title: t('systemSetting.ota.uploadTime'), dataIndex: 'uploadTime', key: 'uploadTime', width: 180 },
{
title: t('systemSetting.ota.fileUrl'),
dataIndex: 'fileUrl',
key: 'fileUrl',
width: 180,
render: (v: string) => <a href={v} rel="noreferrer" download >{v}</a>
},
{
title: t('systemSetting.ota.deviceType'),
dataIndex: 'deviceType',
key: 'deviceType',
width: 120,
},
{ title: t('systemSetting.ota.description'), dataIndex: 'description', key: 'description', ellipsis: true, render: (v?: string) => v || '—' },
{
title: t('roles.actions'),
key: 'action',
@@ -342,80 +512,106 @@ export default function OTAManagement() {
];
const machineColumns: ColumnsType<MachineVersion> = [
{ title: t('systemSetting.ota.machineCode'), dataIndex: 'code', key: 'code', width: 120 },
{ title: t('systemSetting.ota.machineCode'), dataIndex: 'code', key: 'code', width: 140 },
{ title: t('devices.deviceName'), dataIndex: 'name', key: 'name', ellipsis: true },
{ title: t('common.type'), dataIndex: 'type', key: 'type', width: 140 },
{ title: t('common.type'), dataIndex: 'type', key: 'type', width: 140, render: (v: string) => v || '—' },
{
title: t('devices.online'),
dataIndex: 'online',
key: 'online',
width: 100,
render: (v: string) => <Tag color={v === 'ONLINE' ? 'green' : 'red'}>{v}</Tag>,
render: (v: string) => (
<Tag color={v === 'ONLINE' ? 'green' : 'red'}>
{v === 'ONLINE' ? t('devices.online') : t('devices.offline')}
</Tag>
),
},
{
title: t('systemSetting.ota.currentVersion'),
dataIndex: 'currentVersion',
key: 'currentVersion',
width: 130,
render: (v: string) => <Tag color="blue">{v}</Tag>,
},
{
title: t('systemSetting.ota.previousVersion'),
dataIndex: 'previousVersion',
key: 'previousVersion',
width: 130,
render: (v: string | null) => (v ? <Tag>{v}</Tag> : <Text type="secondary">—</Text>),
},
{
title: t('systemSetting.ota.lastUpgradeTime'),
dataIndex: 'lastUpgradeTime',
key: 'lastUpgradeTime',
width: 180,
render: (v: string | null) => v || <Text type="secondary">—</Text>,
},
{
title: t('systemSetting.ota.upgradeStatus'),
dataIndex: 'status',
key: 'status',
width: 110,
render: (v: MachineVersion['status']) => {
const map: Record<string, { color: string; key: string }> = {
IDLE: { color: 'default', key: 'statusIdle' },
UPGRADING: { color: 'processing', key: 'statusUpgrading' },
FAILED: { color: 'red', key: 'statusFailed' },
SUCCESS: { color: 'green', key: 'statusSuccess' },
};
const cfg = map[v] || map.IDLE;
return <Tag color={cfg.color}>{t(`systemSetting.ota.${cfg.key}`)}</Tag>;
},
render: (v: string) => v ? <Tag color="blue">{v}</Tag> : <Text type="secondary">—</Text>,
},
{
title: t('roles.actions'),
key: 'action',
width: 160,
width: 240,
render: (_: any, record: MachineVersion) => (
<Space>
<Button
type="link"
size="small"
icon={<ArrowUpOutlined />}
onClick={() => handleSingleUpgrade(record)}
>
{t('systemSetting.ota.batchUpgrade')}
</Button>
<Button
type="link"
size="small"
icon={<ArrowDownOutlined />}
onClick={() => handleSingleRollback(record)}
disabled={!record.previousVersion}
>
{t('systemSetting.ota.batchRollback')}
</Button>
<Space size={4}>
<Tooltip title={t('systemSetting.ota.batchUpgrade')}>
<Button
type="link"
size="small"
icon={<ArrowUpOutlined />}
onClick={() => handleSingleUpgrade(record)}
>
{t('systemSetting.ota.upgrade')}
</Button>
</Tooltip>
<Tooltip title={t('systemSetting.ota.batchReboot')}>
<Button
type="link"
size="small"
icon={<RestOutlined />}
onClick={() => handleSingleReboot(record)}
>
{t('systemSetting.ota.reboot')}
</Button>
</Tooltip>
<Tooltip title={t('systemSetting.ota.viewRecords')}>
<Button
type="link"
size="small"
icon={<HistoryOutlined />}
onClick={() => openRecordModal(record)}
>
{t('systemSetting.ota.records')}
</Button>
</Tooltip>
</Space>
),
},
];
const handlemapOperateType = (operateType: OtaOperateType) => {
switch (operateType) {
case 'upgrade':
return t('systemSetting.ota.recordOperateTypeUpgrade');
case 'rollback':
return t('systemSetting.ota.recordOperateTypeRollback');
case 'reboot':
return t('systemSetting.ota.recordOperateTypeReboot');
default:
return operateType;
}
}
const recordColumns: ColumnsType<OtaRecord> = [
{ title: t('systemSetting.ota.recordOperateType'), dataIndex: 'operateType', key: 'operateType', width: 100, render: (v?: string) => handlemapOperateType(v as OtaOperateType) || '—' },
{ title: t('systemSetting.ota.fromVersion'), dataIndex: 'preVersion', key: 'preVersion', width: 120, render: (v?: string) => v || '—' },
{ title: t('systemSetting.ota.toVersion'), dataIndex: 'nowVersion', key: 'nowVersion', width: 120, render: (v?: string) => v || '—' },
{ title: t('systemSetting.ota.createTime'), dataIndex: 'createTime', key: 'createTime', width: 180, render: (v?: string) => v || '—' },
{
title: t('roles.actions'),
key: 'action',
width: 100,
render: (_: any, record: OtaRecord) =>
record.firmwareId ? (
<Popconfirm
title={t('systemSetting.ota.confirmRecordRollback', { version: record.toVersion || '' })}
onConfirm={() => handleRecordRollback(record)}
okText={t('common.confirm')}
cancelText={t('common.cancel')}
>
<Button type="link" size="small" icon={<ArrowDownOutlined />}>
{t('systemSetting.ota.rollback')}
</Button>
</Popconfirm>
) : (
<Text type="secondary">—</Text>
),
},
];
const machineRowSelection = {
selectedRowKeys: selectedMachineIds,
@@ -475,15 +671,44 @@ export default function OTAManagement() {
const firmwareCard = (
<Card size="small" style={{ marginBottom: 12 }}>
<Title level={5} style={{ marginTop: 0, marginBottom: 12 }}>
{t('systemSetting.ota.firmwareList')}
</Title>
<div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', marginBottom: 12, flexWrap: 'wrap', gap: 8 }}>
<Title level={5} style={{ margin: 0 }}>
{t('systemSetting.ota.firmwareList')}
</Title>
<Space wrap>
<Popconfirm
title={t('systemSetting.ota.batchDeleteConfirm', { count: selectedFirmwareIds.length })}
onConfirm={handleBatchDeleteFirmware}
okText={t('common.confirm')}
cancelText={t('common.cancel')}
disabled={selectedFirmwareIds.length === 0}
>
<Button
danger
icon={<DeleteOutlined />}
disabled={selectedFirmwareIds.length === 0}
loading={submitting}
>
{t('common.batchDelete')}
{selectedFirmwareIds.length > 0 ? ` (${selectedFirmwareIds.length})` : ''}
</Button>
</Popconfirm>
<Button icon={<ReloadOutlined />} onClick={fetchFirmwares}>
{t('common.refresh')}
</Button>
</Space>
</div>
<Table
rowKey="id"
size="small"
columns={firmwareColumns}
dataSource={firmwareList}
loading={loadingFirmwares}
rowSelection={{
selectedRowKeys: selectedFirmwareIds,
onChange: (keys: React.Key[]) => setSelectedFirmwareIds(keys),
}}
locale={{ emptyText: <Empty description={t('systemSetting.ota.noFirmwareData')} /> }}
pagination={{ pageSize: 10, showSizeChanger: true, showTotal: (total) => `${t('common.total')} ${total} ${t('common.items')}` }}
/>
</Card>
@@ -515,6 +740,15 @@ export default function OTAManagement() {
{t('systemSetting.ota.batchRollback')}
{hasSelection ? ` (${selectedMachineIds.length})` : ''}
</Button>
<Button
icon={<RestOutlined />}
onClick={handleBatchReboot}
disabled={!hasSelection}
loading={submitting}
>
{t('systemSetting.ota.batchReboot')}
{hasSelection ? ` (${selectedMachineIds.length})` : ''}
</Button>
<Button icon={<ReloadOutlined />} onClick={refreshAll}>
{t('common.refresh')}
</Button>
@@ -527,7 +761,8 @@ export default function OTAManagement() {
dataSource={machineList}
loading={loadingMachines}
rowSelection={machineRowSelection}
scroll={{ x: 1200 }} // 添加这行
scroll={{ x: 1200 }}
locale={{ emptyText: <Empty description={t('systemSetting.ota.noDeviceData')} /> }}
pagination={{
pageSize: 10,
showSizeChanger: true,
@@ -548,6 +783,29 @@ export default function OTAManagement() {
{uploadCard}
{firmwareCard}
{machineCard}
<Modal
title={t('systemSetting.ota.recordModalTitle', { name: currentRecordDevice?.name || '' })}
open={recordModalOpen}
onCancel={() => setRecordModalOpen(false)}
footer={[
<Button key="close" onClick={() => setRecordModalOpen(false)}>
{t('common.close')}
</Button>,
]}
width={1000}
>
<Table
rowKey="id"
size="small"
columns={recordColumns}
dataSource={recordList}
loading={recordLoading}
locale={{ emptyText: <Empty description={t('systemSetting.ota.noRecordData')} /> }}
pagination={{ pageSize: 10, showSizeChanger: true }}
scroll={{ x: 900 }}
/>
</Modal>
</div>
);
}

View File

@@ -1,4 +1,4 @@
const en = {
const en = {
common: {
save: 'Save',
saveChanges: 'Save Changes',
@@ -2452,6 +2452,8 @@ const en = {
firmwareList: 'Uploaded Firmware',
fileName: 'File Name',
fileSize: 'File Size',
fileUrl: "File URL",
uploadTime: 'Upload Time',
machineVersionList: 'Machine Version List',
machineCode: 'Machine Code',
@@ -2462,19 +2464,46 @@ const en = {
batchUpgrade: 'Batch Upgrade',
batchRollback: 'Batch Rollback',
selectTargetVersion: 'Select Target Firmware Version',
confirmUpgrade: 'Confirm upgrading {count} selected machine(s) to {version}?',
confirmRollback: 'Confirm rolling back {count} selected machine(s) to previous version?',
confirmUpgrade: 'Confirm upgrading {{count}} selected machine(s) to {{version}}?',
confirmRollback: 'Confirm rolling back {{count}} selected machine(s) to previous version?',
noSelection: 'Please select machines first',
noFirmware: 'Please upload firmware first',
noPreviousVersion: 'Machine {name} has no previous version, cannot rollback',
noPreviousVersion: 'Machine {{name}} has no previous version, cannot rollback',
uploadSuccess: 'Firmware uploaded successfully',
recordOperateTypeUpgrade: 'Upgrade',
recordOperateTypeRollback: 'Rollback',
recordOperateTypeReboot: 'Reboot',
upgradeSuccess: 'Upgrade command dispatched',
rollbackSuccess: 'Rollback command dispatched',
deleteConfirm: 'Delete firmware {version}?',
deleteConfirm: 'Delete firmware {{version}}?',
statusIdle: 'Idle',
statusUpgrading: 'Upgrading',
deviceType: 'Device Type',
statusFailed: 'Failed',
statusSuccess: 'Success',
upgrade: 'Upgrade',
rollback: 'Rollback',
reboot: 'Reboot',
records: 'Records',
batchReboot: 'Batch Reboot',
confirmReboot: 'Confirm rebooting {{count}} selected device(s)?',
rebootSuccess: 'Reboot command dispatched',
md5: 'MD5',
viewRecords: 'View operation records',
recordModalTitle: '{{name}} - Operation Records',
recordOperateType: 'Operation',
fromVersion: 'From Version',
toVersion: 'To Version',
recordStatus: 'Status',
createTime: 'Create Time',
finishTime: 'Finish Time',
recordMessage: 'Message',
noFirmwareData: 'No firmware packages',
noDeviceData: 'No devices',
noRecordData: 'No operation records',
batchDeleteConfirm: 'Delete {{count}} selected firmware package(s)?',
confirmRecordRollback: 'Confirm rollback to version {{version}}?',
},
onlineUsers: 'Online Users',
deviceManagement: 'Device Management',

View File

@@ -1,4 +1,4 @@
import WeatherRainy from "@/src/components/Weather/WeatherRainy";
import WeatherRainy from "@/src/components/Weather/WeatherRainy";
const zh = {
common: {
@@ -1391,6 +1391,7 @@ const zh = {
super: '超清',
downloadTime: '下载时间',
fileSize: '文件大小',
fileUrl: "文件地址",
fileName: '文件名',
downloadStatus: '下载状态',
downloading: '下载中',
@@ -2488,6 +2489,8 @@ const zh = {
firmwareList: '已上传固件包',
fileName: '文件名',
fileSize: '文件大小',
fileUrl: "文件地址",
uploadTime: '上传时间',
machineVersionList: '机器版本列表',
machineCode: '机器编号',
@@ -2498,19 +2501,48 @@ const zh = {
batchUpgrade: '批量升级',
batchRollback: '批量回退',
selectTargetVersion: '选择目标固件版本',
confirmUpgrade: '确认对选中的 {count} 台机器升级到 {version}?',
confirmRollback: '确认对选中的 {count} 台机器回退到上一版本?',
confirmUpgrade: '确认对选中的 {{count}} 台机器升级到 {{version}}?',
recordOperateTypeUpgrade: '升级',
recordOperateTypeRollback: '回退',
recordOperateTypeReboot: '重启',
confirmRollback: '确认对选中的 {{count}} 台机器回退到上一版本?',
noSelection: '请先选择机器',
noFirmware: '请先上传固件包',
noPreviousVersion: '机器 {name} 没有上一版本,无法回退',
noPreviousVersion: '机器 {{name}} 没有上一版本,无法回退',
uploadSuccess: '固件包上传成功',
upgradeSuccess: '升级指令已下发',
rollbackSuccess: '回退指令已下发',
deleteConfirm: '确认删除固件包 {version}?',
deleteConfirm: '确认删除固件包 {{version}}?',
statusIdle: '空闲',
statusUpgrading: '升级中',
statusFailed: '失败',
statusSuccess: '成功',
upgrade: '升级',
rollback: '回退',
reboot: '重启',
records: '记录',
deviceType: '设备类型',
batchReboot: '批量重启',
confirmReboot: '确认对选中的 {{count}} 台设备重启?',
rebootSuccess: '重启指令已下发',
md5: 'MD5',
viewRecords: '查看操作记录',
recordModalTitle: '{{name}} - 操作记录',
recordOperateType: '操作类型',
fromVersion: '原版本',
toVersion: '目标版本',
recordStatus: '状态',
createTime: '创建时间',
finishTime: '完成时间',
recordMessage: '消息',
noFirmwareData: '暂无固件包',
noDeviceData: '暂无设备',
noRecordData: '暂无操作记录',
batchDeleteConfirm: '确认删除选中的 {{count}} 个固件包?',
confirmRecordRollback: '确认回退到版本 {{version}}?',
},
onlineUsers: '在线用户',
deviceManagement: '设备管理',