From 73f74cbf665a431b0db474be129a03c655e2338a Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期五, 25 八月 2023 13:30:03 +0800
Subject: [PATCH] 更新MODBUS-TCP协议，添加GasModus的配置
---
igds-core/src/main/java/models/igds.model.xml | 117 ++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 93 insertions(+), 24 deletions(-)
diff --git a/igds-core/src/main/java/models/igds.model.xml b/igds-core/src/main/java/models/igds.model.xml
index ad7405b..861700c 100644
--- a/igds-core/src/main/java/models/igds.model.xml
+++ b/igds-core/src/main/java/models/igds.model.xml
@@ -194,12 +194,12 @@
<Property name="keyProperty">id</Property>
<Property name="valueProperty">name</Property>
</Property>
- <Property name="required">true</Property>
+ <Property name="required">false</Property>
</PropertyDef>
<PropertyDef name="granaryId">
<Property></Property>
<Property name="label">鎵�灞炲粧闂�</Property>
- <Property name="required">true</Property>
+ <Property name="required">false</Property>
</PropertyDef>
<PropertyDef name="depotType">
<Property></Property>
@@ -231,7 +231,7 @@
<Property name="dataType">Double</Property>
<Property name="label">瀹為檯鍌ㄩ噺</Property>
<Property name="displayFormat">#,##0 KG</Property>
- <Property name="required">true</Property>
+ <Property name="required">false</Property>
</PropertyDef>
<PropertyDef name="storeType">
<Property></Property>
@@ -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("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>
@@ -891,6 +933,33 @@
<Property name="mapping">
<Property name="mapValues">${dorado.getDataProvider("depotPR#triggerCableCone").getResult()}</Property>
<Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ </PropertyDef>
+ <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>
@@ -1263,15 +1332,15 @@
<Property name="label">绫诲瀷</Property>
</PropertyDef>
<PropertyDef name="simple">
- <Property/>
+ <Property></Property>
<Property name="label">绠�鎷�</Property>
</PropertyDef>
<PropertyDef name="disabledTag">
- <Property/>
+ <Property></Property>
<Property name="label">鏄惁绂佺敤</Property>
</PropertyDef>
<PropertyDef name="remark">
- <Property/>
+ <Property></Property>
<Property name="label">澶囨敞淇℃伅</Property>
</PropertyDef>
</DataType>
--
Gitblit v1.9.3