update

潘钊
1 parent f0a0253e
Showing 13 changed files with 152 additions and 225 deletions
src/main/java/com/bsth/controller/realcontrol/LineConfigController.java
src/main/java/com/bsth/data/gpsdata/GpsRealData.java
src/main/java/com/bsth/data/match/Arrival2Schedule.java
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/java/com/bsth/data/schedule/SchAttrCalculator.java
src/main/java/com/bsth/data/schedule/ScheduleComparator.java
src/main/java/com/bsth/entity/realcontrol/LineConfig.java
src/main/java/com/bsth/entity/realcontrol/ScheduleRealInfo.java
src/main/java/com/bsth/service/realcontrol/LineConfigService.java
src/main/java/com/bsth/service/realcontrol/impl/LineConfigServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/websocket/handler/SendUtils.java
src/main/resources/static/pages/control/lineConfig/config.html
@@ -34,4 +34,9 @@ public class LineConfigController extends BaseController&lt;LineConfig, Integer&gt;{
 	public Map<String, Object> editStartOptTime(@RequestParam String time,@RequestParam String lineCode){
 		return lineConfigService.editStartOptTime(time, lineCode);
 	}
+	
+	@RequestMapping(value = "/editOutTimeType", method = RequestMethod.POST)
+	public Map<String, Object> editOutTimeType(@RequestParam String lineCode, @RequestParam int type){
+		return lineConfigService.editOutTimeType(lineCode, type);
+	}
 }
