From 664bb4d0b7799328667ffc47e39da711a77ddbfa Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期一, 28 八月 2023 12:05:33 +0800
Subject: [PATCH] 更新MODBUS-TCP协议，调整配置2

---
 igds-core/src/main/java/models/igds.model.xml |   65 +++++++++++++++++---------------
 1 files changed, 35 insertions(+), 30 deletions(-)

diff --git a/igds-core/src/main/java/models/igds.model.xml b/igds-core/src/main/java/models/igds.model.xml
index 68c3feb..861700c 100644
--- a/igds-core/src/main/java/models/igds.model.xml
+++ b/igds-core/src/main/java/models/igds.model.xml
@@ -154,10 +154,6 @@
         <Property name="valueProperty">name</Property>
       </Property>
     </PropertyDef>
-    <PropertyDef name="ggm">
-      <Property></Property>
-      <Property name="label">鍥借鐮�</Property>
-    </PropertyDef>
   </DataType>
   <DataType name="dtDepot">
     <Property name="creationType">com.ld.igds.models.Depot</Property>
@@ -316,6 +312,10 @@
     <PropertyDef name="remark">
       <Property></Property>
       <Property name="label">澶囨敞</Property>
+    </PropertyDef>
+    <PropertyDef name="ggm">
+      <Property></Property>
+      <Property name="label">鍥借鐮�</Property>
     </PropertyDef>
   </DataType>
   <DataType name="dtDepotStore">
@@ -518,14 +518,17 @@
         <Property name="keyProperty">id</Property>
         <Property name="valueProperty">name</Property>
       </Property>
+      <Property name="required">true</Property>
     </PropertyDef>
     <PropertyDef name="name">
       <Property></Property>
       <Property name="label">鍚嶇О</Property>
+      <Property name="required">true</Property>
     </PropertyDef>
     <PropertyDef name="passCode">
       <Property name="dataType">int</Property>
       <Property name="label">璁惧缂栧彿</Property>
+      <Property name="required">true</Property>
     </PropertyDef>
     <PropertyDef name="link">
       <Property></Property>
@@ -548,6 +551,7 @@
         <Property name="keyProperty">id</Property>
         <Property name="valueProperty">name</Property>
       </Property>
+      <Property name="required">true</Property>
     </PropertyDef>
     <PropertyDef name="type">
       <Property></Property>
@@ -603,24 +607,20 @@
       <Property></Property>
       <Property name="label">浣嶇疆</Property>
     </PropertyDef>
-    <PropertyDef name="modbus">
-      <Property/>
-      <Property name="label">Modbus閰嶇疆</Property>
-    </PropertyDef>
     <PropertyDef name="ext1">
-      <Property/>
+      <Property></Property>
       <Property name="label">鎵╁睍瀛楁1</Property>
     </PropertyDef>
     <PropertyDef name="ext2">
-      <Property/>
+      <Property></Property>
       <Property name="label">鎵╁睍瀛楁2</Property>
     </PropertyDef>
     <PropertyDef name="ext3">
-      <Property/>
+      <Property></Property>
       <Property name="label">鎵╁睍瀛楁3</Property>
     </PropertyDef>
     <PropertyDef name="statusName">
-      <Property/>
+      <Property></Property>
       <Property name="label">褰撳墠鐘舵��</Property>
     </PropertyDef>
   </DataType>
@@ -871,24 +871,6 @@
       <Property name="dataType">Double</Property>
       <Property name="label">铏涓婇檺</Property>
     </PropertyDef>
-    <PropertyDef name="videoIn">
-      <Property></Property>
-      <Property name="label">鍐呴儴瑙嗛</Property>
-      <Property name="mapping">
-        <Property name="mapValues">${dorado.getDataProvider(&quot;securityPR#listCamera&quot;).getResult()}</Property>
-        <Property name="keyProperty">id</Property>
-        <Property name="valueProperty">name</Property>
-      </Property>
-    </PropertyDef>
-    <PropertyDef name="quantitySer">
-      <Property></Property>
-      <Property name="label">鏁伴噺妫�娴嬪垎鏈�</Property>
-      <Property name="mapping">
-        <Property name="mapValues">${dorado.getDataProvider(&quot;deviceSerPR2#getSerCacheByType&quot;).getResult(&quot;99&quot;)}</Property>
-        <Property name="keyProperty">id</Property>
-        <Property name="valueProperty">name</Property>
-      </Property>
-    </PropertyDef>
     <PropertyDef name="thSer">
       <Property></Property>
       <Property name="label">娓╂箍搴﹀垎鏈�</Property>
@@ -957,6 +939,29 @@
     <PropertyDef name="gasSer">
       <Property></Property>
       <Property name="label">姘斾綋鍒嗘満</Property>
+      <Property name="mapping">
+        <Property name="mapValues">${dorado.getDataProvider(&quot;deviceSerPR#getAllSerCache&quot;).getResult()}</Property>
+        <Property name="keyProperty">id</Property>
+        <Property name="valueProperty">name</Property>
+      </Property>
+    </PropertyDef>
+    <PropertyDef name="pestSer">
+      <Property/>
+      <Property name="label">姘斾綋鍒嗘満</Property>
+      <Property name="mapping">
+        <Property name="mapValues">${dorado.getDataProvider(&quot;deviceSerPR#getAllSerCache&quot;).getResult()}</Property>
+        <Property name="keyProperty">id</Property>
+        <Property name="valueProperty">name</Property>
+      </Property>
+    </PropertyDef>
+    <PropertyDef name="verbSer">
+      <Property/>
+      <Property name="label">閫氶鍒嗘満</Property>
+      <Property name="mapping">
+        <Property name="mapValues">${dorado.getDataProvider(&quot;deviceSerPR#getAllSerCache&quot;).getResult()}</Property>
+        <Property name="keyProperty">id</Property>
+        <Property name="valueProperty">name</Property>
+      </Property>
     </PropertyDef>
   </DataType>
   <DataType name="dtDicSlogan">

--
Gitblit v1.9.3