update...

潘钊
1 parent 9a573551
Showing 22 changed files with 540 additions and 84 deletions
src/main/java/com/bsth/data/ThreadMonotor.java
src/main/java/com/bsth/data/directive/DayOfDirectives.java
src/main/java/com/bsth/data/directive/GatewayHttpUtils.java
src/main/java/com/bsth/data/gpsdata/GpsRealData.java
src/main/java/com/bsth/data/gpsdata/arrival/GpsRealAnalyse.java
src/main/java/com/bsth/data/gpsdata/arrival/handlers/InOutStationSignalHandle.java
src/main/java/com/bsth/data/gpsdata/recovery/GpsDataRecovery.java
src/main/java/com/bsth/data/gpsdata/thread/ThreadPollMonitor.java
src/main/java/com/bsth/data/msg_queue/DirectivePushQueue.java
src/main/java/com/bsth/data/msg_queue/QueueData.java
src/main/java/com/bsth/data/msg_queue/QueueData_Directive.java
src/main/java/com/bsth/data/msg_queue/WebSocketPushQueue.java
src/main/java/com/bsth/data/pilot80/PilotReport.java
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/java/com/bsth/service/directive/DirectiveServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/websocket/handler/RealControlSocketHandler.java
src/main/resources/logback.xml
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/fcxxwt.html
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/sftz.html
+package com.bsth.data;
+
+import com.bsth.data.gpsdata.arrival.GpsRealAnalyse;
+import com.bsth.data.msg_queue.DirectivePushQueue;
+import com.bsth.data.msg_queue.WebSocketPushQueue;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+
+/**
+ * Created by panzhao on 2017/5/11.
+ */
+@Component
+public class ThreadMonotor extends Thread{
+
+    Logger log = LoggerFactory.getLogger(this.getClass());
+
+    @Override
+    public void run() {
+
+        //线调GPS分析线程
+        if(GpsRealAnalyse.isBlock()){
+            log.warn("GpsRealAnalyse isBlock true !!!!");
+            GpsRealAnalyse.shutdown();
+        }
+
+        //webSocket 消息推送队列
+        if(WebSocketPushQueue.isIdle()){
+            log.warn("WebSocketPushQueue isIdle true !!!!");
+            WebSocketPushQueue.start();
+        }
+
+        //系统自动发送的网关指令 推送队列
+        if(DirectivePushQueue.isIdle()){
+            log.warn("DirectivePushQueue isIdle true !!!!");
+            DirectivePushQueue.start();
+        }
+    }
+}
@@ -57,10 +57,11 @@ public class DayOfDirectives {
 		pstDirectives = new LinkedList<>();
 	}
