接口优化

This commit is contained in:
mmc
2026-05-19 16:31:08 +08:00
parent e4771c98d3
commit 330d12bdde

View File

@@ -106,37 +106,97 @@ export default function DeviceAccessPage() {
total: 0,
});
// 获取协议列表
const getConnectList = () => {
getConnectTypes("").then(res => {
if (res.code == 200) {
setProtocolList(res.data || []);
} else {
setProtocolList([]);
}
});
// ======================
// 【优化】统一请求方法
// ======================
const fetchProtocolList = async () => {
if (protocolList.length > 0) return;
const res = await getConnectTypes("");
if (res.code === 200) setProtocolList(res.data || []);
};
const fetchDataTypeList = async () => {
if (dataTypeList.length > 0) return;
const res = await getDataTypesApi("");
if (res.code === 200) setDataTypeList(res.data || []);
};
const fetchAllModelList = async () => {
const res = await getDeviceModelList({ pageNum: 1, pageSize: 9999 });
if (res.code === 200) setThingsModelList(res.rows || []);
};
const fetchModelPageList = async () => {
const values = filterForm.getFieldsValue();
const params = {
pageNum: pagination.current,
pageSize: pagination.pageSize,
name: values.name || '',
connectType: values.connectType || '',
};
const res = await getDeviceModelList(params);
if (res.code === 200) {
setFilteredModelList(res.rows);
setPagination(prev => ({ ...prev, total: res.total }));
}
};
const fetchProductPageList = async () => {
const values = filterForm.getFieldsValue();
const params = {
pageNum: pagination.current,
pageSize: pagination.pageSize,
code: values.code || '',
name: values.name || '',
manufacturer: values.manufacturer || '',
categoryId: values.categoryId || '',
protocolCode: values.protocolCode || '',
transport: values.transport || '',
uploadTopic: values.uploadTopic || '',
subscribeTopic: values.subscribeTopic || '',
status: values.status ?? '',
};
const res = await getProductPage(params);
if (res.code === 200) {
setProductList(res.rows);
setPagination(prev => ({ ...prev, total: res.total }));
}
};
// 删除物模型
const handleDeleteModel = (id) => {
deleteModel(id).then(res => {
if (res.code === 200) {
messageApi.success('删除成功');
getModel();
} else {
messageApi.error('删除失败:' + res.msg);
}
}).catch(() => messageApi.error('删除请求异常'));
const handleDeleteModel = async (id) => {
const res = await deleteModel(id);
if (res.code === 200) {
messageApi.success('删除成功');
fetchModelPageList(); // 【优化】删除后刷新
} else {
messageApi.error('删除失败:' + res.msg);
}
};
// 删除产品
const handleDeleteProduct = async (id) => {
const res = await deleteProduct(id);
if (res.code === 200) {
messageApi.success('删除成功');
fetchProductPageList(); // 【优化】删除后刷新
} else {
messageApi.error('删除失败:' + res.msg);
}
};
// 打开弹窗
const openModal = (type: string, record?: any) => {
const openModal = async (type: string, record?: any) => {
setModalType(type);
setEditData(record);
form.resetFields();
setSelectedModelId('');
setPropertyList([]);
getModelAll();
// 【优化】打开弹窗前先加载必要数据
await fetchProtocolList();
await fetchDataTypeList();
await fetchAllModelList();
if (record) {
form.setFieldsValue(record);
@@ -168,17 +228,9 @@ export default function DeviceAccessPage() {
const limitConfig = modelId ? record.thingsModels[modelId] : {};
if (modelId) {
const targetModel = thinsModelList.find(m => m.id == modelId);
setSelectedModelId(Number(modelId)); // 让选中值生效
setSelectedModelId(Number(modelId));
setPropertyList(targetModel?.supportProperties || []);
form.setFieldsValue({
...record,
modelId: modelId,
limitConfig: limitConfig
});
setTimeout(() => {
form.setFieldsValue({ modelId });
}, 100);
form.setFieldsValue({ ...record, modelId, limitConfig });
} else {
form.setFieldsValue(record);
setSelectedModelId('');
@@ -187,96 +239,40 @@ export default function DeviceAccessPage() {
}
} else {
if (type === 'device') { setDeviceProtocol('onvif'); setModelDetail({ props: [] }); }
else if (type === 'product') { setProductProtocol(''); setPropertyList([]); form.setFieldsValue({ status: 1 }) }
else if (type === 'product') { setProductProtocol(''); setPropertyList([]); form.setFieldsValue({ status: 1 }); }
else setModelDetail({ props: [], events: [], actions: [] });
}
setVisible(true);
};
// 获取物模型列表
const getModel = () => {
const values = filterForm.getFieldsValue();
const params = {
pageNum: pagination.current,
pageSize: pagination.pageSize,
name: values.name || '',
connectType: values.connectType || '',
};
getDeviceModelList(params).then(res => {
if (res.code === 200) {
setFilteredModelList(res.rows);
setPagination(prev => ({ ...prev, total: res.total }));
}
});
};
const getModelAll = () => {
const params = { pageNum: 1, pageSize: 999999 };
getDeviceModelList(params).then(res => {
if (res.code === 200) {
setThingsModelList(res.rows);
}
});
};
// 筛选
const handleFilter = () => {
setPagination(prev => ({ ...prev, current: 1 }));
if (activeTab === 'model') getModel();
if (activeTab === 'product') getProductList();
if (activeTab === 'model') fetchModelPageList();
if (activeTab === 'product') fetchProductPageList();
};
// 重置
const handleReset = () => {
filterForm.resetFields();
setPagination(prev => ({ ...prev, current: 1 }));
if (activeTab === 'model') getModel();
if (activeTab === 'product') getProductList();
};
const getDataTypes = () => {
getDataTypesApi("").then(res => {
if (res.code === 200) {
setDataTypeList(res.data || []);
}
})
if (activeTab === 'model') fetchModelPageList();
if (activeTab === 'product') fetchProductPageList();
};
// 分页切换
const handleTableChange = (pag) => {
setPagination(pag);
if (activeTab === 'model') getModel();
if (activeTab === 'product') getProductList();
};
// 获取产品列表
const getProductList = () => {
const values = filterForm.getFieldsValue();
const params = {
pageNum: pagination.current,
pageSize: pagination.pageSize,
code: values.code || '',
name: values.name || '',
manufacturer: values.manufacturer || '',
categoryId: values.categoryId || '',
protocolCode: values.protocolCode || '',
transport: values.transport || '',
uploadTopic: values.uploadTopic || '',
subscribeTopic: values.subscribeTopic || '',
status: values.status ?? '',
};
getProductPage(params).then(res => {
if (res.code === 200) {
setProductList(res.rows);
setPagination(prev => ({ ...prev, total: res.total }));
}
});
if (activeTab === 'model') fetchModelPageList();
if (activeTab === 'product') fetchProductPageList();
};
// 提交
const handleSubmit = () => {
form.validateFields().then(values => {
const handleSubmit = async () => {
const values = await form.validateFields();
let success = false;
try {
if (modalType === 'model') {
const submitData = {
id: editData?.id,
@@ -285,99 +281,49 @@ export default function DeviceAccessPage() {
version: '1.0',
deviceType: values.deviceType,
supportProperties: modelDetail.props.map(p => ({
propertyKey: p.code,
propertyName: p.name,
dataType: p.type,
unit: p.unit || '',
required: p.required ?? true,
defaultValue: p.defaultValue ?? null,
isAlarm: p.isAlarm ?? false
propertyKey: p.code, propertyName: p.name, dataType: p.type,
unit: p.unit || '', required: p.required ?? true, defaultValue: p.defaultValue ?? null, isAlarm: p.isAlarm ?? false
})),
supportActions: modelDetail.actions.map(act => ({
actionId: act.actionId,
actionName: act.actionName,
params: act.params || {}
actionId: act.actionId, actionName: act.actionName, params: act.params || {}
}))
};
if (editData) {
updateDeviceModel(submitData).then(res => {
if (res.code === 200) {
messageApi.success('编辑成功');
getModel();
setVisible(false);
} else {
messageApi.error(res.msg);
}
});
const res = editData ? await updateDeviceModel(submitData) : await addDeviceModel(submitData);
if (res.code === 200) {
messageApi.success(editData ? '编辑成功' : '新增成功');
success = true;
} else {
addDeviceModel(submitData).then(res => {
if (res.code === 200) {
messageApi.success('新增成功');
getModel();
setVisible(false);
} else {
messageApi.error(res.msg);
}
});
messageApi.error(res.msg);
}
}
if (modalType === 'product') {
form.setFieldValue('modelId', selectedModelId);
const newValues = form.getFieldsValue();
const { modelId, limitConfig, ...params } = newValues;
const { modelId, limitConfig, ...params } = values;
const finalLimitConfig = {};
if (limitConfig) {
Object.keys(limitConfig).forEach(key => {
finalLimitConfig[key] = {
min: limitConfig[key].min ?? 0,
max: limitConfig[key].max ?? 100,
};
finalLimitConfig[key] = { min: limitConfig[key].min ?? 0, max: limitConfig[key].max ?? 100 };
});
}
const thingsModels = {};
if (modelId) {
thingsModels[modelId] = finalLimitConfig;
}
const submitData = {
...params,
thingsModels: thingsModels,
id: editData?.id,
};
// ======================
// 产品:判断新增 / 编辑
// ======================
if (editData) {
// 编辑
updateProduct(submitData).then(res => {
if (res.code === 200) {
messageApi.success('产品编辑成功');
getProductList();
setVisible(false);
} else {
messageApi.error(res.msg);
}
});
const thingsModels = modelId ? { [modelId]: finalLimitConfig } : {};
const submitData = { ...params, thingsModels, id: editData?.id };
const res = editData ? await updateProduct(submitData) : await addProduct(submitData);
if (res.code === 200) {
messageApi.success(editData ? '产品编辑成功' : '产品新增成功');
success = true;
} else {
// 新增
addProduct(submitData).then(res => {
if (res.code === 200) {
messageApi.success('产品新增成功');
getProductList();
setVisible(false);
} else {
messageApi.error(res.msg);
}
});
messageApi.error(res.msg);
}
}
} catch (err) { }
});
if (success) {
setVisible(false);
// 【优化】成功后刷新对应列表
if (modalType === 'model') fetchModelPageList();
if (modalType === 'product') fetchProductPageList();
}
};
// 属性
@@ -427,30 +373,27 @@ export default function DeviceAccessPage() {
setMappingList(newList);
messageApi.success('删除成功');
};
const handleDeleteProduct = (data) => {
deleteProduct(data).then(res => {
if (res.code === 200) {
messageApi.success('删除成功');
getProductList();
} else {
messageApi.error('删除失败:' + res.msg);
}
});
}
const getAlarmProps = () => modelDetail?.props?.filter(item => item.isAlarm) || [];
// ======================
// 【优化】切换 tab 才加载对应数据,不一次性请求所有
// ======================
useEffect(() => {
if (activeTab === 'model') {
getModel();
if (activeTab === 'product') {
fetchProtocolList();
fetchProductPageList();
}
}, [pagination.current, pagination.pageSize, activeTab]);
if (activeTab === 'model') {
fetchProtocolList();
fetchDataTypeList();
fetchModelPageList();
}
}, [activeTab, pagination.current, pagination.pageSize]);
// 页面初始只加载基础数据
useEffect(() => {
getConnectList();
getProductList();
getDataTypes();
fetchProtocolList();
}, []);
// 表格列
@@ -464,8 +407,6 @@ export default function DeviceAccessPage() {
{ title: '操作', render: r => <Button type="text" icon={<EditOutlined />} onClick={() => openModal('device', r)}>编辑</Button> }
];
const modelColumns = [
{ title: '模型名称', dataIndex: 'name' },
{ title: '连接协议', dataIndex: 'connectType' },
@@ -538,7 +479,7 @@ export default function DeviceAccessPage() {
<Option value="udp">UDP</Option>
</Select>
</Form.Item>
<Form.Item name="status" label="状态" initialValue={1}>
<Form.Item name="status" label="status" initialValue={1}>
<Select placeholder="状态" allowClear style={{ width: 100 }}>
<Option value={1}>启用</Option>
<Option value={0}>禁用</Option>
@@ -554,7 +495,6 @@ export default function DeviceAccessPage() {
</Button>
</div>
{/* 包一层横向滚动容器 */}
<div style={{ overflowX: 'auto', width: '100%' }}>
<Table
rowKey="id"
@@ -795,16 +735,11 @@ export default function DeviceAccessPage() {
value={selectedModelId}
onChange={(modelId) => {
const model = thinsModelList.find(item => item.id === modelId);
console.log('选中物模型:', model);
if (model) {
setSelectedModelId(Number(modelId));
setPropertyList(model.supportProperties || []);
// 自动获取物模型的协议
const protocol = model.connectType || '';
// 自动给表单设置 protocolCode
form.setFieldsValue({ protocolCode: protocol });
// 设置默认限值
const defaultLimit = {};
model.supportProperties?.forEach(attr => {
defaultLimit[attr.propertyKey] = { min: 0, max: 100 };
@@ -825,18 +760,12 @@ export default function DeviceAccessPage() {
</Select>
</Form.Item>
{/* 隐藏字段:存储协议(从物模型自动获取) */}
<Form.Item name="protocolCode" hidden>
<Input />
</Form.Item>
{/* ======================
根据【物模型协议】自动显示配置
====================== */}
{selectedModelId && (
<>
{/* MQTT 协议配置 */}
{form.getFieldValue('protocolCode')?.toLowerCase() === 'mqtt' && (
<>
<Divider>协议自动配置项</Divider>
@@ -849,10 +778,8 @@ export default function DeviceAccessPage() {
</Form.Item>
</div>
</>
)}
{/* ONVIF 协议配置 */}
{form.getFieldValue('protocolCode')?.toLowerCase() === 'onvif' && (
<>
<Divider>协议自动配置项</Divider>
@@ -870,21 +797,16 @@ export default function DeviceAccessPage() {
<Input.Password placeholder="密码" />
</Form.Item>
</div>
</>
)}
{/* RTSP 协议配置 */}
{form.getFieldValue('protocolCode')?.toLowerCase() === 'rtsp' && (
<>
<Divider>协议自动配置项</Divider>
<Form.Item label="RTSP地址" name="rtspUrl">
<Input placeholder="rtsp://username:password@ip:port/stream" />
</Form.Item>
</>
)}
</>
)}
@@ -930,9 +852,6 @@ export default function DeviceAccessPage() {
</Select>
</Form.Item>
</div>
{/*<div className="flex-1">
<Form.Item label="设备类型" name="deviceType" initialValue={1}><InputNumber style={{ width: '100%' }} /></Form.Item>
</div>*/}
</div>
<Divider>属性</Divider>