From a69402c8b67d8ce4b698d0c394d15ff43b5d99d0 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期四, 14 十二月 2023 23:17:41 +0800
Subject: [PATCH] 提交正来电子协议解析-3

---
 src/main/java/com/fzzy/gateway/view/GatewayDevice.view.xml |  408 +++++++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 292 insertions(+), 116 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 e9db492..d37fa01 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>
@@ -78,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>
@@ -98,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>
@@ -111,6 +111,43 @@
       <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(&quot;apiTriggerService#triggerOnline&quot;).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>
     </DataType>
     <DataType name="dtParam" parent="Map">
@@ -136,6 +173,9 @@
         <Property></Property>
         <Property name="label">璁惧ID</Property>
         <Property name="required">true</Property>
+      </PropertyDef>
+      <PropertyDef name="bizType">
+        <Property name="label">鍔ㄤ綔浜嬩欢</Property>
       </PropertyDef>
     </DataType>
   </Model>
@@ -235,6 +275,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(&quot;#dsMain.data:#&quot;);&#xD;
+var param = {&#xD;
+	deviceId:data.get(&quot;deviceId&quot;),&#xD;
+	bizType:&quot;initLpr&quot;&#xD;
+}&#xD;
+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(&quot;#dsMain.data:#&quot;);&#xD;
+var param = {&#xD;
+	deviceId:data.get(&quot;deviceId&quot;),&#xD;
+	bizType:&quot;syncConf&quot;&#xD;
+}&#xD;
+testIde(param);</ClientEvent>
+          <Property name="caption">杩滅▼鑾峰彇閰嶇疆</Property>
+        </MenuItem>
+        <MenuItem>
+          <ClientEvent name="onClick">var data = view.get(&quot;#dsMain.data:#&quot;);&#xD;
+var param = {&#xD;
+	deviceId:data.get(&quot;deviceId&quot;),&#xD;
+	bizType:&quot;writeConf&quot;&#xD;
+}&#xD;
+testIde(param);</ClientEvent>
+          <Property name="caption">鍐欏叆鍙傛暟</Property>
+        </MenuItem>
+        <MenuItem>
+          <ClientEvent name="onClick">var data = view.get(&quot;#dsMain.data:#&quot;);&#xD;
+var param = {&#xD;
+	deviceId:data.get(&quot;deviceId&quot;),&#xD;
+	bizType:&quot;initParam&quot;&#xD;
+}&#xD;
+&#xD;
+testIde(param);</ClientEvent>
+          <Property name="caption">鍒濆鍖栧垎鏈哄弬鏁�</Property>
+        </MenuItem>
+        <MenuItem>
+          <ClientEvent name="onClick">var data = view.get(&quot;#dsMain.data:#&quot;);&#xD;
+var param = {&#xD;
+	deviceId:data.get(&quot;deviceId&quot;),&#xD;
+	bizType:&quot;disconnect&quot;&#xD;
+}&#xD;
+&#xD;
+testIde(param);</ClientEvent>
+          <Property name="caption">涓诲姩鏂紑杩炴帴</Property>
+        </MenuItem>
+        <MenuItem>
+          <ClientEvent name="onClick">var data = view.get(&quot;#dsMain.data:#&quot;);&#xD;
+var param = {&#xD;
+	deviceId:data.get(&quot;deviceId&quot;),&#xD;
+	bizType:&quot;transparent&quot;&#xD;
+}&#xD;
+&#xD;
+testIde(param);</ClientEvent>
+          <Property name="caption">淇℃伅閫忎紶璋冭瘯</Property>
+        </MenuItem>
+      </MenuButton>
     </ToolBar>
     <DataGrid id="dgMain">
       <Property name="dataSet">dsMain</Property>
@@ -259,8 +365,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>
@@ -289,116 +399,178 @@
       </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">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 layoutConstraint="colSpan:2">
+                  <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">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/>
@@ -518,5 +690,9 @@
       </Children>
       <Tools/>
     </Dialog>
+    <AjaxAction id="ajaxTestIDE">
+      <Property name="confirmMessage">纭畾瑕佹墽琛屼箞锛�</Property>
+      <Property name="service">gatewayDeviceTestPR#testIde</Property>
+    </AjaxAction>
   </View>
 </ViewConfig>

--
Gitblit v1.9.3