From 7243e0b4bd9a267a633d2e481e17646509b6868d Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期四, 07 九月 2023 19:36:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 igds-core/src/main/java/models/igds.model.xml |  113 +++++++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 95 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 7dd3e2f..8cc3fe8 100644
--- a/igds-core/src/main/java/models/igds.model.xml
+++ b/igds-core/src/main/java/models/igds.model.xml
@@ -313,6 +313,10 @@
       <Property></Property>
       <Property name="label">澶囨敞</Property>
     </PropertyDef>
+    <PropertyDef name="ggm">
+      <Property></Property>
+      <Property name="label">鍥借鐮�</Property>
+    </PropertyDef>
   </DataType>
   <DataType name="dtDepotStore">
     <Property name="creationType">com.ld.igds.models.DepotStore</Property>
@@ -340,6 +344,42 @@
     <PropertyDef name="country">
       <Property></Property>
       <Property name="label">鍥藉埆</Property>
+      <Property name="mapping">
+        <Property name="keyProperty">key</Property>
+        <Property name="valueProperty">value</Property>
+        <Property name="mapValues">
+          <Collection>
+            <Entity>
+              <Property name="key">156</Property>
+              <Property name="value">涓浗</Property>
+            </Entity>
+            <Entity>
+              <Property name="key">076</Property>
+              <Property name="value">宸磋タ</Property>
+            </Entity>
+            <Entity>
+              <Property name="key">124</Property>
+              <Property name="value">鍔犳嬁澶�</Property>
+            </Entity>
+            <Entity>
+              <Property name="key">036</Property>
+              <Property name="value">婢冲ぇ鍒╀簹</Property>
+            </Entity>
+            <Entity>
+              <Property name="key">356</Property>
+              <Property name="value">鍗板害</Property>
+            </Entity>
+            <Entity>
+              <Property name="key">764</Property>
+              <Property name="value">娉板浗</Property>
+            </Entity>
+            <Entity>
+              <Property name="key">840</Property>
+              <Property name="value">缇庡浗</Property>
+            </Entity>
+          </Collection>
+        </Property>
+      </Property>
     </PropertyDef>
     <PropertyDef name="manageType">
       <Property></Property>
@@ -478,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>
@@ -508,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>
@@ -562,6 +606,22 @@
     <PropertyDef name="locationName">
       <Property></Property>
       <Property name="label">浣嶇疆</Property>
+    </PropertyDef>
+    <PropertyDef name="ext1">
+      <Property></Property>
+      <Property name="label">鎵╁睍瀛楁1</Property>
+    </PropertyDef>
+    <PropertyDef name="ext2">
+      <Property></Property>
+      <Property name="label">鎵╁睍瀛楁2</Property>
+    </PropertyDef>
+    <PropertyDef name="ext3">
+      <Property></Property>
+      <Property name="label">鎵╁睍瀛楁3</Property>
+    </PropertyDef>
+    <PropertyDef name="statusName">
+      <Property></Property>
+      <Property name="label">褰撳墠鐘舵��</Property>
     </PropertyDef>
   </DataType>
   <DataType name="dtDeviceSer">
@@ -811,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>
@@ -880,6 +922,14 @@
         <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#triggerStartPoint&quot;).getResult()}</Property>
       </Property>
     </PropertyDef>
+    <PropertyDef name="startConvert">
+      <Property name="label">灞傝杞崲</Property>
+      <Property name="mapping">
+        <Property name="keyProperty">code</Property>
+        <Property name="valueProperty">name</Property>
+        <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#triggerStartConvert&quot;).getResult()}</Property>
+      </Property>
+    </PropertyDef>
     <PropertyDef name="depotName">
       <Property></Property>
     </PropertyDef>
@@ -894,6 +944,33 @@
         <Property name="valueProperty">name</Property>
       </Property>
     </PropertyDef>
+    <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">
     <Property name="creationType">com.ld.igds.models.DicSlogan</Property>

--
Gitblit v1.9.3