update...

潘钊
1 parent eea73673
Showing 9 changed files with 155 additions and 28 deletions
src/main/java/com/bsth/controller/directive/DirectiveController.java
src/main/java/com/bsth/data/gpsdata/GpsRealData.java
src/main/java/com/bsth/data/gpsdata/arrival/SignalHandle.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/service/directive/DirectiveService.java
src/main/java/com/bsth/service/directive/DirectiveServiceImpl.java
src/main/resources/static/real_control_v2/fragments/north/nav/directive_history.html
src/main/resources/static/real_control_v2/js/home/context_menu.js
 package com.bsth.controller.directive;
  
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.lang3.StringEscapeUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.bsth.entity.directive.D80;
@@ -17,6 +7,15 @@ import com.bsth.entity.directive.DC0_A3;
 import com.bsth.entity.sys.SysUser;
 import com.bsth.security.util.SecurityUtils;
 import com.bsth.service.directive.DirectiveService;
+import org.apache.commons.lang3.StringEscapeUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.Map;
  
 /**
  * 
@@ -109,6 +108,20 @@ public class DirectiveController {
 		SysUser user = SecurityUtils.getCurrentUser();
 		return directiveService.upDownChange(nbbm, upDown, user.getUserName());
 	}
+
+	/**
+	 *
+	 * @Title: upDownChange
+	 * @Description: TODO(状态切换，营运状态 和 上下行)
+	 * @param @param nbbm 车辆内部编码
+	 * @param @param upDon
+	 * @throws
+	 */
+	@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());
+	}
  
 	/**
 	 * 
 package com.bsth.data.gpsdata;
  
+import com.bsth.Application;
 import com.bsth.data.BasicData;
 import com.bsth.data.forecast.ForecastRealServer;
 import com.bsth.data.gpsdata.thread.GpsDataLoaderThread;
@@ -15,6 +16,7 @@ import org.springframework.boot.CommandLineRunner;
 import org.springframework.stereotype.Component;
  
 import java.util.*;
+import java.util.concurrent.TimeUnit;
  
 /**
  * @author PanZhao
@@ -56,7 +58,7 @@ public class GpsRealData implements CommandLineRunner {
     public void run(String... arg0) throws Exception {
         logger.info("gpsDataLoader,20,5");
         //定时从网关获取GPS数据
-        //Application.mainServices.scheduleWithFixedDelay(gpsDataLoader, 20, 5, TimeUnit.SECONDS);
+        Application.mainServices.scheduleWithFixedDelay(gpsDataLoader, 20, 5, TimeUnit.SECONDS);
         //定时扫描掉离线
         //Application.mainServices.scheduleWithFixedDelay(offlineMonitorThread, 120, 60, TimeUnit.SECONDS);
     }
@@ -5,6 +5,10 @@ import com.bsth.data.gpsdata.arrival.entity.StationRoute;
 import com.bsth.data.gpsdata.arrival.utils.CircleQueue;
 import com.bsth.data.gpsdata.arrival.utils.GeoUtils;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
  
 import java.util.List;
  
@@ -68,6 +72,8 @@ public abstract class SignalHandle {
      * }
      */
  
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+    private static DateTimeFormatter fmtHHmm = DateTimeFormat.forPattern("HH:mm");
     protected void transformUpdown(GpsEntity gps, ScheduleRealInfo sch) {
         int updown = Integer.parseInt(sch.getXlDir());
         //gps 切换走向
@@ -78,6 +84,8 @@ public abstract class SignalHandle {
         if (station != null) {
             gps.setStopNo(station.getCode());
         }
+
+        logger.info(fmtHHmm.print(gps.getTimestamp()) + " 车辆 ：" + gps.getNbbm() + " 切换到走向 : " + updown);
     }
  
     /**
@@ -7,6 +7,7 @@ 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.schedule.DayOfSchedule;
+import com.bsth.data.schedule.ScheduleComparator;
 import com.bsth.entity.realcontrol.LineConfig;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.service.directive.DirectiveService;
@@ -17,6 +18,9 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
  
+import java.util.Collections;
+import java.util.List;
+
 /**
  * 进出站动作处理
  * Created by panzhao on 2016/12/27.
@@ -138,6 +142,10 @@ public class InOutStationSignalHandle extends SignalHandle{
             //持久化
             dayOfSchedule.save(sch);
  
+            if(sch.getBcType().equals("out")){
+                //出场时，切换成营运状态
+                directiveService.send60Operation(sch.getClZbh(), 0, Integer.parseInt(sch.getXlDir()), null, "出场@系统");
+            }
             //出站既出场
             outStationAndOutPark(sch);
             logger.info("班次：" + sch.getDfsj() + "发车， 时间：" + sch.getFcsjActual());
@@ -164,6 +172,11 @@ public class InOutStationSignalHandle extends SignalHandle{
  
                 sendUtils.refreshSch(schPrev);
                 dayOfSchedule.save(schPrev);
+
+                if(schPrev.getBcType().equals("out")){
+                    //出场时，切换成营运状态
+                    directiveService.send60Operation(schPrev.getClZbh(), 0, Integer.parseInt(schPrev.getXlDir()), null, "出场@系统");
+                }
             }
         }
     }
@@ -204,8 +217,14 @@ public class InOutStationSignalHandle extends SignalHandle{
             sendUtils.sendZdsj(sch, next, doneSum);
             //持久化
             dayOfSchedule.save(sch);
-            //下发调度指令
-            directiveService.send60Dispatch(next, doneSum, "到站@系统");
+            if(next != null){
+                //下发调度指令
+                directiveService.send60Dispatch(next, doneSum, "到站@系统");
+            }
+            else if(sch.getBcType().equals("in")){
+                //终班进场，切换成非营运状态
+                directiveService.send60Operation(sch.getClZbh(), 1, Integer.parseInt(sch.getXlDir()), null, "进场@系统");
+            }
  
             //准备执行下一个班次
             if (next != null) {
@@ -217,10 +236,59 @@ public class InOutStationSignalHandle extends SignalHandle{
                 transformUpdown(gps, next);
             }
         }
-        else if(sch.getFcsjActual() == null){
-            //有进站，但班次没有实发，向前追溯一下信号
-            scheduleSignalState.signalRetrospect(gps, sch);
+        else {
+            if(sch.getFcsjActual() == null){
+                //有进站，但班次没有实发，向前追溯一下信号
+                scheduleSignalState.signalRetrospect(gps, sch);
+            }
+
+            //如果当前班次是出场，并且进的是下一个班次的终点
+            if(sch.getBcType().equals("out")){
+                ScheduleRealInfo next = dayOfSchedule.next(sch);
+                if(next.getZdzCode().equals(gps.getStopNo())){
+                    List<ScheduleRealInfo> halfList = dayOfSchedule.findByNbbm(sch.getClZbh());
+                    //和当前进站信号最匹配的一个班次
+                    ScheduleRealInfo nearSch = nearScheduleByGpsIn(gps, halfList);
+
+                    if(nearSch != null){
+                        //直接跳到这个班次
+                        dayOfSchedule.addExecPlan(nearSch);
+                        //重新进站
+                        inStation(gps, prev);
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * 和当前进站信号最匹配的一个班次
+     * @param gps
+     * @param halfList
+     * @return
+     */
+    private ScheduleRealInfo nearScheduleByGpsIn(GpsEntity gps, List<ScheduleRealInfo> halfList){
+        if(halfList == null || halfList.size() == 0)
+            return null;
+
+        //排序
+        Collections.sort(halfList, new ScheduleComparator.FCSJ());
+        ScheduleRealInfo near = null;// = halfList.get(0);
+        ScheduleRealInfo sch;
+
+        String stopId = gps.getStopNo();
+        for(int i = 0; i < halfList.size(); i ++){
+            sch = halfList.get(i);
+            if(!sch.getZdzCode().equals(stopId))
+                continue;
+
+            if(sch.getZdsjT() < gps.getTimestamp())
+                near = sch;
+            else
+                break;
+
         }
+        return near;
     }
  
     /**
@@ -60,7 +60,7 @@ public class GpsDataRecovery implements ApplicationContextAware {
         for (String nbbm : keys) {
             Collections.sort(listMap.get(nbbm), comp);
             threadPool.execute(new RecoveryThread(listMap.get(nbbm), count));
-            /*if(nbbm.equals("W9H-003"))
+            /*if(nbbm.equals("SXC-YD012"))
                 new RecoveryThread(listMap.get(nbbm), count).run();*/
         }
  
