From caf2599a9869244ded811018811c37a2aabac3fc Mon Sep 17 00:00:00 2001
From: vince <757871790@qq.com>
Date: 星期三, 08 一月 2025 11:29:05 +0800
Subject: [PATCH] 优化测温协议
---
src/main/java/com/fzzy/gateway/view/GatewayDevice.view.xml | 467 ++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 327 insertions(+), 140 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 d56a8b3..b3b0d1b 100644
--- a/src/main/java/com/fzzy/gateway/view/GatewayDevice.view.xml
+++ b/src/main/java/com/fzzy/gateway/view/GatewayDevice.view.xml
@@ -25,7 +25,7 @@
</PropertyDef>
<PropertyDef name="depotId">
<Property></Property>
- <Property name="label">鎵�灞炰粨搴撶紪鐮�</Property>
+ <Property name="label">浠撳簱缂栫爜</Property>
</PropertyDef>
<PropertyDef name="type">
<Property></Property>
@@ -48,9 +48,9 @@
<Property></Property>
<Property name="label">瑙嗛RTSP</Property>
</PropertyDef>
- <PropertyDef name="provinceProtocol">
+ <PropertyDef name="pushProtocol">
<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>
@@ -58,19 +58,9 @@
</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="label">涓嬭鍗忚</Property>
<Property name="mapping">
<Property name="keyProperty">code</Property>
<Property name="valueProperty">name</Property>
@@ -88,7 +78,7 @@
</PropertyDef>
<PropertyDef name="httpUrl">
<Property></Property>
- <Property name="label">HTTP鍦板潃</Property>
+ <Property name="label">API璺緞</Property>
</PropertyDef>
<PropertyDef name="deviceSn">
<Property></Property>
@@ -108,11 +98,11 @@
</PropertyDef>
<PropertyDef name="depotIdSys">
<Property></Property>
- <Property name="label">鑷畾涔変粨搴撶紪鐮�</Property>
+ <Property name="label">绯荤粺浠撳簱缂栫爜</Property>
</PropertyDef>
<PropertyDef name="productId">
<Property></Property>
- <Property name="label">璁惧绫诲瀷KEY</Property>
+ <Property name="label">璁惧KEY</Property>
</PropertyDef>
<PropertyDef name="cableRule">
<Property></Property>
@@ -121,6 +111,56 @@
<PropertyDef name="cableCir">
<Property></Property>
<Property name="label">绛掍粨灞傝鍒�</Property>
+ </PropertyDef>
+ <PropertyDef name="position">
+ <Property></Property>
+ <Property name="label">浣嶇疆</Property>
+ </PropertyDef>
+ <PropertyDef name="status">
+ <Property></Property>
+ <Property name="label">鍦ㄧ嚎鐘舵��</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("apiTriggerService#triggerOnline").getResult()}</Property>
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="onlineTime">
+ <Property name="dataType">DateTime</Property>
+ <Property name="label">鏈�鍚庝笂绾挎椂闂�</Property>
+ </PropertyDef>
+ <PropertyDef name="cableStart">
+ <Property></Property>
+ <Property name="label">鐢电紗寮�濮�</Property>
+ </PropertyDef>
+ <PropertyDef name="cableEnd">
+ <Property></Property>
+ <Property name="label">鐢电紗鎴嚦</Property>
+ </PropertyDef>
+ <PropertyDef name="thAddr">
+ <Property></Property>
+ <Property name="label">娓╂箍搴﹀湴鍧�</Property>
+ </PropertyDef>
+ <PropertyDef name="cableFormat">
+ <Property></Property>
+ <Property name="label">鐢电紗鍒跺紡</Property>
+ </PropertyDef>
+ <PropertyDef name="cableType">
+ <Property></Property>
+ <Property name="label">鐢电紗绫诲瀷</Property>
+ </PropertyDef>
+ <PropertyDef name="depotType">
+ <Property></Property>
+ <Property name="label">浠撳簱绫诲瀷</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("apiTriggerPR#listDepotType").getResult()}</Property>
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="bhId">
+ <Property></Property>
+ <Property name="label">鍒嗘満鍐呴儴浠撳簱缂栫爜</Property>
</PropertyDef>
</DataType>
<DataType name="dtParam" parent="Map">
@@ -146,6 +186,9 @@
<Property></Property>
<Property name="label">璁惧ID</Property>
<Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="bizType">
+ <Property name="label">鍔ㄤ綔浜嬩欢</Property>
</PropertyDef>
</DataType>
</Model>
@@ -222,12 +265,15 @@
<Property name="exClassName">toolbar-button-push</Property>
</ToolBarButton>
<ToolBarButton>
- <ClientEvent name="onClick">var data = view.get("#dsMain.data:#");
-var param = {
- deviceId:data.get("deviceId"),
- bizType:"testGrain"
-}
-testDevice(param);</ClientEvent>
+ <ClientEvent name="onClick">$confirm("纭娴嬭瘯绮儏锛�",function(){
+ var data = view.get("#dsMain.data:#");
+ var param = {
+ deviceId:data.get("deviceId"),
+ bizType:"testGrain"
+ }
+testDevice(param);
+});
+</ClientEvent>
<Property name="caption">绮儏璋冭瘯</Property>
<Property name="iconClass">fa fa-wrench</Property>
<Property name="exClassName">toolbar-button-push</Property>
@@ -245,6 +291,72 @@
<Property name="iconClass">fa fa-wrench</Property>
<Property name="exClassName">toolbar-button-push</Property>
</ToolBarButton>
+ <Separator/>
+ <ToolBarButton>
+ <ClientEvent name="onClick">var data = view.get("#dsMain.data:#");
+var param = {
+ deviceId:data.get("deviceId"),
+ bizType:"initLpr"
+}
+initLpr(param);</ClientEvent>
+ <Property name="caption">杞︾墝璇嗗埆鍒濆鍖�</Property>
+ <Property name="iconClass">fa fa-wrench</Property>
+ <Property name="exClassName">toolbar-button-push</Property>
+ </ToolBarButton>
+ <Separator/>
+ <MenuButton>
+ <Property name="caption">涓嬭鍒嗘満璋冭瘯</Property>
+ <Property name="exClassName">toolbar-button-push</Property>
+ <Property name="iconClass">fa fa-wrench</Property>
+ <MenuItem>
+ <ClientEvent name="onClick">var data = view.get("#dsMain.data:#");
+var param = {
+ deviceId:data.get("deviceId"),
+ bizType:"syncConf"
+}
+testIde(param);</ClientEvent>
+ <Property name="caption">杩滅▼鑾峰彇閰嶇疆</Property>
+ </MenuItem>
+ <MenuItem>
+ <ClientEvent name="onClick">var data = view.get("#dsMain.data:#");
+var param = {
+ deviceId:data.get("deviceId"),
+ bizType:"writeConf"
+}
+testIde(param);</ClientEvent>
+ <Property name="caption">鍐欏叆鍙傛暟</Property>
+ </MenuItem>
+ <MenuItem>
+ <ClientEvent name="onClick">var data = view.get("#dsMain.data:#");
+var param = {
+ deviceId:data.get("deviceId"),
+ bizType:"initParam"
+}
+
+testIde(param);</ClientEvent>
+ <Property name="caption">鍒濆鍖栧垎鏈哄弬鏁�</Property>
+ </MenuItem>
+ <MenuItem>
+ <ClientEvent name="onClick">var data = view.get("#dsMain.data:#");
+var param = {
+ deviceId:data.get("deviceId"),
+ bizType:"disconnect"
+}
+
+testIde(param);</ClientEvent>
+ <Property name="caption">涓诲姩鏂紑杩炴帴</Property>
+ </MenuItem>
+ <MenuItem>
+ <ClientEvent name="onClick">var data = view.get("#dsMain.data:#");
+var param = {
+ deviceId:data.get("deviceId"),
+ bizType:"transparent"
+}
+
+testIde(param);</ClientEvent>
+ <Property name="caption">淇℃伅閫忎紶璋冭瘯</Property>
+ </MenuItem>
+ </MenuButton>
</ToolBar>
<DataGrid id="dgMain">
<Property name="dataSet">dsMain</Property>
@@ -269,8 +381,12 @@
<Property name="property">syncProtocol</Property>
<Property name="align">center</Property>
</DataColumn>
- <DataColumn name="pushProtocol">
- <Property name="property">pushProtocol</Property>
+ <DataColumn name="status">
+ <Property name="property">status</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="onlineTime">
+ <Property name="property">onlineTime</Property>
<Property name="align">center</Property>
</DataColumn>
</DataGrid>
@@ -299,121 +415,188 @@
</Buttons>
<Children>
<Container layout="regionPadding:10;padding:10">
- <AutoForm>
- <Property name="dataSet">dsMain</Property>
- <Property name="cols">*,*,*</Property>
- <Property name="labelWidth">125</Property>
- <Property name="labelAlign">right</Property>
- <Property name="labelSeparator">锛�</Property>
- <Property name="labelPosition">left</Property>
- <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>
- <Property name="name">deviceName</Property>
- <Property name="property">deviceName</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">type</Property>
- <Property name="property">type</Property>
- <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>
- <Property name="name">ip</Property>
- <Property name="property">ip</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">port</Property>
- <Property name="property">port</Property>
- <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/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">syncProtocol</Property>
- <Property name="property">syncProtocol</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">serPort</Property>
- <Property name="property">serPort</Property>
- <Property name="labelWidth">150</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">rtsp</Property>
- <Property name="property">rtsp</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">httpUrl</Property>
- <Property name="property">httpUrl</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:3">
- <Property name="name">remark</Property>
- <Property name="property">remark</Property>
- <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>
+ <FieldSet layout="padding:5">
+ <Property name="caption">缃戝叧璁惧閰嶇疆</Property>
+ <Buttons/>
+ <Children>
+ <AutoForm>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="cols">*,*,*</Property>
+ <Property name="labelAlign">right</Property>
+ <Property name="labelSeparator">锛�</Property>
+ <Property name="labelPosition">left</Property>
+ <Property name="labelWidth">100</Property>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">deviceId</Property>
+ <Property name="property">deviceId</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">deviceName</Property>
+ <Property name="property">deviceName</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">type</Property>
+ <Property name="property">type</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">productId</Property>
+ <Property name="property">productId</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">depotId</Property>
+ <Property name="property">depotId</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">position</Property>
+ <Property name="property">position</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">bhId</Property>
+ <Property name="property">bhId</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:1">
+ <Property name="name">remark</Property>
+ <Property name="property">remark</Property>
+ <Editor/>
+ </AutoFormElement>
+ </AutoForm>
+ </Children>
+ </FieldSet>
+ <FieldSet layout="padding:5">
+ <Property name="caption">涓嬭閫氳璁惧閰嶇疆</Property>
+ <Buttons/>
+ <Children>
+ <AutoForm>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="cols">*,*,*</Property>
+ <Property name="labelWidth">120</Property>
+ <Property name="labelAlign">right</Property>
+ <Property name="labelSeparator">锛�</Property>
+ <Property name="labelPosition">left</Property>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">deviceSn</Property>
+ <Property name="property">deviceSn</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">orgId</Property>
+ <Property name="property">orgId</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">ip</Property>
+ <Property name="property">ip</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">port</Property>
+ <Property name="property">port</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">syncProtocol</Property>
+ <Property name="property">syncProtocol</Property>
+ <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">pushProtocol</Property>
+ <Property name="property">pushProtocol</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">rtsp</Property>
+ <Property name="property">rtsp</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">status</Property>
+ <Property name="property">status</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">httpUrl</Property>
+ <Property name="property">httpUrl</Property>
+ <Editor/>
+ </AutoFormElement>
+ </AutoForm>
+ </Children>
+ </FieldSet>
+ <FieldSet layout="padding:5">
+ <Property name="caption">绮儏妫�娴嬪弬鏁伴厤缃�</Property>
+ <Buttons/>
+ <Children>
+ <AutoForm>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="cols">*,*,*</Property>
+ <Property name="labelWidth">120</Property>
+ <Property name="labelAlign">right</Property>
+ <Property name="labelSeparator">锛�</Property>
+ <Property name="labelPosition">left</Property>
+ <AutoFormElement>
+ <Property name="name">depotIdSys</Property>
+ <Property name="property">depotIdSys</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">depotType</Property>
+ <Property name="property">depotType</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>
+ <AutoFormElement>
+ <Property name="name">cableStart</Property>
+ <Property name="property">cableStart</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">cableEnd</Property>
+ <Property name="property">cableEnd</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">thAddr</Property>
+ <Property name="property">thAddr</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">cableFormat</Property>
+ <Property name="property">cableFormat</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">cableType</Property>
+ <Property name="property">cableType</Property>
+ <Editor/>
+ </AutoFormElement>
+ </AutoForm>
+ </Children>
+ </FieldSet>
</Container>
</Children>
<Tools/>
@@ -533,5 +716,9 @@
</Children>
<Tools/>
</Dialog>
+ <AjaxAction id="ajaxTestIDE">
+ <Property name="confirmMessage">纭畾瑕佹墽琛屼箞锛�</Property>
+ <Property name="service">gatewayDeviceTestPR#testIde</Property>
+ </AjaxAction>
</View>
</ViewConfig>
--
Gitblit v1.9.3