From 8728429603cdb25b5fc6245915dc829e78d81571 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期二, 31 十月 2023 21:33:53 +0800
Subject: [PATCH] 船运问题
---
igds-core/src/main/java/models/igds.model.xml | 120 +++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 87 insertions(+), 33 deletions(-)
diff --git a/igds-core/src/main/java/models/igds.model.xml b/igds-core/src/main/java/models/igds.model.xml
index 3ac10d3..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">
@@ -153,10 +158,6 @@
<Property name="keyProperty">code</Property>
<Property name="valueProperty">name</Property>
</Property>
- </PropertyDef>
- <PropertyDef name="ggm">
- <Property></Property>
- <Property name="label">鍥借鐮�</Property>
</PropertyDef>
</DataType>
<DataType name="dtDepot">
@@ -317,6 +318,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>
@@ -344,6 +349,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>
@@ -482,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>
@@ -512,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>
@@ -567,24 +612,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>
@@ -835,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("securityPR#listCamera").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("deviceSerPR2#getSerCacheByType").getResult("99")}</Property>
- <Property name="keyProperty">id</Property>
- <Property name="valueProperty">name</Property>
- </Property>
- </PropertyDef>
<PropertyDef name="thSer">
<Property></Property>
<Property name="label">娓╂箍搴﹀垎鏈�</Property>
@@ -904,6 +927,14 @@
<Property name="mapValues">${dorado.getDataProvider("depotPR#triggerStartPoint").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("depotPR#triggerStartConvert").getResult()}</Property>
+ </Property>
+ </PropertyDef>
<PropertyDef name="depotName">
<Property></Property>
</PropertyDef>
@@ -921,6 +952,29 @@
<PropertyDef name="gasSer">
<Property></Property>
<Property name="label">姘斾綋鍒嗘満</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("deviceSerPR#getAllSerCache").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("deviceSerPR#getAllSerCache").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("deviceSerPR#getAllSerCache").getResult()}</Property>
+ <Property name="keyProperty">id</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
</PropertyDef>
</DataType>
<DataType name="dtDicSlogan">
--
Gitblit v1.9.3