update

潘钊
1 parent a683dca8
Showing 3 changed files with 37 additions and 9 deletions
src/main/java/com/bsth/data/gpsdata/arrival/handlers/InOutStationSignalHandle.java
src/main/java/com/bsth/data/schedule/SchAttrCalculator.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
@@ -163,10 +163,16 @@ public class InOutStationSignalHandle extends SignalHandle{
  
     private void outStationAndOutPark(ScheduleRealInfo sch){
         LineConfig config = lineConfigData.get(sch.getXlBm());
+        //限定出站既出场的停车场
+        String park = config.getTwinsPark();
+        boolean limitPark = StringUtils.isNotEmpty(park);
+
         if (config != null && config.getOutConfig() == 2) {
             //出站既出场
             ScheduleRealInfo schPrev = dayOfSchedule.prev(sch);
-            if (schPrev != null && schPrev.getBcType().equals("out")) {
+            if (schPrev != null && schPrev.getBcType().equals("out")
+                    && (!limitPark || park.equals(schPrev.getQdzCode()))) {
+
                 schPrev.setFcsjActualAll(sch.getFcsjActualTime());
                 schPrev.setZdsjActualAll(sch.getFcsjActualTime());
  
@@ -296,8 +302,14 @@ public class InOutStationSignalHandle extends SignalHandle{
      */
     private void inStationAndInPark(ScheduleRealInfo sch, ScheduleRealInfo next){
         LineConfig config = lineConfigData.get(sch.getXlBm());
-        if (next.getBcType().equals("in") &&
-                config != null && config.getOutConfig() == 2) {
+        //限定出站既出场的停车场
+        String park = config.getTwinsPark();
+        boolean limitPark = StringUtils.isNotEmpty(park);
+
+
+        if (next.getBcType().equals("in") && config.getOutConfig() == 2
+                && (!limitPark || park.equals(next.getZdzCode()))) {
+
             next.setFcsjActualAll(sch.getZdsjActualTime());
             next.setZdsjActualAll(sch.getZdsjActualTime());
  
@@ -197,12 +197,22 @@ public class SchAttrCalculator {
 		String lineCode = list.get(0).getXlBm();
 		LineConfig conf = lineConfigData.get(lineCode);
 		int outConfig = -1;
-		if(conf != null)
+		//限定出站既出场的停车场
+		String park = null;
+		if(conf != null){
 			outConfig = conf.getOutConfig();
+			park = conf.getTwinsPark();
+		}
+		boolean limitPark = StringUtils.isNotEmpty(park);
  
 		for(ScheduleRealInfo sch : list){
 			//如果是出站既出场，忽略出场班次
-			if(outConfig == 2 && sch.getBcType().equals("out"))
+			if(outConfig == 2 && sch.getBcType().equals("out")
+					&& (!limitPark || park.equals(sch.getQdzCode())))
+				continue;
+
+			//忽略烂班
+			if(sch.isDestroy())
 				continue;
  
 			//已执行
@@ -203,7 +203,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         try {
             List<String> idList = Lists.newArrayList(Splitter.on(',').trimResults().omitEmptyStrings().split(idsStr));
  
-            ScheduleRealInfo schedule = null, execSch, next;
+            ScheduleRealInfo schedule = null, next;
             for (String id : idList) {
                 schedule = dayOfSchedule.get(Long.parseLong(id));
                 if (schedule.isDestroy()) {
@@ -219,14 +219,17 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 dayOfSchedule.save(schedule);
                 rsList.add(schedule);
  
-                //如果正在执行当前班次，跳下一个班次
+                /*//如果正在执行当前班次，跳下一个班次
                 execSch = dayOfSchedule.executeCurr(schedule.getClZbh());
                 if(execSch != null && execSch.getId().equals(schedule.getId())){
                     next = dayOfSchedule.next(schedule);
                     dayOfSchedule.addExecPlan(next);
-                }
+                }*/
             }
  
+            //重新计算当前执行班次
+            dayOfSchedule.reCalcExecPlan(schedule.getClZbh());
+
             map.put("status", ResponseCode.SUCCESS);
         } catch (Exception e) {
             logger.error("", e);
@@ -368,8 +371,11 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             //更新起点应到时间
             List<ScheduleRealInfo> ts = dayOfSchedule.updateQdzTimePlan(t.getClZbh());
  
+            //重新计算车辆当前执行班次
+            dayOfSchedule.reCalcExecPlan(t.getClZbh());
  
-            rs.put("ts", ts);
+
+         rs.put("ts", ts);
             rs.put("t", t);
         } catch (Exception e) {
             logger.error("", e);