优化设备接入逻辑

This commit is contained in:
mmc
2026-05-19 16:22:58 +08:00
parent 5c21aded86
commit e4771c98d3

View File

@@ -136,6 +136,7 @@ export default function DeviceAccessPage() {
form.resetFields();
setSelectedModelId('');
setPropertyList([]);
getModelAll();
if (record) {
form.setFieldsValue(record);
@@ -447,7 +448,7 @@ export default function DeviceAccessPage() {
useEffect(() => {
getConnectList();
getModelAll();
getProductList();
getDataTypes();
}, []);
@@ -770,37 +771,23 @@ export default function DeviceAccessPage() {
<Form.Item label="厂商" name="manufacturer">
<Input placeholder="迈步科技" />
</Form.Item>
{/*<Form.Item label="分类ID" name="categoryId">
<InputNumber style={{ width: '100%' }} min={1} />
</Form.Item>*/}
<Form.Item label="协议" name="protocolCode" rules={[{ required: true }]}>
<Select placeholder="选择协议">
{protocolList.map(p => (
<Option key={p.code} value={p.code}>{p.name}</Option>
))}
</Select>
</Form.Item>
<Form.Item label="传输类型" name="transport">
<Select placeholder="传输方式">
<Option value="tcp">TCP</Option>
<Option value="udp">UDP</Option>
</Select>
</Form.Item>
<Form.Item label="上报Topic" name="uploadTopic">
<Input placeholder="device/upload" />
</Form.Item>
<Form.Item label="订阅Topic" name="subscribeTopic">
<Input placeholder="device/subscribe" />
</Form.Item>
<Form.Item label="状态" name="status">
<Select>
<Select defaultValue={1}>
<Option value={1}>启用</Option>
<Option value={0}>禁用</Option>
</Select>
</Form.Item>
</div>
<Divider>物模型属性配置</Divider>
<Divider>绑定物模型</Divider>
<Form.Item label="绑定物模型">
<Select
placeholder="请选择要绑定的物模型"
@@ -808,9 +795,16 @@ 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 };
@@ -819,6 +813,7 @@ export default function DeviceAccessPage() {
} else {
setSelectedModelId('');
setPropertyList([]);
form.setFieldsValue({ protocolCode: '' });
}
}}
>
@@ -830,7 +825,72 @@ export default function DeviceAccessPage() {
</Select>
</Form.Item>
<Form.Item name="modelId" hidden ><Input /></Form.Item>
{/* 隐藏字段:存储协议(从物模型自动获取) */}
<Form.Item name="protocolCode" hidden>
<Input />
</Form.Item>
{/* ======================
根据【物模型协议】自动显示配置
====================== */}
{selectedModelId && (
<>
{/* MQTT 协议配置 */}
{form.getFieldValue('protocolCode')?.toLowerCase() === 'mqtt' && (
<>
<Divider>协议自动配置项</Divider>
<div className="grid grid-cols-2 gap-4">
<Form.Item label="上报Topic" name="uploadTopic">
<Input placeholder="device/upload" />
</Form.Item>
<Form.Item label="订阅Topic" name="subscribeTopic">
<Input placeholder="device/subscribe" />
</Form.Item>
</div>
</>
)}
{/* ONVIF 协议配置 */}
{form.getFieldValue('protocolCode')?.toLowerCase() === 'onvif' && (
<>
<Divider>协议自动配置项</Divider>
<div className="grid grid-cols-2 gap-4">
<Form.Item label="IP地址" name="ip">
<Input placeholder="192.168.1.65" />
</Form.Item>
<Form.Item label="端口" name="port">
<InputNumber className="w-full" defaultValue={80} />
</Form.Item>
<Form.Item label="账号" name="username">
<Input placeholder="admin" />
</Form.Item>
<Form.Item label="密码" name="password">
<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>
</>
)}
</>
)}
<Divider>物模型属性配置</Divider>
<Form.Item name="modelId" hidden><Input /></Form.Item>
<div style={{ marginTop: 12 }}>
{propertyList?.map((item) => (
<div key={item.id} style={{ padding: '12px 16px', border: '1px solid #eee', borderRadius: 8, marginBottom: 8 }}>
@@ -855,7 +915,6 @@ export default function DeviceAccessPage() {
</div>
</>
)}
{modalType === 'model' && (
<>
<div className="flex gap-4 mb-4">