update

游瑞烽
2 parents 163a5e69 3c708086
Showing 3 changed files with 79 additions and 60 deletions
src/main/java/com/bsth/XDApplication.java
src/main/java/com/bsth/data/gpsdata_v2/DataHandleProcess.java
src/main/resources/application-prod.properties
@@ -72,7 +72,7 @@ public class XDApplication implements CommandLineRunner {
     @Autowired
     GpsDataLoaderThread gpsDataLoader;
     @Autowired
-    RfidDataLoaderThread rfidDataLoader;
+    RfidDataLoaderThread rfidDataLoaderThread;
     @Autowired
     OfflineMonitorThread offlineMonitorThread;
@@ -165,7 +165,7 @@ public class XDApplication implements CommandLineRunner {
         sexec.scheduleWithFixedDelay(scheduleRefreshThread, 10, 120, TimeUnit.SECONDS);//班次更新线程
         sexec.scheduleWithFixedDelay(scheduleLateThread, 140, 20, TimeUnit.SECONDS);//检查班次误点
         sexec.scheduleWithFixedDelay(gpsDataLoader, 100, 2, TimeUnit.SECONDS);//抓取GPS数据
-        sexec.scheduleWithFixedDelay(rfidDataLoader, 5, 5, TimeUnit.SECONDS);//抓取RFID数据
+        sexec.scheduleWithFixedDelay(rfidDataLoaderThread, 10, 20, TimeUnit.SECONDS);//抓取GPS数据
         sexec.scheduleWithFixedDelay(fixedCheckStationCodeThread, 60, 60 * 5, TimeUnit.SECONDS);//检查班次站点编码
         sexec.scheduleWithFixedDelay(offlineMonitorThread, 120, 60, TimeUnit.SECONDS);//GPS设备掉离线
@@ -6,7 +6,6 @@ import com.bsth.data.gpsdata_v2.entity.GpsEntity;
 import com.bsth.data.gpsdata_v2.handlers.*;
 import com.bsth.email.SendEmailController;
 import com.bsth.email.entity.EmailBean;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.ArrayListMultimap;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -63,13 +62,29 @@ public class DataHandleProcess {
 		}
     });
+    public static CountDownLatch count;
     static long lastTime;
     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)
@@ -94,24 +109,36 @@ public class DataHandleProcess {
             }
             Set<Integer> ks = dataListMap.keySet();
             logger.info("analyse gps size: " + list.size() + ", ks: " + ks.size());
-            CountDownLatch count = new CountDownLatch(ks.size());
+            count = new CountDownLatch(ks.size());
-            logger.info(JSON.toJSONString(ks));
+            //logger.info(JSON.toJSONString(ks));
             for (Integer index : ks) {
                 threadPool.execute(new SignalHandleThread(dataListMap.get(index), count));
             }
             //等待子线程结束
-            boolean isNormal = count.await(5000, TimeUnit.MILLISECONDS);
+            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/>");
+    				mail.setContent("GPS处理超时，检查线程栈文件信息<br/>");
     				sendEmailController.sendMail("113252620@qq.com", mail);
-    				logger.info(new ObjectMapper().writeValueAsString(list));
     				logger.info("DataHandlerProcess:邮件发送成功!");
     			} catch (Exception e){
     				logger.error("DataHandlerProcess:邮件发送失败!",e);
@@ -142,7 +169,6 @@ public class DataHandleProcess {
         @Override
         public void run() {
-            long start = System.currentTimeMillis();
             try {
                 Collections.sort(list, comp);
                 GpsEntity gps;
@@ -167,18 +193,12 @@ public class DataHandleProcess {
                         GpsCacheData.putGps(gps);//历史gps缓存
                     } catch (Throwable e) {
-                        logger.error("SignalHandleThread.run1", e);
+                        logger.error("", e);
                     }
                 }
-            } catch (Exception e) {
-                logger.error("SignalHandleThread.run2", e);
             } finally {
                 if (count != null)
                     count.countDown();
-
-                StringBuilder sb = new StringBuilder();
-                sb.append("list size:").append(list.size()).append(" cost:").append(System.currentTimeMillis() - start);
-                logger.info(sb.toString());
             }
         }
     }
