优化到离站逻辑

潘钊
1 parent b49a7d13
Showing 17 changed files with 307 additions and 59 deletions
src/main/java/com/bsth/data/arrival/AnalyseData.java
src/main/java/com/bsth/data/arrival/ArrivalData_GPS.java
src/main/java/com/bsth/data/arrival/DataLoader.java
src/main/java/com/bsth/data/directive/FirstScheduleCheckThread.java
src/main/java/com/bsth/data/directive/GatewayHttpUtils.java
src/main/java/com/bsth/data/match/Arrival2Schedule.java
src/main/java/com/bsth/data/match/ExpectArrivalEnd.java
src/main/java/com/bsth/websocket/handler/RealControlSocketHandler.java
src/main/resources/static/assets/img/bg_9b9dcb65ff.png
src/main/resources/static/real_control_v2/css/line_schedule.css
src/main/resources/static/real_control_v2/css/sch_autocomp_result.css
src/main/resources/static/real_control_v2/fragments/line_schedule/sch_table.html
src/main/resources/static/real_control_v2/js/line_schedule/sch_table.js
src/main/resources/static/real_control_v2/js/line_schedule/search.js
src/main/resources/static/real_control_v2/js/main.js
src/main/resources/static/real_control_v2/js/websocket/sch_websocket.js
src/main/resources/static/real_control_v2/main.html
@@ -78,6 +78,9 @@ public class AnalyseData {
 							&& curr.getTs() - prve.getTs() < SHIFT_TIME){
 						prve.setEnable(false);
 					}
