From d1e380d5bc8d6cda7dc26778dd638b3367483ae7 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期五, 11 四月 2025 17:27:30 +0800
Subject: [PATCH] 小程序6种开关阀操作失败时重发一次
---
pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml | 268 +++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 245 insertions(+), 23 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 8e726f1..a8b54fa 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml
@@ -11,24 +11,27 @@
</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>
- <user name="瓒呯骇绠＄悊鍛�" phone="admin" password="admin" supperAdmin="1" />
+ <user name="瓒呯骇绠＄悊鍛�" phone="admin" password="dyyjy" supperAdmin="1" />
<payments>
<item1 name="鐜伴噾"/>
- <item2 name="寰俊鏀粯"/>
- <item3 name="鏀粯瀹濇敮浠�"/>
- <item4 name="閾惰杞处"/>
- <item5 name="鎹㈠崱"/>
+ <item2 name="POS鏈�"/>
+ <item3 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="绾害"/>
+ <item3 item_name="zoomMp" item_value="12" remarks="鎵嬫満鍦板浘缂╂斁绾у埆"/>
+ <item4 item_name="zoomPc" item_value="19" remarks="PC鏈哄湴鍥剧缉鏀剧骇鍒�"/>
+ <item5 item_name="projectName" item_value="楂樻晥鏅烘収绠＄亴寰亴浜戞湇鍔＄鐞嗗钩鍙�" remarks="椤圭洰鍚嶇О"/>
</settings>
<waterTypes>
<item1 typeName="鐏屾簤鐢ㄦ按"/>
@@ -48,33 +51,50 @@
<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>
+ <taskType>
+ <item1 typeName="璁惧瀹夎"/>
+ <item2 typeName="璁惧缁翠慨"/>
+ <item3 typeName="璁惧淇濆吇"/>
+ </taskType>
</org1>
- <org2 tag="pj" name="鐗囪" enable="false">
+ <org2 tag="mj" 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="36" level="0">
+ <city name="璧ｅ窞甯�" num="07" level="1">
+ <country name="瀹侀兘鍘�" num="30" 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>
- <user name="瓒呯骇绠＄悊鍛�" phone="admin" password="admin" supperAdmin="1" />
+ <user name="瓒呯骇绠＄悊鍛�" phone="admin" password="dyyjy" supperAdmin="1" />
<payments>
<item1 name="鐜伴噾"/>
- <item2 name="寰俊鏀粯"/>
- <item3 name="鏀粯瀹濇敮浠�"/>
- <item4 name="閾惰杞处"/>
+ <item2 name="POS鏈�"/>
+ <item3 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="116.00433826446535" remarks="缁忓害"/>
+ <item2 item_name="lat" item_value="26.473821341291966" remarks="绾害"/>
+ <item3 item_name="zoomMp" item_value="12" remarks="鎵嬫満鍦板浘缂╂斁绾у埆"/>
+ <item4 item_name="zoomPc" item_value="19" remarks="PC鏈哄湴鍥剧缉鏀剧骇鍒�"/>
+ <item5 item_name="projectName" item_value="楂樻晥鏅烘収绠＄亴寰亴浜戞湇鍔＄鐞嗗钩鍙�" remarks="椤圭洰鍚嶇О"/>
</settings>
<waterTypes>
<item1 typeName="鐏屾簤鐢ㄦ按"/>
@@ -94,6 +114,208 @@
<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>
+ <taskType>
+ <item1 typeName="璁惧瀹夎"/>
+ <item2 typeName="璁惧缁翠慨"/>
+ <item3 typeName="璁惧淇濆吇"/>
+ </taskType>
</org2>
+ <org3 tag="sp" name="娌欑洏" enable="true">
+ <districts>
+ <province name="鐢樿們鐪�" num="62" level="0">
+ <city name="閰掓硥甯�" num="09" level="1">
+ <country name="鑲冨窞鍖�" num="02" level="2" />
+ </city>
+ </province>
+ </districts>
+ <dictionaries>
+ <dict code="icProtocol" title="IC鍗″崗璁�" valueType="2">
+ <dictItem>
+ <!-- 闈冲缓浼熺増鏈琁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>
+ <user name="瓒呯骇绠＄悊鍛�" phone="admin" password="admin" supperAdmin="1" />
+ <payments>
+ <item1 name="鐜伴噾"/>
+ <item2 name="POS鏈�"/>
+ <item3 name="閾惰杞处"/>
+ </payments>
+ <settings>
+ <item1 item_name="lng" item_value="101.87345" remarks="缁忓害"/>
+ <item2 item_name="lat" item_value="25.70424" remarks="绾害"/>
+ <item3 item_name="zoomMp" item_value="12" remarks="鎵嬫満鍦板浘缂╂斁绾у埆"/>
+ <item4 item_name="zoomPc" item_value="19" remarks="PC鏈哄湴鍥剧缉鏀剧骇鍒�"/>
+ <item5 item_name="projectName" item_value="楂樻晥鏅烘収绠＄亴寰亴浜戞湇鍔＄鐞嗗钩鍙�" 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>
+ <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>
+ <taskType>
+ <item1 typeName="璁惧瀹夎"/>
+ <item2 typeName="璁惧缁翠慨"/>
+ <item3 typeName="璁惧淇濆吇"/>
+ </taskType>
+ </org3>
+ <org4 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="icProtocol" title="IC鍗″崗璁�" valueType="2">
+ <dictItem>
+ <!-- 闈冲缓浼熺増鏈琁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>
+ <user name="瓒呯骇绠＄悊鍛�" phone="admin" password="admin" supperAdmin="1" />
+ <payments>
+ <item1 name="鐜伴噾"/>
+ <item2 name="POS鏈�"/>
+ <item3 name="閾惰杞处"/>
+ </payments>
+ <settings>
+ <item1 item_name="lng" item_value="101.87345" remarks="缁忓害"/>
+ <item2 item_name="lat" item_value="25.70424" remarks="绾害"/>
+ <item3 item_name="zoomMp" item_value="12" remarks="鎵嬫満鍦板浘缂╂斁绾у埆"/>
+ <item4 item_name="zoomPc" item_value="19" remarks="PC鏈哄湴鍥剧缉鏀剧骇鍒�"/>
+ <item5 item_name="projectName" item_value="楂樻晥鏅烘収绠＄亴寰亴浜戞湇鍔＄鐞嗗钩鍙�" 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>
+ <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>
+ <taskType>
+ <item1 typeName="璁惧瀹夎"/>
+ <item2 typeName="璁惧缁翠慨"/>
+ <item3 typeName="璁惧淇濆吇"/>
+ </taskType>
+ </org4>
+ <org5 tag="mq" name="姘戝嫟" enable="true">
+ <districts>
+ <province name="鐢樿們鐪�" num="62" level="0">
+ <city name="姝﹀▉甯�" num="06" level="1">
+ <country name="姘戝嫟鍘�" num="21" level="2" />
+ </city>
+ </province>
+ </districts>
+ <dictionaries>
+ <dict code="icProtocol" title="IC鍗″崗璁�" valueType="2">
+ <dictItem>
+ <!-- 闈冲缓浼熺増鏈琁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>
+ <user name="瓒呯骇绠＄悊鍛�" phone="admin" password="dyyjy" supperAdmin="1" />
+ <payments>
+ <item1 name="鐜伴噾"/>
+ <item2 name="POS鏈�"/>
+ <item3 name="閾惰杞处"/>
+ </payments>
+ <settings>
+ <item1 item_name="lng" item_value="103.09122920036317" remarks="缁忓害"/>
+ <item2 item_name="lat" item_value="38.62387375005241" remarks="绾害"/>
+ <item3 item_name="zoomMp" item_value="12" remarks="鎵嬫満鍦板浘缂╂斁绾у埆"/>
+ <item4 item_name="zoomPc" item_value="19" remarks="PC鏈哄湴鍥剧缉鏀剧骇鍒�"/>
+ <item5 item_name="projectName" item_value="楂樻晥鏅烘収绠＄亴寰亴浜戞湇鍔＄鐞嗗钩鍙�" 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>
+ <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>
+ <taskType>
+ <item1 typeName="璁惧瀹夎"/>
+ <item2 typeName="璁惧缁翠慨"/>
+ <item3 typeName="璁惧淇濆吇"/>
+ </taskType>
+ </org5>
</orgs>
</config>
\ No newline at end of file
--
Gitblit v1.8.0