From 9dccc035980f0a770c2e492cc2987f75de868640 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期二, 24 十月 2023 09:46:53 +0800
Subject: [PATCH] 西藏山南项目

---
 igds-core/src/main/java/models/igds.model.xml |   72 +++++++++++++++++++++--------------
 1 files changed, 43 insertions(+), 29 deletions(-)

diff --git a/igds-core/src/main/java/models/igds.model.xml b/igds-core/src/main/java/models/igds.model.xml
index 791ffe0..49293d4 100644
--- a/igds-core/src/main/java/models/igds.model.xml
+++ b/igds-core/src/main/java/models/igds.model.xml
@@ -97,13 +97,18 @@
       <Property name="displayFormat">0.00 绫�</Property>
     </PropertyDef>
     <PropertyDef name="diameter">
-      <Property name="label">绛掍粨鐩村緞</Property>
-      <Property name="displayFormat">0.00 绫�</Property>
+      <Property name="label">绛掍粨/娌圭綈鐩村緞</Property>
+      <Property name="displayFormat">0.000 绫�</Property>
       <Property name="dataType">Double</Property>
     </PropertyDef>
     <PropertyDef name="volume">
       <Property name="label">绛掍粨浣撶Н</Property>
-      <Property name="displayFormat">0.00 绔嬫柟绫�</Property>
+      <Property name="displayFormat">0.000 绔嬫柟绫�</Property>
+      <Property name="dataType">Double</Property>
+    </PropertyDef>
+    <PropertyDef name="deVolume">
+      <Property name="label">鎵ｉ櫎浣撶Н</Property>
+      <Property name="displayFormat">0.000 绔嬫柟绫�</Property>
       <Property name="dataType">Double</Property>
     </PropertyDef>
     <PropertyDef name="doorNum">
@@ -518,14 +523,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 +556,7 @@
         <Property name="keyProperty">id</Property>
         <Property name="valueProperty">name</Property>
       </Property>
+      <Property name="required">true</Property>
     </PropertyDef>
     <PropertyDef name="type">
       <Property></Property>
@@ -602,14 +611,6 @@
     <PropertyDef name="locationName">
       <Property></Property>
       <Property name="label">浣嶇疆</Property>
-    </PropertyDef>
-    <PropertyDef name="modbus">
-      <Property></Property>
-      <Property name="label">Modbus閰嶇疆</Property>
-    </PropertyDef>
-    <PropertyDef name="linkModbus">
-      <Property/>
-      <Property name="label">鍏宠仈璁惧Modbus</Property>
     </PropertyDef>
     <PropertyDef name="ext1">
       <Property></Property>
@@ -875,24 +876,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>
@@ -944,6 +927,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>
@@ -961,6 +952,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