update...

潘钊
1 parent 914f0551
Showing 5 changed files with 180 additions and 130 deletions
src/main/java/com/bsth/controller/realcontrol/anomalyCheckController.java → src/main/java/com/bsth/controller/realcontrol/AdminUtilsController.java
src/main/java/com/bsth/data/gpsdata_v2/handlers/OutStationProcess.java
src/main/java/com/bsth/data/gpsdata_v2/utils/GpsDataRecovery.java
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/resources/static/real_control_v2/js/line_schedule/sch_table.js
-package com.bsth.controller.realcontrol;
-
-import com.bsth.data.gpsdata_v2.cache.GeoCacheData;
-import com.bsth.data.gpsdata_v2.thread.GpsDataLoaderThread;
-import com.bsth.data.msg_queue.DirectivePushQueue;
-import com.bsth.data.msg_queue.WebSocketPushQueue;
-import com.bsth.data.schedule.DayOfSchedule;
-import com.bsth.entity.realcontrol.ScheduleRealInfo;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-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.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Created by panzhao on 2017/4/14.
- */
-@RestController
-@RequestMapping("anomalyCheck")
-public class anomalyCheckController {
-
-
-    Logger logger = LoggerFactory.getLogger(this.getClass());
-
-    @Autowired
-    DayOfSchedule dayOfSchedule;
-
-    @Autowired
-    GeoCacheData geoCacheData;
-
-    /**
-     * 出现重复班次的车辆
-     * @param nbbm
-     */
-    @RequestMapping(value = "/schRepeat", method = RequestMethod.POST)
-    public void schRepeat(@RequestParam String nbbm){
-        logger.info("前端通知，车辆 " + nbbm + "出现重复班次，开始检测...");
-        List<ScheduleRealInfo> list = dayOfSchedule.findByNbbm(nbbm);
-        logger.info("检测前，车辆班次数量：" + list.size());
-
-        Map<Long, ScheduleRealInfo> map = new HashMap<>();
-        for(ScheduleRealInfo sch : list){
-            if(map.containsKey(sch.getId())){
-                logger.info("检测到重复ID： " + sch.getId());
-            }
-            map.put(sch.getId(), sch);
-        }
-
-        logger.info("检测后，车辆班次数量：" + list.size());
-        if(map.values().size() > 0){
-            dayOfSchedule.replaceByNbbm(nbbm, map.values());
-        }
-    }
-
-    @RequestMapping(value = "/directivePushQueue")
-    public void directivePushQueue(){
-        DirectivePushQueue.start();
-    }
-
-    @RequestMapping(value = "/directiveQueueSize")
-    public void directiveQueueSize(){
-        DirectivePushQueue.size();
-    }
-
-    @RequestMapping(value = "/webSocketPushQueue")
-    public void webSocketPushQueue(){
-        WebSocketPushQueue.start();
-    }
-
-    @RequestMapping(value = "/webSocketQueueSize")
-    public void webSocketQueueSize(){
-        WebSocketPushQueue.size();
-    }
-
-    @RequestMapping(value = "/setHttpFlag")
-    public void setHttpFlag(@RequestParam int flag){
-        if(flag != 0 && flag != -1)
-            return;
-        GpsDataLoaderThread.setFlag(flag);
-    }
-
-    @RequestMapping(value = "/updateCacheBuff")
-    public void updateCacheBuff(){
-        geoCacheData.loadData();
-    }
-
-    @RequestMapping(value = "/reCalcLpSch")
-    public void reCalcLpSch(){
-        dayOfSchedule._test_reCalcLpSch();
-    }
-
-    @RequestMapping(value = "/findSchByLpName")
-    public List<ScheduleRealInfo> findSchByLpName(@RequestParam String lpName){
-        return dayOfSchedule.getLpScheduleMap().get(lpName);
-    }
-
-    @RequestMapping(value = "/findSchByNbbm")
-    public List<ScheduleRealInfo> findSchByNbbm(@RequestParam String nbbm){
-        return dayOfSchedule.findByNbbm(nbbm);
-    }
-
-    @RequestMapping(value = "/removeExecPlan")
-    public int removeExecPlan(@RequestParam String nbbm){
-        dayOfSchedule.removeExecPlan(nbbm);
-        return 1;
-    }
-
-    @RequestMapping(value = "/sch_re_calc_id_maps")
-    public int reCalcIdMaps(){
-        return dayOfSchedule.reCalcIdMaps();
-    }
-
-    @RequestMapping(value = "/sch_size_string")
-    public String schSizeString(){
-        return dayOfSchedule.sizeString();
-    }
-}
+package com.bsth.controller.realcontrol;
+
+import com.bsth.data.directive.DayOfDirectives;
+import com.bsth.data.gpsdata_v2.cache.GeoCacheData;
+import com.bsth.data.gpsdata_v2.thread.GpsDataLoaderThread;
+import com.bsth.data.msg_queue.DirectivePushQueue;
+import com.bsth.data.msg_queue.WebSocketPushQueue;
+import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.websocket.handler.RealControlSocketHandler;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by panzhao on 2017/4/14.
+ */
+@RestController
+@RequestMapping("adminUtils")
+public class AdminUtilsController {
+
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Autowired
+    DayOfSchedule dayOfSchedule;
+
+    @Autowired
+    GeoCacheData geoCacheData;
+
+    @Autowired
+    DayOfDirectives dayOfDirectives;
+
+    @Autowired
+    RealControlSocketHandler realControlSocketHandler;
+
+    /**
+     * 出现重复班次的车辆
+     * @param
+
+    @RequestMapping(value = "/schRepeat", method = RequestMethod.POST)
+    public void schRepeat(@RequestParam String nbbm){
+        logger.info("前端通知，车辆 " + nbbm + "出现重复班次，开始检测...");
+        List<ScheduleRealInfo> list = dayOfSchedule.findByNbbm(nbbm);
+        logger.info("检测前，车辆班次数量：" + list.size());
+
+        Map<Long, ScheduleRealInfo> map = new HashMap<>();
+        for(ScheduleRealInfo sch : list){
+            if(map.containsKey(sch.getId())){
+                logger.info("检测到重复ID： " + sch.getId());
+            }
+            map.put(sch.getId(), sch);
+        }
+
+        logger.info("检测后，车辆班次数量：" + list.size());
+        if(map.values().size() > 0){
+            dayOfSchedule.replaceByNbbm(nbbm, map.values());
+        }
+    }*/
+
+/*    @RequestMapping(value = "/directivePushQueue")
+    public void directivePushQueue(){
+        DirectivePushQueue.start();
+    }*/
+
+    @RequestMapping(value = "/directiveQueueSize")
+    public void directiveQueueSize(){
+        DirectivePushQueue.size();
+    }
+
+    /*@RequestMapping(value = "/webSocketPushQueue")
+    public void webSocketPushQueue(){
+        WebSocketPushQueue.start();
+    }*/
+
+    @RequestMapping(value = "/webSocketQueueSize")
+    public void webSocketQueueSize(){
+        WebSocketPushQueue.size();
+    }
+
+    @RequestMapping(value = "/setHttpFlag")
+    public void setHttpFlag(@RequestParam int flag){
+        if(flag != 0 && flag != -1)
+            return;
+        GpsDataLoaderThread.setFlag(flag);
+    }
+
+    @RequestMapping(value = "/updateCacheBuff")
+    public void updateCacheBuff(){
+        geoCacheData.loadData();
+    }
+
+    @RequestMapping(value = "/reCalcLpSch")
+    public void reCalcLpSch(){
+        dayOfSchedule._test_reCalcLpSch();
+    }
+
+    @RequestMapping(value = "/findSchByLpName")
+    public List<ScheduleRealInfo> findSchByLpName(@RequestParam String lpName){
+        return dayOfSchedule.getLpScheduleMap().get(lpName);
+    }
+
+    @RequestMapping(value = "/findSchByNbbm")
+    public List<ScheduleRealInfo> findSchByNbbm(@RequestParam String nbbm){
+        return dayOfSchedule.findByNbbm(nbbm);
+    }
+
+    @RequestMapping(value = "/removeExecPlan")
+    public int removeExecPlan(@RequestParam String nbbm){
+        dayOfSchedule.removeExecPlan(nbbm);
+        return 1;
+    }
+
+    @RequestMapping(value = "/sch_re_calc_id_maps")
+    public int reCalcIdMaps(){
+        return dayOfSchedule.reCalcIdMaps();
+    }
+
+    @RequestMapping(value = "/sch_size_string")
+    public String schSizeString(){
+        return dayOfSchedule.sizeString();
+    }
+
+    @RequestMapping(value = "/containerSize")
+    public Map<String, Integer> containerSize(){
+        Map<String, Integer> rs = new HashMap<>();
+        rs.put("60_size", dayOfDirectives.all60().size());
+        rs.put("nbbm_sch_size", dayOfSchedule.findAll().size());
+        rs.put("lp_sch_size", dayOfSchedule.findAllByLpContainer().size());
+        rs.put("id_sch_size", dayOfSchedule.findAllByIdContainer().size());
+        rs.put("pst_sch_size", dayOfSchedule.getPstSize());
+        return rs;
+    }
+
+    @RequestMapping(value = "/websocketRadioText")
+    public int radioText(String t){
+        realControlSocketHandler.sendMessage(t);
+        return 0;
+    }
+}
@@ -39,7 +39,7 @@ public class OutStationProcess {
     @Autowired
     GpsStatusManager gpsStatusManager;
-    private final static int MAX_BEFORE_TIME = 1000 * 60 * 120;
+    private final static int MAX_BEFORE_TIME = 1000 * 60 * 60 * 3;
     public void process(GpsEntity gps) {
         //自动执行的线路，滚蛋
@@ -86,8 +86,8 @@ public class OutStationProcess {
             }
             int diff = (int) (sch.getDfsjT() - gps.getTimestamp());
-            //首班出场最多提前2小时
-            if ((dayOfSchedule.isFirstOut(sch) && diff > MAX_BEFORE_TIME) || diff > MAX_BEFORE_TIME / 2)
+            //首班出场最多提前3小时
+            if (dayOfSchedule.isFirstOut(sch) && diff > MAX_BEFORE_TIME)
                 return;
             gps.setPremiseCode(null);//清除前置围栏标记
@@ -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,SERVER_TS from bsth_c_gps_info where days_year=346"; //+ dayOfYear;
+        String sql = "select DEVICE_ID,LAT,LON,TS,SPEED_GPS,LINE_ID,SERVICE_STATE,SERVER_TS from bsth_c_gps_info where days_year=39"; //+ dayOfYear;
         JdbcTemplate jdbcTemplate = new JdbcTemplate(DBUtils_MS.getDataSource());
         List<GpsEntity> list =
@@ -102,6 +102,7 @@ public class GpsDataRecovery implements ApplicationContextAware {
                         gps.setTimestamp(rs.getLong("TS"));
                         gps.setUpDown((byte) getUpOrDown(rs.getLong("SERVICE_STATE")));
                         gps.setServerTimestamp(rs.getLong("SERVER_TS"));
+                        gps.setState((int) getService(rs.getLong("SERVICE_STATE")));
                         return gps;
                     }
                 });
