From 2884bf1f32b51129a83125ecfc2cf8526f71154f Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期四, 24 八月 2023 15:34:43 +0800
Subject: [PATCH] 更新MODBUS-TCP协议 4

---
 igds-core/src/main/java/models/igds.model.xml |   41 +++++++++++++++++++++++------------------
 1 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/igds-core/src/main/java/models/igds.model.xml b/igds-core/src/main/java/models/igds.model.xml
index 933f79a..861700c 100644
--- a/igds-core/src/main/java/models/igds.model.xml
+++ b/igds-core/src/main/java/models/igds.model.xml
@@ -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