From 233c0e20548cadafb77efdcb3418f38c6658bbad Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期四, 26 十月 2023 14:20:57 +0800
Subject: [PATCH] 四川省网关接口相关7
---
src/main/java/com/fzzy/gateway/view/GatewayDevice.view.xml | 76 +++++++++++++++++++++++++++++++-------
1 files changed, 62 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/fzzy/gateway/view/GatewayDevice.view.xml b/src/main/java/com/fzzy/gateway/view/GatewayDevice.view.xml
index 617451d..1d47410 100644
--- a/src/main/java/com/fzzy/gateway/view/GatewayDevice.view.xml
+++ b/src/main/java/com/fzzy/gateway/view/GatewayDevice.view.xml
@@ -22,14 +22,15 @@
<PropertyDef name="type">
<Property></Property>
<Property name="label">璁惧绫诲瀷</Property>
+ <Property name="mapping">
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ <Property name="mapValues">${dorado.getDataProvider("apiTriggerService#triggerGatewayDeviceType").getResult()}</Property>
+ </Property>
</PropertyDef>
<PropertyDef name="depotId">
<Property></Property>
- <Property name="label">鎵�灞炰粨搴�</Property>
- </PropertyDef>
- <PropertyDef name="depotName">
- <Property></Property>
- <Property name="label">鎵�灞炰粨搴�</Property>
+ <Property name="label">鎵�灞炰粨搴撶紪鐮�</Property>
</PropertyDef>
<PropertyDef name="ip">
<Property></Property>
@@ -43,6 +44,16 @@
<Property></Property>
<Property name="label">瑙嗛RTSP</Property>
</PropertyDef>
+ <PropertyDef name="provinceProtocol">
+ <Property/>
+ <Property name="label">鐪佸钩鍙板崗璁�</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("apiTriggerService#triggerPushProtocol").getResult()}</Property>
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
<PropertyDef name="pushProtocol">
<Property></Property>
<Property name="label">绯荤粺缃戝叧閫氳鍗忚</Property>
@@ -55,7 +66,7 @@
</PropertyDef>
<PropertyDef name="syncProtocol">
<Property></Property>
- <Property name="label">缃戝叧涓庤澶囬�氳鍗忚</Property>
+ <Property name="label">缃戝叧璁惧閫氳鍗忚</Property>
<Property name="mapping">
<Property name="keyProperty">code</Property>
<Property name="valueProperty">name</Property>
@@ -76,8 +87,24 @@
<Property name="label">HTTP鍦板潃</Property>
</PropertyDef>
<PropertyDef name="deviceSn">
- <Property/>
+ <Property></Property>
<Property name="label">璁惧搴忓垪鍙�</Property>
+ </PropertyDef>
+ <PropertyDef name="serPort">
+ <Property name="dataType">int</Property>
+ <Property name="label">TCP鏈嶅姟绔彛</Property>
+ </PropertyDef>
+ <PropertyDef name="userName">
+ <Property/>
+ <Property name="label">璁惧鐢ㄦ埛鍚�</Property>
+ </PropertyDef>
+ <PropertyDef name="password">
+ <Property/>
+ <Property name="label">璁惧瀵嗙爜</Property>
+ </PropertyDef>
+ <PropertyDef name="depotName">
+ <Property/>
+ <Property name="label">鎵�灞炰粨搴�</Property>
</PropertyDef>
</DataType>
</Model>
@@ -150,9 +177,6 @@
<DataColumn name="type">
<Property name="property">type</Property>
</DataColumn>
- <DataColumn name="depotName">
- <Property name="property">depotName</Property>
- </DataColumn>
<DataColumn name="syncProtocol">
<Property name="property">syncProtocol</Property>
</DataColumn>
@@ -192,13 +216,18 @@
<AutoForm>
<Property name="dataSet">dsMain</Property>
<Property name="cols">*,*,*</Property>
- <Property name="labelWidth">100</Property>
+ <Property name="labelWidth">125</Property>
<Property name="labelAlign">right</Property>
<Property name="labelSeparator">锛�</Property>
<Property name="labelPosition">left</Property>
- <AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:2">
<Property name="name">deviceId</Property>
<Property name="property">deviceId</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">deviceSn</Property>
+ <Property name="property">deviceSn</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -209,6 +238,11 @@
<AutoFormElement>
<Property name="name">type</Property>
<Property name="property">type</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">orgId</Property>
+ <Property name="property">orgId</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -227,18 +261,32 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
+ <Property name="name">userName</Property>
+ <Property name="property">userName</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">password</Property>
+ <Property name="property">password</Property>
+ <Editor/>
+ </AutoFormElement>
+ <Control/>
+ <AutoFormElement>
<Property name="name">pushProtocol</Property>
<Property name="property">pushProtocol</Property>
+ <Property name="labelWidth">150</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
<Property name="name">syncProtocol</Property>
<Property name="property">syncProtocol</Property>
+ <Property name="labelWidth">150</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">orgId</Property>
- <Property name="property">orgId</Property>
+ <Property name="name">serPort</Property>
+ <Property name="property">serPort</Property>
+ <Property name="labelWidth">150</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement layoutConstraint="colSpan:2">
--
Gitblit v1.9.3