From 9c49930966edbe0f24e62e38f58c2d3e453976b3 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期三, 23 八月 2023 15:51:39 +0800
Subject: [PATCH] 更新MODBUS-TCP协议 4
---
igds-core/src/main/java/models/igds.model.xml | 60 ++++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 48 insertions(+), 12 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..933f79a 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>
@@ -317,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>
@@ -344,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>
@@ -482,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>
@@ -512,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>
@@ -567,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>
--
Gitblit v1.9.3