From d52795fc5de0b6ed748cd2ef217dcd1371e4b8e9 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期五, 10 十一月 2023 01:06:13 +0800
Subject: [PATCH] 重新调整代码结构和实现方式

---
 src/main/java/com/fzzy/gateway/view/GatewayDevice.view.xml |  295 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 270 insertions(+), 25 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..e9db492 100644
--- a/src/main/java/com/fzzy/gateway/view/GatewayDevice.view.xml
+++ b/src/main/java/com/fzzy/gateway/view/GatewayDevice.view.xml
@@ -16,20 +16,25 @@
       </PropertyDef>
       <PropertyDef name="deviceName">
         <Property></Property>
-        <Property name="label">鍚嶇О</Property>
+        <Property name="label">璁惧鍚嶇О</Property>
         <Property name="required">true</Property>
+      </PropertyDef>
+      <PropertyDef name="depotName">
+        <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>
-      </PropertyDef>
-      <PropertyDef name="depotId">
-        <Property></Property>
-        <Property name="label">鎵�灞炰粨搴�</Property>
-      </PropertyDef>
-      <PropertyDef name="depotName">
-        <Property></Property>
-        <Property name="label">鎵�灞炰粨搴�</Property>
+        <Property name="mapping">
+          <Property name="keyProperty">code</Property>
+          <Property name="valueProperty">name</Property>
+          <Property name="mapValues">${dorado.getDataProvider(&quot;apiTriggerService#triggerGatewayDeviceType&quot;).getResult()}</Property>
+        </Property>
       </PropertyDef>
       <PropertyDef name="ip">
         <Property></Property>
@@ -45,9 +50,9 @@
       </PropertyDef>
       <PropertyDef name="pushProtocol">
         <Property></Property>
-        <Property name="label">绯荤粺缃戝叧閫氳鍗忚</Property>
+        <Property name="label">涓婅鍗忚</Property>
         <Property name="mapping">
-          <Property name="mapValues">${dorado.getDataProvider(&quot;apiTriggerService#triggerGatewayProtocol&quot;).getResult()}</Property>
+          <Property name="mapValues">${dorado.getDataProvider(&quot;apiTriggerService#triggerPushProtocol&quot;).getResult()}</Property>
           <Property name="keyProperty">code</Property>
           <Property name="valueProperty">name</Property>
         </Property>
@@ -55,7 +60,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,16 +81,77 @@
         <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>
+        <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>
+        <Property name="label">甯冪嚎瑙勫垯</Property>
+      </PropertyDef>
+      <PropertyDef name="cableCir">
+        <Property></Property>
+        <Property name="label">绛掍粨灞傝鍒�</Property>
+      </PropertyDef>
+    </DataType>
+    <DataType name="dtParam" parent="Map">
+      <PropertyDef name="start">
+        <Property name="dataType">DateTime</Property>
+      </PropertyDef>
+      <PropertyDef name="end">
+        <Property name="dataType">DateTime</Property>
+      </PropertyDef>
+      <PropertyDef name="dayTime">
+        <Property name="dataType">Date</Property>
+        <Property name="label">閫夋嫨鏃堕棿</Property>
+      </PropertyDef>
+      <PropertyDef name="weight">
+        <Property name="label">閲嶉噺</Property>
+        <Property name="dataType">Double</Property>
+        <Property name="defaultValue">0.0</Property>
+      </PropertyDef>
+      <PropertyDef name="carNumber">
+        <Property name="label">杞︾墝</Property>
+      </PropertyDef>
+      <PropertyDef name="deviceId">
+        <Property></Property>
+        <Property name="label">璁惧ID</Property>
+        <Property name="required">true</Property>
       </PropertyDef>
     </DataType>
   </Model>
   <View layout="regionPadding:10">
     <Property name="packages">font-awesome,css-common</Property>
+    <Property name="styleSheetFile">./static/lib/jquery/jquery-3.4.1.min.js</Property>
     <DataSet id="dsMain">
       <Property name="dataType">[dtMain]</Property>
       <Property name="dataProvider">gatewayDeviceService#listAll</Property>
+    </DataSet>
+    <DataSet id="dsQuery">
+      <ClientEvent name="onReady">self.insert({&#xD;
+	weight:2500,&#xD;
+	carNumber:&quot;宸滱15U7M&quot;&#xD;
+});</ClientEvent>
+      <Property name="dataType">dtParam</Property>
     </DataSet>
     <ToolBar>
       <ToolBarLabel>
@@ -138,10 +204,40 @@
         <Property name="width">90</Property>
         <Property name="exClassName">toolbar-button-warn</Property>
       </ToolBarButton>
+      <Separator/>
+      <ToolBarButton>
+        <ClientEvent name="onClick">view.get(&quot;#dialogGrain&quot;).show();</ClientEvent>
+        <Property name="caption">kafka绮儏鎺ㄩ�佽皟璇�</Property>
+        <Property name="iconClass">fa fa-wrench</Property>
+        <Property name="exClassName">toolbar-button-push</Property>
+      </ToolBarButton>
+      <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;testGrain&quot;&#xD;
+}&#xD;
+testDevice(param);</ClientEvent>
+        <Property name="caption">绮儏璋冭瘯</Property>
+        <Property name="iconClass">fa fa-wrench</Property>
+        <Property name="exClassName">toolbar-button-push</Property>
+      </ToolBarButton>
+      <ToolBarButton>
+        <ClientEvent name="onClick">view.get(&quot;#dialogWeight&quot;).show();</ClientEvent>
+        <Property name="caption">鍦扮璋冭瘯</Property>
+        <Property name="iconClass">fa fa-wrench</Property>
+        <Property name="exClassName">toolbar-button-push</Property>
+      </ToolBarButton>
+      <ToolBarButton>
+        <ClientEvent name="onClick">view.get(&quot;#dialogLpr&quot;).show();&#xD;
+</ClientEvent>
+        <Property name="caption">杞︾墝璇嗗埆璋冭瘯</Property>
+        <Property name="iconClass">fa fa-wrench</Property>
+        <Property name="exClassName">toolbar-button-push</Property>
+      </ToolBarButton>
     </ToolBar>
     <DataGrid id="dgMain">
       <Property name="dataSet">dsMain</Property>
-      <Property name="selectionMode">multiRows</Property>
       <Property name="readOnly">true</Property>
       <RowNumColumn/>
       <DataColumn name="deviceName">
@@ -149,18 +245,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">
@@ -170,8 +271,7 @@
       <Property name="closeable">false</Property>
       <Buttons>
         <Button>
-          <ClientEvent name="onClick">var cur = view.get(&quot;#dgMain&quot;).getCurrentItem();&#xD;
-view.get(&quot;#updateSave&quot;).execute(function(){&#xD;
+          <ClientEvent name="onClick">view.get(&quot;#updateSave&quot;).execute(function(){&#xD;
 	self.get(&quot;parent&quot;).hide();&#xD;
 });</ClientEvent>
           <Property name="caption">淇濆瓨淇敼</Property>
@@ -192,13 +292,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>
@@ -212,8 +317,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>
@@ -227,6 +347,16 @@
               <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/>
@@ -237,8 +367,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">
@@ -257,6 +388,16 @@
               <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>
@@ -267,11 +408,115 @@
       <UpdateItem>
         <Property name="dataPath">[#current]</Property>
         <Property name="dataSet">dsMain</Property>
+        <Property name="alias">data</Property>
       </UpdateItem>
     </UpdateAction>
     <AjaxAction id="ajaxDel">
       <Property name="service">gatewayDeviceService#delData</Property>
       <Property name="confirmMessage">纭畾瑕佸垹闄や箞锛�</Property>
     </AjaxAction>
+    <Dialog id="dialogGrain">
+      <Property name="width">400</Property>
+      <Property name="height">300</Property>
+      <Property name="caption">閫夋嫨鏉′欢</Property>
+      <Buttons>
+        <Button>
+          <ClientEvent name="onClick">var data = view.get(&quot;#dsMain.data:#&quot;);&#xD;
+var query = view.get(&quot;#dsQuery.data&quot;);&#xD;
+var param = {&#xD;
+	deviceId:data.get(&quot;deviceId&quot;),&#xD;
+	dayTime:query.get(&quot;dayTime&quot;),&#xD;
+	bizType:&quot;ajaxTestKafkaGrain&quot;&#xD;
+}&#xD;
+testDevice(param);</ClientEvent>
+          <Property name="caption">纭畾鎵ц</Property>
+        </Button>
+        <Button>
+          <ClientEvent name="onClick">view.get(&quot;#dialogGrain&quot;).hide();</ClientEvent>
+          <Property name="caption">鍙栨秷鎵ц</Property>
+        </Button>
+      </Buttons>
+      <Children>
+        <AutoForm>
+          <Property name="dataSet">dsQuery</Property>
+          <Property name="cols">*</Property>
+          <AutoFormElement>
+            <Property name="name">dayTime</Property>
+            <Property name="property">dayTime</Property>
+            <Editor/>
+          </AutoFormElement>
+        </AutoForm>
+      </Children>
+      <Tools/>
+    </Dialog>
+    <Dialog id="dialogWeight">
+      <Property name="width">400</Property>
+      <Property name="height">300</Property>
+      <Property name="caption">杈撳叆閲嶉噺</Property>
+      <Buttons>
+        <Button>
+          <ClientEvent name="onClick">var data = view.get(&quot;#dsMain.data:#&quot;);&#xD;
+var query = view.get(&quot;#dsQuery.data&quot;);&#xD;
+var param = {&#xD;
+	deviceId:data.get(&quot;deviceId&quot;),&#xD;
+	weight:query.get(&quot;weight&quot;),&#xD;
+	bizType:&quot;ajaxTestWeight&quot;&#xD;
+}&#xD;
+testDevice(param);</ClientEvent>
+          <Property name="caption">纭畾鎵ц</Property>
+        </Button>
+        <Button>
+          <ClientEvent name="onClick">view.get(&quot;#dialogWeight&quot;).hide();</ClientEvent>
+          <Property name="caption">鍙栨秷鎵ц</Property>
+        </Button>
+      </Buttons>
+      <Children>
+        <AutoForm>
+          <Property name="dataSet">dsQuery</Property>
+          <Property name="cols">*</Property>
+          <AutoFormElement>
+            <Property name="name">weight</Property>
+            <Property name="property">weight</Property>
+            <Editor/>
+          </AutoFormElement>
+        </AutoForm>
+      </Children>
+      <Tools/>
+    </Dialog>
+    <Dialog id="dialogLpr">
+      <Property name="width">400</Property>
+      <Property name="height">300</Property>
+      <Property name="caption">杈撳叆杞︾墝</Property>
+      <Buttons>
+        <Button>
+          <ClientEvent name="onClick">var data = view.get(&quot;#dsMain.data:#&quot;);&#xD;
+var query = view.get(&quot;#dsQuery.data&quot;);&#xD;
+var param = {&#xD;
+	deviceId:data.get(&quot;deviceId&quot;),&#xD;
+	carNumber:query.get(&quot;carNumber&quot;),&#xD;
+	bizType:&quot;ajaxTestLpr&quot;&#xD;
+}&#xD;
+testDevice(param);</ClientEvent>
+          <Property name="caption">纭畾鎵ц</Property>
+          <Property name="action">updateAction1</Property>
+        </Button>
+        <Button>
+          <ClientEvent name="onClick">view.get(&quot;#dialogLpr&quot;).hide();</ClientEvent>
+          <Property name="caption">鍙栨秷鎵ц</Property>
+        </Button>
+      </Buttons>
+      <Children>
+        <AutoForm>
+          <Property name="dataSet">dsQuery</Property>
+          <Property name="cols">*</Property>
+          <AutoFormElement>
+            <Property name="name">carNumber</Property>
+            <Property name="property">carNumber</Property>
+            <Editor/>
+          </AutoFormElement>
+        </AutoForm>
+      </Children>
+      <Tools/>
+    </Dialog>
   </View>
 </ViewConfig>

--
Gitblit v1.9.3