Merge branch 'minhang' into qingpu

# Conflicts: # src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java

Merge branch 'minhang' into qingpu
# Conflicts: # src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java
潘钊
2 parents d3a02a96 7a906155
Showing 69 changed files with 2775 additions and 734 deletions
src/main/java/com/bsth/Application.java
src/main/java/com/bsth/XDApplication.java
src/main/java/com/bsth/controller/LineController.java
src/main/java/com/bsth/controller/StationRouteController.java
src/main/java/com/bsth/controller/excep/NowOutboundController.java
src/main/java/com/bsth/controller/forms/ExportController.java
src/main/java/com/bsth/controller/forms/MCY_FormsController.java
src/main/java/com/bsth/controller/oil/CwjyController.java
src/main/java/com/bsth/controller/oil/DlbController.java
src/main/java/com/bsth/controller/oil/YlbController.java
src/main/java/com/bsth/controller/oil/YlxxbController.java
src/main/java/com/bsth/controller/realcontrol/BasicDataController.java
src/main/java/com/bsth/controller/realcontrol/FrequentPhrasesController.java
src/main/java/com/bsth/controller/realcontrol/LineConfigController.java
src/main/java/com/bsth/controller/realcontrol/RealMapController.java
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/controller/realcontrol/anomalyCheckController.java
src/main/java/com/bsth/controller/report/ReportController.java
src/main/java/com/bsth/controller/sys/IntervalController.java
src/main/java/com/bsth/controller/sys/UserController.java
@@ -17,7 +17,7 @@ import java.util.concurrent.ScheduledExecutorService;
 @SpringBootApplication
 public class Application extends SpringBootServletInitializer {
-	public static ScheduledExecutorService mainServices = Executors.newScheduledThreadPool(15);
+	public static ScheduledExecutorService mainServices = Executors.newScheduledThreadPool(16);
 	@Override
 	protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
@@ -4,10 +4,14 @@ import com.bsth.data.BasicData;
 import com.bsth.data.ThreadMonotor;
 import com.bsth.data.car_out_info.UpdateDBThread;
 import com.bsth.data.directive.DirectivesPstThread;
+import com.bsth.data.forecast.SampleTimeDataLoader;
 import com.bsth.data.gpsdata.thread.GpsDataLoaderThread;
 import com.bsth.data.gpsdata.thread.OfflineMonitorThread;
+import com.bsth.data.msg_queue.DirectivePushQueue;
+import com.bsth.data.msg_queue.WebSocketPushQueue;
 import com.bsth.data.schedule.edit_logs.SeiPstThread;
 import com.bsth.data.schedule.late_adjust.ScheduleLateThread;
+import com.bsth.data.schedule.signal.SchSiginUpdateDBThread;
 import com.bsth.data.schedule.thread.CalcOilThread;
 import com.bsth.data.schedule.thread.SchedulePstThread;
 import com.bsth.data.schedule.thread.ScheduleRefreshThread;
@@ -56,6 +60,10 @@ public class XDApplication implements CommandLineRunner {
     ThreadMonotor threadMonotor;
     @Autowired
     SeiPstThread seiPstThread;
+    @Autowired
+    SampleTimeDataLoader sampleTimeDataLoader;
+    @Autowired
+    SchSiginUpdateDBThread schSiginUpdateDBThread;
     private static long timeDiff;
     private static long timeDiffTraffic;
@@ -116,30 +124,31 @@ public class XDApplication implements CommandLineRunner {
     public void prodInit(){
         log.info("prodInit...");
         ScheduledExecutorService sexec = Application.mainServices;
-        //发车信息
-        sexec.scheduleWithFixedDelay(fcxxUpdateThread, 60, 40, TimeUnit.SECONDS);
-        //抓取GPS数据
-        sexec.scheduleWithFixedDelay(gpsDataLoader, 30, 2, TimeUnit.SECONDS);
-        //GPS设备掉离线
-        sexec.scheduleWithFixedDelay(offlineMonitorThread, 120, 60, TimeUnit.SECONDS);
-        //班次更新线程
-        sexec.scheduleWithFixedDelay(scheduleRefreshThread, 15, 240, TimeUnit.SECONDS);
-        //班次延迟入库线程
-        sexec.scheduleWithFixedDelay(schedulePstThread, 60, 10, TimeUnit.SECONDS);
-        //班次修正日志入库
-        sexec.scheduleWithFixedDelay(seiPstThread, 60, 60, TimeUnit.SECONDS);
-        //检查班次误点
-        sexec.scheduleWithFixedDelay(scheduleLateThread, 60, 30, TimeUnit.SECONDS);
-        //调度指令延迟入库
-        sexec.scheduleWithFixedDelay(directivesPstThread, 180, 100, TimeUnit.SECONDS);
+
+        /** 线调业务 */
+        sexec.scheduleWithFixedDelay(gpsDataLoader, 30, 2, TimeUnit.SECONDS);//抓取GPS数据
+        sexec.scheduleWithFixedDelay(offlineMonitorThread, 120, 60, TimeUnit.SECONDS);//GPS设备掉离线
+        sexec.scheduleWithFixedDelay(scheduleRefreshThread, 15, 240, TimeUnit.SECONDS);//班次更新线程
+        sexec.scheduleWithFixedDelay(schedulePstThread, 60, 10, TimeUnit.SECONDS);//班次延迟入库线程
+        sexec.scheduleWithFixedDelay(seiPstThread, 60, 60, TimeUnit.SECONDS);//班次修正日志入库
+        sexec.scheduleWithFixedDelay(scheduleLateThread, 60, 30, TimeUnit.SECONDS);//检查班次误点
+        sexec.scheduleWithFixedDelay(directivesPstThread, 180, 100, TimeUnit.SECONDS);//调度指令延迟入库
+        sexec.scheduleWithFixedDelay(threadMonotor, 240, 60, TimeUnit.SECONDS);//线程监听（防止重要的线程阻塞、异常结束。以及部分主备切换工作）
+        sexec.scheduleWithFixedDelay(sampleTimeDataLoader, 12, 120 * 60, TimeUnit.SECONDS);//到离站预测需要的站点间耗时数据
+        sexec.scheduleWithFixedDelay(basicDataLoader, 2, 2, TimeUnit.HOURS);//基础数据更新
+        DirectivePushQueue.start();//消息队列 -指令，系统下发的
+        WebSocketPushQueue.start();//消息队列 -webSocket ，推送至线调web页面的
+
+        /** 线调为其他程序提供的数据 --写入数据库 */
+        sexec.scheduleWithFixedDelay(fcxxUpdateThread, 60, 40, TimeUnit.SECONDS);//发车信息（发车屏、信息发布）
+        //线路首末班数据（网关用，班次更新时写入）
+        //com.bsth.data.schedule.f_a_l.FirstAndLastHandler
+        sexec.scheduleWithFixedDelay(schSiginUpdateDBThread, 60, 60 * 30, TimeUnit.SECONDS);//无法自动完成的班次信息（网关用，补信号）
         //运管处静态数据提交
         log.info(timeDiff / 1000 / 60 + "分钟之后提交到运管处");
         sexec.scheduleAtFixedRate(submitToTrafficManage, timeDiffTraffic / 1000, 60 * 60 * 24, TimeUnit.SECONDS);
         //计算油、公里加注
         sexec.scheduleAtFixedRate(calcOilThread, timeDiff / 1000, 60 * 60 * 24, TimeUnit.SECONDS);
-
-        //线程监听（防止重要的线程阻塞、异常结束。以及部分主备切换工作）
-        sexec.scheduleWithFixedDelay(threadMonotor, 240, 60, TimeUnit.SECONDS);
     }
 }
 package com.bsth.controller;
+import java.util.HashMap;
 import java.util.Map;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
+import com.bsth.common.ResponseCode;
 import com.bsth.entity.Line;
 import com.bsth.service.LineService;
 import com.bsth.util.GetUIDAndCode;
@@ -50,12 +53,22 @@ public class LineController extends BaseController&lt;Line, Integer&gt; {
 	 */
 	@RequestMapping(method = RequestMethod.POST)
 	public Map<String, Object> save(Line t){
-		
+		Map<String, Object> map = new HashMap<>();
 		if(t.getId()==null) {
 			t.setId(Integer.valueOf(t.getLineCode()));
 		}
+		if( (t.getId().toString().length()) > 6) {
+			
+			map.put("status", ResponseCode.ERROR); 
+			return map;
+		}
 		return service.save(t);
 	} 
+	
+	@RequestMapping(value ="/findById" , method = RequestMethod.GET)
+	Line findByID(@RequestParam(defaultValue = "id") Integer id){
+		return service.findById(id);
+	}
 }
@@ -12,6 +12,8 @@ import org.springframework.web.bind.annotation.RestController;
 import java.util.List;
 import java.util.Map;
+import javax.servlet.http.HttpServletResponse;
+
 /**
  * 
  * @ClassName: StationRouteController(站点路由控制器)
@@ -48,6 +50,18 @@ public class StationRouteController extends BaseController&lt;StationRoute, Integer
     }
     /**
+	 * @Description :TODO(查询路段信息)
+	 * 
+	 * @param map <line.id_eq:线路ID； directions_eq：方向>
+	 * 
+	 * @return Map<String, Object> 
+	 */
+	@RequestMapping(value = "/export" , method = RequestMethod.GET)
+	public Map<String, Object> export(@RequestParam Integer id, HttpServletResponse resp) {
+		return service.getSectionRouteExport(id, resp);
+	}
+    
+    /**
      * @param String
      * @throws
      * @Description: TODO(批量撤销站点)
 package com.bsth.controller.excep;
+import java.text.ParseException;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -10,7 +12,9 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import com.bsth.controller.BaseController;
+import com.bsth.data.BasicData;
 import com.bsth.entity.excep.Outbound;
+import com.bsth.entity.excep.Speeding;
 import com.bsth.entity.sys.SysUser;
 import com.bsth.service.excep.NowOutboundService;
 import com.bsth.util.PageObject;
@@ -44,5 +48,11 @@ public class NowOutboundController extends BaseController&lt;SysUser, Integer&gt;{
 		return modelMap;
 	}
+	@RequestMapping(value = "/findPosition", method = RequestMethod.GET)
+	public List<Outbound> findPosition(@RequestParam String vehicle,@RequestParam String startdate,@RequestParam String enddate) throws ParseException {
+    	String deviceid = BasicData.deviceId2NbbmMap.inverse().get(vehicle);
+    	List<Outbound> listOutbound = nowOutboundService.findPosition(deviceid,startdate,enddate);
+    	return listOutbound;
+	}
 }
@@ -190,9 +190,6 @@ public class ExportController {
 			m.put("clzbh", l.getClzbh());
 			m.put("jsy", l.getJsy());
 			m.put("jName", l.getjName());
-			
-			
-			
 			m.put("sgh", l.getSgh());
 			m.put("sName", l.getsName());
 			m.put("jhlc", l.getJhlc());
@@ -78,6 +78,13 @@ public class MCY_FormsController {
 		return formsService.singledata(map);
 	}
+	
+	// 路单数据
+	@RequestMapping(value = "/singledatanew", method = RequestMethod.GET)
+	public List<Singledata> singledatanew(@RequestParam Map<String, Object> map) {
+
+		return formsService.singledata(map);
+	}
 	// 车辆加注
 	@RequestMapping(value = "/vehicleloading", method = RequestMethod.GET)
@@ -12,7 +12,10 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
+import com.bsth.common.ResponseCode;
 import com.bsth.controller.BaseController;
+import com.bsth.data.BasicData;
+import com.bsth.entity.Line;
 import com.bsth.entity.oil.Cwjy;
 import com.bsth.entity.oil.Ylxxb;
 import com.bsth.entity.sys.SysUser;
@@ -30,12 +33,24 @@ public class CwjyController extends BaseController&lt;Cwjy, Integer&gt;{
 		SysUser sysUser = SecurityUtils.getCurrentUser();
 		t.setCreateDate(new Date());
 		t.setXgr(sysUser.getUserName());
-		return service.save(t);
+		t.setNbbm(t.getNbbm().trim().toUpperCase());
+		Line line=BasicData.nbbm2LineMap.get(t.getNbbm());
+		t.setLine(line == null?"" : line.getLineCode());
+		Map<String, Object> map = new HashMap<>();
+		try {
+		 map=service.save(t);
+		}catch (Exception e) {
+			// TODO: handle exception
+			if(e.getMessage().indexOf("PK_CWJYUK")>0){
+				map.put("fage", "存在相同数据,数据已经过滤");
+			}
+		}
+		return map;
 	}
 	@RequestMapping(value = "/checkNbbm",method = RequestMethod.GET)
 	public int checkNbbm(Cwjy t){
-		return service.checkNbbm(t.getNbbm().trim());
+		return service.checkNbbm(t);
 	}
 	@RequestMapping(value = "/queryList",method = RequestMethod.GET)
@@ -2,6 +2,7 @@ package com.bsth.controller.oil;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -84,8 +85,14 @@ public class DlbController extends BaseController&lt;Dlb, Integer&gt;{
 	@RequestMapping(value = "/obtain",method = RequestMethod.GET)
-	public Map<String, Object> obtain(@RequestParam Map<String, Object> map){
-		Map<String, Object> list=service.obtain(map);
+	public Map<String, Object> obtain(@RequestParam Map<String, Object> map) throws Exception{
+		Map<String, Object> list=new HashMap<String, Object>();
+		try {
+			list = service.obtain(map);
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			throw e;
+		}
 		return list;
 	}
@@ -188,4 +195,30 @@ public class DlbController extends BaseController&lt;Dlb, Integer&gt;{
 	}
+	
+	@RequestMapping(value = "/checkJsy",method = RequestMethod.GET)
+	public String checkJsy(@RequestParam Map<String, Object> map){
+		String list=service.checkJsy(map);
+		return list;
+	}
+	
+	@RequestMapping(value = "/deleteIds", method = RequestMethod.POST)
+    public Map<String, Object> deleteIds(@RequestParam Map<String, Object> map) {
+		Map<String, Object> maps=new HashMap<String, Object>();
+        try {
+        	maps= service.deleteIds(map);
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+        return maps;
+    }
+	
+	@RequestMapping(value = "/saveDlb",method = RequestMethod.POST)
+	public Map<String, Object> saveDlb(Dlb t){
+//		SysUser user = SecurityUtils.getCurrentUser();
+		t.setCreatetime(new Date());
+//		Ylb t=new Ylb();
+		return service.saveDlb(t);
+	}
 }
@@ -209,8 +209,8 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
         return maps;
     }
 	@RequestMapping(value="/oilListMonth")
-	public List<Ylb> oilListMonth(@RequestParam String line,@RequestParam String date,@RequestParam String type){
-		return yblService.oilListMonth(line, date, type);
+	public List<Ylb> oilListMonth(@RequestParam Map<String, Object> map){
+		return yblService.oilListMonth(map);
 	}
 	@RequestMapping(value = "/checkJsy",method = RequestMethod.GET)
 package com.bsth.controller.oil;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -28,6 +29,12 @@ public class YlxxbController extends BaseController&lt;Ylxxb, Integer&gt;{
 		return pagequery;
 	}
+	@RequestMapping(value = "/listNbbm",method = RequestMethod.GET)
+	public List<Ylxxb> listNbbm(@RequestParam Map<String, Object> map){
+		List<Ylxxb> list=service.Pagequery_nbbm(map);
+		return list;
+	}
+	
 	/**
 	 * 核对油量（有加油没里程）
@@ -45,4 +52,17 @@ public class YlxxbController extends BaseController&lt;Ylxxb, Integer&gt;{
 		}
 		return list;
 	}
+	
+	@RequestMapping(value = "/checkNbbm",method = RequestMethod.POST)
+	public Map<String, Object> checkNbbm(@RequestParam Map<String, Object> map){
+		Map<String, Object> list=new HashMap<>();
+		try {
+			list = service.checkNbbm(map);
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		return list;
+	}
+	
 }
@@ -131,7 +131,7 @@ public class BasicDataController {
 	 */
 	@RequestMapping("/nbbm2PlateNo")
 	public Map<String, String> nbbm2PlateNo(){
-		return basicData.getNbbm2PlateNo();
+		return basicData.nbbmCompanyPlateMap;
 	}
+package com.bsth.controller.realcontrol;
+
+import com.bsth.controller.BaseController;
+import com.bsth.entity.realcontrol.FrequentPhrases;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * Created by panzhao on 2017/9/17.
+ */
+@RestController
+@RequestMapping("frequent_phrases")
+public class FrequentPhrasesController extends BaseController<FrequentPhrases, Integer>{
+
+}
@@ -79,6 +79,11 @@ public class LineConfigController extends BaseController&lt;LineConfig, Integer&gt;{
 		return lineConfigService.getByLineCode(lineCode);
 	}
+	@RequestMapping(value = "/findByIdx")
+	public Map<String, Object> findByIdx(@RequestParam String idx){
+		return lineConfigService.findByIdx(idx);
+	}
+
 	/**
 	 * 到站缓冲区设置
 	 * @param lineCode
 package com.bsth.controller.realcontrol;
+import com.bsth.data.gpsdata.arrival.GeoCacheData;
+import com.bsth.data.gpsdata.arrival.entity.TimedEnableStationRoute;
 import com.bsth.service.realcontrol.RealMapService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
@@ -74,4 +77,9 @@ public class RealMapController {
     public Map<String, Object> multiSectionRoute(@RequestParam String codeIdx){
         return realMapService.multiSectionRoute(codeIdx);
     }
+
+    @RequestMapping(value = "/lockAndFlxedTimeEnabled", method = RequestMethod.POST)
+    public void lockAndFlxedTimeEnabled(TimedEnableStationRoute tes){
+        GeoCacheData.tesMap.put(tes.getLineCode(), tes);
+    }
 }
@@ -417,6 +417,70 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 		}
 		return scheduleRealInfoService.statisticsDailyTj(gsdm,fgsdm,line, date,date2, xlName, type);
 	}
+	
+	/*
+	 * 公里修正报表
+	 */
+	@RequestMapping(value="/mileageReportTj")
+	public List<Map<String,Object>> mileageReport(@RequestParam Map<String, Object> map){
+		String gsdm="";
+		if(map.get("gsdm")!=null){
+			gsdm=map.get("gsdm").toString();
+		}
+		String fgsdm="";
+		if(map.get("fgsdm")!=null){
+			fgsdm=map.get("fgsdm").toString();
+		}
+		String line="";
+		if(map.get("line")!=null){
+			line=map.get("line").toString();
+		}
+		String date="";
+		if(map.get("date")!=null){
+			date=map.get("date").toString();
+		}
+		String date2="";
+		if(map.get("date2")!=null){
+			date2=map.get("date2").toString();
+		}
+		String xlName="";
+		if(map.get("xlName")!=null){
+			xlName=map.get("xlName").toString();
+		}
+		return scheduleRealInfoService.mileageReport(gsdm,fgsdm,line, date,date2);
+	}
+	
+	/*
+	 * 班次修正报表
+	 */
+	@RequestMapping(value="/scheduleCorrectionReport")
+	public List<Map<String,Object>> scheduleCorrectionReport(@RequestParam Map<String, Object> map){
+		String gsdm="";
+		if(map.get("gsdm")!=null){
+			gsdm=map.get("gsdm").toString();
+		}
+		String fgsdm="";
+		if(map.get("fgsdm")!=null){
+			fgsdm=map.get("fgsdm").toString();
+		}
+		String line="";
+		if(map.get("line")!=null){
+			line=map.get("line").toString();
+		}
+		String date="";
+		if(map.get("date")!=null){
+			date=map.get("date").toString();
+		}
+		String date2="";
+		if(map.get("date2")!=null){
+			date2=map.get("date2").toString();
+		}
+		String xlName="";
+		if(map.get("xlName")!=null){
+			xlName=map.get("xlName").toString();
+		}
+		return scheduleRealInfoService.scheduleCorrectionReport(gsdm,fgsdm,line, date,date2);
+	}
 	@RequestMapping(value="/MapById",method = RequestMethod.GET)
 	public Map<String, Object> MapById(@RequestParam("id") Long id){
@@ -95,4 +95,25 @@ public class anomalyCheckController {
     public void updateCacheBuff(){
         geoCacheData.loadData();
     }
+
+    @RequestMapping(value = "/reCalcLpSch")
+    public void reCalcLpSch(){
+        dayOfSchedule._test_reCalcLpSch();
+    }
+
+    @RequestMapping(value = "/findSchByLpName")
+    public List<ScheduleRealInfo> findSchByLpName(@RequestParam String lpName){
+        return dayOfSchedule.getLpScheduleMap().get(lpName);
+    }
+
+    @RequestMapping(value = "/findSchByNbbm")
+    public List<ScheduleRealInfo> findSchByNbbm(@RequestParam String nbbm){
+        return dayOfSchedule.findByNbbm(nbbm);
+    }
+
+    @RequestMapping(value = "/removeExecPlan")
+    public int removeExecPlan(@RequestParam String nbbm){
+        dayOfSchedule.removeExecPlan(nbbm);
+        return 1;
+    }
 }
@@ -84,12 +84,19 @@ public class ReportController {
 			@RequestParam int zd){
 		return service.queryStrinon(line,zd);
 	}
+	//根据排班查到离站
 	@RequestMapping(value="/queryInOutStrtion" ,method = RequestMethod.GET)
 	public List<Map<String, Object>> queryInOutStrtion(@RequestParam String line,
 			@RequestParam String date,@RequestParam int zd,@RequestParam String lzsj){
 		return service.queryInOutStrtion(line,date,zd,lzsj);
 	}
+	//根据GPS数据查到离站
+	@RequestMapping(value="/queryInOutStrtions" ,method = RequestMethod.GET)
+	public List<Map<String, Object>> queryInOutStrtions(@RequestParam String line,
+			@RequestParam String date,@RequestParam int zd,@RequestParam String lzsj){
+		return service.queryInOutStrtions(line,date,zd,lzsj);
+	}
 	@RequestMapping(value="/queryListClzd" ,method = RequestMethod.GET)
 	public List<ArrivalInfo> queryListClzd(@RequestParam String zd,@RequestParam String line,
 			@RequestParam String zdlx,@RequestParam String fcsj,@RequestParam String ddsj){
@@ -9,12 +9,13 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import com.alibaba.fastjson.JSON;
+import com.bsth.controller.BaseController;
 import com.bsth.entity.sys.Interval;
 import com.bsth.service.sys.IntervalService;
 @RestController
 @RequestMapping("interval")
-public class IntervalController {
+public class IntervalController extends BaseController<Interval, Integer> {
 	@Autowired
 	IntervalService intervalService;
@@ -31,220 +31,252 @@ import java.util.*;
 @RequestMapping("user")
 public class UserController extends BaseController<SysUser, Integer> {
-	Logger logger = LoggerFactory.getLogger(this.getClass());
-
-	@Autowired
-	SysUserService sysUserService;
-
-	@Autowired
-	CompanyAuthorityService companyAuthorityService;
-	
-	@RequestMapping(value = "/login/jCryptionKey")
-	public Map<String, Object> jCryptionKey(HttpServletRequest request){
-		//公匙返回页面
-		Map<String, Object> rs = new HashMap<>();
-		rs.put("publickey", RSAUtils.generateBase64PublicKey());
-		return rs;
-	}
-	
-	//需要验证码的账号
-	public static Map<String, Integer> captchaMap = new HashMap<>();
-
-	@RequestMapping(value = "/login", method = RequestMethod.POST)
-	public Map<String, Object> login(HttpServletRequest request, @RequestParam String userName,
-			@RequestParam String password, String captcha) {
-		
-		Map<String, Object> rs = new HashMap<>();
-		rs.put("status", ResponseCode.ERROR);
-		try {
-			HttpSession session = request.getSession();
-			rs.put("captcha", session.getAttribute("captcha"));
-			
-			if(captchaMap.get(userName) != null && captchaMap.get(userName) >= 3){
-				//校验验证码
-				String verCode = (String) session
-						.getAttribute(com.google.code.kaptcha.Constants.KAPTCHA_SESSION_KEY);
-				
-				if(StringUtils.isBlank(captcha))
-					return put(rs, "msg", "请输入验证码");
-				
-				if(!verCode.equals(captcha))
-					return put(rs, "msg", "验证码有误，请刷新后重新输入");
-			}
-			
-			//解密RSA
-			try {
-				userName = RSAUtils.decryptBase64(userName);
-				password = RSAUtils.decryptBase64(password);
-			} catch (RuntimeException e) {
-				return put(rs, "msg", "decrypt RSA fail！可能页面已过期，尝试刷新页面。");
-			}
-
-			SysUser user = sysUserService.findByUserName(userName);
-			if (null == user) 
-				return put(rs, "msg", "不存在的用户");
-			
-			if (!user.isEnabled()) 
-				return put(rs, "msg", "该用户已被锁定，请联系管理员");
-			
-			// 校验密码
-			boolean matchStatus = new BCryptPasswordEncoder(4).matches(password, user.getPassword());
-			if (!matchStatus) {
-				rs.put("msg", "密码有误");
-				
-				Integer captchSize = captchaMap.get(userName);
-				if(null == captchSize)
-					captchSize = 0;
-				
-				captchSize ++;
-				captchaMap.put(userName, captchSize);
-				return rs;
-			}
-
-			// 登录
-			SecurityUtils.login(user, request);
-			//session里写入用户名，webSocket连接时标识身份用
-			session.setAttribute(Constants.SESSION_USERNAME, user.getUserName());
-
-			//获取公司权限数据
-			List<CompanyAuthority> cmyAuths=companyAuthorityService.findByUser(user);
-			session.setAttribute(Constants.COMPANY_AUTHORITYS, cmyAuths);
-
-			captchaMap.remove(userName);
-			rs.put("status", ResponseCode.SUCCESS);
-		} catch (Exception e) {
-			logger.error("", e);
-			rs.put("msg", "服务器出现异常，请联系管理员");
-		}
-		return rs;
-	}
-
-	/**
-	 * 返回当前用户的公司权限数据，用于构建页面级联下拉框
-	 * @return
-	 */
-	@RequestMapping("companyData")
-	public List<CompanyData> companyData(HttpServletRequest request){
-		List<CompanyData> rs = new ArrayList<>();
-		CompanyData companyData;
-
-		ArrayListMultimap<String, CompanyAuthority> map = ArrayListMultimap.create();
-		List<CompanyAuthority> cmyAuths = (List<CompanyAuthority>) request.getSession().getAttribute(Constants.COMPANY_AUTHORITYS);
-
-		for(CompanyAuthority cAuth : cmyAuths){
-			map.put(cAuth.getCompanyCode()+"_"+cAuth.getCompanyName(), cAuth);
-		}
-
-		Set<String> keys = map.keySet();
-		String[] temps;
-		for(String k : keys){
-			temps = k.split("_");
-
-			companyData = new CompanyData();
-			companyData.setCompanyCode(temps[0]);
-			companyData.setCompanyName(temps[1]);
-			companyData.setChildren(new ArrayList<CompanyData.ChildrenCompany>());
-
-			cmyAuths = map.get(k);
-			for(CompanyAuthority c : cmyAuths){
-				companyData.getChildren().add(new CompanyData.ChildrenCompany(c.getSubCompanyCode(), c.getSubCompanyName()));
-			}
-
-			rs.add(companyData);
-		}
-
-		return rs;
-	}
-	
-	@RequestMapping(value = "/login/captchaStatus")
-	public int captchaStatus(String userName){
-		Integer size = captchaMap.get(userName);
-		return size == null?0:size;
-	}
-	
-	public Map<String, Object> put(Map<String, Object> rs, String key, Object val){
-		rs.put(key, val);
-		return rs;
-	}
-
-	/**
-	 * 
-	 * @Title: loginFailure @Description: TODO(查询登录失败的详细信息) @param @param
-	 * request @return String 返回类型 @throws
-	 */
-	@RequestMapping("/loginFailure")
-	public String loginFailure(HttpServletRequest request) {
-		String msg = "";
-		HttpSession session = request.getSession();
-
-		Object obj = session.getAttribute("SPRING_SECURITY_LAST_EXCEPTION");
-
-		if (obj instanceof BadCredentialsException)
-			msg = "登录失败，用户名或密码错误.";
-		else if (obj instanceof SessionAuthenticationException)
-			msg = "登录失败，当前策略不允许重复登录.";
-		session.removeAttribute("SPRING_SECURITY_LAST_EXCEPTION");
-		return msg;
-	}
-
-	@RequestMapping("/currentUser")
-	public SysUser currentUser() {
-		return SecurityUtils.getCurrentUser();
-	}
-
-	/**
-	 * @Title changeEnabled
-	 * @Description: TODO(改变用户状态)
-	 * @param id
-	 *            用户ID
-	 * @param enabled
-	 *            状态
-	 * @return
-	 */
-	@RequestMapping("/changeEnabled")
-	public int changeEnabled(@RequestParam int id, @RequestParam int enabled) {
-		return sysUserService.changeEnabled(id, enabled);
-	}
-
-	/**
-	 * @Title changePWD
-	 * @Description: TODO(修改密码)
-	 * @param oldPWD
-	 *            原始密码
-	 * @param newPWD
-	 *            新密码
-	 * @param cnewPWD
-	 *            确认新密码
-	 * @return
-	 */
-	@RequestMapping(value = "/changePWD", method = RequestMethod.POST)
-	public String changePWD(@RequestParam String oldPWD, @RequestParam String newPWD, @RequestParam String cnewPWD) {
-		SysUser sysUser = SecurityUtils.getCurrentUser();
-		String msg = "";
-		if (new BCryptPasswordEncoder(4).matches(oldPWD, sysUser.getPassword())) {
-			if (oldPWD.equals(newPWD)) {
-				msg = "新密码不能跟原始密码一样！";
-			} else {
-				if (newPWD.equals(cnewPWD)) {
-					sysUserService.changePWD(sysUser.getId(), newPWD);
-					msg = "修改成功！";
-				} else {
-					msg = "新密码两次输入不一致！";
-				}
-			}
-		} else {
-			msg = "原始密码错误！";
-		}
-		return msg;
-	}
-
-	@RequestMapping(value = "/register" ,method = RequestMethod.POST)
-	public Map<String, Object> register(SysUser u){
-		return sysUserService.register(u);
-	}
-
-	@RequestMapping(value = "/all_distinct")
-	public List<SysUser> findAll_distinct(){
-		return sysUserService.findAll_distinct();
-	}
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Autowired
+    SysUserService sysUserService;
+
+    @Autowired
+    CompanyAuthorityService companyAuthorityService;
+
+    @RequestMapping(value = "/login/jCryptionKey")
+    public Map<String, Object> jCryptionKey(HttpServletRequest request) {
+        //公匙返回页面
+        Map<String, Object> rs = new HashMap<>();
+        rs.put("publickey", RSAUtils.generateBase64PublicKey());
+        return rs;
+    }
+
+    //需要验证码的账号
+    public static Map<String, Integer> captchaMap = new HashMap<>();
+
+    @RequestMapping(value = "/login", method = RequestMethod.POST)
+    public Map<String, Object> login(HttpServletRequest request, @RequestParam String userName,
+                                     @RequestParam String password, String captcha) {
+
+        Map<String, Object> rs = new HashMap<>();
+        rs.put("status", ResponseCode.ERROR);
+        try {
+            HttpSession session = request.getSession();
+            rs.put("captcha", session.getAttribute("captcha"));
+
+            if (captchaMap.get(userName) != null && captchaMap.get(userName) >= 3) {
+                //校验验证码
+                String verCode = (String) session
+                        .getAttribute(com.google.code.kaptcha.Constants.KAPTCHA_SESSION_KEY);
+
+                if (StringUtils.isBlank(captcha))
+                    return put(rs, "msg", "请输入验证码");
+
+                if (!verCode.equals(captcha))
+                    return put(rs, "msg", "验证码有误，请刷新后重新输入");
+            }
+
+            //解密RSA
+            try {
+                userName = RSAUtils.decryptBase64(userName);
+                password = RSAUtils.decryptBase64(password);
+            } catch (RuntimeException e) {
+                return put(rs, "msg", "decrypt RSA fail！可能页面已过期，尝试刷新页面。");
+            }
+
+            SysUser user = sysUserService.findByUserName(userName);
+            if (null == user)
+                return put(rs, "msg", "不存在的用户");
+
+            if (!user.isEnabled())
+                return put(rs, "msg", "该用户已被锁定，请联系管理员");
+
+            // 校验密码
+            boolean matchStatus = new BCryptPasswordEncoder(4).matches(password, user.getPassword());
+            if (!matchStatus) {
+                rs.put("msg", "密码有误");
+
+                Integer captchSize = captchaMap.get(userName);
+                if (null == captchSize)
+                    captchSize = 0;
+
+                captchSize++;
+                captchaMap.put(userName, captchSize);
+                return rs;
+            }
+
+            // 登录
+            SecurityUtils.login(user, request);
+            //session里写入用户名，webSocket连接时标识身份用
+            session.setAttribute(Constants.SESSION_USERNAME, user.getUserName());
+
+            //获取公司权限数据
+            List<CompanyAuthority> cmyAuths = companyAuthorityService.findByUser(user);
+            session.setAttribute(Constants.COMPANY_AUTHORITYS, cmyAuths);
+
+            captchaMap.remove(userName);
+            rs.put("status", ResponseCode.SUCCESS);
+        } catch (Exception e) {
+            logger.error("", e);
+            rs.put("msg", "服务器出现异常，请联系管理员");
+        }
+        return rs;
+    }
+
+    @RequestMapping(value = "/change_user", method = RequestMethod.POST)
+    public Map<String, Object> changeUser(HttpServletRequest request, @RequestParam String userName,
+                                          @RequestParam String password) {
+
+        Map<String, Object> rs = new HashMap<>();
+        rs.put("status", ResponseCode.ERROR);
+        try {
+            HttpSession session = request.getSession();
+
+            SysUser user = sysUserService.findByUserName(userName);
+            if (null == user)
+                return put(rs, "msg", "不存在的用户");
+
+            if (!user.isEnabled())
+                return put(rs, "msg", "该用户已被锁定，请联系管理员");
+
+            // 校验密码
+            boolean matchStatus = new BCryptPasswordEncoder(4).matches(password, user.getPassword());
+            if (!matchStatus)
+                return put(rs, "msg", "密码有误");
+
+            // 登录
+            SecurityUtils.login(user, request);
+            //session里写入用户名，webSocket连接时标识身份用
+            session.setAttribute(Constants.SESSION_USERNAME, user.getUserName());
+
+            //获取公司权限数据
+            List<CompanyAuthority> cmyAuths = companyAuthorityService.findByUser(user);
+            session.setAttribute(Constants.COMPANY_AUTHORITYS, cmyAuths);
+            rs.put("status", ResponseCode.SUCCESS);
+        } catch (Exception e) {
+            logger.error("", e);
+            rs.put("msg", "服务器出现异常，请联系管理员");
+        }
+        return rs;
+    }
+
+    /**
+     * 返回当前用户的公司权限数据，用于构建页面级联下拉框
+     *
+     * @return
+     */
+    @RequestMapping("companyData")
+    public List<CompanyData> companyData(HttpServletRequest request) {
+        List<CompanyData> rs = new ArrayList<>();
+        CompanyData companyData;
+
+        ArrayListMultimap<String, CompanyAuthority> map = ArrayListMultimap.create();
+        List<CompanyAuthority> cmyAuths = (List<CompanyAuthority>) request.getSession().getAttribute(Constants.COMPANY_AUTHORITYS);
+
+        for (CompanyAuthority cAuth : cmyAuths) {
+            map.put(cAuth.getCompanyCode() + "_" + cAuth.getCompanyName(), cAuth);
+        }
+
+        Set<String> keys = map.keySet();
+        String[] temps;
+        for (String k : keys) {
+            temps = k.split("_");
+
+            companyData = new CompanyData();
+            companyData.setCompanyCode(temps[0]);
+            companyData.setCompanyName(temps[1]);
+            companyData.setChildren(new ArrayList<CompanyData.ChildrenCompany>());
+
+            cmyAuths = map.get(k);
+            for (CompanyAuthority c : cmyAuths) {
+                companyData.getChildren().add(new CompanyData.ChildrenCompany(c.getSubCompanyCode(), c.getSubCompanyName()));
+            }
+
+            rs.add(companyData);
+        }
+
+        return rs;
+    }
+
+    @RequestMapping(value = "/login/captchaStatus")
+    public int captchaStatus(String userName) {
+        Integer size = captchaMap.get(userName);
+        return size == null ? 0 : size;
+    }
+
+    public Map<String, Object> put(Map<String, Object> rs, String key, Object val) {
+        rs.put(key, val);
+        return rs;
+    }
+
+    /**
+     * @Title: loginFailure @Description: TODO(查询登录失败的详细信息) @param @param
+     * request @return String 返回类型 @throws
+     */
+    @RequestMapping("/loginFailure")
+    public String loginFailure(HttpServletRequest request) {
+        String msg = "";
+        HttpSession session = request.getSession();
+
+        Object obj = session.getAttribute("SPRING_SECURITY_LAST_EXCEPTION");
+
+        if (obj instanceof BadCredentialsException)
+            msg = "登录失败，用户名或密码错误.";
+        else if (obj instanceof SessionAuthenticationException)
+            msg = "登录失败，当前策略不允许重复登录.";
+        session.removeAttribute("SPRING_SECURITY_LAST_EXCEPTION");
+        return msg;
+    }
+
+    @RequestMapping("/currentUser")
+    public SysUser currentUser() {
+        return SecurityUtils.getCurrentUser();
+    }
+
+    /**
+     * @param id      用户ID
+     * @param enabled 状态
+     * @return
+     * @Title changeEnabled
+     * @Description: TODO(改变用户状态)
+     */
+    @RequestMapping("/changeEnabled")
+    public int changeEnabled(@RequestParam int id, @RequestParam int enabled) {
+        return sysUserService.changeEnabled(id, enabled);
+    }
+
+    /**
+     * @param oldPWD  原始密码
+     * @param newPWD  新密码
+     * @param cnewPWD 确认新密码
+     * @return
+     * @Title changePWD
+     * @Description: TODO(修改密码)
+     */
+    @RequestMapping(value = "/changePWD", method = RequestMethod.POST)
+    public String changePWD(@RequestParam String oldPWD, @RequestParam String newPWD, @RequestParam String cnewPWD) {
+        SysUser sysUser = SecurityUtils.getCurrentUser();
+        String msg = "";
+        if (new BCryptPasswordEncoder(4).matches(oldPWD, sysUser.getPassword())) {
+            if (oldPWD.equals(newPWD)) {
+                msg = "新密码不能跟原始密码一样！";
+            } else {
+                if (newPWD.equals(cnewPWD)) {
+                    sysUserService.changePWD(sysUser.getId(), newPWD);
+                    msg = "修改成功！";
+                } else {
+                    msg = "新密码两次输入不一致！";
+                }
+            }
+        } else {
+            msg = "原始密码错误！";
+        }
+        return msg;
+    }
+
+    @RequestMapping(value = "/register", method = RequestMethod.POST)
+    public Map<String, Object> register(SysUser u) {
+        return sysUserService.register(u);
+    }
+
+    @RequestMapping(value = "/all_distinct")
+    public List<SysUser> findAll_distinct() {
+        return sysUserService.findAll_distinct();
+    }
 }
+package com.bsth.controller.traffic;
+
+import com.bsth.controller.BaseController;
+import com.bsth.entity.traffic.VehicleInoutStop;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+/**
+ *
+ * @author BSTH
+ *
+ */
+@RestController
+@RequestMapping("vehicle_stop")
+public class VehicleInoutStopController extends BaseController<VehicleInoutStop,Integer> {
+}
 package com.bsth.data;
-import com.bsth.Application;
 import com.bsth.data.gpsdata.arrival.GeoCacheData;
 import com.bsth.data.pinyin.PersionPinYinBuffer;
 import com.bsth.entity.*;
@@ -13,12 +12,9 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.CommandLineRunner;
-import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Component;
 import java.util.*;
-import java.util.concurrent.TimeUnit;
 /**
  * @author PanZhao
@@ -27,7 +23,7 @@ import java.util.concurrent.TimeUnit;
  * @date 2016年8月10日 下午3:27:45
  */
 @Component
-public class BasicData implements CommandLineRunner {
+public class BasicData {
     //公司代码和公司名对照(K: 公司编码，V:公司名)
     public static Map<String, String> businessCodeNameMap;
@@ -80,20 +76,12 @@ public class BasicData implements CommandLineRunner {
     static Logger logger = LoggerFactory.getLogger(BasicData.class);
-    @Autowired
-    BasicDataLoader dataLoader;
-
-    @Override
-    public void run(String... arg0) throws Exception {
-        Application.mainServices.scheduleWithFixedDelay(dataLoader, 2, 2, TimeUnit.HOURS);
-    }
-
     public static String getStationNameByCode(String code, String prefix){
         String name = stationCode2NameMap.get(code);
         return name != null? name: stationCode2NameMap.get(prefix + code);
     }
-    @Autowired
+/*    @Autowired
     JdbcTemplate jdbcTemplate;
     public Map<String, String> getNbbm2PlateNo(){
         List<Map<String, Object>> list = jdbcTemplate.queryForList("select CAR_CODE,CAR_PLATE from bsth_c_cars where CAR_CODE is not null and CAR_PLATE is not null");
@@ -103,7 +91,7 @@ public class BasicData implements CommandLineRunner {
             rs.put(map.get("CAR_CODE").toString(), map.get("CAR_PLATE").toString());
         }
         return rs;
-    }
+    }*/
     @Component
     public static class BasicDataLoader extends Thread {
@@ -269,7 +257,7 @@ public class BasicData implements CommandLineRunner {
          * @Description: TODO(加载线路相关信息)
          */
         public void loadLineInfo() {
-            Iterator<Line> iterator = lineRepository.findAll().iterator();
+            Iterator<Line> iterator = lineRepository.findAllService().iterator();
             Line line;
             BiMap<Integer, String> biMap = HashBiMap.create();
@@ -77,7 +77,7 @@ public class LineConfigData implements CommandLineRunner {
     public long applyIn(ScheduleRealInfo sch, Long timestamp){
         LineConfig config = lineConfMap.get(sch.getXlBm());
         int diff = sch.getXlDir().equals("0")?config.getUpInDiff():config.getDownInDiff();
-        return timestamp - (diff * 1000);
+        return timestamp + (diff * 1000);
     }
     @Component
@@ -54,27 +54,19 @@ public class CarOutInfoHandler {
      * 全量更新发车信息表
      */
     public void updateAll() {
-        Set<String> ks = BasicData.lineCode2NameMap.keySet();
-        for (String lineCode : ks) {
-            update(lineCode);
-        }
-    }
-
-    public void update(String lineCode) {
-        try {
-            ArrayListMultimap<String, ScheduleRealInfo> lpScheduleMap = dayOfSchedule.getLpScheduleMap();
-            List<ScheduleRealInfo> list = new ArrayList<>();
+        try{
+            //将班次按线路分组
+            List<ScheduleRealInfo> all = new ArrayList<>(dayOfSchedule.findAll());
+            ArrayListMultimap<String, ScheduleRealInfo> xlMaps = ArrayListMultimap.create();
+            for(ScheduleRealInfo sch : all){
+                xlMaps.put(sch.getXlBm(), sch);
+            }
-            Set<String> ks = lpScheduleMap.keySet();
-            String prefix = lineCode + "_";
+            Set<String> ks = xlMaps.keySet();
             for (String k : ks) {
-                if (k.startsWith(prefix)) {
-                    list.addAll(lpScheduleMap.get(k));
-                }
+                update(xlMaps.get(k));
             }
-
-            update(list);
-        } catch (Exception e) {
+        }catch (Exception e){
             logger.error("", e);
         }
     }
 package com.bsth.data.forecast;
-import com.bsth.Application;
 import com.bsth.data.forecast.entity.ForecastResult;
 import com.bsth.data.forecast.entity.ForecastResult.ForecastResultItem;
 import com.bsth.data.forecast.entity.SimpleRoute;
@@ -13,7 +12,6 @@ import com.google.common.collect.ArrayListMultimap;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.CommandLineRunner;
 import org.springframework.stereotype.Component;
 import java.text.DecimalFormat;
@@ -21,7 +19,6 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.TimeUnit;
 /**
  * 
@@ -32,10 +29,7 @@ import java.util.concurrent.TimeUnit;
  *
  */
 @Component
-public class ForecastRealServer implements CommandLineRunner {
-	
-	@Autowired
-	SampleTimeDataLoader dataLoader;
+public class ForecastRealServer {
 	@Autowired
 	DayOfSchedule dayOfSchedule;
@@ -57,12 +51,6 @@ public class ForecastRealServer implements CommandLineRunner {
 		forecastMap = new HashMap<>();
 	}
-	@Override
-	public void run(String... arg0) throws Exception {
-		//2小时更新一次站点间耗时数据
-		Application.mainServices.scheduleWithFixedDelay(dataLoader, 12, 120 * 60, TimeUnit.SECONDS);
-	}
-	
 	/**
 	 * 
 	 * @Title: forecast 
@@ -79,6 +79,12 @@ public class GpsEntity implements Cloneable{
 	@JsonIgnore
 	private StationRoute station;
+	/**
+	 * 前置约束 -站点编码
+	 */
+	@JsonIgnore
+	private String premiseCode;
+
 	/** 状态 */
 	private String signalState = "normal";
@@ -358,4 +364,12 @@ public class GpsEntity implements Cloneable{
 	public void setServerTimestamp(Long serverTimestamp) {
 		this.serverTimestamp = serverTimestamp;
 	}
+
+	public String getPremiseCode() {
+		return premiseCode;
+	}
+
+	public void setPremiseCode(String premiseCode) {
+		this.premiseCode = premiseCode;
+	}
 }
@@ -2,8 +2,11 @@ package com.bsth.data.gpsdata.arrival;
 import com.bsth.data.gpsdata.GpsEntity;
 import com.bsth.data.gpsdata.arrival.entity.StationRoute;
+import com.bsth.data.gpsdata.arrival.entity.TimedEnableStationRoute;
+import com.bsth.data.gpsdata.arrival.precondition.entity.PreconditionGeo;
 import com.bsth.data.gpsdata.arrival.utils.CircleQueue;
 import com.bsth.data.gpsdata.arrival.utils.StationRouteComp;
+import com.google.common.base.Splitter;
 import com.google.common.collect.ArrayListMultimap;
 import com.vividsolutions.jts.geom.Coordinate;
 import com.vividsolutions.jts.geom.GeometryFactory;
@@ -13,6 +16,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.BeanPropertyRowMapper;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.stereotype.Component;
@@ -41,6 +45,8 @@ public class GeoCacheData {
     //线路站点路由
     private static ArrayListMultimap<String, StationRoute> stationCacheMap;
+    //线路前置进站围栏
+    public static ArrayListMultimap<String, PreconditionGeo> premiseGeoMap;
     //线路_上下行_站点编码 ——> 站点
     private static Map<String, StationRoute> routeCodeMap;
@@ -53,6 +59,9 @@ public class GeoCacheData {
     //线路限速信息
     private static Map<String, Double> speedLimitMap;
+    //需要定时刷新的站点路由
+    public static Map<String, TimedEnableStationRoute> tesMap = new HashMap<>();
+
     @Autowired
     JdbcTemplate jdbcTemplate;
@@ -63,10 +72,6 @@ public class GeoCacheData {
     public static void putGps(GpsEntity gps) {
         CircleQueue<GpsEntity> queue = gpsCacheMap.get(gps.getNbbm());
         if (queue == null) {
-            /*//第一个点从站内开始
-            if (gps.getInstation() == 0)
-                return;*/
-
             queue = new CircleQueue<>(CACHE_SIZE);
             gpsCacheMap.put(gps.getNbbm(), queue);
         }
@@ -141,6 +146,61 @@ public class GeoCacheData {
         //加载路段信息
         loadRoadsData();
+
+        //加载前置进站围栏
+        loadPremiseGeoData();
+    }
+
+    private void loadPremiseGeoData() {
+        ArrayListMultimap<String, PreconditionGeo> premiseGeoMapCopy = ArrayListMultimap.create();
+
+        String sql = "select * from  bsth_f_geo_premise";
+        List<PreconditionGeo> list = jdbcTemplate.query(sql, BeanPropertyRowMapper.newInstance(PreconditionGeo.class));
+
+        List<String> coordList;
+        String[] cs;
+        com.bsth.util.Geo.Point point;
+        List<com.bsth.util.Geo.Point> ps;
+        StationRoute sr;
+        for(PreconditionGeo p : list){
+            try{
+                sr = routeCodeMap.get(p.getLineCode()+"_"+p.getUpDown()+"_"+p.getStationCode());
+                p.setOrder(sr.getRouteSort());
+                //polygon
+                ps = new ArrayList<>();
+                coordList = Splitter.on(",").trimResults().splitToList(p.getCoords());
+                for(String c : coordList){
+                    cs = c.split(" ");
+                    point = new com.bsth.util.Geo.Point(Double.parseDouble(cs[0]), Double.parseDouble(cs[1]));
+                    ps.add(point);
+                }
+
+                p.setPolygon(new com.bsth.util.Geo.Polygon(ps));
+
+                sr.setPremise(true);
+                //按线路，走向分组
+                premiseGeoMapCopy.put(p.getLineCode()+"_"+p.getUpDown(), p);
+            }catch (Exception e){
+                logger.error("", e);
+            }
+        }
+
+        //排序
+        Set<String> ks = premiseGeoMapCopy.keySet();
+        PreconditionGeoComp comp = new PreconditionGeoComp();
+        for(String k : ks){
+            Collections.sort(premiseGeoMapCopy.get(k), comp);
+        }
+
+        premiseGeoMap = premiseGeoMapCopy;
+    }
+
+    private static class PreconditionGeoComp implements Comparator<PreconditionGeo>{
+
+        @Override
+        public int compare(PreconditionGeo p1, PreconditionGeo p2) {
+            return p1.getOrder() - p2.getOrder();
+        }
     }
     private void loadRoadsData() {
@@ -282,6 +342,28 @@ public class GeoCacheData {
                 connectStationRoute(tempMap.get(key));
             }
+            //定时启用的站点走向
+            if(tesMap.size() > 0){
+                List<String> rems = new ArrayList<>();
+                long t = System.currentTimeMillis();
+                for(TimedEnableStationRoute tes : tesMap.values()){
+                    if(tes.getEnableTime() > t){
+                        logger.info("锁住站点路由，"  + tes.getLineCode());
+                        tempMap.replaceValues(tes.getLineCode() + "_0", stationCacheMap.get(tes.getLineCode() + "_0"));
+                        tempMap.replaceValues(tes.getLineCode() + "_1", stationCacheMap.get(tes.getLineCode() + "_1"));
+                    }
+                    else
+                        rems.add(tes.getLineCode());
+                }
+
+                //remove
+                if(rems.size() > 0){
+                    for(String lineCode : rems){
+                        logger.info("启用路由，"  + lineCode);
+                        tesMap.remove(lineCode);
+                    }
+                }
+            }
             stationCacheMap = tempMap;
             routeCodeMap = codeMap;
         }
@@ -78,6 +78,7 @@ public abstract class SignalHandle {
         byte updown = Byte.parseByte(sch.getXlDir());
         //gps 切换走向
         gps.setUpDown(updown);
+        gps.setPremiseCode(null);
         List<StationRoute> srs = GeoCacheData.getStationRoute(sch.getXlBm(), updown);
         StationRoute station = GeoUtils.gpsInStation(gps, srs);
@@ -60,6 +60,11 @@ public class StationRoute {
     private String name;
+    /**
+     * 是否有前置进站约束
+     */
+    private boolean premise;
+
     public String getCode() {
         return code;
     }
@@ -147,5 +152,13 @@ public class StationRoute {
     public void setName(String name) {
         this.name = name;
     }
+
+    public boolean isPremise() {
+        return premise;
+    }
+
+    public void setPremise(boolean premise) {
+        this.premise = premise;
+    }
 }
+package com.bsth.data.gpsdata.arrival.entity;
+
+/**
+ * 定时启用站点路由
+ * Created by panzhao on 2017/8/28.
+ */
+public class TimedEnableStationRoute {
+
+    private String lineCode;
+
+    private Long enableTime;
+
+    public String getLineCode() {
+        return lineCode;
+    }
+
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
+    }
+
+    public Long getEnableTime() {
+        return enableTime;
+    }
+
+    public void setEnableTime(Long enableTime) {
+        this.enableTime = enableTime;
+    }
+}
@@ -65,8 +65,8 @@ public class AbnormalStateHandle extends SignalHandle{
      * @return
      */
     public boolean outOfBounds(GpsEntity gps){
-        //场内的车不处理
-        if(gps.getInstation() == 2){
+        //只处理电子围栏外的车
+        if(gps.getInstation() != 0){
             return false;
         }
@@ -4,6 +4,7 @@ import com.bsth.data.LineConfigData;
 import com.bsth.data.gpsdata.GpsEntity;
 import com.bsth.data.gpsdata.arrival.GeoCacheData;
 import com.bsth.data.gpsdata.arrival.SignalHandle;
+import com.bsth.data.gpsdata.arrival.entity.StationRoute;
 import com.bsth.data.gpsdata.arrival.utils.CircleQueue;
 import com.bsth.data.gpsdata.arrival.utils.ScheduleSignalState;
 import com.bsth.data.gpsdata.arrival.utils.SignalSchPlanMatcher;
@@ -148,6 +149,7 @@ public class InOutStationSignalHandle extends SignalHandle{
                 && (gps.getInstation()==0 || !gps.getStopNo().equals(prev.getStopNo()))
                 && !willDepart(gps, prev, sch)){
+            gps.setPremiseCode(null);
             //发车班次匹配
             signalSchPlanMatcher.outMatch(gps, sch);
             sch = dayOfSchedule.executeCurr(gps.getNbbm());
@@ -163,6 +165,10 @@ public class InOutStationSignalHandle extends SignalHandle{
             //实发时间
             sch.setFcsjActualAll(rsT);
+            sch.setSiginCompate(1);
+
+            //出站既出场
+            outStationAndOutPark(sch);
             //通知客户端
             sendUtils.sendFcsj(sch);
             //持久化
@@ -171,12 +177,11 @@ public class InOutStationSignalHandle extends SignalHandle{
             //清理应发未发标记
             LateAdjustHandle.remove(sch);
-            if(!gps.isService()){
+            if(!gps.isService() && !dayOfSchedule.emptyService(sch)){
                 //切换成营运状态
                 gpsStatusManager.changeServiceState(sch.getClZbh(), sch.getXlDir(), 0, "发车@系统");
             }
-            //出站既出场
-            outStationAndOutPark(sch);
+
             logger.info("车辆：" + sch.getClZbh() + " 班次：" + sch.getDfsj() + "发车， 时间：" + sch.getFcsjActual());
         }
         else if(isOutSch(sch)){
@@ -205,8 +210,8 @@ public class InOutStationSignalHandle extends SignalHandle{
             }
             if(next != null && prev.getStopNo().equals(next.getQdzCode())){
                 //发下一个班次
-                dayOfSchedule.addExecPlan(next);
-                outStation(gps, prev);
+                if(dayOfSchedule.addExecPlan(next))
+                    outStation(gps, prev);
             }
         }
         //当前班次是区间
@@ -218,8 +223,8 @@ public class InOutStationSignalHandle extends SignalHandle{
             //是环线
             if(prev.getStopNo().equals(next.getQdzCode())){
                 //发下一个班次
-                dayOfSchedule.addExecPlan(next);
-                outStation(gps, prev);
+                if(dayOfSchedule.addExecPlan(next))
+                    outStation(gps, prev);
             }
         }
     }
@@ -231,6 +236,10 @@ public class InOutStationSignalHandle extends SignalHandle{
      * @return
      */
     private boolean outManyFit(GpsEntity gps, ScheduleRealInfo sch) {
+        LineConfig conf = lineConfigData.get(sch.getXlBm());
+        if(null != conf && conf.isLockFirstOutTime())
+            return false;//锁定第一个发车信号，不匹配最佳
+
         if(StringUtils.isNotEmpty(sch.getZdsjActual()))
             return false;
@@ -238,39 +247,42 @@ public class InOutStationSignalHandle extends SignalHandle{
         long t2 = gps.getTimestamp();
         long c = sch.getDfsjT();
-        if(c - t1 > 1000 * 60 * 15 && Math.abs(t2 - c) < 1000 * 60 * 5){
+        /*if(c - t1 > 1000 * 60 * 15 && Math.abs(t2 - c) < 1000 * 60 * 5){
+            return true;
+        }*/
+        int threshold = 1000 * 60 * 5;
+        if(Math.abs(t2 - c) < threshold && c - t1 > threshold){
             return true;
         }
+        //if(Math.abs(t2 - c) < 1000 * 60 * 5 && c - t1 > 1000 * 60 * 5)
         return false;
     }
     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")
-                    && (!limitPark || park.equals(schPrev.getQdzCode()))) {
-
-                schPrev.setFcsjActualAll(sch.getFcsjActualTime());
-                schPrev.setZdsjActualAll(sch.getFcsjActualTime());
-
-                sendUtils.refreshSch(schPrev);
-                dayOfSchedule.save(schPrev);
-
-                /*if(schPrev.getBcType().equals("out")){
-                    //出场时，切换成营运状态
-                    String deviceId = BasicData.deviceId2NbbmMap.inverse().get(sch.getClZbh());
-                    gpsStatusManager.changeServiceState(deviceId, schPrev.getXlDir(), 0, "出场@系统");
-                    //DirectivePushQueue.put6003(schPrev.getClZbh(), 0, Integer.parseInt(schPrev.getXlDir()), "出场@系统");
-                    //directiveService.send60Operation(schPrev.getClZbh(), 0, Integer.parseInt(schPrev.getXlDir()), null, "出场@系统");
-                }*/
+        try{
+            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") && (schPrev.getBcsj()==0 || schPrev.getJhlcOrig().intValue()==0)
+                        && (!limitPark || park.equals(schPrev.getQdzCode()))) {
+
+                    schPrev.setFcsjActualAll(sch.getFcsjActualTime());
+                    schPrev.setZdsjActualAll(sch.getFcsjActualTime());
+                    //起点实到
+                    sch.setQdzArrDatesj(schPrev.getZdsjActual());
+
+                    sendUtils.refreshSch(schPrev);
+                    dayOfSchedule.save(schPrev);
+                }
             }
+        }catch (Exception e){
+            logger.error("", e);
         }
     }
@@ -283,7 +295,7 @@ public class InOutStationSignalHandle extends SignalHandle{
         ScheduleRealInfo sch = dayOfSchedule.executeCurr(gps.getNbbm());
         if(gps.getStopNo().equals(sch.getZdzCode())
-                && !gps.getStopNo().equals(prev.getStopNo())){
+                && (!gps.getStopNo().equals(prev.getStopNo()) || gps.getStopNo().equals(prev.getPremiseCode()))){
             int diff = 0;
             try{
@@ -299,6 +311,11 @@ public class InOutStationSignalHandle extends SignalHandle{
             if(Math.abs(diff) > MAX_NORMAL_DIFF)
                 return;
+            //校验进站前置约束
+            if(!validInPremise(gps)){
+                return;
+            }
+
             //环线或内外圈 ，飘出去再回来
             if(sch.getQdzCode().equals(sch.getZdzCode())
                     && StringUtils.isNotEmpty(sch.getFcsjActual())
@@ -316,7 +333,7 @@ public class InOutStationSignalHandle extends SignalHandle{
             long rsT = lineConfigData.applyIn(sch, gps.getTimestamp());
             sch.setZdsjActualAll(rsT);
-
+            sch.setSiginCompate(2);
             //通知误点停靠程序，有车辆到站
             LateAdjustHandle.carArrive(gps);
@@ -352,11 +369,12 @@ public class InOutStationSignalHandle extends SignalHandle{
                 if(!next.getXlBm().equals(sch.getXlBm())){
                     gpsStatusManager.changeLine(next.getClZbh(), next.getXlBm(), "套跑@系统");
                 }
-            }
-            else if(sch.getBcType().equals("in")){
-                //进场，切换成非营运状态
-                gpsStatusManager.changeServiceState(sch.getClZbh(), sch.getXlDir(), 1, "进场@系统");
-            }
+
+                //下一个班次是空驶班次
+                if(dayOfSchedule.emptyService(next))
+                    nonService(sch, "空驶@系统");
+            } else
+                nonService(sch, "结束@系统");
         }
         else {
             /*if(sch.getFcsjActual() == null){
@@ -393,9 +411,8 @@ public class InOutStationSignalHandle extends SignalHandle{
                     if(nearSch != null){
                         //直接跳到这个班次
-                        dayOfSchedule.addExecPlan(nearSch);
-                        //重新进站
-                        inStation(gps, prev);
+                        if(dayOfSchedule.addExecPlan(nearSch))
+                            inStation(gps, prev);//重新进站
                     }
                 }
             }
@@ -403,6 +420,28 @@ public class InOutStationSignalHandle extends SignalHandle{
     }
     /**
+     * 校验进站前置约束
+     * @param gps
+     * @return
+     */
+    private boolean validInPremise(GpsEntity gps) {
+        StationRoute sr = gps.getStation();
+        if(null == sr || !sr.isPremise())
+            return true;
+
+        String premiseCode = gps.getPremiseCode();
+
+        if(StringUtils.isNotEmpty(premiseCode) && premiseCode.equals(gps.getStopNo())){
+            logger.info("满足前置进站约束 " + premiseCode);
+            return true;
+        }
+        else{
+            logger.info(gps.getNbbm() + " not premiseCode 不满足前置进站约束 " + premiseCode);
+        }
+        return false;
+    }
+
+    /**
      * 和当前进站信号最匹配的一个班次
      * @param gps
      * @param halfList
@@ -420,7 +459,7 @@ public class InOutStationSignalHandle extends SignalHandle{
         String stopId = gps.getStopNo();
         for(int i = 0; i < halfList.size(); i ++){
             sch = halfList.get(i);
-            if(!sch.getZdzCode().equals(stopId))
+            if(!sch.getZdzCode().equals(stopId) || sch.getStatus()==2)
                 continue;
             if(sch.getZdsjT() < gps.getTimestamp())
@@ -443,7 +482,7 @@ public class InOutStationSignalHandle extends SignalHandle{
         boolean limitPark = StringUtils.isNotEmpty(park);
-        if (next.getBcType().equals("in") && config.getOutConfig() == 2
+        if (next.getBcType().equals("in") && config.getOutConfig() == 2 && (next.getBcsj()==0 || next.getJhlcOrig().equals(0))
                 && (!limitPark || park.equals(next.getZdzCode()))) {
             next.setFcsjActualAll(sch.getZdsjActualTime());
@@ -458,7 +497,7 @@ public class InOutStationSignalHandle extends SignalHandle{
                 dayOfSchedule.addExecPlan(next);
             //进场，切换成非营运状态
-            gpsStatusManager.changeServiceState(sch.getClZbh(), sch.getXlDir(), 1, "进场@系统");
+            nonService(sch, "进场@系统");
         }
     }
@@ -514,4 +553,13 @@ public class InOutStationSignalHandle extends SignalHandle{
     private boolean isInSch(ScheduleRealInfo sch){
         return sch.getBcType().equals("in") || GeoCacheData.tccMap.keySet().contains(sch.getZdzCode());
     }
+
+    /**
+     * 切换为非营运状态
+     * @param sch
+     * @param sender
+     */
+    private void nonService(ScheduleRealInfo sch, String sender){
+        gpsStatusManager.changeServiceState(sch.getClZbh(), sch.getXlDir(), 1, sender);
+    }
 }
 \ No newline at end of file
@@ -6,6 +6,8 @@ import com.bsth.data.gpsdata.arrival.SignalHandle;
 import com.bsth.data.gpsdata.arrival.entity.StationRoute;
 import com.bsth.data.gpsdata.arrival.utils.CircleQueue;
 import com.bsth.data.gpsdata.arrival.utils.GeoUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 import java.util.List;
@@ -17,6 +19,7 @@ import java.util.List;
 @Component
 public class StationInsideHandle extends SignalHandle {
+    Logger logger = LoggerFactory.getLogger(this.getClass());
     @Override
     public boolean handle(GpsEntity gps, CircleQueue<GpsEntity> prevs) {
@@ -37,13 +40,41 @@ public class StationInsideHandle extends SignalHandle {
             gps.setStation(station);
         }
+        //是否在进站前置围栏内
+        String premiseCode = GeoUtils.gpsInPremiseGeo(gps);
+        gps.setPremiseCode(premiseCode);
+
+        if(isNotEmpty(prevs)){
+            try {
+                GpsEntity prev = prevs.getTail();
+                //继承前置围栏
+                if(null == premiseCode && null != prev.getPremiseCode())
+                    gps.setPremiseCode(prev.getPremiseCode());
+
+                //在场，站外
+                if(gps.getInstation() == 0){
+                    //继承上一个点的站点编码
+                    gps.setStopNo(prev.getStopNo());
+
+                    /*if(null == premiseCode && null != prev.getPremiseCode())
+                        gps.setPremiseCode(prev.getPremiseCode());*/
+                }
+                /*else if(null != gps.getPremiseCode() && !gps.getStopNo().equals(gps.getPremiseCode())){
+                    gps.setPremiseCode(null);
+                }*/
+            }catch (Exception e){
+                logger.error("", e);
+            }
+        }
+
+/*
         //在场，站外
         if(gps.getInstation() == 0 && isNotEmpty(prevs)){
             //继承上一个点的站点编码
             GpsEntity prev = prevs.getTail();
             gps.setStopNo(prev.getStopNo());
         }
-
+*/
         return true;
     }
 }
+package com.bsth.data.gpsdata.arrival.precondition;
+
+import com.bsth.data.gpsdata.GpsEntity;
+import org.springframework.stereotype.Component;
+
+/**
+ * 进站（前置电子围栏）
+ * Created by panzhao on 2017/9/23.
+ */
+@Component
+public class InPreconditionHandler {
+
+    /**
+     * 进站动作是否有通过前置围栏
+     * @param gps
+     * @param prev
+     * @return
+     */
+    public boolean isPass(GpsEntity gps, GpsEntity prev){
+        return false;
+    }
+}
+package com.bsth.data.gpsdata.arrival.precondition.entity;
+
+import com.bsth.util.Geo.Polygon;
+
+/**
+ * 前置围栏 -地理坐标
+ * Created by panzhao on 2017/9/23.
+ */
+public class PreconditionGeo {
+
+    private String name;
+
+    /**
+     * 前置约束的站点编码
+     */
+    private String stationCode;
+
+    /**
+     * 线路编码
+     */
+    private String lineCode;
+
+    /**
+     * 上下行
+     */
+    private int upDown;
+
+    /**
+     * 多边形坐标
+     */
+    private String coords;
+
+    private com.bsth.util.Geo.Polygon polygon;
+
+    private Integer order;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getStationCode() {
+        return stationCode;
+    }
+
+    public void setStationCode(String stationCode) {
+        this.stationCode = stationCode;
+    }
+
+    public String getLineCode() {
+        return lineCode;
+    }
+
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
+    }
+
+    public int getUpDown() {
+        return upDown;
+    }
+
+    public void setUpDown(int upDown) {
+        this.upDown = upDown;
+    }
+
+    public String getCoords() {
+        return coords;
+    }
+
+    public void setCoords(String coords) {
+        this.coords = coords;
+    }
+
+    public Integer getOrder() {
+        return order;
+    }
+
+    public void setOrder(Integer order) {
+        this.order = order;
+    }
+
+    public Polygon getPolygon() {
+        return polygon;
+    }
+
+    public void setPolygon(Polygon polygon) {
+        this.polygon = polygon;
+    }
+}
@@ -3,6 +3,7 @@ package com.bsth.data.gpsdata.arrival.utils;
 import com.bsth.data.gpsdata.GpsEntity;
 import com.bsth.data.gpsdata.arrival.GeoCacheData;
 import com.bsth.data.gpsdata.arrival.entity.StationRoute;
+import com.bsth.data.gpsdata.arrival.precondition.entity.PreconditionGeo;
 import com.vividsolutions.jts.geom.Coordinate;
 import com.vividsolutions.jts.geom.GeometryFactory;
 import com.vividsolutions.jts.geom.LineString;
@@ -169,6 +170,28 @@ public class GeoUtils {
     }
     /**
+     * 是否在进站前置围栏内
+     * @param gps
+     * @return
+     */
+    public static String gpsInPremiseGeo(GpsEntity gps) {
+        List<PreconditionGeo> list = GeoCacheData.premiseGeoMap.get(gps.getLineId()+"_"+gps.getUpDown());
+
+        if(null == list || list.size()==0)
+            return null;
+
+        com.bsth.util.Geo.Point point = new com.bsth.util.Geo.Point(gps.getLon(), gps.getLat());
+        com.bsth.util.Geo.Polygon polygon;
+        for(PreconditionGeo p : list){
+            polygon = p.getPolygon();
+            if(com.bsth.util.Geo.GeoUtils.isPointInPolygon(point, polygon)){
+                return p.getStationCode();
+            }
+        }
+        return null;
+    }
+
+    /**
      * 是否是有效的连续点
      * @param prevGps
      * @param gps
@@ -69,8 +69,8 @@ public class SignalSchPlanMatcher {
         double s = (int) (next.getDfsjT() - sch.getDfsjT());
         double r = (int) (t - sch.getDfsjT());
         if(r / s > 0.7){
-            dayOfSchedule.addExecPlan(next);
-            outMatch(outSigal, next);
+            if(dayOfSchedule.addExecPlan(next))
+                outMatch(outSigal, next);
         }
     }
@@ -60,7 +60,7 @@ public class GpsDataRecovery implements ApplicationContextAware {
         for (String nbbm : keys) {
             Collections.sort(listMap.get(nbbm), comp);
             threadPool.execute(new RecoveryThread(listMap.get(nbbm), count));
-            /*if(nbbm.equals("W9H-088"))
+            /*if(nbbm.equals("W2H-015"))
                 new RecoveryThread(listMap.get(nbbm), count).run();*/
             /*if(lineId.equals("60028"))
                 new RecoveryThread(listMap.get(lineId), count).run();*/
@@ -84,7 +84,7 @@ public class GpsDataRecovery implements ApplicationContextAware {
         Calendar calendar = Calendar.getInstance();
         int dayOfYear = calendar.get(Calendar.DAY_OF_YEAR);
-        String sql = "select DEVICE_ID,LAT,LON,TS,SPEED_GPS,LINE_ID,SERVICE_STATE from bsth_c_gps_info where days_year=207";// + dayOfYear;
+        String sql = "select DEVICE_ID,LAT,LON,TS,SPEED_GPS,LINE_ID,SERVICE_STATE from bsth_c_gps_info where days_year=267";// + dayOfYear;
         JdbcTemplate jdbcTemplate = new JdbcTemplate(DBUtils_MS.getDataSource());
         List<GpsEntity> list =
@@ -153,7 +153,7 @@ public class GpsDataRecovery implements ApplicationContextAware {
                 boolean task;
                 for (GpsEntity gps : list) {
                     try {
-                        /*if(gps.getTimestamp() >= 1500942270000L){
+                        /*if(gps.getTimestamp() >= 1506216540000L){
                             System.out.println("debugger...");
                         }*/
                         //是否有任务
@@ -48,11 +48,11 @@ public class GpsDataLoaderThread extends Thread {
     //0：从GPS客户端内存获取  -1：从网关获取
     private static int flag = 0;
-    public static void setFlag(int v){
+    public static void setFlag(int v) {
         flag = v;
     }
-    public static int getFlag(int v){
+    public static int getFlag(int v) {
         return flag;
     }
@@ -65,7 +65,7 @@ public class GpsDataLoaderThread extends Thread {
     @Override
     public void run() {
         try {
-            if(flag == 0)
+            if (flag == 0)
                 load();
             else
                 loadByGateway();
@@ -76,6 +76,7 @@ public class GpsDataLoaderThread extends Thread {
     /**
      * 从网关获取实时GPS数据
+     *
      * @throws Exception
      */
     public void loadByGateway() throws Exception {
@@ -107,6 +108,9 @@ public class GpsDataLoaderThread extends Thread {
                 if (jsonObj != null)
                     list = JSON.parseArray(jsonObj.getString("data"), GpsEntity.class);
+                //过滤掉无效的点位
+                list = filterInvalid(list);
+
                 String nbbm;
                 GpsEntity old;
                 for (GpsEntity gps : list) {
@@ -130,7 +134,7 @@ public class GpsDataLoaderThread extends Thread {
                     //有更新的点位
                     updateList.add(gps);
                 }
-                logger.info("全量点："+ list.size() +"，更新点" + updateList.size());
+                logger.info("全量点：" + list.size() + "，更新点" + updateList.size());
                 //分析数据
                 gpsRealAnalyse.analyse(updateList);
             } else
@@ -146,9 +150,33 @@ public class GpsDataLoaderThread extends Thread {
     }
     /**
+     * 过滤无效的gps点位
+     *
+     * @param list
+     * @return
+     */
+    private List<GpsEntity> filterInvalid(List<GpsEntity> list) {
+        List<GpsEntity> rsList = new ArrayList<>();
+
+        try {
+            for (GpsEntity gps : list) {
+                if (gps.getValid() == 0)
+                    rsList.add(gps);
+            }
+
+            if (rsList.size() < list.size())
+                logger.info("过滤无效的点位 : " + (list.size() - rsList.size()));
+        } catch (Exception e) {
+            logger.error("", e);
+            rsList = list;
+        }
+        return rsList;
+    }
+
+    /**
      * 从客户端内存获取GPS数据
      */
-    public void load() throws Exception{
+    public void load() throws Exception {
         List<GpsEntity> list = null;
         CloseableHttpClient httpClient = null;
         CloseableHttpResponse response = null;
@@ -174,6 +202,10 @@ public class GpsDataLoaderThread extends Thread {
                     stringBuffer.append(str);
                 list = JSON.parseArray(stringBuffer.toString(), GpsEntity.class);
+
+                //过滤掉无效的点位
+                list = filterInvalid(list);
+
                 String nbbm;
                 logger.info("load end!");
                 for (GpsEntity gps : list) {
@@ -5,7 +5,6 @@ import com.bsth.service.directive.DirectiveService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeansException;
-import org.springframework.boot.CommandLineRunner;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.stereotype.Component;
@@ -17,7 +16,7 @@ import java.util.concurrent.ConcurrentLinkedQueue;
  * Created by panzhao on 2017/5/11.
  */
 @Component
-public class DirectivePushQueue implements CommandLineRunner, ApplicationContextAware {
+public class DirectivePushQueue implements ApplicationContextAware {
     static ConcurrentLinkedQueue<QueueData_Directive> linkedList;
     static DataPushThread thread;
@@ -80,10 +79,10 @@ public class DirectivePushQueue implements CommandLineRunner, ApplicationContext
         return linkedList.size();
     }
-    @Override
+/*    @Override
     public void run(String... strings) throws Exception {
         start();
-    }
+    }*/
     @Override
     public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
@@ -3,7 +3,6 @@ package com.bsth.data.msg_queue;
 import com.bsth.common.Constants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.boot.CommandLineRunner;
 import org.springframework.stereotype.Component;
 import org.springframework.web.socket.TextMessage;
 import org.springframework.web.socket.WebSocketSession;
@@ -15,7 +14,7 @@ import java.util.concurrent.ConcurrentLinkedQueue;
  * Created by panzhao on 2017/5/11.
  */
 @Component
-public class WebSocketPushQueue implements CommandLineRunner {
+public class WebSocketPushQueue {
     static ConcurrentLinkedQueue<QueueData> linkedList;
     static DataPushThread thread;
@@ -54,10 +53,6 @@ public class WebSocketPushQueue implements CommandLineRunner {
         return linkedList.size();
     }
-    @Override
-    public void run(String... strings) throws Exception {
-        start();
-    }
     public static class DataPushThread extends Thread {
@@ -278,12 +278,14 @@ public class DayOfSchedule {
         List<String> lprms = new ArrayList<>();
         Set<String> lps = lpScheduleMap.keySet();
         for (String lp : lps) {
-            if (lp.indexOf(lineCode + "_") != -1)
+            if (lp.startsWith(lineCode + "_"))
                 lprms.add(lp);
         }
-        for (String lp : lprms)
+        for (String lp : lprms){
+            logger.info("清理路牌映射 " + lp);
             lpScheduleMap.removeAll(lp);
+        }
         logger.info(lineCode + "排班清理 " + count);
     }
@@ -571,7 +573,7 @@ public class DayOfSchedule {
                 continue;
             //出站既出场，忽略出场班次
-            if (outConfig == 2 && temp.getBcType().equals("out")
+            if (outConfig == 2 && temp.getBcType().equals("out") && (temp.getBcsj()==0 || temp.getJhlcOrig().equals(0))
                     && (!limitPark || park.equals(temp.getQdzCode())))
                 continue;
@@ -590,7 +592,7 @@ public class DayOfSchedule {
      * @param sch  当前班次
      * @return
      */
-    private ScheduleRealInfo next2(Collection<ScheduleRealInfo> list, ScheduleRealInfo sch) {
+    private ScheduleRealInfo next2_lp(Collection<ScheduleRealInfo> list, ScheduleRealInfo sch) {
         int outConfig = -1;
         LineConfig config = lineConfigData.get(sch.getXlBm());
         if (config != null)
@@ -603,8 +605,35 @@ public class DayOfSchedule {
                 flag = true;
                 continue;
             }
-            //忽略烂班
-            if (temp.isDestroy())
+
+            if (flag) {
+                next = temp;
+                break;
+            }
+        }
+        return next;
+    }
+
+    private ScheduleRealInfo next3_lp(Collection<ScheduleRealInfo> list, ScheduleRealInfo sch) {
+        int outConfig = -1;
+        LineConfig config = lineConfigData.get(sch.getXlBm());
+        if (config != null)
+            outConfig = config.getOutConfig();
+
+        //限定出站既出场的停车场
+        String park = config.getTwinsPark();
+        boolean limitPark = StringUtils.isNotEmpty(park);
+        boolean flag = false;
+        ScheduleRealInfo next = null;
+        for (ScheduleRealInfo temp : list) {
+            if (temp.getId() == sch.getId()) {
+                flag = true;
+                continue;
+            }
+
+            //出站既出场，忽略出场班次
+            if (outConfig == 2 && temp.getBcType().equals("out") && (temp.getBcsj()==0 || temp.getJhlcOrig().equals(0))
+                    && (!limitPark || park.equals(temp.getQdzCode())))
                 continue;
             if (flag) {
@@ -729,7 +758,7 @@ public class DayOfSchedule {
     /**
      * @Title: prveNotExecNum
      * @Description: TODO(班次之前未执行班次数量)
-     */
+
     public int prveNotExecNum(ScheduleRealInfo sch) {
         int n = 0;
         List<ScheduleRealInfo> list = nbbmScheduleMap.get(sch.getClZbh());
@@ -741,29 +770,29 @@ public class DayOfSchedule {
                 break;
         }
         return n;
-    }
+    }*/
     /**
      * @Title: validEndTime
      * @Description: TODO(是否是有效的到达时间)
-     */
+
     public boolean validEndTime(ScheduleRealInfo sch, Long ts) {
         if (sch.getFcsjActualTime() != null && sch.getFcsjActualTime() > ts)
             return false;
         return validTime(sch, ts);
-    }
+    }*/
     /**
      * @Title: validStartTime
      * @Description: TODO(是否是合适的发车时间)
-     */
+
     public boolean validStartTime(ScheduleRealInfo sch, Long ts) {
         if (sch.getZdsjActualTime() != null && sch.getZdsjActualTime() < ts)
             return false;
         return validTime(sch, ts);
-    }
+    }*/
     public boolean validTime(ScheduleRealInfo sch, Long ts) {
         List<ScheduleRealInfo> list = nbbmScheduleMap.get(sch.getClZbh());
@@ -875,15 +904,16 @@ public class DayOfSchedule {
         return outList;
     }
-    public Set<String> allCar() {
+/*    public Set<String> allCar() {
         return nbbmScheduleMap.keySet();
-    }
+    }*/
     public Collection<ScheduleRealInfo> findAll() {
         return nbbmScheduleMap.values();
     }
-    public void addExecPlan(ScheduleRealInfo sch) {
+    public boolean addExecPlan(ScheduleRealInfo sch) {
+        ScheduleRealInfo oldExec = executeCurr(sch.getClZbh());
         if (sch != null){
             if(sch.getStatus()==2)
                 reCalcExecPlan(sch.getClZbh());
@@ -892,6 +922,8 @@ public class DayOfSchedule {
         }
         else
             carExecutePlanMap.remove(sch.getClZbh());
+
+        return executeCurr(sch.getClZbh()) != oldExec;
     }
     public void removeExecPlan(String clzbh) {
@@ -939,15 +971,16 @@ public class DayOfSchedule {
         return ups;
     }
-    public void removeNbbm2SchMapp(ScheduleRealInfo sch, String nbbm) {
-        nbbmScheduleMap.remove(nbbm, sch);
+    public void removeNbbm2SchMapp(ScheduleRealInfo sch) {
+        nbbmScheduleMap.remove(sch.getClZbh(), sch);
     }
-    public void addNbbm2SchMapp(ScheduleRealInfo sch, String nbbm) {
-        nbbmScheduleMap.put(nbbm, sch);
+    public void addNbbm2SchMapp(ScheduleRealInfo sch) {
+        nbbmScheduleMap.put(sch.getClZbh(), sch);
     }
     public void reCalcExecPlan(String nbbm) {
+        logger.info("reCalcExecPlan...: " + nbbm);
         List<ScheduleRealInfo> list = nbbmScheduleMap.get(nbbm);
         Collections.sort(list, schFCSJComparator);
@@ -1119,7 +1152,7 @@ public class DayOfSchedule {
     public ScheduleRealInfo nextByLp(ScheduleRealInfo sch) {
         List<ScheduleRealInfo> list = lpScheduleMap.get(sch.getXlBm() + "_" + sch.getLpName());
         Collections.sort(list, schFCSJComparator);
-        return next(list, sch);
+        return next3_lp(list, sch);
     }
     /**
@@ -1131,10 +1164,22 @@ public class DayOfSchedule {
     public ScheduleRealInfo nextByLp2(ScheduleRealInfo sch) {
         List<ScheduleRealInfo> list = lpScheduleMap.get(sch.getXlBm() + "_" + sch.getLpName());
         Collections.sort(list, schFCSJComparator);
-        return next2(list, sch);
+        return next2_lp(list, sch);
     }
     public ArrayListMultimap<String, ScheduleRealInfo> getLpScheduleMap() {
         return lpScheduleMap;
     }
+
+    /**
+     * 重新全量计算路牌下的班次关联性
+     * 临时性的函数
+     */
+    public void _test_reCalcLpSch() {
+        Map<String ,Collection<ScheduleRealInfo>> map = lpScheduleMap.asMap();
+        Set<String> ks = map.keySet();
+        for(String k : ks){
+            schAttrCalculator.calcQdzTimePlan(new ArrayList<ScheduleRealInfo>(map.get(k)));
+        }
+    }
 }
 \ No newline at end of file
@@ -17,212 +17,291 @@ import java.util.Collections;
 import java.util.List;
 /**
- * 
+ * @author PanZhao
  * @ClassName: SchAttrCalculator
  * @Description: TODO(班次相关属性计算器)
- * @author PanZhao
  * @date 2016年8月15日 下午4:40:26
- *
  */
 @Component
 public class SchAttrCalculator {
-	@Autowired
-	LineConfigData lineConfigData;
-
-	private final static long DAY_TIME = 1000 * 60 * 60 * 24L;
-
-	Logger logger = LoggerFactory.getLogger(this.getClass());
-
-	private static DateTimeFormatter fmtyyyyMMdd = DateTimeFormat.forPattern("yyyy-MM-dd")
-			,fmtHHmm = DateTimeFormat.forPattern("HH:mm")
-			,fmtyyyyMMddHHmm = DateTimeFormat.forPattern("yyyy-MM-ddHH:mm");
-
-	/**
-	 * @Title: calcRealDate
-	 * @Description: TODO(计算班次的真实执行日期)
-	 */
-	public SchAttrCalculator calcRealDate(ScheduleRealInfo sch) {
-		LineConfig conf = lineConfigData.get(sch.getXlBm());
-
-		try {
-			if (null == sch.getFcsjT())
-				calcFcsjTime(sch);
-
-			//计发時間
-			if(sch.getFcsj().compareTo(conf.getStartOpt()) < 0){
-				sch.setFcsjAll(fmtyyyyMMddHHmm.parseMillis(sch.getScheduleDateStr()+sch.getFcsj()) + DAY_TIME);
-			}
-
-			//待发時間
-			if(sch.getDfsj().compareTo(conf.getStartOpt()) < 0){
-				sch.setDfsjAll(fmtyyyyMMddHHmm.parseMillis(sch.getScheduleDateStr()+sch.getDfsj()) + DAY_TIME);
-			}
-			else
-				sch.setDfsjAll(fmtyyyyMMddHHmm.parseMillis(sch.getScheduleDateStr()+sch.getDfsj()));
-
-			//实发時間
-			if(StringUtils.isNotEmpty(sch.getFcsjActual()) &&
-					sch.getFcsjActual().compareTo(conf.getStartOpt()) < 0){
-				sch.setFcsjActualAll(fmtyyyyMMddHHmm.parseMillis(sch.getScheduleDateStr()+sch.getFcsjActual()) + DAY_TIME);
-			}
-
-			//实际终点時間
-			if(StringUtils.isNotEmpty(sch.getZdsjActual()) &&
-					sch.getZdsjActual().compareTo(conf.getStartOpt()) < 0){
-				sch.setZdsjActualAll(fmtyyyyMMddHHmm.parseMillis(sch.getScheduleDateStr()+sch.getZdsjActual()) + DAY_TIME);
-			}
-
-			sch.setRealExecDate(fmtyyyyMMdd.print(sch.getFcsjT()));
-		} catch (Exception e) {
-			logger.error("", e);
-		}
-		return this;
-	}
-
-	/**
-	 * 
-	 * @Title: calcAllTimeByFcsj
-	 * @Description: TODO(根据发车时间字符串计算 （计发时间，终点时间，待发时间）)
-	 */
-	public SchAttrCalculator calcAllTimeByFcsj(ScheduleRealInfo sch) {
-		try {
-			// 生成时间戳
-			calcTimestamp(sch);
-			
-			// 计划终点时间
-			if (sch.getBcsj() != null) {
-				sch.setZdsjT(sch.getDfsjT() + (sch.getBcsj() * 60 * 1000));
-				sch.setZdsj(fmtHHmm.print(sch.getZdsjT()));
-			}
-		} catch (ParseException e) {
-			logger.error("", e);
-		}
-		return this;
-	}
-	
-	/**
-	 * 
-	 * @Title: calcQdzTimePlan 
-	 * @Description: TODO(计算班次的起点应到时间)
-	 */
-	public void calcQdzTimePlan(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.getZdzName().equals(curr.getQdzName())
-					|| prve.getZdzCode().equals(curr.getQdzCode())){
-				curr.setQdzArrDatejh(prve.getZdsj());
-				if(StringUtils.isNotEmpty(prve.getZdsjActual()))
-					curr.setQdzArrDatesj(prve.getZdsjActual());
-			}
-			prve = curr;
-		}
-	}
-	
-	/**
-	 * 
-	 * @Title: updateQdzTimePlan 
-	 * @Description: TODO(更新班次的起点应到时间) 并返回被更新的班次
-	 */
-	public List<ScheduleRealInfo> updateQdzTimePlan(List<ScheduleRealInfo> list){
-		Collections.sort(list, new ScheduleComparator.FCSJ());
-		
-		List<ScheduleRealInfo> updateList = new ArrayList<>();
-		int len = list.size();
-		if(len == 0)
-			return updateList;
-		
-		ScheduleRealInfo prve = list.get(0), curr;
-		for(int i = 1; i < len; i ++){
-			curr = list.get(i);
-			
-			if(prve.getZdzName().equals(curr.getQdzName())
-					|| prve.getZdzCode().equals(curr.getQdzCode())){
-				
-				if(curr.getQdzArrDatejh() != null && prve.getZdsj().equals(curr.getQdzArrDatejh())){
-					prve = curr;
-					continue;
-				}
-					
-				curr.setQdzArrDatejh(prve.getZdsj());
-				updateList.add(curr);
-			}
-			else{
-				curr.setQdzArrDatejh(null);
-				updateList.add(curr);
-			}
-			prve = curr;
-		}
-		
-		return updateList;
-	}
-
-	public SchAttrCalculator calcFcsjTime(ScheduleRealInfo sch) throws ParseException {
-		sch.setFcsjT(fmtyyyyMMddHHmm.parseMillis(sch.getRealExecDate() + sch.getFcsj()));
-		return this;
-	}
-	
-	public void calcTimestamp(ScheduleRealInfo sch) throws ParseException{
-		//计发时间
-		if(sch.getFcsjT() == null)
-			calcFcsjTime(sch);
-		
-		//待发时间
-		if(sch.getDfsj() == null)
-			sch.setDfsjAll(sch.getFcsjT());
-		if(sch.getDfsjT() == null)
-			sch.setDfsjAll(sch.getDfsj());
-		
-		//实发时间戳
-		if(sch.getFcsjActualTime() == null && sch.getFcsjActual() != null)
-			sch.setFcsjActualAll(sch.getFcsjActual());
-		
-		//实达时间戳
-		if(sch.getZdsjActualTime() == null && sch.getZdsjActual() != null)
-			sch.setZdsjActualAll(sch.getZdsjActual());
-	}
-
-	/**
-	 * 计算当前要执行的班次
-	 * @param list
-	 * @return
-	 */
-	public ScheduleRealInfo calcCurrentExecSch(List<ScheduleRealInfo> list){
-		String lineCode = list.get(0).getXlBm();
-		LineConfig conf = lineConfigData.get(lineCode);
-		int outConfig = -1;
-		//限定出站既出场的停车场
-		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")
-					&& (!limitPark || park.equals(sch.getQdzCode())))
-				continue;
-
-			//忽略烂班
-			if(sch.isDestroy())
-				continue;
-
-			//已执行
-			if(StringUtils.isNotEmpty(sch.getZdsjActual()))
-				continue;
-
-			return sch;
-		}
-		return null;
-	}
+    @Autowired
+    LineConfigData lineConfigData;
+
+    private final static long DAY_TIME = 1000 * 60 * 60 * 24L;
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    private static DateTimeFormatter fmtyyyyMMdd = DateTimeFormat.forPattern("yyyy-MM-dd"), fmtHHmm = DateTimeFormat.forPattern("HH:mm"), fmtyyyyMMddHHmm = DateTimeFormat.forPattern("yyyy-MM-ddHH:mm");
+
+    /**
+     * @Title: calcRealDate
+     * @Description: TODO(计算班次的真实执行日期)
+     */
+    public SchAttrCalculator calcRealDate(ScheduleRealInfo sch) {
+        LineConfig conf = lineConfigData.get(sch.getXlBm());
+
+        try {
+            if (null == sch.getFcsjT())
+                calcFcsjTime(sch);
+
+            String rq = sch.getScheduleDateStr();
+            //计发時間
+            sch.setFcsjAll(getTime(rq, sch.getFcsj(), conf));
+
+            //待发時間
+            sch.setDfsjAll(getTime(rq, sch.getDfsj(), conf));
+            /*if (sch.getDfsj().compareTo(conf.getStartOpt()) < 0) {
+                sch.setDfsjAll(fmtyyyyMMddHHmm.parseMillis(sch.getScheduleDateStr() + sch.getDfsj()) + DAY_TIME);
+            } else
+                sch.setDfsjAll(fmtyyyyMMddHHmm.parseMillis(sch.getScheduleDateStr() + sch.getDfsj()));*/
+
+            //实发時間
+            sch.setFcsjActualAll(getTime(rq, sch.getFcsjActual(), conf));
+            /*if (StringUtils.isNotEmpty(sch.getFcsjActual()) &&
+                    sch.getFcsjActual().compareTo(conf.getStartOpt()) < 0) {
+                sch.setFcsjActualAll(fmtyyyyMMddHHmm.parseMillis(sch.getScheduleDateStr() + sch.getFcsjActual()) + DAY_TIME);
+            }*/
+
+            //实际终点時間
+            sch.setZdsjActualAll(getTime(rq, sch.getZdsjActual(), conf));
+            /*if (StringUtils.isNotEmpty(sch.getZdsjActual()) &&
+                    sch.getZdsjActual().compareTo(conf.getStartOpt()) < 0) {
+                sch.setZdsjActualAll(fmtyyyyMMddHHmm.parseMillis(sch.getScheduleDateStr() + sch.getZdsjActual()) + DAY_TIME);
+            }*/
+
+            sch.setRealExecDate(fmtyyyyMMdd.print(sch.getFcsjT()));
+        } catch (Exception e) {
+            logger.error("", e);
+        }
+        return this;
+    }
+
+    public Long getTime(String rq, String timeStr, LineConfig conf) {
+        Long t = null;
+        if (StringUtils.isNotEmpty(timeStr)) {
+            t = fmtyyyyMMddHHmm.parseMillis(rq + timeStr);
+            if(timeStr.compareTo(conf.getStartOpt()) < 0)
+                return t + DAY_TIME;
+        }
+        return t;
+    }
+
+    /**
+     * @Title: calcAllTimeByFcsj
+     * @Description: TODO(根据发车时间字符串计算 （计发时间，终点时间，待发时间）)
+     */
+    public SchAttrCalculator calcAllTimeByFcsj(ScheduleRealInfo sch) {
+        try {
+            // 生成时间戳
+            calcTimestamp(sch);
+
+            // 计划终点时间
+            if (sch.getBcsj() != null) {
+                sch.setZdsjT(sch.getDfsjT() + (sch.getBcsj() * 60 * 1000));
+                sch.setZdsj(fmtHHmm.print(sch.getZdsjT()));
+            }
+        } catch (ParseException e) {
+            logger.error("", e);
+        }
+        return this;
+    }
+
+    /**
+     * @Title: calcQdzTimePlan
+     * @Description: TODO(计算班次的起点应到时间)
+     */
+    public void calcQdzTimePlan(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 (isJoin(prve, curr)) {
+                curr.setQdzArrDatejh(prve.getZdsj());
+                if (StringUtils.isNotEmpty(prve.getZdsjActual()))
+                    curr.setQdzArrDatesj(prve.getZdsjActual());
+            }
+            prve = curr;
+        }
+    }
+
+    private boolean isJoin(ScheduleRealInfo prve, ScheduleRealInfo curr) {
+        return prve.getZdzName().equals(curr.getQdzName())//名称相等
+                || prve.getZdzCode().equals(curr.getQdzCode())//编码相等
+                || prve.getZdzName().startsWith(curr.getQdzName())//起始包括
+                || curr.getQdzName().startsWith(prve.getZdzName());//起始包括
+    }
+
+    /**
+     * @Title: updateQdzTimePlan
+     * @Description: TODO(更新班次的起点应到时间) 并返回被更新的班次
+     */
+    public List<ScheduleRealInfo> updateQdzTimePlan(List<ScheduleRealInfo> list) {
+        Collections.sort(list, new ScheduleComparator.FCSJ());
+
+        List<ScheduleRealInfo> updateList = new ArrayList<>();
+        int len = list.size();
+        if (len == 0)
+            return updateList;
+
+        ScheduleRealInfo prve = list.get(0), curr;
+        for (int i = 1; i < len; i++) {
+            curr = list.get(i);
+
+            if (prve.getZdzName().equals(curr.getQdzName())
+                    || prve.getZdzCode().equals(curr.getQdzCode())) {
+
+                if (curr.getQdzArrDatejh() != null && prve.getZdsj().equals(curr.getQdzArrDatejh())) {
+                    prve = curr;
+                    continue;
+                }
+
+                curr.setQdzArrDatejh(prve.getZdsj());
+                updateList.add(curr);
+            } else {
+                curr.setQdzArrDatejh(null);
+                updateList.add(curr);
+            }
+            prve = curr;
+        }
+
+        return updateList;
+    }
+
+    public SchAttrCalculator calcFcsjTime(ScheduleRealInfo sch) throws ParseException {
+        sch.setFcsjT(fmtyyyyMMddHHmm.parseMillis(sch.getRealExecDate() + sch.getFcsj()));
+        return this;
+    }
+
+    public void calcTimestamp(ScheduleRealInfo sch) throws ParseException {
+        //计发时间
+        if (sch.getFcsjT() == null)
+            calcFcsjTime(sch);
+
+        //待发时间
+        if (sch.getDfsj() == null)
+            sch.setDfsjAll(sch.getFcsjT());
+        if (sch.getDfsjT() == null)
+            sch.setDfsjAll(sch.getDfsj());
+
+        //实发时间戳
+        if (sch.getFcsjActualTime() == null && sch.getFcsjActual() != null)
+            sch.setFcsjActualAll(sch.getFcsjActual());
+
+        //实达时间戳
+        if (sch.getZdsjActualTime() == null && sch.getZdsjActual() != null)
+            sch.setZdsjActualAll(sch.getZdsjActual());
+    }
+
+    /**
+     * 计算当前要执行的班次
+     *
+     * @param list
+     * @return
+     */
+    public ScheduleRealInfo calcCurrentExecSch(List<ScheduleRealInfo> list) {
+        String lineCode = list.get(0).getXlBm();
+        LineConfig conf = lineConfigData.get(lineCode);
+        long t = System.currentTimeMillis();
+        int outConfig = -1;
+        //限定出站既出场的停车场
+        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")
+                    && (!limitPark || park.equals(sch.getQdzCode())))
+                continue;
+
+            //忽略烂班
+            if (sch.isDestroy())
+                continue;
+
+            //已执行
+            if (StringUtils.isNotEmpty(sch.getZdsjActual()))
+                continue;
+
+            if (Math.abs((t - sch.getDfsjT())) > 1000 * 60 * 60) {
+                //差值较大，倒着找看有没有更合适的
+                ScheduleRealInfo schReverse = calcCurrentExecSchReverse(list, outConfig, limitPark, park);
+                if (null != schReverse && !schReverse.getId().equals(sch.getId())) {
+                    logger.info("calc_current_exec_sch_reverse... -" + schReverse.getId());
+                    return suitableExecSch(schReverse, sch, t);
+                }
+            }
+            return sch;
+        }
+        return null;
+    }
+
+    /**
+     * 反转匹配一个班次
+     *
+     * @param list
+     * @param outConfig
+     * @param limitPark
+     * @param park
+     * @return
+     */
+    private ScheduleRealInfo calcCurrentExecSchReverse(List<ScheduleRealInfo> list, int outConfig, boolean limitPark, String park) {
+        ScheduleRealInfo near = null;
+        for (ScheduleRealInfo sch : list) {
+            //如果是出站既出场，忽略出场班次
+            if (outConfig == 2 && isInout(sch)
+                    && (!limitPark || park.equals(sch.getQdzCode()) || park.equals(sch.getZdzCode())))
+                continue;
+
+            //忽略烂班
+            if (sch.isDestroy())
+                continue;
+
+            if (StringUtils.isNotEmpty(sch.getZdsjActual())) {
+                near = null;
+                continue;
+            }
+
+            if (null == near)
+                near = sch;
+        }
+        return near;
+    }
+
+    /**
+     * 比较2个班次，谁是指定时间更合适执行的
+     *
+     * @param schReverse
+     * @param sch
+     * @param t
+     * @return
+     */
+    private ScheduleRealInfo suitableExecSch(ScheduleRealInfo schReverse, ScheduleRealInfo sch, long t) {
+        return Math.abs(t - schReverse.getDfsjT()) > Math.abs(t - sch.getDfsjT()) ? sch : schReverse;
+    }
+
+    private boolean isInout(ScheduleRealInfo sch) {
+        return sch.getBcType().equals("out") || sch.getBcType().equals("in");
+    }
+
+    /**
+     *
+     * @param fcsjT
+     * @param zdsjT
+     */
+    public boolean isValid(Long fcsjT, Long zdsjT) {
+        if(null != fcsjT && null != zdsjT)
+            return fcsjT < zdsjT;
+
+        return true;
+    }
 }
@@ -3,6 +3,8 @@ package com.bsth.data.schedule;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import java.util.Comparator;
+import java.util.HashMap;
+import java.util.Map;
 /**
  * 
@@ -20,20 +22,38 @@ public class ScheduleComparator {
 			return s1.getFcno() - s2.getFcno();
 		}
 	}*/
+
+	static Map<String, Integer> bcTypeOrderMap = new HashMap<>();
+
+	static{
+		bcTypeOrderMap.put("out", 0);
+		bcTypeOrderMap.put("normal", 1);
+		bcTypeOrderMap.put("region", 2);
+		bcTypeOrderMap.put("major", 3);
+		bcTypeOrderMap.put("venting", 4);
+		bcTypeOrderMap.put("ldks", 5);
+		bcTypeOrderMap.put("in", 6);
+	}
 	public static class FCSJ  implements Comparator<ScheduleRealInfo>{
 		@Override
 		public int compare(ScheduleRealInfo s1, ScheduleRealInfo s2) {
-			return (int) (s1.getFcsjT() - s2.getFcsjT());
+			int diff = (int) (s1.getFcsjT() - s2.getFcsjT());
+			return diff!=0?diff:typeOrder(s1.getBcType()) - typeOrder(s2.getBcType());
 		}
 	}
+	private static int typeOrder(String bcType){
+		return bcTypeOrderMap.get(bcType)!=null?bcTypeOrderMap.get(bcType):0;
+	}
+
 	public static class DFSJ  implements Comparator<ScheduleRealInfo>{
 		@Override
 		public int compare(ScheduleRealInfo s1, ScheduleRealInfo s2) {
-			return (int) (s1.getDfsjT() - s2.getDfsjT());
+			int diff = (int) (s1.getDfsjT() - s2.getDfsjT());
+			return diff!=0?diff:typeOrder(s1.getBcType()) - typeOrder(s2.getBcType());
 		}
 	}
 }
@@ -15,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import java.util.Date;
+import java.util.LinkedList;
 /**
  * 为报表写入相关的班次修改记录
@@ -27,9 +28,12 @@ public class FormLogger {
     Logger log = LoggerFactory.getLogger(this.getClass());
+    static LinkedList<Changetochange> ccPsts = new LinkedList<>();
+
     @Autowired
     ChangetochangeRepository changetochangeRepository;
+
     /**
      * 换人换车情况表
      */
@@ -70,7 +74,9 @@ public class FormLogger {
             if(StringUtils.isNotEmpty(newJsy))
                 cc.setSjgh(newJsy);
-            changetochangeRepository.save(cc);
+            //改异步入库
+            ccPsts.add(cc);
+            //changetochangeRepository.save(cc);
         }catch (Exception e){
             log.error("纪录换人换车情况表", e);
         }
@@ -82,4 +88,13 @@ public class FormLogger {
         cpc.setJsy(jsy);
         saveChangetochange(sch, cpc);
     }
+
+    public void saveDb(){
+        Changetochange cc;
+        for(int i = 0; i < 1000; i ++){
+            cc = ccPsts.poll();
+            if(null != cc)
+                changetochangeRepository.save(cc);
+        }
+    }
 }
@@ -23,6 +23,9 @@ public class SeiPstThread extends Thread{
     Logger log = LoggerFactory.getLogger(this.getClass());
+    @Autowired
+    FormLogger formLogger;
+
     @Override
     public void run() {
         try{
@@ -40,6 +43,9 @@ public class SeiPstThread extends Thread{
             }
             repository.save(pstList);
+
+            //报表结构化日志入库
+            formLogger.saveDb();
         }catch (Exception e){
             log.error("", e);
         }
@@ -101,6 +101,7 @@ public class LateAdjustHandle implements ApplicationContextAware{
                 lateSchMap.remove(sch.getClZbh());
                 sch.setLate2(false);
                 sch.setLateMinute(0);
+                sch.setDfAuto(false);
             }
         }catch (Exception e){
             logger.error("", e);
+package com.bsth.data.schedule.signal;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * Created by panzhao on 2017/8/14.
+ */
+@Component
+public class SchSiginUpdateDBThread extends Thread{
+
+    @Autowired
+    SignalComplateHandler signalComplateHandler;
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Override
+    public void run() {
+        try{
+            signalComplateHandler.handler();
+        }catch (Exception e){
+            logger.error("", e);
+        }
+    }
+}
+package com.bsth.data.schedule.signal;
+
+import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.data.schedule.signal.entity.SchSiginCompate;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.util.db.DBUtils_MS;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.BatchPreparedStatementSetter;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.datasource.DataSourceTransactionManager;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.TransactionDefinition;
+import org.springframework.transaction.TransactionStatus;
+import org.springframework.transaction.support.DefaultTransactionDefinition;
+
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 班次信号补全（写入数据库，网关以补发的形式提交运管处）
+ * Created by panzhao on 2017/8/13.
+ */
+@Component
+public class SignalComplateHandler {
+
+    @Autowired
+    DayOfSchedule dayOfSchedule;
+
+    Logger log = LoggerFactory.getLogger(this.getClass());
+
+    public void handler(){
+        Collection<ScheduleRealInfo> all = dayOfSchedule.findAll();
+        List<SchSiginCompate> list = new ArrayList<>();
+
+        SchSiginCompate siginCompate;
+        Date d = new Date();
+        long et = System.currentTimeMillis() - (1000 * 60 * 60 * 2),
+            st = et - (1000 * 60 * 60 * 2);
+        for(ScheduleRealInfo sch : all){
+            if(sch.getDfsjT() > et || sch.getDfsjT() < st)
+                continue;
+
+            //能自动完成的
+            if(sch.getSiginCompate() >= 2)
+                continue;
+
+            //烂班
+            if(sch.isDestroy())
+                continue;
+
+            //空驶任务
+            if(dayOfSchedule.emptyService(sch))
+                continue;
+
+            siginCompate = new SchSiginCompate(sch);
+            if(siginCompate == null || StringUtils.isEmpty(siginCompate.getDeciveId()))
+                continue;
+
+            //标记已经补发
+            sch.setSiginCompate(3);
+            //标记入库
+            dayOfSchedule.save(sch);
+            siginCompate.setCreateDate(d);
+            list.add(siginCompate);
+        }
+
+        put(list);
+    }
+
+    public void put(final List<SchSiginCompate> list){
+        if(null == list || list.size() == 0)
+            return;
+
+        JdbcTemplate jdbcTemp = new JdbcTemplate(DBUtils_MS.getDataSource());
+        //编程式事务
+        DataSourceTransactionManager tran = new DataSourceTransactionManager(jdbcTemp.getDataSource());
+        DefaultTransactionDefinition def = new DefaultTransactionDefinition();
+        def.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRED);
+        TransactionStatus status = tran.getTransaction(def);
+
+        try{
+            jdbcTemp.batchUpdate("insert into bsth_t_sigin_complate(id, rq, line_code, device_id, up_down, s_code, e_code, st, et, create_date, status) VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", new BatchPreparedStatementSetter() {
+                @Override
+                public void setValues(PreparedStatement ps, int i) throws SQLException {
+                    SchSiginCompate sc = list.get(i);
+                    ps.setLong(1, sc.getId());
+                    ps.setString(2, sc.getRq());
+                    ps.setString(3, sc.getLineCode());
+                    ps.setString(4, sc.getDeciveId());
+                    ps.setInt(5, sc.getUpDown());
+                    ps.setString(6, sc.getsCode());
+                    ps.setString(7, sc.geteCode());
+                    ps.setLong(8, sc.getSt());
+                    ps.setLong(9, sc.getEt());
+                    ps.setDate(10, new java.sql.Date(sc.getCreateDate().getTime()));
+                    ps.setInt(11, sc.getStatus());
+                }
+
+                @Override
+                public int getBatchSize() {
+                    return list.size();
+                }
+            });
+
+            tran.commit(status);
+            log.info("补信号班次入库，" + list.size());
+        }catch (Exception e){
+            log.error("", e);
+            tran.rollback(status);
+        }
+    }
+
+
+}
+package com.bsth.data.schedule.signal.entity;
+
+import com.bsth.data.BasicData;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+
+import java.util.Date;
+
+/**
+ * 班次信号补偿
+ * Created by panzhao on 2017/8/13.
+ */
+public class SchSiginCompate {
+
+    /** 实际班次ID */
+    private long id;
+
+    /** 班次日期 */
+    private String rq;
+
+    /** 线路编码 */
+    private String lineCode;
+
+    /** 设备号 */
+    private String deciveId;
+
+    /** 上下行 */
+    private int upDown;
+
+    /** 起始站编码 */
+    private String sCode;
+
+    /** 终点站编码 */
+    private String eCode;
+
+    /** 开始时间戳 */
+    private long st;
+
+    /** 结束时间戳 */
+    private long et;
+
+    /** 入库时间 */
+    private Date createDate;
+
+    private int status = 0;
+
+    public SchSiginCompate(ScheduleRealInfo sch) {
+        this.id = sch.getId();
+        this.rq = sch.getScheduleDateStr();
+        this.lineCode = sch.getXlBm();
+        this.upDown = Integer.parseInt(sch.getXlDir());
+        this.deciveId = BasicData.deviceId2NbbmMap.inverse().get(sch.getClZbh());
+        this.sCode = sch.getQdzCode();
+        this.eCode = sch.getZdzCode();
+        this.st = sch.getDfsjT();
+        this.et = sch.getZdsjT();
+
+        if(sch.getFcsjActualTime() != null)
+            this.st = sch.getFcsjActualTime();
+        if(sch.getZdsjActualTime() != null)
+            this.et = sch.getZdsjActualTime();
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public String getRq() {
+        return rq;
+    }
+
+    public void setRq(String rq) {
+        this.rq = rq;
+    }
+
+    public String getLineCode() {
+        return lineCode;
+    }
+
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
+    }
+
+    public String getDeciveId() {
+        return deciveId;
+    }
+
+    public void setDeciveId(String deciveId) {
+        this.deciveId = deciveId;
+    }
+
+    public int getUpDown() {
+        return upDown;
+    }
+
+    public void setUpDown(int upDown) {
+        this.upDown = upDown;
+    }
+
+    public String getsCode() {
+        return sCode;
+    }
+
+    public void setsCode(String sCode) {
+        this.sCode = sCode;
+    }
+
+    public String geteCode() {
+        return eCode;
+    }
+
+    public void seteCode(String eCode) {
+        this.eCode = eCode;
+    }
+
+    public long getSt() {
+        return st;
+    }
+
+    public void setSt(long st) {
+        this.st = st;
+    }
+
+    public long getEt() {
+        return et;
+    }
+
+    public void setEt(long et) {
+        this.et = et;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+}
@@ -49,25 +49,34 @@ public class ScheduleRefreshThread extends Thread{
 			Collection<LineConfig> confs = lineConfs.getAll();
 			String currSchDate, oldSchDate;
-			String lineCode;
+			String lineCode = null;
 			for(LineConfig conf : confs){
-				lineCode = conf.getLine().getLineCode();
-				oldSchDate = dayOfSchedule.getCurrSchDate().get(lineCode);
-				currSchDate = dayOfSchedule.calcSchDate(lineCode);
-				
-				if(oldSchDate == null || !oldSchDate.equals(currSchDate)){
+				try{
+					lineCode = conf.getLine().getLineCode();
+					oldSchDate = dayOfSchedule.getCurrSchDate().get(lineCode);
+					currSchDate = dayOfSchedule.calcSchDate(lineCode);
-					logger.info(lineCode + "开始翻班， " + currSchDate);
-					//清除指令数据
-					Set<String> cars = dayOfSchedule.findCarByLineCode(lineCode);
-					for(String car : cars)
-						dayOfDirectives.clear(BasicData.deviceId2NbbmMap.inverse().get(car));
-					//清除驾驶员上报数据
-					pilotReport.clear(lineCode);
-					
-					//重载排班数据
-					dayOfSchedule.reloadSch(lineCode, currSchDate, false);
-					logger.info(lineCode + "翻班完成， " + currSchDate + " -班次数量：" + dayOfSchedule.findByLineCode(lineCode).size());
+					if(oldSchDate == null || !oldSchDate.equals(currSchDate)){
+
+						logger.info(lineCode + "开始翻班， " + currSchDate);
+
+						try{
+							//清除指令数据
+							Set<String> cars = dayOfSchedule.findCarByLineCode(lineCode);
+							for(String car : cars)
+								dayOfDirectives.clear(BasicData.deviceId2NbbmMap.inverse().get(car));
+							//清除驾驶员上报数据
+							pilotReport.clear(lineCode);
+						}catch (Exception e){
+							logger.error("清理 60 和 80出现问题", e);
+						}
+
+						//重载排班数据
+						dayOfSchedule.reloadSch(lineCode, currSchDate, false);
+						logger.info(lineCode + "翻班完成， " + currSchDate + " -班次数量：" + dayOfSchedule.findByLineCode(lineCode).size());
+					}
+				}catch (Exception e){
+					logger.error("班次更新失败！！ -" + lineCode, e);
 				}
 			}
@@ -44,7 +44,7 @@ public class Personnel extends BEntity {
     @Formula(" concat(company_code, '_', branche_company_code) ")
     private String cgsbm;
-    /** 工号 */
+    /** 工号（员工编号带公司编码前缀） */
     @Column(nullable = false)
     private String jobCode;
     /** 姓名 */
@@ -59,10 +59,17 @@ public class Personnel extends BEntity {
     private String personnelType;
     /** 所属岗位/工种（字典类型gzType） */
     private String posts;
-    
+
+    /** 工号 */
+    @Column(nullable = false)
+    private String jobCodeori;
     /** 身份证 */
     private String card;
+
+    /** 备注 */
+    private String remark;
+
     public Personnel() {}
     public Personnel(Object id, Object companyCode, Object gh) {
@@ -231,4 +238,20 @@ public class Personnel extends BEntity {
     public void setCgsbm(String cgsbm) {
         this.cgsbm = cgsbm;
     }
+
+    public String getJobCodeori() {
+        return jobCodeori;
+    }
+
+    public void setJobCodeori(String jobCodeori) {
+        this.jobCodeori = jobCodeori;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
 }
@@ -61,11 +61,12 @@ public class ArrivalInfo {
 	private String jzsj;
 	/** -1 则信号有效，但程序标记为不使用 */
 	private int flag = 0;
-	
+	private Date dates;
+	private int route;
 	public ArrivalInfo(){}
 	public ArrivalInfo(String deviceId, long ts, String lineCode, int upDown, String stopNo, int inOut, long createDate,
-			int weeksYear, String stopName) {
+			int weeksYear, String stopName,Date dates,int route) {
 		this.deviceId = deviceId;
 		this.ts = ts;
@@ -75,6 +76,8 @@ public class ArrivalInfo {
 		this.stopName = stopName;
 		this.inOut = inOut;
 		this.createDate = createDate;
+		this.dates=dates;
+		this.route=route;
 	}
 /*	@Override
@@ -253,6 +256,22 @@ public class ArrivalInfo {
 	public void setPzh(String pzh) {
 		this.pzh = pzh;
 	}
+
+	public Date getDates() {
+		return dates;
+	}
+
+	public void setDates(Date dates) {
+		this.dates = dates;
+	}
+
+	public int getRoute() {
+		return route;
+	}
+
+	public void setRoute(int route) {
+		this.route = route;
+	}
@@ -34,9 +34,6 @@ public class Outbound {
 	 */
 	private String lineName;
-
-	
-
 	/**
 	 * 上下行（0 上行 ， 1 下行 ， -1 无效）
 	 */
@@ -57,18 +54,66 @@ public class Outbound {
 	 */
 	private String location;
+	/**
+	 * 超速结束时经度
+	 */
+	private Float endlon;
+	
+	/**
+	 * 超速结束时纬度
+	 */
+	private Float endlat;
 	/**
 	 * 	时间戳
 	 */
 	private Long timestamp;
+	public Float getEndlon() {
+		return endlon;
+	}
+
+	public void setEndlon(Float endlon) {
+		this.endlon = endlon;
+	}
+
+	public Float getEndlat() {
+		return endlat;
+	}
+
+	public void setEndlat(Float endlat) {
+		this.endlat = endlat;
+	}
+
+	public Long getEndtimestamp() {
+		return endtimestamp;
+	}
+
+	public void setEndtimestamp(Long endtimestamp) {
+		this.endtimestamp = endtimestamp;
+	}
+
+	public String getEndtimestampDate() {
+		return endtimestampDate;
+	}
+
+	public void setEndtimestampDate(String endtimestampDate) {
+		this.endtimestampDate = endtimestampDate;
+	}
+
 	/**
 	 * 时间戳转换的时间
 	 */
 	private String timestampDate;
+	//结束时间，单位：秒/s
+	@Transient
+	private Long endtimestamp;
+	
+	@Transient
+	private String endtimestampDate;
+		
 	/**
 	 * 	时间
 	 */
@@ -26,6 +26,11 @@ public class Cwjy {
 	private String xgr;
 	private Date createDate;
+	
+	private String line;
+	
+	@Transient
+	private String linename;
 	@Transient
 	private String gsname;
@@ -95,6 +100,24 @@ public class Cwjy {
 	public void setFgsname(String fgsname) {
 		this.fgsname = fgsname;
 	}
+
+	public String getLine() {
+		return line;
+	}
+
+	public void setLine(String line) {
+		this.line = line;
+	}
+
+	public String getLinename() {
+		return BasicData.lineCode2NameMap.get(this.line);
+	}
+
+	public void setLinename(String linename) {
+		this.linename = linename;
+	}
+	
+	
 }
@@ -54,6 +54,7 @@ public class Dlb {
 	private String edituser;
 	private Date edittime;
 	private Date createtime;
+	private Date updatetime;
 	private int nylx;
 	//进场顺序（根据最先出场和最后进场来关联车辆的存电量）
 	private int jcsx;
@@ -374,4 +375,14 @@ public class Dlb {
 	public void setFgsname(String fgsname) {
 		this.fgsname = fgsname;
 	}
+
+	public Date getUpdatetime() {
+		return updatetime;
+	}
+
+	public void setUpdatetime(Date updatetime) {
+		this.updatetime = updatetime;
+	}
+	
+	
 }
@@ -38,13 +38,14 @@ public class Ylxxb {
 	private Integer nylx;
 	@Transient
 	private String ldgh;
-	//0为接口数据，1为手工输入
+	//0为接口数据，1为手工输入,2为改变车号，3为改变驾驶员
 	private Integer jylx=0;
 	@Transient
 	private String gsname;
 	@Transient
 	private String fgsname;
-	
+	@Transient
+	private String linename;
 	@Transient
 	private Double zjzl;
@@ -193,6 +194,12 @@ public class Ylxxb {
 	public void setZjzl(Double zjzl) {
 		this.zjzl = zjzl;
 	}
+	public String getLinename() {
+		return linename;
+	}
+	public void setLinename(String linename) {
+		this.linename = linename;
+	}
+package com.bsth.entity.oil;
+
+import java.util.Date;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+
+import org.springframework.format.annotation.DateTimeFormat;
+
+import com.bsth.data.BasicData;
+
+@Entity
+@Table(name = "bsth_c_ylxxb_update")
+public class YlxxbUpdate {
+	@Id
+	@GeneratedValue
+	private Integer id;
+	@DateTimeFormat(pattern="yyyy-MM-dd")
+	private Date yyrq;
+	private Date jlrq;
+	private String nbbm;
+	private String jsy;
+	private Double jzl;
+	private String stationid;
+	private Date createtime;
+	private String gsdm;
+	
+	private Date xgrq;
+	private String xgr;
+	private String tj;
+	public Integer getId() {
+		return id;
+	}
+	public void setId(Integer id) {
+		this.id = id;
+	}
+	public Date getYyrq() {
+		return yyrq;
+	}
+	public void setYyrq(Date yyrq) {
+		this.yyrq = yyrq;
+	}
+	public Date getJlrq() {
+		return jlrq;
+	}
+	public void setJlrq(Date jlrq) {
+		this.jlrq = jlrq;
+	}
+	public String getNbbm() {
+		return nbbm;
+	}
+	public void setNbbm(String nbbm) {
+		this.nbbm = nbbm;
+	}
+	public String getJsy() {
+		return jsy;
+	}
+	public void setJsy(String jsy) {
+		this.jsy = jsy;
+	}
+	public Double getJzl() {
+		return jzl;
+	}
+	public void setJzl(Double jzl) {
+		this.jzl = jzl;
+	}
+	public String getStationid() {
+		return stationid;
+	}
+	public void setStationid(String stationid) {
+		this.stationid = stationid;
+	}
+	public Date getCreatetime() {
+		return createtime;
+	}
+	public void setCreatetime(Date createtime) {
+		this.createtime = createtime;
+	}
+	public String getGsdm() {
+		return gsdm;
+	}
+	public void setGsdm(String gsdm) {
+		this.gsdm = gsdm;
+	}
+	public Date getXgrq() {
+		return xgrq;
+	}
+	public void setXgrq(Date xgrq) {
+		this.xgrq = xgrq;
+	}
+	public String getXgr() {
+		return xgr;
+	}
+	public void setXgr(String xgr) {
+		this.xgr = xgr;
+	}
+	public String getTj() {
+		return tj;
+	}
+	public void setTj(String tj) {
+		this.tj = tj;
+	}
+	
+	
+	
+	
+}
+package com.bsth.entity.realcontrol;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+/**
+ * 常用短语
+ * Created by panzhao on 2017/9/17.
+ */
+@Entity
+@Table(name = "bsth_c_s_frequent_phrases")
+public class FrequentPhrases {
+
+    @Id
+    @GeneratedValue
+    private Integer id;
+
+    /**
+     * 用户名
+     */
+    private String userName;
+
+    /**
+     * 短语
+     */
+    private String text;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getText() {
+        return text;
+    }
+
+    public void setText(String text) {
+        this.text = text;
+    }
+}
@@ -89,6 +89,11 @@ public class LineConfig {
 	private int upStopMinute;
 	private int downStopMinute;
+	/**
+	 * 使用第一个发车时间，不匹配最佳时间
+	 */
+	private boolean lockFirstOutTime;
+
 	@OneToMany(cascade = CascadeType.ALL)
 	private Set<D80ReplyTemp> d80Temps = new HashSet<>();
@@ -281,4 +286,12 @@ public class LineConfig {
 	public void setTwinsStation(String twinsStation) {
 		this.twinsStation = twinsStation;
 	}
+
+	public boolean isLockFirstOutTime() {
+		return lockFirstOutTime;
+	}
+
+	public void setLockFirstOutTime(boolean lockFirstOutTime) {
+		this.lockFirstOutTime = lockFirstOutTime;
+	}
 }
@@ -214,6 +214,17 @@ public class ScheduleRealInfo {
 	@JsonIgnore
 	private int saveFailCount=0;
+	/** 是否需要补充GPS信号 （网关提交至运管处动态数据用） 1: 能发车， 2：能到达  3: 补发过*/
+	private int siginCompate;
+
+	/**
+	 * 漂移状态
+	 * 1: 发车漂移
+	 * 2：到站漂移
+	 * 3：中途漂移
+	 */
+	private Integer driftStatus = 0;
+
 	public boolean isDfAuto() {
 		return dfAuto;
 	}
@@ -303,10 +314,10 @@ public class ScheduleRealInfo {
 		String old = this.getRemarks();
 		if(StringUtils.isBlank(old))
 			old = "";
-		
+
 		old += remark + ";";
 		this.setRemarks(old);
-		
+
 	}
 	public Long getId() {
@@ -622,16 +633,17 @@ public class ScheduleRealInfo {
 		this.dfsjT = dfsjT;
 		this.dfsj = fmtHHmm.print(this.dfsjT);
 	}
-	
+
 	public void setDfsjAll(String dfsj) {
 		this.dfsjT = fmtyyyyMMddHHmm.parseMillis(this.realExecDate + dfsj);
 		this.dfsj = dfsj;
 	}
-	
+
 	public void calcEndTime(){
 		//计划终点时间
 		if(this.getBcsj() != null){
-			this.setZdsjT(this.getDfsjT() + (this.getBcsj() * 60 * 1000));
+			//this.setZdsjT(this.getDfsjT() + (this.getBcsj() * 60 * 1000));
+			this.setZdsjT(this.getFcsjT() + (this.getBcsj() * 60 * 1000));//计划终点时间不变
 			this.setZdsj(fmtHHmm.print(this.zdsjT));
 		}
 	}
@@ -665,33 +677,33 @@ public class ScheduleRealInfo {
 	public void setSflj(boolean sflj) {
 		this.sflj = sflj;
 	}
-	
+
 	/**
-	 * 
-	 * @Title: setFcsjAll 
-	 * @Description: TODO(设置计划发车时间) 
+	 *
+	 * @Title: setFcsjAll
+	 * @Description: TODO(设置计划发车时间)
 	 * @throws
 	 */
 	public void setFcsjAll(String fcsj){
 		this.fcsjT = fmtyyyyMMddHHmm.parseMillis(this.realExecDate + fcsj);
 		this.fcsj = fcsj;
 	}
-	
+
 	/**
-	 * 
-	 * @Title: setFcsjAll 
-	 * @Description: TODO(设置计划发车时间) 
+	 *
+	 * @Title: setFcsjAll
+	 * @Description: TODO(设置计划发车时间)
 	 * @throws
 	 */
 	public void setFcsjAll(Long fcsjT){
 		this.fcsjT = fcsjT;
 		this.fcsj = fmtHHmm.print(fcsjT);
 	}
-	
+
 	/**
-	 * 
-	 * @Title: setFcsjActualAll 
-	 * @Description: TODO(设置实际发车时间 字符串) 
+	 *
+	 * @Title: setFcsjActualAll
+	 * @Description: TODO(设置实际发车时间 字符串)
 	 * @throws
 	 */
 	public void setFcsjActualAll(String fcsjActual){
@@ -699,39 +711,47 @@ public class ScheduleRealInfo {
 		this.fcsjActual = fcsjActual;
 		calcStatus();
 	}
-	
+
 	/**
-	 * 
-	 * @Title: setFcsjActualAll 
-	 * @Description: TODO(设置实际发车时间 时间戳) 
+	 *
+	 * @Title: setFcsjActualAll
+	 * @Description: TODO(设置实际发车时间 时间戳)
 	 * @throws
 	 */
 	public void setFcsjActualAll(Long t){
+
 		this.fcsjActualTime = t;
-		this.fcsjActual = fmtHHmm.print(t);
+		if(null == t)
+			this.fcsjActual = null;
+		else
+			this.fcsjActual = fmtHHmm.print(t);
 		//更新班次状态
 		calcStatus();
 	}
-	
+
 	/**
-	 * 
-	 * @Title: setFcsjActualAll 
-	 * @Description: TODO(设置实际终点时间) 
+	 *
+	 * @Title: setFcsjActualAll
+	 * @Description: TODO(设置实际终点时间)
 	 * @throws
 	 */
 	public void setZdsjActualAll(Long t){
 		this.zdsjActualTime = t;
-		this.zdsjActual = fmtHHmm.print(t);
-		
+
+		if(null == t)
+			this.zdsjActual = null;
+		else
+			this.zdsjActual = fmtHHmm.print(t);
+
 		//更新班次状态
 		calcStatus();
 	}
-	
+
 	/**
-	 * 
-	 * @Title: setFcsjActualAll 
-	 * @Description: TODO(设置实际终点时间) 
+	 *
+	 * @Title: setFcsjActualAll
+	 * @Description: TODO(设置实际终点时间)
 	 * @throws
 	 */
 	public void setZdsjActualAll(String zdsjActual){
@@ -740,7 +760,7 @@ public class ScheduleRealInfo {
 		calcStatus();
 	}
-	
+
 	public Long getSpId() {
 		return spId;
 	}
@@ -760,11 +780,11 @@ public class ScheduleRealInfo {
 	public void calcStatus() {
 		if(this.status == -1)
 			return;
-		
+
 		this.status = 0;
 		if(StringUtils.isNotBlank(this.fcsjActual)){
 			this.status = 1;
-			
+
 			//进出场班次并且没有计划里程的
 			if((this.bcType.equals("out") || this.bcType.equals("in"))
 					&& this.jhlc == null){
@@ -774,7 +794,7 @@ public class ScheduleRealInfo {
 		if(StringUtils.isNotBlank(this.zdsjActual))
 			this.status = 2;
 	}
-	
+
 	public void destroy(){
 		this.jhlc = 0.0;
 		if(this.isSflj())
@@ -782,11 +802,11 @@ public class ScheduleRealInfo {
 		this.status = -1;
 		this.clearFcsjActual();
 	}
-	
+
 	public boolean isDestroy(){
 		return this.status == -1;
 	}
-	
+
 /*	public boolean isNotDestroy(){
 		return this.status != -1;
 	}*/
@@ -806,18 +826,18 @@ public class ScheduleRealInfo {
 	public void setScheduleDateStr(String scheduleDateStr) {
 		this.scheduleDateStr = scheduleDateStr;
 	}
-	
+
 	public void clearFcsjActual(){
 		this.setFcsjActual(null);
 		this.setFcsjActualTime(null);
 		this.calcStatus();
 	}
-	
+
 	//清除实际终点时间
 	public void clearZdsjActual(){
 		this.setZdsjActual(null);
 		this.setZdsjActualTime(null);
-		
+
 		calcStatus();
 	}
@@ -922,4 +942,20 @@ public class ScheduleRealInfo {
 	public void setSaveFailCount(int saveFailCount) {
 		this.saveFailCount = saveFailCount;
 	}
+
+	public int getSiginCompate() {
+		return siginCompate;
+	}
+
+	public void setSiginCompate(int siginCompate) {
+		this.siginCompate = siginCompate;
+	}
+
+	public Integer getDriftStatus() {
+		return driftStatus;
+	}
+
+	public void setDriftStatus(Integer driftStatus) {
+		this.driftStatus = driftStatus;
+	}
 }
+package com.bsth.entity.report;
+
+import java.util.Date;
+
+/**
+ * @ClassName: MileageReport.java
+ * @Description: TODO(营运里程修正报表)
+ * @author: YouRuiFeng
+ * @date: 2017-8-14 上午11:09:19
+ * 
+ */
+public class MileageReport {
+	/** 公司编码 */
+    private String companyId;
+
+    /** 分公司编码 */
+    private String subCompanyId;
+    
+    /** 公司名称 */
+    private String companyName;
+
+    /** 分公司名称 */
+    private String subCompanyName;
+
+    /** 线路编码 */
+    private String lineCode;
+
+    /** 线路名称 */
+    private String lineName;
+    
+    /** 总营运公里  */
+    private double zgl;
+
+    /** 实际运营公里  */
+    private double sjyygl;
+    
+    /** 实际空驶公里  */
+    private double sjksgl;
+
+    /** 手动待发公里  */
+    private double sddfgl;
+    
+    /** 自动代发公里  */
+    private double zddfgl;
+    
+    /** 完全无Gps信号公里  */
+    private double wqwxhgl;
+    
+    /** 部分无Gps公里  */
+    private double bfwxhgl;
+    
+    /** 漂移公里  */
+    private double pygl;
+    
+    /** 临加公里  */
+    private double ljgl;
+    
+    /** 子任务  */
+    private double zrwgl;
+
+    /** 其他*/
+    private String other;
+
+    /** 备注 */
+    private String remarks;
+    
+    /** 日期 （班次日期） */
+    private String rq;
+
+    private Date createDate;
+
+
+	public String getCompanyId() {
+		return companyId;
+	}
+
+	public void setCompanyId(String companyId) {
+		this.companyId = companyId;
+	}
+
+	public String getSubCompanyId() {
+		return subCompanyId;
+	}
+
+	public void setSubCompanyId(String subCompanyId) {
+		this.subCompanyId = subCompanyId;
+	}
+
+	public String getCompanyName() {
+		return companyName;
+	}
+
+	public void setCompanyName(String companyName) {
+		this.companyName = companyName;
+	}
+
+	public String getSubCompanyName() {
+		return subCompanyName;
+	}
+
+	public void setSubCompanyName(String subCompanyName) {
+		this.subCompanyName = subCompanyName;
+	}
+
+	public String getLineCode() {
+		return lineCode;
+	}
+
+	public void setLineCode(String lineCode) {
+		this.lineCode = lineCode;
+	}
+
+	public String getLineName() {
+		return lineName;
+	}
+
+	public void setLineName(String lineName) {
+		this.lineName = lineName;
+	}
+
+	public double getZgl() {
+		return zgl;
+	}
+
+	public void setZgl(double zgl) {
+		this.zgl = zgl;
+	}
+
+	public double getSjyygl() {
+		return sjyygl;
+	}
+
+	public void setSjyygl(double sjyygl) {
+		this.sjyygl = sjyygl;
+	}
+	
+	public double getSjksgl() {
+		return sjksgl;
+	}
+
+	public void setSjksgl(double sjksgl) {
+		this.sjksgl = sjksgl;
+	}
+
+	public double getSddfgl() {
+		return sddfgl;
+	}
+
+	public void setSddfgl(double sddfgl) {
+		this.sddfgl = sddfgl;
+	}
+
+	public double getZddfgl() {
+		return zddfgl;
+	}
+
+	public void setZddfgl(double zddfgl) {
+		this.zddfgl = zddfgl;
+	}
+
+	public double getWqwxhgl() {
+		return wqwxhgl;
+	}
+
+	public void setWqwxhgl(double wqwxhgl) {
+		this.wqwxhgl = wqwxhgl;
+	}
+
+	public double getBfwxhgl() {
+		return bfwxhgl;
+	}
+
+	public void setBfwxhgl(double bfwxhgl) {
+		this.bfwxhgl = bfwxhgl;
+	}
+
+	public double getPygl() {
+		return pygl;
+	}
+
+	public void setPygl(double pygl) {
+		this.pygl = pygl;
+	}
+
+	public double getLjgl() {
+		return ljgl;
+	}
+
+	public void setLjgl(double ljgl) {
+		this.ljgl = ljgl;
+	}
+
+	public double getZrwgl() {
+		return zrwgl;
+	}
+
+	public void setZrwgl(double zrwgl) {
+		this.zrwgl = zrwgl;
+	}
+
+	public String getOther() {
+		return other;
+	}
+
+	public void setOther(String other) {
+		this.other = other;
+	}
+
+	public String getRemarks() {
+		return remarks;
+	}
+
+	public void setRemarks(String remarks) {
+		this.remarks = remarks;
+	}
+
+	public String getRq() {
+		return rq;
+	}
+
+	public void setRq(String rq) {
+		this.rq = rq;
+	}
+
+	public Date getCreateDate() {
+		return createDate;
+	}
+
+	public void setCreateDate(Date createDate) {
+		this.createDate = createDate;
+	}
+    
+    
+}
+package com.bsth.entity.report;
+
+import java.util.Date;
+
+/**
+ * @ClassName: MileageReport.java
+ * @Description: TODO(营运里程修正报表)
+ * @author: YouRuiFeng
+ * @date: 2017-8-14 上午11:09:19
+ * 
+ */
+public class ScheduleCorrectionReport {
+	/** 公司编码 */
+    private String companyId;
+
+    /** 分公司编码 */
+    private String subCompanyId;
+    
+    /** 公司名称 */
+    private String companyName;
+
+    /** 分公司名称 */
+    private String subCompanyName;
+
+    /** 线路编码 */
+    private String lineCode;
+
+    /** 线路名称 */
+    private String lineName;
+    
+    /** 总营运班次  */
+    private int zbc;
+
+    /** 实际运营班次  */
+    private int sjyybc;
+    
+    /** 实际空驶班次  */
+    private int sjksbc;
+
+    /** 手动待发班次  */
+    private int sddfbc;
+    
+    /** 自动代发班次  */
+    private int zddfbc;
+    
+    /** 完全无Gps信号班次  */
+    private int wqwxhbc;
+    
+    /** 部分无Gps班次  */
+    private int bfwxhbc;
+    
+    /** 漂移班次  */
+    private int pybc;
+    
+    /** 临加班次  */
+    private int ljbc;
+    
+    /** 子任务  */
+    private int zrwbc;
+
+    /** 其他*/
+    private String other;
+
+    /** 备注 */
+    private String remarks;
+    
+    /** 日期 （班次日期） */
+    private String rq;
+
+    private Date createDate;
+
+	public String getCompanyId() {
+		return companyId;
+	}
+
+	public void setCompanyId(String companyId) {
+		this.companyId = companyId;
+	}
+
+	public String getSubCompanyId() {
+		return subCompanyId;
+	}
+
+	public void setSubCompanyId(String subCompanyId) {
+		this.subCompanyId = subCompanyId;
+	}
+
+	public String getCompanyName() {
+		return companyName;
+	}
+
+	public void setCompanyName(String companyName) {
+		this.companyName = companyName;
+	}
+
+	public String getSubCompanyName() {
+		return subCompanyName;
+	}
+
+	public void setSubCompanyName(String subCompanyName) {
+		this.subCompanyName = subCompanyName;
+	}
+
+	public String getLineCode() {
+		return lineCode;
+	}
+
+	public void setLineCode(String lineCode) {
+		this.lineCode = lineCode;
+	}
+
+	public String getLineName() {
+		return lineName;
+	}
+
+	public void setLineName(String lineName) {
+		this.lineName = lineName;
+	}
+
+	public int getZbc() {
+		return zbc;
+	}
+
+	public void setZbc(int zbc) {
+		this.zbc = zbc;
+	}
+
+	public int getSjyybc() {
+		return sjyybc;
+	}
+
+	public void setSjyybc(int sjyybc) {
+		this.sjyybc = sjyybc;
+	}
+
+	public int getSjksbc() {
+		return sjksbc;
+	}
+
+	public void setSjksbc(int sjksbc) {
+		this.sjksbc = sjksbc;
+	}
+
+	public int getSddfbc() {
+		return sddfbc;
+	}
+
+	public void setSddfbc(int sddfbc) {
+		this.sddfbc = sddfbc;
+	}
+
+	public int getZddfbc() {
+		return zddfbc;
+	}
+
+	public void setZddfbc(int zddfbc) {
+		this.zddfbc = zddfbc;
+	}
+
+	public int getWqwxhbc() {
+		return wqwxhbc;
+	}
+
+	public void setWqwxhbc(int wqwxhbc) {
+		this.wqwxhbc = wqwxhbc;
+	}
+
+	public int getBfwxhbc() {
+		return bfwxhbc;
+	}
+
+	public void setBfwxhbc(int bfwxhbc) {
+		this.bfwxhbc = bfwxhbc;
+	}
+
+	public int getPybc() {
+		return pybc;
+	}
+
+	public void setPybc(int pybc) {
+		this.pybc = pybc;
+	}
+
+	public int getLjbc() {
+		return ljbc;
+	}
+
+	public void setLjbc(int ljbc) {
+		this.ljbc = ljbc;
+	}
+
+	public int getZrwbc() {
+		return zrwbc;
+	}
+
+	public void setZrwbc(int zrwbc) {
+		this.zrwbc = zrwbc;
+	}
+
+	public String getOther() {
+		return other;
+	}
+
+	public void setOther(String other) {
+		this.other = other;
+	}
+
+	public String getRemarks() {
+		return remarks;
+	}
+
+	public void setRemarks(String remarks) {
+		this.remarks = remarks;
+	}
+
+	public String getRq() {
+		return rq;
+	}
+
+	public void setRq(String rq) {
+		this.rq = rq;
+	}
+
+	public Date getCreateDate() {
+		return createDate;
+	}
+
+	public void setCreateDate(Date createDate) {
+		this.createDate = createDate;
+	}
+	
+}
@@ -3,6 +3,7 @@ package com.bsth.entity.schedule;
 import com.bsth.entity.Line;
 import com.bsth.service.schedule.rules.rerun.RerunRule_input;
 import com.bsth.service.schedule.rules.shiftloop.ScheduleResult_output;
+import com.bsth.service.schedule.rules.shiftloop.ScheduleRule_Type;
 import org.apache.commons.lang3.StringUtils;
 import javax.persistence.*;
@@ -267,7 +268,8 @@ public class SchedulePlanInfo extends BEntity {
             List<EmployeeConfigInfo> employeeConfigInfoList,
             SchedulePlan schedulePlan,
             boolean isFirstBc, // 是否第一个班次
-            boolean isLastBc // 是否最后一个班次
+            boolean isLastBc, // 是否最后一个班次
+            ScheduleRule_Type sType // 类型
         ) {
         // TODO：关联的公司名称
@@ -294,47 +296,51 @@ public class SchedulePlanInfo extends BEntity {
         this.lpName = ttInfoDetail.getLp().getLpName();
         // 关联的车辆信息
-        this.cl = carConfigInfo.getCl().getId(); // 车辆id
-        this.clZbh = carConfigInfo.getCl().getInsideCode(); // 自编号/内部编号
+        if (sType == ScheduleRule_Type.NORMAL) {
+            this.cl = carConfigInfo.getCl().getId(); // 车辆id
+            this.clZbh = carConfigInfo.getCl().getInsideCode(); // 自编号/内部编号
+        }
         // TODO：报道时间，出场时间没有
         // 关联的驾驶员
-        EmployeeConfigInfo employeeConfigInfo = null;
-        if (isFb) {
-            if (employeeConfigInfoList.size() > 1) {
-                employeeConfigInfo = employeeConfigInfoList.get(1);
+        if (sType == ScheduleRule_Type.NORMAL) {
+            EmployeeConfigInfo employeeConfigInfo = null;
+            if (isFb) {
+                if (employeeConfigInfoList.size() > 1) {
+                    employeeConfigInfo = employeeConfigInfoList.get(1);
+                } else {
+                    employeeConfigInfo = employeeConfigInfoList.get(0);
+                }
             } else {
                 employeeConfigInfo = employeeConfigInfoList.get(0);
             }
-        } else {
-            employeeConfigInfo = employeeConfigInfoList.get(0);
-        }
-        this.j = employeeConfigInfo.getJsy().getId();
+            this.j = employeeConfigInfo.getJsy().getId();
 //        this.jGh = employeeConfigInfo.getJsy().getJobCode();
-        if (StringUtils.isNotEmpty(employeeConfigInfo.getJsy().getJobCode())) {
-            String[] jsy_temp = employeeConfigInfo.getJsy().getJobCode().split("-");
-            if (jsy_temp.length > 1) {
-                this.jGh = jsy_temp[1];
-            } else {
-                this.jGh = jsy_temp[0];
-            }
-        }
-        this.jName = employeeConfigInfo.getJsy().getPersonnelName();
-        // 关联的售票员
-        if (employeeConfigInfo.getSpy() != null) {
-            this.s = employeeConfigInfo.getSpy().getId();
-//            this.sGh = employeeConfigInfo.getSpy().getJobCode();
-            if (StringUtils.isNotEmpty(employeeConfigInfo.getSpy().getJobCode())) {
-                String[] spy_temp = employeeConfigInfo.getSpy().getJobCode().split("-");
-                if (spy_temp.length > 1) {
-                    this.sGh = spy_temp[1];
+            if (StringUtils.isNotEmpty(employeeConfigInfo.getJsy().getJobCode())) {
+                String[] jsy_temp = employeeConfigInfo.getJsy().getJobCode().split("-");
+                if (jsy_temp.length > 1) {
+                    this.jGh = jsy_temp[1];
                 } else {
-                    this.sGh = spy_temp[0];
+                    this.jGh = jsy_temp[0];
                 }
             }
+            this.jName = employeeConfigInfo.getJsy().getPersonnelName();
+            // 关联的售票员
+            if (employeeConfigInfo.getSpy() != null) {
+                this.s = employeeConfigInfo.getSpy().getId();
+//            this.sGh = employeeConfigInfo.getSpy().getJobCode();
+                if (StringUtils.isNotEmpty(employeeConfigInfo.getSpy().getJobCode())) {
+                    String[] spy_temp = employeeConfigInfo.getSpy().getJobCode().split("-");
+                    if (spy_temp.length > 1) {
+                        this.sGh = spy_temp[1];
+                    } else {
+                        this.sGh = spy_temp[0];
+                    }
+                }
-            this.sName = employeeConfigInfo.getSpy().getPersonnelName();
+                this.sName = employeeConfigInfo.getSpy().getPersonnelName();
+            }
         }
         // 时刻明细数据
@@ -360,42 +366,44 @@ public class SchedulePlanInfo extends BEntity {
         this.remark = ttInfoDetail.getRemark();
         // 使用车辆配置的停车场信息
-        String pzType = carConfigInfo.getPzType(); // 配置类型
-        if (pzType != null && !pzType.equals("BSY")) {
-            if ("ZW".equals(pzType)) { // 只看早晚进出场
-                if (isFirstBc) { // 第一个班次是出场
+        if (sType == ScheduleRule_Type.NORMAL) {
+            String pzType = carConfigInfo.getPzType(); // 配置类型
+            if (pzType != null && !pzType.equals("BSY")) {
+                if ("ZW".equals(pzType)) { // 只看早晚进出场
+                    if (isFirstBc) { // 第一个班次是出场
 //                    this.qdz = carConfigInfo.getTcc().getId(); // 起点站-停车场id
-                    this.qdzCode = carConfigInfo.getTcc().getParkCode(); // 起点站-停车场code
-                    this.qdzName = carConfigInfo.getTcc().getParkName(); // 起点站-停车场name
+                        this.qdzCode = carConfigInfo.getTcc().getParkCode(); // 起点站-停车场code
+                        this.qdzName = carConfigInfo.getTcc().getParkName(); // 起点站-停车场name
-                    this.jhlc = "0".equals(this.xlDir) ? carConfigInfo.getUpOutLc() : carConfigInfo.getDownOutLc();
-                    this.bcsj = "0".equals(this.xlDir) ? carConfigInfo.getUpOutSj().intValue() : carConfigInfo.getDownOutSj().intValue();
+                        this.jhlc = "0".equals(this.xlDir) ? carConfigInfo.getUpOutLc() : carConfigInfo.getDownOutLc();
+                        this.bcsj = "0".equals(this.xlDir) ? carConfigInfo.getUpOutSj().intValue() : carConfigInfo.getDownOutSj().intValue();
-                } else if (isLastBc) { // 最后一个班次是进场
+                    } else if (isLastBc) { // 最后一个班次是进场
 //                    this.zdz = carConfigInfo.getTcc().getId(); // 终点站-停车场id
-                    this.zdzCode = carConfigInfo.getTcc().getParkCode(); // 终点站-停车场code
-                    this.zdzName = carConfigInfo.getTcc().getParkName(); // 终点站-停车场name
+                        this.zdzCode = carConfigInfo.getTcc().getParkCode(); // 终点站-停车场code
+                        this.zdzName = carConfigInfo.getTcc().getParkName(); // 终点站-停车场name
-                    this.jhlc = "0".equals(this.xlDir) ? carConfigInfo.getUpInLc() : carConfigInfo.getDownInLc();
-                    this.bcsj = "0".equals(this.xlDir) ? carConfigInfo.getUpInSj().intValue() : carConfigInfo.getDownInSj().intValue();
-                }
+                        this.jhlc = "0".equals(this.xlDir) ? carConfigInfo.getUpInLc() : carConfigInfo.getDownInLc();
+                        this.bcsj = "0".equals(this.xlDir) ? carConfigInfo.getUpInSj().intValue() : carConfigInfo.getDownInSj().intValue();
+                    }
-            } else if ("FS".equals(pzType)) { // 所有进出场
-                if ("out".equals(this.bcType)) { // 出场班次
+                } else if ("FS".equals(pzType)) { // 所有进出场
+                    if ("out".equals(this.bcType)) { // 出场班次
 //                    this.qdz = carConfigInfo.getTcc().getId(); // 起点站-停车场id
-                    this.qdzCode = carConfigInfo.getTcc().getParkCode(); // 起点站-停车场code
-                    this.qdzName = carConfigInfo.getTcc().getParkName(); // 起点站-停车场name
+                        this.qdzCode = carConfigInfo.getTcc().getParkCode(); // 起点站-停车场code
+                        this.qdzName = carConfigInfo.getTcc().getParkName(); // 起点站-停车场name
-                    this.jhlc = "0".equals(this.xlDir) ? carConfigInfo.getUpOutLc() : carConfigInfo.getDownOutLc();
-                    this.bcsj = "0".equals(this.xlDir) ? carConfigInfo.getUpOutSj().intValue() : carConfigInfo.getDownOutSj().intValue();
+                        this.jhlc = "0".equals(this.xlDir) ? carConfigInfo.getUpOutLc() : carConfigInfo.getDownOutLc();
+                        this.bcsj = "0".equals(this.xlDir) ? carConfigInfo.getUpOutSj().intValue() : carConfigInfo.getDownOutSj().intValue();
-                } else if ("in".equals(this.bcType)) {
+                    } else if ("in".equals(this.bcType)) {
 //                    this.zdz = carConfigInfo.getTcc().getId(); // 终点站-停车场id
-                    this.zdzCode = carConfigInfo.getTcc().getParkCode(); // 终点站-停车场code
-                    this.zdzName = carConfigInfo.getTcc().getParkName(); // 终点站-停车场name
+                        this.zdzCode = carConfigInfo.getTcc().getParkCode(); // 终点站-停车场code
+                        this.zdzName = carConfigInfo.getTcc().getParkName(); // 终点站-停车场name
-                    this.jhlc = "0".equals(this.xlDir) ? carConfigInfo.getUpInLc() : carConfigInfo.getDownInLc();
-                    this.bcsj = "0".equals(this.xlDir) ? carConfigInfo.getUpInSj().intValue() : carConfigInfo.getDownInSj().intValue();
+                        this.jhlc = "0".equals(this.xlDir) ? carConfigInfo.getUpInLc() : carConfigInfo.getDownInLc();
+                        this.bcsj = "0".equals(this.xlDir) ? carConfigInfo.getUpInSj().intValue() : carConfigInfo.getDownInSj().intValue();
+                    }
                 }
             }
         }
@@ -108,7 +108,10 @@ public class PredicatesBuilder {
                 String.class.isAssignableFrom(rightType)) { // Date >= String
             DateTime dateTime = new DateTime(object);
             return cb.greaterThanOrEqualTo((Path<Date>) expression, dateTime.toDate());
-        } else {
+        } else if (long.class.isAssignableFrom(leftType) &&
+				String.class.isAssignableFrom(rightType)) { // Long >= String
+			return cb.greaterThanOrEqualTo((Path<Long>) expression, Long.valueOf(object+""));
+		} else {
             throw new RuntimeException("ge 不支持类型组合：" + expression.getJavaType() + ">=" + object.getClass());
         }
 	}
@@ -140,7 +143,10 @@ public class PredicatesBuilder {
                 String.class.isAssignableFrom(rightType)) { // Date <= String
             DateTime dateTime = new DateTime(object);
             return cb.lessThanOrEqualTo((Path<Date>) expression, dateTime.toDate());
-        } else {
+        }else if (long.class.isAssignableFrom(leftType) &&
+				String.class.isAssignableFrom(rightType)) { // Long <= String
+			return cb.lessThanOrEqualTo((Path<Long>) expression, Long.valueOf(object + "") );
+		} else {
             throw new RuntimeException("le 不支持类型组合：" + expression.getJavaType() + "<=" + object.getClass());
         }
 	}
@@ -39,11 +39,11 @@ public class Interval {
 	}
-	public Integer getCreateBy() {
+	public String getCreateBy() {
 		return createBy;
 	}
-	public void setCreateBy(Integer createBy) {
+	public void setCreateBy(String createBy) {
 		this.createBy = createBy;
 	}
@@ -55,11 +55,11 @@ public class Interval {
 		this.createDate = createDate;
 	}
-	public Integer getUpdateBy() {
+	public String getUpdateBy() {
 		return updateBy;
 	}
-	public void setUpdateBy(Integer updateBy) {
+	public void setUpdateBy(String updateBy) {
 		this.updateBy = updateBy;
 	}
@@ -75,13 +75,13 @@ public class Interval {
 	private Integer trough;
 	@Column(name = "create_by")
-	private Integer createBy;
+	private String createBy;
 	@Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
 	private Date createDate;
 	@Column(name = "update_by")
-	private Integer updateBy;
+	private String updateBy;
 	@Column(name = "update_date", columnDefinition = "timestamp  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
 	private Date updateDate;
+package com.bsth.entity.traffic;
+
+import com.bsth.entity.Cars;
+import com.bsth.entity.Line;
+
+import javax.persistence.*;
+import java.util.Date;
+
+/**
+ * 
+ * @ClassName: VehicleInoutStop(车载上报停靠站信息)
+ * 
+ * @Description: TODO(线路标准信息)
+ * 
+ * @Author bsth@zq
+ * 
+ * @Date 2017-9-18 9:34:39
+ *	
+ * @Version 公交调度系统BS版 0.1
+ * 
+ */
+@Entity
+@Table(name = "bsth_c_shreal")
+public class VehicleInoutStop {
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	private Integer id;
+
+	@ManyToOne
+	private Line line;
+
+	@ManyToOne
+	private Cars cars;
+
+	// 站点序号
+	private Integer stop;
+
+	// 营运状态
+	private Integer serviceState;
+
+	// 上下行
+	private Integer upDown;
+
+	// 进出站/站内外
+	private Integer inOutStop;
+
+	// 上报时间
+	private long reportDate;
+
+	public Integer getId() {
+		return id;
+	}
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	public Line getLine() {
+		return line;
+	}
+
+	public void setLine(Line line) {
+		this.line = line;
+	}
+
+	public Cars getCars() {
+		return cars;
+	}
+
+	public void setCars(Cars cars) {
+		this.cars = cars;
+	}
+
+	public Integer getStop() {
+		return stop;
+	}
+
+	public void setStop(Integer stop) {
+		this.stop = stop;
+	}
+
+	public Integer getServiceState() {
+		return serviceState;
+	}
+
+	public void setServiceState(Integer serviceState) {
+		this.serviceState = serviceState;
+	}
+
+	public Integer getUpDown() {
+		return upDown;
+	}
+
+	public void setUpDown(Integer upDown) {
+		this.upDown = upDown;
+	}
+
+	public Integer getInOutStop() {
+		return inOutStop;
+	}
+
+	public void setInOutStop(Integer inOutStop) {
+		this.inOutStop = inOutStop;
+	}
+
+	public long getReportDate() { return reportDate; }
+
+	public void setReportDate(long reportDate) { this.reportDate = reportDate; }
+}
 package com.bsth.filter;
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Component;
-
 import com.alibaba.fastjson.JSON;
+import com.bsth.entity.sys.SysUser;
 import com.bsth.security.util.SecurityUtils;
 import com.bsth.util.IpUtils;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+import javax.servlet.FilterChain;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.Enumeration;
 import java.util.List;
@@ -38,7 +37,9 @@ public class AccessLogFilter extends BaseFilter {
 			HttpServletResponse response, FilterChain chain)
 			throws IOException, ServletException {
-		String username = SecurityUtils.getCurrentUser().getName(); 
+		SysUser user = SecurityUtils.getCurrentUser();
+		String username = user.getUserName();
+		String name = user.getName();
 		String jsessionId = request.getRequestedSessionId();
 		String ip = IpUtils.getIpAddr(request);
 		String userAgent = request.getHeader("User-Agent");
@@ -47,7 +48,7 @@ public class AccessLogFilter extends BaseFilter {
 		String headers = getHeaders(request);
 		StringBuilder s = new StringBuilder();
-		s.append(getBlock(username));
+		s.append(getBlock(username + " -" + name));
 		s.append(getBlock(jsessionId));
 		s.append(getBlock(ip));
 		s.append(getBlock(userAgent));
@@ -41,4 +41,7 @@ public interface LineRepository extends BaseRepository&lt;Line, Integer&gt; {
 	@Query(value = "  SELECT l FROM Line l where l.company like %?1% and l.brancheCompany like %?2% and l.lineCode like ?3")
 	public List<Line> findLineBygsBm(String gsBm, String fgsBm, String line);
+
+	@Query("SELECT L FROM Line L where L.destroy=0")
+	List<Line> findAllService();
 }