Merge branch 'minhang' into qingpu

潘钊
2 parents 51497cc4 2ba8f995
Showing 14 changed files with 226 additions and 48 deletions
src/main/java/com/bsth/ServiceStateTest.java
src/main/java/com/bsth/Test2.java
src/main/java/com/bsth/controller/directive/DirectiveController.java
src/main/java/com/bsth/controller/directive/UpstreamEntrance.java
src/main/java/com/bsth/data/arrival/AnalyseArrivalData.java
src/main/java/com/bsth/data/arrival/ArrivalData_GPS.java
src/main/java/com/bsth/data/arrival/ArrivalEntity.java
src/main/java/com/bsth/data/directive/DirectiveCreator.java
src/main/java/com/bsth/data/match/Arrival2Schedule.java
src/main/java/com/bsth/service/directive/DirectiveServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/application-dev.properties
src/main/resources/static/pages/control/line/index.html
src/main/resources/static/pages/control/line/js/home.js
@@ -3,8 +3,8 @@ package com.bsth;
 public class ServiceStateTest {
 	public static void main(String[] args) {
-		System.out.println("运营状态：" + getService(33554432));
-		System.out.println("上下行：" + getUpOrDown(33554432));
+		System.out.println("运营状态：" + getService(603979776));
+		System.out.println("上下行：" + getUpOrDown(603979776));
 	}
 	/**
+package com.bsth;
+
+public class Test2 {
+	
+	public static void main(String[] args) {
+		
+		for(int i = 0; i < 20; i ++){
+			new MyThread(i + "").start();
+		}
+	}
+	
+	public static class MyThread extends Thread {
+		
+		private String name ;
+		
+		public MyThread(String name) {
+			this.name = name;
+		}
+
+		@Override
+		public void run() {
+			method(name);
+		}
+	}
+	
+	public static void method(String name){
+		System.out.println("线程" + name + "开始...");
+		int a = 0;
+		for(int i = 0; i < 1000; i ++){
+			a ++;
+		}
+		a--;
+		System.out.println("线程" + name + "结束... a = " + a);
+	}
+}
@@ -4,10 +4,6 @@ import java.util.List;
 import java.util.Map;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Sort;
-import org.springframework.data.domain.Sort.Direction;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -3,6 +3,7 @@ package com.bsth.controller.directive;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Scope;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -25,6 +26,7 @@ import com.bsth.entity.directive.DirectiveReponse;
  */
 @RestController
 @RequestMapping("/control")
+@Scope("prototype")
 public class UpstreamEntrance {
 	Logger logger = LoggerFactory.getLogger(this.getClass());
@@ -73,7 +73,7 @@ public class AnalyseArrivalData {
 			else if(curr.getTs() - prve.getTs() < SCH_TIME){
 				if(prve.getUpDown() == curr.getUpDown()){
 					//信号漂移，出站无效
-					if(prve.getStopNo().equals(prve.getStopNo()) 
+					if(curr.getStopNo().equals(prve.getStopNo()) 
 							&& prve.getInOut() == 1 && curr.getInOut() == 0
 							&& curr.getTs() - prve.getTs() < SHIFT_TIME){
 						prve.setEnable(false);
@@ -122,7 +122,7 @@ public class ArrivalData_GPS implements CommandLineRunner{
 		logger.info(lineCode + " 清除到离站数据 ，" + count);
 	}
-	public static List<ArrivalEntity> findByNbbm(String nbbm){
+	public synchronized static List<ArrivalEntity> findByNbbm(String nbbm){
 		return startAndEndMaps.get(nbbm);
 	}
 package com.bsth.data.arrival;
-import java.text.SimpleDateFormat;
 import java.util.Date;
+import com.bsth.data.BasicData;
+import com.bsth.util.DateUtils;
+
 /**
  * 
  * @ClassName: ArrivalEntity 
@@ -46,6 +48,14 @@ public class ArrivalEntity {
 	private boolean tcc;
+	//是否被纠正
+	private boolean correct;
+	
+	private String correctText;
+	
+	/** -1 则信号有效，但程序标记为不使用 */
+	private int flag = 0;
+	
 	public ArrivalEntity(){}
 	public ArrivalEntity(String deviceId, long ts, String lineCode, int upDown, String stopNo, int inOut, long createDate,
@@ -74,11 +84,15 @@ public class ArrivalEntity {
 		return this.toString().hashCode();
 	}*/
-static SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 	@Override
 	public String toString() {
-		return sdf.format(new Date(this.ts)) + "_" + this.deviceId + "_" + this.inOut + "_" + this.stopName;
+		try {
+			return "["+BasicData.deviceId2NbbmMap.get(this.deviceId)+"， "+DateUtils.sdfHHmm.format(new Date(this.ts))
+			+"，"+(this.getUpDown()==0?"上行":"下行")+"，"+(this.inOut==0?"进":"出")+"，"+this.stopNo+" （"+this.stopName+"）]";
+		} catch (Exception e) {
+			return "";
+		}
 	}
 	public String getLineCode() {
@@ -180,4 +194,32 @@ static SimpleDateFormat sdf = new SimpleDateFormat(&quot;yyyy-MM-dd HH:mm:ss&quot;);
 	public void setTcc(boolean tcc) {
 		this.tcc = tcc;
 	}
+
+	public boolean isOutTcc() {
+		return isTcc() && inOut == 1;
+	}
+
+	public boolean isCorrect() {
+		return correct;
+	}
+
+	public void setCorrect(boolean correct) {
+		this.correct = correct;
+	}
+
+	public String getCorrectText() {
+		return correctText;
+	}
+
+	public void setCorrectText(String correctText) {
+		this.correctText = correctText;
+	}
+
+	public Integer getFlag() {
+		return flag;
+	}
+
+	public void setFlag(Integer flag) {
+		this.flag = flag;
+	}
 }
@@ -81,8 +81,9 @@ public class DirectiveCreator {
 	}
-	static SimpleDateFormat sdfMMddHHmm = new SimpleDateFormat("MMddHHmm");
 	public static D60 createD60_02(String nbbm, String text, int upDown, int state, Date alarmTime){
+		SimpleDateFormat sdfMMddHHmm = new SimpleDateFormat("MMddHHmm");
+		
 		Long timestamp = System.currentTimeMillis();
 		Short company = Short.parseShort(BasicData.nbbm2CompanyCodeMap.get(nbbm));
 package com.bsth.data.match;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Set;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
@@ -19,26 +22,25 @@ import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.service.directive.DirectiveService;
 import com.bsth.websocket.handler.SendUtils;
+/**
+ * 
+ * @ClassName: Arrival2Schedule 
+ * @Description: TODO(到离站数据 和 计划班次进行匹配  注意线程安全！！！！) 
+ * @author PanZhao 
+ * @date 2016年8月28日 上午1:13:02 
+ *
+ */
 @Component
 public class Arrival2Schedule implements ApplicationContextAware {
 	private static DayOfSchedule dayOfSchedule;
-	
-	
-	private static ScheduleComparator.FCSJ schComparator;
-	private static ArrivalComparator arrComparator;
-	private static MatchResultComparator mrComparator;;
 	private static SendUtils sendUtils;
 	private static DirectiveService directiveService;
 	private final static int ONE_MINUTE = 1000 * 60;
 	//定一个4小时的范围，基本能对正常班次进行容错。主要防止早上停车场GPS飘导致完成晚上的进场班次
 	private final static int FOUR_HOURS = 1000 * 60 * 60 * 4;
-	static{
-		schComparator = new ScheduleComparator.FCSJ();
-		arrComparator = new ArrivalComparator();
-		mrComparator = new MatchResultComparator();
-	}
+	private static Logger logger = LoggerFactory.getLogger(Arrival2Schedule.class);
 	/**
 	 * 
@@ -58,27 +60,39 @@ public class Arrival2Schedule implements ApplicationContextAware {
 		public SchMatchThread(String nbbm){
 			this.nbbm = nbbm;
 		}
+		
+		//排序器
+		private ScheduleComparator.FCSJ schComparator = new ScheduleComparator.FCSJ();
+		private ArrivalComparator arrComparator = new ArrivalComparator();
+		private MatchResultComparator mrComparator = new MatchResultComparator();
+		private SimpleDateFormat sdfyyyyMMddHHmm = new SimpleDateFormat("yyyy-MM-ddHH:mm");
+		
 		@Override
 		public void run() {
-			if(nbbm.equals("YT-CD002")){
-				System.out.println("debugger..");
-			}
-			
 			//班次列表
 			List<ScheduleRealInfo> schList = dayOfSchedule.findByNbbm(nbbm);
 			//进出起终点数据
 			List<ArrivalEntity> arrList = ArrivalData_GPS.findByNbbm(nbbm);
+			
+			if(schList.size() == 0 || arrList.size() == 0)
+				return;
+			
 			//排序
 			Collections.sort(schList, schComparator);
 			Collections.sort(arrList, arrComparator);
 			//过滤班次
 			schList = matchFilter(schList);
+			//检查并修正首班出场终点信号，可能会出现走向异常
+			correctFirstSignal(schList, arrList);
+			
+			
 			//用实际来匹配计划
 			for(ArrivalEntity arr : arrList){
 				match(arr, schList);
 			}
 		}
+		
 		private void match(ArrivalEntity arr, List<ScheduleRealInfo> schList) {
 			if(arr.getInOut() == 1)
@@ -104,6 +118,9 @@ public class Arrival2Schedule implements ApplicationContextAware {
 		}
 		private void matchOut(ArrivalEntity arr, List<ScheduleRealInfo> schList){
+			if(arr.getFlag() == -1)
+				return;
+			
 			List<MatchResult> mrs = new ArrayList<>();
 			ScheduleRealInfo sch;
 			MatchResult mr;
@@ -139,11 +156,15 @@ public class Arrival2Schedule implements ApplicationContextAware {
 				Collections.sort(mrs, mrComparator);
 				mr = mrs.get(0);
-				mr.sch.setFcsjActualAll(mr.ts);
-				//通知客户端
-				sendUtils.sendFcsj(mr.sch);
-				//持久化
-				dayOfSchedule.save(mr.sch);
+				//漂移判定
+				if(driftCheck(mr, arr)){
+					
+					mr.sch.setFcsjActualAll(mr.ts);
+					//通知客户端
+					sendUtils.sendFcsj(mr.sch);
+					//持久化
+					dayOfSchedule.save(mr.sch);
+				}
 			}
 		}
@@ -191,6 +212,10 @@ public class Arrival2Schedule implements ApplicationContextAware {
 					next.setQdzArrDateSJ(mr.sch.getZdsjActual());
 					//下发调度指令
 					directiveService.send60Dispatch(next, doneSum, "到站@系统");
+					
+					//起点既停车场的进场班次
+					if(next.getBcType().equals("in") && next.getJhlc() == null)
+						next.setFcsjActualAll(mr.ts);
 				}
 				else//下发文本指令（已结束运营）
 					directiveService.send60Phrase(nbbm, "到达终点 " + mr.sch.getZdzName() + "，已完成当日所有排班。", "系统");
@@ -200,6 +225,80 @@ public class Arrival2Schedule implements ApplicationContextAware {
 				dayOfSchedule.save(mr.sch);
 			}
 		}
+		
+		/**
+		 * 
+		 * @Title: correctFirstSignal 
+		 * @Description: TODO(检查并纠正首班出场到离站) 
+		 */
+		private final static long TEN_MINUTES = 1000 * 60 * 10;
+		private void correctFirstSignal(List<ScheduleRealInfo> schList, List<ArrivalEntity> arrList) {
+			ScheduleRealInfo sch = schList.get(0);
+			ArrivalEntity arr = arrList.get(0);
+			
+			//有里程的出场班次才需要纠正
+			if(arr.isCorrect() || !sch.getBcType().equals("out") || sch.getJhlc() == null || sch.getBcsj() == null)
+				return;
+			
+			//如果首个进出站信号是出场
+			if(arr.isOutTcc() && arrList.size() >= 2)
+				arr = arrList.get(1);
+			else
+				return;
+			
+			//出场任务 “进终点” 信号才需要纠正
+			if(arr.getInOut() != 0)
+				return;
+			
+			//在计划终点之前到达，或者之后10分钟内到达
+			if(arr.getTs() < sch.getZdsjT()
+					|| arr.getTs() - sch.getZdsjT() < TEN_MINUTES){
+				
+				int upDown = Integer.parseInt(sch.getXlDir());
+				//走向不一致，相信班次的走向。纠正进站信号
+				if(arr.getUpDown() != upDown
+						&& arr.getStopName().equals(sch.getZdzName())){
+					
+					
+					String old = arr.toString();
+					arr.setUpDown(upDown);
+					arr.setStopNo(sch.getZdzCode());
+					arr.setCorrect(true);
+					arr.setCorrectText(old + " | " + arr.toString());
+					
+					logger.info("被纠正的信号：" + arr.getCorrectText());
+				}
+			}
+		}
+		
+		/**
+		 * 
+		 * @Title: driftCheck 
+		 * @Description: TODO(漂移判定) 
+		 */
+		public boolean driftCheck(MatchResult mr, ArrivalEntity arr){
+			try{
+				//上行发车，和到达时间比较一下。起点一般不会立即发出
+				if(mr.sch.getXlDir().equals("0") 
+						&& null != mr.sch.getQdzArrDateSJ()){
+					
+					long dt = sdfyyyyMMddHHmm.parse(mr.sch.getRealExecDate() + mr.sch.getQdzArrDateSJ()).getTime();
+					
+					//停站时间少于 计划的3分之1，标记为漂移信号
+					if((mr.ts - dt < (mr.sch.getDfsjT() - dt) / 3)){
+						arr.setCorrect(true);
+						arr.setCorrectText("停站时间太短，标记为信号漂移");
+						arr.setFlag(-1);
+						
+						logger.info("漂移判定：" + arr);
+						return false;
+					}
+				}
+			}catch(Exception e){
+				logger.error("", e);
+			}
+			return true;
+		}
 	}
 	@Override
@@ -71,8 +71,6 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
 	@Autowired
 	DayOfSchedule dayOfSchedule;
-	SimpleDateFormat sdfHHmm = new SimpleDateFormat("HH点mm分");
-
 	static Long schDiff = 1000 * 60 * 60L;
 	@Override
@@ -111,6 +109,8 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
 				logger.warn("烂班不允许发送调度指令....");
 				return -1;
 			}
+			//多线程下发指令时，SimpleDateFormat必须方法内初始化
+			SimpleDateFormat sdfHHmm = new SimpleDateFormat("HH点mm分");
 			String text = "已完成" + finish + "个班次，下一发车时间" + sdfHHmm.format(new Date(sch.getDfsjT())) + "，由"
 					+ sch.getQdzName() + "发往" + sch.getZdzName();
@@ -785,7 +785,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 				}
 				else{
 					//撤销实发
-					revokeRealOutgo(sch.getId());
+					if(sch.getFcsjActual() != null)
+						revokeRealOutgo(sch.getId());
 				}
 				//实达时间
@@ -802,15 +803,17 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 					}
 				}
 				else {
-					//将对应的到离站数据标记为不可信
-					List<ArrivalEntity> list = ArrivalData_GPS.findByNbbm(sch.getClZbh());
-					for(ArrivalEntity arr : list){
-						if(arr.getInOut() == 0 
-								&& arr.getUpDown() == Integer.parseInt(sch.getXlDir())
-								&& arr.getStopNo().equals(sch.getZdzCode())
-								&& Math.abs(arr.getTs() - sch.getZdsjActualTime()) < 1000 * 60){
-							arr.setEnable(false);
-							break;
+					if(sch.getZdsjActual() != null){
+						//将对应的到离站数据标记为不可信
+						List<ArrivalEntity> list = ArrivalData_GPS.findByNbbm(sch.getClZbh());
+						for(ArrivalEntity arr : list){
+							if(arr.getInOut() == 0 
+									&& arr.getUpDown() == Integer.parseInt(sch.getXlDir())
+									&& arr.getStopNo().equals(sch.getZdzCode())
+									&& Math.abs(arr.getTs() - sch.getZdsjActualTime()) < 1000 * 60){
+								arr.setEnable(false);
+								break;
+							}
 						}
 					}
@@ -8,7 +8,7 @@ spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy
 spring.jpa.database= MYSQL
 spring.jpa.show-sql= true
 spring.datasource.driver-class-name= com.mysql.jdbc.Driver
-spring.datasource.url= jdbc:mysql://127.0.0.1:3306/qp_control
+spring.datasource.url= jdbc:mysql://127.0.0.1:3306/control
 spring.datasource.username= root
 spring.datasource.password= panzhao
 #DATASOURCE
@@ -228,8 +228,8 @@ function countDown(name){
 <script>
 var updateLog = {
-	text: '<div class="updete_log"><p>1、当出场班次没有计划里程时，系统将下发下一个营运班次指令。</p><p>2、如果首班出场“待发时间”前3分钟没有收到驾驶员出场请求，系统将自动下发调度指令。</p></div>'
-	,title: '2016年8月27号凌晨更新日志'
+	text: '<div class="updete_log"><p>1、修正因设备状态异常导致的第一个营运班次被跳过问题。</p><p>2、修复发车信息微调报出的“未知异常”问题。</p></div>'
+	,title: '2016年8月28号更新日志'
 }
 var lineCodes = '' //全部线路编码字符串，由data.js初始化
@@ -87,14 +87,14 @@ var _home = (function() {
 			setTimeout(function() {
 				// 提示文本
-				var promptFlag = storage.getItem('promptFlag_0827');
+				var promptFlag = storage.getItem('promptFlag_0828');
 				if (!promptFlag) {
 					layer.alert(updateLog.text, {
 						title: updateLog.title,
 						area: ['410px', '250px'],
 						shift : 5
 					});
-					storage.setItem('promptFlag_0827', 1);
+					storage.setItem('promptFlag_0828', 1);
 				}
 			}, 1500);
 		}