Merge branch 'minhang' into pudong

潘钊
2 parents 332e72ef 7f04b456
Showing 13 changed files with 656 additions and 140 deletions
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/controller/realcontrol/anomalyCheckController.java
src/main/java/com/bsth/data/directive/GatewayHttpUtils.java
src/main/java/com/bsth/data/gpsdata/GpsRealData.java
src/main/java/com/bsth/data/gpsdata/arrival/GpsRealAnalyse.java
src/main/java/com/bsth/data/gpsdata/thread/GpsDataLoaderThread.java
src/main/java/com/bsth/data/gpsdata/thread/ThreadPollMonitor.java
src/main/java/com/bsth/data/pilot80/PilotReport.java
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/java/com/bsth/data/schedule/ScheduleComparator.java
src/main/java/com/bsth/service/schedule/PeopleCarPlanServiceImpl.java
src/main/java/com/bsth/websocket/handler/RealControlSocketHandler.java
src/main/resources/rules/shiftloop_fb_2.drl
@@ -24,10 +24,10 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	/*@Autowired
 	GetSchedulePlanThread getSchedulePlanThread;*/
-	
+
 	@Autowired
 	ScheduleRealInfoService scheduleRealInfoService;
-	
+
 	@Autowired
 	DayOfSchedule dayOfSchedule;
@@ -42,29 +42,29 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	}
 	/**
-	 * 
+	 *
 	 * @Title: outgoAdjust @Description: TODO(待发调整) @param @param id
 	 * 主键 @param @param remarks 备注 @param @param dfsj 待发时间（HH:mm） @throws
 	 */
 	@RequestMapping(value = "/outgoAdjust", method = RequestMethod.POST)
 	public Map<String, Object> outgoAdjust(@RequestParam Long id, @RequestParam String remarks,
-			@RequestParam String dfsj,String bcType) {
+										   @RequestParam String dfsj,String bcType) {
 		return scheduleRealInfoService.outgoAdjust(id, remarks, dfsj, bcType);
 	}
 	/**
-	 * 
+	 *
 	 * @Title: destroy @Description: TODO(销毁，烂班) @param @param idsStr 要烂掉的班次ID ,分隔 
 	 */
 	@RequestMapping(value = "/destroy", method = RequestMethod.POST)
 	public Map<String, Object> destroy(@RequestParam String idsStr
 			/*, @RequestParam(defaultValue = "-1") int spaceAdjust*/,
-			@RequestParam String remarks, @RequestParam String adjustExps/*, @RequestParam(defaultValue = "0") int spaceNum*/) {
+									   @RequestParam String remarks, @RequestParam String adjustExps/*, @RequestParam(defaultValue = "0") int spaceNum*/) {
 		return scheduleRealInfoService.destroy(idsStr/*, spaceAdjust*/, remarks, adjustExps/*, spaceNum*/);
 	}
 	/**
-	 * 
+	 *
 	 * @Title: carDeviceMapp @Description: TODO(获取车辆自编号和设备号对照，从缓存取) @throws
 	 */
 	@RequestMapping(value = "/carDeviceMapp", method = RequestMethod.GET)
@@ -73,7 +73,7 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	}
 	/**
-	 * 
+	 *
 	 * @Title: findPersionByLine @Description: TODO(根据线路主键获取驾驶员) @param @param
 	 * lineId @throws
 	 */
@@ -83,7 +83,7 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	}
 	/**
-	 * 
+	 *
 	 * @Title: findPersionByLine @Description: TODO(根据线路主键获取售票员) @param @param
 	 * lineId @throws
 	 */
@@ -93,7 +93,7 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	}
 	/**
-	 * 
+	 *
 	 * @Title: findPersionByLine @Description: TODO(根据线路主键获取车辆) @param @param
 	 * lineId @throws
 	 */
@@ -103,7 +103,7 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	}
 	/**
-	 * 
+	 *
 	 * @Title: sreachNbbm @Description: TODO(搜索车辆内部编码) @throws
 	 */
 	@RequestMapping(value = "/sreachVehic", method = RequestMethod.GET)
@@ -111,9 +111,9 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 		return scheduleRealInfoService.sreachVehic(nbbm);
 	}
 	/**
-	 * 
-	 * @Title: realOutAdjust 
-	 * @Description: TODO(实发调整) 
+	 *
+	 * @Title: realOutAdjust
+	 * @Description: TODO(实发调整)
 	 * @param @param id 班次ID
 	 * @param @param fcsjActual 实际发车时间 HH:mm
 	 * @param @param remarks 备注
@@ -121,14 +121,14 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	 */
 	@RequestMapping(value = "/realOutAdjust", method = RequestMethod.POST)
 	public Map<String, Object> realOutAdjust(@RequestParam Long id, @RequestParam String fcsjActual,
-			@RequestParam String remarks) {
+											 @RequestParam String remarks) {
 		return scheduleRealInfoService.realOutAdjust(id, fcsjActual, remarks);
 	}
-	
+
 	/**
-	 * 
-	 * @Title: revokeDestroy 
-	 * @Description: TODO(撤销烂班) 
+	 *
+	 * @Title: revokeDestroy
+	 * @Description: TODO(撤销烂班)
 	 * @param @param id
 	 * @throws
 	 */
@@ -136,11 +136,11 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	public Map<String, Object> revokeDestroy(@RequestParam Long id){
 		return scheduleRealInfoService.revokeDestroy(id);
 	}
-	
+
 	/**
-	 * 
-	 * @Title: revokeRealOutgo 
-	 * @Description: TODO(撤销实发) 
+	 *
+	 * @Title: revokeRealOutgo
+	 * @Description: TODO(撤销实发)
 	 * @param @param id
 	 * @throws
 	 */
@@ -160,9 +160,9 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	}
 	/**
-	 * 
-	 * @Title: spaceAdjust 
-	 * @Description: TODO(间隔调整) 
+	 *
+	 * @Title: spaceAdjust
+	 * @Description: TODO(间隔调整)
 	 * @param @param ids 要调整的班次数组ID
 	 * @param @param space 间隔
 	 * @throws
@@ -171,11 +171,11 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	public Map<String, Object> spaceAdjust(Long[] ids, Integer space){
 		return scheduleRealInfoService.spaceAdjust(ids, space);
 	}
-	
+
 	/**
-	 * 
-	 * @Title: schInfoFineTune 
-	 * @Description: TODO(发车信息微调) 
+	 *
+	 * @Title: schInfoFineTune
+	 * @Description: TODO(发车信息微调)
 	 * @param @param map
 	 * @throws
 	 */
@@ -183,11 +183,11 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	public Map<String, Object> schInfoFineTune(@RequestParam Map<String, String> map){
 		return scheduleRealInfoService.schInfoFineTune(map);
 	}
