From a9098372191b3c51995d41ee28404d1b71244d98 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期二, 12 十二月 2023 18:41:04 +0800
Subject: [PATCH] 提交网关心跳和设备状态2

---
 src/main/java/com/fzzy/gateway/view/GatewayDevice.view.xml |   30 ++++++++++++++++++++++++++----
 1 files changed, 26 insertions(+), 4 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 54c02aa..89f3b83 100644
--- a/src/main/java/com/fzzy/gateway/view/GatewayDevice.view.xml
+++ b/src/main/java/com/fzzy/gateway/view/GatewayDevice.view.xml
@@ -113,8 +113,21 @@
         <Property name="label">绛掍粨灞傝鍒�</Property>
       </PropertyDef>
       <PropertyDef name="position">
-        <Property/>
+        <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>
     </DataType>
     <DataType name="dtParam" parent="Map">
@@ -275,8 +288,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>
@@ -398,7 +415,7 @@
               <Property name="property">httpUrl</Property>
               <Editor/>
             </AutoFormElement>
-            <AutoFormElement layoutConstraint="colSpan:2">
+            <AutoFormElement>
               <Property name="name">position</Property>
               <Property name="property">position</Property>
               <Editor/>
@@ -419,6 +436,11 @@
               <Property name="property">cableCir</Property>
               <Editor/>
             </AutoFormElement>
+            <AutoFormElement>
+              <Property name="name">status</Property>
+              <Property name="property">status</Property>
+              <Editor/>
+            </AutoFormElement>
           </AutoForm>
         </Container>
       </Children>

--
Gitblit v1.9.3