-server.port=9088
-#management.port= 9001
-#management.address= 127.0.0.1
-management.security.enabled=false
-management.context-path=/manage
-dubbo.use=true
-
-spring.jpa.hibernate.ddl-auto= update
-spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy
-#DATABASE
-spring.jpa.database= MYSQL
-spring.jpa.show-sql= false
-spring.datasource.driver-class-name= com.mysql.jdbc.Driver
-spring.datasource.url= jdbc:mysql://10.10.200.148:3306/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
-spring.datasource.username= root
-spring.datasource.password= root
-
-#DATASOURCE
-spring.datasource.max-active=100
-spring.datasource.max-idle=8
-spring.datasource.min-idle=8
-spring.datasource.initial-size=5
-
-spring.datasource.test-on-borrow=true
-spring.datasource.test-on-connect=true
-spring.datasource.test-on-return=true
-spring.datasource.test-while-idle=true
-spring.datasource.validation-query=select 1
-
-## gps client data
-http.gps.real.cache.url= http://10.10.150.24:12580/realGps/all
-## gateway real data
-http.gps.real.url= http://10.10.200.79:8080/transport_server/rtgps/
-## gateway send directive
-#http.send.directive = http://10.10.200.79:8080/transport_server/message/
-## wxsb
-#http.report.url.05= http://192.168.168.154:8088/ygjwsystem_j2ee/clbx/clbx_dd.do
-#http.report.url.22= http://192.168.168.154:8088/jgjwsystem_j2ee/clbx/clbx_dd.do
-#http.report.url.26= http://192.168.168.154:8088/nhjwsystem_j2ee/clbx/clbx_dd.do
-#http.report.url.55= http://192.168.168.154:8088/snjwsystem_j2ee/clbx/clbx_dd.do
-http.report.url.05= http://116.228.197.222:8081/ygjwsystem_j2ee/clbx/clbx_dd1.do
-http.report.url.22= http://116.247.73.122:9098/jgjwsystem_j2ee/clbx/clbx_dd1.do
-http.report.url.26= http://116.236.141.34:8088/nhjwsystem_j2ee/clbx/clbx_dd1.do
+server.port=9088
+#management.port= 9001
+#management.address= 127.0.0.1
+management.security.enabled=false
+management.context-path=/manage
+dubbo.use=true
+
+spring.jpa.hibernate.ddl-auto= update
+spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy
+#DATABASE
+spring.jpa.database= MYSQL
+spring.jpa.show-sql= false
+spring.datasource.driver-class-name= com.mysql.jdbc.Driver
+spring.datasource.url= jdbc:mysql://10.10.200.148:3306/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
+spring.datasource.username= root
+spring.datasource.password= root
+#DATASOURCE
+spring.datasource.max-active=100
+spring.datasource.max-idle=8
+spring.datasource.min-idle=8
+spring.datasource.initial-size=5
+
+spring.datasource.test-on-borrow=true
+spring.datasource.test-on-connect=true
+spring.datasource.test-on-return=true
+spring.datasource.test-while-idle=true
+spring.datasource.validation-query=select 1
+
+## gps client data
+http.gps.real.cache.url= http://10.10.150.24:12580/realGps/all
+## gateway real data
+http.gps.real.url= http://10.10.200.79:8080/transport_server/rtgps/
+## gateway send directive
+#http.send.directive = http://10.10.200.79:8080/transport_server/message/
+## wxsb
+#http.report.url.05= http://192.168.168.154:8088/ygjwsystem_j2ee/clbx/clbx_dd.do
+#http.report.url.22= http://192.168.168.154:8088/jgjwsystem_j2ee/clbx/clbx_dd.do
+#http.report.url.26= http://192.168.168.154:8088/nhjwsystem_j2ee/clbx/clbx_dd.do
+#http.report.url.55= http://192.168.168.154:8088/snjwsystem_j2ee/clbx/clbx_dd.do
+http.report.url.05= http://116.228.197.222:8081/ygjwsystem_j2ee/clbx/clbx_dd1.do
+http.report.url.22= http://116.247.73.122:9098/jgjwsystem_j2ee/clbx/clbx_dd1.do
+http.report.url.26= http://116.236.141.34:8088/nhjwsystem_j2ee/clbx/clbx_dd1.do
 http.report.url.55= http://180.168.216.248:8088/snjwsystem_j2ee/clbx/clbx_dd1.do
 \ No newline at end of file