-	
+
 	/**
-	 * 
-	 * @Title: outgoAdjustAll 
-	 * @Description: TODO(批量待发调整) 
+	 *
+	 * @Title: outgoAdjustAll
+	 * @Description: TODO(批量待发调整)
 	 * @param @param list
 	 * @throws
 	 */
@@ -197,11 +197,11 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 		params = StringEscapeUtils.unescapeHtml4(params);
 		return scheduleRealInfoService.outgoAdjustAll(params);
 	}
-	
+
 	/**
-	 * 
-	 * @Title: findByLineAndUpDown 
-	 * @Description: TODO(根据线路和走向获取班次) 
+	 *
+	 * @Title: findByLineAndUpDown
+	 * @Description: TODO(根据线路和走向获取班次)
 	 * @param @param line
 	 * @param @param upDown
 	 */
@@ -209,11 +209,11 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	public List<ScheduleRealInfo> findByLineAndUpDown(@RequestParam String line,@RequestParam Integer upDown){
 		return dayOfSchedule.findByLineAndUpDown(line, upDown);
 	}
-	
+
 	/**
-	 * 
-	 * @Title: findRouteByLine 
-	 * @Description: TODO(获取线路的站点，路段路由) 
+	 *
+	 * @Title: findRouteByLine
+	 * @Description: TODO(获取线路的站点，路段路由)
 	 * @param @param lineCode
 	 * @throws
 	 */
@@ -221,11 +221,11 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	public Map<String, Object> findRouteByLine(@RequestParam String lineCode){
 		return scheduleRealInfoService.findRouteByLine(lineCode);
 	}
-	
+
 	/**
-	 * 
-	 * @Title: removeChildTask 
-	 * @Description: TODO(删除子任务) 
+	 *
+	 * @Title: removeChildTask
+	 * @Description: TODO(删除子任务)
 	 * @param @param taskId 子任务ID
 	 * @throws
 	 */
@@ -235,9 +235,9 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	}
 	/**
-	 * 
-	 * @Title: findByLineCode 
-	 * @Description: TODO(根据线路获取班次信息) 
+	 *
+	 * @Title: findByLineCode
+	 * @Description: TODO(根据线路获取班次信息)
 	 * @param @param lineCode
 	 */
 	@RequestMapping(value = "/lineCode/{lineCode}")
@@ -247,29 +247,29 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	@RequestMapping(value = "/queryUserInfo")
 	public List<ScheduleRealInfo> queryUserInfo(@RequestParam String line,
-			@RequestParam String date,@RequestParam String state) {
+												@RequestParam String date,@RequestParam String state) {
 		return scheduleRealInfoService.queryUserInfo(line, date,state);
 	}
-	
+
 	@RequestMapping(value = "/queryUserInfoPx")
 	public List<ScheduleRealInfo> queryUserInfoPx(@RequestParam String line,
-			@RequestParam String date,@RequestParam String state,@RequestParam String type) {
+												  @RequestParam String date,@RequestParam String state,@RequestParam String type) {
 		return scheduleRealInfoService.queryUserInfoPx(line, date,state,type);
 	}
 	@RequestMapping(value = "/exportWaybill",method = RequestMethod.GET)
 	public List<ScheduleRealInfo> exportWaybill(@RequestParam String jName, @RequestParam String clZbh,
-			@RequestParam String lpName,@RequestParam String date,@RequestParam String line) {
+												@RequestParam String lpName,@RequestParam String date,@RequestParam String line) {
 		return scheduleRealInfoService.exportWaybill(jName, clZbh, lpName,date,line);
 	}
-	
+
 	@RequestMapping(value = "/exportWaybillQp",method = RequestMethod.GET)
 	public List<ScheduleRealInfo> exportWaybillQp(@RequestParam String clZbh
 			,@RequestParam String date,@RequestParam String line) {
 		return scheduleRealInfoService.exportWaybillQp( clZbh, date,line);
 	}
