From d3d7078262d784444fe6cda3d7065b75981aa1f1 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期二, 05 十一月 2024 16:10:50 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml | 56 +++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 43 insertions(+), 13 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml b/pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml
index 4dfa85b..f015a6c 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml
@@ -11,10 +11,12 @@
</province>
</districts>
<dictionaries>
- <dict code="protocol" title="鍗忚" valueType="2">
+ <dict code="icProtocol" title="IC鍗″崗璁�" valueType="2">
<dictItem>
- <item1 dictCode="protocol" value="p206V1_0_1" name="鑰佸崗璁�" status="1" sort="0" />
- <item2 dictCode="protocol" value="p206V202404" name="鏂板崗璁�" status="0" sort="1" />
+ <!-- 闈冲缓浼熺増鏈琁C鍗″崗璁� 鍗′腑缂栧彿宸茬粡鍔犻暱锛堜笌鐜嬫睙娴风増鏈竴鑷达級锛屼笌绾�佺増鏈崗璁笉鍚� -->
+ <item1 dictCode="icProtocol" value="icP202203" name="鑰佸崱鍗忚" status="1" sort="0" />
+ <!-- 鐜嬫睙娴风増鏈琁C鍗″崗璁� -->
+ <item2 dictCode="icProtocol" value="icP202404" name="鏂板崱鍗忚" status="0" sort="1" />
</dictItem>
</dict>
</dictionaries>
@@ -49,20 +51,30 @@
<item7 defaultValue = "50" unit = "3" sort = "3" type = "2"/>
<item8 defaultValue = "80" unit = "3" sort = "4" type = "2"/>
</irrigateProfile>
+ <rechargeProfile>
+ <item1 rechargeAmount = "50" sort = "1"/>
+ <item2 rechargeAmount = "100" sort = "2" />
+ <item3 rechargeAmount = "200" sort = "3"/>
+ <item4 rechargeAmount = "300" sort = "4"/>
+ <item5 rechargeAmount = "500" sort = "5"/>
+ <item6 rechargeAmount = "1000" sort = "6"/>
+ </rechargeProfile>
</org1>
- <org2 tag="sp" name="娌欑洏" enable="false">
+ <org2 tag="sp" name="娌欑洏" enable="true">
<districts>
- <province name="鐢樿們鐪�" num="53" level="0">
- <city name="閰掓硥甯�" num="23" level="1">
- <country name="澶х闆嗗洟" num="28" level="2" />
+ <province name="鐢樿們鐪�" num="62" level="0">
+ <city name="閰掓硥甯�" num="09" level="1">
+ <country name="鑲冨窞鍖�" num="02" level="2" />
</city>
</province>
</districts>
<dictionaries>
- <dict code="protocol" title="鍗忚" valueType="2">
+ <dict code="icProtocol" title="IC鍗″崗璁�" valueType="2">
<dictItem>
- <item1 dictCode="protocol" value="p206V1_0_1" name="鑰佸崗璁�" status="1" sort="0" />
- <item2 dictCode="protocol" value="p206V202404" name="鏂板崗璁�" status="0" sort="1" />
+ <!-- 闈冲缓浼熺増鏈琁C鍗″崗璁� 鍗′腑缂栧彿宸茬粡鍔犻暱锛堜笌鐜嬫睙娴风増鏈竴鑷达級锛屼笌绾�佺増鏈崗璁笉鍚� -->
+ <item1 dictCode="icProtocol" value="icP202203" name="鑰佸崱鍗忚" status="1" sort="0" />
+ <!-- 鐜嬫睙娴风増鏈琁C鍗″崗璁� -->
+ <item2 dictCode="icProtocol" value="icP202404" name="鏂板崱鍗忚" status="0" sort="1" />
</dictItem>
</dict>
</dictionaries>
@@ -97,6 +109,14 @@
<item7 defaultValue = "50" unit = "3" sort = "3" type = "2"/>
<item8 defaultValue = "80" unit = "3" sort = "4" type = "2"/>
</irrigateProfile>
+ <rechargeProfile>
+ <item1 rechargeAmount = "50" sort = "1"/>
+ <item2 rechargeAmount = "100" sort = "2" />
+ <item3 rechargeAmount = "200" sort = "3"/>
+ <item4 rechargeAmount = "300" sort = "4"/>
+ <item5 rechargeAmount = "500" sort = "5"/>
+ <item6 rechargeAmount = "1000" sort = "6"/>
+ </rechargeProfile>
</org2>
<org3 tag="test" name="娴嬭瘯" enable="true">
<districts>
@@ -107,10 +127,12 @@
</province>
</districts>
<dictionaries>
- <dict code="protocol" title="鍗忚" valueType="2">
+ <dict code="icProtocol" title="IC鍗″崗璁�" valueType="2">
<dictItem>
- <item1 dictCode="protocol" value="p206V1_0_1" name="鑰佸崗璁�" status="1" sort="0" />
- <item2 dictCode="protocol" value="p206V202404" name="鏂板崗璁�" status="0" sort="1" />
+ <!-- 闈冲缓浼熺増鏈琁C鍗″崗璁� 鍗′腑缂栧彿宸茬粡鍔犻暱锛堜笌鐜嬫睙娴风増鏈竴鑷达級锛屼笌绾�佺増鏈崗璁笉鍚� -->
+ <item1 dictCode="icProtocol" value="icP202203" name="鑰佸崱鍗忚" status="1" sort="0" />
+ <!-- 鐜嬫睙娴风増鏈琁C鍗″崗璁� -->
+ <item2 dictCode="icProtocol" value="icP202404" name="鏂板崱鍗忚" status="0" sort="1" />
</dictItem>
</dict>
</dictionaries>
@@ -145,6 +167,14 @@
<item7 defaultValue = "50" unit = "3" sort = "3" type = "2"/>
<item8 defaultValue = "80" unit = "3" sort = "4" type = "2"/>
</irrigateProfile>
+ <rechargeProfile>
+ <item1 rechargeAmount = "50" sort = "1"/>
+ <item2 rechargeAmount = "100" sort = "2" />
+ <item3 rechargeAmount = "200" sort = "3"/>
+ <item4 rechargeAmount = "300" sort = "4"/>
+ <item5 rechargeAmount = "500" sort = "5"/>
+ <item6 rechargeAmount = "1000" sort = "6"/>
+ </rechargeProfile>
</org3>
</orgs>
</config>
\ No newline at end of file
--
Gitblit v1.8.0