Merge branch 'pudong' of http://222.66.0.204:8090/panzhaov5/bsth_control

into pudong

Merge branch 'pudong' of http://222.66.0.204:8090/panzhaov5/bsth_control
into pudong
廖磊
2 parents e7f80413 69aab057
Showing 11 changed files with 26 additions and 27 deletions
src/main/java/com/bsth/XDApplication.java
src/main/java/com/bsth/data/forecast/ArrivalDataLoader.java
src/main/java/com/bsth/data/gpsdata/arrival/GpsRealAnalyse.java
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/java/com/bsth/data/schedule/auto_exec/RealScheduleAutoExecHandler.java
src/main/java/com/bsth/data/schedule/late_adjust/LateAdjustHandle.java
src/main/java/com/bsth/entity/realcontrol/LineConfig.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/static/real_control_v2/fragments/north/nav/directive_history.html
src/main/resources/static/real_control_v2/js/forms/form_embed.js
src/main/resources/static/real_control_v2/js/main.js
@@ -131,14 +131,14 @@ public class XDApplication implements CommandLineRunner {
         ScheduledExecutorService sexec = Application.mainServices;
         /** 线调业务 */
-        sexec.scheduleWithFixedDelay(scheduleRefreshThread, 15, 240, TimeUnit.SECONDS);//班次更新线程
+        sexec.scheduleWithFixedDelay(scheduleRefreshThread, 10, 120, TimeUnit.SECONDS);//班次更新线程
         sexec.scheduleWithFixedDelay(scheduleLateThread, 70, 30, TimeUnit.SECONDS);//检查班次误点
         sexec.scheduleWithFixedDelay(gpsDataLoader, 100, 2, TimeUnit.SECONDS);//抓取GPS数据
         sexec.scheduleWithFixedDelay(offlineMonitorThread, 120, 60, TimeUnit.SECONDS);//GPS设备掉离线
         sexec.scheduleWithFixedDelay(schedulePstThread, 120, 10, TimeUnit.SECONDS);//班次延迟入库线程
         sexec.scheduleWithFixedDelay(seiPstThread, 160, 60, TimeUnit.SECONDS);//班次修正日志入库
-        sexec.scheduleWithFixedDelay(directivesPstThread, 180, 100, TimeUnit.SECONDS);//调度指令延迟入库
+        sexec.scheduleWithFixedDelay(directivesPstThread, 180, 120, TimeUnit.SECONDS);//调度指令延迟入库
         sexec.scheduleWithFixedDelay(threadMonotor, 240, 60, TimeUnit.SECONDS);//线程监听（防止重要的线程阻塞、异常结束。以及部分主备切换工作）
         sexec.scheduleWithFixedDelay(sampleTimeDataLoader, 140, 120 * 60, TimeUnit.SECONDS);//到离站预测需要的站点间耗时数据
         sexec.scheduleWithFixedDelay(basicDataLoader, 2, 2, TimeUnit.HOURS);//基础数据更新
@@ -3,7 +3,6 @@ package com.bsth.data.forecast;
 import com.bsth.data.BasicData;
 import com.bsth.data.LineConfigData;
 import com.bsth.data.forecast.entity.ArrivalEntity;
-import com.bsth.entity.realcontrol.LineConfig;
 import com.bsth.util.db.DBUtils_MS;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -16,7 +15,6 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Calendar;
-import java.util.Collection;
 import java.util.List;
 /**
@@ -43,7 +41,7 @@ public class ArrivalDataLoader {
 	 * 
 	 * @Title: load 
 	 * @Description: TODO(根据上次加载时间，查询之后的增量数据) 
-	 */
+
 	public List<ArrivalEntity> load(){
 		List<ArrivalEntity> list = null;
@@ -79,13 +77,13 @@ public class ArrivalDataLoader {
 			}
 		}
 		return list;
-	}
+	}*/
 	/**
 	 * 
 	 * @Title: recovery 
 	 * @Description: TODO(从数据库恢复数据，按照线路的开始运营时间恢复) 
-	 */
+
 	public List<ArrivalEntity> recovery(){
 		Collection<LineConfig> confs = lineConfigData.getAll();
 		long t = System.currentTimeMillis()
@@ -105,7 +103,7 @@ public class ArrivalDataLoader {
 		prveLoadTime = t;
 		return all;
-	}
+	}*/
 	/**
 	 * 
@@ -41,7 +41,7 @@ public class GpsRealAnalyse {
     @Autowired
     GpsRealData gpsRealData;
-    final static int POOL_SIZE = 30;
+    final static int POOL_SIZE = 25;
     static ExecutorService threadPool = Executors.newFixedThreadPool(POOL_SIZE + 1);
     public static long st;
@@ -14,7 +14,6 @@ import com.bsth.entity.schedule.SchedulePlanInfo;
 import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
 import com.bsth.service.schedule.SchedulePlanInfoService;
 import com.bsth.util.BatchSaveUtils;
-import com.bsth.util.DateUtils;
 import com.bsth.websocket.handler.SendUtils;
 import com.google.common.base.Predicate;
 import com.google.common.collect.ArrayListMultimap;
@@ -136,14 +135,15 @@ public class DayOfSchedule {
      * @Description: TODO(计算线路当前应该使用的排班日期)
      */
     public String calcSchDate(String lineCode) {
+        Long t = System.currentTimeMillis();
         LineConfig conf = lineConfigData.get(lineCode);
-        long ct = System.currentTimeMillis();
-        String schDate = fmtyyyyMMdd.print(ct);
         // 小于当天起始运营时间,则取前一天的排班
-        if (ct < conf.getCurrStartTime())
-            schDate = DateUtils.subtractDay(schDate, 1);
+        String ct = fmtHHmm.print(t);
+        if(ct.compareTo(conf.getStartOpt()) < 0)
+            t -= 1000 * 60 * 60 * 24;
+        String schDate = fmtyyyyMMdd.print(t);
         return schDate;
     }
