1.GpsCacheData中HashMap替换成并发Map

# Conflicts: # src/main/java/com/bsth/data/gpsdata_v2/DataHandleProcess.java

1.GpsCacheData中HashMap替换成并发Map
# Conflicts: # src/main/java/com/bsth/data/gpsdata_v2/DataHandleProcess.java
王通
1 parent a9524206
Showing 1 changed file with 3 additions and 58 deletions
src/main/java/com/bsth/data/gpsdata_v2/DataHandleProcess.java
@@ -41,27 +41,13 @@ public class DataHandleProcess {
     ReverseRouteProcess reverseRouteProcess;
     @Autowired
     GpsRealData gpsRealData;
-    // 发送邮件
- 	@Autowired
- 	private SendEmailController sendEmailController;
     static Logger logger = LoggerFactory.getLogger(DataHandleProcess.class);
     final static int POOL_SIZE = 20;
-    static ExecutorService threadPool = Executors.newFixedThreadPool(POOL_SIZE + 1, new ThreadFactory() {
-
-		@Override
-		public Thread newThread(Runnable r) {
-			// TODO Auto-generated method stub
-			Thread t = new Thread(r);
-			t.setName("GPSProcessor");
-			
-			return t;
-		}
-    	
-    });
+    static ExecutorService threadPool = Executors.newFixedThreadPool(POOL_SIZE + 1);
     public static CountDownLatch count;
     static long lastTime;
@@ -69,22 +55,7 @@ public class DataHandleProcess {
     public static boolean isBlock() {
         return System.currentTimeMillis() - lastTime > 1000 * 30;
     }
-    
-    private void shutdownAndAwaitTermination(ExecutorService pool) {
-    	pool.shutdown();
-    	try {
-    		if (!pool.awaitTermination(500, TimeUnit.MILLISECONDS)) {
-    			pool.shutdownNow();
-    		}
-    		if (!pool.awaitTermination(500, TimeUnit.MILLISECONDS)) {
-    			logger.error("线程池无法正常终止");
-    		}
-    	} catch (InterruptedException e) {
-    		pool.shutdown();
-    		Thread.currentThread().interrupt();
-    	}
-    }
-    
+
     public void handle(List<GpsEntity> list) {
         try {
             if (list.size() == 0)
@@ -118,32 +89,7 @@ public class DataHandleProcess {
             //等待子线程结束
-            boolean isNormal = count.await(5, TimeUnit.SECONDS);
-            if (!isNormal) {
-            	try {
-            		shutdownAndAwaitTermination(threadPool);
-            		threadPool = Executors.newFixedThreadPool(POOL_SIZE + 1, new ThreadFactory() {
-
-            			@Override
-            			public Thread newThread(Runnable r) {
-            				// TODO Auto-generated method stub
-            				Thread t = new Thread(r);
-            				t.setName("GPSProcessor");
-            				
-            				return t;
-            			}
-            	    	
-            	    });
-    				//发送邮件
-    				EmailBean mail = new EmailBean();
-    				mail.setSubject("线调GPS处理");
-    				mail.setContent("GPS处理超时，检查线程栈文件信息<br/>");
-    				sendEmailController.sendMail("113252620@qq.com", mail);
-    				logger.info("DataHandlerProcess:邮件发送成功!");
-    			} catch (Exception e){
-    				logger.error("DataHandlerProcess:邮件发送失败!",e);
-    			}
-            }
+            count.await();
             //加入实时gps对照
             for (GpsEntity gps : list)
@@ -173,7 +119,6 @@ public class DataHandleProcess {
                 Collections.sort(list, comp);
                 GpsEntity gps;
                 for(int i = 0,len = list.size(); i< len ;i ++){
-                	if (Thread.currentThread().isInterrupted()) break;
                     gps = list.get(i);
                     try {