Merge branch 'minhang' of

http://222.66.0.204:8090/panzhaov5/bsth_control into minhang

Merge branch 'minhang' of
http://222.66.0.204:8090/panzhaov5/bsth_control into minhang
廖磊
2 parents a7203436 fc3393ec
Showing 7 changed files with 162 additions and 105 deletions
src/main/java/com/bsth/XDApplication.java
src/main/java/com/bsth/data/gpsdata/arrival/GeoCacheData.java
src/main/java/com/bsth/data/gpsdata/arrival/GpsRealAnalyse.java
src/main/resources/static/pages/base/timesmodel/js/add-form-wizard.js
src/main/resources/static/pages/base/timesmodel/js/gantt.js
src/main/resources/static/pages/base/timesmodel/js/strategy/ParameterObj.js
src/main/resources/static/pages/base/timesmodel/tepms/fcjx_temp.html
@@ -126,24 +126,25 @@ public class XDApplication implements CommandLineRunner {
         ScheduledExecutorService sexec = Application.mainServices;
         /** 线调业务 */
-        sexec.scheduleWithFixedDelay(gpsDataLoader, 30, 2, TimeUnit.SECONDS);//抓取GPS数据
-        sexec.scheduleWithFixedDelay(offlineMonitorThread, 120, 60, TimeUnit.SECONDS);//GPS设备掉离线
         sexec.scheduleWithFixedDelay(scheduleRefreshThread, 15, 240, TimeUnit.SECONDS);//班次更新线程
-        sexec.scheduleWithFixedDelay(schedulePstThread, 60, 10, TimeUnit.SECONDS);//班次延迟入库线程
-        sexec.scheduleWithFixedDelay(seiPstThread, 60, 60, TimeUnit.SECONDS);//班次修正日志入库
-        sexec.scheduleWithFixedDelay(scheduleLateThread, 60, 30, TimeUnit.SECONDS);//检查班次误点
+        sexec.scheduleWithFixedDelay(scheduleLateThread, 70, 30, TimeUnit.SECONDS);//检查班次误点
+        sexec.scheduleWithFixedDelay(gpsDataLoader, 100, 2, TimeUnit.SECONDS);//抓取GPS数据
+
+        sexec.scheduleWithFixedDelay(offlineMonitorThread, 120, 60, TimeUnit.SECONDS);//GPS设备掉离线
+        sexec.scheduleWithFixedDelay(schedulePstThread, 120, 10, TimeUnit.SECONDS);//班次延迟入库线程
+        sexec.scheduleWithFixedDelay(seiPstThread, 160, 60, TimeUnit.SECONDS);//班次修正日志入库
         sexec.scheduleWithFixedDelay(directivesPstThread, 180, 100, TimeUnit.SECONDS);//调度指令延迟入库
         sexec.scheduleWithFixedDelay(threadMonotor, 240, 60, TimeUnit.SECONDS);//线程监听（防止重要的线程阻塞、异常结束。以及部分主备切换工作）
-        sexec.scheduleWithFixedDelay(sampleTimeDataLoader, 12, 120 * 60, TimeUnit.SECONDS);//到离站预测需要的站点间耗时数据
+        sexec.scheduleWithFixedDelay(sampleTimeDataLoader, 140, 120 * 60, TimeUnit.SECONDS);//到离站预测需要的站点间耗时数据
         sexec.scheduleWithFixedDelay(basicDataLoader, 2, 2, TimeUnit.HOURS);//基础数据更新
         DirectivePushQueue.start();//消息队列 -指令，系统下发的
         WebSocketPushQueue.start();//消息队列 -webSocket ，推送至线调web页面的
         /** 线调为其他程序提供的数据 --写入数据库 */
-        sexec.scheduleWithFixedDelay(fcxxUpdateThread, 60, 40, TimeUnit.SECONDS);//发车信息（发车屏、信息发布）
+        sexec.scheduleWithFixedDelay(fcxxUpdateThread, 160, 40, TimeUnit.SECONDS);//发车信息（发车屏、信息发布）
         //线路首末班数据（网关用，班次更新时写入）
         //com.bsth.data.schedule.f_a_l.FirstAndLastHandler
-        sexec.scheduleWithFixedDelay(schSiginUpdateDBThread, 60, 60 * 30, TimeUnit.SECONDS);//无法自动完成的班次信息（网关用，补信号）
+        sexec.scheduleWithFixedDelay(schSiginUpdateDBThread, 160, 60 * 30, TimeUnit.SECONDS);//无法自动完成的班次信息（网关用，补信号）
         //运管处静态数据提交
         log.info(timeDiff / 1000 / 60 + "分钟之后提交到运管处");
@@ -33,8 +33,8 @@ public class GeoCacheData {
     static Logger logger = LoggerFactory.getLogger(GeoCacheData.class);
-    //每辆车缓存最后1000条gps
-    private static final int CACHE_SIZE = 1000;
+    //每辆车缓存最后500条gps
+    private static final int CACHE_SIZE = 500;
     private static Map<String, CircleQueue<GpsEntity>> gpsCacheMap = new HashMap<>();
     //线路路段走向
@@ -41,7 +41,8 @@ public class GpsRealAnalyse {
     @Autowired
     GpsRealData gpsRealData;
-    static ExecutorService threadPool = Executors.newFixedThreadPool(25);
+    final static int POOL_SIZE = 15;
+    static ExecutorService threadPool = Executors.newFixedThreadPool(POOL_SIZE + 1);
     public static long st;
     public static CountDownLatch count;
@@ -60,19 +61,27 @@ public class GpsRealAnalyse {
                 return;
             st = System.currentTimeMillis();
-            //按线路分组gps
+            //按设备号分组数据（一个设备号的多条数据，必须在一个线程里跑）
             ArrayListMultimap multimap = ArrayListMultimap.create();
             for (GpsEntity gps : list) {
-                multimap.put(gps.getLineId(), gps);
+                multimap.put(gps.getDeviceId(), gps);
             }
-
-            Set<String> ks = multimap.keySet();
-
+            List<String> deviceList = new ArrayList<>(multimap.keySet());
+
+            //数据均分给20个线程
+            ArrayListMultimap dataListMap = ArrayListMultimap.create();
+            int size = deviceList.size(), threadIndex=0, threadSize = size / POOL_SIZE;
+            for(int i = 0; i < size; i++){
+                if(i % threadSize == 0)
+                    threadIndex ++;
+                dataListMap.putAll(threadIndex, multimap.get(deviceList.get(i)));
+            }
+            Set<Integer> ks = dataListMap.keySet();
             logger.info("analyse gps size: " + list.size() + ", ks: " + ks.size());
             count = new CountDownLatch(ks.size());
-            for (String lineCode : ks) {
-                threadPool.execute(new SignalHandleThread(multimap.get(lineCode), count));
+            for (Integer index : ks) {
+                threadPool.execute(new SignalHandleThread(dataListMap.get(index), count));
             }
             //等待子线程结束
@@ -522,10 +522,16 @@ var SKBFormWizard = function() {
                     'dgmaxtzsj' : {required : true,number : true}, // 低谷最大停站时间,必填项、必须为整数.
                     // 发车间隙分析用参数
-                    'fcjx': {required: true}, // 时段发车间隙，TODO:貌似没发启用form验证
+                    //'fcjx': {required: true}, // 时段发车间隙，TODO:貌似没发启用form验证
                     'stt': {required: true}, // 停站类型，TODO：貌似没发启用form验证
+                    'zgffcjxmin' : {required : true,number : true,digits: true},// 早高峰最小发车间隔.
+                    'zgffcjxmax' : {required : true,number : true,digits: true},// 早高峰最大发车间隔.
+                    'wffcjxmin' : {required : true,number : true,digits: true},// 晚高峰最小发车间隔.
+                    'wffcjxmax' : {required : true,number : true,digits: true},// 晚高峰最大发车间隔.
+                    'dgfcjxmin' : {required : true,number : true,digits: true},// 低谷最小发车间隔.
+                    'dgfcjxmax' : {required : true,number : true,digits: true},// 低谷最大发车间隔.
                     'gfjypcs': {required : true,number : true,digits: true}, // 高峰建议配车数
-                    'jblps': {required : true,number : true,digits: true} // 加班车路牌数
+                    'jbclcount': {required : true,number : true,digits: true} // 建议加班车数
 				},
 				/**
@@ -934,7 +940,7 @@ var SKBFormWizard = function() {
                                     });
                                     // 发车间隙选择控件
-                                    ComponentsBootstrapTagsinput.init_fcjx();
+                                    //ComponentsBootstrapTagsinput.init_fcjx();
                                     // 停站类型选择控件
                                     ComponentsBootstrapTagsinput.init_stoptype();
@@ -50,7 +50,7 @@
 		var CSMap = null,data = null;
         // 创建ParameterObj
-        var _paramObj = StrategyUtils.getFactory().createParameterObj(map, dataMap);
+        var _paramObj;
 		if(map.baseRes== '0') {
 			CSMap = getMaxCarAndStopSpace0(map,seMap);
@@ -62,6 +62,8 @@
             map.fcjx = CSMap.fcjx;
 		}else if (map.baseRes == '2') {
             // TODO：之后可能有新的参数加入
+            _paramObj = StrategyUtils.getFactory().createParameterObj(map, dataMap);
+
             map.clzs = StrategyUtils.calcuClzx(_paramObj);
             CSMap = getMaxCarAndStopSpace1(map);
@@ -105,7 +105,6 @@ var ParameterObj = function(formMap, dataMap) {
     // 计算各个时段的发车间隙
     var _fcjxIntervalObj_fun = function() {
-        var _fcjxes = _formMap.fcjx.split(",");
         var _rtn = {
             mpeakfcjx : {}, // 早高峰
             epeakfcjx : {}, // 晚高峰
@@ -114,32 +113,34 @@ var ParameterObj = function(formMap, dataMap) {
         var _fcjx = [];
         var i = 0;
-        // TODO：这里按照顺序判定发车间隔
+        // TODO：这里只有3个间隔，以后加其他的
         // 1、早高峰间隙
         // 2、晚高峰间隙
-        // 3、早低谷
-        // 4、平峰
-        // 5、晚低谷
-
-        // 至少3个，系统暂时使用3个，有最小间隔，有最大间隔
-        if (_fcjxes.length < 3) {
-            alert("发车间隙至少3个（早高峰，晚高峰，低谷）");
-            throw "发车间隙至少3个（早高峰，晚高峰，低谷）";
-        } else {
-            for (i = 0; i < 3; i++) {
-                _fcjx = _fcjxes[i].split("/");
-                if (i == 0) {
-                    _rtn.mpeakfcjx.min = parseInt(_fcjx[2].split("-")[0]);
-                    _rtn.mpeakfcjx.max = parseInt(_fcjx[2].split("-")[1]);
-                } else if (i == 1) {
-                    _rtn.epeakfcjx.min = parseInt(_fcjx[2].split("-")[0]);
-                    _rtn.epeakfcjx.max = parseInt(_fcjx[2].split("-")[1]);
-                } else {
-                    _rtn.troughfcjx.min = parseInt(_fcjx[2].split("-")[0]);
-                    _rtn.troughfcjx.max = parseInt(_fcjx[2].split("-")[1]);
-                }
-            }
+        // 3、低谷
+
+        _rtn.mpeakfcjx.min = parseInt(_formMap.zgffcjxmin);
+        _rtn.mpeakfcjx.max = parseInt(_formMap.zgffcjxmax);
+
+        _rtn.epeakfcjx.min = parseInt(_formMap.wffcjxmin);
+        _rtn.epeakfcjx.max = parseInt(_formMap.wffcjxmax);
+
+        _rtn.troughfcjx.min = parseInt(_formMap.dgfcjxmin);
+        _rtn.troughfcjx.max = parseInt(_formMap.dgfcjxmax);
+
+        // 做一些逻辑检查
+        if (_rtn.mpeakfcjx.min > _rtn.mpeakfcjx.max) {
+            alert("早高峰最小间隔大于最大间隔");
+            throw "早高峰最小间隔大于最大间隔";
+        }
+        if (_rtn.epeakfcjx.min > _rtn.epeakfcjx.max) {
+            alert("晚高峰最小间隔大于最大间隔");
+            throw "晚高峰最小间隔大于最大间隔";
         }
+        if (_rtn.troughfcjx.min > _rtn.troughfcjx.max) {
+            alert("低谷最小间隔大于最大间隔");
+            throw "低谷最小间隔大于最大间隔";
+        }
+
         return _rtn;
     };
@@ -502,7 +503,7 @@ var ParameterObj = function(formMap, dataMap) {
          * @returns {Number|*}
          */
         getJBLpes: function() {
-            return parseInt(_formMap.jblps);
+            return parseInt(_formMap.jbclcount);
         },
         //----------------- 获取关联数据信息 -----------------//
@@ -144,44 +144,55 @@
     </div>
     <div class="form-group">
-        <div class="col-md-6 ">
-            <label class="control-label col-md-5"><span class="required"> * </span>时段发车间隔　:</label>
-            <div class="col-md-5 tagsDiv">
-                <div class="row" style="margin-left: 15px;">
-                    <input type="text" value="" name="fcjx" id="fcjx_tagsinput" style="display: none;">
-                </div>
-
-                <div class="row" style="margin-top: 10px;">
-                    <label class="control-label col-md-4">开始时间:</label>
-                    <div class="col-md-8">
-                        <input type="text" class="form-control" placeholder="时段开始时间" id="fcjx_tagsinput_starttime">
-                    </div>
-                </div>
-
-                <div class="row" style="margin-top: 10px;">
-                    <label class="control-label col-md-4">结束时间:</label>
-                    <div class="col-md-8">
-                        <input type="text" class="form-control" placeholder="时段结束时间" id="fcjx_tagsinput_endtime">
-                    </div>
-                </div>
-
-                <div class="row" style="margin-top: 10px;">
-                    <label class="control-label col-md-4">间隔值:</label>
-                    <div class="col-md-4">
-                        <input type="number" class="form-control" placeholder="开始" id="fcjx_tagsinput_fvalue" min="1">
-                    </div>
-                    <div class="col-md-4">
-                        <input type="number" class="form-control" placeholder="结束" id="fcjx_tagsinput_tvalue" min="1">
-                    </div>
-                </div>
-
-                <div class="row" style="margin-top: 10px;margin-left: 116px;">
-                    <a href="javascript:" class="btn red" id="fcjx_tagsinput_add">添加</a>
-                </div>
+        <div class="col-md-6">
+            <label class="control-label col-md-5"><span class="required"> * </span>早高峰发车间隔　:</label>
+            <div class="col-md-3" style="padding-right: 0px;">
+                <input type="text" class="form-control" name="zgffcjxmin" id="zgffcjxmin_id"
+                       placeholder="最小间隔">
+            </div>
+            <div class="col-md-1" style="padding-top: 10px; font-size: 85%;">至</div>
+            <div class="col-md-3" style="padding-left: 0px;">
+                <input type="text" class="form-control" name="zgffcjxmax" id="zgffcjxmax_id"
+                       placeholder="最大间隔">
             </div>
         </div>
+        <div class="col-md-6">
+            <label class="control-label col-md-5"><span class="required"> * </span>晚高峰发车间隔　:</label>
+            <div class="col-md-3" style="padding-right: 0px;">
+                <input type="text" class="form-control" name="wffcjxmin" id="wffcjxmin_id"
+                       placeholder="最小间隔">
+            </div>
+            <div class="col-md-1" style="padding-top: 10px; font-size: 85%;">至</div>
+            <div class="col-md-3" style="padding-left: 0px;">
+                <input type="text" class="form-control" name="wffcjxmax" id="wffcjxmax_id"
+                       placeholder="最大间隔">
+            </div>
+        </div>
+    </div>
+    <div class="form-group">
+        <div class="col-md-6">
+            <label class="control-label col-md-5"><span class="required"> * </span>低谷发车间隔　:</label>
+            <div class="col-md-3" style="padding-right: 0px;">
+                <input type="text" class="form-control" name="dgfcjxmin" id="dgfcjxmin_id"
+                       placeholder="最小间隔">
+            </div>
+            <div class="col-md-1" style="padding-top: 10px; font-size: 85%;">至</div>
+            <div class="col-md-3" style="padding-left: 0px;">
+                <input type="text" class="form-control" name="dgfcjxmax" id="dgfcjxmax_id"
+                       placeholder="最大间隔">
+            </div>
+        </div>
+        <div class="col-md-6">
+            <label class="control-label col-md-5"><span class="required"> * </span>建议加班车数　:</label>
+            <div class="col-md-5">
+                <input type="text" class="form-control" name="jbclcount" id="jbclcount_id"
+                       placeholder="间隔">
+            </div>
+        </div>
+    </div>
+    <div class="form-group">
         <div class="col-md-6">
             <label class="control-label col-md-5"><span class="required"> * </span>停站类型　:</label>
             <div class="col-md-5 tagsDiv">
@@ -218,25 +229,14 @@
         </div>
-    </div>
-
-    <div class="form-group">
         <div class="col-md-6">
             <label class="control-label col-md-5">
-                <span class="required"> * </span> 高峰建议配车数  :</label>
+                <span class="required"> * </span> 高峰建议配车数　:</label>
             <div class="col-md-5">
                 <input type="text" class="form-control" placeholder="车辆数" name="gfjypcs" id="gfjypcsInput" min="1">
             </div>
         </div>
-        <div class="col-md-6">
-            <label class="control-label col-md-5">
-                <span class="required"> * </span> 加班车路牌数  :</label>
-            <div class="col-md-5">
-                <input type="text" class="form-control" placeholder="加班路牌数" name="jblps" id="jblpsInput" min="1">
-            </div>
-        </div>
-
     </div>
     <!-- 隐藏字段-时间 -->
@@ -412,38 +412,76 @@
     <div class="form-group">
         <div class="col-md-6">
-            <label class="control-label col-md-5">
-                <span class="required"> * </span> 时段发车间隔　:
-            </label>
+            <label class="control-label col-md-5">早高峰最小发车间隔　:</label>
             <div class="col-md-4">
-                <p class="form-control-static" data-display="fcjx"> </p>
+                <p class="form-control-static" data-display="zgffcjxmin"> </p>
             </div>
         </div>
         <div class="col-md-6">
-            <label class="control-label col-md-5">
-                <span class="required"> * </span> 停站类型　:
-            </label>
+            <label class="control-label col-md-5">早高峰最大发车间隔　:</label>
             <div class="col-md-4">
-                <p class="form-control-static" data-display="stt"> </p>
+                <p class="form-control-static" data-display="zgffcjxmax"> </p>
             </div>
         </div>
+    </div>
+    <div class="form-group">
+        <div class="col-md-6">
+            <label class="control-label col-md-5">晚高峰最小发车间隔　:</label>
+            <div class="col-md-4">
+                <p class="form-control-static" data-display="wffcjxmin"> </p>
+            </div>
+        </div>
+        <div class="col-md-6">
+            <label class="control-label col-md-5">晚高峰最大发车间隔　:</label>
+            <div class="col-md-4">
+                <p class="form-control-static" data-display="wffcjxmax"> </p>
+            </div>
+        </div>
     </div>
     <div class="form-group">
         <div class="col-md-6">
-            <label class="control-label col-md-5"> 高峰建议配车数　: </label>
+            <label class="control-label col-md-5">低谷最小发车间隔　:</label>
             <div class="col-md-4">
-                <p class="form-control-static" data-display="gfjypcs"> </p>
+                <p class="form-control-static" data-display="dgfcjxmin"> </p>
+            </div>
+        </div>
+        <div class="col-md-6">
+            <label class="control-label col-md-5">低谷最大发车间隔　:</label>
+            <div class="col-md-4">
+                <p class="form-control-static" data-display="dgfcjxmax"> </p>
             </div>
         </div>
+    </div>
+
+    <div class="form-group">
         <div class="col-md-6">
-            <label class="control-label col-md-5"> 加班车路牌数　: </label>
+            <label class="control-label col-md-5">
+                <span class="required"> * </span> 建议加班车数　:
+            </label>
             <div class="col-md-4">
-                <p class="form-control-static" data-display="jblps"> </p>
+                <p class="form-control-static" data-display="jbclcount"> </p>
             </div>
         </div>
+    </div>
+    <div class="form-group">
+        <div class="col-md-6">
+            <label class="control-label col-md-5">
+                <span class="required"> * </span> 停站类型　:
+            </label>
+            <div class="col-md-4">
+                <p class="form-control-static" data-display="stt"> </p>
+            </div>
+        </div>
+
+        <div class="col-md-6">
+            <label class="control-label col-md-5"> 高峰建议配车数　: </label>
+            <div class="col-md-4">
+                <p class="form-control-static" data-display="gfjypcs"> </p>
+            </div>
+        </div>
     </div>
 </script>
 \ No newline at end of file