From 3c6efb35ff0ebcca6e7104c20cde64825fddd59d Mon Sep 17 00:00:00 2001 From: YYC <1833023622@qq.com> Date: 星期四, 07 九月 2023 19:35:24 +0800 Subject: [PATCH] 添加数据 --- igds-core/src/main/java/models/igds.model.xml | 112 +++++++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 83 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 c2e1770..791ffe0 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> @@ -562,6 +602,30 @@ <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> + <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"> @@ -894,6 +958,10 @@ <Property name="valueProperty">name</Property> </Property> </PropertyDef> + <PropertyDef name="gasSer"> + <Property></Property> + <Property name="label">姘斾綋鍒嗘満</Property> + </PropertyDef> </DataType> <DataType name="dtDicSlogan"> <Property name="creationType">com.ld.igds.models.DicSlogan</Property> @@ -1095,32 +1163,6 @@ <Property name="label">椤甸潰涓殑鍧愭爣</Property> </PropertyDef> </DataType> - <DataType name="dtFoodOrigin"> - <Property name="creationType">com.ld.igds.models.DicFoodOrigin</Property> - <PropertyDef name="id"> - <Property name="dataType">int</Property> - </PropertyDef> - <PropertyDef name="code"> - <Property></Property> - <Property name="label">浜у湴缂栫爜</Property> - </PropertyDef> - <PropertyDef name="name"> - <Property></Property> - <Property name="label">浜у湴鍚嶇О</Property> - </PropertyDef> - <PropertyDef name="sort"> - <Property name="dataType">int</Property> - <Property name="label">鎺掑簭</Property> - </PropertyDef> - <PropertyDef name="simple"> - <Property></Property> - <Property name="label">浜у湴绠�鎷�</Property> - </PropertyDef> - <PropertyDef name="disabledTag"> - <Property></Property> - <Property name="label">鏄惁绂佺敤</Property> - </PropertyDef> - </DataType> <DataType name="dtSecFire"> <Property name="creationType">com.ld.igds.models.SecFire</Property> <PropertyDef name="id"> @@ -1288,6 +1330,18 @@ <PropertyDef name="type"> <Property name="label">绫诲瀷</Property> </PropertyDef> + <PropertyDef name="simple"> + <Property></Property> + <Property name="label">绠�鎷�</Property> + </PropertyDef> + <PropertyDef name="disabledTag"> + <Property></Property> + <Property name="label">鏄惁绂佺敤</Property> + </PropertyDef> + <PropertyDef name="remark"> + <Property></Property> + <Property name="label">澶囨敞淇℃伅</Property> + </PropertyDef> </DataType> <DataType name="dtFileData"> <Property name="creationType">com.ld.igds.file.dto.FileData</Property> -- Gitblit v1.9.3