接收 全局推送告警 处理告警 优化控制逻辑
This commit is contained in:
@@ -29,7 +29,7 @@ import AgrtcRoomRobot from '../AgrtcRoomRobot';
|
||||
import CesiumMap from '../Map.jsx';
|
||||
import DeviceParamModal from './DeviceParamModal';
|
||||
import { getUAVState, getSiteDevice, getSiteUAVList, getsinglePlan, getRobotTaskList, getDeviceTotalData, updateDeviceAliasApi, hasPermission } from '@/api/device.ts';
|
||||
import { getAlarmList } from '@/api/alarmApi.js';
|
||||
import { getAlarmList, handleAlarm } from '@/api/alarmApi.js';
|
||||
|
||||
|
||||
import dayjs from 'dayjs';
|
||||
@@ -48,6 +48,36 @@ import { backToRestPointCommand } from '@/api/mapEdit';
|
||||
const { Content } = Layout;
|
||||
const { Text, Title } = Typography;
|
||||
|
||||
// 告警时间兼容:Java LocalDateTime 数组 / ISO 字符串 / 时间戳
|
||||
const formatAlarmTime = (value: any, fmt = 'YYYY-MM-DD HH:mm:ss') => {
|
||||
if (value === null || value === undefined || value === '') return '';
|
||||
if (Array.isArray(value)) {
|
||||
const [y, mo, d, h = 0, mi = 0, se = 0] = value;
|
||||
if (!y) return '';
|
||||
const dt = dayjs(new Date(y, mo - 1, d, h, mi, se));
|
||||
return dt.isValid() ? dt.format(fmt) : '';
|
||||
}
|
||||
const dt = dayjs(value);
|
||||
return dt.isValid() ? dt.format(fmt) : String(value);
|
||||
};
|
||||
|
||||
// 告警标题:alarmTitle 是编码时改用 alarmContent 中文描述
|
||||
const isAlarmCode = (value: any) => typeof value === 'string' && /^[A-Z][A-Z0-9_]*$/.test(value);
|
||||
const getAlarmTitleText = (record: any) => {
|
||||
const title = record?.alarmTitle;
|
||||
return (isAlarmCode(title) ? record?.alarmContent : (title || record?.alarmContent)) || record?.alarmNo || '';
|
||||
};
|
||||
|
||||
// 告警级别:兼容数字 1-4 / CRITICAL 等别名
|
||||
const ALARM_LEVEL_ALIAS: Record<string, string> = {
|
||||
'1': 'ERROR', '2': 'WARNING', '3': 'INFO', '4': 'INFO',
|
||||
CRITICAL: 'ERROR', MAJOR: 'WARNING', MINOR: 'INFO',
|
||||
};
|
||||
const resolveAlarmLevel = (record: any) => {
|
||||
const raw = String(record?.alertLevel ?? record?.alarmLevel ?? 'INFO').toUpperCase();
|
||||
return ALARM_LEVEL_ALIAS[raw] || raw;
|
||||
};
|
||||
|
||||
|
||||
|
||||
export default function DeviceOverviewPage() {
|
||||
@@ -312,6 +342,11 @@ export default function DeviceOverviewPage() {
|
||||
if (!userInfo || !stationId) return;
|
||||
const controller = new DeviceController(userInfo, messageApi, stationId);
|
||||
controller.initMapPush((rtMap: any) => setRealtimeMap(rtMap || {}));
|
||||
// 全局推送的新告警:合并到列表顶部(按 id 去重),只显示最近 5 条
|
||||
controller.onDeviceErrorPush = (payload: any) => {
|
||||
const incoming: any[] = Array.isArray(payload?.alarms) ? payload.alarms : [];
|
||||
setAlarmList(incoming);
|
||||
};
|
||||
controllerRef.current = controller;
|
||||
return () => {
|
||||
if (controllerRef.current) controllerRef.current.closeMapPush();
|
||||
@@ -601,6 +636,24 @@ export default function DeviceOverviewPage() {
|
||||
})
|
||||
}
|
||||
|
||||
// 手动处理告警:handleStatus=2 表示已关闭
|
||||
const handleAlarmItem = async (record: any) => {
|
||||
const alarmId = record?.id;
|
||||
if (!alarmId) return;
|
||||
try {
|
||||
const res = await handleAlarm({ alarmId, handleStatus: 2 });
|
||||
if (res?.code === 200) {
|
||||
messageApi.success(t('alerts.handleSuccess'));
|
||||
setAlarmList((prev) => prev.filter((a) => a.id !== alarmId));
|
||||
} else {
|
||||
messageApi.error(res?.msg || t('alerts.handleFail'));
|
||||
}
|
||||
} catch (err) {
|
||||
console.error('处理告警失败', err);
|
||||
messageApi.error(t('alerts.handleFail'));
|
||||
}
|
||||
};
|
||||
|
||||
const fetchAlarmList = async () => {
|
||||
try {
|
||||
const res = await getAlarmList({ pageNum: 1, pageSize: 5, siteId: stationId });
|
||||
@@ -945,7 +998,7 @@ export default function DeviceOverviewPage() {
|
||||
|
||||
>
|
||||
<Table
|
||||
rowKey="time"
|
||||
rowKey={(record) => record?.id ?? record?.alarmNo ?? record?.alarmTime}
|
||||
size="small"
|
||||
pagination={false}
|
||||
dataSource={taskList}
|
||||
@@ -1029,33 +1082,57 @@ export default function DeviceOverviewPage() {
|
||||
</>}
|
||||
variant="borderless"
|
||||
style={{ borderRadius: 8, height: '100%' }}
|
||||
extra={
|
||||
<div style={{ display: 'flex', alignItems: 'center', gap: 8 }}>
|
||||
<Button size="small" style={{ borderRadius: 4, border: '1px solid #d9d9d9' }}>
|
||||
{t('devices.fixed2AllLevels')}
|
||||
</Button>
|
||||
</div>
|
||||
}
|
||||
|
||||
>
|
||||
<Table
|
||||
rowKey="time"
|
||||
rowKey={(record) => record?.id ?? record?.alarmNo ?? record?.alarmTitle}
|
||||
size="small"
|
||||
pagination={false}
|
||||
dataSource={alarmList}
|
||||
scroll={{ x: 'max-content' }}
|
||||
columns={[
|
||||
{ title: t('common.time'), dataIndex: 'alarmTime', width: 90, render: (v) => <span style={{ fontSize: 13 }}>{v}</span> },
|
||||
{ title: t('devices.device'), dataIndex: 'deviceName', width: 100, render: (v) => <span style={{ fontSize: 13 }}>{v}</span> },
|
||||
{
|
||||
title: t('common.time'),
|
||||
dataIndex: 'alarmTime',
|
||||
width: 145,
|
||||
render: (v) => <span style={{ fontSize: 12, whiteSpace: 'nowrap' }}>{formatAlarmTime(v) || '-'}</span>
|
||||
},
|
||||
{
|
||||
title: t('devices.device'),
|
||||
dataIndex: 'deviceName',
|
||||
width: 110,
|
||||
ellipsis: true,
|
||||
render: (v, record) => <span style={{ fontSize: 12 }}>{record?.deviceAlias || record?.deviceId || v || '-'}</span>
|
||||
},
|
||||
{
|
||||
title: t('alerts.alarmTitle'),
|
||||
dataIndex: 'alarmTitle',
|
||||
width: 70,
|
||||
|
||||
dataIndex: 'alarmContent',
|
||||
width: 220,
|
||||
render: (_, record) => {
|
||||
const text = getAlarmTitleText(record);
|
||||
return (
|
||||
<Tooltip title={text}>
|
||||
<span style={{ fontSize: 12 }}>{text || '-'}</span>
|
||||
</Tooltip>
|
||||
);
|
||||
}
|
||||
},
|
||||
{
|
||||
title: t('alerts.alertLevel'), dataIndex: 'alertLevel', render: (l) => <AlarmLevelTag level={l} size="small" />
|
||||
title: t('alerts.alertLevel'),
|
||||
width: 70,
|
||||
render: (_, record) => <AlarmLevelTag level={resolveAlarmLevel(record)} size="small" />
|
||||
},
|
||||
{
|
||||
title: t('alerts.handle'),
|
||||
width: 70,
|
||||
render: (_, record) => record?.handleStatus === 2
|
||||
? <Tag style={{ fontSize: 11, margin: 0 }}>{t('alerts.handled')}</Tag>
|
||||
: (
|
||||
<Button type="link" size="small" style={{ padding: 0, fontSize: 12 }} onClick={() => handleAlarmItem(record)}>
|
||||
{t('alerts.handle')}
|
||||
</Button>
|
||||
)
|
||||
},
|
||||
{ title: '', width: 70, render: (_, record) => record.level ? <Tag color="red" style={{ fontSize: 11, margin: 0 }}>{record.level}</Tag> : null }
|
||||
]}
|
||||
/>
|
||||
<div style={{ textAlign: 'center', marginTop: 8 }}>
|
||||
|
||||
Reference in New Issue
Block a user