From 29bd44e8648aa2df488f94e7a947ed6839a33877 Mon Sep 17 00:00:00 2001
From: vince <757871790@qq.com>
Date: 星期四, 09 十一月 2023 00:02:18 +0800
Subject: [PATCH] 手动测试
---
src/main/java/com/fzzy/gateway/view/GatewayDevice.view.xml | 180 +++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 143 insertions(+), 37 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 e4edcc9..9db29e6 100644
--- a/src/main/java/com/fzzy/gateway/view/GatewayDevice.view.xml
+++ b/src/main/java/com/fzzy/gateway/view/GatewayDevice.view.xml
@@ -6,31 +6,38 @@
<DataType name="dtMain">
<Property name="creationType">com.fzzy.gateway.entity.GatewayDevice</Property>
<PropertyDef name="id">
- <Property/>
+ <Property></Property>
<Property name="label">绯荤粺ID</Property>
</PropertyDef>
<PropertyDef name="deviceId">
- <Property/>
+ <Property></Property>
<Property name="label">璁惧ID</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="deviceName">
- <Property/>
- <Property name="label">鍚嶇О</Property>
- </PropertyDef>
- <PropertyDef name="type">
- <Property/>
- <Property name="label">璁惧绫诲瀷</Property>
- </PropertyDef>
- <PropertyDef name="depotId">
- <Property/>
- <Property name="label">鎵�灞炰粨搴�</Property>
+ <Property></Property>
+ <Property name="label">璁惧鍚嶇О</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="depotName">
- <Property/>
- <Property name="label">鎵�灞炰粨搴�</Property>
+ <Property></Property>
+ <Property name="label">浠撳簱鍚嶇О</Property>
+ </PropertyDef>
+ <PropertyDef name="depotId">
+ <Property></Property>
+ <Property name="label">鎵�灞炰粨搴撶紪鐮�</Property>
+ </PropertyDef>
+ <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="ip">
- <Property/>
+ <Property></Property>
<Property name="label">閫氳IP</Property>
</PropertyDef>
<PropertyDef name="port">
@@ -38,16 +45,12 @@
<Property name="label">閫氳绔彛</Property>
</PropertyDef>
<PropertyDef name="rtsp">
- <Property/>
+ <Property></Property>
<Property name="label">瑙嗛RTSP</Property>
</PropertyDef>
- <PropertyDef name="syncProtocol">
- <Property/>
- <Property name="label">璁惧鍗忚</Property>
- </PropertyDef>
- <PropertyDef name="pushProtocol">
+ <PropertyDef name="provinceProtocol">
<Property></Property>
- <Property name="label">缃戝叧閫氳</Property>
+ <Property name="label">鐪佸钩鍙板崗璁�</Property>
<Property name="mapping">
<Property name="mapValues">${dorado.getDataProvider("apiTriggerService#triggerPushProtocol").getResult()}</Property>
<Property name="keyProperty">code</Property>
@@ -55,17 +58,69 @@
</Property>
<Property name="required">true</Property>
</PropertyDef>
+ <PropertyDef name="pushProtocol">
+ <Property></Property>
+ <Property name="label">涓庣郴缁熼�氳鍗忚</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("apiTriggerService#triggerGatewayProtocol").getResult()}</Property>
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="syncProtocol">
+ <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#triggerGatewayDeviceProtocol").getResult()}</Property>
+ </Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
<PropertyDef name="orgId">
- <Property/>
+ <Property></Property>
<Property name="label">缁勭粐缂栫爜</Property>
</PropertyDef>
<PropertyDef name="remark">
- <Property/>
+ <Property></Property>
<Property name="label">澶囨敞</Property>
</PropertyDef>
<PropertyDef name="httpUrl">
- <Property/>
+ <Property></Property>
<Property name="label">HTTP鍦板潃</Property>
+ </PropertyDef>
+ <PropertyDef name="deviceSn">
+ <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>
+ <Property name="label">璁惧鐢ㄦ埛鍚�</Property>
+ </PropertyDef>
+ <PropertyDef name="password">
+ <Property></Property>
+ <Property name="label">璁惧瀵嗙爜</Property>
+ </PropertyDef>
+ <PropertyDef name="depotIdSys">
+ <Property></Property>
+ <Property name="label">鑷畾涔変粨搴撶紪鐮�</Property>
+ </PropertyDef>
+ <PropertyDef name="productId">
+ <Property></Property>
+ <Property name="label">璁惧绫诲瀷KEY</Property>
+ </PropertyDef>
+ <PropertyDef name="cableRule">
+ <Property/>
+ <Property name="label">甯冪嚎瑙勫垯</Property>
+ </PropertyDef>
+ <PropertyDef name="cableCir">
+ <Property/>
+ <Property name="label">绛掍粨灞傝鍒�</Property>
</PropertyDef>
</DataType>
</Model>
@@ -137,18 +192,23 @@
</DataColumn>
<DataColumn name="type">
<Property name="property">type</Property>
+ <Property name="align">center</Property>
</DataColumn>
- <DataColumn name="depotName">
- <Property name="property">depotName</Property>
+ <DataColumn name="productId">
+ <Property name="property">productId</Property>
+ </DataColumn>
+ <DataColumn name="deviceId">
+ <Property name="property">deviceId</Property>
+ <Property name="align">center</Property>
+ <Property name="width">550</Property>
</DataColumn>
<DataColumn name="syncProtocol">
<Property name="property">syncProtocol</Property>
+ <Property name="align">center</Property>
</DataColumn>
<DataColumn name="pushProtocol">
<Property name="property">pushProtocol</Property>
- </DataColumn>
- <DataColumn name="remark">
- <Property name="property">remark</Property>
+ <Property name="align">center</Property>
</DataColumn>
</DataGrid>
<Dialog id="dialogMain">
@@ -158,8 +218,7 @@
<Property name="closeable">false</Property>
<Buttons>
<Button>
- <ClientEvent name="onClick">var cur = view.get("#dgMain").getCurrentItem();
-view.get("#updateSave").execute(function(){
+ <ClientEvent name="onClick">view.get("#updateSave").execute(function(){
self.get("parent").hide();
});</ClientEvent>
<Property name="caption">淇濆瓨淇敼</Property>
@@ -180,13 +239,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>
@@ -200,8 +264,23 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
+ <Property name="name">productId</Property>
+ <Property name="property">productId</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">orgId</Property>
+ <Property name="property">orgId</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
<Property name="name">depotId</Property>
<Property name="property">depotId</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">depotIdSys</Property>
+ <Property name="property">depotIdSys</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -215,6 +294,21 @@
<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>
+ <AutoFormElement>
+ <Property name="name">provinceProtocol</Property>
+ <Property name="property">provinceProtocol</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
<Property name="name">pushProtocol</Property>
<Property name="property">pushProtocol</Property>
<Editor/>
@@ -225,8 +319,9 @@
<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">
@@ -245,16 +340,27 @@
<Property name="editorType">TextArea</Property>
<Editor/>
</AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">cableRule</Property>
+ <Property name="property">cableRule</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">cableCir</Property>
+ <Property name="property">cableCir</Property>
+ <Editor/>
+ </AutoFormElement>
</AutoForm>
</Container>
</Children>
<Tools/>
</Dialog>
<UpdateAction id="updateSave">
- <Property name="dataResolver">gatewayDeviceService#updateSave</Property>
+ <Property name="dataResolver">gatewayDeviceService2#updateSave</Property>
<UpdateItem>
<Property name="dataPath">[#current]</Property>
<Property name="dataSet">dsMain</Property>
+ <Property name="alias">data</Property>
</UpdateItem>
</UpdateAction>
<AjaxAction id="ajaxDel">
--
Gitblit v1.9.3