From 0a8ef890592a9c0389c42daeebb9a3f0974c37e6 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期三, 08 十一月 2023 14:59:41 +0800
Subject: [PATCH] 调整MQTT配置

---
 src/main/java/com/fzzy/gateway/view/GatewayDevice.view.xml |   30 +++++++++++++++++++++---------
 1 files changed, 21 insertions(+), 9 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 fc41c88..cccd044 100644
--- a/src/main/java/com/fzzy/gateway/view/GatewayDevice.view.xml
+++ b/src/main/java/com/fzzy/gateway/view/GatewayDevice.view.xml
@@ -107,8 +107,12 @@
         <Property name="label">璁惧瀵嗙爜</Property>
       </PropertyDef>
       <PropertyDef name="depotIdSys">
+        <Property></Property>
+        <Property name="label">鑷畾涔変粨搴撶紪鐮�</Property>
+      </PropertyDef>
+      <PropertyDef name="productId">
         <Property/>
-        <Property name="label">搴撳尯绯荤粺浠撳簱缂栫爜</Property>
+        <Property name="label">璁惧绫诲瀷KEY</Property>
       </PropertyDef>
     </DataType>
   </Model>
@@ -182,6 +186,9 @@
         <Property name="property">type</Property>
         <Property name="align">center</Property>
       </DataColumn>
+      <DataColumn name="productId">
+        <Property name="property">productId</Property>
+      </DataColumn>
       <DataColumn name="deviceId">
         <Property name="property">deviceId</Property>
         <Property name="align">center</Property>
@@ -203,8 +210,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>
@@ -250,6 +256,11 @@
               <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/>
@@ -257,6 +268,11 @@
             <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>
@@ -310,11 +326,6 @@
               <Property name="property">httpUrl</Property>
               <Editor/>
             </AutoFormElement>
-            <AutoFormElement>
-              <Property name="name">depotIdSys</Property>
-              <Property name="property">depotIdSys</Property>
-              <Editor/>
-            </AutoFormElement>
             <AutoFormElement layoutConstraint="colSpan:3">
               <Property name="name">remark</Property>
               <Property name="property">remark</Property>
@@ -327,10 +338,11 @@
       <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