From 001f24d4efd7b818bc2224b976c82faf4f9e564c Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 01 十一月 2024 11:25:00 +0800
Subject: [PATCH] 1、通信协议要增加版本号（目的为远程升级准备），原来没有版本号的协议默认为版本号为1，所以调整了程序命名； 2、流浪控制器与控制器数据库表都增加了协议版本号字段； 3、VO中Double和Float类型的属性增加注解@JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
---
pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml | 44 +++++++++++++++++++++++++-------------------
1 files changed, 25 insertions(+), 19 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 5e36442..abf23ac 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml
@@ -13,21 +13,23 @@
<dictionaries>
<dict code="protocol" title="鍗忚" valueType="2">
<dictItem>
- <item1 dictCode="protocol" value="p206V1_0_1" name="鑰佸崗璁�" status="1" sort="0" />
+ <item1 dictCode="protocol" value="p206V1" 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" />
+ <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="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,18 +50,18 @@
<item8 defaultValue = "80" unit = "3" sort = "4" type = "2"/>
</irrigateProfile>
</org1>
- <org2 tag="pj" 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">
<dictItem>
- <item1 dictCode="protocol" value="p206V1_0_1" name="鑰佸崗璁�" status="1" sort="0" />
+ <item1 dictCode="protocol" value="p206V1" name="鑰佸崗璁�" status="1" sort="0" />
<item2 dictCode="protocol" value="p206V202404" name="鏂板崗璁�" status="0" sort="1" />
</dictItem>
</dict>
@@ -67,13 +69,15 @@
<user name="瓒呯骇绠＄悊鍛�" phone="admin" password="admin" 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="绾害"/>
+ <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="鐏屾簤鐢ㄦ按"/>
@@ -105,7 +109,7 @@
<dictionaries>
<dict code="protocol" title="鍗忚" valueType="2">
<dictItem>
- <item1 dictCode="protocol" value="p206V1_0_1" name="鑰佸崗璁�" status="1" sort="0" />
+ <item1 dictCode="protocol" value="p206V1" name="鑰佸崗璁�" status="1" sort="0" />
<item2 dictCode="protocol" value="p206V202404" name="鏂板崗璁�" status="0" sort="1" />
</dictItem>
</dict>
@@ -113,13 +117,15 @@
<user name="瓒呯骇绠＄悊鍛�" phone="admin" password="admin" 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="绾害"/>
+ <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="鐏屾簤鐢ㄦ按"/>
--
Gitblit v1.8.0