+//					else if(curr.getInOut()){
+//						//curr.getTs() - prve.getTs() < 30000
+//					}
 				}
 				else{
 					//上下行的同名站，新走向的第一个出站信号开始有效
@@ -51,7 +51,7 @@ public class ArrivalData_GPS implements CommandLineRunner{
 	@Override
 	public void run(String... arg0) throws Exception {
 		logger.info("ArrivalData_GPS,30,10");
-		Application.mainServices.scheduleWithFixedDelay(dataLoaderThread, 30, 600, TimeUnit.SECONDS);
+		Application.mainServices.scheduleWithFixedDelay(dataLoaderThread, 40, 20, TimeUnit.SECONDS);
 	}
 	@Component
@@ -58,7 +58,7 @@ public class DataLoader {
 			PreparedStatement ps = null;
 			ResultSet rs = null;
-			String sql = "select * from bsth_c_arrival_info where weeks_year=? AND create_timestamp > ? AND create_timestamp <=? AND ABS(create_timestamp - ts) < 3600000 order by ts";
+			String sql = "select * from bsth_c_arrival_info where weeks_year=? AND create_timestamp > ? AND create_timestamp <=? AND ABS(create_timestamp - ts) < 3600000 order by create_date";
 			try{
 				long t = System.currentTimeMillis();
@@ -8,6 +8,8 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+import com.bsth.data.match.Arrival2Schedule;
+import com.bsth.data.match.ExpectArrivalEnd;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.service.directive.DirectiveService;
@@ -63,6 +65,26 @@ public class FirstScheduleCheckThread extends Thread{
 							&& Math.abs(first.getDfsjT() - t) < THREE_MINUTES){
 						directiveService.send60Dispatch(first, dayOfSchedule.doneSum(first.getClZbh()), "定补@系统");
+						//期望完成出场班次时间
+						long endTime;
+						
+						if(first.getZdsj() != null)
+							endTime=first.getZdsjT() - 60000;
+						else
+							endTime=schList.get(1).getDfsjT() - 60000;
+						
+						ExpectArrivalEnd ead = new ExpectArrivalEnd()
+									,ead2 = new ExpectArrivalEnd();
+						ead.setNbbm(car);
+						ead.setEndStation(first.getQdzCode());
+						ead.setEndTime(endTime);
+						
+						ead2.setNbbm(car);
+						ead2.setEndStation(first.getZdzCode());
+						ead2.setEndTime(endTime);
+						
+						Arrival2Schedule.addExpect(car, ead);
+						Arrival2Schedule.addExpect(car, ead2);
 					}
 				}
 			}
@@ -51,13 +51,13 @@ public class GatewayHttpUtils {
 			post.setEntity(new StringEntity(jsonStr, "utf-8"));
-			CloseableHttpResponse response = httpClient.execute(post);
-			
-			JSONObject json = JSONObject.parseObject(EntityUtils.toString(response.getEntity()));
-			if(null != json && json.getInteger("errCode") == 0)
-				code = 0;
-			else
-				logger.error("和网关http通讯失败，rs: " + json);
+//			CloseableHttpResponse response = httpClient.execute(post);
+//			
+//			JSONObject json = JSONObject.parseObject(EntityUtils.toString(response.getEntity()));
+//			if(null != json && json.getInteger("errCode") == 0)
+//				code = 0;
+//			else
+//				logger.error("和网关http通讯失败，rs: " + json);
 		}catch(Exception e){
 			logger.error("", e);
 		}finally {
@@ -3,9 +3,7 @@ package com.bsth.data.match;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 import org.slf4j.Logger;
@@ -15,14 +13,18 @@ import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.stereotype.Component;
+import com.bsth.data.LineConfigData;
 import com.bsth.data.arrival.ArrivalComparator;
 import com.bsth.data.arrival.ArrivalData_GPS;
 import com.bsth.data.arrival.ArrivalEntity;
 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;
 import com.bsth.websocket.handler.SendUtils;
+import com.google.common.collect.ArrayListMultimap;
+import com.google.common.collect.ListMultimap;
 /**
  * 
@@ -38,13 +40,14 @@ public class Arrival2Schedule implements ApplicationContextAware {
 	private static DayOfSchedule dayOfSchedule;
 	private static SendUtils sendUtils;
 	private static DirectiveService directiveService;
+	private static LineConfigData lineConfigData;
 	private final static int ONE_MINUTE = 1000 * 60;
 	//定一个4小时的范围，基本能对正常班次进行容错。主要防止早上停车场GPS飘导致完成晚上的进场班次
 	private final static int FOUR_HOURS = 1000 * 60 * 60 * 4;
 	private static Logger logger = LoggerFactory.getLogger(Arrival2Schedule.class);
-	private static Map<String, ExpectArrivalEnd> expectMap = new HashMap<>();
+	private static ArrayListMultimap<String, ExpectArrivalEnd> expectMap = ArrayListMultimap.create();
 	/**
 	 * 
@@ -61,6 +64,8 @@ public class Arrival2Schedule implements ApplicationContextAware {
 	public static class SchMatchThread extends Thread{
 		String nbbm;
+		LineConfig conf;
+		
 		public SchMatchThread(String nbbm){
 			this.nbbm = nbbm;
 		}
@@ -73,7 +78,6 @@ public class Arrival2Schedule implements ApplicationContextAware {
 		@Override
 		public void run() {
-				
 			//班次列表
 			List<ScheduleRealInfo> schList = dayOfSchedule.findByNbbm(nbbm);
 			//进出起终点数据
@@ -82,6 +86,7 @@ public class Arrival2Schedule implements ApplicationContextAware {
 			if(schList.size() == 0 || arrList.size() == 0)
 				return;
+			conf = lineConfigData.get(schList.get(0).getXlBm());
 			//排序
 			Collections.sort(schList, schComparator);
 			Collections.sort(arrList, arrComparator);
@@ -113,8 +118,8 @@ public class Arrival2Schedule implements ApplicationContextAware {
 				if(sch.isDestroy())
 					continue;
-				//没有里程的不匹配
-				if(sch.getBcsj() == null && sch.getJhlc() == null)
+				//线路配置出站既出场，并且没有里程的不匹配
+				if(conf.getOutConfig()==2 && sch.getBcsj() == null && sch.getJhlc() == null)
 					continue;
 				list.add(sch);
@@ -194,7 +199,15 @@ public class Arrival2Schedule implements ApplicationContextAware {
 				mr = new MatchResult();
 				mr.sch = sch;
 				mr.ts = inArr.getTs();
-				mr.diff = inArr.getTs() - sch.getZdsjT();
+				//班次没有里程和运送时间的
+				if(sch.getZdsj() == null){
+					if(i < schList.size()-1)
+						mr.diff = inArr.getTs() - schList.get(i + 1).getDfsjT();
+					else
+						mr.diff = inArr.getTs() - sch.getDfsjT();
+				}
+				else
+					mr.diff = inArr.getTs() - sch.getZdsjT();
 				mr.success = dayOfSchedule.validEndTime(sch, inArr.getTs());
 				if(Math.abs(mr.diff) < FOUR_HOURS && mr.success)
 					mrs.add(mr);
@@ -216,13 +229,8 @@ public class Arrival2Schedule implements ApplicationContextAware {
 		public void carOut(MatchResult mr){
 			ScheduleRealInfo sch = mr.sch;
-			if(expectMap.containsKey(nbbm)){
-				ExpectArrivalEnd ead = expectMap.get(nbbm);
-				if(mr.ts < ead.getEndTime())
-					return;
-				else
-					expectMap.remove(nbbm);
-			}
+			if(!isExpectOut(mr))
+				return;
 			//设置发车时间
 			sch.setFcsjActualAll(mr.ts);
 			//通知客户端
@@ -231,8 +239,32 @@ public class Arrival2Schedule implements ApplicationContextAware {
 			dayOfSchedule.save(sch);
 			//车辆当前执行班次
 			dayOfSchedule.addExecPlan(sch);
+			
 			//期望车辆到达的终点
-			expectMap.put(nbbm, ExpectArrivalEnd.getEndInstance(sch, mr.ts));
+			if(sch.getZdsj() != null)
+				expectMap.put(nbbm, ExpectArrivalEnd.getEndInstance(sch, mr.ts));
+		}
+		
+		/**
+		 * 
+		 * @Title: isExpectOut 
+		 * @Description: TODO(是否是一个期望的出站匹配结果) 
+		 */
+		private boolean isExpectOut(MatchResult mr){
+			ScheduleRealInfo sch = mr.sch;
+			String nbbm = sch.getClZbh();
+			if(expectMap.containsKey(nbbm)){
+				List<ExpectArrivalEnd> eads = expectMap.get(nbbm);
+				for(ExpectArrivalEnd ead : eads){
+					if(sch.getQdzCode().equals(ead.getEndStation())
+							|| mr.ts > ead.getEndTime()){
+						expectMap.removeAll(nbbm);
+						return true;
+					}
+				}
+				return false;
+			}
+			return true;
 		}
 		/**
@@ -243,15 +275,8 @@ public class Arrival2Schedule implements ApplicationContextAware {
 		public void carInStop(MatchResult mr){
 			ScheduleRealInfo sch = mr.sch;
 			String nbbm=sch.getClZbh();
-			if(expectMap.containsKey(nbbm)){
-				ExpectArrivalEnd ead = expectMap.get(nbbm);
-				if(mr.ts < ead.getEndTime() 
-						&& !mr.sch.getZdzCode().equals(ead.getEndStation())){
-					return;
-				}
-				else
-					expectMap.remove(nbbm);
-			}
+			if(!isExpectIn(mr))
+				return;
 			//如果是进停车场，并且实达时间差值大于 30 分钟，并且之前还有未完成班次。
 			if(sch.getBcType().equals("in") && Math.abs(mr.diff) > (1000 * 60 * 30)){
@@ -289,6 +314,28 @@ public class Arrival2Schedule implements ApplicationContextAware {
 		/**
 		 * 
+		 * @Title: isExpectOut 
+		 * @Description: TODO(是否是一个期望的进站匹配结果) 
+		 */
+		private boolean isExpectIn(MatchResult mr){
+			ScheduleRealInfo sch = mr.sch;
+			String nbbm = sch.getClZbh();
+			if(expectMap.containsKey(nbbm)){
+				List<ExpectArrivalEnd> eads = expectMap.get(nbbm);
+				for(ExpectArrivalEnd ead : eads){
+					if(sch.getZdzCode().equals(ead.getEndStation())
+							|| mr.ts > ead.getEndTime()){
+						expectMap.removeAll(nbbm);
+						return true;
+					}
+				}
+				return false;
+			}
+			return true;
+		}
+		
+		/**
+		 * 
 		 * @Title: correctFirstSignal 
 		 * @Description: TODO(检查并纠正首班出场到离站) 
 		 */
@@ -367,6 +414,7 @@ public class Arrival2Schedule implements ApplicationContextAware {
 		sendUtils = arg0.getBean(SendUtils.class);
 		dayOfSchedule = arg0.getBean(DayOfSchedule.class);
 		directiveService = arg0.getBean(DirectiveService.class);
+		lineConfigData = arg0.getBean(LineConfigData.class);
 	}
 	/**
@@ -376,6 +424,10 @@ public class Arrival2Schedule implements ApplicationContextAware {
 	 * @param @param nbbm   
 	 */
 	public void removeExpect(String nbbm){
-		expectMap.remove(nbbm);
+		expectMap.removeAll(nbbm);
+	}
+	
+	public static void addExpect(String nbbm, ExpectArrivalEnd eae){
+		expectMap.put(nbbm, eae);
 	}
 }
@@ -5,7 +5,7 @@ import com.bsth.entity.realcontrol.ScheduleRealInfo;
 /**
  * 
  * @ClassName: ExpectArrivalEnd 
- * @Description: TODO(期望车辆在某个时间段到达某个终点........) 
+ * @Description: TODO(期望车辆在某个时间段到达某个终点或 发出某个起点........) 
  * @author PanZhao 
  * @date 2016年11月2日 下午8:04:43 
  *
@@ -29,6 +29,7 @@ public class ExpectArrivalEnd {
 		}
 		return ead;
 	}
+	
 	public String getNbbm() {
 		return nbbm;
@@ -3,6 +3,7 @@ package com.bsth.websocket.handler;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -83,7 +84,7 @@ public class RealControlSocketHandler implements WebSocketHandler {
 		default:
 			break;
 		}
-		System.out.println(msg);
+		logger.info(msg.getPayload().toString());
 	}
 	@Override
@@ -145,22 +146,23 @@ public class RealControlSocketHandler implements WebSocketHandler {
 	 * @param message
 	 */
 	public synchronized void sendMessageToLine(String lineCode, String msg) {
-		//Set<String> uids = BasicData.lineCode2SocketUserMap.get(lineCode);
-		//if(null == uids || uids.size() == 0)
-		//	return;
 		TextMessage message = new TextMessage(msg.getBytes());
-		List<WebSocketSession> sessList = listenMap.get(lineCode);
+		Iterator<WebSocketSession> iterator = listenMap.get(lineCode).iterator();
-		for (WebSocketSession user : sessList) {
+		WebSocketSession user;
+		while(iterator.hasNext()){
+			user = iterator.next();
 			try {
 				if (user.isOpen()) {
 					user.sendMessage(message);
 				}
-			} catch (IOException e) {
+			} catch (Exception e) {
+				logger.error("sendMessageToLine error ...."+msg);
 				logger.error("sendMessageToLine error ....", e);
 			}
+			
 		}
 	}
 }
@@ -706,3 +706,26 @@ input.i-cbox[type=checkbox]{
 .sch-tzrc-table.ct_table>.ct_table_body dl.context-menu-active{
   background: #e6e6e6;
 }
+
+.search_sch_panel{
+    float: right;
+}
+
+.search_sch_panel .uk-form input[type=text]{
+  width: 80px;
+  background: #fafafa;
+  border: 0;
+  border-bottom: 1px solid #ddd;
+  font-size: 14px;
+  height: 20px;
+  transition: all .3s ease;
+}
+
+.search_sch_panel .uk-form input.active[type=text]{
+  width: 130px;
+}
+
+.search_sch_panel .uk-form input[type=text]::-webkit-input-placeholder{
+  font-size: 12px;
+  color: #cecece;
+}
+.uk-autocomplete.sch-search-autocom .uk-dropdown {
+    width: 260px;
+    max-height: 500px;
+    overflow: auto;
+}
+
+.sch-search-results>li {
+    position: relative;
+    /*line-height: 18px;*/
+}
+
+.sch-search-results>li.uk-active small {
+    color: #ebeaea;
+}
+
+.sch-search-results small {
+    /*display: block;*/
+    color: #9b9797;
+    margin-left: 9px;
+}
+
+.sch-search-results small.search-result-desc {
+    white-space: nowrap;
+    overflow: hidden;
+    display: block;
+    text-overflow: ellipsis;
+    margin-left: 0;
+}
+
+
+/*.sch-search-results div.exec_sch_badge {
+    position: absolute;
+    top: 8px;
+    right: 3px;
+    background: #96f396;
+    text-indent: 0;
+    padding: 0 3px;
+    border-radius: 5px;
+    color: #7b5d5d;
+}*/
@@ -7,6 +7,16 @@
         {{else}}
           下行/{{line.endStationName}}
         {{/if}}
+        <!-- <div class="search_sch_panel">
+          <form class="uk-form">
+              <div class="uk-autocomplete sch-search-autocom">
+                <div class="uk-form-icon">
+                    <i class="uk-icon-search"></i>
+                    <input type="text" placeholder="search">
+                </div>
+              </div>
+          </form>
+        </div> -->
       </h3>
       <div class="schedule-body">
           <div class="ct_table_wrap">
@@ -10,7 +10,7 @@ var gb_schedule_table = (function() {
         return s1.dfsjT - s2.dfsjT;
     }
-    var show = function() {
+    var show = function(cb) {
         //从服务器获取班次数据
         $.get('/realSchedule/lines', {
             lines: gb_data_basic.line_idx
@@ -63,6 +63,8 @@ var gb_schedule_table = (function() {
             gb_ct_table.enableSort($('.ct_table', content), reset_seq_no, gb_schedule_table_dbclick.init);
             //dbclick event
             gb_schedule_table_dbclick.init();
+
+            cb&&cb();
         });
     }
@@ -189,15 +191,20 @@ var gb_schedule_table = (function() {
         drag_strat = null;
     }).on('mouseover', seq_nos, function() {
         if (drag_strat) {
-            var drag_end = parseInt($(this).text()),
+            var e = parseInt($(this).text()),
                 dls = $(this).parents('.ct_table_body').find('dl');
             reset_drag_active_all(this);
-            if (drag_end - drag_strat <= 1)
-                return;
-
-            for (var i = drag_strat; i < drag_end; i++)
-                $(dls[i]).addClass('drag-active');
+            //向上选中
+            if(e <= drag_strat){
+              for (var i = drag_strat; i > e-2; i--)
+                  $(dls[i]).addClass('drag-active');
+            }
+            //向下选中
+            else{
+              for (var j = drag_strat; j < e; j++)
+                  $(dls[j]).addClass('drag-active');
+            }
         }
     }).on('click', seq_nos, function() {
         reset_relevance_active(this);
@@ -278,7 +285,7 @@ var gb_schedule_table = (function() {
     //计算应发未发数量
     var calc_yfwf_num = function(lineCode){
-      var schArr=line2Schedule[lineCode]
+      var schArr=gb_common.get_vals(line2Schedule[lineCode]).sort(schedule_sort)
         ,yfwf_num=0
         ,t = new Date().valueOf();
+/** 班次搜索 */
+var gb_sch_search = (function() {
+
+    //搜索结果模板，和art-template冲突。 用字符串渲染
+    var result_template = '<script type="text/autocomplete">' +
+        '  <ul class="uk-nav uk-nav-autocomplete uk-autocomplete-results sch-search-results">' +
+        '      {{~items}}' +
+        '      <li data-value="{{ $item.value }}">' +
+        '          <a>' +
+        '              {{ $item.value }}' +
+        '              <small >执行班次 07:00</small>' +
+        '              <small class="search-result-desc">{{{ $item.desc }}}</small>' +
+        '          </a>' +
+        '      </li>' +
+        '      {{/items}}' +
+        '  </ul>' +
+        '</script>';
+
+    var ips = '.search_sch_panel input',
+        _input, schArr, lineCode, group_cars;
+    $(document)
+        .on('focus', ips, function() {
+            $(this).addClass('active');
+            lineCode = $(this).parents('li.line_schedule').data('id');
+            schArr = gb_common.get_vals(gb_schedule_table.findScheduleByLine(lineCode));
+
+            group_cars = gb_common.groupBy(schArr, 'clZbh');
+            _input = $(this);
+        })
+        .on('blur', ips, function() {
+            if ($(this).val() == '')
+                $(this).removeClass('active');
+        });
+
+    var elements = '.search_sch_panel .sch-search-autocom';
+    var init = function() {
+        $(elements).each(function() {
+            $(this).append(result_template);
+            constructor(this);
+        });
+    };
+
+    var constructor = function(e) {
+        UIkit.autocomplete(e, {
+            minLength: 1,
+            delay: 50,
+            source: autocomplete_source
+        }).on('selectitem.uk.autocomplete', selectitem);
+    }
+
+    var autocomplete_source = function(release) {
+        var rs = [],
+            v = _input.val().toUpperCase();
+        for (var car in group_cars) {
+            if (car.indexOf(v) != -1)
+                rs.push({
+                    value: car,
+                    desc: '应发未发：0，已完成 8 个班次'
+                });
+        }
+
+        console.log(rs);
+        release && release(rs);
+    }
+
+    var selectitem = function(event, data, acobject){
+      var cont='li.line_schedule[data-id='+lineCode+']'
+        ,tbodys=$('.line-schedule-table .ct_table_body', cont);
+
+      $('.sch-search-autocom input', cont).val(data.value).addClass('active');
+      console.log(tbodys);
+    }
+
+    return {
+        init: init
+    };
+})();
@@ -35,7 +35,10 @@ var gb_main_ep = new EventProxy(),
         //render schedule table
         eq.once('render-sch-table', function() {
-            gb_schedule_table.show();
+            gb_schedule_table.show(function(){
+              //搜索框
+              //gb_sch_search.init();
+            });
             //嵌入地图页面
 			      $('li.map-panel','#main-tab-content').load('/real_control_v2/mapmonitor/real_monitor/real.html');
@@ -9,14 +9,7 @@ var gb_sch_websocket = (function() {
     schSock.onopen = function(e) {
         console.log('webSocket[realcontrol] onopen');
-        setTimeout(function() {
-            //注册线路监听
-            var data = {
-                operCode: 'register_line',
-                idx: gb_data_basic.line_idx
-            }
-            schSock.send(JSON.stringify(data));
-        }, 500);
+        setTimeout(regListen, 500);
     };
     //接收消息
     schSock.onmessage = function(e) {
@@ -28,9 +21,22 @@ var gb_sch_websocket = (function() {
         }
     };
+    function regListen (){
+    	//注册线路监听
+        var data = {
+            operCode: 'register_line',
+            idx: gb_data_basic.line_idx
+        }
+        schSock.send(JSON.stringify(data));
+        console.log('regListen....', data);
+    }
+
     //断开
     schSock.onclose = function(e) {
         alert('和服务器连接断开....');
+        console.log('和服务器连接断开....');
+        regListen();
+
     };
     //80协议上报
@@ -18,6 +18,7 @@
     <link rel="stylesheet" href="/real_control_v2/css/home.css" />
     <!-- line style -->
     <link rel="stylesheet" href="/real_control_v2/css/line_schedule.css" />
+    <link rel="stylesheet" href="/real_control_v2/css/sch_autocomp_result.css" />
     <!-- custom table -->
     <link rel="stylesheet" href="/real_control_v2/css/ct_table.css" />
     <!-- jquery contextMenu style -->
@@ -118,6 +119,7 @@
     <script src="/real_control_v2/js/line_schedule/sch_table.js"></script>
     <script src="/real_control_v2/js/line_schedule/context_menu.js"></script>
     <script src="/real_control_v2/js/line_schedule/dbclick.js"></script>
+    <script src="/real_control_v2/js/line_schedule/search.js"></script>
     <!-- 字典相关 -->
     <script src="/assets/js/dictionary.js"></script>