正在显示
1 个修改的文件
包含
3 行增加
和
9 行删除
1 | package com.sy.task; | 1 | package com.sy.task; |
2 | 2 | ||
3 | import com.sy.bwAnalysis.AnalysisRoute; | 3 | import com.sy.bwAnalysis.AnalysisRoute; |
4 | -import com.sy.logic.LiftBar; | ||
5 | import com.sy.utils.XMLThreadPoolFactory; | 4 | import com.sy.utils.XMLThreadPoolFactory; |
6 | -import com.tianbo.util.Date.DateUtil; | ||
7 | import com.tianbo.util.IO.FileTool; | 5 | import com.tianbo.util.IO.FileTool; |
8 | import org.apache.commons.io.FileUtils; | 6 | import org.apache.commons.io.FileUtils; |
9 | import org.springframework.beans.factory.annotation.Value; | 7 | import org.springframework.beans.factory.annotation.Value; |
@@ -51,21 +49,17 @@ public class TaskAnalysis { | @@ -51,21 +49,17 @@ public class TaskAnalysis { | ||
51 | List<File> files = FileTool.readDirectoryFiles(fileDirectory); | 49 | List<File> files = FileTool.readDirectoryFiles(fileDirectory); |
52 | //文件数量大于50个,每次只解析前50个 | 50 | //文件数量大于50个,每次只解析前50个 |
53 | if (files!=null && !files.isEmpty() && files.size()>theadamount){ | 51 | if (files!=null && !files.isEmpty() && files.size()>theadamount){ |
54 | - CountDownLatch latch = new CountDownLatch(theadamount); | ||
55 | log.trace("本地解析报文任务开始{},剩余处理文件数量:{}",startTime,files.size()); | 52 | log.trace("本地解析报文任务开始{},剩余处理文件数量:{}",startTime,files.size()); |
56 | for (int i=0;i<theadamount;i++){ | 53 | for (int i=0;i<theadamount;i++){ |
57 | - threadJbob(files.get(i),latch,"",threadPool); | 54 | + threadJbob(files.get(i),null,"",threadPool); |
58 | } | 55 | } |
59 | - latch.await(); | ||
60 | } | 56 | } |
61 | //文件数量小于50个,全部一次解析完 | 57 | //文件数量小于50个,全部一次解析完 |
62 | else if (files!=null && !files.isEmpty() && files.size()<theadamount){ | 58 | else if (files!=null && !files.isEmpty() && files.size()<theadamount){ |
63 | - CountDownLatch latch = new CountDownLatch(files.size()); | ||
64 | log.trace("本地解析报文任务开始{},剩余处理文件数量文件数量:{}",startTime,files.size()); | 59 | log.trace("本地解析报文任务开始{},剩余处理文件数量文件数量:{}",startTime,files.size()); |
65 | for (int i=0;i<files.size();i++){ | 60 | for (int i=0;i<files.size();i++){ |
66 | - threadJbob(files.get(i),latch,"",threadPool); | 61 | + threadJbob(files.get(i),null,"",threadPool); |
67 | } | 62 | } |
68 | - latch.await(); | ||
69 | } | 63 | } |
70 | 64 | ||
71 | }catch (Exception e){ | 65 | }catch (Exception e){ |
@@ -80,7 +74,7 @@ public class TaskAnalysis { | @@ -80,7 +74,7 @@ public class TaskAnalysis { | ||
80 | private void threadJbob(File file,CountDownLatch latch,String transToCfps,ThreadPoolExecutor threadPool){ | 74 | private void threadJbob(File file,CountDownLatch latch,String transToCfps,ThreadPoolExecutor threadPool){ |
81 | try{ | 75 | try{ |
82 | AnalysisRoute analysisRoute=new AnalysisRoute(); | 76 | AnalysisRoute analysisRoute=new AnalysisRoute(); |
83 | - String message = com.sy.utils.FileTool.readfile(file,"UTF-8"); | 77 | + String message = com.sy.utils.FileTool.readfile(file); |
84 | analysisRoute.setMessage(message); | 78 | analysisRoute.setMessage(message); |
85 | threadPool.execute(analysisRoute); | 79 | threadPool.execute(analysisRoute); |
86 | FileUtils.moveFileToDirectory(file,new File("bw/handled/"),true); | 80 | FileUtils.moveFileToDirectory(file,new File("bw/handled/"),true); |
-
请 注册 或 登录 后发表评论