@@ -4,6 +4,7 @@ import com.bsth.data.gpsdata.status_manager.GpsStatusManager;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.websocket.handler.SendUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -29,20 +30,21 @@ public class RealScheduleAutoExecHandler {
         boolean flag = false;
         long t = System.currentTimeMillis();
-        if (sch.getDfsjT() < t) {
+        if (StringUtils.isEmpty(sch.getFcsjActual()) && sch.getDfsjT() < t) {
             sch.setFcsjActualAll(sch.getDfsjT());
             flag = true;
         }
-        if (sch.getZdsjT() < t) {
+        if (StringUtils.isEmpty(sch.getZdsjActual()) && sch.getZdsjT() < t) {
             sch.setZdsjActualAll(sch.getZdsjT());
             //准备执行下一个班次
             ScheduleRealInfo next = dayOfSchedule.next(sch);
             if (next != null) {
+                dayOfSchedule.addExecPlan(next);
                 //套跑  -下发线路切换指令
                 if(!next.getXlBm().equals(sch.getXlBm())){
-                    gpsStatusManager.changeLine(next.getClZbh(), next.getXlBm(), "套跑@系统");
+                    gpsStatusManager.changeLine(next.getClZbh(), next.getXlBm(), "auto@系统");
                 }
             }
@@ -60,6 +62,7 @@ public class RealScheduleAutoExecHandler {
         }
         if (flag) {
+            dayOfSchedule.save(sch);
             sendUtils.refreshSch(sch);
         }
     }
@@ -50,7 +50,7 @@ public class LateAdjustHandle implements ApplicationContextAware{
     public static void putLate(ScheduleRealInfo sch){
         try {
             //出场班次不需要
-            if(/*sch.getBcType().equals("in") || */sch.getBcType().equals("out"))
+            if(sch.getBcType().equals("out"))
                 return;
             //线路配置
             LineConfig config = lineConfigData.get(sch.getXlBm());
@@ -3,9 +3,6 @@ package com.bsth.entity.realcontrol;
 import com.bsth.entity.Line;
 import javax.persistence.*;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
 import java.util.HashSet;
 import java.util.Set;
@@ -156,7 +153,7 @@ public class LineConfig {
 		this.schDirectiveTemp = schDirectiveTemp;
 	}
-	public long getCurrStartTime() {
+/*	public long getCurrStartTime() {
 		Date d = null;
 		try {
 			SimpleDateFormat sdfyyyyMMddHHmm = new SimpleDateFormat("yyyy-MM-ddHH:mm")
@@ -166,7 +163,7 @@ public class LineConfig {
 			e.printStackTrace();
 		}
 		return d.getTime();
-	}
+	}*/
 	public D80ReplyTemp findByCode(short code){
 		for(D80ReplyTemp temp : d80Temps){
@@ -285,7 +285,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             //取消应发未到标记，不再自动调整待发
             //if(schedule.isLate2()){
             //    schedule.setLate2(false);
-            LateAdjustHandle.remove(schedule);
+            //LateAdjustHandle.remove(schedule);
             //}
             try {
@@ -112,7 +112,7 @@
                 var data = form.serializeJSON();
                 data.page = page;
                 data.size = pageSize;
-                if(data.lineCode){
+                if(data.lineCode && !data.nbbms){
                     //有选择线路，重新设置车辆字符串
                     var nbbmArray=data.nbbms=gb_schedule_table.findNbbmByLineCode(data.lineCode);
                     if(nbbmArray.length>0){
@@ -44,7 +44,7 @@ var gb_embed_form_hanlde = (function () {
         //包裹页面
         var wrapUrl = '/real_control_v2/js/forms/wrap.html?origin=real_control_iframe';
-        layer.open({
+        var index = layer.open({
             type: 2,
             title: title,
             shadeClose: true,
@@ -61,6 +61,7 @@ var gb_embed_form_hanlde = (function () {
             }
         });
+        layer.full(index);
     };
@@ -47,7 +47,7 @@ var gb_main_ep = new EventProxy(),
                 $('li.map-panel', '#main-tab-content').load('/real_control_v2/mapmonitor/real.html');
             }, 1000);
             //弹出更新说明
-            showUpdateDescription();
+            //showUpdateDescription();
         });
         function g_emit(id) {