update

潘钊
1 parent bf72abb6
Showing 9 changed files with 139 additions and 33 deletions
src/main/java/com/bsth/entity/schedule/SchedulePlanInfo.java
src/main/java/com/bsth/service/realcontrol/buffer/GetSchedulePlanThread.java
src/main/java/com/bsth/vehicle/directive/service/DirectiveServiceImpl.java
src/main/java/com/bsth/vehicle/directive/thread/FirstScheduleIssuedThread.java
src/main/java/com/bsth/vehicle/gpsdata/GpsArrivalStationThread.java
src/main/java/com/bsth/vehicle/gpsdata/buffer/GpsArrivalDataBuffer.java
src/main/resources/static/pages/control/line/index.html
src/main/resources/static/pages/control/line/js/homeMenu.js
src/main/resources/static/pages/control/line/temps/home_tp.html
@@ -135,11 +135,11 @@ public class SchedulePlanInfo {
     @ManyToOne(cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
-/*    @JoinTable(
+    @JoinTable(
             name = "bsth_c_s_sp_r_info",
             joinColumns = @JoinColumn(name = "sp_info_id"),
             inverseJoinColumns = @JoinColumn(name = "sp_id")
-    )*/
+    )
     private SchedulePlan schedulePlan;
     public SchedulePlanInfo() {}
@@ -41,8 +41,10 @@ public class GetSchedulePlanThread  extends Thread{
 	@Override
 	public void run() {
 		try{
+			ScheduleBuffer.clear();
+			
 			List<ScheduleRealInfo>  realList = null;
-			String dateStr = /*sdf.format(new Date())*/"2016-06-01";
+			String dateStr = sdfyyyyMMdd.format(new Date());
 			Date cDate = sdfyyyyMMdd.parse(dateStr);
 			//查询数据库是否有今日排班
 			int size = scheduleRealInfoRepository.countByDate(cDate);
@@ -110,7 +110,6 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;Directive60, Integer&gt; 
 			directive.setDispatch(true);
 			directive.setSch(sch);
 			DirectiveBuffer.put(directive);
-			
 			//通知页面，消息已发出
 			sendDirectiveState(sch);
 		}else{
@@ -35,7 +35,9 @@ public class FirstScheduleIssuedThread extends Thread{
 			sch = linkedList.getFirst();
-			if(sch.getFcsjActual() == null)
+			//没有完成班次，且头班车没有发车时间
+			if(!ScheduleBuffer.finishLinkedMap.containsKey(nbbm) 
+					&& sch.getFcsjActual() == null)
 				directiveService.send60Dispatch(sch, 0);
 		}
 	}
@@ -8,7 +8,9 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
+import java.util.HashSet;
 import java.util.Iterator;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
@@ -22,6 +24,7 @@ import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.service.realcontrol.buffer.ScheduleBuffer;
 import com.bsth.util.DateUtils;
 import com.bsth.util.db.DBUtils_MS;
+import com.bsth.vehicle.common.CommonMapped;
 import com.bsth.vehicle.directive.service.DirectiveService;
 import com.bsth.vehicle.gpsdata.buffer.GpsArrivalDataBuffer;
 import com.bsth.vehicle.gpsdata.entity.ArrivalInfo;
@@ -57,7 +60,33 @@ public class GpsArrivalStationThread extends Thread{
 		} catch (ParseException e) {
 			e.printStackTrace();
 		}
+		//缓存
 		GpsArrivalDataBuffer.putAll(list);
+
+		//车辆
+		Set<String> set = new HashSet<>();
+		for(ArrivalInfo arr : list)
+			set.add(CommonMapped.vehicDeviceBiMap.get(arr.getDeviceId()));
+		
+		List<ArrivalInfo> rsList = null;
+		LinkedList<ScheduleRealInfo> linked = null;
+		int[] status;
+		ScheduleRealInfo sch;
+		for(String nbbm : set){
+			rsList = GpsArrivalDataBuffer.pops(nbbm);
+			//和该车辆未执行班次进行匹配
+			linked = ScheduleBuffer.vehLinkedMap.get(nbbm);
+			
+			if(null == linked || linked.size() == 0)
+				continue;
+			//第一个未执行班次
+			sch = linked.getFirst();
+			
+			//匹配结果
+			status = match(rsList, sch);
+		}
+		//
+		/*GpsArrivalDataBuffer.putAll(list);
 		//实际到离站和计划排班相匹配
 		Set<String> keySet = GpsArrivalDataBuffer.allMap.keySet();
@@ -68,7 +97,42 @@ public class GpsArrivalStationThread extends Thread{
 			if(null != schList)
 				match(GpsArrivalDataBuffer.allMap.get(key), schList);
 		}
-		System.out.println("结束...");
+		System.out.println("结束...");*/
+	}
+	
+	public int[] match(List<ArrivalInfo> arrList, ScheduleRealInfo sch){
+		//进出分组
+		List<ArrivalInfo> in = new ArrayList<>(), out = new ArrayList<>();
+		for(ArrivalInfo arr : arrList){
+			if(arr.getInOut() == 0)
+				in.add(arr);
+			else
+				out.add(arr);
+		}
+		int s1 = 0, s2 = 0;
+		//匹配发车时间
+		if(sch.getFcsjActual() == null)
+			s1 = matchOut(arrList, sch);
+		
+		//匹配终点时间
+		if(sch.getZdsjActual() == null)
+			s2 = matchIn(arrList, sch);
+		
+		return new int[]{s1,s2};
+	}
+	
+	public int matchOut(List<ArrivalInfo> arrList, ScheduleRealInfo sch){
+		
+		for(ArrivalInfo arr : arrList){
+			if(arr.getStopNo().equals(sch.getQdzCode())){
+				
+			}
+		}
+		return 0;
+	}
+	
+	public int matchIn(List<ArrivalInfo> arrList, ScheduleRealInfo sch){
+		return 0;
 	}
@@ -80,21 +144,21 @@ public class GpsArrivalStationThread extends Thread{
 	 * @param @param schList 计划排班链表
 	 * @throws
 	 */
-	public void match(List<ArrivalInfo> arrList, List<ScheduleRealInfo> schList){
+	/*public void match(List<ArrivalInfo> arrList, List<ScheduleRealInfo> schList){
 		Iterator<ScheduleRealInfo> schIterator = schList.iterator();
 		while(schIterator.hasNext())
 			match(schIterator.next(), arrList);
-	}
+	}*/
-	public void match(ScheduleRealInfo scInfo, List<ArrivalInfo> arrList){
+	/*public void match(ScheduleRealInfo scInfo, List<ArrivalInfo> arrList){
 		for(ArrivalInfo arr : arrList){
 			match(scInfo, arr);
 		}
-	}
+	}*/
-	public void match(ScheduleRealInfo scInfo, ArrivalInfo arr){
+/*	public void match(ScheduleRealInfo scInfo, ArrivalInfo arr){
 		try{
 			//匹配起点
 			matchStart(scInfo, arr);
@@ -104,7 +168,7 @@ public class GpsArrivalStationThread extends Thread{
 		}catch(Exception e){
 			e.printStackTrace();
 		}
-	}
+	}*/
 	/**
 	 * 
@@ -2,7 +2,9 @@ package com.bsth.vehicle.gpsdata.buffer;
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import com.bsth.vehicle.common.CommonMapped;
 import com.bsth.vehicle.gpsdata.entity.ArrivalInfo;
@@ -10,54 +12,74 @@ import com.google.common.collect.LinkedListMultimap;
 /**
  * 
- * @ClassName: GpsArrivalDataBuffer 
- * @Description: TODO(GPS到离站数据缓存) 
+ * @ClassName: GpsArrivalDataBuffer
+ * @Description: TODO(GPS到离站数据缓存)
  * @author PanZhao
- * @date 2016年6月27日 下午1:08:35 
+ * @date 2016年6月27日 下午1:08:35
  *
  */
 public class GpsArrivalDataBuffer {
 	/**
-	 * 车辆  时间戳排序的进出站链表
+	 * 车辆 时间戳排序的进出站链表
 	 */
 	public static LinkedListMultimap<String, ArrivalInfo> allMap;
-	
+
+	/**
+	 * 车辆 和 进出站链表索引
+	 */
+	public static Map<String, Integer> markMap;
+
 	/**
 	 * 时间戳标记，从数据库增量查询时起始时间
 	 */
 	public static Long markTime;
-	
-	
-	static{
+
+	public static List<ArrivalInfo> pops(String nbbm) {
+		Integer mark = null;
+		if (!markMap.containsKey(nbbm))
+			mark = 0;
+		else
+			mark = markMap.get(nbbm);
+
+		List<ArrivalInfo> all = allMap.get(nbbm);
+		int size = all.size();
+		if(size == 0)
+			return null;
+		
+		List<ArrivalInfo> rs = all.subList(mark, size);
+
+		markMap.put(nbbm, size);
+		return rs;
+	}
+
+	static {
 		allMap = LinkedListMultimap.create();
+		markMap = new HashMap<>();
 	}
-	
+
 	/**
 	 * 
-	 * @Title: putAll 
-	 * @Description: TODO(将增量数据添加到缓存) 
-	 * @param @param list    设定文件 
-	 * @return void    返回类型 
-	 * @throws
+	 * @Title: putAll @Description: TODO(将增量数据添加到缓存) @param @param list
+	 * 设定文件 @return void 返回类型 @throws
 	 */
-	public static void putAll(List<ArrivalInfo> list){
-		//按时间戳排序
+	public static void putAll(List<ArrivalInfo> list) {
+		// 按时间戳排序
 		Collections.sort(list, new Comparator<ArrivalInfo>() {
 			@Override
 			public int compare(ArrivalInfo o1, ArrivalInfo o2) {
 				return (int) (o1.getTs() - o2.getTs());
 			}
 		});
-		
+
 		int len = list.size();
 		ArrivalInfo arrival;
 		String nbbm;
-		for(int i = 0; i < len; i ++){
+		for (int i = 0; i < len; i++) {
 			arrival = list.get(i);
 			nbbm = CommonMapped.vehicDeviceBiMap.get(arrival.getDeviceId());
-			
-			if(null != nbbm)
+
+			if (null != nbbm)
 				allMap.put(nbbm, arrival);
 		}
 	}
@@ -176,6 +176,11 @@
         </button>
     </li>
     <li class="menu-separator"></li>
+    <li class="menu-item" >
+        <button type="button" class="menu-btn" data-method="showState">
+            <span class="menu-text">车辆状态查看</span>
+        </button>
+    </li>
     <li class="menu-item submenu">
         <button type="button" class="menu-btn">
             <span class="menu-text">车辆状态发送</span>
@@ -74,6 +74,18 @@ var _home_menu = (function(){
 				else
 					layer.alert('发送指令失败！', {icon: 2, title: '操作失败'});
     		});
+    	},
+    	//车辆状态查看
+    	showState: function(nbbm){
+    		/*var index = layer.open({
+  			  type: 1,
+  			  area: '370px',
+  			  maxmin: true,
+  			  content: template('', data),
+  			  shift: 5,
+  			  title: '---' + nbbm + '---',
+  			  success: function(){}
+  			});*/
     	}
     }
 })();
@@ -121,7 +121,7 @@
 <script id="home_table_temp" type="text/html">
 {{each list as obj i}}
-<tr data-nbbm="{{obj.nbbm}}">
+<tr data-nbbm="{{obj.nbbm}}" data-device="{{obj.deviceId}}">
    <td style="width: 22%;"> {{obj.nbbm}} </td>
    <td style="width: 17%;"> 
 	{{if obj.currSch != null}}