update...

潘钊
1 parent e25f09c9
Showing 23 changed files with 683 additions and 83 deletions
src/main/java/com/bsth/controller/directive/DirectiveController.java
src/main/java/com/bsth/data/directive/DayOfDirectives.java
src/main/java/com/bsth/data/gpsdata/GpsEntity.java
src/main/java/com/bsth/data/gpsdata/GpsRealData.java
src/main/java/com/bsth/data/gpsdata/arrival/handlers/CorrectSignalHandle.java
src/main/java/com/bsth/data/gpsdata/arrival/handlers/InOutStationSignalHandle.java
src/main/java/com/bsth/data/gpsdata/arrival/handlers/OfflineSignalHandle.java
src/main/java/com/bsth/data/gpsdata/recovery/GpsDataRecovery.java
src/main/java/com/bsth/data/gpsdata/status_manager/GpsStatusManager.java
src/main/java/com/bsth/data/gpsdata/status_manager/gps_line_state/ChangeBean.java
src/main/java/com/bsth/data/gpsdata/status_manager/gps_line_state/LineStateHandle.java
src/main/java/com/bsth/data/gpsdata/status_manager/gps_service_state/ServiceStateHandle.java
src/main/java/com/bsth/data/gpsdata/status_manager/gps_service_state/StateBean.java
src/main/java/com/bsth/data/msg_queue/DirectivePushQueue.java
src/main/java/com/bsth/data/pilot80/PilotReport.java
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/java/com/bsth/entity/realcontrol/ScheduleType.java
src/main/java/com/bsth/service/directive/DirectiveService.java
src/main/java/com/bsth/service/directive/DirectiveServiceImpl.java
src/main/java/com/bsth/service/gps/GpsServiceImpl.java
@@ -31,7 +31,7 @@ public class DirectiveController {
 	@Autowired
 	DirectiveService directiveService;
-	
+
 	/**
 	 * 
 	 * @Title: send60 
@@ -106,7 +106,7 @@ public class DirectiveController {
 	@RequestMapping(value = "/upDownChange", method = RequestMethod.POST)
 	public int upDownChange(@RequestParam String nbbm, @RequestParam Integer upDown){
 		SysUser user = SecurityUtils.getCurrentUser();
-		return directiveService.upDownChange(nbbm, upDown, user.getUserName());
+		return directiveService.send60Operation(nbbm, 0, upDown, user.getUserName());
 	}
 	/**
@@ -120,7 +120,7 @@ public class DirectiveController {
 	@RequestMapping(value = "/stateChange", method = RequestMethod.POST)
 	public int stateChange(@RequestParam String nbbm, @RequestParam Integer upDown, @RequestParam Integer state){
 		SysUser user = SecurityUtils.getCurrentUser();
-		return directiveService.stateChange(nbbm, upDown, state, user.getUserName());
+		return directiveService.send60Operation(nbbm, state, upDown, user.getUserName());
 	}
 	/**
@@ -166,7 +166,8 @@ public class DayOfDirectives {
 			if(null != d60Map.remove(d60.getMsgId()))
 				c60 ++;
 		}
-		logger.info("清除60数据 ，" + c60);
+		if(c60 > 0)
+			logger.info("清除60数据 ，" + c60);
 		//找到该设备的64数据
 		Collection<D64> d64s = d64Map.values();
@@ -184,8 +185,9 @@ public class DayOfDirectives {
 			if(null != d64Map.remove(d64.getKey()))
 				c64 ++;
 		}
-		
-		logger.info("清除64数据 ，" + c64);
+
+		if(c64 > 0)
+			logger.info("清除64数据 ，" + c64);
 	}
 	public Collection<D60> all60(){
@@ -40,9 +40,12 @@ public class GpsEntity {
 	/** 纬度 */
 	private Float lat;
-	/** 发送时间戳 */
+	/** GPS发送时间戳 */
 	private Long timestamp;
+	/** 网关收到时间 */
+	private Long serverTimestamp;
+
 	/** 速度 */
 	private Float speed;
@@ -318,17 +321,33 @@ public class GpsEntity {
 		long t = System.currentTimeMillis();
-		if((t - this.getTimestamp()) > 1000 * 60){
+		if((t - this.getServerTimestamp()) > 1000 * 60 * 2){
 			return false;
 		}
-		if((this.getTimestamp() - t) > 1000 * 60 * 3){
+		if((this.getServerTimestamp() - t) > 1000 * 60 * 3){
 			return false;
 		}
 		return true;
 	}
+	/**
+	 * 是否营运
+	 * @return
+	 */
+	public boolean isService(){
+		return state!=null && state==0;
+	}
+
 	public boolean isOffline(){
 		return this.getAbnormalStatus() != null && this.getAbnormalStatus().equals("offline");
 	}
+
+	public Long getServerTimestamp() {
+		return serverTimestamp;
+	}
+
+	public void setServerTimestamp(Long serverTimestamp) {
+		this.serverTimestamp = serverTimestamp;
+	}
 }
@@ -110,6 +110,14 @@ public class GpsRealData {
         return rs;
     }
+    public GpsEntity getByNbbm(String nbbm){
+        String device = BasicData.deviceId2NbbmMap.inverse().get(nbbm);
+        if(StringUtils.isNotBlank(device))
+            return get(device);
+        else
+            return null;
+    }
+
     /**
      * @Title: get @Description: TODO(线路编码获取GPS集合) @throws
      */
@@ -3,8 +3,8 @@ package com.bsth.data.gpsdata.arrival.handlers;
 import com.bsth.data.gpsdata.GpsEntity;
 import com.bsth.data.gpsdata.arrival.SignalHandle;
 import com.bsth.data.gpsdata.arrival.utils.CircleQueue;
+import com.bsth.data.gpsdata.status_manager.GpsStatusManager;
 import com.bsth.data.schedule.DayOfSchedule;
-import com.bsth.entity.realcontrol.ChildTaskPlan;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.service.directive.DirectiveService;
 import org.slf4j.Logger;
@@ -24,28 +24,45 @@ public class CorrectSignalHandle extends SignalHandle {
     @Autowired
     DirectiveService directiveService;
+    @Autowired
+    GpsStatusManager gpsStatusManager;
+
     Logger logger = LoggerFactory.getLogger(this.getClass());
     @Override
     public boolean handle(GpsEntity gps, CircleQueue<GpsEntity> prevs) {
-        Object task = dayOfSchedule.executeCurr(gps.getNbbm());
+        ScheduleRealInfo task = dayOfSchedule.executeCurr(gps.getNbbm());
         if(task == null)
             return false;
-        ScheduleRealInfo sch;
+        //ScheduleRealInfo sch;
         //子任务
-        if(task.getClass().isAssignableFrom(ChildTaskPlan.class)){
+        /*if(task.getClass().isAssignableFrom(ChildTaskPlan.class)){
             ChildTaskPlan childTask = (ChildTaskPlan) task;
             sch = childTask.getSchedule();
         }
         else
-            sch = (ScheduleRealInfo) task;
+            sch = (ScheduleRealInfo) task;*/
-        byte updown = Byte.parseByte(sch.getXlDir());
+        byte updown = Byte.parseByte(task.getXlDir());
         //走向
         if(gps.getUpDown() != updown){
             gps.setUpDown(updown);
-            gps.setState(0);
+            //gps.setState(0);
+        }
+
+        //（转发的数据不管）
+        if(gps.getSource() != 0){
+            //gps=非营运 && 班次=非空驶 ;切换到营运状态
+            if(!gps.isService() &&
+                    !dayOfSchedule.emptyService(task)){
+                gpsStatusManager.changeServiceState(gps.getNbbm(), updown, 0, null);
+            }
+
+            //需要切换线路
+            if(!task.getXlBm().equals(gps.getLineId())){
+                gpsStatusManager.changeLine(gps.getNbbm(), task.getXlBm(), null);
+            }
         }
         return true;
@@ -6,6 +6,7 @@ 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.gpsdata.status_manager.GpsStatusManager;
 import com.bsth.data.msg_queue.DirectivePushQueue;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.data.schedule.ScheduleComparator;
@@ -46,6 +47,9 @@ public class InOutStationSignalHandle extends SignalHandle{
     @Autowired
     SignalSchPlanMatcher signalSchPlanMatcher;
+    @Autowired
+    GpsStatusManager gpsStatusManager;
+
     private final static int MAX_BEFORE_TIME = 1000 * 60 * 120;
     //最大的班次时间差，防止异常的GPS时间打乱数据
@@ -57,10 +61,11 @@ public class InOutStationSignalHandle extends SignalHandle{
         if(isGpsOffline(gps))
             return false;
-        //从异常状态恢复的第一个信号
+        /*//从异常状态恢复的第一个信号*/
         if(abnormalRecovery(gps, prevs)){
             //回溯一下之前的轨迹
-            scheduleSignalState.signalRetrospect(gps);
+            //scheduleSignalState.signalRetrospect(gps);
+            return false;
         }
         if(isNotEmpty(prevs)){
@@ -154,10 +159,9 @@ public class InOutStationSignalHandle extends SignalHandle{
             //清理应发未发标记
             LateAdjustHandle.remove(sch);
-            if(sch.getBcType().equals("out")){
-                //出场时，切换成营运状态
-                DirectivePushQueue.put6003(sch.getClZbh(), 0, Integer.parseInt(sch.getXlDir()), null, "出场@系统");
-                //directiveService.send60Operation(sch.getClZbh(), 0, Integer.parseInt(sch.getXlDir()), null, "出场@系统");
+            if(!gps.isService()){
+                //切换成营运状态
+                gpsStatusManager.changeServiceState(sch.getClZbh(), sch.getXlDir(), 0, "发车@系统");
             }
             //出站既出场
             outStationAndOutPark(sch);
@@ -232,11 +236,13 @@ public class InOutStationSignalHandle extends SignalHandle{
                 sendUtils.refreshSch(schPrev);
                 dayOfSchedule.save(schPrev);
-                if(schPrev.getBcType().equals("out")){
+                /*if(schPrev.getBcType().equals("out")){
                     //出场时，切换成营运状态
-                    DirectivePushQueue.put6003(schPrev.getClZbh(), 0, Integer.parseInt(schPrev.getXlDir()), null, "出场@系统");
+                    String deviceId = BasicData.deviceId2NbbmMap.inverse().get(sch.getClZbh());
+                    gpsStatusManager.changeServiceState(deviceId, schPrev.getXlDir(), 0, "出场@系统");
+                    //DirectivePushQueue.put6003(schPrev.getClZbh(), 0, Integer.parseInt(schPrev.getXlDir()), "出场@系统");
                     //directiveService.send60Operation(schPrev.getClZbh(), 0, Integer.parseInt(schPrev.getXlDir()), null, "出场@系统");
-                }
+                }*/
             }
         }
     }
@@ -265,6 +271,15 @@ public class InOutStationSignalHandle extends SignalHandle{
             if(Math.abs(diff) > MAX_NORMAL_DIFF)
                 return;
+            //环线或内外圈 ，飘出去再回来
+            if(sch.getQdzCode().equals(sch.getZdzCode())
+                    && StringUtils.isNotEmpty(sch.getFcsjActual())
+                    && gps.getTimestamp() - sch.getFcsjActualTime() < 1000 * 60 * 3){
+                sch.clearFcsjActual();
+                sendUtils.refreshSch(sch);
+                return;
+            }
+
             //实达时间不覆盖
             if(StringUtils.isNotEmpty(sch.getZdsjActual()))
                 return;
@@ -304,26 +319,23 @@ public class InOutStationSignalHandle extends SignalHandle{
                 transformUpdown(gps, next);
                 //下发调度指令
                 DirectivePushQueue.put6002(next, doneSum, "到站@系统");
-                //directiveService.send60Dispatch(next, doneSum, "到站@系统");
                 //套跑  -下发线路切换指令
                 if(!next.getXlBm().equals(sch.getXlBm())){
-                    DirectivePushQueue.put64(next.getClZbh(), next.getXlBm(), "套跑@系统");
-                    //directiveService.lineChange(next.getClZbh(), next.getXlBm(), "套跑@系统");
+                    gpsStatusManager.changeLine(next.getClZbh(), next.getXlBm(), "套跑@系统");
                 }
             }
             else if(sch.getBcType().equals("in")){
-                //终班进场，切换成非营运状态
-                DirectivePushQueue.put6003(sch.getClZbh(), 1, Integer.parseInt(sch.getXlDir()), null, "进场@系统");
-                //directiveService.send60Operation(sch.getClZbh(), 1, Integer.parseInt(sch.getXlDir()), null, "进场@系统");
+                //进场，切换成非营运状态
+                gpsStatusManager.changeServiceState(sch.getClZbh(), sch.getXlDir(), 1, "进场@系统");
             }
         }
         else {
-            if(sch.getFcsjActual() == null){
+            /*if(sch.getFcsjActual() == null){
                 //有进站，但班次没有实发，向前追溯一下信号
                 scheduleSignalState.signalRetrospect(gps, sch);
             }
-
+*/
             //如果当前班次是出场，并且进的是下一个班次的终点
             if(sch.getBcType().equals("out")){
                 ScheduleRealInfo next = dayOfSchedule.next(sch);
@@ -397,6 +409,9 @@ public class InOutStationSignalHandle extends SignalHandle{
             next = dayOfSchedule.next(next);
             if(next != null)
                 dayOfSchedule.addExecPlan(next);
+
+            //进场，切换成非营运状态
+            gpsStatusManager.changeServiceState(sch.getClZbh(), sch.getXlDir(), 1, "进场@系统");
         }
     }
@@ -23,7 +23,7 @@ public class OfflineSignalHandle extends SignalHandle{
     public boolean handle(GpsEntity gps, CircleQueue<GpsEntity> prevs) {
         //掉线信号不管
         if(isGpsOffline(gps)){
-            gps.setSignalState("drift");
+            gps.setSignalState("gps-offline");
             gps.setAbnormalStatus("gps-offline");
             return true;
         }
@@ -84,7 +84,7 @@ public class GpsDataRecovery implements ApplicationContextAware {
         Calendar calendar = Calendar.getInstance();
         int dayOfYear = calendar.get(Calendar.DAY_OF_YEAR);
-        String sql = "select DEVICE_ID,LAT,LON,TS,SPEED_GPS,LINE_ID,SERVICE_STATE from bsth_c_gps_info where days_year=" + dayOfYear;
+        String sql = "select DEVICE_ID,LAT,LON,TS,SPEED_GPS,LINE_ID,SERVICE_STATE from bsth_c_gps_info where days_year=194";// + dayOfYear;
         JdbcTemplate jdbcTemplate = new JdbcTemplate(DBUtils_MS.getDataSource());
         List<GpsEntity> list =
+package com.bsth.data.gpsdata.status_manager;
+
+import com.bsth.Application;
+import com.bsth.data.gpsdata.status_manager.gps_line_state.LineStateHandle;
+import com.bsth.data.gpsdata.status_manager.gps_service_state.ServiceStateHandle;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.stereotype.Component;
+
+import java.util.concurrent.TimeUnit;
+
+/**
+ * GPS 状态管理
+ * Created by panzhao on 2017/7/13.
+ */
+@Component
+public class GpsStatusManager  implements CommandLineRunner {
+
+    @Autowired
+    StatusCheckThread checkThread;
+
+    @Autowired
+    LineStateHandle lineStateHandle;
+
+    @Autowired
+    ServiceStateHandle serviceStateHandle;
+
+    /**
+     * 切换线路
+     * @param nbbm
+     * @param lineCode
+     * @param sender
+     */
+    public void changeLine(String nbbm, String lineCode, String sender){
+        lineStateHandle.changeLine(nbbm, lineCode, sender);
+    }
+
+    /**
+     * 切换营运状态
+     * @param nbbm
+     * @param state 0 营运， 1：非营运
+     * @param sender
+     */
+    public void changeServiceState(String nbbm, String upDown,int state, String sender){
+        changeServiceState(nbbm, Integer.parseInt(upDown), state, sender);
+    }
+
+    /**
+     * 切换营运状态
+     * @param nbbm
+     * @param state 0 营运， 1：非营运
+     * @param sender
+     */
+    public void changeServiceState(String nbbm, int upDown,int state, String sender){
+        serviceStateHandle.changeState(nbbm, upDown, state, sender);
+    }
+
+    @Override
+    public void run(String... strings) throws Exception {
+        Application.mainServices.scheduleWithFixedDelay(checkThread, 120, 120, TimeUnit.SECONDS);
+    }
+
+    @Component
+    public static class StatusCheckThread extends Thread{
+
+        @Autowired
+        LineStateHandle lineStateHandle;
+
+        @Autowired
+        ServiceStateHandle serviceStateHandle;
+
+        @Override
+        public void run() {
+            /** 检查线路切换结果 */
+            lineStateHandle.checkResultAll();
+            /** 检查营运状态切换结果 */
+            serviceStateHandle.checkResultAll();
+        }
+    }
+}
+package com.bsth.data.gpsdata.status_manager.gps_line_state;
+
+/**
+ * Created by panzhao on 2017/7/13.
+ */
+public class ChangeBean {
+
+    /**
+     * 车辆自编号
+     */
+    private String nbbm;
+
+    /**
+     * 要切换到的线路
+     */
+    private String lineCode;
+
+    /**
+     * 指令发送次数
+     */
+    private int sendCount;
+
+    /**
+     * 上次指令时间
+     */
+    private long st;
+
+    /**发送人 */
+    private String sender;
+
+    public static ChangeBean getInstance(String nbbm, String lineCode, String sender){
+        ChangeBean cb = new ChangeBean();
+        cb.setNbbm(nbbm);
+        cb.setLineCode(lineCode);
+        cb.setSendCount(0);
+        cb.setSender(sender);
+        return cb;
+    }
+
+    public void countPlus(){
+        sendCount ++;
+    }
+
+    public String getLineCode() {
+        return lineCode;
+    }
+
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
+    }
+
+    public int getSendCount() {
+        return sendCount;
+    }
+
+    public void setSendCount(int sendCount) {
+        this.sendCount = sendCount;
+    }
+
+    public long getSt() {
+        return st;
+    }
+
+    public void setSt(long st) {
+        this.st = st;
+    }
+
+    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;
+    }
+}
+package com.bsth.data.gpsdata.status_manager.gps_line_state;
+
+import com.bsth.data.gpsdata.GpsEntity;
+import com.bsth.data.gpsdata.GpsRealData;
+import com.bsth.data.msg_queue.DirectivePushQueue;
+import com.bsth.service.directive.DirectiveService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Collection;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * 设备线路状态处理
+ * Created by panzhao on 2017/7/13.
+ */
+@Component
+public class LineStateHandle {
+
+    private static ConcurrentHashMap<String, ChangeBean> map;
+
+    @Autowired
+    DirectiveService directiveService;
+    @Autowired
+    GpsRealData gpsRealData;
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    /** 重发次数 */
+    private final static int MAX_SEND_COUNT=3;
+    /** 重发间隔 */
+    private final static int SEND_SPACE=1000 * 60 * 5;
+    /** 最大有效时间 */
+    private final static int MAX_AVAIL_TIME=1000 * 60 * 60 * 2;
+
+    static{
+        map = new ConcurrentHashMap();
+    }
+
+    public void changeLine(String nbbm, String lineCode, String sender){
+        ChangeBean cb = map.get(nbbm);
+        if(cb != null && cb.getLineCode().equals(lineCode)){
+            return;
+        }
+
+        cb = ChangeBean.getInstance(nbbm, lineCode, sender);
+        map.put(nbbm, cb);
+
+        changeLine(cb);
+    }
+
+    private void changeLine(ChangeBean cb){
+        cb.setSt(System.currentTimeMillis());
+        cb.countPlus();
+        DirectivePushQueue.put64(cb.getNbbm(), cb.getLineCode(), cb.getSender());
+    }
+
+
+    public void checkResultAll(){
+        Collection<ChangeBean> cbs = map.values();
+        for(ChangeBean cb : cbs){
+            checkResult(cb);
+        }
+    }
+
+    private void checkResult(ChangeBean cb){
+        try{
+            GpsEntity gps = gpsRealData.getByNbbm(cb.getNbbm());
+            if(gps == null)
+                return;
+
+            if(cb.getLineCode().equals(gps.getLineId())){
+                map.remove(cb.getNbbm());
+                logger.info("线路切换成功，" + cb.getNbbm() + "、" + cb.getLineCode());
+            }
+            else{
+                reSend(cb);
+            }
+        }catch (Exception e){
+            logger.error("", e);
+        }
+    }
+
+    private void reSend(ChangeBean cb){
+        if(cb.getSendCount() >= MAX_SEND_COUNT){
+            map.remove(cb.getNbbm());
+            logger.info("超过重发次数，" + cb.getNbbm() + "、" + cb.getLineCode());
+            return;
+        }
+
+        long diff = System.currentTimeMillis() - cb.getSt();
+        if(diff >= MAX_AVAIL_TIME){
+            map.remove(cb.getNbbm());
+            logger.info("超过有效时间，" + cb.getNbbm() + "、" + cb.getLineCode() + "、" + cb.getSt());
+            return;
+        }
+
+        if(diff >= SEND_SPACE){
+            cb.setSender("补发@系统");
+            changeLine(cb);
+            logger.info("重发线路切换指令，" + cb.getNbbm() + "、" + cb.getLineCode());
+            return;
+        }
+    }
+}
+package com.bsth.data.gpsdata.status_manager.gps_service_state;
+
+import com.bsth.data.gpsdata.GpsEntity;
+import com.bsth.data.gpsdata.GpsRealData;
+import com.bsth.data.msg_queue.DirectivePushQueue;
+import com.bsth.service.directive.DirectiveService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Collection;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * 设备营运状态处理
+ * Created by panzhao on 2017/7/13.
+ */
+@Component
+public class ServiceStateHandle {
+
+    private static ConcurrentHashMap<String, StateBean> map;
+
+    @Autowired
+    DirectiveService directiveService;
+    @Autowired
+    GpsRealData gpsRealData;
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    /** 重发次数 */
+    private final static int MAX_SEND_COUNT=3;
+    /** 重发间隔 */
+    private final static int SEND_SPACE=1000 * 60 * 4;
+    /** 最大有效时间 */
+    private final static int MAX_AVAIL_TIME=1000 * 60 * 60;
+
+    static{
+        map = new ConcurrentHashMap();
+    }
+
+    public void changeState(String nbbm, int upDown ,int state, String sender){
+        if(map.containsKey(nbbm)){
+            return;
+        }
+        StateBean sb = StateBean.getInstance(nbbm, upDown, state, sender);
+        map.put(nbbm, sb);
+        changeState(sb);
+    }
+
+    private void changeState(StateBean sb){
+        sb.setSt(System.currentTimeMillis());
+        sb.countPlus();
+        DirectivePushQueue.put6003(sb.getNbbm(), sb.getState(), sb.getUpDown(), sb.getSender());
+    }
+
+    public void checkResultAll(){
+        Collection<StateBean> sbs = map.values();
+        for(StateBean sb : sbs){
+            checkResult(sb);
+        }
+    }
+
+    private void checkResult(StateBean sb){
+        try{
+            GpsEntity gps = gpsRealData.getByNbbm(sb.getNbbm());
+            if(gps == null)
+                return;
+
+            if(gps.getState().equals(sb.getState())){
+                map.remove(sb.getNbbm());
+                logger.info("营运状态切换成功，" + sb.getNbbm() + "、" + sb.getState());
+            }
+            else
+                reSend(sb);
+        }catch (Exception e){
+            logger.error("", e);
+        }
+    }
+
+    private void reSend(StateBean sb){
+        if(sb.getSendCount() >= MAX_SEND_COUNT){
+            map.remove(sb.getNbbm());
+            logger.info("超过重发次数，" + sb.getNbbm() + "、" + sb.getState());
+            return;
+        }
+
+        long diff = System.currentTimeMillis() - sb.getSt();
+        if(diff >= MAX_AVAIL_TIME){
+            map.remove(sb.getNbbm());
+            logger.info("营运状态切换超过有效时间，" + sb.getNbbm() + "、" + sb.getState() + "、" + sb.getSt());
+            return;
+        }
+
+        if(diff >= SEND_SPACE){
+            sb.setSender("补发@系统");
+            changeState(sb);
+            logger.info("重发营运状态切换指令，" + sb.getNbbm() + "、" + sb.getState());
+            return;
+        }
+    }
+}
+package com.bsth.data.gpsdata.status_manager.gps_service_state;
+
+/**
+ * Created by panzhao on 2017/7/13.
+ */
+public class StateBean {
+
+    /**
+     * 车辆自编号
+     */
+    private String nbbm;
+
+    /**
+     * 要切换到营运状态
+     */
+    private int state;
+
+    /**
+     * 要切换到的上下行
+     */
+    private int upDown;
+
+    /**
+     * 指令发送次数
+     */
+    private int sendCount;
+
+    /**
+     * 上次指令时间
+     */
+    private long st;
+
+    /**发送人 */
+    private String sender;
+
+    public static StateBean getInstance(String nbbm, int upDown, int state, String sender){
+        StateBean sb = new StateBean();
+        sb.setNbbm(nbbm);
+        sb.setState(state);
+        sb.setSendCount(0);
+        sb.setSender(sender);
+        sb.setUpDown(upDown);
+        return sb;
+    }
+
+    public int getState() {
+        return state;
+    }
+
+    public void setState(int state) {
+        this.state = state;
+    }
+
+    public int getSendCount() {
+        return sendCount;
+    }
+
+    public void setSendCount(int sendCount) {
+        this.sendCount = sendCount;
+    }
+
+    public long getSt() {
+        return st;
+    }
+
+    public void setSt(long st) {
+        this.st = st;
+    }
+
+    public String getSender() {
+        return sender;
+    }
+
+    public void setSender(String sender) {
+        this.sender = sender;
+    }
+
+    public void countPlus(){
+        sendCount ++;
+    }
+
+    public int getUpDown() {
+        return upDown;
+    }
+
+    public void setUpDown(int upDown) {
+        this.upDown = upDown;
+    }
+
+    public String getNbbm() {
+        return nbbm;
+    }
+
+    public void setNbbm(String nbbm) {
+        this.nbbm = nbbm;
+    }
+}
@@ -39,12 +39,12 @@ public class DirectivePushQueue implements CommandLineRunner, ApplicationContext
         linkedList.add(qd6002);
     }
-    public static void put6003(String nbbm, int state, int upDown, ScheduleRealInfo sch,  String sender){
+    public static void put6003(String nbbm, int state, int upDown, String sender){
         QueueData_Directive qd6003 = new QueueData_Directive();
         qd6003.setNbbm(nbbm);
         qd6003.setState(state);
         qd6003.setUpDown(upDown);
-        qd6003.setSch(sch);
+        //qd6003.setSch(sch);
         qd6003.setSender(sender);
         qd6003.setCode("60_03");
@@ -111,7 +111,7 @@ public class DirectivePushQueue implements CommandLineRunner, ApplicationContext
                             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());
+                            directiveService.send60Operation(qd.getNbbm(), qd.getState(), qd.getUpDown(), qd.getSender());
                             log.info("directive 60_03 nbbm: " + qd.getNbbm());
                         }
                         else if(code.equals("64")){
@@ -2,7 +2,9 @@ package com.bsth.data.pilot80;
 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.gpsdata.status_manager.GpsStatusManager;
 import com.bsth.data.msg_queue.DirectivePushQueue;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.entity.Line;
@@ -51,6 +53,9 @@ public class PilotReport {
     @Autowired
     DC0A4Repository dc0A4Repository;
+    @Autowired
+    GpsStatusManager gpsStatusManager;
+
     //private static ArrayListMultimap<String, D80> d80MultiMap;
     private static ConcurrentHashMap<Integer, D80> d80Maps;
@@ -80,14 +85,26 @@ public class PilotReport {
                     ScheduleRealInfo outSch = dayOfSchedule.searchNearByBcType(nbbm, "out");
                     //如果有对应出场班次
                     if (outSch != null) {
-                        //没有计划里程的出场班次，出场既是首发站，发送下一班次的营运指令
+                        //没有计划里程的出场班次，出场既是首发站，发送下一班次的调度指令
                         if (outSch.getJhlc() == null)
                             outSch = dayOfSchedule.next(outSch);
                         //下发调度指令
+                        String deviceId = d80.getDeviceId();
                         DirectivePushQueue.put6002(outSch, dayOfSchedule.doneSum(nbbm), "请出@系统");
+
                         //下发线路切换指令
                         DirectivePushQueue.put64(outSch.getClZbh(), outSch.getXlBm(), "请出@系统");
+
+                        try {
+                            GpsEntity gps = gpsRealData.get(deviceId);
+                            if(gps != null && !gps.isService()){
+                                //切换到营运状态
+                                gpsStatusManager.changeServiceState(nbbm, outSch.getXlDir() ,0, "请出@系统");
+                            }
+                        }catch (Exception e){
+                            logger.error("请出切换营运状态异常", e);
+                        }
                     }
                     break;
             }
@@ -4,12 +4,9 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.bsth.common.Constants;
 import com.bsth.common.ResponseCode;
-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.gpsdata.recovery.GpsDataRecovery;
-import com.bsth.data.msg_queue.DirectivePushQueue;
 import com.bsth.entity.realcontrol.LineConfig;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.entity.schedule.SchedulePlanInfo;
@@ -949,7 +946,31 @@ public class DayOfSchedule {
         ScheduleRealInfo sch = schAttrCalculator.calcCurrentExecSch(list);
         carExecutePlanMap.put(nbbm, sch);
-        try {
+
+ /*       try{
+            GpsEntity gps = gpsRealData.get(BasicData.deviceId2NbbmMap.inverse().get(nbbm));
+            if (gps == null || !gps.isOnline())
+                return;//设备不在线
+
+            *//*if(sch == null && gps.isService())
+                DirectivePushQueue.put6003(nbbm, 1, 0, null, "系统");//无任务*//*
+
+            //String bcType = sch.getBcType();
+            *//*if(bcType.equals("normal")
+                    || bcType.equals("region")
+                    || bcType.equals("major")){
+                //全程、区间、放站，切换到营运状态
+                if(!gps.isService()){
+                    DirectivePushQueue.put6003(nbbm, 0, Integer.parseInt(sch.getXlDir()), sch, "系统");
+                }
+            }
+            else if(gps.isService()){
+                DirectivePushQueue.put6003(nbbm, 1, 0, null, "系统");//空驶任务
+            }*//*
+        }catch (Exception e){
+            logger.error("", e);
+        }
+        *//*try {
             //切换设备状态
             GpsEntity gps = gpsRealData.get(BasicData.deviceId2NbbmMap.inverse().get(nbbm));
             if (gps == null || !gps.isOnline())
@@ -967,7 +988,18 @@ public class DayOfSchedule {
             }
         } catch (Exception e) {
             logger.error("", e);
-        }
+        }*/
+    }
+
+    /**
+     * 空驶任务？
+     * 出场、进场、直放、两点间空驶
+     * @param sch
+     * @return
+     */
+    public static boolean emptyService(ScheduleRealInfo sch){
+        String type = sch.getBcType();
+        return type.equals("out") || type.equals("in") || type.equals("venting") || type.equals("ldks");
     }
     /**
@@ -975,7 +1007,7 @@ public class DayOfSchedule {
      *
      * @param nbbm
      * @return
-     */
+
     public boolean isExecFirstOut(String nbbm, long time) {
         try {
             List<ScheduleRealInfo> list = nbbmScheduleMap.get(nbbm);
@@ -991,7 +1023,7 @@ public class DayOfSchedule {
         }
         return false;
-    }
+    }*/
     @Autowired
-package com.bsth.entity.realcontrol;
-
-/**
- * 班次类型
- * Created by panzhao on 2016/12/23.
- */
-public enum ScheduleType {
-
-    normal, //正常班次
-    out,    //出场
-    in,     //进场
-    region, //区间
-    venting,//直放
-    major   //放站
-}
@@ -44,7 +44,7 @@ public interface DirectiveService extends BaseService&lt;D60, Integer&gt;{
 	int send60Dispatch(Long id, String sender);
 	//60营运指令
-	int send60Operation(String nbbm, int state, int upDown, ScheduleRealInfo sch, String sender);
+	int send60Operation(String nbbm, int state, int upDown, String sender);
 	/**
 	 * 
@@ -66,7 +66,7 @@ public interface DirectiveService extends BaseService&lt;D60, Integer&gt;{
 	 * @param @param upDonw 上下行 0 上行  1 下行
 	 * @throws
 	 */
-	int upDownChange(String nbbm, Integer upDown, String sender);
+	//int upDownChange(String nbbm, Integer upDown, String sender);
 	/**
 	 * 
@@ -94,7 +94,7 @@ public interface DirectiveService extends BaseService&lt;D60, Integer&gt;{
     int refreshLineFile(String deviceId);
-    int stateChange(String nbbm, Integer upDown, Integer state, String userName);
+    //int stateChange(String nbbm, Integer upDown, Integer state, String userName);
     Map<String,Object> deviceCofigList(Map<String, String> map, int page, int size);
 }
@@ -188,7 +188,7 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
     }
     @Override
-    public int send60Operation(String nbbm, int state, int upDown, ScheduleRealInfo sch, String sender) {
+    public int send60Operation(String nbbm, int state, int upDown, String sender) {
         logger.info("切换运营状态, nbbm: " + nbbm + " ,state: " + state + " ,upDown:" + upDown);
         String text = "切换为 " + (upDown == 0 ? "上行" : "下行") + (state == 0 ? "营运" : "未营运");
@@ -204,9 +204,10 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
         int code = GatewayHttpUtils.postJson(JSON.toJSONString(d60));
         // 添加到缓存，等待入库
         d60.setHttpCode(code);
-        if (null != sch)
+        /*if (null != sch){
             d60.setSch(sch);
-
+            d60.setLineCode(sch.getXlBm());
+        }*/
         if (code == 0) {
             dayOfDirectives.put60(d60, true);
@@ -294,10 +295,10 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
         return new DirectiveCreator().createD60(nbbm, text, dispatchInstruct, upDown, state, lineCode);
     }
-    @Override
+/*    @Override
     public int upDownChange(String nbbm, Integer upDown, String sender) {
-        return send60Operation(nbbm, 0, upDown, null, sender);
-    }
+        return send60Operation(nbbm, 0, upDown, sender);
+    }*/
     @Override
@@ -540,10 +541,10 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
         return GatewayHttpUtils.postJson(new DirectiveCreator().createDeviceRefreshData(deviceId, gps.getLineId()));
     }
-    @Override
+/*    @Override
     public int stateChange(String nbbm, Integer upDown, Integer state, String userName) {
-        return send60Operation(nbbm, state, upDown, null, userName);
-    }
+        return send60Operation(nbbm, state, upDown, userName);
+    }*/
     @Override
     public Map<String, Object> deviceCofigList(Map<String, String> map, int page, int size) {
@@ -152,6 +152,17 @@ public class GpsServiceImpl implements GpsService {
         return (byte) (((serviceState & 0x10000000) == 0x10000000) ? 1 : 0);
     }
+    /**
+     * 获取运营状态
+     *
+     * @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);
+    }
+
     @Override
     public List<Map<String, Object>> history(String[] nbbmArray, Long st, Long et) {
         List<Map<String, Object>> list = new ArrayList<>();
@@ -239,10 +250,11 @@ public class GpsServiceImpl implements GpsService {
             rs = ps.executeQuery();
             Float lon, lat;
             Location bdLoc, gdLoc;
-            int upDown, inOutStop;
+            int inOutStop;
+            long serviceState;
             ArrivalEntity arrival;
             while (rs.next()) {
-                upDown = getUpOrDown(rs.getLong("SERVICE_STATE"));
+                serviceState = rs.getLong("SERVICE_STATE");
                 map = new HashMap<>();
                 lon = rs.getFloat("LON");
@@ -278,9 +290,9 @@ public class GpsServiceImpl implements GpsService {
                 }
                 map.put("nbbm", BasicData.deviceId2NbbmMap.get(rs.getString("DEVICE_ID")));
-                map.put("state", 0);
+                map.put("state", getService(serviceState));
                 // 上下行
-                map.put("upDown", upDown);
+                map.put("upDown", getUpOrDown(serviceState));
                 //路段编码
                 map.put("section_code", rs.getString("SECTION_CODE"));
                 list.add(map);
@@ -182,6 +182,28 @@
 		<appender-ref ref="GPS_COUNT" />
 	</logger>
+	<!-- 设备状态指令 -->
+	<appender name="GPS_STATUS_DIRECTIVE"
+			  class="ch.qos.logback.core.rolling.RollingFileAppender">
+		<file>${LOG_BASE}/gps_state/state_directive.log</file>
+		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+			<fileNamePattern>${LOG_BASE}/gps_state/state_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.gpsdata.status_manager"
+			level="INFO" additivity="false">
+		<appender-ref ref="GPS_STATUS_DIRECTIVE" />
+	</logger>
+
 	<!-- 消息队列纪录 -->
 	<appender name="QUEUE_WEB_SOCKET"
 			  class="ch.qos.logback.core.rolling.RollingFileAppender">
@@ -111,7 +111,7 @@
                 //起点改变
                 $f('startStation', f).on('change', function () {
-                    $f('endStation', outf).val($(this).val());//.trigger('change');
+                    $f('endStation', outf).val($(this).val()).trigger('change');
                 }).trigger('change');
             }
@@ -149,13 +149,14 @@
                 }
                 if(eCode==sch.qdzCode || eCode==sch.zdzCode){
                     $f('startStation',inf).val(eCode).trigger('change');
-                    $f('type2',outf).trigger('change');
+                    //$f('type2',outf).trigger('change');
+                    $f('endStation',outf).val(eCode).trigger('change');
                     return;
                 }
                 //进场起点
                 $f('startStation',inf).val(eCode);//.trigger('change');
-                //终点trigger change 出发重计算
+                //终点trigger change 触发重计算
                 $f('endStation',inf).trigger('change');
                 //中途进场
@@ -47,7 +47,7 @@ var gb_main_ep = new EventProxy(),
                 $('li.map-panel', '#main-tab-content').load('/real_control_v2/mapmonitor/real.html');
             }, 1000);
             //弹出更新说明
-            showUpdateDescription();
+            //showUpdateDescription();
         });
         function g_emit(id) {
@@ -169,8 +169,8 @@ var disabled_submit_btn = function (form) {
 function showUpdateDescription() {
     //更新说明
     var updateDescription = {
-        date: '2017-07-05',
-        text: '<h5>稍微调整了添加子任务的界面</h5><h5>1、现在进出场子任务也必须选择进场原因</h5><h5>2、现在进出场子任务可以勾选 “无售票员” 如果是无人售票线路，请忽略这个选项</h5><h5>3、现在做中途进场子任务时，可以勾选“换车出场至中途站继续营运”</h5>'
+        date: '2017-07-14',
+        text: '<h5></h5>'
     };
     var storage = window.localStorage