-	
+
 	@RequestMapping(value = "/dailyInfo")
 	public List<Map<String, Object>> dailyInfo(@RequestParam String line, @RequestParam String date,@RequestParam String type) {
 		return scheduleRealInfoService.dailyInfo(line, date, type);
@@ -277,41 +277,41 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	@RequestMapping(value = "/historyMessage")
 	public List<Object[]> historyMessage(@RequestParam String line, @RequestParam String date,
-			@RequestParam String code, @RequestParam String type) {
+										 @RequestParam String code, @RequestParam String type) {
 		return scheduleRealInfoService.historyMessage(line, date, code, type);
 	}
-	
+
 	@RequestMapping(value="/findLine")
 	public List<Map<String,String>> findLine(@RequestParam String line){
 		return scheduleRealInfoService.findLine(line);
 	}
-	
+
 	@RequestMapping(value="/findKMBC",method = RequestMethod.GET)
 	public Map<String,Object> findKMBC(@RequestParam String jGh,@RequestParam String clZbh,@RequestParam String lpName
 			,@RequestParam String date,@RequestParam String line){
 		return scheduleRealInfoService.findKMBC(jGh, clZbh,lpName,date,line);
 	}
-	
+
 	@RequestMapping(value="/findKMBCQp",method = RequestMethod.GET)
 	public Map<String,Object> findKMBCQp(@RequestParam String clZbh
 			,@RequestParam String date,@RequestParam String line){
 		return scheduleRealInfoService.findKMBCQp(clZbh,date,line);
 	}
-	
+
 	@RequestMapping(value="/findLpName")
 	public List<Map<String,String>> findLpName(@RequestParam String lpName){
 		return scheduleRealInfoService.findLpName(lpName);
 	}
-	
+
 	@RequestMapping(value = "/account")
 	public List<Map<String,Object>> account(@RequestParam String line, @RequestParam String date,
-			@RequestParam String code,@RequestParam String xlName, @RequestParam String type) {
+											@RequestParam String code,@RequestParam String xlName, @RequestParam String type) {
 		return scheduleRealInfoService.account(line, date, code, xlName, type);
 	}
-	
+
 	@RequestMapping(value = "/correctForm")
 	public List<ScheduleRealInfo> correctForm(@RequestParam String line, @RequestParam String startDate,
-			@RequestParam String endDate, @RequestParam String lpName, @RequestParam String code, @RequestParam String type) {
+											  @RequestParam String endDate, @RequestParam String lpName, @RequestParam String code, @RequestParam String type) {
 		return scheduleRealInfoService.correctForm(line, startDate, endDate, lpName, code, type);
 	}
 	/**
@@ -327,19 +327,19 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 			,@RequestParam String date,@RequestParam String line){
 		return scheduleRealInfoService.queryListWaybill(jName, clZbh,lpName,date,line);
 	}
-	
+
 	@RequestMapping(value="/queryListWaybillQp",method = RequestMethod.GET)
 	public List<ScheduleRealInfo> queryListWaybillQp(@RequestParam String clZbh,
-			@RequestParam String date,@RequestParam String line){
+													 @RequestParam String date,@RequestParam String line){
 		return scheduleRealInfoService.queryListWaybillQp(clZbh,date,line);
 	}
-	
+
 	@RequestMapping(value="/statisticsDaily")
 	public List<Map<String,Object>> statisticsDaily(@RequestParam String line, @RequestParam String date,
-			@RequestParam String xlName, @RequestParam String type){
+													@RequestParam String xlName, @RequestParam String type){
 		return scheduleRealInfoService.statisticsDaily(line, date, xlName, type);
 	}
-	
+
 	@RequestMapping(value="/statisticsDailyTj")
 	public List<Map<String,Object>> statisticsDailyTj(@RequestParam Map<String, Object> map){
 		String gsdm="";
@@ -372,41 +372,41 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 		}
 		return scheduleRealInfoService.statisticsDailyTj(gsdm,fgsdm,line, date,date2, xlName, type);
 	}
-	
+
 	@RequestMapping(value="/MapById",method = RequestMethod.GET)
 	public Map<String, Object> MapById(@RequestParam("id") Long id){
 		return scheduleRealInfoService.MapById(id);
 	}
-	
+
 	/**
-	 * @Title: scheduleDaily 
-	 * @Description: TODO(调度日报表) 
+	 * @Title: scheduleDaily
+	 * @Description: TODO(调度日报表)
 	 * @param line 线路
 	 * @param date 时间
-	 * @return 
+	 * @return
 	 */
 	@RequestMapping(value="/scheduleDaily")
 	public Map<String,Object> scheduleDaily(@RequestParam String line,@RequestParam String date){
 		return scheduleRealInfoService.scheduleDaily(line,date);
 	}
-	
+
 	@RequestMapping(value="/realScheduleList")
 	public List<ScheduleRealInfo> realScheduleList(@RequestParam String line,@RequestParam String date){
 		return scheduleRealInfoService.realScheduleList(line,date);
 	}
-	
+
 	@RequestMapping(value="/realScheduleListQp")
 	public List<ScheduleRealInfo> realScheduleListQp(@RequestParam String line,@RequestParam String date){
 		return scheduleRealInfoService.realScheduleListQp(line,date);
 	}
-	
+
 	@RequestMapping(value="/multi_tzrc", method=RequestMethod.POST)
 	public Map<String, Object> multi_tzrc(@RequestParam String cpcsJson){
 		cpcsJson = StringEscapeUtils.unescapeHtml4(cpcsJson);
 		List<ChangePersonCar> cpcs = JSONArray.parseArray(cpcsJson, ChangePersonCar.class);
 		return scheduleRealInfoService.multi_tzrc(cpcs);
 	}
-	
+
 	@RequestMapping(value="/multi_dftz", method=RequestMethod.POST)
 	public Map<String, Object> multi_dftz(@RequestParam String dcsJson){
 		dcsJson = StringEscapeUtils.unescapeHtml4(dcsJson);
@@ -436,7 +436,7 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 		List<String> rs = new ArrayList<>();
 		long t = new Date().getTime() - ONE_DAY - (1000 * 60 * 60 * 2);
-		for(int i = 0; i < 5; i ++){
+		for(int i = 0; i < 10; i ++){
 			rs.add(fmtyyyyMMdd.print(t));
 			t -= ONE_DAY;
 		}
@@ -467,7 +467,7 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	public List<Map<String, Object>> scheduleDailyExport(@RequestParam Map<String, Object> map){
 		return scheduleRealInfoService.scheduleDailyExport(map);
 	}
-	
+
 	@RequestMapping(value = "exportWaybillMore", method = RequestMethod.GET)
 	public Map<String, Object> exportWaybillMore(@RequestParam Map<String, Object> map){
 		return scheduleRealInfoService.exportWaybillMore(map);
 package com.bsth.controller.realcontrol;
+import com.bsth.data.gpsdata.arrival.GpsRealAnalyse;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import org.slf4j.Logger;
@@ -49,4 +50,9 @@ public class anomalyCheckController {
             dayOfSchedule.replaceByNbbm(nbbm, map.values());
         }
     }
+
+    @RequestMapping(value = "/shutdownThreadPool")
+    public void shutdownThreadPool(){
+        GpsRealAnalyse.shutdown();
+    }
 }
 package com.bsth.data.directive;
-import java.io.IOException;
-
+import com.alibaba.fastjson.JSONObject;
+import com.bsth.util.ConfigUtil;
 import org.apache.http.client.config.RequestConfig;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpPost;
@@ -12,8 +12,7 @@ import org.apache.http.util.EntityUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import com.alibaba.fastjson.JSONObject;
-import com.bsth.util.ConfigUtil;
+import java.io.IOException;
 /**
  * 
@@ -42,7 +41,7 @@ public class GatewayHttpUtils {
 			//超时时间
 			RequestConfig requestConfig = RequestConfig.custom()  
-			        .setConnectTimeout(3000).setConnectionRequestTimeout(1000)  
+			        .setConnectTimeout(3000).setConnectionRequestTimeout(1000)
 			        .setSocketTimeout(3000).build();
 			HttpPost post = new HttpPost(url);
@@ -4,6 +4,7 @@ import com.bsth.data.BasicData;
 import com.bsth.data.forecast.ForecastRealServer;
 import com.bsth.data.gpsdata.thread.GpsDataLoaderThread;
 import com.bsth.data.gpsdata.thread.OfflineMonitorThread;
+import com.bsth.data.gpsdata.thread.ThreadPollMonitor;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.google.common.collect.TreeMultimap;
@@ -46,6 +47,9 @@ public class GpsRealData implements CommandLineRunner {
     @Autowired
     ForecastRealServer forecastRealServer;
+    @Autowired
+    ThreadPollMonitor threadPollMonitor;
+
     /**
      * 构造函数
      */
@@ -61,6 +65,10 @@ public class GpsRealData implements CommandLineRunner {
         //Application.mainServices.scheduleWithFixedDelay(gpsDataLoader, 20, 2, TimeUnit.SECONDS);
         //定时扫描掉离线
         //Application.mainServices.scheduleWithFixedDelay(offlineMonitorThread, 120, 60, TimeUnit.SECONDS);
+
+        //扫描GPS线程池状态
+        //Application.mainServices.scheduleWithFixedDelay(threadPollMonitor, 60, 20, TimeUnit.SECONDS);
+
     }
@@ -26,7 +26,7 @@ import java.util.concurrent.Executors;
 @Component
 public class GpsRealAnalyse {
-    Logger logger = LoggerFactory.getLogger(this.getClass());
+    static Logger logger = LoggerFactory.getLogger(GpsRealAnalyse.class);
     @Autowired
     OfflineSignalHandle offlineSignalHandle;
@@ -46,40 +46,54 @@ public class GpsRealAnalyse {
     static ExecutorService threadPool = Executors.newFixedThreadPool(100);
+    public static long st;
+    public static CountDownLatch count;
+
     public void analyse(List<GpsEntity> list) {
-        //如果正在恢复数据
-        if (GpsDataRecovery.run)
-            return;
-
-        long t = System.currentTimeMillis();
-        logger.info("analyse gps size: " + list.size());
-        //按线路分组gps
-        ArrayListMultimap multimap = ArrayListMultimap.create();
-        for(GpsEntity gps : list){
-            multimap.put(gps.getLineId(), gps);
-        }
+        try {
+            st = System.currentTimeMillis();
+            //如果正在恢复数据
+            if (GpsDataRecovery.run)
+                return;
+
+            //按线路分组gps
+            ArrayListMultimap multimap = ArrayListMultimap.create();
+            for (GpsEntity gps : list) {
+                multimap.put(gps.getLineId(), gps);
+            }
-        Set<String> ks = multimap.keySet();
-        CountDownLatch count = new CountDownLatch(ks.size());
+            Set<String> ks = multimap.keySet();
+            logger.info("analyse gps size: " + list.size() + ", ks: " + ks.size());
+            count = new CountDownLatch(ks.size());
-        for(String lineCode : ks){
-            threadPool.execute(new SignalHandleThread(multimap.get(lineCode), count));
-        }
+            for (String lineCode : ks) {
+                threadPool.execute(new SignalHandleThread(multimap.get(lineCode), count));
+            }
-        try {
             //等待子线程结束
             count.await();
             //加入实时gps对照
-            for(GpsEntity gps: list)
+            for (GpsEntity gps : list)
                 gpsRealData.put(gps);
-            logger.info("time , " + (System.currentTimeMillis() - t));
-        } catch (InterruptedException e) {
+            logger.info("time , " + (System.currentTimeMillis() - st));
+        } catch (Exception e) {
             logger.error("", e);
         }
     }
+    public static void shutdown() {
+        logger.warn("GpsRealAnalyse shutdown！！");
+        threadPool.shutdownNow();
+        long len = count.getCount();
+        for (int i = 0; i < len; i++) {
+            count.countDown();
+        }
+
+        threadPool = Executors.newFixedThreadPool(100);
+    }
+
     static GpsComp comp = new GpsComp();
     public class SignalHandleThread implements Runnable {
@@ -97,7 +111,7 @@ public class GpsRealAnalyse {
             try {
                 Collections.sort(list, comp);
-                for(GpsEntity gps : list){
+                for (GpsEntity gps : list) {
                     //是否有任务
                     boolean task;
                     CircleQueue<GpsEntity> prevs = GeoCacheData.getGps(gps.getNbbm());
@@ -110,7 +124,7 @@ public class GpsRealAnalyse {
                     //异常判定（越界/超速）
                     abnormalStateHandle.handle(gps, prevs);
-                    if(!task)
+                    if (!task)
                         return; //无任务的，到这里就结束
                     //反向处理
@@ -122,7 +136,7 @@ public class GpsRealAnalyse {
             } catch (Exception e) {
                 logger.error("", e);
             } finally {
-                if(count != null)
+                if (count != null)
                     count.countDown();
             }
         }
@@ -101,9 +101,9 @@ public class GpsDataLoaderThread extends Thread {
                     old = gpsRealData.get(gps.getDeviceId());
                     if (old != null &&
-                            old.getTimestamp() == gps.getTimestamp() &&
-                            old.getLat() == gps.getLat() &&
-                            old.getLon() == gps.getLon())
+                            old.getTimestamp().equals(gps.getTimestamp()) &&
+                            old.getLat().equals(gps.getLat()) &&
+                            old.getLon().equals(gps.getLon()))
                         continue;
                     nbbm = BasicData.deviceId2NbbmMap.get(gps.getDeviceId());
+package com.bsth.data.gpsdata.thread;
+
+import com.bsth.data.gpsdata.arrival.GpsRealAnalyse;
+import org.springframework.stereotype.Component;
+
+/**
+ * 线程池监听
+ * Created by panzhao on 2017/5/10.
+ */
+@Component
+public class ThreadPollMonitor extends Thread{
+
+    @Override
+    public void run() {
+        long t = System.currentTimeMillis();
+
+        if(t - GpsRealAnalyse.st > 3000 * 10){
+            GpsRealAnalyse.shutdown();
+        }
+    }
+}
@@ -74,7 +74,7 @@ public class PilotReport {
 		switch (d80.getData().getRequestCode()) {
 		case 0xA3:
 			//出场请求
-			ScheduleRealInfo outSch = dayOfSchedule.nextByBcType(nbbm, "out");
+			ScheduleRealInfo outSch = dayOfSchedule.searchNearByBcType(nbbm, "out");
 			//如果有对应出场班次
 			if(outSch != null){
 				//没有计划里程的出场班次，出场既是首发站，发送下一班次的营运指令
@@ -833,6 +833,29 @@ public class DayOfSchedule implements CommandLineRunner {
         return sch;
     }
+    /**
+     * 搜索离当前时间最近的一个指定类型的班次
+     * @param nbbm
+     * @param bcType
+     * @return
+     */
+    public ScheduleRealInfo searchNearByBcType(String nbbm, String bcType){
+        List<ScheduleRealInfo> list = findByBcType(nbbm, bcType);
+        Collections.sort(list, schFCSJComparator);
+
+        long t = System.currentTimeMillis();
+        int distance=-1;
+
+        ScheduleRealInfo sch = null;
+        for(ScheduleRealInfo temp : list){
+
+            if(Math.abs(temp.getDfsjT() - t) < distance || distance == -1){
+                sch = temp;
+            }
+        }
+        return sch;
+    }
+
     public List<ScheduleRealInfo> findByBcType(String nbbm, String bcType) {
         List<ScheduleRealInfo> all = nbbmScheduleMap.get(nbbm), outList = new ArrayList<>();
 package com.bsth.data.schedule;
-import java.util.Comparator;
-
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import java.util.Comparator;
+
 /**
  * 
  * @ClassName: ScheduleComparator 
@@ -25,7 +25,7 @@ public class ScheduleComparator {
 		@Override
 		public int compare(ScheduleRealInfo s1, ScheduleRealInfo s2) {
-			return (int) (s1.getDfsjT() - s2.getDfsjT());
+			return (int) (s1.getFcsjT() - s2.getFcsjT());
 		}
 	}
 }
@@ -5,6 +5,7 @@ import java.net.URLEncoder;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.text.DecimalFormat;
+import java.text.NumberFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -17,7 +18,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import org.drools.compiler.lang.DRL5Expressions.type_return;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowMapper;
@@ -759,6 +759,254 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		return modelMap;
 	}
+	
+	@Override
+	public Map<String, Object> scheduleAnaly_sum(Map<String, Object> map) {
+		DecimalFormat df = new DecimalFormat("00");
+		NumberFormat nf = NumberFormat.getNumberInstance();
+		nf.setMaximumFractionDigits(2);
+//		List<TTInfoDetail> ttList = new ArrayList<TTInfoDetail>();
+		List<Long> ttList = new ArrayList<Long>();
+		List<ScheduleRealInfo> list = new ArrayList<ScheduleRealInfo>();
+		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
+		List<Map<String, Object>> tempList = new ArrayList<Map<String, Object>>();
+		Map<String, List<ScheduleRealInfo>> keyMap = new HashMap<String, List<ScheduleRealInfo>>();
+		Map<String, Object> modelMap = new HashMap<String, Object>();
+		
+		String company = "";
+		if(map.get("company")!=null)
+			company=map.get("company").toString();
+		String subCompany = "";
+		if(map.get("subCompany")!=null)
+			subCompany=map.get("subCompany").toString();
+		String page = map.get("page").toString();
+		String line = map.get("line").toString();
+		String startDate = map.get("startDate").toString();
+		String endDate = map.get("endDate").toString();
+		String nbbm = map.get("nbbm").toString();
+		String type = map.get("type").toString();
+		
+		if(startDate.length() == 0){
+			startDate = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
+		}
+		if(endDate.length() == 0){
+			endDate = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
+		}
+		try {
+
+			String sql = "select * from bsth_c_s_sp_info_real where DATE_FORMAT(schedule_date,'%Y-%m-%d') >= '"+startDate+"' and DATE_FORMAT(schedule_date,'%Y-%m-%d') <= '"+endDate+"'";
+			if(line.length() != 0){
+				sql += " and xl_bm = '"+line+"'";
+			}
+			if(nbbm.length() != 0){
+				sql += " and cl_zbh like '%"+nbbm+"%'";
+			}
+//			if(company.length() != 0){
+				sql += " and gs_bm like '%"+company+"%' and fgs_bm like '%"+subCompany+"%'";
+//			}
+			sql += " and bc_type != 'in' and bc_type != 'out'";
+			
+			list = jdbcTemplate.query(sql,
+					new RowMapper<ScheduleRealInfo>(){
+				@Override
+				public ScheduleRealInfo mapRow(ResultSet rs, int rowNum) throws SQLException {
+					ScheduleRealInfo schedule = new ScheduleRealInfo();
+					schedule.setScheduleDateStr(rs.getString("schedule_date_Str"));
+					schedule.setRealExecDate(rs.getString("real_exec_date"));
+					schedule.setXlName(rs.getString("xl_name"));
+					schedule.setBcType(rs.getString("bc_type"));
+					schedule.setGsName(rs.getString("gs_name"));
+					schedule.setFgsName(rs.getString("fgs_name"));
+					schedule.setXlDir(rs.getString("xl_dir"));
+					schedule.setBcs(rs.getInt("bcs"));
+					schedule.setFcno(rs.getInt("fcno"));
+					schedule.setFcsj(rs.getString("fcsj"));
+					schedule.setFcsjActual(rs.getString("fcsj_actual"));
+					schedule.setZdsj(rs.getString("zdsj"));
+					schedule.setZdsjActual(rs.getString("zdsj_actual"));
+					schedule.setBcsj(rs.getInt("bcsj"));
+					schedule.setQdzName(rs.getString("qdz_name"));
+					schedule.setSpId(rs.getLong("sp_id"));
+					
+					if(schedule.getFcsj() != null && schedule.getZdsj() != null){
+						String[] split1 = schedule.getFcsj().split(":");
+						String[] split2 = schedule.getZdsj().split(":");
+						int fcsj = Integer.valueOf(split1[0]) * 60 + Integer.valueOf(split1[1]);
+						int zdsj = Integer.valueOf(split2[0]) * 60 + Integer.valueOf(split2[1]);
+						if(zdsj < fcsj){
+							zdsj += 1440;
+							schedule.setZdsj((zdsj/60>9?zdsj/60:"0"+zdsj/60) + ":" + (zdsj%60>9?zdsj%60:"0"+zdsj%60));
+						}
+						schedule.setFcsjT((long)fcsj);
+						schedule.setZdsjT((long)zdsj);
+					}
+					if(schedule.getFcsjActual() != null && schedule.getZdsjActual() != null){
+						String[] split3 = schedule.getFcsjActual().split(":");
+						String[] split4 = schedule.getZdsjActual().split(":");
+						int fcsjA = Integer.valueOf(split3[0]) * 60 + Integer.valueOf(split3[1]);
+						int zdsjA = Integer.valueOf(split4[0]) * 60 + Integer.valueOf(split4[1]);
+						if(fcsjA > zdsjA){
+							zdsjA += 1440;
+							schedule.setZdsjActual((zdsjA/60>9?zdsjA/60:"0"+zdsjA/60) + ":" + (zdsjA%60>9?zdsjA%60:"0"+zdsjA%60));
+						}
+						schedule.setFcsjActualTime((long)fcsjA);
+						schedule.setZdsjActualTime((long)zdsjA);
+					}
+					
+					return schedule;
+				}
+			});
+			
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		
+		{
+			Map<String, Object> m0 = new HashMap<String, Object>();
+			m0.put("time", "首~6:30");
+			m0.put("upbc", "0");m0.put("dnbc", "0");
+			m0.put("upys", "--");m0.put("dnys", "--");
+			m0.put("pjys", "--");
+			tempList.add(m0);
+			Map<String, Object> m1 = new HashMap<String, Object>();
+			m1.put("time", "6:31~8:30");
+			m1.put("upbc", "0");m1.put("dnbc", "0");
+			m1.put("upys", "--");m1.put("dnys", "--");
+			m1.put("pjys", "--");
+			tempList.add(m1);
+			Map<String, Object> m2 = new HashMap<String, Object>();
+			m2.put("time", "8:31~11:00");
+			m2.put("upbc", "0");m2.put("dnbc", "0");
+			m2.put("upys", "--");m2.put("dnys", "--");
+			m2.put("pjys", "--");
+			tempList.add(m2);
+			Map<String, Object> m3 = new HashMap<String, Object>();
+			m3.put("time", "11:01~13:30");
+			m3.put("upbc", "0");m3.put("dnbc", "0");
+			m3.put("upys", "--");m3.put("dnys", "--");
+			m3.put("pjys", "--");
+			tempList.add(m3);
+			Map<String, Object> m4 = new HashMap<String, Object>();
+			m4.put("time", "13:31~16:00");
+			m4.put("upbc", "0");m4.put("dnbc", "0");
+			m4.put("upys", "--");m4.put("dnys", "--");
+			m4.put("pjys", "--");
+			tempList.add(m4);
+			Map<String, Object> m5 = new HashMap<String, Object>();
+			m5.put("time", "16:01~18:00");
+			m5.put("upbc", "0");m5.put("dnbc", "0");
+			m5.put("upys", "--");m5.put("dnys", "--");
+			m5.put("pjys", "--");
+			tempList.add(m5);
+			Map<String, Object> m6 = new HashMap<String, Object>();
+			m6.put("time", "18:01~20:30");
+			m6.put("upbc", "0");m6.put("dnbc", "0");
+			m6.put("upys", "--");m6.put("dnys", "--");
+			m6.put("pjys", "--");
+			tempList.add(m6);
+			Map<String, Object> m7 = new HashMap<String, Object>();
+			m7.put("time", "20:31~末");
+			m7.put("upbc", "0");m7.put("dnbc", "0");
+			m7.put("upys", "--");m7.put("dnys", "--");
+			m7.put("pjys", "--");
+			tempList.add(m7);
+		}
+		
+		//按时间段分组
+		for(ScheduleRealInfo schedule : list){
+			if(schedule.getFcsjActualTime()!=null && schedule.getZdsjActualTime()!=null){
+				Long fcsjA = schedule.getFcsjActualTime();
+				if(fcsjA <= 6*60+30){
+					if(!keyMap.containsKey("首~6:30"))
+						keyMap.put("首~6:30", new ArrayList<ScheduleRealInfo>());
+					keyMap.get("首~6:30").add(schedule);
+				}
+				if(fcsjA > 6*60+30 && fcsjA <= 8*60+30){
+					if(!keyMap.containsKey("6:31~8:30"))
+						keyMap.put("6:31~8:30", new ArrayList<ScheduleRealInfo>());
+					keyMap.get("6:31~8:30").add(schedule);
+				}
+				if(fcsjA > 8*60+30 && fcsjA <= 11*60){
+					if(!keyMap.containsKey("8:31~11:00"))
+						keyMap.put("8:31~11:00", new ArrayList<ScheduleRealInfo>());
+					keyMap.get("8:31~11:00").add(schedule);
+				}
+				if(fcsjA > 11*60 && fcsjA <= 13*60+30){
+					if(!keyMap.containsKey("11:01~13:30"))
+						keyMap.put("11:01~13:30", new ArrayList<ScheduleRealInfo>());
+					keyMap.get("11:01~13:30").add(schedule);
+				}
+				if(fcsjA > 13*60+30 && fcsjA <= 16*60){
+					if(!keyMap.containsKey("13:31~16:00"))
+						keyMap.put("13:31~16:00", new ArrayList<ScheduleRealInfo>());
+					keyMap.get("13:31~16:00").add(schedule);
+				}
+				if(fcsjA > 16*60 && fcsjA <= 18*60){
+					if(!keyMap.containsKey("16:01~18:00"))
+						keyMap.put("16:01~18:00", new ArrayList<ScheduleRealInfo>());
+					keyMap.get("16:01~18:00").add(schedule);
+				}
+				if(fcsjA > 18*60 && fcsjA <= 20*60+30){
+					if(!keyMap.containsKey("18:01~20:30"))
+						keyMap.put("18:01~20:30", new ArrayList<ScheduleRealInfo>());
+					keyMap.get("18:01~20:30").add(schedule);
+				}
+				if(fcsjA > 20*60+30){
+					if(!keyMap.containsKey("20:31~末"))
+						keyMap.put("20:31~末", new ArrayList<ScheduleRealInfo>());
+					keyMap.get("20:31~末").add(schedule);
+				}
+			}
+		}
+		
+		for(String key : keyMap.keySet()){
+			Map<String, Object> m = null;
+			for(Map<String, Object> map2 : tempList){
+				if(map2.get("time").toString().equals(key)){
+					m = map2;
+				}
+			}
+			int upbc = 0, dnbc = 0;
+			long upys = 0, dnys = 0;
+			for(ScheduleRealInfo schedule : keyMap.get(key)){
+				if(schedule.getXlDir().equals("0")){
+					upbc++;
+					upys += schedule.getZdsjActualTime() - schedule.getFcsjActualTime();
+				}else if(schedule.getXlDir().equals("1")){
+					dnbc++;
+					dnys += schedule.getZdsjActualTime() - schedule.getFcsjActualTime();
+				}
+			}
+			m.put("upbc", upbc);
+			m.put("dnbc", dnbc);
+			m.put("upys", nf.format((float)upys / upbc));
+			m.put("dnys", nf.format((float)dnys / dnbc));
+			m.put("pjys", nf.format((float) (upys + dnys) / (upbc + dnbc)));
+		}
+		
+		modelMap.put("dataList", tempList);
+		
+		//导出
+		if(type.equals("export")){
+			SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
+					sdfSimple = new SimpleDateFormat("yyyyMMdd");
+			List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+			Map<String,Object> m = new HashMap<String, Object>();
+			ReportUtils ee = new ReportUtils();
+			try {
+				listI.add(tempList.iterator());
+				String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
+				ee.excelReplace(listI, new Object[] { m }, path+"mould/scheduleAnaly_sum.xls",
+						path+"export/时刻表分析(汇总)" + sdfSimple.format(sdfMonth.parse(startDate)) + "-" + sdfSimple.format(sdfMonth.parse(endDate)) + ".xls");
+			} catch (Exception e) {
+				// TODO: handle exception
+				e.printStackTrace();
+			}
+		}
+		
+		return modelMap;
+	}
 	@Override
 	public List<Map<String, Object>> getModel(Map<String, Object> map) {
@@ -908,6 +1156,181 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 			List<Long> longList1 = new ArrayList<Long>();
 			String companyName = "", subCompanyName = "";
 			for(ScheduleRealInfo schedule : keyMap.get(key)){
+				if(schedule.getFcsjActual() == null || schedule.getFcsjActual().trim().length() == 0){
+					continue;
+				}
+				if(schedule.getGsName() != null && companyName.length() == 0)
+					companyName = schedule.getGsName();
+				if(schedule.getFgsName() != null && subCompanyName.length() == 0)
+					subCompanyName = schedule.getFgsName();
+				String[] split = schedule.getFcsj().split(":");
+				long min = Integer.valueOf(split[0])*60 + Integer.valueOf(split[1]);
+				schedule.setFcsjT(min);
+				if(schedule.getXlDir().equals("0")){
+					temp0.put(min, schedule);
+					longList0.add(min);
+				} else {
+					temp1.put(min, schedule);
+					longList1.add(min);
+				}
+			}
+			if(longList0.size() == 0 || longList1.size() == 0){
+				continue;
+			}
+			if(longList0.size() != 0){
+				Collections.sort(longList0);
+				ScheduleRealInfo shouban0 = temp0.get(longList0.get(0));
+				ScheduleRealInfo moban0 = temp0.get(longList0.get(longList0.size() - 1));
+				tempMap.put("qdzFirst0", shouban0.getQdzName());
+				tempMap.put("jhfcFirst0", shouban0.getFcsj());
+				tempMap.put("qdzLast0", moban0.getQdzName());
+				tempMap.put("jhfcLast0", moban0.getFcsj());
+				if(shouban0.getFcsjActual() != null){
+					String[] split = shouban0.getFcsjActual().split(":");
+					long min = Integer.valueOf(split[0])*60 + Integer.valueOf(split[1]); 
+					long delay = shouban0.getFcsjT() - min;
+					tempMap.put("sjfcFirst0", shouban0.getFcsjActual());
+					if(delay > 0)
+						tempMap.put("delayFirst0", "+" + delay);
+					else
+						tempMap.put("delayFirst0", delay);
+				} else {
+					tempMap.put("sjfcFirst0", "/");
+					tempMap.put("delayFirst0", "/");
+				}
+				if(moban0.getFcsjActual() != null){
+					String[] split = moban0.getFcsjActual().split(":");
+					long min = Integer.valueOf(split[0])*60 + Integer.valueOf(split[1]);
+					long delay = moban0.getFcsjT() - min;
+					tempMap.put("sjfcLast0", moban0.getFcsjActual());
+					if(delay > 0)
+						tempMap.put("delayLast0", "+" + delay);
+					else
+						tempMap.put("delayLast0", delay);
+				} else {
+					tempMap.put("sjfcLast0", "/");
+					tempMap.put("delayLast0", "/");
+				}
+			}else{
+				tempMap.put("qdzFirst0", "--");
+				tempMap.put("jhfcFirst0", "/");
+				tempMap.put("qdzLast0", "--");
+				tempMap.put("jhfcLast0", "/");
+				tempMap.put("sjfcFirst0", "/");
+				tempMap.put("delayFirst0", "/");
+				tempMap.put("sjfcLast0", "/");
+				tempMap.put("delayLast0", "/");
+			}
+			
+			if(longList1.size() != 0){
+				Collections.sort(longList1);
+				ScheduleRealInfo shouban1 = temp1.get(longList1.get(0));
+				ScheduleRealInfo moban1 = temp1.get(longList1.get(longList1.size() - 1));
+				tempMap.put("qdzFirst1", shouban1.getQdzName());
+				tempMap.put("jhfcFirst1", shouban1.getFcsj());
+				tempMap.put("qdzLast1", moban1.getQdzName());
+				tempMap.put("jhfcLast1", moban1.getFcsj());
+				if(shouban1.getFcsjActual() != null){
+					String[] split = shouban1.getFcsjActual().split(":");
+					long min = Integer.valueOf(split[0])*60 + Integer.valueOf(split[1]); 
+					long delay = shouban1.getFcsjT() - min;
+					tempMap.put("sjfcFirst1", shouban1.getFcsjActual());
+					if(delay > 0)
+						tempMap.put("delayFirst1", "+" + delay);
+					else
+						tempMap.put("delayFirst1", delay);
+				} else {
+					tempMap.put("sjfcFirst1", "/");
+					tempMap.put("delayFirst1", "/");
+				}
+				if(moban1.getFcsjActual() != null){
+					String[] split = moban1.getFcsjActual().split(":");
+					long min = Integer.valueOf(split[0])*60 + Integer.valueOf(split[1]);
+					long delay = moban1.getFcsjT() - min;
+					tempMap.put("sjfcLast1", moban1.getFcsjActual());
+					if(delay > 0)
+						tempMap.put("delayLast1", "+" + delay);
+					else
+						tempMap.put("delayLast1", delay);
+				} else {
+					tempMap.put("sjfcLast1", "/");
+					tempMap.put("delayLast1", "/");
+				}
+			}else{
+				tempMap.put("qdzFirst1", "--");
+				tempMap.put("jhfcFirst1", "/");
+				tempMap.put("qdzLast1", "--");
+				tempMap.put("jhfcLast1", "/");
+				tempMap.put("sjfcFirst1", "/");
+				tempMap.put("delayFirst1", "/");
+				tempMap.put("sjfcLast1", "/");
+				tempMap.put("delayLast1", "/");
+			}
+			
+			tempMap.put("date", date);
+			tempMap.put("company", companyName);
+			tempMap.put("subCompany", subCompanyName);
+			tempMap.put("line", key);
+			resList.add(tempMap);
+		}
+		
+		if(type.equals("export")){
+			SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
+					sdfSimple = new SimpleDateFormat("yyyyMMdd");
+			List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+			Map<String,Object> m = new HashMap<String, Object>();
+			ReportUtils ee = new ReportUtils();
+			try {
+				listI.add(resList.iterator());
+				String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
+				ee.excelReplace(listI, new Object[] { m }, path+"mould/firstAndLastBus.xls",
+						path+"export/线路首末班" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
+			} catch (Exception e) {
+				// TODO: handle exception
+				e.printStackTrace();
+			}
+		}
+		
+		return resList;
+	}
+
+	@Override
+	public List<Map<String, Object>> firstAndLastBus_sum(Map<String, Object> map) {
+		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
+		Map<String, List<ScheduleRealInfo>> keyMap = new HashMap<String, List<ScheduleRealInfo>>();
+		
+		String company = map.get("company").toString();
+		String subCompany = map.get("subCompany").toString();
+		String line = map.get("line").toString();
+		String date = map.get("date").toString();
+		String type = map.get("type").toString();
+		
+		if(date.length() == 0)
+			date = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
+		
+		List<ScheduleRealInfo> list = this.getSchedule(company, subCompany, line, date);
+		
+		for(ScheduleRealInfo schedule : list){
+			if(schedule.getBcType().equals("in") || schedule.getBcType().equals("out"))
+				continue;
+			String key = schedule.getXlName();
+			if(key == null || key.trim().length() == 0)
+				continue;
+			if(!keyMap.containsKey(key))
+				keyMap.put(key, new ArrayList<ScheduleRealInfo>());
+			keyMap.get(key).add(schedule);
+		}
+		for(String key : keyMap.keySet()){
+			Map<String, Object> tempMap = new HashMap<String, Object>();
+			Map<Long, ScheduleRealInfo> temp0 = new HashMap<Long, ScheduleRealInfo>();
+			List<Long> longList0 = new ArrayList<Long>();
+			Map<Long, ScheduleRealInfo> temp1 = new HashMap<Long, ScheduleRealInfo>();
+			List<Long> longList1 = new ArrayList<Long>();
+			String companyName = "", subCompanyName = "";
+			for(ScheduleRealInfo schedule : keyMap.get(key)){
+				if(schedule.getFcsjActual() == null || schedule.getFcsjActual().trim().length() == 0){
+					continue;
+				}
 				if(schedule.getGsName() != null && companyName.length() == 0)
 					companyName = schedule.getGsName();
 				if(schedule.getFgsName() != null && subCompanyName.length() == 0)
@@ -923,6 +1346,9 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 					longList1.add(min);
 				}
 			}
+			if(longList0.size() == 0 || longList1.size() == 0){
+				continue;
+			}
 			Collections.sort(longList0);
 			Collections.sort(longList1);
 			ScheduleRealInfo shouban0 = temp0.get(longList0.get(0));
@@ -1015,7 +1441,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		return resList;
 	}
-
+	
 	@Override
 	public List<Map<String, Object>> commandState(Map<String, Object> map) {
 		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
@@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.bsth.common.Constants;
 import com.bsth.data.BasicData;
 import com.google.common.base.Splitter;
-import com.google.common.collect.ArrayListMultimap;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.annotation.Scope;
@@ -12,6 +11,7 @@ import org.springframework.stereotype.Component;
 import org.springframework.web.socket.*;
 import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
 /**
  * @author PanZhao
@@ -22,12 +22,14 @@ public class RealControlSocketHandler implements WebSocketHandler {
 	Logger logger = LoggerFactory.getLogger(this.getClass());
-	private static final ArrayList<WebSocketSession> users;
-	private static final ArrayListMultimap<String, WebSocketSession> listenMap;
+	private static ArrayList<WebSocketSession> users;
+	//private static final ArrayListMultimap<String, WebSocketSession> listenMap;
+	private static ConcurrentHashMap<String, List<WebSocketSession>> listenMap;
 	static {
 		users = new ArrayList<WebSocketSession>();
-		listenMap = ArrayListMultimap.create();
+		//listenMap = ArrayListMultimap.create();
+		listenMap = new ConcurrentHashMap();
 	}
 	@Override
@@ -35,19 +37,31 @@ public class RealControlSocketHandler implements WebSocketHandler {
 			throws Exception {
 		users.remove(session);
 		//清理监听
-		Set<String> keys = listenMap.keySet();
-		Map<String, WebSocketSession> remMap = new HashMap<>();
-		for(String k : keys){
-			if(listenMap.get(k).contains(session))
-				remMap.put(k, session);
-		}
+		//Set<String> keys = listenMap.keySet();
+		//Map<String, WebSocketSession> remMap = new HashMap<>();
+
+		int vsCount=0;
+		Collection<List<WebSocketSession>> vs = listenMap.values();
+		for(List<WebSocketSession> list : vs){
+			list.remove(session);
-		Set<String> remSet = remMap.keySet();
+			vsCount += list.size();
+		}
+		/*List<WebSocketSession> vs;
+		for(String k : keys){
+			//vs = listenMap.get(k);
+			//vs.remove(session);
+			listenMap.get(k).remove()
+			*//*if(listenMap.get(k).contains(session))
+				remMap.put(k, session);*//*
+		}*/
+
+		/*Set<String> remSet = remMap.keySet();
 		for(String k : remSet){
 			listenMap.remove(k, remMap.get(k));
 			logger.info("web socket close, remove listen K: "+ k);
-		}
-		logger.info("listen values size: " + listenMap.values().size() + " -CloseStatus:" + arg1);
+		}*/
+		logger.info("listen values size: " + vsCount + " -CloseStatus:" + arg1);
 	}
 	@Override
@@ -65,8 +79,12 @@ public class RealControlSocketHandler implements WebSocketHandler {
 				//注册线路监听
 				List<String> idx = Splitter.on(",").splitToList(jsonObj.getString("idx"));
 				for(String lineCode : idx){
-					if(BasicData.lineCode2NameMap.containsKey(lineCode))
-						listenMap.put(lineCode, session);
+					if(BasicData.lineCode2NameMap.containsKey(lineCode)){
+						if(!listenMap.containsKey(lineCode)){
+							listenMap.put(lineCode, new ArrayList<WebSocketSession>());
+						}
+						listenMap.get(lineCode).add(session);
+					}
 				}
 				break;
@@ -97,12 +115,11 @@ public class RealControlSocketHandler implements WebSocketHandler {
 	public void sendMessageToLine(String lineCode, String msg) {
 		TextMessage message = new TextMessage(msg.getBytes());
+		List<WebSocketSession> list = listenMap.get(lineCode);
+		if(list == null || list.size() == 0)
+			return;
-		Iterator<WebSocketSession> iterator = listenMap.get(lineCode).iterator();
-
-		WebSocketSession user;
-		while(iterator.hasNext()){
-			user = iterator.next();
+		for(WebSocketSession user : list){
 			try {
 				if (user.isOpen()) {
 					user.sendMessage(message);
@@ -148,7 +148,8 @@ rule &quot;Calcu_SchedulePlanRuleResult_wrap&quot;
             $self: schedulePlan
         )
         eval($self.getIsHistoryPlanFirst() == true) // 是否使用历史排班标识
-        $sprr: SchedulePlanRuleResult($qyrq: qyrq) from scheduleRuleService.findLastByXl($xlId, $fromDate.toDate())
+        $sprr: SchedulePlanRuleResult() from scheduleRuleService.findLastByXl($xlId, $fromDate.toDate())
+        eval($sprr.getQyrq() != null)
     then
         // 创建班序历史结果数据
@@ -159,7 +160,7 @@ rule &quot;Calcu_SchedulePlanRuleResult_wrap&quot;
         // 规则Md5编码
         String md5 = Md5Util.getMd5(
-            String.valueOf($qyrq.getTime()) + "_" +
+            String.valueOf($sprr.getQyrq().getTime()) + "_" +
             $sprr.getGids() + "_" + $sprr.getEcids()
         );
@@ -325,6 +326,7 @@ rule &quot;Calcu_loop2_1_&quot; // 路牌在时刻表中存在，就翻
         schedulePlanRuleResult.setScheduleDate($csd2.toDate());
         schedulePlanRuleResult.setTtinfoId($ttinfoId);
         schedulePlanRuleResult.setTtinfoName($ttinfoName);
+        schedulePlanRuleResult.setQyrq($sri.getQyrq().toDate());
         scheduleResult.getSchedulePlanRuleResults().add(schedulePlanRuleResult);