@@ -109,6 +110,17 @@ public class GpsDataRecovery implements ApplicationContextAware {
     }
     /**
+     * 获取运营状态
+     *
+     * @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下行
@@ -861,6 +861,18 @@ public class DayOfSchedule {
         return nbbmScheduleMap.values();
     }
+    public Collection<ScheduleRealInfo> findAllByLpContainer() {
+        return lpScheduleMap.values();
+    }
+
+    public Collection<ScheduleRealInfo> findAllByIdContainer() {
+        return id2SchedulMap.values();
+    }
+
+    public int getPstSize() {
+        return pstBuffer.size();
+    }
+
     public boolean addExecPlan(ScheduleRealInfo sch) {
         ScheduleRealInfo oldExec = executeCurr(sch.getClZbh());
         if (sch != null){
@@ -476,10 +476,12 @@ var gb_schedule_table = (function () {
         if (nextSch) {
             $('dl[data-id=' + nextSch.id + ']', contWrap).addClass('intimity');
-            if (nextSch.xlDir == sch.xlDir)
-                return;
+            /*if (nextSch.xlDir == sch.xlDir)
+                return;*/
             //滚动到下一个班次
-            scroToDl(nextSch);
+            if(nextSch.xlDir != sch.xlDir)
+                scroToDl(nextSch);
+
         }
         //如果有打开轨迹回放