update...

潘钊
1 parent 52f30026
Showing 4 changed files with 12 additions and 17 deletions
src/main/java/com/bsth/data/forecast/ArrivalDataLoader.java
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/java/com/bsth/data/schedule/late_adjust/LateAdjustHandle.java
src/main/java/com/bsth/entity/realcontrol/LineConfig.java
@@ -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;
-	}
+	}*/
 	/**
 	 * 
@@ -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;
     }
@@ -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){