From d788dc245d3c69e5499cc342725446ca770a4c3d Mon Sep 17 00:00:00 2001 From: zhubaomin <zhubaomin> Date: 星期五, 20 九月 2024 15:49:44 +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 | 90 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 87 insertions(+), 3 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 5b007fd..ade2283 100644 --- a/pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml +++ b/pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml @@ -10,7 +10,15 @@ </city> </province> </districts> - <user name="瓒呯骇绠$悊鍛�" phone="admin" password="admin" supperAdmin="1" /> + <dictionaries> + <dict code="protocol" title="鍗忚" 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" /> + </dictItem> + </dict> + </dictionaries> + <user name="瓒呯骇绠$悊鍛�" phone="admin" password="dyyjy" supperAdmin="1" /> <payments> <item1 name="鐜伴噾"/> <item2 name="寰俊鏀粯"/> @@ -18,8 +26,8 @@ <item4 name="閾惰杞处"/> </payments> <settings> - <item1 item_name="lng" item_value="101.87345" remarks="缁忓害"/> - <item2 item_name="lat" item_value="25.70424" remarks="绾害"/> + <item1 item_name="lng" item_value="101.89878161146011" remarks="缁忓害"/> + <item2 item_name="lat" item_value="25.673963608371185" remarks="绾害"/> </settings> <waterTypes> <item1 typeName="鐏屾簤鐢ㄦ按"/> @@ -28,6 +36,17 @@ <item4 typeName="鍏绘畺鐢ㄦ按"/> <item5 typeName="缁垮寲鐢ㄦ按"/> </waterTypes> + <waterPrice price="0.90" /> + <irrigateProfile> + <item1 defaultValue = "10" unit = "2" sort = "1" type = "1"/> + <item2 defaultValue = "20" unit = "2" sort = "2" type = "1" /> + <item3 defaultValue = "1" unit = "1" sort = "3" type = "1"/> + <item4 defaultValue = "2" unit = "1" sort = "4" type = "1"/> + <item5 defaultValue = "20" unit = "3" sort = "1" type = "2"/> + <item6 defaultValue = "30" unit = "3" sort = "2" type = "2"/> + <item7 defaultValue = "50" unit = "3" sort = "3" type = "2"/> + <item8 defaultValue = "80" unit = "3" sort = "4" type = "2"/> + </irrigateProfile> </org1> <org2 tag="pj" name="鐗囪" enable="false"> <districts> @@ -37,6 +56,14 @@ </city> </province> </districts> + <dictionaries> + <dict code="protocol" title="鍗忚" 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" /> + </dictItem> + </dict> + </dictionaries> <user name="瓒呯骇绠$悊鍛�" phone="admin" password="admin" supperAdmin="1" /> <payments> <item1 name="鐜伴噾"/> @@ -55,6 +82,63 @@ <item4 typeName="鍏绘畺鐢ㄦ按"/> <item5 typeName="缁垮寲鐢ㄦ按"/> </waterTypes> + <waterPrice price="0.90" /> + <irrigateProfile> + <item1 defaultValue = "10" unit = "2" sort = "1" type = "1"/> + <item2 defaultValue = "20" unit = "2" sort = "2" type = "1" /> + <item3 defaultValue = "1" unit = "1" sort = "3" type = "1"/> + <item4 defaultValue = "2" unit = "1" sort = "4" type = "1"/> + <item5 defaultValue = "20" unit = "3" sort = "1" type = "2"/> + <item6 defaultValue = "30" unit = "3" sort = "2" type = "2"/> + <item7 defaultValue = "50" unit = "3" sort = "3" type = "2"/> + <item8 defaultValue = "80" unit = "3" sort = "4" type = "2"/> + </irrigateProfile> </org2> + <org3 tag="test" name="娴嬭瘯" enable="true"> + <districts> + <province name="澶╂触甯�" num="12" level="0"> + <city name="甯傝緰鍖�" num="01" level="1"> + <country name="姝︽竻鍖�" num="14" level="2" /> + </city> + </province> + </districts> + <dictionaries> + <dict code="protocol" title="鍗忚" 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" /> + </dictItem> + </dict> + </dictionaries> + <user name="瓒呯骇绠$悊鍛�" phone="admin" password="admin" supperAdmin="1" /> + <payments> + <item1 name="鐜伴噾"/> + <item2 name="寰俊鏀粯"/> + <item3 name="鏀粯瀹濇敮浠�"/> + <item4 name="閾惰杞处"/> + </payments> + <settings> + <item1 item_name="lng" item_value="101.87345" remarks="缁忓害"/> + <item2 item_name="lat" item_value="25.70424" remarks="绾害"/> + </settings> + <waterTypes> + <item1 typeName="鐏屾簤鐢ㄦ按"/> + <item2 typeName="宸ヤ笟鐢ㄦ按"/> + <item3 typeName="鐢熸椿鐢ㄦ按"/> + <item4 typeName="鍏绘畺鐢ㄦ按"/> + <item5 typeName="缁垮寲鐢ㄦ按"/> + </waterTypes> + <waterPrice price="0.90" /> + <irrigateProfile> + <item1 defaultValue = "10" unit = "2" sort = "1" type = "1"/> + <item2 defaultValue = "20" unit = "2" sort = "2" type = "1" /> + <item3 defaultValue = "1" unit = "1" sort = "3" type = "1"/> + <item4 defaultValue = "2" unit = "1" sort = "4" type = "1"/> + <item5 defaultValue = "20" unit = "3" sort = "1" type = "2"/> + <item6 defaultValue = "30" unit = "3" sort = "2" type = "2"/> + <item7 defaultValue = "50" unit = "3" sort = "3" type = "2"/> + <item8 defaultValue = "80" unit = "3" sort = "4" type = "2"/> + </irrigateProfile> + </org3> </orgs> </config> \ No newline at end of file -- Gitblit v1.8.0