定时器修改

gic-cloud-data-hook-service/src/main/java/com/gic/cloud/data/hook/service/impl/FlatQueryResultServiceImpl.java

@@ -21,6 +21,7 @@ import com.opencsv.ResultSetHelper;
 import io.netty.handler.codec.http.HttpUtil;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.concurrent.BasicThreadFactory;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
@@ -38,6 +39,9 @@ import java.sql.*;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.Date;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
@@ -502,11 +506,13 @@ public class FlatQueryResultServiceImpl implements IFlatQueryResultService {
 
 
 	/** 下载任务执行计时器 */
-	private Timer downloadTaskTimer = new Timer();
+	//private Timer downloadTaskTimer = new Timer();
+	ScheduledExecutorService downloadService = new ScheduledThreadPoolExecutor(1,
+			new BasicThreadFactory.Builder().namingPattern("applyTimer-%d").daemon(true).build());
 
 	/** 启动自助指标查询计划任务 */
 	private void runDownloadTask(Integer interval) {
-		this.downloadTaskTimer.schedule(new TimerTask() {
+		downloadService.scheduleAtFixedRate(new Runnable() {
 			@Override
 			public void run() {
 				try{
@@ -684,18 +690,19 @@ public class FlatQueryResultServiceImpl implements IFlatQueryResultService {
 					log.debug("自助指标下载异常", e.getMessage());
 					e.printStackTrace();
 				}
-			} // run Define Over
-		}, interval * 1000, interval * 1000);// 配置中的值为毫秒
+			}
+		}, interval*1000, interval*1000, TimeUnit.MILLISECONDS);
 	}
 
 
 
 	/** 下载任务执行计时器 */
-	private Timer balaDownloadTaskTimer = new Timer();
-
+	//private Timer balaDownloadTaskTimer = new Timer();
+	ScheduledExecutorService balaDownloadService = new ScheduledThreadPoolExecutor(1,
+			new BasicThreadFactory.Builder().namingPattern("balaDownloadTimer-%d").daemon(true).build());
 	/** 启动自助指标查询计划任务 */
 	private void runBalaDownloadTask(Integer interval) {
-		this.balaDownloadTaskTimer.schedule(new TimerTask() {
+		this.balaDownloadService.scheduleAtFixedRate(new Runnable() {
 			@Override
 			public void run() {
 				try{
@@ -872,19 +879,19 @@ public class FlatQueryResultServiceImpl implements IFlatQueryResultService {
 					log.debug("自助指标下载异常", e.getMessage());
 					e.printStackTrace();
 				}
-			} // run Define Over
-		}, interval * 1000, interval * 1000);// 配置中的值为毫秒
+			}
+		}, interval*1000, interval*1000, TimeUnit.MILLISECONDS);
 	}
 
 
 	/** 下载申请检查计时器 */
-	private Timer applyTimer = new Timer();
+	//private Timer applyTimer = new Timer();
 
-	/** 运行下载申请任务
-	 * @param interval
-	 */
-	private void runApplyTask(Integer interval) {
-		this.applyTimer.schedule(new TimerTask() {
+	ScheduledExecutorService applyService = new ScheduledThreadPoolExecutor(1,
+			new BasicThreadFactory.Builder().namingPattern("applyTimer-%d").daemon(true).build());
+
+	public void runApplyTask(Integer interval){
+		applyService.scheduleAtFixedRate(new Runnable() {
 			@Override
 			public void run() {
 				List<DownloadTask> waitingTasks = DownloadTaskServiceImpl.getInstance().getDownloadTaskOfWaiting(QueryDataSource.FLAT_QUERY);
@@ -937,9 +944,21 @@ public class FlatQueryResultServiceImpl implements IFlatQueryResultService {
 						} // IF ELSE OVER
 					}
 				} // FOR OVER
+			}
+		}, interval*1000, interval * 1000, TimeUnit.MILLISECONDS);
+	}
+
+/*	*//** 运行下载申请任务
+	 * @param interval
+	 *//*
+	private void runApplyTask(Integer interval) {
+		this.applyTimer.schedule(new TimerTask() {
+			@Override
+			public void run() {
+
 			} // RUN OVER
 		}, interval * 1000, interval * 1000);// 配置中的值为毫秒
-	}
+	}*/
 
 
 }