update...

潘钊
1 parent ac4452a2
Showing 10 changed files with 228 additions and 183 deletions
src/main/java/com/bsth/ServiceStateTest.java
src/main/java/com/bsth/XDApplication.java
src/main/java/com/bsth/data/BasicData.java
src/main/java/com/bsth/data/car_out_info/CarOutInfo.java
src/main/java/com/bsth/data/car_out_info/CarOutInfoHandler.java
src/main/java/com/bsth/data/car_out_info/UpdateDBThread.java
src/main/java/com/bsth/data/forecast/ForecastRealServer.java
src/main/java/com/bsth/data/gpsdata/GpsRealData.java
src/main/java/com/bsth/data/gpsdata/thread/GpsDataLoaderThread.java
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
-package com.bsth;
-
-public class ServiceStateTest {
-
-	public static void main(String[] args) {
-		System.out.println("运营状态：" + getService(603979776));
-		System.out.println("上下行：" + getUpOrDown(603979776));
-	}
-
-	/**
-	 * 获取运营状态
-	 * 
-	 * @return -1无效 0运营 1未运营
-	 */
-	public static byte getService(long serviceState) {
-		if ((serviceState & 0x00020000) == 0x00020000 || (serviceState & 0x80000000) == 0x80000000)
-			return -1;
-		return (byte) (((serviceState & 0x02000000) == 0x02000000) ? 1 : 0);
-	}
-
-	/**
-	 * 王通 2016/6/29 9:23:24 获取车辆线路上下行
-	 * 
-	 * @return -1无效 0上行 1下行
-	 */
-	public static byte getUpOrDown(long serviceState) {
-		if ((serviceState & 0x00020000) == 0x00020000 || (serviceState & 0x80000000) == 0x80000000
-				|| (serviceState & 0x01000000) == 0x01000000 || (serviceState & 0x08000000) == 0x08000000)
-			return -1;
-		return (byte) (((serviceState & 0x10000000) == 0x10000000) ? 1 : 0);
-	}
-}
+package com.bsth;
+
+import com.bsth.data.BasicData;
+import com.bsth.data.ThreadMonotor;
+import com.bsth.data.car_out_info.UpdateDBThread;
+import com.bsth.data.directive.DirectivesPstThread;
+import com.bsth.data.gpsdata.thread.GpsDataLoaderThread;
+import com.bsth.data.gpsdata.thread.OfflineMonitorThread;
+import com.bsth.data.schedule.late_adjust.ScheduleLateThread;
+import com.bsth.data.schedule.thread.CalcOilThread;
+import com.bsth.data.schedule.thread.SchedulePstThread;
+import com.bsth.data.schedule.thread.ScheduleRefreshThread;
+import com.bsth.data.schedule.thread.SubmitToTrafficManage;
+import com.bsth.util.DateUtils;
+import com.bsth.util.Tools;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.stereotype.Component;
+
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * 线调大部分服务都在这里启动
+ * Created by panzhao on 2017/5/14.
+ */
+@Component
+public class XDApplication implements CommandLineRunner {
+
+    Logger log = LoggerFactory.getLogger(this.getClass());
+
+    @Autowired
+    BasicData.BasicDataLoader basicDataLoader;
+    @Autowired
+    UpdateDBThread fcxxUpdateThread;
+    @Autowired
+    GpsDataLoaderThread gpsDataLoader;
+    @Autowired
+    OfflineMonitorThread offlineMonitorThread;
+    @Autowired
+    ScheduleRefreshThread scheduleRefreshThread;
+    @Autowired
+    SchedulePstThread schedulePstThread;
+    @Autowired
+    ScheduleLateThread scheduleLateThread;
+    @Autowired
+    SubmitToTrafficManage submitToTrafficManage;
+    @Autowired
+    CalcOilThread calcOilThread;
+    @Autowired
+    DirectivesPstThread directivesPstThread;
+    @Autowired
+    ThreadMonotor threadMonotor;
+
+    private static long timeDiff;
+
+    static {
+        timeDiff = (DateUtils.getTimestamp() + 1000 * 60 * 140) - System.currentTimeMillis();
+        if (timeDiff < 0)
+            timeDiff += (1000 * 60 * 60 * 24);
+    }
+
+    @Override
+    public void run(String... strings) throws Exception {
+        try {
+            Tools tools = new Tools("application.properties");
+            String environment = tools.getValue("spring.profiles.active");
+            //预先加载基础的对照数据
+            basicDataLoader.loadAllData();
+            switch (environment){
+                case "dev":
+                    devInit();
+                    break;
+                case "prod":
+                    prodInit();
+                    break;
+            }
+        }catch (Exception e){
+            log.error("线调后台启动出现异常！！", e);
+            System.exit(1);
+        }
+    }
+
+    public void devInit(){
+        ScheduledExecutorService sexec = Application.mainServices;
+        //抓取GPS数据
+        //sexec.scheduleWithFixedDelay(gpsDataLoader, 30, 2, TimeUnit.SECONDS);
+        //实际排班更新线程
+        //sexec.scheduleWithFixedDelay(scheduleRefreshThread, 15, 240, TimeUnit.SECONDS);
+    }
+
+    public void prodInit(){
+        ScheduledExecutorService sexec = Application.mainServices;
+        //发车信息
+        sexec.scheduleWithFixedDelay(fcxxUpdateThread, 60, 40, TimeUnit.SECONDS);
+        //抓取GPS数据
+        sexec.scheduleWithFixedDelay(gpsDataLoader, 30, 2, TimeUnit.SECONDS);
+        //检查设备掉离线
+        sexec.scheduleWithFixedDelay(offlineMonitorThread, 120, 60, TimeUnit.SECONDS);
+        //实际排班更新线程
+        sexec.scheduleWithFixedDelay(scheduleRefreshThread, 15, 240, TimeUnit.SECONDS);
+        //实际排班延迟入库线程
+        sexec.scheduleWithFixedDelay(schedulePstThread, 60, 30, TimeUnit.SECONDS);
+        //检查班次误点
+        sexec.scheduleWithFixedDelay(scheduleLateThread, 60, 30, TimeUnit.SECONDS);
+        //调度指令延迟入库
+        sexec.scheduleWithFixedDelay(directivesPstThread, 180, 180, TimeUnit.SECONDS);
+
+        //运管处静态数据提交
+        log.info(timeDiff / 1000 / 60 + "分钟之后提交到运管处");
+        sexec.scheduleAtFixedRate(submitToTrafficManage, timeDiff / 1000, 60 * 60 * 24, TimeUnit.SECONDS);
+        //计算油、公里加注
+        sexec.scheduleAtFixedRate(calcOilThread, timeDiff / 1000, 60 * 60 * 24, TimeUnit.SECONDS);
+
+
+        //线程监听（防止重要的线程阻塞、异常结束。以及部分主备切换工作）
+        sexec.scheduleWithFixedDelay(threadMonotor, 120, 60, TimeUnit.SECONDS);
+    }
+}
@@ -154,8 +154,6 @@ public class BasicData implements CommandLineRunner {
                 loadLineInfo();
                 //车辆和线路映射信息
                 loadNbbm2LineInfo();
-                //站点路由信息
-                //loadStationRouteInfo();
                 //人员信息
                 loadPersonnelInfo();
                 //公司信息
-package com.bsth.data.car_out_info;
-
-import com.bsth.entity.realcontrol.ScheduleRealInfo;
-
-import java.util.List;
-
-/**
- * Created by panzhao on 2017/5/7.
- */
-public interface CarOutInfo {
-
-    void updateAll();
-
-    void update(String lineCode);
-
-    void update(List<ScheduleRealInfo> list) ;
-}
@@ -9,15 +9,12 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.CommandLineRunner;
 import org.springframework.jdbc.core.BatchPreparedStatementSetter;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.datasource.DataSourceTransactionManager;
 import org.springframework.stereotype.Component;
-import org.springframework.stereotype.Service;
 import org.springframework.transaction.TransactionDefinition;
 import org.springframework.transaction.TransactionStatus;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.support.DefaultTransactionDefinition;
 import java.sql.PreparedStatement;
@@ -28,14 +25,23 @@ import java.util.*;
  * 发车信息表处理程序
  * Created by panzhao on 2017/5/5.
  */
-@Service
-public class CarOutInfoHandler implements CommandLineRunner, CarOutInfo {
+@Component
+public class CarOutInfoHandler {
     @Autowired
     DayOfSchedule dayOfSchedule;
     //班次类型对照表
-    Map<String, String> bcTypeMap;
+    static Map<String, String> bcTypeMap;
+
+    static{
+        bcTypeMap = new HashMap<>();
+        bcTypeMap.put("normal", "正常班次");
+        bcTypeMap.put("region", "区间");
+        bcTypeMap.put("venting", "直放");
+        bcTypeMap.put("major", "放站");
+        bcTypeMap.put("ldks", "两点间空驶");
+    }
     private static ScheduleComparator.FCSJ schFCSJComparator = new ScheduleComparator.FCSJ();
@@ -47,7 +53,6 @@ public class CarOutInfoHandler implements CommandLineRunner, CarOutInfo {
     /**
      * 全量更新发车信息表
      */
-    @Override
     public void updateAll() {
         Set<String> ks = BasicData.lineCode2NameMap.keySet();
         for (String lineCode : ks) {
@@ -55,7 +60,6 @@ public class CarOutInfoHandler implements CommandLineRunner, CarOutInfo {
         }
     }
-    @Override
     public void update(String lineCode) {
         try {
             ArrayListMultimap<String, ScheduleRealInfo> lpScheduleMap = dayOfSchedule.getLpScheduleMap();
@@ -75,8 +79,6 @@ public class CarOutInfoHandler implements CommandLineRunner, CarOutInfo {
         }
     }
-    @Transactional
-    @Override
     public void update(List<ScheduleRealInfo> list) {
         if (list.size() == 0)
             return;
@@ -194,30 +196,4 @@ public class CarOutInfoHandler implements CommandLineRunner, CarOutInfo {
         }
         return array;
     }
-
-    @Autowired
-    UpdateInfoThread updateInfoThread;
-
-    @Override
-    public void run(String... strings) throws Exception {
-        bcTypeMap = new HashMap<>();
-        bcTypeMap.put("normal", "正常班次");
-        bcTypeMap.put("region", "区间");
-        bcTypeMap.put("venting", "直放");
-        bcTypeMap.put("major", "放站");
-        bcTypeMap.put("ldks", "两点间空驶");
-        //Application.mainServices.scheduleWithFixedDelay(updateInfoThread, 60, 40, TimeUnit.SECONDS);
-    }
-
-    @Component
-    private static class UpdateInfoThread extends Thread {
-
-        @Autowired
-        CarOutInfo carOutInfoHandler;
-
-        @Override
-        public void run() {
-            carOutInfoHandler.updateAll();
-        }
-    }
 }
+package com.bsth.data.car_out_info;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 数据库发车信息表更新线程
+ * Created by panzhao on 2017/5/14.
+ */
+@Component
+public class UpdateDBThread extends Thread{
+
+    @Autowired
+    CarOutInfoHandler carOutInfoHandler;
+
+    @Override
+    public void run() {
+        carOutInfoHandler.updateAll();
+    }
+}
@@ -47,7 +47,7 @@ public class ForecastRealServer implements CommandLineRunner {
 	//车辆 ——> 预测终点时间
 	//static Map<String, Float> forecastMap = new HashMap<>(); 
-	//线路_上下行 ——> 封装耗时数据的路由链
+	//线路_上下行 ——> 耗时数据的路由链
 	public static ArrayListMultimap<String, SimpleRoute> lineSampleMap;
 	//车辆 ——> 预测结果
 	public static Map<String, ForecastResult> forecastMap;
@@ -2,8 +2,6 @@ package com.bsth.data.gpsdata;
 import com.bsth.data.BasicData;
 import com.bsth.data.forecast.ForecastRealServer;
-import com.bsth.data.gpsdata.thread.GpsDataLoaderThread;
-import com.bsth.data.gpsdata.thread.OfflineMonitorThread;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.google.common.collect.TreeMultimap;
@@ -11,7 +9,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.CommandLineRunner;
 import org.springframework.stereotype.Component;
 import java.util.*;
@@ -25,7 +22,7 @@ import java.util.concurrent.ConcurrentMap;
  * @date 2016年8月12日 下午2:04:41
  */
 @Component
-public class GpsRealData implements CommandLineRunner {
+public class GpsRealData {
     static Logger logger = LoggerFactory.getLogger(GpsRealData.class);
@@ -35,12 +32,6 @@ public class GpsRealData implements CommandLineRunner {
     private static TreeMultimap<String, String> lineCode2Devices;
     @Autowired
-    GpsDataLoaderThread gpsDataLoader;
-
-    @Autowired
-    OfflineMonitorThread offlineMonitorThread;
-
-    @Autowired
     DayOfSchedule dayOfSchedule;
     @Autowired
@@ -54,15 +45,6 @@ public class GpsRealData implements CommandLineRunner {
         lineCode2Devices = TreeMultimap.create();
     }
-    @Override
-    public void run(String... arg0) throws Exception {
-        logger.info("gpsDataLoader,30,2");
-        //http形式获取GPS数据
-        //Application.mainServices.scheduleWithFixedDelay(gpsDataLoader, 30, 2, TimeUnit.SECONDS);
-        //定时扫描掉离线
-        //Application.mainServices.scheduleWithFixedDelay(offlineMonitorThread, 120, 60, TimeUnit.SECONDS);
-    }
-
     public void put(GpsEntity gps) {
         String device = gps.getDeviceId();
@@ -6,7 +6,6 @@ import com.bsth.data.BasicData;
 import com.bsth.data.gpsdata.GpsEntity;
 import com.bsth.data.gpsdata.GpsRealData;
 import com.bsth.data.gpsdata.arrival.GpsRealAnalyse;
-import com.bsth.data.gpsdata.recovery.GpsDataRecovery;
 import com.bsth.util.ConfigUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpEntity;
@@ -38,10 +37,16 @@ public class GpsDataLoaderThread extends Thread {
      */
     public GpsDataLoaderThread() {
         url = ConfigUtil.get("http.gps.real.url");
+        clientUrl = ConfigUtil.get("http.gps.real.cache.url");
     }
     // 网关数据接口地址
     private static String url;
+    // GPS客户端内存数据接口
+    private static String clientUrl;
+
+    //0：从客户端内存获取  -1：从网关获取
+    private static int flag = 0;
     @Autowired
     GpsRealData gpsRealData;
@@ -52,17 +57,20 @@ public class GpsDataLoaderThread extends Thread {
     @Override
     public void run() {
         try {
-            //如果正在恢复数据
-            if (GpsDataRecovery.run)
-                return;
-
-            load();
+            if(flag == 0)
+                load();
+            else if(flag == -1)
+                loadByGateway();
         } catch (Exception e) {
             logger.error("", e);
         }
     }
-    public void load() throws Exception {
+    /**
+     * 从网关获取实时GPS数据
+     * @throws Exception
+     */
+    public void loadByGateway() throws Exception {
         List<GpsEntity> list = null;
         List<GpsEntity> updateList = new ArrayList<>();
         CloseableHttpClient httpClient = null;
@@ -72,8 +80,8 @@ public class GpsDataLoaderThread extends Thread {
             HttpGet get = new HttpGet(url);
             //超时时间
             RequestConfig requestConfig = RequestConfig.custom()
-                    .setConnectTimeout(2000).setConnectionRequestTimeout(1000)
-                    .setSocketTimeout(2000).build();
+                    .setConnectTimeout(1500).setConnectionRequestTimeout(1000)
+                    .setSocketTimeout(1500).build();
             get.setConfig(requestConfig);
             response = httpClient.execute(get);
@@ -128,4 +136,59 @@ public class GpsDataLoaderThread extends Thread {
                 response.close();
         }
     }
+
+    /**
+     * 从客户端内存获取GPS数据
+     */
+    public void load() throws Exception{
+        List<GpsEntity> list = null;
+        CloseableHttpClient httpClient = null;
+        CloseableHttpResponse response = null;
+
+        try {
+            httpClient = HttpClients.createDefault();
+            HttpGet get = new HttpGet(url);
+            //超时时间
+            RequestConfig requestConfig = RequestConfig.custom()
+                    .setConnectTimeout(2000).setConnectionRequestTimeout(1000)
+                    .setSocketTimeout(2000).build();
+            get.setConfig(requestConfig);
+
+            response = httpClient.execute(get);
+
+            HttpEntity entity = response.getEntity();
+            if (null != entity) {
+                BufferedReader br = new BufferedReader(new InputStreamReader(entity.getContent()));
+                StringBuffer stringBuffer = new StringBuffer();
+                String str = "";
+                while ((str = br.readLine()) != null)
+                    stringBuffer.append(str);
+
+                JSONObject jsonObj = JSON.parseObject(stringBuffer.toString());
+
+                if (jsonObj != null)
+                    list = JSON.parseArray(jsonObj.getString("data"), GpsEntity.class);
+
+                String nbbm;
+                for (GpsEntity gps : list) {
+
+                    nbbm = BasicData.deviceId2NbbmMap.get(gps.getDeviceId());
+                    if (StringUtils.isBlank(nbbm))
+                        gps.setIncomplete(true);//标记为异常数据
+                    else
+                        gps.setNbbm(nbbm);
+                }
+                //分析数据
+                gpsRealAnalyse.analyse(list);
+            } else
+                logger.error("client gps result is null");
+        } catch (Exception e) {
+            logger.error("", e);
+        } finally {
+            if (null != httpClient)
+                httpClient.close();
+            if (null != response)
+                response.close();
+        }
+    }
 }
 \ No newline at end of file
@@ -2,20 +2,11 @@ package com.bsth.data.schedule;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
-import com.bsth.Application;
 import com.bsth.common.Constants;
 import com.bsth.common.ResponseCode;
-import com.bsth.data.BasicData;
 import com.bsth.data.LineConfigData;
-import com.bsth.data.ThreadMonotor;
-import com.bsth.data.directive.DirectivesPstThread;
 import com.bsth.data.gpsdata.GpsRealData;
 import com.bsth.data.gpsdata.recovery.GpsDataRecovery;
-import com.bsth.data.schedule.late_adjust.ScheduleLateThread;
-import com.bsth.data.schedule.thread.CalcOilThread;
-import com.bsth.data.schedule.thread.SchedulePstThread;
-import com.bsth.data.schedule.thread.ScheduleRefreshThread;
-import com.bsth.data.schedule.thread.SubmitToTrafficManage;
 import com.bsth.entity.realcontrol.LineConfig;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.entity.schedule.SchedulePlanInfo;
@@ -33,8 +24,6 @@ import org.joda.time.format.DateTimeFormatter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.CommandLineRunner;
-import org.springframework.core.annotation.Order;
 import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Component;
@@ -42,7 +31,6 @@ import org.springframework.stereotype.Component;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
-import java.util.concurrent.TimeUnit;
 /**
  * @author PanZhao
@@ -51,8 +39,7 @@ import java.util.concurrent.TimeUnit;
  * @date 2016年8月15日 上午10:16:12
  */
 @Component
-@Order(value = 3)
-public class DayOfSchedule implements CommandLineRunner {
+public class DayOfSchedule {
     Logger logger = LoggerFactory.getLogger(this.getClass());
@@ -95,9 +82,6 @@ public class DayOfSchedule implements CommandLineRunner {
     @Autowired
     GpsRealData gpsRealData;
-    @Autowired
-    BasicData.BasicDataLoader basicDataLoader;
-
     /**
      * 线路当前使用的排班的日期
      */
@@ -117,63 +101,13 @@ public class DayOfSchedule implements CommandLineRunner {
     }
     @Autowired
-    ScheduleRefreshThread scheduleRefreshThread;
-
-    @Autowired
-    SchedulePstThread schedulePstThread;
-
-    @Autowired
-    ScheduleLateThread scheduleLateThread;
-
-    @Autowired
-    SubmitToTrafficManage submitToTrafficManage;
-
-    @Autowired
     LineConfigData lineConfigs;
     @Autowired
     GpsDataRecovery gpsDataRecovery;
-    @Autowired
-    DirectivesPstThread directivesPstThread;
-
-    @Autowired
-    CalcOilThread calcOilThread;
-
-    @Autowired
-    ThreadMonotor threadMonotor;
-
     private static DateTimeFormatter fmtyyyyMMdd = DateTimeFormat.forPattern("yyyy-MM-dd"), fmtHHmm = DateTimeFormat.forPattern("HH:mm");
-    @Override
-    public void run(String... arg0) throws Exception {
-        basicDataLoader.loadAllData();
-
-        //翻班线程
-//        Application.mainServices.scheduleWithFixedDelay(scheduleRefreshThread, 15, 240, TimeUnit.SECONDS);
-        //入库
-//        Application.mainServices.scheduleWithFixedDelay(schedulePstThread, 60, 30, TimeUnit.SECONDS);
-        //班次误点扫描
-//        Application.mainServices.scheduleWithFixedDelay(scheduleLateThread, 60, 30, TimeUnit.SECONDS);
-
-        //每天凌晨2点20提交数据到运管处
-        long diff = (DateUtils.getTimestamp() + 1000 * 60 * 140) - System.currentTimeMillis();
-        if (diff < 0)
-            diff += (1000 * 60 * 60 * 24);
-
-        logger.info(diff / 1000 / 60 + "分钟之后提交到运管处");
-        //Application.mainServices.scheduleAtFixedRate(submitToTrafficManage, diff / 1000, 60 * 60 * 24, TimeUnit.SECONDS);
-
-        //计算油、公里加注
-        Application.mainServices.scheduleAtFixedRate(calcOilThread, diff / 1000, 60 * 60 * 24, TimeUnit.SECONDS);
-
-        //指令持久化线程
-        Application.mainServices.scheduleWithFixedDelay(directivesPstThread, 180, 180, TimeUnit.SECONDS);
-
-        //监听
-        Application.mainServices.scheduleWithFixedDelay(threadMonotor, 120, 60, TimeUnit.SECONDS);
-    }
-
     //数据恢复
     private void dataRecovery() {
         GpsDataRecovery.run = true;