From dbb4ac17ff70578662af99c6b1772b5c0641d005 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 20 十一月 2024 18:48:23 +0800
Subject: [PATCH] 1、基于Timer实现定时执行的任务，并在满足条件下结束定时任务，为此实现抽象类TimerTaskJob类，并在UpgradeManager类中应用； 2、TreadJob类由TimerTaskJob替换，弃用TreadJob类。
---
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