From bda423b1aae1d5322116511651ae03a54cdcd231 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 26 十一月 2024 17:25:39 +0800
Subject: [PATCH] 1、几个测试模块系统的log4j.xml配置中的编码修改； 2、RTU升级模拟器增加命令行设置服务端IP和端口功能； 3、应王江海要求，井电双控协议中也实现远程升级功能，因井电双控协议、阀控器协议不同，而双方协议中的升级子协议相同，所以通信中间件做增量开发、适应性修改，以适应这种混合协议情况，同时也提高通信中间件运行效率。
---
pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml | 51 +++++++++++++++++++++++++++++++++------------------
1 files changed, 33 insertions(+), 18 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 b3559b7..d8535a2 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml
@@ -52,13 +52,18 @@
<item8 defaultValue = "80" unit = "3" sort = "4" type = "2"/>
</irrigateProfile>
<rechargeProfile>
- <item1 rechargeAmount = "5000" sort = "1"/>
- <item2 rechargeAmount = "10000" sort = "2" />
- <item3 rechargeAmount = "20000" sort = "3"/>
- <item4 rechargeAmount = "30000" sort = "4"/>
- <item5 rechargeAmount = "50000" sort = "5"/>
- <item6 rechargeAmount = "100000" sort = "6"/>
+ <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="sp" name="娌欑洏" enable="true">
<districts>
@@ -110,13 +115,18 @@
<item8 defaultValue = "80" unit = "3" sort = "4" type = "2"/>
</irrigateProfile>
<rechargeProfile>
- <item1 rechargeAmount = "5000" sort = "1"/>
- <item2 rechargeAmount = "10000" sort = "2" />
- <item3 rechargeAmount = "20000" sort = "3"/>
- <item4 rechargeAmount = "30000" sort = "4"/>
- <item5 rechargeAmount = "50000" sort = "5"/>
- <item6 rechargeAmount = "100000" sort = "6"/>
+ <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="test" name="娴嬭瘯" enable="true">
<districts>
@@ -168,13 +178,18 @@
<item8 defaultValue = "80" unit = "3" sort = "4" type = "2"/>
</irrigateProfile>
<rechargeProfile>
- <item1 rechargeAmount = "5000" sort = "1"/>
- <item2 rechargeAmount = "10000" sort = "2" />
- <item3 rechargeAmount = "20000" sort = "3"/>
- <item4 rechargeAmount = "30000" sort = "4"/>
- <item5 rechargeAmount = "50000" sort = "5"/>
- <item6 rechargeAmount = "100000" sort = "6"/>
+ <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>
</orgs>
</config>
\ No newline at end of file
--
Gitblit v1.8.0