@@ -63,7 +63,7 @@ public class GpsRealData implements CommandLineRunner{
 	@Override
 	public void run(String... arg0) throws Exception {
 		logger.info("gpsDataLoader,20,8");
-		Application.mainServices.scheduleWithFixedDelay(gpsDataLoader, 20, 8, TimeUnit.SECONDS);
+		//Application.mainServices.scheduleWithFixedDelay(gpsDataLoader, 20, 8, TimeUnit.SECONDS);
 	}
 	public static GpsEntity add(GpsEntity gps) {
@@ -158,7 +158,6 @@ public class Arrival2Schedule implements ApplicationContextAware {
 				//漂移判定
 				if(driftCheck(mr, arr)){
-					
 					mr.sch.setFcsjActualAll(mr.ts);
 					//通知客户端
 					sendUtils.sendFcsj(mr.sch);
@@ -62,15 +62,11 @@ public class DayOfSchedule implements CommandLineRunner {
 	public static LinkedList<ScheduleRealInfo> pstBuffer;
 	// 排序器
-	private static ScheduleComparator.FCNO schNoComparator;
-	//private static ScheduleComparator.FCSJ schFcsjComparator;
+	private static ScheduleComparator.FCSJ schFCSJComparator;
 	@Autowired
 	LineConfigData lineConfigData;
-	/*@Autowired
-	ScheduleRealInfoService scheduleRealService;*/
-	
 	@Autowired
 	ScheduleRealInfoRepository schRepository;
@@ -90,7 +86,7 @@ public class DayOfSchedule implements CommandLineRunner {
 		nbbmScheduleMap = ArrayListMultimap.create();
 		id2SchedulMap = new HashMap<>();
 		pstBuffer = new LinkedList<>();
-		schNoComparator = new ScheduleComparator.FCNO();
+		schFCSJComparator = new ScheduleComparator.FCSJ();
 		currSchDateMap = new HashMap<>();
 		nbbm2SEStationMap = TreeMultimap.create();
 	}
@@ -167,11 +163,18 @@ public class DayOfSchedule implements CommandLineRunner {
 			//添加到缓存
 			putAll(list);
-			//计算“起点站应到”时间
 			Set<String> cars = searchAllCars(list);
+			//计算“起点站应到”时间
 			for(String nbbm : cars)
 				schAttrCalculator.calcQdzTimePlan(nbbmScheduleMap.get(nbbm));
+			//是否是出站即出场
+			LineConfig conf = lineConfigData.get(lineCode);
+			if(conf.getOutConfig() == 2){
+				for(String nbbm : cars)
+					schAttrCalculator.connectOutSchedule(nbbmScheduleMap.get(nbbm));
+			}
+			
 			// 页面 翻班通知
 			sendUtils.shiftSchedule(lineCode);
 		} catch (Exception e) {
@@ -290,6 +293,9 @@ public class DayOfSchedule implements CommandLineRunner {
 						logger.error("loadPlanSch... 计算终点时间失败...");
 					}
 				}
+				//计划里程为0，直接清空
+				if(sch.getJhlc() != null && sch.getJhlc() == 0)
+					sch.setJhlc(null);
 			}
 		} catch (Exception e) {
 			logger.error("", e);
@@ -418,28 +424,6 @@ public class DayOfSchedule implements CommandLineRunner {
 		return next;
 	}
-	/**
-	 * 
-	 * @Title: prveRealSch
-	 * @Description: TODO(获取上一个已实际发出的班次)
-	 */
-/*	public ScheduleRealInfo prveSjfc(ScheduleRealInfo sch) {
-		List<ScheduleRealInfo> list = nbbmScheduleMap.get(sch.getClZbh());
-		// 排序
-		Collections.sort(list, schNoComparator);
-
-		ScheduleRealInfo prve = null;
-
-		int i = list.indexOf(sch);
-		for (; i >= 0; i--){
-			if (list.get(i).getFcsjActual() != null){
-				prve = list.get(i);
-				break;
-			}
-		}
-		return prve;
-	}*/
-
 	public void put(ScheduleRealInfo sch) {
 		schAttrCalculator
 			.calcRealDate(sch)
@@ -466,7 +450,7 @@ public class DayOfSchedule implements CommandLineRunner {
 	public List<ScheduleRealInfo> nextAll(ScheduleRealInfo sch) {
 		List<ScheduleRealInfo> list = nbbmScheduleMap.get(sch.getClZbh());
 		// 排序
-		Collections.sort(list, schNoComparator);
+		Collections.sort(list, schFCSJComparator);
 		List<ScheduleRealInfo> rs = new ArrayList<>();
 		ScheduleRealInfo temp;
@@ -554,33 +538,6 @@ public class DayOfSchedule implements CommandLineRunner {
 		pstBuffer.add(sch);
 	}
-	/**
-	 * 
-	 * @Title: outSch 
-	 * @Description: TODO(出场班次) 
-	 */
-/*	public List<ScheduleRealInfo> outSch(String nbbm){
-		List<ScheduleRealInfo> all = nbbmScheduleMap.get(nbbm)
-					,outList = new ArrayList<>();
-		
-		for(ScheduleRealInfo sch : all){
-			if(sch.getBcType().equals("out"))
-				outList.add(sch);
-		}
-		return outList;
-	}
-	
-	public ScheduleRealInfo nextOut(String nbbm){
-		List<ScheduleRealInfo> list = outSch(nbbm);
-		Collections.sort(list, schNoComparator);
-		ScheduleRealInfo sch = null;
-		for(ScheduleRealInfo temp : list){
-			if(temp.getFcsjActual() == null)
-				sch = temp;
-		}
-		
-		return sch;
-	}*/
 	/**
 	 * 
@@ -590,7 +547,7 @@ public class DayOfSchedule implements CommandLineRunner {
 	public ScheduleRealInfo nextByBcType(String nbbm, String bcType){
 		List<ScheduleRealInfo> list = findByBcType(nbbm, bcType);
-		Collections.sort(list, schNoComparator);
+		Collections.sort(list, schFCSJComparator);
 		ScheduleRealInfo sch = null;
 		for(ScheduleRealInfo temp : list){
 			if(temp.getFcsjActual() == null)
@@ -87,7 +87,7 @@ public class SchAttrCalculator {
 	 * @Description: TODO(计算班次的起点应到时间，list 必须是同一辆车的班次) 
 	 */
 	public void calcQdzTimePlan(List<ScheduleRealInfo> list){
-		Collections.sort(list, new ScheduleComparator.FCNO());
+		Collections.sort(list, new ScheduleComparator.FCSJ());
 		int len = list.size();
 		if(len == 0)
@@ -102,6 +102,34 @@ public class SchAttrCalculator {
 			prve = curr;
 		}
 	}
+	
+	/**
+	 * 
+	 * @Title: connectOutSchedule 
+	 * @Description: TODO(关联出场班次) 
+	 */
+	public void connectOutSchedule(List<ScheduleRealInfo> list){
+		Collections.sort(list, new ScheduleComparator.FCSJ());
+		
+		int len = list.size();
+		if(len == 0)
+			return;
+		
+		ScheduleRealInfo prve = list.get(0), curr;
+		for(int i = 1; i < len; i ++){
+			curr = list.get(i);
+			
+			//出站即出场关联
+			if(prve.getBcType().equals("out") && prve.getJhlc() == null)
+				curr.setTwinsSch(prve);
+			
+			//进站即进场关联
+			if(curr.getBcType().equals("in") && curr.getJhlc() == null)
+				prve.setTwinsSch(curr);
+			
+			prve = curr;
+		}
+	}
 	public SchAttrCalculator calcFcsjTime(ScheduleRealInfo sch) throws ParseException {
 		sch.setFcsjT(DateUtils.sdfyyyyMMddHHmm.parse(sch.getRealExecDate() + sch.getFcsj()).getTime());
@@ -14,12 +14,12 @@ import com.bsth.entity.realcontrol.ScheduleRealInfo;
  */
 public class ScheduleComparator {
-	public static class FCNO implements Comparator<ScheduleRealInfo>{
+/*	public static class FCNO implements Comparator<ScheduleRealInfo>{
 		@Override
 		public int compare(ScheduleRealInfo s1, ScheduleRealInfo s2) {
 			return s1.getFcno() - s2.getFcno();
 		}
-	}
+	}*/
 	public static class FCSJ  implements Comparator<ScheduleRealInfo>{
@@ -55,10 +55,10 @@ public class LineConfig {
 	/** 托管状态 */
 	private boolean trust;
-	/** 出场时间设置 0：真实出场（设备离开缓冲区时间） 1：请求出场时间 */
+	/** 出场时间设置 0：真实出场（设备离开缓冲区时间） 1：请求出场时间 2：出站即出场 */
 	private int outConfig;
-	/** 进场时间设置 0：真实进场（设备进入缓冲区时间） 1：请求进场时间 */
+	/** 进场时间设置 0：真实进场（设备进入缓冲区时间） 1：请求进场时间  2：出站即出场*/
 	private int inConfig;
 	/** 短语模板 , 号分隔多个 */
@@ -102,19 +102,10 @@ public class ScheduleRealInfo {
 	 */
 	private String bcType;
-	/** 设备请求出场或进场时间（班次为 出场或进场 时，该字段可能有值） 
-	private Long devRequestTime;*/
-	
-	/** 停车场既首发站  */
-	@Transient
-	private boolean parkIsFirstStation;
-	/** 首发站既停车场  */
-	@Transient
-	private boolean firstStationIsPark;
-	/** 与其共享发车时间的进出场班次  */
+	/** 出站即出场 ， 关联的进出场班次  */
 	@JsonIgnore
 	@Transient
-	private ScheduleRealInfo twins;
+	private ScheduleRealInfo twinsSch;
 	/** 创建人 */
 	@JsonIgnore
@@ -539,35 +530,6 @@ public class ScheduleRealInfo {
 		}
 	}
-	/**
-	 * @throws ParseException 
-	 * 
-	 * @Title: syncTime 
-	 * @Description: TODO(根据计发时间，计算待发时间和终点时间) 
-	 * @param     设定文件 
-	 * @return void    返回类型 
-	 * @throws
-	
-	public void syncTime(){
-		try{
-			this.setDfsj(this.getFcsj());
-			//发车时间戳
-			this.setFcsjT(sdfyyyyMMddHHmm.parse(this.realExecDate + " " + this.getFcsj()).getTime());
-			//待发时间戳
-			this.setDfsjT(this.getFcsjT());
-			//计算终点时间
-			calcEndTime();
-			
-			if(this.fcsjActual != null)
-				this.setFcsjActualAll(this.fcsjActual);
-			
-			if(this.zdsjActual != null)
-				this.setZdsjActualAll(this.zdsjActual);
-		}catch(Exception e){
-			e.printStackTrace();
-		}
-	} */
-	
 	public void calcEndTime(){
 		//计划终点时间
 		if(this.getBcsj() != null){
@@ -671,21 +633,6 @@ public class ScheduleRealInfo {
 		calcStatus();
 	}
-	//和依赖班次同步发车时间
-/*	public void synchroFcsj(){
-		if(this.isFirstStationIsPark() || this.isParkIsFirstStation()){
-			ScheduleRealInfo twinsSch = this.twins;
-			if(null != twinsSch){
-				//有关联的出场班次
-				twinsSch.setFcsjActual(this.fcsjActual);
-				twinsSch.setFcsjActualTime(this.fcsjActualTime);
-				if(null != twinsSch.getSjfcModel())
-					twinsSch.getSjfcModel().setPersonTime(this.fcsjActualTime);
-				twinsSch.calcStatus();
-			}
-		}
-	}*/
-	
 	/**
 	 * 
 	 * @Title: setFcsjActualAll 
@@ -718,19 +665,6 @@ public class ScheduleRealInfo {
 		}
 	}
-	//和依赖的进场班次同步终点时间
-/*	public void synchroZdsj(){
-		if(this.isFirstStationIsPark()){
-			ScheduleRealInfo twinsSch = this.twins;
-			if(null != twinsSch && twinsSch.getBcType().equals("in")){
-				//有关联的进场班次
-				twinsSch.setFcsjActual(this.zdsjActual);
-				twinsSch.setFcsjActualTime(this.zdsjActualTime);
-				twinsSch.calcStatus();
-			}
-		}
-	}*/
-
 	public Long getSpId() {
 		return spId;
 	}
@@ -755,9 +689,9 @@ public class ScheduleRealInfo {
 		if(StringUtils.isNotBlank(this.fcsjActual)){
 			this.status = 1;
-			//进出场班次并且没有终点时间的
+			//进出场班次并且没有计划里程的
 			if((this.bcType.equals("out") || this.bcType.equals("in"))
-					&& this.zdsj == null){
+					&& this.jhlc == null){
 				this.status = 2;
 			}
 		}
@@ -792,60 +726,12 @@ public class ScheduleRealInfo {
 	public void setScheduleDateStr(String scheduleDateStr) {
 		this.scheduleDateStr = scheduleDateStr;
 	}
-
-	public boolean isParkIsFirstStation() {
-		return parkIsFirstStation;
-	}
-
-	public void setParkIsFirstStation(boolean parkIsFirstStation) {
-		this.parkIsFirstStation = parkIsFirstStation;
-	}
-
-/*	public ScheduleRealInfo getTwins() {
-		return twins;
-	}
-
-	public void setTwins(ScheduleRealInfo twins) {
-		this.twins = twins;
-	}
-
-	public boolean isFirstStationIsPark() {
-		return firstStationIsPark;
-	}
-
-	public void setFirstStationIsPark(boolean firstStationIsPark) {
-		this.firstStationIsPark = firstStationIsPark;
-	}*/
-	
-	
-	/*public boolean statusTostart(){
-		return this.getFcsjActual() == null
-				&& this.getSjfcModel().getTime() != null;
-	}
-	
-	public boolean statusToEnd(){
-		return this.getZdsjActual() == null
-				&& this.getSjddModel().getTime() != null;
-	}
-
-	public void revokeRealOutgo() {
-		//this.setStatus(0);
-		this.setFcsjActual(null);
-		this.setFcsjActualTime(null);
-		if(null != this.getSjfcModel())
-			this.getSjfcModel().resetNull();
-		this.calcStatus();
-	}*/
 	public void clearFcsjActual(){
 		this.setFcsjActual(null);
 		this.setFcsjActualTime(null);
 		this.calcStatus();
 	}
-
-/*	public boolean existDependent() {
-		return this.isFirstStationIsPark() || this.parkIsFirstStation;
-	}*/
 	//清除实际终点时间
 	public void clearZdsjActual(){
@@ -862,4 +748,12 @@ public class ScheduleRealInfo {
 	public void setOpDirectiveState(Integer opDirectiveState) {
 		this.opDirectiveState = opDirectiveState;
 	}
+
+	public ScheduleRealInfo getTwinsSch() {
+		return twinsSch;
+	}
+
+	public void setTwinsSch(ScheduleRealInfo twinsSch) {
+		this.twinsSch = twinsSch;
+	}
 }
@@ -13,4 +13,6 @@ public interface LineConfigService extends BaseService&lt;LineConfig, Integer&gt;{
 	Map<String, Object> editStartOptTime(String time, String lineCode);
+	Map<String, Object> editOutTimeType(String lineCode, int type);
+
 }
@@ -64,4 +64,18 @@ public class LineConfigServiceImpl extends BaseServiceImpl&lt;LineConfig, Integer&gt; 
 		rs.put("time", time);
 		return rs;
 	}
+
+	@Override
+	public Map<String, Object> editOutTimeType(String lineCode, int type) {
+		Map<String, Object> rs = new HashMap<>();
+		LineConfig conf = lineConfigData.get(lineCode);
+		
+		conf.setOutConfig(type);
+		conf.setInConfig(type);
+		lineConfigData.set(conf);
+		
+		rs.put("status", ResponseCode.SUCCESS);
+		rs.put("type", type);
+		return rs;
+	}
 }
@@ -712,7 +712,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 			}
 			else{
 				// 按发车时间排序
-				Collections.sort(list, new ScheduleComparator.FCNO());
+				Collections.sort(list, new ScheduleComparator.FCSJ());
 				// 以第一个实际发车/待发时间为起点，调整间隔
 				sch = list.get(0);
@@ -14,6 +14,7 @@ import org.springframework.stereotype.Component;
 import com.alibaba.fastjson.JSONObject;
 import com.bsth.data.BasicData;
+import com.bsth.data.LineConfigData;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.entity.directive.D80;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
@@ -24,6 +25,9 @@ public class SendUtils{
 	@Autowired
 	private RealControlSocketHandler socketHandler;
+	
+	@Autowired
+	LineConfigData lineConfigData;
 	private static SimpleDateFormat sdf = new SimpleDateFormat("HH:mm");
@@ -33,17 +37,19 @@ public class SendUtils{
 	 * @throws JsonProcessingException
 	 *             TODO(推送发车信息)
 	 */
-	public void sendFcsj(ScheduleRealInfo schedule) {
-
+	public void sendFcsj(ScheduleRealInfo sch) {
+		//处理出站即出场的班次
+		connectOutSchTime(sch);
+		
 		Map<String, Object> map = new HashMap<>();
 		map.put("fn", "faChe");
-		map.put("t", schedule);
+		map.put("t", sch);
 		map.put("dataStr", sdf.format(new Date()));
 		ObjectMapper mapper = new ObjectMapper();
 		try {
-			socketHandler.sendMessageToLine(schedule.getXlBm(), mapper.writeValueAsString(map));
+			socketHandler.sendMessageToLine(sch.getXlBm(), mapper.writeValueAsString(map));
 		} catch (Exception e) {
 			logger.error("", e);
 		}
@@ -77,11 +83,13 @@ public class SendUtils{
 	 * 			@throws NumberFormatException @Title: sendFcsj @Description:
 	 *             TODO(推送到达终点时间) @param @param schedule 班次 @throws
 	 */
-	public void sendZdsj(ScheduleRealInfo schedule, ScheduleRealInfo nextSch, int finish) {
+	public void sendZdsj(ScheduleRealInfo sch, ScheduleRealInfo nextSch, int finish) {
+		//处理进站即进场的班次
+		connectInSchTime(sch);
 		Map<String, Object> map = new HashMap<>();
 		map.put("fn", "zhongDian");
-		map.put("t", schedule);
+		map.put("t", sch);
 		map.put("nt", nextSch);
 		map.put("finish", finish);
 		map.put("dataStr", sdf.format(new Date()));
@@ -89,7 +97,7 @@ public class SendUtils{
 		ObjectMapper mapper = new ObjectMapper();
 		try {
-			socketHandler.sendMessageToLine(schedule.getXlBm(), mapper.writeValueAsString(map));
+			socketHandler.sendMessageToLine(sch.getXlBm(), mapper.writeValueAsString(map));
 		} catch (Exception e) {
 			logger.error("", e);
 		}
@@ -141,5 +149,36 @@ public class SendUtils{
 		refreshSch(list);
 	}
-	//public void sendReportOutTime(ScheduleRealInfo sch)
+	
+	//出站即出场
+	public void connectOutSchTime(ScheduleRealInfo sch){
+		try{
+			ScheduleRealInfo twins = sch.getTwinsSch();
+			if(twins != null
+					&& lineConfigData.get(sch.getXlBm()).getOutConfig() == 2){
+				
+				twins.setFcsjActualAll(sch.getFcsjActualTime());
+				//刷新关联的出场班次
+				refreshSch(twins);
+			}
+		}catch(Exception e){
+			logger.error("", e);
+		}
+	}
+	
+	//进站即出场
+	public void connectInSchTime(ScheduleRealInfo sch){
+		try{
+			ScheduleRealInfo twins = sch.getTwinsSch();
+			if(twins != null
+					&& lineConfigData.get(sch.getXlBm()).getOutConfig() == 2){
+				
+				twins.setZdsjActualAll(sch.getZdsjActualTime());
+				//刷新关联的出场班次
+				refreshSch(twins);
+			}
+		}catch(Exception e){
+			logger.error("", e);
+		}
+	}
 }
@@ -211,23 +211,14 @@ butto.line-config-btn:active{
 	  </div>
 	</section>
-	<!--<section>
-	  <h3>出场时间</h3>
-	
-	  <div class="settings-row" >
-	    <p > 使用 <a href="javascript:;" data-type="select" id="outTimeType"></a> 作为出场班次的实际时间。</p>
-	  </div>
-	</section>
--->
-<!--
 	<section>
-	  <h3>进场时间</h3>
+	  <h3>班次进出场时间</h3>
 	  <div class="settings-row" >
-	    <p > 使用 <a href="javascript:;" data-type="select" id="inTimeType"></a> 作为进场班次的实际时间。</p>
+	    <p > 使用 <a href="javascript:;" data-type="select" id="outTimeType"></a> 时间作为出场班次的实际时间。</p>
 	  </div>
 	</section>
--->
+
 </form>
 </script>
@@ -305,7 +296,6 @@ butto.line-config-btn:active{
 		//运营开始时间
 		$('#startOptTimeLink').editable({
 			 type: 'time',
-			 title:'修改线路运营开始时间',
 			 placement: 'right',
 			 display: false,
 			 validate: function(value){
@@ -316,42 +306,41 @@ butto.line-config-btn:active{
 		})
 		.on('save', function(e, params) {
 			var index = showLoad('提交数据...');
-		    var lineCode = $('.line_config_tree li.selected').data('code');
-		    $post('/lineConfig/editTime', {lineCode: lineCode, time: params.newValue}
+		    $post('/lineConfig/editTime', {lineCode: getLineCode(), time: params.newValue}
 		    	,function(rs){
 		    		layer.close(index);
 		    		$('#startOptTimeLink').text(rs.time);
 		    	});
 		});
-/* 		//出场时间类型
+		//进出场时间类型
         $('#outTimeType').editable({
         	value: conf.outConfig,
             inputclass: 'form-control',
             placement: 'right',
             source: [{
                 value: 0,
-                text: '离开缓冲区时间'
+                text: 'gps出场'
             }, {
                 value: 1,
-                text: '请求出场时间'
-            }]
-        });
-		
-		//进场时间类型
-        $('#inTimeType').editable({
-        	value: conf.inConfig,
-            inputclass: 'form-control',
-            placement: 'right',
-            source: [{
-                value: 0,
-                text: '离开缓冲区时间'
+                text: '请求出场'
             }, {
-                value: 1,
-                text: '请求进场时间'
+            	value: 2,
+            	text: '出站即出场'
             }]
-        }); */
-        
+        })
+        .on('save', function(e, params) {
+			var index = showLoad('提交数据...');
+		   $post('/lineConfig/editOutTimeType', {lineCode: lineCode, type: params.newValue}
+		    	,function(rs){
+		    		layer.close(index);
+		    		$('#outTimeType').val(rs.type);
+		    });
+		});
+	}
+	
+	function getLineCode(){
+		return $('.line_config_tree li.selected').data('code');
 	}
 }();
 </script>
 \ No newline at end of file