-	public void put60(D60 d60) {
+	public void put60(D60 d60, boolean pst) {
 		d60Map.put(d60.getMsgId(), d60);
 		//等待持久化
-		pstDirectives.add(d60);
+		if(pst)
+			pstDirectives.add(d60);
 	}
 	public void put64(D64 d64) {
@@ -41,8 +41,8 @@ public class GatewayHttpUtils {
 			//超时时间
 			RequestConfig requestConfig = RequestConfig.custom()  
-			        .setConnectTimeout(3000).setConnectionRequestTimeout(1000)
-			        .setSocketTimeout(3000).build();
+			        .setConnectTimeout(1500).setConnectionRequestTimeout(1000)
+			        .setSocketTimeout(1500).build();
 			HttpPost post = new HttpPost(url);
@@ -4,7 +4,6 @@ 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.gpsdata.thread.ThreadPollMonitor;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.google.common.collect.TreeMultimap;
@@ -47,9 +46,6 @@ public class GpsRealData implements CommandLineRunner {
     @Autowired
     ForecastRealServer forecastRealServer;
-    @Autowired
-    ThreadPollMonitor threadPollMonitor;
-
     /**
      * 构造函数
      */
@@ -60,15 +56,11 @@ public class GpsRealData implements CommandLineRunner {
     @Override
     public void run(String... arg0) throws Exception {
-        logger.info("gpsDataLoader,20,3");
+        logger.info("gpsDataLoader,30,2");
         //http形式获取GPS数据
-        //Application.mainServices.scheduleWithFixedDelay(gpsDataLoader, 20, 2, TimeUnit.SECONDS);
+        //Application.mainServices.scheduleWithFixedDelay(gpsDataLoader, 30, 2, TimeUnit.SECONDS);
         //定时扫描掉离线
         //Application.mainServices.scheduleWithFixedDelay(offlineMonitorThread, 120, 60, TimeUnit.SECONDS);
-
-        //扫描GPS线程池状态
-        //Application.mainServices.scheduleWithFixedDelay(threadPollMonitor, 60, 20, TimeUnit.SECONDS);
-
     }
@@ -89,19 +81,29 @@ public class GpsRealData implements CommandLineRunner {
                     gps.setExpectStopTime(forecastRealServer.expectStopTime(gps.getNbbm()));
                 }
             }
-        } catch (Exception e) {
-            logger.error("", e);
-        }
-        //刷新对照
-        gpsMap.put(device, gps);
-        if (StringUtils.isNotBlank(gps.getLineId())) {
-            //站点名称
-            gps.setStationName(getStationName(gps));
-            lineCode2Devices.put(gps.getLineId(), device);
+            //刷新对照
+            gpsMap.put(device, gps);
+            if (StringUtils.isNotBlank(gps.getLineId())) {
+                //站点名称
+                gps.setStationName(getStationName(gps));
+                lineCode2Devices.put(gps.getLineId(), device);
+
+                if(old != null && !gps.getLineId().equals(old.getLineId()))
+                    lineCode2Devices.remove(old.getLineId(), device);
+            }
-            if(old != null && !gps.getLineId().equals(old.getLineId()))
-                lineCode2Devices.remove(old.getLineId(), device);
+            //车辆换设备了
+            String nbbm = gps.getNbbm();
+            if(old != null && StringUtils.isNotEmpty(nbbm) && !nbbm.equals(old.getNbbm())){
+                List<GpsEntity> list = findByNbbm(nbbm);
+                for(GpsEntity g : list){
+                    if(!g.getDeviceId().equals(device))
+                        gpsMap.remove(g.getDeviceId());
+                }
+            }
+        } catch (Exception e) {
+            logger.error("", e);
         }
     }
@@ -116,6 +118,16 @@ public class GpsRealData implements CommandLineRunner {
         return gpsMap.get(deviceId);
     }
+    public List<GpsEntity> findByNbbm(String nbbm){
+        Collection<GpsEntity> arr = gpsMap.values();
+        List<GpsEntity> rs = new ArrayList<>();
+        for(GpsEntity g : arr){
+            if(nbbm.equals(g.getNbbm()))
+                rs.add(g);
+        }
+        return rs;
+    }
+
     /**
      * @Title: get @Description: TODO(线路编码获取GPS集合) @throws
      */
@@ -11,10 +11,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -44,15 +41,18 @@ public class GpsRealAnalyse {
     @Autowired
     GpsRealData gpsRealData;
-    static ExecutorService threadPool = Executors.newFixedThreadPool(100);
+    static ExecutorService threadPool = Executors.newFixedThreadPool(20);
     public static long st;
     public static CountDownLatch count;
+    public static boolean isBlock() {
+        return System.currentTimeMillis() - st > 1000 * 20;
+    }
+
     public void analyse(List<GpsEntity> list) {
         try {
             st = System.currentTimeMillis();
-            //如果正在恢复数据
             if (GpsDataRecovery.run)
                 return;
@@ -63,6 +63,7 @@ public class GpsRealAnalyse {
             }
             Set<String> ks = multimap.keySet();
+
             logger.info("analyse gps size: " + list.size() + ", ks: " + ks.size());
             count = new CountDownLatch(ks.size());
@@ -125,7 +126,7 @@ public class GpsRealAnalyse {
                     abnormalStateHandle.handle(gps, prevs);
                     if (!task)
-                        return; //无任务的，到这里就结束
+                        continue; //无任务的，到这里就结束
                     //反向处理
                     reverseSignalHandle.handle(gps, prevs);
@@ -6,12 +6,12 @@ import com.bsth.data.gpsdata.arrival.SignalHandle;
 import com.bsth.data.gpsdata.arrival.utils.CircleQueue;
 import com.bsth.data.gpsdata.arrival.utils.ScheduleSignalState;
 import com.bsth.data.gpsdata.arrival.utils.SignalSchPlanMatcher;
+import com.bsth.data.msg_queue.DirectivePushQueue;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.data.schedule.ScheduleComparator;
 import com.bsth.data.schedule.late_adjust.LateAdjustHandle;
 import com.bsth.entity.realcontrol.LineConfig;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
-import com.bsth.service.directive.DirectiveService;
 import com.bsth.websocket.handler.SendUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -41,9 +41,6 @@ public class InOutStationSignalHandle extends SignalHandle{
     SendUtils sendUtils;
     @Autowired
-    DirectiveService directiveService;
-
-    @Autowired
     ScheduleSignalState scheduleSignalState;
     @Autowired
@@ -151,7 +148,8 @@ public class InOutStationSignalHandle extends SignalHandle{
             if(sch.getBcType().equals("out")){
                 //出场时，切换成营运状态
-                directiveService.send60Operation(sch.getClZbh(), 0, Integer.parseInt(sch.getXlDir()), null, "出场@系统");
+                DirectivePushQueue.put6003(sch.getClZbh(), 0, Integer.parseInt(sch.getXlDir()), null, "出场@系统");
+                //directiveService.send60Operation(sch.getClZbh(), 0, Integer.parseInt(sch.getXlDir()), null, "出场@系统");
             }
             //出站既出场
             outStationAndOutPark(sch);
@@ -208,7 +206,8 @@ public class InOutStationSignalHandle extends SignalHandle{
                 if(schPrev.getBcType().equals("out")){
                     //出场时，切换成营运状态
-                    directiveService.send60Operation(schPrev.getClZbh(), 0, Integer.parseInt(schPrev.getXlDir()), null, "出场@系统");
+                    DirectivePushQueue.put6003(schPrev.getClZbh(), 0, Integer.parseInt(schPrev.getXlDir()), null, "出场@系统");
+                    //directiveService.send60Operation(schPrev.getClZbh(), 0, Integer.parseInt(schPrev.getXlDir()), null, "出场@系统");
                 }
             }
         }
@@ -276,15 +275,19 @@ public class InOutStationSignalHandle extends SignalHandle{
                 //将gps转换为下一个班次走向的站内信号
                 transformUpdown(gps, next);
                 //下发调度指令
-                directiveService.send60Dispatch(next, doneSum, "到站@系统");
+                DirectivePushQueue.put6002(next, doneSum, "到站@系统");
+                //directiveService.send60Dispatch(next, doneSum, "到站@系统");
                 //套跑  -下发线路切换指令
-                if(!next.getXlBm().equals(sch.getXlBm()))
-                    directiveService.lineChange(next.getClZbh(), next.getXlBm(), "套跑@系统");
+                if(!next.getXlBm().equals(sch.getXlBm())){
+                    DirectivePushQueue.put64(next.getClZbh(), next.getXlBm(), "套跑@系统");
+                    //directiveService.lineChange(next.getClZbh(), next.getXlBm(), "套跑@系统");
+                }
             }
             else if(sch.getBcType().equals("in")){
                 //终班进场，切换成非营运状态
-                directiveService.send60Operation(sch.getClZbh(), 1, Integer.parseInt(sch.getXlDir()), null, "进场@系统");
+                DirectivePushQueue.put6003(sch.getClZbh(), 1, Integer.parseInt(sch.getXlDir()), null, "进场@系统");
+                //directiveService.send60Operation(sch.getClZbh(), 1, Integer.parseInt(sch.getXlDir()), null, "进场@系统");
             }
         }
         else {
@@ -164,7 +164,7 @@ public class GpsDataRecovery implements ApplicationContextAware {
                     //abnormalStateHandle.handle(gps, prevs);
                     if(!task)
-                        return; //无任务的，到这里就结束
+                        continue; //无任务的，到这里就结束
                     //反向处理
                     reverseSignalHandle.handle(gps, prevs);
-package com.bsth.data.gpsdata.thread;
-
-import com.bsth.data.gpsdata.arrival.GpsRealAnalyse;
-import org.springframework.stereotype.Component;
-
-/**
- * 线程池监听
- * Created by panzhao on 2017/5/10.
- */
-@Component
-public class ThreadPollMonitor extends Thread{
-
-    @Override
-    public void run() {
-        long t = System.currentTimeMillis();
-
-        if(t - GpsRealAnalyse.st > 3000 * 10){
-            GpsRealAnalyse.shutdown();
-        }
-    }
-}
+package com.bsth.data.msg_queue;
+
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.service.directive.DirectiveService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeansException;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.stereotype.Component;
+
+import java.util.LinkedList;
+
+/**
+ * 到网关的指令推送队列 （系统发送的队列， 用户手动发送的不走这里）
+ * Created by panzhao on 2017/5/11.
+ */
+@Component
+public class DirectivePushQueue implements CommandLineRunner, ApplicationContextAware {
+
+    static LinkedList<QueueData_Directive> linkedList;
+    static DataPushThread thread;
+    static DirectiveService directiveService;
+    static long t;
+    static final int IDLE_TIME = 1000 * 30;
+
+    static {
+        linkedList = new LinkedList<>();
+    }
+
+    public static void put6002(ScheduleRealInfo sch, int finish, String sender){
+        QueueData_Directive qd6002 = new QueueData_Directive();
+        qd6002.setSch(sch);
+        qd6002.setFinish(finish);
+        qd6002.setSender(sender);
+        qd6002.setCode("60_02");
+
+        linkedList.add(qd6002);
+    }
+
+    public static void put6003(String nbbm, int state, int upDown, ScheduleRealInfo sch,  String sender){
+        QueueData_Directive qd6003 = new QueueData_Directive();
+        qd6003.setNbbm(nbbm);
+        qd6003.setState(state);
+        qd6003.setUpDown(upDown);
+        qd6003.setSch(sch);
+        qd6003.setSender(sender);
+
+        qd6003.setCode("60_03");
+
+        linkedList.add(qd6003);
+    }
+
+    public static void put64(String nbbm, String lineCode, String sender){
+        QueueData_Directive qd64 = new QueueData_Directive();
+        qd64.setNbbm(nbbm);
+        qd64.setLineCode(lineCode);
+        qd64.setSender(sender);
+
+        qd64.setCode("64");
+
+        linkedList.add(qd64);
+    }
+
+    public static boolean isIdle(){
+        return System.currentTimeMillis() - t > IDLE_TIME;
+    }
+
+    public static void start(){
+        if(thread != null){
+            thread.interrupt();
+        }
+        thread = new DataPushThread();
+        thread.start();
+    }
+
+    @Override
+    public void run(String... strings) throws Exception {
+        start();
+    }
+
+    @Override
+    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+        directiveService = applicationContext.getBean(DirectiveService.class);
+    }
+
+    public static class DataPushThread extends Thread {
+
+        Logger log = LoggerFactory.getLogger(this.getClass());
+
+        @Override
+        public void run() {
+            boolean sleepFlag = false;
+            QueueData_Directive qd;
+            String code;
+            while (true) {
+                try {
+                    qd = linkedList.pollFirst();
+                    if (qd != null) {
+                        sleepFlag = false;
+                        code = qd.getCode();
+
+                        if(code.equals("60_02")){
+                            directiveService.send60Dispatch(qd.getSch(), qd.getFinish(), qd.getSender());
+                            log.info("directive 60_02 sch id: " + qd.getSch().getId());
+                        }
+                        else if(code.equals("60_03")){
+                            directiveService.send60Operation(qd.getNbbm(), qd.getState(), qd.getUpDown(), null, qd.getSender());
+                            log.info("directive 60_03 nbbm: " + qd.getNbbm());
+                        }
+                        else if(code.equals("64")){
+                            directiveService.lineChange(qd.getNbbm(), qd.getLineCode(), qd.getSender());
+                            log.info("directive 64 nbbm: " + qd.getNbbm() + " lineCode: " + qd.getLineCode());
+                        }
+
+                    } else{
+                        Thread.sleep(500);
+                        if(!sleepFlag){
+                            log.info("sleep...");
+                            sleepFlag = true;
+                        }
+                    }
+                    t = System.currentTimeMillis();
+                }
+                catch(InterruptedException e){
+                    break;
+                }
+                catch (Exception e) {
+                    log.error("", e);
+                }
+
+            }
+        }
+    }
+}
+package com.bsth.data.msg_queue;
+
+import org.springframework.web.socket.TextMessage;
+import org.springframework.web.socket.WebSocketSession;
+
+/**
+ * Created by panzhao on 2017/5/11.
+ */
+public class QueueData {
+
+    private TextMessage message;
+
+    private WebSocketSession session;
+
+
+    public WebSocketSession getSession() {
+        return session;
+    }
+
+    public void setSession(WebSocketSession session) {
+        this.session = session;
+    }
+
+    public TextMessage getMessage() {
+        return message;
+    }
+
+    public void setMessage(TextMessage message) {
+        this.message = message;
+    }
+}
+package com.bsth.data.msg_queue;
+
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+
+/**
+ * Created by panzhao on 2017/5/11.
+ */
+public class QueueData_Directive {
+
+    /**
+     * 指令类型
+     * 60_02
+     * 60_03
+     * 64
+     */
+    private String code;
+
+    /** 60调度指令内容  60_02*/
+    private ScheduleRealInfo sch;
+    private int finish;
+
+    /** 60 营运指令 60_03*/
+    private String nbbm;
+    private int state;
+    private int upDown;
+
+    /** 64指令内容 */
+    private String lineCode;
+
+    private String sender;
+
+
+    public ScheduleRealInfo getSch() {
+        return sch;
+    }
+
+    public void setSch(ScheduleRealInfo sch) {
+        this.sch = sch;
+    }
+
+    public int getFinish() {
+        return finish;
+    }
+
+    public void setFinish(int finish) {
+        this.finish = finish;
+    }
+
+    public String getSender() {
+        return sender;
+    }
+
+    public void setSender(String sender) {
+        this.sender = sender;
+    }
+
+    public String getNbbm() {
+        return nbbm;
+    }
+
+    public void setNbbm(String nbbm) {
+        this.nbbm = nbbm;
+    }
+
+    public int getState() {
+        return state;
+    }
+
+    public void setState(int state) {
+        this.state = state;
+    }
+
+    public int getUpDown() {
+        return upDown;
+    }
+
+    public void setUpDown(int upDown) {
+        this.upDown = upDown;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getLineCode() {
+        return lineCode;
+    }
+
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
+    }
+}
+package com.bsth.data.msg_queue;
+
+import com.bsth.common.Constants;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.stereotype.Component;
+import org.springframework.web.socket.TextMessage;
+import org.springframework.web.socket.WebSocketSession;
+
+import java.util.LinkedList;
+
+/**
+ * 线调web socket 推送队列
+ * Created by panzhao on 2017/5/11.
+ */
+@Component
+public class WebSocketPushQueue implements CommandLineRunner {
+
+    static LinkedList<QueueData> linkedList;
+    static DataPushThread thread;
+    static Logger log = LoggerFactory.getLogger(WebSocketPushQueue.class);
+    static long t;
+    static final int IDLE_TIME = 1000 * 30;
+
+    static {
+        linkedList = new LinkedList();
+    }
+
+    public static boolean isIdle() {
+        return System.currentTimeMillis() - t > IDLE_TIME;
+    }
+
+    public static void put(WebSocketSession session, TextMessage msg) {
+        QueueData qd = new QueueData();
+        qd.setMessage(msg);
+        qd.setSession(session);
+
+        log.info("put、[" + session.getAttributes().get(Constants.SESSION_USERNAME) + "] 、" + msg.getPayload());
+        linkedList.add(qd);
+    }
+
+    public static void start() {
+        if (thread != null) {
+            thread.interrupt();
+        }
+        thread = new DataPushThread();
+        thread.start();
+    }
+
+    @Override
+    public void run(String... strings) throws Exception {
+        start();
+    }
+
+    public static class DataPushThread extends Thread {
+
+        Logger log = LoggerFactory.getLogger(this.getClass());
+
+        @Override
+        public void run() {
+            QueueData qd;
+            WebSocketSession session;
+
+            boolean sleepFlag = false;
+            while (true) {
+                try {
+                    qd = linkedList.pollFirst();
+                    if (qd != null) {
+                        sleepFlag = false;
+                        session = qd.getSession();
+                        if (session.isOpen()) {
+                            log.info("push start、[" + session.getAttributes().get(Constants.SESSION_USERNAME) + "] 、" + qd.getMessage().getPayload());
+                            session.sendMessage(qd.getMessage());
+                            log.info("push end..");
+                        }
+                    } else {
+                        Thread.sleep(500);
+                        if (!sleepFlag) {
+                            log.info("sleep...");
+                            sleepFlag = true;
+                        }
+                    }
+                    t = System.currentTimeMillis();
+                } catch (InterruptedException e) {
+                    break;
+                } catch (Exception e) {
+                    log.error("", e);
+                }
+            }
+        }
+    }
+}
@@ -4,6 +4,7 @@ import com.bsth.data.BasicData;
 import com.bsth.data.LineConfigData;
 import com.bsth.data.gpsdata.GpsEntity;
 import com.bsth.data.gpsdata.GpsRealData;
+import com.bsth.data.msg_queue.DirectivePushQueue;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.entity.Line;
 import com.bsth.entity.directive.D80;
@@ -82,9 +83,11 @@ public class PilotReport {
 					outSch = dayOfSchedule.next(outSch);
 				//下发调度指令
-				directiveService.send60Dispatch(outSch, dayOfSchedule.doneSum(nbbm), "请出@系统");
+				DirectivePushQueue.put6002(outSch, dayOfSchedule.doneSum(nbbm), "请出@系统");
+				//directiveService.send60Dispatch(outSch, dayOfSchedule.doneSum(nbbm), "请出@系统");
 				//下发线路切换指令
-				directiveService.lineChange(outSch.getClZbh(), outSch.getXlBm(), "请出@系统");
+				DirectivePushQueue.put64(outSch.getClZbh(), outSch.getXlBm(), "请出@系统");
+				//directiveService.lineChange(outSch.getClZbh(), outSch.getXlBm(), "请出@系统");
 			}else
 				d80.setRemarks("没有出场计划");
@@ -7,6 +7,7 @@ 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;
@@ -139,6 +140,9 @@ public class DayOfSchedule implements CommandLineRunner {
     @Autowired
     CalcOilThread calcOilThread;
+    @Autowired
+    ThreadMonotor threadMonotor;
+
     private static DateTimeFormatter fmtyyyyMMdd = DateTimeFormat.forPattern("yyyy-MM-dd"), fmtHHmm = DateTimeFormat.forPattern("HH:mm");
     @Override
@@ -165,6 +169,9 @@ public class DayOfSchedule implements CommandLineRunner {
         //指令持久化线程
         Application.mainServices.scheduleWithFixedDelay(directivesPstThread, 180, 180, TimeUnit.SECONDS);
+
+        //监听
+        Application.mainServices.scheduleWithFixedDelay(threadMonotor, 120, 60, TimeUnit.SECONDS);
     }
     //数据恢复
@@ -85,12 +85,15 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
 		if(null != sender)
 			d60.setSender(sender);
 		d60.setHttpCode(code);
-		// 添加到缓存
-		dayOfDirectives.put60(d60);
-		if (code != 0) {
+		if (code == 0) {
+			// 添加到缓存
+			dayOfDirectives.put60(d60, true);
+		}
+		else{
 			d60.setErrorText("网关通讯失败, code: " + code);
 			d60Repository.save(d60);
+			dayOfDirectives.put60(d60, false);
 		}
 		return code;
 	}
@@ -139,12 +142,13 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
 		if (code == 0) {
 			sch.setDirectiveState(60);
 			// 添加到缓存，延迟入库
-			dayOfDirectives.put60(d60);
+			dayOfDirectives.put60(d60, true);
 			// 通知页面
 			sendD60ToPage(sch);
 		}
 		else{
 			d60.setErrorText("网关通讯失败, code: " + code);
+			dayOfDirectives.put60(d60, false);
 			d60Repository.save(d60);
 		}
 		return code;
@@ -196,11 +200,15 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
 		d60.setHttpCode(code);
 		if (null != sch)
 			d60.setSch(sch);
-		dayOfDirectives.put60(d60);
-		if (code != 0) {
+
+		if (code == 0) {
+			dayOfDirectives.put60(d60, true);
+		}
+		else{
 			d60.setErrorText("网关通讯失败, code: " + code);
 			d60Repository.save(d60);
+			dayOfDirectives.put60(d60, false);
 		}
 		return code;
 	}
@@ -10,6 +10,7 @@ import com.bsth.controller.realcontrol.dto.DfsjChange;
 import com.bsth.controller.realcontrol.dto.LpData;
 import com.bsth.data.BasicData;
 import com.bsth.data.LineConfigData;
+import com.bsth.data.msg_queue.DirectivePushQueue;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.data.schedule.SchAttrCalculator;
 import com.bsth.data.schedule.SchModifyLog;
@@ -1280,11 +1281,12 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                     ts.add(next);
                 }
-                //车辆下一个要执行的班次
                 try{
+                    //车辆下一个要执行的班次
                     ScheduleRealInfo carNext = dayOfSchedule.next(sch);
                     if(carNext != null && !carNext.getXlBm().equals(sch.getXlBm())){
-                        directiveService.lineChange(carNext.getClZbh(), carNext.getXlBm(), "套跑@系统");
+                        DirectivePushQueue.put64(carNext.getClZbh(), carNext.getXlBm(), "套跑@系统");
+                        //directiveService.lineChange(carNext.getClZbh(), carNext.getXlBm(), "套跑@系统");
                     }
                 }catch (Exception e){logger.error("", e);}
 package com.bsth.websocket.handler;
 import com.alibaba.fastjson.JSONObject;
-import com.bsth.common.Constants;
 import com.bsth.data.BasicData;
+import com.bsth.data.msg_queue.WebSocketPushQueue;
 import com.google.common.base.Splitter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -103,7 +103,8 @@ public class RealControlSocketHandler implements WebSocketHandler {
 			return;
 		for(WebSocketSession user : list){
-			try {
+			WebSocketPushQueue.put(user, message);
+			/*try {
 				if (user.isOpen()) {
 					user.sendMessage(message);
 				}
@@ -114,7 +115,7 @@ public class RealControlSocketHandler implements WebSocketHandler {
 				catch(Exception e2){}
 				logger.error("sendMessageToLine error ...."+msg);
 				logger.error("sendMessageToLine error ....", e);
-			}
+			}*/
 		}
 	}
@@ -182,6 +182,48 @@
 		<appender-ref ref="GPS_COUNT" />
 	</logger>
+	<!-- 消息队列纪录 -->
+	<appender name="QUEUE_WEB_SOCKET"
+			  class="ch.qos.logback.core.rolling.RollingFileAppender">
+		<file>${LOG_BASE}/msg_queue/websocket.log</file>
+		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+			<fileNamePattern>${LOG_BASE}/msg_queue/websocket-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+			<timeBasedFileNamingAndTriggeringPolicy
+					class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+				<maxFileSize>100MB</maxFileSize>
+			</timeBasedFileNamingAndTriggeringPolicy>
+		</rollingPolicy>
+
+		<layout class="ch.qos.logback.classic.PatternLayout">
+			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%file:%line] %-5level -%msg%n
+			</pattern>
+		</layout>
+	</appender>
+	<logger name="com.bsth.data.msg_queue.WebSocketPushQueue"
+			level="INFO" additivity="false">
+		<appender-ref ref="QUEUE_WEB_SOCKET" />
+	</logger>
+	<appender name="QUEUE_DIRECTIVE"
+			  class="ch.qos.logback.core.rolling.RollingFileAppender">
+		<file>${LOG_BASE}/msg_queue/directive.log</file>
+		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+			<fileNamePattern>${LOG_BASE}/msg_queue/directive-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+			<timeBasedFileNamingAndTriggeringPolicy
+					class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+				<maxFileSize>100MB</maxFileSize>
+			</timeBasedFileNamingAndTriggeringPolicy>
+		</rollingPolicy>
+
+		<layout class="ch.qos.logback.classic.PatternLayout">
+			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%file:%line] %-5level -%msg%n
+			</pattern>
+		</layout>
+	</appender>
+	<logger name="com.bsth.data.msg_queue.DirectivePushQueue"
+			level="INFO" additivity="false">
+		<appender-ref ref="QUEUE_DIRECTIVE" />
+	</logger>
+
 	<!--<logger name="org.hibernate.SQL" level="TRACE">-->
 	<!--<appender-ref ref="STDOUT" />-->
 	<!--</logger>-->
@@ -116,10 +116,10 @@
                     <label class="uk-form-label" >调整说明</label>
                     <div class="uk-form-controls">
                         <select name="adjustExps">
-                          <option value="">请选择..</option>
-                          {{each adjustExps as exp i}}
+                            <option value="">请选择..</option>
+                            {{each adjustExps as exp i}}
                             <option value="{{exp}}">{{exp}}</option>
-                          {{/each}}
+                            {{/each}}
                         </select>
                     </div>
                 </div>
@@ -129,7 +129,7 @@
             <div class="uk-width-1-1">
                 <div class="uk-form-row ct-stacked">
                     <div class="uk-form-controls" style="margin-top: 5px;">
-                        <textarea id="form-s-t" cols="30" rows="5" name="remarks" data-fv-stringlength="true" data-fv-stringlength-max="50" placeholder="备注，不超过50个字符">{{sch.remarks}}</textarea>
+                        <textarea id="form-s-t" cols="30" rows="5" required name="remarks" data-fv-stringlength="true" data-fv-stringlength-max="50" placeholder="备注，不超过50个字符">{{sch.remarks}}</textarea>
                     </div>
                 </div>
             </div>
@@ -54,7 +54,7 @@
                 <div class="uk-form-row ct-stacked">
                     <label class="uk-form-label" for="form-s-t">调整说明<small class="font-danger">（不超过20个字符）</small></label>
                     <div class="uk-form-controls">
-                        <textarea id="form-s-t" cols="30" rows="5" name="remarks" data-fv-stringlength="true" data-fv-stringlength-max="20" placeholder="不超过20个字符。非必填"></textarea>
+                        <textarea id="form-s-t" cols="30" rows="5" name="remarks" required data-fv-stringlength="true" data-fv-stringlength-max="20" placeholder="不超过20个字符。必填"></textarea>
                     </div>
                 </div>
             </div>
@@ -169,8 +169,8 @@ var disabled_submit_btn = function (form) {
 function showUpdateDescription() {
     //更新说明
     var updateDescription = {
-        date: '2017-05-09',
-        text: '<h5>恢复到了最新功能版本，并修复了临加时没有保存售票员的问题。</h5>'
+        date: '2017-05-12',
+        text: '<h5>现在班次调整时，备注是必填项</h5><h5>现在中途更换设备后，需要刷新缓存数据后，再刷新线调页面。</h5><h5>分班套跑车辆将在上午最后一个班次完成后发送线路切换指令。捕捉到出场信号时也会切换至出场班次所在线路，驾驶员请求出场时候也会同步一次状态</h5><h5>修复了一些其他问题。</h5>'
     };
     var storage = window.localStorage
@@ -864,6 +864,8 @@
                     if(typeof(upDown) == "undefined")
                         upDown = roadUpdown;
+                    if(upDown!= 0 && upDown != 1)
+                        return;
                     map.clearOverlays();
                     parkPolygons = {};//清除停车场对照
                     //路段