加入真实时间

潘钊
1 parent bb31fd8f
Showing 8 changed files with 84 additions and 14 deletions
src/main/java/com/bsth/StartCommand.java
src/main/java/com/bsth/entity/realcontrol/ScheduleRealInfo.java
src/main/java/com/bsth/service/realcontrol/buffer/ScheduleBuffer.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/util/DateUtils.java
src/main/resources/static/pages/control/line/child_pages/child_task.html
src/main/resources/static/pages/control/line/js/alone.js
src/main/resources/static/pages/control/line/js/data.js
@@ -50,6 +50,8 @@ public class StartCommand implements CommandLineRunner{
 	@Autowired
 	FirstScheduleIssuedThread firstScheduleIssuedThread;
  
+	static Long hourTime = 1000 * 60 * 60L;
+	
 	@Override
 	public void run(String... arg0){
  
@@ -64,12 +66,12 @@ public class StartCommand implements CommandLineRunner{
 			scheduler.scheduleWithFixedDelay(gpsRefreshThread, 0, 8, TimeUnit.SECONDS);
  
 			/**
-			 * 每天 0点 抓取当天实际排班
+			 * 每天 凌晨 2 点 抓取当天实际排班
 			 */
 			//启动时先run一次
 			getSchedulePlanThread.start();
 			scheduler.scheduleAtFixedRate(getSchedulePlanThread
-					, DateUtils.getTimesnight() + 5 - System.currentTimeMillis() / 1000
+					, ((DateUtils.getTimesnight2() + hourTime * 2) - System.currentTimeMillis()) / 1000
 					, 60 * 60 * 24, TimeUnit.SECONDS);
  
 			/**
@@ -24,6 +24,9 @@ public class ScheduleRealInfo {
  
 	/** 排班计划日期 */
 	private Date scheduleDate;
+	
+	/** 真实执行时间 yyyy-MM-dd */
+	private String realExecDate;
  
 	/** 线路名称 */
 	private String xlName;
@@ -485,7 +488,7 @@ public class ScheduleRealInfo {
 	public void setDfsjAll(String dfsj) {
  
 		try {
-			String dfsjFull = sdfyyyyMMdd.format(this.scheduleDate) + " " + dfsj;
+			String dfsjFull = this.realExecDate + " " + dfsj;
 			this.dfsjT = sdfyyyyMMddHHmm.parse(dfsjFull).getTime();
 			this.dfsj = dfsj;
 		} catch (ParseException e) {
@@ -504,7 +507,7 @@ public class ScheduleRealInfo {
 	 * @throws ParseException 
 	 * 
 	 * @Title: syncTime 
-	 * @Description: TODO(计算时间戳，待发时间为计发时间) 
+	 * @Description: TODO(根据计发时间，计算待发时间和终点时间) 
 	 * @param     设定文件 
 	 * @return void    返回类型 
 	 * @throws
@@ -513,7 +516,7 @@ public class ScheduleRealInfo {
 		try{
 			this.setDfsj(this.getFcsj());
 			//发车时间戳
-			this.setFcsjT(sdfyyyyMMddHHmm.parse(sdfyyyyMMdd.format(this.scheduleDate) + " " + this.getFcsj()).getTime());
+			this.setFcsjT(sdfyyyyMMddHHmm.parse(this.realExecDate + " " + this.getFcsj()).getTime());
 			//待发时间戳
 			this.setDfsjT(this.getFcsjT());
  
@@ -582,6 +585,17 @@ public class ScheduleRealInfo {
  
 	/**
 	 * 
+	 * @Title: setFcsjAll 
+	 * @Description: TODO(设置计划发车时间) 
+	 * @throws
+	 */
+	public void setFcsjAll(Long fcsjT){
+		this.fcsjT = fcsjT;
+		this.fcsj = sdfHHmm.format(new Date(fcsjT));
+	}
+	
+	/**
+	 * 
 	 * @Title: setFcsjActualAll 
 	 * @Description: TODO(设置实际发车时间) 
 	 * @throws
@@ -639,4 +653,12 @@ public class ScheduleRealInfo {
 	public void setSpId(Long spId) {
 		this.spId = spId;
 	}
+
+	public String getRealExecDate() {
+		return realExecDate;
+	}
+
+	public void setRealExecDate(String realExecDate) {
+		this.realExecDate = realExecDate;
+	}
 }
 package com.bsth.service.realcontrol.buffer;
  
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
@@ -71,6 +73,8 @@ public class ScheduleBuffer {
  
 	static ScheduleComparator scheduleComparator = new ScheduleComparator();
  
+	static final Long DAY_TIME = 1000 * 60 * 60 * 24L;
+	
 	static{
 		clear();
 	}
@@ -86,10 +90,13 @@ public class ScheduleBuffer {
 	}
  
 	public static int init(List<ScheduleRealInfo> list){
+		SimpleDateFormat sdfyyyyMMdd = new SimpleDateFormat("yyyy-MM-dd");
  
 		try{
 			//计算时间戳
 			for(ScheduleRealInfo schedul : list){
+				//真实日期默认是排班日期
+				schedul.setRealExecDate(sdfyyyyMMdd.format(schedul.getScheduleDate()));
 				schedul.syncTime();
 			}
  
@@ -98,18 +105,18 @@ public class ScheduleBuffer {
  
 			String zbh;
 			for(ScheduleRealInfo schedul : list){
+				
 				schedulListMap.put(schedul.getXlBm(), schedul);
 				pkSchedulMap.put(schedul.getId(), schedul);
  
 				//初始化车辆和班次列表对照
 				zbh = schedul.getClZbh();
 				vehSchListMap.put(zbh, schedul);
-				/*if(!vehLinkedMap.containsKey(zbh))
-					vehLinkedMap.put(zbh, new LinkedList<ScheduleRealInfo>());
-				
-				vehLinkedMap.get(zbh).add(schedul);*/
 			}
  
+			//计算计划发车真实时间
+			calcRealOutTime();
+			
 			//计算起点应到时间
 			Set<String> codes = schedulListMap.keySet();
 			for(String code : codes)
@@ -117,6 +124,7 @@ public class ScheduleBuffer {
  
 			//计算班次平均间隔
 			calcAvgSpace();
+			
 		}catch(Exception e){
 			logger.error("缓存排班数据失败...", e);
 			return -1;
@@ -124,6 +132,29 @@ public class ScheduleBuffer {
 		return 0;
 	}
  
+	private static void calcRealOutTime() {
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+		Set<String> keys = vehSchListMap.keySet();
+		
+		List<ScheduleRealInfo> list;
+		ScheduleRealInfo schedule;
+		for(String key : keys){
+			list = vehSchListMap.get(key);
+			
+			//发车顺序号排序
+			Collections.sort(list, scheduleComparator);
+			for(int i = 0; i < list.size(); i ++){
+				schedule = list.get(i);
+				if(i > 0 && schedule.getFcsjT() < list.get(i - 1).getFcsjT()){
+					//加一天
+					schedule.setFcsjAll(schedule.getFcsjT() + DAY_TIME);
+					schedule.setRealExecDate(sdf.format(new Date(schedule.getFcsjT())));
+					schedule.syncTime();
+				}
+			}
+		}
+	}
+
 	//计算平均间隔
 	public static void calcAvgSpace(){
 		schSpaceMap = new HashMap<>();
@@ -99,7 +99,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 		try {
  
 			ScheduleRealInfo schedule = ScheduleBuffer.pkSchedulMap.get(id);
-			schedule.setDfsjT(sdfMinute.parse(sdfMonth.format(new Date()) + " " + dfsj).getTime());
+			schedule.setDfsjT(sdfMinute.parse(schedule.getRealExecDate() + " " + dfsj).getTime());
 			schedule.setDfsj(dfsj);
 			schedule.addRemarks(remarks + ";");
 			schedule.setClZbh(nbbm);
@@ -465,7 +465,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 		Map<String, Object> rs = new HashMap<>();
 		try {
 			ScheduleRealInfo sch = ScheduleBuffer.findOne(id);
-			String rq = sdfMonth.format(sch.getScheduleDate());
+			String rq = sdfMonth.format(sch.getRealExecDate());
  
 			sch.setFcsjActualTime(sdfMinute.parse(rq + " " + fcsjActual).getTime());
 			sch.setFcsjActual(fcsjActual);
@@ -32,6 +32,16 @@ public class DateUtils {
 		return (int) (cal.getTimeInMillis() / 1000);
 	}
  
+	// 获得当天24点时间 毫秒
+	public static Long getTimesnight2() {
+		Calendar cal = Calendar.getInstance();
+		cal.set(Calendar.HOUR_OF_DAY, 24);
+		cal.set(Calendar.SECOND, 0);
+		cal.set(Calendar.MINUTE, 0);
+		cal.set(Calendar.MILLISECOND, 0);
+		return cal.getTimeInMillis();
+	}
+	
 	public static Long getTimesnight(Calendar cal) {
 		cal.set(Calendar.HOUR_OF_DAY, 24);
 		cal.set(Calendar.SECOND, 0);
@@ -436,13 +436,16 @@ $(function(){
 	$('.confirm', schAddPanel).on('click', function(){
 		var f = $('form', schAddPanel);
 		var param = f.serializeJSON();
-		/** 页面组装数据 */
 		//线路
 		param.xlBm = lineSelect.val();
 		param.xlName = _data.getLineIds()[param.xlBm];
 		//路牌
 		param.lpName = lpSelect.val();
 		//拆分驾驶员工号和姓名
+		if(!param.jGh){
+			layer.alert('驾驶员不能为空！', {icon: 2, title: '提交失败'});
+			return;
+		}
 		param.jName = param.jGh.split('/')[1];
 		param.jGh = param.jGh.split('/')[0];
  
@@ -148,6 +148,9 @@ var _alone = (function(){
 	}
  
 	function splitDir(list){
+		/*list.sort(function(a, b){
+			return a.fcno - b.fcno;
+		});*/
 		var rs = {up: [], down: []};
 		$.each(list, function(){
 			if(this.xlDir == upCode)
@@ -29,8 +29,7 @@ var _data = (function(){
 	var carDeviceIdMapp = {};
  
 	var fcsjSort = function(a, b){
-		//return a.fcsjT - b.fcsjT;
-		return a.fcno - b.fcno;
+		return a.fcsjT - b.fcsjT;
 	}
  
 	var dataObject = {