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 | 62 ++++++++++++++++++++++++++++++ 1 files changed, 61 insertions(+), 1 deletions(-) diff --git a/igds-core/src/main/java/models/igds.model.xml b/igds-core/src/main/java/models/igds.model.xml index c1570ad..933f79a 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"> @@ -895,7 +955,7 @@ </Property> </PropertyDef> <PropertyDef name="gasSer"> - <Property/> + <Property></Property> <Property name="label">姘斾綋鍒嗘満</Property> </PropertyDef> </DataType> -- Gitblit v1.9.3