@@ -163,9 +163,8 @@ public class GpsDataRecovery implements ApplicationContextAware {
                     reverseSignalHandle.handle(gps, prevs);
                     //进出站动作处理
                     inOutStationSignalHandle.handle(gps, prevs);
-                    GeoCacheData.putGps(gps);
  
-                    //Thread.sleep(50);
+                    GeoCacheData.putGps(gps);
                 }
             } catch (Exception e) {
                 logger.error("", e);
 package com.bsth.service.directive;
  
  
-import java.util.List;
-import java.util.Map;
-
 import com.bsth.entity.directive.D60;
 import com.bsth.entity.directive.D64;
 import com.bsth.entity.directive.D80;
@@ -11,6 +8,9 @@ import com.bsth.entity.directive.DC0_A3;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.service.BaseService;
  
+import java.util.List;
+import java.util.Map;
+
 public interface DirectiveService extends BaseService<D60, Integer>{
  
 	/**
@@ -93,4 +93,6 @@ public interface DirectiveService extends BaseService&lt;D60, Integer&gt;{
 	int sendC0A5(String json);
  
     int refreshLineFile(String deviceId);
+
+    int stateChange(String nbbm, Integer upDown, Integer state, String userName);
 }
@@ -504,4 +504,9 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
  
 		return GatewayHttpUtils.postJson(new DirectiveCreator().createDeviceRefreshData(deviceId, gps.getLineId()));
 	}
+
+	@Override
+	public int stateChange(String nbbm, Integer upDown, Integer state, String userName) {
+		return send60Operation(nbbm, state, upDown, null, userName);
+	}
 }
@@ -65,9 +65,9 @@
                   {{if obj.reply46 != 0}}
                   <div class="uk-badge uk-badge-danger"> 设备未响应</div>
                   {{else if obj.reply47 != 0}}
-                  <div class="uk-badge uk-badge-warning"> 驾驶员未确认</div>
+                  <div class="uk-badge uk-badge-warning"> 设备已响应</div>
                   {{else if obj.reply46 == 0 && obj.reply47 == 0}}
-                  <div class="uk-badge"> 成功</div>
+                  <div class="uk-badge"> 驾驶员已确认</div>
                   {{/if}}
                 {{/if}}
             </td>
@@ -39,6 +39,20 @@ var gb_home_context_menu = (function() {
         });
     };
  
+    //营运状态和上下行切换
+    var stateChange = function (nbbm, updown, state) {
+        $.post('/directive/stateChange', {
+            nbbm: nbbm,
+            upDown: updown,
+            state: state
+        }, function(rs) {
+            if (rs == 0)
+                notify_succ('指令已发出');
+            else
+                notify_err('发送失败，原因参考【指令下发记录】');
+        });
+    };
+
     // send phrase
     var sendPhrase = function() {
         var dom = temps['home-send-phrase-temp']({
@@ -139,11 +153,19 @@ var gb_home_context_menu = (function() {
     };
  
     var state_up_0 = function() {
-        changeUpDown(active_car, 0);
+        stateChange(active_car, 0, 0);
     };
  
     var state_down_0 = function() {
-        changeUpDown(active_car, 1);
+        stateChange(active_car, 1, 0);
+    };
+
+    var state_up_1 = function () {
+        stateChange(active_car, 0, 1);
+    };
+
+    var state_down_1 = function () {
+        stateChange(active_car, 1, 1);
     };
  
     var line_change = function() {
@@ -179,7 +201,6 @@ var gb_home_context_menu = (function() {
         });
     };
  
-
     var C0_A3 = function(){
       open_modal('/real_control_v2/fragments/home/c0_a3.html', {}, {center: false, bgclose: false});
     };
@@ -190,7 +211,9 @@ var gb_home_context_menu = (function() {
         state_up_0: state_up_0,
         state_down_0: state_down_0,
         line_change: line_change,
-        C0_A3: C0_A3
+        C0_A3: C0_A3,
+        state_up_1: state_up_1,
+        state_down_1: state_down_1
     };
  
     $.contextMenu({
@@ -210,6 +233,13 @@ var gb_home_context_menu = (function() {
             'fold_state': {
                 name: '状态切换',
                 items: {
+                    'state_up_1': {
+                        'name': '上行非营运'
+                    },
+                    'state_down_1': {
+                        'name': '下行非营运'
+                    },
+                    'sep3_2': '---------',
                     'state_up_0': {
                         'name': '上行营运'
                     },