Merge branch 'minhang' into qingpu

# Conflicts: # src/main/resources/ms-jdbc.properties

Merge branch 'minhang' into qingpu
# Conflicts: # src/main/resources/ms-jdbc.properties
潘钊
2 parents 9f87b4d0 a91199a8
Showing 85 changed files with 2804 additions and 562 deletions
src/main/java/com/bsth/controller/BaseController.java
src/main/java/com/bsth/controller/forecast/SampleController.java
src/main/java/com/bsth/controller/realcontrol/LineConfigController.java
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/controller/schedule/SchedulePlanInfoController.java
src/main/java/com/bsth/controller/schedule/ScheduleRule1FlatController.java
src/main/java/com/bsth/controller/sys/UserLineController.java
src/main/java/com/bsth/data/match/Arrival2Schedule.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/SchAttrCalculator.java
src/main/java/com/bsth/data/schedule/ScheduleComparator.java
src/main/java/com/bsth/data/schedule/thread/ScheduleLateThread.java
src/main/java/com/bsth/data/schedule/SchedulePstThread.java → src/main/java/com/bsth/data/schedule/thread/SchedulePstThread.java
src/main/java/com/bsth/data/schedule/ScheduleRefreshThread.java → src/main/java/com/bsth/data/schedule/thread/ScheduleRefreshThread.java
src/main/java/com/bsth/entity/LineInformation.java
src/main/java/com/bsth/entity/forecast/Sample.java
src/main/java/com/bsth/entity/realcontrol/LineConfig.java
src/main/java/com/bsth/entity/realcontrol/ScheduleRealInfo.java
src/main/java/com/bsth/entity/schedule/SchedulePlanInfo.java
@@ -3,6 +3,7 @@ package com.bsth.controller;
 import com.bsth.common.ResponseCode;
 import com.bsth.service.BaseService;
 import com.bsth.service.schedule.utils.DataImportExportService;
+import com.google.common.base.Splitter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
@@ -17,6 +18,7 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 /**
@@ -58,8 +60,12 @@ public class BaseController&lt;T, ID extends Serializable&gt; {
 			d = Direction.ASC;
 		else
 			d = Direction.DESC;
-		
-		return baseService.list(map, new PageRequest(page, size, new Sort(d, order)));
+
+        // 允许多个字段排序，order可以写单个字段，也可以写多个字段
+        // 多个字段格式：{col1},{col2},{col3},....,{coln}
+        // 每个字段的排序方向都是一致，这个以后再看要不要改
+        List<String> list = Splitter.on(",").trimResults().splitToList(order);
+		return baseService.list(map, new PageRequest(page, size, new Sort(d, list)));
 	}
 	/**
+package com.bsth.controller.forecast;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.bsth.controller.BaseController;
+import com.bsth.entity.forecast.Sample;
+
+@RestController
+@RequestMapping("sample")
+public class SampleController extends BaseController<Sample, Long>{
+
+}
@@ -34,4 +34,9 @@ public class LineConfigController extends BaseController&lt;LineConfig, Integer&gt;{
 	public Map<String, Object> editStartOptTime(@RequestParam String time,@RequestParam String lineCode){
 		return lineConfigService.editStartOptTime(time, lineCode);
 	}
+	
+	@RequestMapping(value = "/editOutTimeType", method = RequestMethod.POST)
+	public Map<String, Object> editOutTimeType(@RequestParam String lineCode, @RequestParam int type){
+		return lineConfigService.editOutTimeType(lineCode, type);
+	}
 }
@@ -298,8 +298,8 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	@RequestMapping(value = "/exportWaybill")
 	public List<ScheduleRealInfo> exportWaybill(@RequestParam String jName, @RequestParam String clZbh,
-			@RequestParam String lpName) {
-		return scheduleRealInfoService.exportWaybill(jName, clZbh, lpName);
+			@RequestParam String lpName,@RequestParam String date) {
+		return scheduleRealInfoService.exportWaybill(jName, clZbh, lpName,date);
 	}
 	@RequestMapping(value = "/dailyInfo")
@@ -319,8 +319,9 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	}
 	@RequestMapping(value="/findKMBC")
-	public Map<String,Object> findKMBC(@RequestParam String jName,@RequestParam String clZbh,@RequestParam String lpName){
-		return scheduleRealInfoService.findKMBC(jName, clZbh,lpName);
+	public Map<String,Object> findKMBC(@RequestParam String jName,@RequestParam String clZbh,@RequestParam String lpName
+			,@RequestParam String date){
+		return scheduleRealInfoService.findKMBC(jName, clZbh,lpName,date);
 	}
 	@RequestMapping(value="/findLpName")
@@ -348,8 +349,9 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	 * @return
 	 */
 	@RequestMapping(value="/queryListWaybill")
-	public List<ScheduleRealInfo> queryListWaybill(@RequestParam String jName,@RequestParam String clZbh,@RequestParam String lpName){
-		return scheduleRealInfoService.queryListWaybill(jName, clZbh,lpName);
+	public List<ScheduleRealInfo> queryListWaybill(@RequestParam String jName,@RequestParam String clZbh,@RequestParam String lpName
+			,@RequestParam String date){
+		return scheduleRealInfoService.queryListWaybill(jName, clZbh,lpName,date);
 	}
 	@RequestMapping(value="/statisticsDaily")
@@ -2,18 +2,9 @@ package com.bsth.controller.schedule;
 import com.bsth.controller.BaseController;
 import com.bsth.entity.schedule.SchedulePlanInfo;
-import com.google.common.base.Splitter;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Sort;
 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 java.util.List;
-import java.util.Map;
-
 /**
  * Created by xu on 16/6/16.
  */
@@ -21,32 +12,4 @@ import java.util.Map;
 @RequestMapping("spic")
 public class SchedulePlanInfoController extends BaseController<SchedulePlanInfo, Long> {
-    /**
-     *
-     * @Title: list
-     * @Description: TODO(多条件分页查询)
-     * @param @param map 查询条件
-     * @param @param page 页码
-     * @param @param size 每页显示数量
-     * @throws
-     */
-    @RequestMapping(method = RequestMethod.GET)
-    public Page<SchedulePlanInfo> list(@RequestParam Map<String, Object> map,
-                        @RequestParam(defaultValue = "0") int page,
-                        @RequestParam(defaultValue = "10") int size,
-                        @RequestParam(defaultValue = "id") String order,
-                        @RequestParam(defaultValue = "DESC") String direction){
-
-        Sort.Direction d;
-
-        if(null != direction && direction.equals("ASC"))
-            d = Sort.Direction.ASC;
-        else
-            d = Sort.Direction.DESC;
-
-        // order由 col1,col2,col3 这样传入
-        List<String> list = Splitter.on(",").trimResults().splitToList(order);
-        return baseService.list(map, new PageRequest(page, size, new Sort(d, list)));
-    }
-
 }
@@ -55,11 +55,14 @@ public class ScheduleRule1FlatController extends BaseController&lt;ScheduleRule1Fla
         for (int i = 0; i < lpNames.length; i++) {
             param1.put("lpName_eq", lpNames[i]);
             Iterable<GuideboardInfo> guideboardInfos = guideboardInfoService.list(param1);
+            if (!guideboardInfos.iterator().hasNext()) {
+                throw new RuntimeException("路牌：" + lpNames[i] + "没有找到！");
+            }
             lpIds[i] = guideboardInfos.iterator().next().getId().toString();
         }
         t.setLpIds(StringUtils.join(lpIds, ","));
-        // 2、查找人员配置id
+        // 2、查找人员配置id（这里要考虑分班的情况，先用-隔开，在用,隔开）
         Map<String, Object> param2 = new HashMap<>();
         param2.put("xl.id_eq", t.getXl().getId());
         param2.put("dbbm_eq", null);
@@ -67,9 +70,34 @@ public class ScheduleRule1FlatController extends BaseController&lt;ScheduleRule1Fla
         String[] ryDbbms = t.getRyDbbms().split(",");
         String[] ryIds = new String[ryDbbms.length];
         for (int j = 0; j < ryDbbms.length; j++) {
-            param2.put("dbbm_eq", ryDbbms[j]);
-            Iterable<EmployeeConfigInfo> employeeConfigInfos = employeeConfigInfoService.list(param2);
-            ryIds[j] = employeeConfigInfos.iterator().next().getId().toString();
+            if (ryDbbms[j].indexOf("-") == -1) {
+                param2.put("dbbm_eq", ryDbbms[j]);
+                Iterable<EmployeeConfigInfo> employeeConfigInfos = employeeConfigInfoService.list(param2);
+                if (!employeeConfigInfos.iterator().hasNext()) {
+                    throw new RuntimeException("搭班编码：：" + ryDbbms[j] + "没有找到！");
+                }
+                ryIds[j] = employeeConfigInfos.iterator().next().getId().toString();
+            } else {
+                String[] fbRyDbbms = ryDbbms[j].split("-");
+                if (fbRyDbbms.length != 2) {
+                    throw new RuntimeException("搭班编码：" + ryDbbms[j] + "错误！");
+                }
+                String[] fbRyIds = new String[2];
+                param2.put("dbbm_eq", fbRyDbbms[0]);
+                Iterable<EmployeeConfigInfo> employeeConfigInfos = employeeConfigInfoService.list(param2);
+                if (!employeeConfigInfos.iterator().hasNext()) {
+                    throw new RuntimeException("搭班编码：：" + fbRyDbbms[0] + "没有找到！");
+                }
+                fbRyIds[0] = employeeConfigInfos.iterator().next().getId().toString();
+                param2.put("dbbm_eq", fbRyDbbms[1]);
+                employeeConfigInfos = employeeConfigInfoService.list(param2);
+                if (!employeeConfigInfos.iterator().hasNext()) {
+                    throw new RuntimeException("搭班编码：：" + fbRyDbbms[1] + "没有找到！");
+                }
+                fbRyIds[1] = employeeConfigInfos.iterator().next().getId().toString();
+                ryIds[j] = StringUtils.join(fbRyIds, "-");
+            }
+
         }
         t.setRyConfigIds(StringUtils.join(ryIds, ","));
+package com.bsth.controller.sys;
+
+import java.util.List;
+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.controller.BaseController;
+import com.bsth.entity.sys.UserLine;
+import com.bsth.service.sys.UserLineService;
+
+@RestController
+@RequestMapping("userline")
+public class UserLineController extends BaseController<UserLine, Integer> {
+	
+	
+	@Autowired
+	private UserLineService service;
+	
+	@RequestMapping(value = "/userRoleTree", method = RequestMethod.GET)
+	public List<Map<String, Object>> userRoleTree(@RequestParam Map<String, Object> map){
+		
+		return service.userRoleTree(map);
+		
+	}
+	
+	/**
+	 * 
+	 * @Title: setLineCasts 
+	 * 
+	 * @Description: TODO(为角色设置模块，全量覆盖) 
+	 * 
+	 * @param @param userId 用户ID
+	 * 
+	 * @param @param mIds  线路ID字符串（1,2,3,4）
+	 * 
+	 * @throws
+	 */
+	@RequestMapping(value = "/setLineCasts", method = RequestMethod.POST)
+	public Map<String, Object> setLineCasts(@RequestParam Integer userId,@RequestParam String mIds){
+		return service.setLineCasts(userId, mIds);
+	}
+}
@@ -158,7 +158,6 @@ public class Arrival2Schedule implements ApplicationContextAware {
 				//漂移判定
 				if(driftCheck(mr, arr)){
-					
 					mr.sch.setFcsjActualAll(mr.ts);
 					//通知客户端
 					sendUtils.sendFcsj(mr.sch);
@@ -211,7 +210,7 @@ public class Arrival2Schedule implements ApplicationContextAware {
 				if(null != next){
 					next.setQdzArrDateSJ(mr.sch.getZdsjActual());
 					//下发调度指令
-					directiveService.send60Dispatch(next, doneSum, "到站@系统");
+					//directiveService.send60Dispatch(next, doneSum, "到站@系统");
 					//起点既停车场的进场班次
 					if(next.getBcType().equals("in") && next.getJhlc() == null)
@@ -283,7 +283,7 @@ public class PilotReport {
 	public void clear(String lineCode){
 		logger.info("清除 80数据 before: " + d80MultiMap.size());
-		d80MultiMap.removeAll(lineCode);
+		d80MultiMap.removeAll(Integer.parseInt(lineCode));
 		logger.info("清除 80数据 after: " + d80MultiMap.size());
 	}
@@ -25,6 +25,9 @@ import com.alibaba.fastjson.JSONArray;
 import com.bsth.Application;
 import com.bsth.data.LineConfigData;
 import com.bsth.data.directive.FirstScheduleCheckThread;
+import com.bsth.data.schedule.thread.ScheduleLateThread;
+import com.bsth.data.schedule.thread.SchedulePstThread;
+import com.bsth.data.schedule.thread.ScheduleRefreshThread;
 import com.bsth.entity.realcontrol.LineConfig;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.entity.schedule.SchedulePlanInfo;
@@ -62,15 +65,11 @@ public class DayOfSchedule implements CommandLineRunner {
 	public static LinkedList<ScheduleRealInfo> pstBuffer;
 	// 排序器
-	private static ScheduleComparator.FCNO schNoComparator;
-	//private static ScheduleComparator.FCSJ schFcsjComparator;
+	private static ScheduleComparator.FCSJ schFCSJComparator;
 	@Autowired
 	LineConfigData lineConfigData;
-	/*@Autowired
-	ScheduleRealInfoService scheduleRealService;*/
-	
 	@Autowired
 	ScheduleRealInfoRepository schRepository;
@@ -90,7 +89,7 @@ public class DayOfSchedule implements CommandLineRunner {
 		nbbmScheduleMap = ArrayListMultimap.create();
 		id2SchedulMap = new HashMap<>();
 		pstBuffer = new LinkedList<>();
-		schNoComparator = new ScheduleComparator.FCNO();
+		schFCSJComparator = new ScheduleComparator.FCSJ();
 		currSchDateMap = new HashMap<>();
 		nbbm2SEStationMap = TreeMultimap.create();
 	}
@@ -103,6 +102,9 @@ public class DayOfSchedule implements CommandLineRunner {
 	@Autowired
 	FirstScheduleCheckThread firstScheduleCheckThread;
+	
+	@Autowired
+	ScheduleLateThread scheduleLateThread;
 	@Override
 	public void run(String... arg0) throws Exception {
@@ -112,6 +114,8 @@ public class DayOfSchedule implements CommandLineRunner {
 		Application.mainServices.scheduleWithFixedDelay(schedulePstThread, 60, 60, TimeUnit.SECONDS);
 		//首班出场指令补发器
 		Application.mainServices.scheduleWithFixedDelay(firstScheduleCheckThread, 60, 60, TimeUnit.SECONDS);
+		//班次误点扫描
+		Application.mainServices.scheduleWithFixedDelay(scheduleLateThread, 60, 60, TimeUnit.SECONDS);
 	}
 	public Map<String, String> getCurrSchDate() {
@@ -167,11 +171,18 @@ public class DayOfSchedule implements CommandLineRunner {
 			//添加到缓存
 			putAll(list);
-			//计算“起点站应到”时间
 			Set<String> cars = searchAllCars(list);
+			//计算“起点站应到”时间
 			for(String nbbm : cars)
 				schAttrCalculator.calcQdzTimePlan(nbbmScheduleMap.get(nbbm));
+			//是否是出站即出场
+			LineConfig conf = lineConfigData.get(lineCode);
+			if(conf.getOutConfig() == 2){
+				for(String nbbm : cars)
+					schAttrCalculator.connectOutSchedule(nbbmScheduleMap.get(nbbm));
+			}
+			
 			// 页面 翻班通知
 			sendUtils.shiftSchedule(lineCode);
 		} catch (Exception e) {
@@ -265,6 +276,7 @@ public class DayOfSchedule implements CommandLineRunner {
 	 * @Description: TODO(从计划排班表加载数据)
 	 */
 	public List<ScheduleRealInfo> loadPlanSch(String lineCode, String schDate) {
+		logger.info("从计划排班表恢复排班，lineCode: " + lineCode + ", schDate: " + schDate);
 		List<ScheduleRealInfo> realList = new ArrayList<>();
 		try {
@@ -290,6 +302,9 @@ public class DayOfSchedule implements CommandLineRunner {
 						logger.error("loadPlanSch... 计算终点时间失败...");
 					}
 				}
+				//计划里程为0，直接清空
+				if(sch.getJhlc() != null && sch.getJhlc() == 0)
+					sch.setJhlc(null);
 			}
 		} catch (Exception e) {
 			logger.error("", e);
@@ -418,28 +433,6 @@ public class DayOfSchedule implements CommandLineRunner {
 		return next;
 	}
-	/**
-	 * 
-	 * @Title: prveRealSch
-	 * @Description: TODO(获取上一个已实际发出的班次)
-	 */
-/*	public ScheduleRealInfo prveSjfc(ScheduleRealInfo sch) {
-		List<ScheduleRealInfo> list = nbbmScheduleMap.get(sch.getClZbh());
-		// 排序
-		Collections.sort(list, schNoComparator);
-
-		ScheduleRealInfo prve = null;
-
-		int i = list.indexOf(sch);
-		for (; i >= 0; i--){
-			if (list.get(i).getFcsjActual() != null){
-				prve = list.get(i);
-				break;
-			}
-		}
-		return prve;
-	}*/
-
 	public void put(ScheduleRealInfo sch) {
 		schAttrCalculator
 			.calcRealDate(sch)
@@ -466,7 +459,7 @@ public class DayOfSchedule implements CommandLineRunner {
 	public List<ScheduleRealInfo> nextAll(ScheduleRealInfo sch) {
 		List<ScheduleRealInfo> list = nbbmScheduleMap.get(sch.getClZbh());
 		// 排序
-		Collections.sort(list, schNoComparator);
+		Collections.sort(list, schFCSJComparator);
 		List<ScheduleRealInfo> rs = new ArrayList<>();
 		ScheduleRealInfo temp;
@@ -554,33 +547,6 @@ public class DayOfSchedule implements CommandLineRunner {
 		pstBuffer.add(sch);
 	}
-	/**
-	 * 
-	 * @Title: outSch 
-	 * @Description: TODO(出场班次) 
-	 */
-/*	public List<ScheduleRealInfo> outSch(String nbbm){
-		List<ScheduleRealInfo> all = nbbmScheduleMap.get(nbbm)
-					,outList = new ArrayList<>();
-		
-		for(ScheduleRealInfo sch : all){
-			if(sch.getBcType().equals("out"))
-				outList.add(sch);
-		}
-		return outList;
-	}
-	
-	public ScheduleRealInfo nextOut(String nbbm){
-		List<ScheduleRealInfo> list = outSch(nbbm);
-		Collections.sort(list, schNoComparator);
-		ScheduleRealInfo sch = null;
-		for(ScheduleRealInfo temp : list){
-			if(temp.getFcsjActual() == null)
-				sch = temp;
-		}
-		
-		return sch;
-	}*/
 	/**
 	 * 
@@ -590,7 +556,7 @@ public class DayOfSchedule implements CommandLineRunner {
 	public ScheduleRealInfo nextByBcType(String nbbm, String bcType){
 		List<ScheduleRealInfo> list = findByBcType(nbbm, bcType);
-		Collections.sort(list, schNoComparator);
+		Collections.sort(list, schFCSJComparator);
 		ScheduleRealInfo sch = null;
 		for(ScheduleRealInfo temp : list){
 			if(temp.getFcsjActual() == null)
@@ -623,4 +589,8 @@ public class DayOfSchedule implements CommandLineRunner {
 	public Set<String> allCar(){
 		return nbbmScheduleMap.keySet();
 	}
+	
+	public Collection<ScheduleRealInfo> findAll(){
+		return nbbmScheduleMap.values();
+	}
 }
@@ -87,7 +87,7 @@ public class SchAttrCalculator {
 	 * @Description: TODO(计算班次的起点应到时间，list 必须是同一辆车的班次) 
 	 */
 	public void calcQdzTimePlan(List<ScheduleRealInfo> list){
-		Collections.sort(list, new ScheduleComparator.FCNO());
+		Collections.sort(list, new ScheduleComparator.FCSJ());
 		int len = list.size();
 		if(len == 0)
@@ -102,6 +102,34 @@ public class SchAttrCalculator {
 			prve = curr;
 		}
 	}
+	
+	/**
+	 * 
+	 * @Title: connectOutSchedule 
+	 * @Description: TODO(关联出场班次) 
+	 */
+	public void connectOutSchedule(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.getBcType().equals("out") && prve.getJhlc() == null)
+				curr.setTwinsSch(prve);
+			
+			//进站即进场关联
+			if(curr.getBcType().equals("in") && curr.getJhlc() == null)
+				prve.setTwinsSch(curr);
+			
+			prve = curr;
+		}
+	}
 	public SchAttrCalculator calcFcsjTime(ScheduleRealInfo sch) throws ParseException {
 		sch.setFcsjT(DateUtils.sdfyyyyMMddHHmm.parse(sch.getRealExecDate() + sch.getFcsj()).getTime());
@@ -14,18 +14,18 @@ import com.bsth.entity.realcontrol.ScheduleRealInfo;
  */
 public class ScheduleComparator {
-	public static class FCNO implements Comparator<ScheduleRealInfo>{
+/*	public static class FCNO implements Comparator<ScheduleRealInfo>{
 		@Override
 		public int compare(ScheduleRealInfo s1, ScheduleRealInfo s2) {
 			return s1.getFcno() - s2.getFcno();
 		}
-	}
+	}*/
 	public static class FCSJ  implements Comparator<ScheduleRealInfo>{
 		@Override
 		public int compare(ScheduleRealInfo s1, ScheduleRealInfo s2) {
-			return (int) (s1.getFcsjT() - s2.getFcsjT());
+			return (int) (s1.getDfsjT() - s2.getDfsjT());
 		}
 	}
 }
+package com.bsth.data.schedule.thread;
+
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.data.schedule.ScheduleComparator;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.websocket.handler.SendUtils;
+
+/**
+ * 
+ * @ClassName: ScheduleLateThread 
+ * @Description: TODO(班次误点扫描线程) 
+ * @author PanZhao 
+ * @date 2016年8月31日 下午3:09:02 
+ *
+ */
+@Component
+public class ScheduleLateThread extends Thread{
+
+	@Autowired
+	DayOfSchedule dayOfSchedule;
+	
+	@Autowired
+	SendUtils sendUtils;
+	
+	private static Comparator<ScheduleRealInfo> cpm = new ScheduleComparator.FCSJ();
+	
+	@Override
+	public void run() {
+		List<ScheduleRealInfo> all = new ArrayList<>(dayOfSchedule.findAll());
+		Collections.sort(all, cpm);
+		
+		long t = System.currentTimeMillis();
+		int size = all.size();
+		
+		ScheduleRealInfo sch;
+		for(int i = 0; i < size; i ++){
+			sch = all.get(i);
+			if(sch.getDfsjT() > t)
+				break;
+			
+			if(sch.getStatus() == 0 && sch.getFcsjActual() == null){
+				//应发未发
+				sch.setLate(true);
+				//通知客户端
+				sendUtils.refreshSch(sch);
+			}
+		}
+	}
+}
-package com.bsth.data.schedule;
+package com.bsth.data.schedule.thread;
 import java.util.LinkedList;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
-package com.bsth.data.schedule;
+package com.bsth.data.schedule.thread;
 import java.util.Collection;
 import java.util.Set;
@@ -13,6 +13,7 @@ import com.bsth.data.LineConfigData;
 import com.bsth.data.arrival.ArrivalData_GPS;
 import com.bsth.data.directive.DayOfDirectives;
 import com.bsth.data.pilot80.PilotReport;
+import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.entity.realcontrol.LineConfig;
 /**
@@ -100,6 +100,94 @@ public class LineInformation {
 	// 进场里程
 	private Double paradeMileage;
+	// 上行进场时间
+	private Double upInTimer; 
+	
+	// 上行出场时间
+	private Double upOutTimer;
+	
+	// 下行进场时间
+	private Double downInTimer;
+	
+	// 下行出场时间
+	private Double downOutTimer;
+	
+	// 上行进场里程
+	private Double upInMileage;
+	
+	// 上行出场里程
+	private Double upOutMileage;
+	
+	// 下行进场里程
+	private Double downInMileage;
+	
+	// 下行出场里程
+	private Double downOutMileage;
+	
+	public Double getUpInTimer() {
+		return upInTimer;
+	}
+
+	public void setUpInTimer(Double upInTimer) {
+		this.upInTimer = upInTimer;
+	}
+
+	public Double getUpOutTimer() {
+		return upOutTimer;
+	}
+
+	public void setUpOutTimer(Double upOutTimer) {
+		this.upOutTimer = upOutTimer;
+	}
+
+	public Double getDownInTimer() {
+		return downInTimer;
+	}
+
+	public void setDownInTimer(Double downInTimer) {
+		this.downInTimer = downInTimer;
+	}
+
+	public Double getDownOutTimer() {
+		return downOutTimer;
+	}
+
+	public void setDownOutTimer(Double downOutTimer) {
+		this.downOutTimer = downOutTimer;
+	}
+
+	public Double getUpInMileage() {
+		return upInMileage;
+	}
+
+	public void setUpInMileage(Double upInMileage) {
+		this.upInMileage = upInMileage;
+	}
+
+	public Double getUpOutMileage() {
+		return upOutMileage;
+	}
+
+	public void setUpOutMileage(Double upOutMileage) {
+		this.upOutMileage = upOutMileage;
+	}
+
+	public Double getDownInMileage() {
+		return downInMileage;
+	}
+
+	public void setDownInMileage(Double downInMileage) {
+		this.downInMileage = downInMileage;
+	}
+
+	public Double getDownOutMileage() {
+		return downOutMileage;
+	}
+
+	public void setDownOutMileage(Double downOutMileage) {
+		this.downOutMileage = downOutMileage;
+	}
+
 	// 出场里程
 	private Double outMileage;
+package com.bsth.entity.forecast;
+
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+
+/**
+ * 
+ * @ClassName: Sample
+ * @Description: TODO(站点耗时预测样本)
+ * @author PanZhao
+ * @date 2016年8月31日 上午9:50:49
+ *
+ */
+@Entity
+@Table(name = "bsth_forecast_sample")
+public class Sample {
+
+	@Id
+	@GeneratedValue
+	private Long id;
+
+	private Integer lineCode;
+	
+	// 开始时间
+	private String sDate;
+	@Transient
+	private Long sTime;
+
+	// 结束时间
+	private String eDate;
+	@Transient
+	private Long eTime;
+
+	// 开始站点
+	private String sStation;
+
+	// 结束站点
+	private String eStation;
+
+	// 0：gps分析生成， 1：人工录入
+	private int type;
+	
+	private String tag;
+	
+	//行驶时间
+	private Float runTime;
+	
+	private int updown;
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public String getsDate() {
+		return sDate;
+	}
+
+	public void setsDate(String sDate) {
+		this.sDate = sDate;
+	}
+
+	public Long getsTime() {
+		return sTime;
+	}
+
+	public void setsTime(Long sTime) {
+		this.sTime = sTime;
+	}
+
+	public String geteDate() {
+		return eDate;
+	}
+
+	public void seteDate(String eDate) {
+		this.eDate = eDate;
+	}
+
+	public Long geteTime() {
+		return eTime;
+	}
+
+	public void seteTime(Long eTime) {
+		this.eTime = eTime;
+	}
+
+	public String getsStation() {
+		return sStation;
+	}
+
+	public void setsStation(String sStation) {
+		this.sStation = sStation;
+	}
+
+	public String geteStation() {
+		return eStation;
+	}
+
+	public void seteStation(String eStation) {
+		this.eStation = eStation;
+	}
+
+	public int getType() {
+		return type;
+	}
+
+	public void setType(int type) {
+		this.type = type;
+	}
+
+	public String getTag() {
+		return tag;
+	}
+
+	public void setTag(String tag) {
+		this.tag = tag;
+	}
+
+	public Float getRunTime() {
+		return runTime;
+	}
+
+	public void setRunTime(Float runTime) {
+		this.runTime = runTime;
+	}
+
+	public Integer getLineCode() {
+		return lineCode;
+	}
+
+	public void setLineCode(Integer lineCode) {
+		this.lineCode = lineCode;
+	}
+
+	public int getUpdown() {
+		return updown;
+	}
+
+	public void setUpdown(int updown) {
+		this.updown = updown;
+	}
+}
@@ -55,10 +55,10 @@ public class LineConfig {
 	/** 托管状态 */
 	private boolean trust;
-	/** 出场时间设置 0：真实出场（设备离开缓冲区时间） 1：请求出场时间 */
+	/** 出场时间设置 0：真实出场（设备离开缓冲区时间） 1：请求出场时间 2：出站即出场 */
 	private int outConfig;
-	/** 进场时间设置 0：真实进场（设备进入缓冲区时间） 1：请求进场时间 */
+	/** 进场时间设置 0：真实进场（设备进入缓冲区时间） 1：请求进场时间  2：出站即出场*/
 	private int inConfig;
 	/** 短语模板 , 号分隔多个 */
@@ -102,19 +102,10 @@ public class ScheduleRealInfo {
 	 */
 	private String bcType;
-	/** 设备请求出场或进场时间（班次为 出场或进场 时，该字段可能有值） 
-	private Long devRequestTime;*/
-	
-	/** 停车场既首发站  */
-	@Transient
-	private boolean parkIsFirstStation;
-	/** 首发站既停车场  */
-	@Transient
-	private boolean firstStationIsPark;
-	/** 与其共享发车时间的进出场班次  */
+	/** 出站即出场 ， 关联的进出场班次  */
 	@JsonIgnore
 	@Transient
-	private ScheduleRealInfo twins;
+	private ScheduleRealInfo twinsSch;
 	/** 创建人 */
 	@JsonIgnore
@@ -149,7 +140,7 @@ public class ScheduleRealInfo {
 	private boolean sflj;
 	/** 是否误点*/
-	private boolean isLate;
+	private boolean late;
 	/**实际里程*/
 	private Float realMileage;
@@ -468,14 +459,6 @@ public class ScheduleRealInfo {
 		this.status = status;
 	}
-	public boolean isLate() {
-		return isLate;
-	}
-
-	public void setLate(boolean isLate) {
-		this.isLate = isLate;
-	}
-
 	public Float getRealMileage() {
 		return realMileage;
 	}
@@ -539,35 +522,6 @@ public class ScheduleRealInfo {
 		}
 	}
-	/**
-	 * @throws ParseException 
-	 * 
-	 * @Title: syncTime 
-	 * @Description: TODO(根据计发时间，计算待发时间和终点时间) 
-	 * @param     设定文件 
-	 * @return void    返回类型 
-	 * @throws
-	
-	public void syncTime(){
-		try{
-			this.setDfsj(this.getFcsj());
-			//发车时间戳
-			this.setFcsjT(sdfyyyyMMddHHmm.parse(this.realExecDate + " " + this.getFcsj()).getTime());
-			//待发时间戳
-			this.setDfsjT(this.getFcsjT());
-			//计算终点时间
-			calcEndTime();
-			
-			if(this.fcsjActual != null)
-				this.setFcsjActualAll(this.fcsjActual);
-			
-			if(this.zdsjActual != null)
-				this.setZdsjActualAll(this.zdsjActual);
-		}catch(Exception e){
-			e.printStackTrace();
-		}
-	} */
-	
 	public void calcEndTime(){
 		//计划终点时间
 		if(this.getBcsj() != null){
@@ -671,21 +625,6 @@ public class ScheduleRealInfo {
 		calcStatus();
 	}
-	//和依赖班次同步发车时间
-/*	public void synchroFcsj(){
-		if(this.isFirstStationIsPark() || this.isParkIsFirstStation()){
-			ScheduleRealInfo twinsSch = this.twins;
-			if(null != twinsSch){
-				//有关联的出场班次
-				twinsSch.setFcsjActual(this.fcsjActual);
-				twinsSch.setFcsjActualTime(this.fcsjActualTime);
-				if(null != twinsSch.getSjfcModel())
-					twinsSch.getSjfcModel().setPersonTime(this.fcsjActualTime);
-				twinsSch.calcStatus();
-			}
-		}
-	}*/
-	
 	/**
 	 * 
 	 * @Title: setFcsjActualAll 
@@ -718,19 +657,6 @@ public class ScheduleRealInfo {
 		}
 	}
-	//和依赖的进场班次同步终点时间
-/*	public void synchroZdsj(){
-		if(this.isFirstStationIsPark()){
-			ScheduleRealInfo twinsSch = this.twins;
-			if(null != twinsSch && twinsSch.getBcType().equals("in")){
-				//有关联的进场班次
-				twinsSch.setFcsjActual(this.zdsjActual);
-				twinsSch.setFcsjActualTime(this.zdsjActualTime);
-				twinsSch.calcStatus();
-			}
-		}
-	}*/
-
 	public Long getSpId() {
 		return spId;
 	}
@@ -755,9 +681,9 @@ public class ScheduleRealInfo {
 		if(StringUtils.isNotBlank(this.fcsjActual)){
 			this.status = 1;
-			//进出场班次并且没有终点时间的
+			//进出场班次并且没有计划里程的
 			if((this.bcType.equals("out") || this.bcType.equals("in"))
-					&& this.zdsj == null){
+					&& this.jhlc == null){
 				this.status = 2;
 			}
 		}
@@ -792,60 +718,12 @@ public class ScheduleRealInfo {
 	public void setScheduleDateStr(String scheduleDateStr) {
 		this.scheduleDateStr = scheduleDateStr;
 	}
-
-	public boolean isParkIsFirstStation() {
-		return parkIsFirstStation;
-	}
-
-	public void setParkIsFirstStation(boolean parkIsFirstStation) {
-		this.parkIsFirstStation = parkIsFirstStation;
-	}
-
-/*	public ScheduleRealInfo getTwins() {
-		return twins;
-	}
-
-	public void setTwins(ScheduleRealInfo twins) {
-		this.twins = twins;
-	}
-
-	public boolean isFirstStationIsPark() {
-		return firstStationIsPark;
-	}
-
-	public void setFirstStationIsPark(boolean firstStationIsPark) {
-		this.firstStationIsPark = firstStationIsPark;
-	}*/
-	
-	
-	/*public boolean statusTostart(){
-		return this.getFcsjActual() == null
-				&& this.getSjfcModel().getTime() != null;
-	}
-	
-	public boolean statusToEnd(){
-		return this.getZdsjActual() == null
-				&& this.getSjddModel().getTime() != null;
-	}
-
-	public void revokeRealOutgo() {
-		//this.setStatus(0);
-		this.setFcsjActual(null);
-		this.setFcsjActualTime(null);
-		if(null != this.getSjfcModel())
-			this.getSjfcModel().resetNull();
-		this.calcStatus();
-	}*/
 	public void clearFcsjActual(){
 		this.setFcsjActual(null);
 		this.setFcsjActualTime(null);
 		this.calcStatus();
 	}
-
-/*	public boolean existDependent() {
-		return this.isFirstStationIsPark() || this.parkIsFirstStation;
-	}*/
 	//清除实际终点时间
 	public void clearZdsjActual(){
@@ -862,4 +740,20 @@ public class ScheduleRealInfo {
 	public void setOpDirectiveState(Integer opDirectiveState) {
 		this.opDirectiveState = opDirectiveState;
 	}
+
+	public ScheduleRealInfo getTwinsSch() {
+		return twinsSch;
+	}
+
+	public void setTwinsSch(ScheduleRealInfo twinsSch) {
+		this.twinsSch = twinsSch;
+	}
+
+	public boolean isLate() {
+		return late;
+	}
+
+	public void setLate(boolean late) {
+		this.late = late;
+	}
 }
@@ -3,10 +3,10 @@ package com.bsth.entity.schedule;
 import com.bsth.entity.Line;
 import com.bsth.entity.sys.SysUser;
 import com.bsth.service.schedule.rules.shiftloop.ScheduleResult_output;
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import javax.persistence.*;
 import java.util.Date;
+import java.util.List;
 /**
  * 排班计划明细。
@@ -150,7 +150,7 @@ public class SchedulePlanInfo {
             ScheduleResult_output scheduleResult_output,
             TTInfoDetail ttInfoDetail,
             CarConfigInfo carConfigInfo,
-            EmployeeConfigInfo employeeConfigInfo,
+            List<EmployeeConfigInfo> employeeConfigInfoList,
             SchedulePlan schedulePlan) {
         // TODO：关联的公司名称
@@ -180,6 +180,17 @@ public class SchedulePlanInfo {
         // TODO：报道时间，出场时间没有
         // 关联的驾驶员
+        EmployeeConfigInfo employeeConfigInfo = null;
+        if (ttInfoDetail.getIsFB()) {
+            if (employeeConfigInfoList.size() > 1) {
+                employeeConfigInfo = employeeConfigInfoList.get(1);
+            } else {
+                employeeConfigInfo = employeeConfigInfoList.get(0);
+            }
+        } else {
+            employeeConfigInfo = employeeConfigInfoList.get(0);
+        }
+
         this.j = employeeConfigInfo.getJsy().getId();
         this.jGh = employeeConfigInfo.getJsy().getJobCode();
         this.jName = employeeConfigInfo.getJsy().getPersonnelName();
@@ -207,15 +218,13 @@ public class SchedulePlanInfo {
             this.zdz = ttInfoDetail.getTcc().getId(); // 终点站-停车场id
             this.zdzCode = ttInfoDetail.getTcc().getParkCode(); // 终点站-停车场code
             this.zdzName = ttInfoDetail.getTcc().getParkName(); // 终点站-停车场name
-        } else if ("normal".equals(this.bcType)) { // 正常班次
+        } else { // 其他班次
             this.qdz = ttInfoDetail.getQdz().getId(); // 起点站id
             this.qdzCode = ttInfoDetail.getQdz().getStationCod(); // 起点站code
             this.qdzName = ttInfoDetail.getQdz().getStationName(); // 起点站name
             this.zdz = ttInfoDetail.getZdz().getId(); // 终点站id
             this.zdzCode = ttInfoDetail.getZdz().getStationCod(); // 终点站code
             this.zdzName = ttInfoDetail.getZdz().getStationName(); // 终点站name
-        } else {
-            throw new RuntimeException("排班计划数据，未知班次类型：" + this.bcType);
         }
         this.fcsj = ttInfoDetail.getFcsj(); // 发车时间
@@ -61,10 +61,10 @@ public class ScheduleRule1Flat {
     /** 起始路牌（从0开始） */
     @NotNull
     private Integer lpStart;
-    /** 人员搭班编码s（用逗号隔开） */
+    /** 人员搭班编码s（用逗号隔开，如果分班，就先-隔开再逗号隔开） */
     @NotNull
     private String ryDbbms;
-    /** 对应的人员配置ids（用逗号隔开） */
+    /** 对应的人员配置ids（用逗号隔开，如果分班，就先-隔开再逗号隔开） */
     @NotNull
     private String ryConfigIds;
     /** 起始人员（从0开始） */
+package com.bsth.entity.sys;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+
+import com.bsth.entity.Line;
+
+/**
+ * 
+ * @ClassName: Line(用户线路分配实体类)
+ * 
+ * @Description: TODO(用户线路分配实体类)
+ * 
+ * @Author bsth@lq
+ * 
+ * @Date 2016年8月26日 09:03:33
+ *
+ * @Version 公交调度系统BS版 0.1
+ * 
+ */
+
+@Entity
+@Table(name = "bsth_c_user_line")
+public class UserLine {
+	
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	private Integer id;
+	
+	@ManyToOne
+	private Line line;
+	
+	@ManyToOne
+	private SysUser user;
+
+	public Line getLine() {
+		return line;
+	}
+	
+	public Integer getId() {
+		return id;
+	}
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	public void setLine(Line line) {
+		this.line = line;
+	}
+
+	public SysUser getUser() {
+		return user;
+	}
+
+	public void setUser(SysUser user) {
+		this.user = user;
+	}
+}
@@ -66,9 +66,9 @@ public interface CarParkRepository extends BaseRepository&lt;CarPark, Integer&gt;{
 							"k.update_date AS carParkUpdateDate," +
 							"k.versions AS carParkVersions," +
 							"k.b_center_point AS carParkBcenterPoint," +
-							"AsText(k.b_park_point) AS carParkBparkPoint," +
+							"ST_AsText(k.b_park_point) AS carParkBparkPoint," +
 							"k.g_center_point AS carParkGcenterPoint," +
-							"AsText(k.g_park_point) AS carParkGparkPoint, " +
+							"ST_AsText(k.g_park_point) AS carParkGparkPoint, " +
 							"k.db_type AS carParkDBtype," +
 							"k.radius AS carParkRadius," +
 							"k.shapes_type AS carParkShapesType FROM bsth_c_car_park k where k.id = ?1", nativeQuery=true)
@@ -36,6 +36,6 @@ public interface LineRepository extends BaseRepository&lt;Line, Integer&gt; {
 	@Query(value = "  SELECT l FROM Line l where l.name like ?1")
 	List<Line> findLine(String line);
-
+	
 	public Line findByLineCode(String string);
 }
@@ -51,8 +51,8 @@ public interface SectionRouteRepository extends BaseRepository&lt;SectionRoute, Int
 			" b.middle_node AS sectionMiddleNode," +
 	        " b.section_type AS sectionType," +
 			" b.csection_vector AS sectionCsectionVector," +
-			" AsText(b.bsection_vector) AS sectionBsectionVector," +
-			" AsText(b.gsection_vector) AS sectionGsectionVector," +
+			" ST_AsText(b.bsection_vector) AS sectionBsectionVector," +
+			" ST_AsText(b.gsection_vector) AS sectionGsectionVector," +
 			" b.road_coding AS sectionRoadCoding," +
 			" b.section_distance AS sectionDistance," +
             " b.section_time AS sectionTime," +
@@ -101,9 +101,9 @@ public interface SectionRouteRepository extends BaseRepository&lt;SectionRoute, Int
 			"b.start_node AS sectionStartNode," +
 			"b.middle_node AS sectionMiddleNode," +
 			"b.section_type AS sectionType," +
-			"AsText(b.csection_vector) AS sectionCsectionVector," +
-			"AsText(b.bsection_vector) AS sectionBsectionVector," +
-			"AsText(b.gsection_vector) AS sectionGsectionVector," +
+			"ST_AsText(b.csection_vector) AS sectionCsectionVector," +
+			"ST_AsText(b.bsection_vector) AS sectionBsectionVector," +
+			"ST_AsText(b.gsection_vector) AS sectionGsectionVector," +
 			"b.section_distance AS sectionDistance," +
 			"b.section_time AS sectionTime," +
 			"b.db_type AS sectionDbtype," +
@@ -151,7 +151,7 @@ public interface SectionRouteRepository extends BaseRepository&lt;SectionRoute, Int
 	 */
 	@Query(value =  "SELECT " +
 					"c.directions," +
-					"AsText(s.bsection_vector) as bsection_vector," +
+					"ST_AsText(s.bsection_vector) as bsection_vector," +
 					"s.speed_limit," +
 					"s.section_name " +
 					" FROM bsth_c_sectionroute c " +
@@ -3,7 +3,7 @@ package com.bsth.repository;
 import java.util.List;
 import java.util.Map;
-
+import com.bsth.entity.schedule.CarConfigInfo;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.domain.Specification;
@@ -14,6 +14,7 @@ import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 import com.bsth.entity.Line;
+import com.bsth.entity.LineInformation;
 import com.bsth.entity.StationRoute;
 /**
@@ -62,8 +63,8 @@ public interface StationRouteRepository extends BaseRepository&lt;StationRoute, Int
 							"b.y AS 'station.y'," +
 							"b.shapes_type AS 'station.shapesType'," +
 							"b.radius AS 'station.radius'," +
-							"AsText(b.g_polygon_grid) AS 'station.gPolygonGrid'," +
-							"AsText(b.b_polygon_grid) AS 'station.bPolygonGrid'," +
+							"ST_AsText(b.g_polygon_grid) AS 'station.gPolygonGrid'," +
+							"ST_AsText(b.b_polygon_grid) AS 'station.bPolygonGrid'," +
 							"b.destroy AS 'station.destroy'," +
 							"b.versions AS 'station.versions'," +
 							"b.descriptions AS 'station.descriptions' FROM (" +
@@ -108,7 +109,7 @@ public interface StationRouteRepository extends BaseRepository&lt;StationRoute, Int
 	 * 
 	 * @return List<Object[]>
 	 */
-	@Query(value = "SELECT s.b_jwpoints FROM (" +
+	@Query(value = "SELECT s.b_jwpoints,s.station_name FROM (" +
 						"SELECT b.station FROM bsth_c_stationroute b where b.line =?1 and b.directions = ?2 and b.destroy=0) r " +
 				   "LEFT JOIN bsth_c_station s on r.station = s.id", nativeQuery=true)
 	List<Object[]> getSelectStationRouteCenterPoints(Integer lineId,Integer direction);
@@ -190,8 +191,8 @@ public interface StationRouteRepository extends BaseRepository&lt;StationRoute, Int
 			" b.g_laty AS stationGlaty," +
 			" b.x AS stationX," +
 			" b.y AS stationY," +
-			" AsText(b.b_polygon_grid) as stationBPolyonGrid," +
-			" AsText(b.g_polygon_grid) AS stationGPloyonGrid, " +
+			" ST_AsText(b.b_polygon_grid) as stationBPolyonGrid," +
+			" ST_AsText(b.g_polygon_grid) AS stationGPloyonGrid, " +
 			" b.destroy AS stationDestroy," +
 			" b.radius AS stationRadius," +
 			" b.shapes_type AS stationShapesType," +
@@ -226,17 +227,10 @@ public interface StationRouteRepository extends BaseRepository&lt;StationRoute, Int
 	List<StationRoute> findByLine(Line line);
-    @EntityGraph(value = "stationRoute_station", type = EntityGraph.EntityGraphType.FETCH)
-    @Override
-    Page<StationRoute> findAll(Specification<StationRoute> spec, Pageable pageable);
-
-    @EntityGraph(value = "stationRoute_station", type = EntityGraph.EntityGraphType.FETCH)
-    @Override
-    List<StationRoute> findAll(Specification<StationRoute> spec);
-	
+	@EntityGraph(value = "stationRoute_station", type = EntityGraph.EntityGraphType.FETCH)
+	@Query("select s from StationRoute s where s.destroy=0")
+	List<StationRoute> findAll2();
     @Query("select new map(sr.station.id as stationid, sr.stationName as stationname) from StationRoute sr where sr.line.id=?1 and sr.directions=?2")
     List<Map<String, Object>> findStations(Integer xlid, Integer xldir);
-    
-    
 }
+package com.bsth.repository.forecast;
+
+import org.springframework.stereotype.Repository;
+
+import com.bsth.entity.forecast.Sample;
+import com.bsth.repository.BaseRepository;
+
+@Repository
+public interface SampleRepository extends BaseRepository<Sample, Long>{
+
+}
@@ -20,10 +20,10 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	List<ScheduleRealInfo> findByLines(List<String> lines);
-	@Query(value="select s from ScheduleRealInfo s where s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 group by jName,clZbh,lpName")
+	@Query(value="select s from ScheduleRealInfo s where s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 and s.bcType = 'out' order by (lpName+1)")
 	List<ScheduleRealInfo> queryUserInfo(String line,String date);
-	@Query(value="select s from ScheduleRealInfo s where s.jName = ?1 and s.clZbh = ?2 and s.lpName = ?3 order by fcsj")
+	@Query(value="select s from ScheduleRealInfo s where s.jName = ?1 and s.clZbh = ?2 and s.lpName = ?3 order by bcs")
 	List<ScheduleRealInfo> exportWaybill(String jName,String clZbh,String lpName);
 	@Query(value="select new map(clZbh as clZbh,jGh as jGh,jName as jName,sum(jhlc) as zgl,sum(addMileage) as ksgl,count(jName) as bcs) from ScheduleRealInfo s where s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 group by clZbh,jGh")
@@ -54,8 +54,8 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	@Query(value="select s from ScheduleRealInfo s where s.xlBm = ?1 and s.scheduleDate >= str_to_date(?2,'%Y-%m-%d') and s.scheduleDate <= str_to_date(?3,'%Y-%m-%d') and s.lpName = ?4 order by s.fcsj")
 	List<ScheduleRealInfo> correctForm(String line,String startDate,String endDate,String lpName);
-	@Query(value="select s from ScheduleRealInfo s where s.jName = ?1 and s.clZbh = ?2 and s.lpName = ?3 order by fcsj")
-	List<ScheduleRealInfo> queryListWaybill(String jName,String clZbh,String lpName);
+	@Query(value="select s from ScheduleRealInfo s where s.jName = ?1 and s.clZbh = ?2 and s.lpName = ?3 and s.scheduleDate <= str_to_date(?4,'%Y-%m-%d') order by bcs")
+	List<ScheduleRealInfo> queryListWaybill(String jName,String clZbh,String lpName,String date);
 	@Query(value="select s from ScheduleRealInfo s where s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2")
 	List<ScheduleRealInfo> scheduleDaily(String line,String date);
+package com.bsth.repository.sys;
+
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.stereotype.Repository;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.bsth.entity.sys.UserLine;
+import com.bsth.repository.BaseRepository;
+
+
+@Repository
+public interface UserLineRepository extends BaseRepository<UserLine, Integer>{
+	
+    @Modifying
+    @Query(value="DELETE FROM bsth_c_user_line  WHERE user = ?1", nativeQuery=true)
+	public void del(int userId);
+	
+}
@@ -4,6 +4,7 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import java.io.Serializable;
+import java.util.Collection;
 import java.util.Map;
 /**
@@ -70,4 +71,11 @@ public interface BaseService&lt;T, ID extends Serializable&gt; {
      * @return {status:状态编码,msg:错误描述}，状态编码 @see com.bsth.common.ResponseCode
      */
     Map<String, Object> validateEquale(Map<String, Object> params);
+
+    /**
+     * 批量保存。
+     * @param entities 实体列表
+     * @return 保存后的entities
+     */
+    <S extends T> Collection<S> bulkSave(Collection<S> entities);
 }
@@ -4,9 +4,6 @@ package com.bsth.service.directive;
 import java.util.List;
 import java.util.Map;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
-
 import com.bsth.entity.directive.D60;
 import com.bsth.entity.directive.D64;
 import com.bsth.entity.directive.D80;
@@ -40,6 +40,8 @@ import com.bsth.security.util.SecurityUtils;
 import com.bsth.service.impl.BaseServiceImpl;
 import com.bsth.util.DateUtils;
 import com.bsth.websocket.handler.RealControlSocketHandler;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.base.Splitter;
 @Service
@@ -165,10 +167,17 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
 	 */
 	@Override
 	public void sendD60ToPage(ScheduleRealInfo sch) {
-		JSONObject json = new JSONObject();
-		json.put("fn", "directive");
-		json.put("t", sch);
-		socketHandler.sendMessageToLine(sch.getXlBm(), json.toJSONString());
+		Map<String, Object> map = new HashMap<>();
+		map.put("fn", sch);
+		map.put("t", sch);
+		
+		ObjectMapper mapper = new ObjectMapper();
+		
+		try {
+			socketHandler.sendMessageToLine(sch.getXlBm(), mapper.writeValueAsString(map));
+		} catch (JsonProcessingException e) {
+			logger.error("", e);
+		}
 	}
 	@Override
@@ -244,7 +253,7 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
 			logger.error("没有设备号对照的车辆：" + nbbm);
 			return null;
 		}
-		// 根据当前确定 上下行和营运状态
+		// 根据当前GPS确定 上下行和营运状态
 		Integer upDown = null, state = null;
 		if (null == sch) {
 			GpsEntity gpsData = gpsRealDataBuffer.findByDeviceId(deviceId);
+package com.bsth.service.forecast;
+
+import com.bsth.entity.forecast.Sample;
+import com.bsth.service.BaseService;
+
+public interface SampleService extends BaseService<Sample, Long>{
+
+}
+package com.bsth.service.forecast;
+
+import org.springframework.stereotype.Service;
+
+import com.bsth.entity.forecast.Sample;
+import com.bsth.service.impl.BaseServiceImpl;
+
+@Service
+public class SampleServiceImpl extends BaseServiceImpl<Sample, Long>{
+
+}
@@ -7,18 +7,23 @@ import com.bsth.service.BaseService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
+import javax.persistence.EntityManager;
 import java.io.Serializable;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.*;
 public class BaseServiceImpl<T, ID extends Serializable> implements BaseService<T, ID>{
 	@Autowired
 	private BaseRepository<T, ID> baseRepository;
+    @Autowired
+    private EntityManager entityManager;
+    @Value("${hibernate.jdbc.batch_size}")
+    private int batchSize;
 	Logger logger = LoggerFactory.getLogger(this.getClass());
@@ -50,9 +55,25 @@ public class BaseServiceImpl&lt;T, ID extends Serializable&gt; implements BaseService&lt;
 		}
 		return map;
 	}
-	
-	@Override
+    @Override
+    public <S extends T> Collection<S> bulkSave(Collection<S> entities) {
+        final List<S> savedEntities = new ArrayList<>(entities.size());
+        int i = 0;
+        for (S t : entities) {
+            entityManager.persist(t);
+            savedEntities.add(t);
+            i++;
+            if (i % batchSize == 0) {
+                entityManager.flush();
+                entityManager.clear();
+            }
+        }
+
+        return savedEntities;
+    }
+
+    @Override
 	public Iterable<T> findAll() {
 		return baseRepository.findAll();
 	}
@@ -38,9 +38,10 @@ public class LineServiceImpl extends BaseServiceImpl&lt;Line, Integer&gt; implements L
 		// TODO Auto-generated method stub
 		return repository.selectMaxIdToLineCode();
 	}
-
+	
 	@Override
 	public Line findByLineCode(Integer lineCode) {
 		return repository.findByLineCode(lineCode + "");
 	}
+
 }
@@ -457,7 +457,9 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 				Map<String, Object> tempM = new HashMap<String,Object>();
-				tempM.put("bJwpoints", list.get(i));
+				tempM.put("bJwpoints", list.get(i)[0]);
+				
+				tempM.put("stationName", list.get(i)[1]);
 				resultList.add(tempM);
@@ -13,4 +13,6 @@ public interface LineConfigService extends BaseService&lt;LineConfig, Integer&gt;{
 	Map<String, Object> editStartOptTime(String time, String lineCode);
+	Map<String, Object> editOutTimeType(String lineCode, int type);
+
 }
@@ -60,7 +60,7 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
 	List<ScheduleRealInfo> queryUserInfo(String line,String date);
-	List<ScheduleRealInfo> exportWaybill(String jName,String clZbh,String lpName);
+	List<ScheduleRealInfo> exportWaybill(String jName,String clZbh,String lpName,String date);
 	List<Map<String,Object>> dailyInfo(String line,String date,String type);
@@ -84,7 +84,7 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
 	List<Map<String,String>> findLine(String line);
-	Map<String,Object> findKMBC(String jName,String clZbh,String lpName);
+	Map<String,Object> findKMBC(String jName,String clZbh,String lpName,String date);
 	List<Map<String,String>> findLpName(String lpName);
@@ -92,7 +92,7 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
 	List<ScheduleRealInfo> correctForm(String line,String startDate,String endDate,String lpName,String code);
-	List<ScheduleRealInfo> queryListWaybill(String jName,String clZbh,String lpName);
+	List<ScheduleRealInfo> queryListWaybill(String jName,String clZbh,String lpName,String date);
 	Map<String, Object> removeChildTask(Long taskId);
@@ -64,4 +64,18 @@ public class LineConfigServiceImpl extends BaseServiceImpl&lt;LineConfig, Integer&gt; 
 		rs.put("time", time);
 		return rs;
 	}
+
+	@Override
+	public Map<String, Object> editOutTimeType(String lineCode, int type) {
+		Map<String, Object> rs = new HashMap<>();
+		LineConfig conf = lineConfigData.get(lineCode);
+		
+		conf.setOutConfig(type);
+		conf.setInConfig(type);
+		lineConfigData.set(conf);
+		
+		rs.put("status", ResponseCode.SUCCESS);
+		rs.put("type", type);
+		return rs;
+	}
 }
@@ -455,11 +455,11 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 	 * 
 	 */
 	@Override
-	public List<ScheduleRealInfo> exportWaybill(String jName, String clZbh, String lpName) {
+	public List<ScheduleRealInfo> exportWaybill(String jName, String clZbh, String lpName,String date) {
 		ReportUtils ee = new ReportUtils();
 		ReportRelatedUtils rru = new ReportRelatedUtils();
 		List<Iterator<?>> list = new ArrayList<Iterator<?>>();
-		List<ScheduleRealInfo> scheduleRealInfos = scheduleRealInfoRepository.exportWaybill(jName, clZbh, lpName);
+		List<ScheduleRealInfo> scheduleRealInfos = scheduleRealInfoRepository.queryListWaybill(jName, clZbh, lpName,date);
 		List<Map<String,Object>> listMap = new ArrayList<Map<String,Object>>();
 		DecimalFormat format = new DecimalFormat("0.00");
@@ -712,7 +712,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 			}
 			else{
 				// 按发车时间排序
-				Collections.sort(list, new ScheduleComparator.FCNO());
+				Collections.sort(list, new ScheduleComparator.FCSJ());
 				// 以第一个实际发车/待发时间为起点，调整间隔
 				sch = list.get(0);
@@ -979,8 +979,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 	@Override
 	public Map<String, Object> findKMBC(String jName, String clZbh,
-			String lpName) {
-		List<ScheduleRealInfo> list = scheduleRealInfoRepository.exportWaybill(jName, clZbh, lpName);
+			String lpName,String date) {
+		List<ScheduleRealInfo> list = scheduleRealInfoRepository.queryListWaybill(jName, clZbh, lpName, date);
 		DecimalFormat format = new DecimalFormat("0.00");
 		int cjbc = scheduleRealInfoRepository.findCjbc(jName, clZbh, lpName);
 		int ljbc = scheduleRealInfoRepository.findLjbc(jName, clZbh, lpName);
@@ -1039,8 +1039,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 	@Override
 	public List<ScheduleRealInfo> queryListWaybill(String jName, String clZbh,
-			String lpName) {
-		return scheduleRealInfoRepository.queryListWaybill(jName,clZbh,lpName);
+			String lpName,String date) {
+		return scheduleRealInfoRepository.queryListWaybill(jName,clZbh,lpName,date);
 	}
 	@Override
@@ -47,8 +47,8 @@ public class SchedulePlanServiceImpl extends BaseServiceImpl&lt;SchedulePlan, Long&gt;
         // 1-1、查找线路具体信息
         Line xl = strategy.getLine(schedulePlan.getXl().getId());
         // 1-2、查出指定线路的所有规则
-        TTInfo ttInfo = strategy.getTTInfo(xl.getId()); // 时刻表id
-        schedulePlan.setTtInfo(ttInfo); // 关联的时刻表
+        TTInfo ttInfo = strategy.getTTInfo(xl.getId()).get(0); // 时刻表id
+        schedulePlan.setTtInfo(ttInfo); // TODO：关联的时刻表，之后改掉
         // 2-1、构造drools规则输入数据，输出数据
         // 全局计算参数
@@ -89,7 +89,9 @@ public class SchedulePlanServiceImpl extends BaseServiceImpl&lt;SchedulePlan, Long&gt;
         // 3、根据规则返回，组合最后的输出数据
         // 3-1、根据注入的策略服务，获取原始数据
-        Multimap<Long, TTInfoDetail> gbdTTinfoMaps = strategy.getGuideboardXlTTInfoDetailMaps(xl.getId()); // 路牌对应时刻明细
+        Map<Date, Multimap<Long, TTInfoDetail>> gbdTTinfoMaps = strategy.getGuideboardXlTTInfoDetailMaps(
+                xl.getId(), schedulePlan.getScheduleFromTime(), schedulePlan.getScheduleToTime());
+
         Map<Long, CarConfigInfo> carConfigMaps = strategy.getCarConfigMaps(xl.getId()); // 车辆配置对应车辆信息
         Map<Long, EmployeeConfigInfo> employeeConfigMaps = strategy.getEmployeeConfigMaps(xl.getId()); // 人员配置对应的人员信息
@@ -97,18 +99,23 @@ public class SchedulePlanServiceImpl extends BaseServiceImpl&lt;SchedulePlan, Long&gt;
         List<SchedulePlanInfo> schedulePlanInfos = new ArrayList<>();
         for (ScheduleResult_output scheduleResult_output : scheduleResults_output.getResults()) {
             // 车辆配置对应的车辆
-            CarConfigInfo configInfo = carConfigMaps.get(scheduleResult_output.getCarConfigId());
-            // 人员配置对应的人员
-            EmployeeConfigInfo employeeConfigInfo = employeeConfigMaps.get(scheduleResult_output.getEmployeeConfigId());
+            CarConfigInfo configInfo = carConfigMaps.get(Long.valueOf(scheduleResult_output.getCarConfigId()));
+            // 人员配置对应的人员，这里需要分班处理的
+            List<EmployeeConfigInfo> employeeConfigInfoList = new ArrayList<>();
+            String[] eids = scheduleResult_output.getEmployeeConfigId().split("-");
+            for (String eid : eids) {
+                employeeConfigInfoList.add(employeeConfigMaps.get(Long.valueOf(eid)));
+            }
             // 排班明细（这个要迭代的）
-            Collection<TTInfoDetail> ttInfoDetails = gbdTTinfoMaps.get(scheduleResult_output.getGuideboardId());
+            Collection<TTInfoDetail> ttInfoDetails = gbdTTinfoMaps.get(scheduleResult_output.getSd().toDate()).get(
+                    Long.parseLong(scheduleResult_output.getGuideboardId()));
             for (TTInfoDetail ttInfoDetail : ttInfoDetails) {
                 SchedulePlanInfo schedulePlanInfo = new SchedulePlanInfo(
                         xl,
                         scheduleResult_output,
                         ttInfoDetail,
                         configInfo,
-                        employeeConfigInfo,
+                        employeeConfigInfoList,
                         schedulePlan);
                 schedulePlanInfos.add(schedulePlanInfo);
             }
@@ -58,6 +58,9 @@ public class MyDroolsConfiguration {
         kfs.write("src/main/resources/shiftloop.drl", kieServices.getResources()
                 .newInputStreamResource(this.getClass().getResourceAsStream(
                         "/rules/shiftloop.drl"), "UTF-8"));
+        kfs.write("src/main/resources/ttinfo.drl", kieServices.getResources()
+                .newInputStreamResource(this.getClass().getResourceAsStream(
+                        "/rules/ttinfo.drl"), "UTF-8"));
         // TODO：还有其他drl....
         // 4、创建KieBuilder，使用KieFileSystem构建
@@ -11,15 +11,12 @@ public class ScheduleCalcuParam_input {
     private DateTime fromDate;
     /** 结束计算日期 */
     private DateTime toDate;
-    /** 时刻表id */
-    private Long ttinfoId;
     public ScheduleCalcuParam_input() {}
     public ScheduleCalcuParam_input(SchedulePlan schedulePlan) {
         this.fromDate = new DateTime((schedulePlan.getScheduleFromTime()));
         this.toDate = new DateTime((schedulePlan.getScheduleToTime()));
-        this.ttinfoId = schedulePlan.getTtInfo().getId();
     }
     public DateTime getFromDate() {
@@ -38,11 +35,4 @@ public class ScheduleCalcuParam_input {
         this.toDate = toDate;
     }
-    public Long getTtinfoId() {
-        return ttinfoId;
-    }
-
-    public void setTtinfoId(Long ttinfoId) {
-        this.ttinfoId = ttinfoId;
-    }
 }
@@ -9,13 +9,13 @@ public class ScheduleResult_output {
     /** 具体日期 */
     private DateTime sd;
     /** 用的是哪一组rule */
-    private Long ruleId;
+    private String ruleId;
     /** 路牌id */
-    private Long guideboardId;
+    private String guideboardId;
     /** 人员配置id */
-    private Long employeeConfigId;
+    private String employeeConfigId;
     /** 车辆配置id */
-    private Long carConfigId;
+    private String carConfigId;
     public DateTime getSd() {
         return sd;
@@ -25,36 +25,35 @@ public class ScheduleResult_output {
         this.sd = sd;
     }
-    public Long getGuideboardId() {
+    public String getRuleId() {
+        return ruleId;
+    }
+
+    public void setRuleId(String ruleId) {
+        this.ruleId = ruleId;
+    }
+
+    public String getGuideboardId() {
         return guideboardId;
     }
-    public void setGuideboardId(Long guideboardId) {
+    public void setGuideboardId(String guideboardId) {
         this.guideboardId = guideboardId;
     }
-    public Long getEmployeeConfigId() {
+    public String getEmployeeConfigId() {
         return employeeConfigId;
     }
-    public void setEmployeeConfigId(Long employeeConfigId) {
+    public void setEmployeeConfigId(String employeeConfigId) {
         this.employeeConfigId = employeeConfigId;
     }
-    public Long getCarConfigId() {
+    public String getCarConfigId() {
         return carConfigId;
     }
-    public void setCarConfigId(Long carConfigId) {
+    public void setCarConfigId(String carConfigId) {
         this.carConfigId = carConfigId;
     }
-
-    public Long getRuleId() {
-        return ruleId;
-    }
-
-    public void setRuleId(Long ruleId) {
-        this.ruleId = ruleId;
-    }
-
 }
@@ -25,7 +25,7 @@ public class ScheduleResults_output {
      */
     public String showGuideboardDesc1() {
         StringBuilder stringBuilder = new StringBuilder();
-        Map<Long, List<ScheduleResult_output>> groupRuleIdGuideBoardMap = new HashMap<>();
+        Map<String, List<ScheduleResult_output>> groupRuleIdGuideBoardMap = new HashMap<>();
         for (ScheduleResult_output s : results) {
             if (groupRuleIdGuideBoardMap.get(s.getRuleId()) == null) {
                 groupRuleIdGuideBoardMap.put(s.getRuleId(), new ArrayList<ScheduleResult_output>());
@@ -33,7 +33,7 @@ public class ScheduleResults_output {
             groupRuleIdGuideBoardMap.get(s.getRuleId()).add(s);
         }
-        for (Long ruleId : groupRuleIdGuideBoardMap.keySet()) {
+        for (String ruleId : groupRuleIdGuideBoardMap.keySet()) {
             Collections.sort(groupRuleIdGuideBoardMap.get(ruleId), new Comparator<ScheduleResult_output>() {
                 @Override
                 public int compare(ScheduleResult_output o1, ScheduleResult_output o2) {
@@ -41,8 +41,8 @@ public class ScheduleResults_output {
                 }
             });
-            List<Long> gbids = new ArrayList<>();
-            List<Long> ecids = new ArrayList<>();
+            List<String> gbids = new ArrayList<>();
+            List<String> ecids = new ArrayList<>();
             for (ScheduleResult_output so : groupRuleIdGuideBoardMap.get(ruleId)) {
                 gbids.add(so.getGuideboardId());
                 ecids.add(so.getEmployeeConfigId());
@@ -12,51 +12,52 @@ import java.util.List;
  */
 public class ScheduleRule_input {
     /** 规则Id */
-    private Long ruleId;
+    private String ruleId;
     /** 规则启用日期 */
     private DateTime qyrq;
     /** 路牌范围 */
-    private List<Long> guideboardIds = new ArrayList<>();
+    private List<String> guideboardIds = new ArrayList<>();
     /** 起始路牌下标 */
     private int startGbdIndex;
     /** 人员范围 */
-    private List<Long> employeeConfigIds = new ArrayList<>();
+    private List<String> employeeConfigIds = new ArrayList<>();
     /** 起始人员下标 */
     private int startEIndex;
     /** 车辆配置id */
-    private Long carConfigId;
+    private String carConfigId;
     // TODO：车辆翻班暂时不考虑进去
     public ScheduleRule_input() {}
     public ScheduleRule_input(ScheduleRule1Flat scheduleRule1Flat) {
-        this.ruleId = scheduleRule1Flat.getId();
+        this.ruleId = String.valueOf(scheduleRule1Flat.getId());
         this.qyrq = new DateTime(scheduleRule1Flat.getQyrq());
         List<String> lpIds = Splitter.on(",").splitToList(scheduleRule1Flat.getLpIds());
-        for (String lpId : lpIds) {
-            this.guideboardIds.add(Long.parseLong(lpId));
-        }
+//        for (String lpId : lpIds) {
+//            this.guideboardIds.add(Long.parseLong(lpId));
+//        }
+        guideboardIds.addAll(lpIds);
         // 路牌初始下标减1
         this.startGbdIndex = scheduleRule1Flat.getLpStart() - 1;
         List<String> ryCids = Splitter.on(",").splitToList(scheduleRule1Flat.getRyConfigIds());
-        for (String ryCid : ryCids) {
-            this.employeeConfigIds.add(Long.parseLong(ryCid));
-        }
+//        for (String ryCid : ryCids) {
+//            this.employeeConfigIds.add(Long.parseLong(ryCid));
+//        }
+        employeeConfigIds.addAll(ryCids);
         // 人员初始索引减1
         this.startEIndex = scheduleRule1Flat.getRyStart() - 1;
-        this.carConfigId = scheduleRule1Flat.getCarConfigInfo().getId();
+        this.carConfigId = String.valueOf(scheduleRule1Flat.getCarConfigInfo().getId());
     }
-
-    public Long getRuleId() {
+    public String getRuleId() {
         return ruleId;
     }
-    public void setRuleId(Long ruleId) {
+    public void setRuleId(String ruleId) {
         this.ruleId = ruleId;
     }
@@ -68,11 +69,11 @@ public class ScheduleRule_input {
         this.qyrq = qyrq;
     }
-    public List<Long> getGuideboardIds() {
+    public List<String> getGuideboardIds() {
         return guideboardIds;
     }
-    public void setGuideboardIds(List<Long> guideboardIds) {
+    public void setGuideboardIds(List<String> guideboardIds) {
         this.guideboardIds = guideboardIds;
     }
@@ -84,11 +85,11 @@ public class ScheduleRule_input {
         this.startGbdIndex = startGbdIndex;
     }
-    public List<Long> getEmployeeConfigIds() {
+    public List<String> getEmployeeConfigIds() {
         return employeeConfigIds;
     }
-    public void setEmployeeConfigIds(List<Long> employeeConfigIds) {
+    public void setEmployeeConfigIds(List<String> employeeConfigIds) {
         this.employeeConfigIds = employeeConfigIds;
     }
@@ -100,11 +101,11 @@ public class ScheduleRule_input {
         this.startEIndex = startEIndex;
     }
-    public Long getCarConfigId() {
+    public String getCarConfigId() {
         return carConfigId;
     }
-    public void setCarConfigId(Long carConfigId) {
+    public void setCarConfigId(String carConfigId) {
         this.carConfigId = carConfigId;
     }
 }
@@ -8,6 +8,8 @@ import com.bsth.entity.schedule.TTInfoDetail;
 import com.bsth.entity.schedule.rule.ScheduleRule1Flat;
 import com.google.common.collect.Multimap;
+import java.util.Date;
+import java.util.List;
 import java.util.Map;
 /**
@@ -27,7 +29,14 @@ public interface IStrategy {
      * @param xlId 线路id
      * @return 时刻表
      */
-    TTInfo getTTInfo(Integer xlId);
+    List<TTInfo> getTTInfo(Integer xlId);
+
+    /**
+     * 获取指定线路的时刻表的明细。
+     * @param xlId 线路id
+     * @return
+     */
+    List<TTInfoDetail> getTTInfoDetail(Integer xlId);
     /**
      * 获取指定线路下，可用的排班规则。
@@ -37,11 +46,13 @@ public interface IStrategy {
     Iterable<ScheduleRule1Flat> getScheduleRule(Integer xlId);
     /**
-     * 获取指定线路下，路牌与时刻明细对应的Map。
+     * 获取指定线路下，日期与路牌与时刻明细对应的Map。
      * @param xlId 线路id
+     * @param fromDate 开始日期
+     * @param toDate 结束日期
      * @return 路牌id为key，时刻明细 Collection<TTInfoDetail> 为value
      */
-    Multimap<Long, TTInfoDetail> getGuideboardXlTTInfoDetailMaps(Integer xlId);
+    Map<Date, Multimap<Long, TTInfoDetail>> getGuideboardXlTTInfoDetailMaps(Integer xlId, Date fromDate, Date toDate);
     /**
      * 获取指定线路下，车辆配置与车辆信息对应的Map。
@@ -8,14 +8,21 @@ import com.bsth.entity.schedule.TTInfoDetail;
 import com.bsth.entity.schedule.rule.ScheduleRule1Flat;
 import com.bsth.service.LineService;
 import com.bsth.service.schedule.*;
+import com.bsth.service.schedule.rules.ttinfo.TTInfoCalcuParam_input;
+import com.bsth.service.schedule.rules.ttinfo.TTInfoResult_output;
+import com.bsth.service.schedule.rules.ttinfo.TTInfoResults_output;
+import com.bsth.service.schedule.rules.ttinfo.TTInfo_input;
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.Multimap;
+import org.joda.time.DateTime;
+import org.kie.api.KieBase;
+import org.kie.api.runtime.KieSession;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
+import java.util.*;
 /**
  * Created by xu on 16/7/10.
@@ -35,6 +42,12 @@ public class IStrategyImpl implements IStrategy {
     @Autowired
     private ScheduleRule1FlatService scheduleRule1FlatService;
+    /** 日志记录器 */
+    private Logger logger = LoggerFactory.getLogger(IStrategyImpl.class);
+
+    @Autowired
+    private KieBase kieBase;
+
     @Override
     public Line getLine(Integer xlId) {
         Line xl = lineService.findById(xlId); // 查找线路具体信息
@@ -42,18 +55,39 @@ public class IStrategyImpl implements IStrategy {
     }
     @Override
-    public TTInfo getTTInfo(Integer xlId) {
-        // TODO：本来要使用规则判定到底使用哪张时刻表，这里选用第一张
-        Map<String, Object> param = new HashMap<>(); // 查询参数
-        param.clear();
-        param.put("xl.id_eq", xlId); // 线路id
-        param.put("isCancel_eq", false); // 没有作废
-        param.put("isEnableDisTemplate_eq", true); // 是否启用
-        Iterable<TTInfo> ttInfoIterable = ttInfoService.list(param);
-        Iterator<TTInfo> ttInfoIterator = ttInfoIterable.iterator();
-        if (!ttInfoIterator.hasNext())
-            throw new RuntimeException("线路id=" + xlId + "，下没有任何时刻表数据！");
-        return ttInfoIterator.next();
+    public List<TTInfo> getTTInfo(Integer xlId) {
+        // 查询参数
+        Map<String, Object> param = new HashMap<>();
+        param.put("xl.id_eq", xlId); // 线路Id
+        param.put("isCancel_eq", false); // 作废的过滤掉
+        Iterator<TTInfo> ttInfoIterator = ttInfoService.list(param).iterator();
+        if (!ttInfoIterator.hasNext()) {
+            throw new RuntimeException("线路id=" + xlId + " 没有时刻表！");
+        }
+        List<TTInfo> ttInfos = new ArrayList<>();
+        while (ttInfoIterator.hasNext()) {
+            TTInfo ttInfo = ttInfoIterator.next();
+            ttInfos.add(ttInfo);
+        }
+        return ttInfos;
+    }
+
+    @Override
+    public List<TTInfoDetail> getTTInfoDetail(Integer xlId) {
+        List<TTInfoDetail> ttInfoDetails = new ArrayList<>();
+
+        List<TTInfo> ttInfos = getTTInfo(xlId);
+        Map<String, Object> param = new HashMap<>();
+        for (TTInfo ttInfo : ttInfos) {
+            param.clear();
+            param.put("ttinfo.id_eq", ttInfo.getId());
+            Iterator<TTInfoDetail> ttInfoDetailIterator = ttInfoDetailService.list(param).iterator();
+            while (ttInfoDetailIterator.hasNext()) {
+                ttInfoDetails.add(ttInfoDetailIterator.next());
+            }
+        }
+
+        return ttInfoDetails;
     }
     @Override
@@ -70,23 +104,59 @@ public class IStrategyImpl implements IStrategy {
     }
     @Override
-    public Multimap<Long, TTInfoDetail> getGuideboardXlTTInfoDetailMaps(Integer xlId) {
-        TTInfo ttInfo = getTTInfo(xlId);
-        // 查询参数
+    public Map<Date, Multimap<Long, TTInfoDetail>> getGuideboardXlTTInfoDetailMaps(
+            Integer xlId, Date fromDate, Date toDate) {
+        // 获取线路的所有时刻表
+        List<TTInfo> ttInfos = getTTInfo(xlId);
+
+        // 执行规则，判定每天使用的时刻表
+        KieSession session = kieBase.newKieSession();
+
+        session.setGlobal("log", logger);
+        TTInfoResults_output ttInfoResults_output = new TTInfoResults_output();
+        session.setGlobal("results", ttInfoResults_output);
+
+        TTInfoCalcuParam_input ttInfoCalcuParam_input = new TTInfoCalcuParam_input(
+                new DateTime(fromDate), new DateTime(toDate), String.valueOf(xlId));
+        session.insert(ttInfoCalcuParam_input);
+        for (TTInfo ttInfo : ttInfos) {
+            TTInfo_input ttInfo_input = new TTInfo_input(ttInfo);
+            session.insert(ttInfo_input);
+        }
+
+        session.fireAllRules();
+        session.dispose();
+
+        // 获取ttinfoDetail
+        List<TTInfoDetail> ttInfoDetails = getTTInfoDetail(xlId);
+
+        // 规则输出结果
+        Multimap<DateTime, TTInfoResult_output> outputMultimap =
+                ttInfoResults_output.getResults().get(String.valueOf(xlId));
+        // return结果输出
+        Map<Date, Multimap<Long, TTInfoDetail>> ttInfoDetailMultimap = new HashMap<>();
+
         Map<String, Object> param = new HashMap<>();
-        param.put("ttinfo.id_eq", ttInfo.getId());
-        Iterable<TTInfoDetail> ttInfoDetailIterable = ttInfoDetailService.list(param);
-        Iterator<TTInfoDetail> ttInfoDetailIterator = ttInfoDetailIterable.iterator();
-        if (!ttInfoDetailIterator.hasNext())
-            throw new RuntimeException("时刻表id=" + ttInfo.getId() + "，下没有明细数据！");
-
-        Multimap<Long, TTInfoDetail> gtmaps = ArrayListMultimap.create();
-        while (ttInfoDetailIterator.hasNext()) {
-            TTInfoDetail ttInfoDetail = ttInfoDetailIterator.next();
-            gtmaps.put(ttInfoDetail.getLp().getId(), ttInfoDetail);
+        for (DateTime dateTime : outputMultimap.keySet()) {
+            Collection<TTInfoResult_output> ttInfoResult_outputs = outputMultimap.get(dateTime);
+            // 如果有多个，使用第一个
+            Iterator<TTInfoResult_output> ttInfoResult_outputIterator = ttInfoResult_outputs.iterator();
+            if (ttInfoResult_outputIterator.hasNext()) {
+                // 同一天，多张时刻表只取第一张
+                TTInfoResult_output ttInfoResult_output = ttInfoResult_outputIterator.next();
+                // 查找时刻表明细
+                Multimap<Long, TTInfoDetail> ttinfodetailMap2 = ArrayListMultimap.create();
+                for (TTInfoDetail ttInfoDetail : ttInfoDetails) {
+                    if (ttInfoDetail.getTtinfo().getId() == Long.valueOf(ttInfoResult_output.getTtInfoId())) {
+                        ttinfodetailMap2.put(ttInfoDetail.getLp().getId(), ttInfoDetail);
+                    }
+                }
+
+                ttInfoDetailMultimap.put(dateTime.toDate(), ttinfodetailMap2);
+            }
         }
-        return gtmaps;
+        return ttInfoDetailMultimap;
     }
     @Override
+package com.bsth.service.schedule.rules.ttinfo;
+
+import org.joda.time.DateTime;
+
+/**
+ * 时刻表计算参数_输入。
+ */
+public class TTInfoCalcuParam_input {
+    /** 开始计算日期 */
+    private DateTime fromDate;
+    /** 结束计算日期 */
+    private DateTime toDate;
+    /** 线路Id */
+    private String xlId;
+
+    public TTInfoCalcuParam_input() {}
+
+    public TTInfoCalcuParam_input(DateTime fromDate, DateTime toDate, String xlId) {
+        this.fromDate = fromDate;
+        this.toDate = toDate;
+        this.xlId = xlId;
+    }
+
+    public DateTime getFromDate() {
+        return fromDate;
+    }
+
+    public void setFromDate(DateTime fromDate) {
+        this.fromDate = fromDate;
+    }
+
+    public DateTime getToDate() {
+        return toDate;
+    }
+
+    public void setToDate(DateTime toDate) {
+        this.toDate = toDate;
+    }
+
+    public String getXlId() {
+        return xlId;
+    }
+
+    public void setXlId(String xlId) {
+        this.xlId = xlId;
+    }
+}
+package com.bsth.service.schedule.rules.ttinfo;
+
+import org.joda.time.DateTime;
+
+/**
+ * 时刻表选择规则出的结果_输出。
+ */
+public class TTInfoResult_output {
+    /** 具体日期 */
+    private DateTime dateTime;
+    /** 时刻表Id */
+    private String ttInfoId;
+    /** 线路Id */
+    private String xlId;
+
+    public DateTime getDateTime() {
+        return dateTime;
+    }
+
+    public void setDateTime(DateTime dateTime) {
+        this.dateTime = dateTime;
+    }
+
+    public String getTtInfoId() {
+        return ttInfoId;
+    }
+
+    public void setTtInfoId(String ttInfoId) {
+        this.ttInfoId = ttInfoId;
+    }
+
+    public String getXlId() {
+        return xlId;
+    }
+
+    public void setXlId(String xlId) {
+        this.xlId = xlId;
+    }
+
+    @Override
+    public String toString() {
+        return String.format(
+                "<日期=%s 线路id=%s 时刻表id=%s>\n",
+                dateTime.toString("yyyy-MM-dd"),
+                xlId,
+                ttInfoId);
+    }
+}
+package com.bsth.service.schedule.rules.ttinfo;
+
+import com.google.common.collect.ArrayListMultimap;
+import com.google.common.collect.Multimap;
+import org.joda.time.DateTime;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 输出结果集合。
+ */
+public class TTInfoResults_output {
+
+    /** 输出列表，key为线路id，value是key为日期，value为排序的时刻表output列表 */
+    private Map<String, Multimap<DateTime, TTInfoResult_output>> results = new HashMap<>();
+
+    public Map<String, Multimap<DateTime, TTInfoResult_output>> getResults() {
+        return results;
+    }
+
+    public void setResults(Map<String, Multimap<DateTime, TTInfoResult_output>> results) {
+        this.results = results;
+    }
+
+    public void addXlTTInfos(String xlid, DateTime dt, List<TTInfo_input> ttInfo_inputList) {
+        Multimap<DateTime, TTInfoResult_output> map;
+        if (results.get(xlid) == null) {
+            map = ArrayListMultimap.create();
+            results.put(xlid, map);
+        } else {
+            map = results.get(xlid);
+        }
+
+        for (TTInfo_input ttInfo_input : ttInfo_inputList) {
+            TTInfoResult_output ttInfoResult_output = new TTInfoResult_output();
+            ttInfoResult_output.setDateTime(dt);
+            ttInfoResult_output.setTtInfoId(ttInfo_input.getTtInfoId());
+            ttInfoResult_output.setXlId(xlid);
+            map.put(dt, ttInfoResult_output);
+        }
+    }
+
+    /**
+     * 输出计算后的时刻表
+     * @return
+     */
+    public String showTTInfoDesc1() {
+        StringBuilder str = new StringBuilder();
+        for (String key : results.keySet()) {
+            str.append("线路id=" + key);
+            str.append("\n");
+            str.append("时刻表=" + results.get(key));
+            str.append("\n");
+        }
+
+        return str.toString();
+    }
+
+}
+package com.bsth.service.schedule.rules.ttinfo;
+
+import com.bsth.entity.schedule.TTInfo;
+import org.joda.time.DateTime;
+import org.joda.time.format.DateTimeFormat;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 时刻表_输入
+ */
+public class TTInfo_input implements Comparable<TTInfo_input> {
+    /** 时刻表id */
+    private String ttInfoId;
+    /** 线路Id */
+    private String xlId;
+    /** 周一到周日是否启用 */
+    private List<Boolean> weekdays = new ArrayList<>();
+    /** 特殊节假日 */
+    private List<DateTime> specialDays = new ArrayList<>();
+    /** 最新修改时间 */
+    private DateTime updateDate;
+    /** 是否启用 */
+    private Boolean isEnable;
+    /** 启用日期 */
+    private DateTime qyDate;
+
+    public TTInfo_input() {
+
+    }
+
+    @Override
+    public int compareTo(TTInfo_input ttInfo_input) {
+        if (ttInfo_input != null) {
+            if (ttInfo_input.updateDate != null && this.updateDate != null)
+                return - this.updateDate.compareTo(ttInfo_input.updateDate);
+        }
+        return -1;
+    }
+
+    public TTInfo_input(TTInfo ttInfo) {
+        this.ttInfoId = String.valueOf(ttInfo.getId());
+        this.xlId = String.valueOf(ttInfo.getXl().getId());
+        String[] days = ttInfo.getRule_days().split(",");
+        System.out.println(days.length);
+        for (int i = 0; i < 7; i++) {
+            if ("1".equals(days[i])) {
+                weekdays.add(true);
+            } else {
+                weekdays.add(false);
+            }
+        }
+        String[] sdays = ttInfo.getSpecial_days().split(",");
+        for (int i = 0; i < sdays.length; i++) {
+            specialDays.add(DateTimeFormat.forPattern("yyyy-MM-dd").
+                    parseDateTime(sdays[i]));
+        }
+        this.updateDate = new DateTime(ttInfo.getUpdateDate());
+        this.isEnable = ttInfo.getIsEnableDisTemplate();
+        this.qyDate = new DateTime(ttInfo.getQyrq());
+
+    }
+
+    public String getTtInfoId() {
+        return ttInfoId;
+    }
+
+    public void setTtInfoId(String ttInfoId) {
+        this.ttInfoId = ttInfoId;
+    }
+
+    public String getXlId() {
+        return xlId;
+    }
+
+    public void setXlId(String xlId) {
+        this.xlId = xlId;
+    }
+
+    public List<Boolean> getWeekdays() {
+        return weekdays;
+    }
+
+    public void setWeekdays(List<Boolean> weekdays) {
+        this.weekdays = weekdays;
+    }
+
+    public List<DateTime> getSpecialDays() {
+        return specialDays;
+    }
+
+    public void setSpecialDays(List<DateTime> specialDays) {
+        this.specialDays = specialDays;
+    }
+
+    public DateTime getUpdateDate() {
+        return updateDate;
+    }
+
+    public void setUpdateDate(DateTime updateDate) {
+        this.updateDate = updateDate;
+    }
+
+    public Boolean getIsEnable() {
+        return isEnable;
+    }
+
+    public void setIsEnable(Boolean isEnable) {
+        this.isEnable = isEnable;
+    }
+
+    public DateTime getQyDate() {
+        return qyDate;
+    }
+
+    public void setQyDate(DateTime qyDate) {
+        this.qyDate = qyDate;
+    }
+}
+时刻表选择规则，每天的时刻表都不一样
 \ No newline at end of file
+package com.bsth.service.sys;
+import java.util.List;
+import java.util.Map;
+
+import com.bsth.entity.sys.UserLine;
+import com.bsth.service.BaseService;
+
+
+
+/**
+ * 
+ * @Interface: LineService(线路service业务层实现接口)
+ * 
+ * @extends : BaseService
+ * 
+ * @Description: TODO(线路service业务层实现接口)
+ * 
+ * @Author bsth@lq
+ * 
+ * @Date 2016年4月28日 上午9:21:17
+ *
+ * @Version 公交调度系统BS版 0.1
+ * 
+ */
+public interface UserLineService extends BaseService<UserLine, Integer> {
+	
+	List<Map<String, Object>> userRoleTree(Map<String, Object> map);
+	
+	Map<String, Object> setLineCasts(Integer userId, String mIds);
+	 
+}
 package com.bsth.service.sys.impl;
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -8,6 +10,8 @@ import java.util.Map;
 import java.util.Set;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.domain.Sort.Direction;
 import org.springframework.stereotype.Service;
 import com.bsth.common.ResponseCode;
@@ -60,7 +64,7 @@ public class ModuleServiceImpl extends BaseServiceImpl&lt;Module, Integer&gt; implemen
 		SysUser user = SecurityUtils.getCurrentUser();
 		Set<Role> roles = user.getRoles();
-		List<Module> all = (List<Module>) moduleRepository.findAll()
+		List<Module> all = (List<Module>) moduleRepository.findAll(new Sort(Direction.ASC, "id"))
 					,results = new ArrayList<>();
 		Map<Integer, Module> map = new HashMap<>();
+package com.bsth.service.sys.impl;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.catalina.User;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.bsth.common.ResponseCode;
+import com.bsth.entity.Line;
+import com.bsth.entity.search.CustomerSpecs;
+import com.bsth.entity.sys.Role;
+import com.bsth.entity.sys.SysUser;
+import com.bsth.entity.sys.UserLine;
+import com.bsth.repository.LineRepository;
+import com.bsth.repository.sys.RoleRepository;
+import com.bsth.repository.sys.SysUserRepository;
+import com.bsth.repository.sys.UserLineRepository;
+import com.bsth.service.impl.BaseServiceImpl;
+import com.bsth.service.sys.UserLineService;
+
+
+/**
+ * Created by xu on 16/5/31.
+ */
+@Service
+public class UserLineServiceImpl extends BaseServiceImpl<UserLine, Integer> implements UserLineService {
+	
+	@Autowired
+	private UserLineRepository repository;
+	
+	@Autowired
+	private SysUserRepository userRepository;
+	
+	@Autowired
+	private RoleRepository roleRepository;
+	
+	@Autowired
+	private LineRepository lineRepository;
+	
+	Logger logger = LoggerFactory.getLogger(this.getClass());
+	
+	@Override
+	public List<Map<String, Object>> userRoleTree(Map<String, Object> map) {
+		
+		CustomerSpecs spec  =  new CustomerSpecs<Role>(map);
+		 
+		List<Role> roleLine = roleRepository.findAll(spec);
+		
+		int size = roleLine.size();
+		
+		List<Map<String, Object>> list = new ArrayList<>();
+		
+		if(size>0){
+			
+			for(int i = 0; i <size;i++) {
+				
+				Map<String, Object> tempM = new HashMap<String, Object>();
+				int roleId = roleLine.get(i).getId();
+				String roleName = roleLine.get(i).getRoleName();
+				tempM.put("name", roleName);
+				tempM.put("text", roleName);
+				tempM.put("icon", "fa fa-database");
+				tempM.put("pId",null);
+				tempM.put("id", 100+roleId);
+				tempM.put("groupType", "1");
+				tempM.put("enable", true);
+				Set<SysUser> user = roleLine.get(i).getUsers();
+				Iterator<SysUser> it =  user.iterator();
+				List<Map<String, Object>> roleChildren = new ArrayList<>();
+				while(it.hasNext()) {
+					Map<String, Object> userMap = new HashMap<String, Object>();
+					SysUser tempU = it.next();
+					String userName = tempU.getUserName();
+					int userId = tempU.getId();
+					userMap.put("name", userName);
+					userMap.put("text", userName);
+					userMap.put("icon", "fa fa-user");
+					userMap.put("pId",100+roleId);
+					userMap.put("id", 1000+userId);
+					userMap.put("userId", userId);
+					userMap.put("groupType", "2");
+					userMap.put("enable", true);
+					roleChildren.add(userMap);
+					
+				}
+				tempM.put("children", roleChildren);
+				list.add(tempM);
+			}
+			
+		}
+		
+		return list;
+	}
+
+	@Override
+	@Transactional
+	public Map<String, Object> setLineCasts(Integer userId, String mIds) {
+		Map<String, Object> map = new HashMap<>();
+		
+		try {
+			
+			repository.del(userId);
+			
+			SysUser user = userRepository.findOne(userId);
+			
+			List<Integer> idList = new ArrayList<>();
+			String[] array = mIds.split(",");
+			for (String id : array) {
+				if (null == id || id.trim().equals(""))
+					continue;
+				idList.add(Integer.parseInt(id));
+			}
+			
+			int size  = idList.size();
+			
+			if(size>0) {
+				
+				for(int i = 0 ; i<size;i++) {
+					
+					UserLine entity = new UserLine();
+					
+					int lineId = idList.get(i);
+					
+					Line line =  lineRepository.findOne(lineId);
+					
+					entity.setUser(user);
+					
+					entity.setLine(line);
+					
+					repository.save(entity);
+				}
+				
+			}
+			
+			map.put("status", ResponseCode.SUCCESS);
+			
+		} catch (Exception e) {
+			
+			logger.error("", e);
+			map.put("status", ResponseCode.ERROR);
+		}
+		
+		return map;
+	}
+}
@@ -14,6 +14,7 @@ import org.springframework.stereotype.Component;
 import com.alibaba.fastjson.JSONObject;
 import com.bsth.data.BasicData;
+import com.bsth.data.LineConfigData;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.entity.directive.D80;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
@@ -24,6 +25,9 @@ public class SendUtils{
 	@Autowired
 	private RealControlSocketHandler socketHandler;
+	
+	@Autowired
+	LineConfigData lineConfigData;
 	private static SimpleDateFormat sdf = new SimpleDateFormat("HH:mm");
@@ -33,17 +37,19 @@ public class SendUtils{
 	 * @throws JsonProcessingException
 	 *             TODO(推送发车信息)
 	 */
-	public void sendFcsj(ScheduleRealInfo schedule) {
-
+	public void sendFcsj(ScheduleRealInfo sch) {
+		//处理出站即出场的班次
+		connectOutSchTime(sch);
+		
 		Map<String, Object> map = new HashMap<>();
 		map.put("fn", "faChe");
-		map.put("t", schedule);
+		map.put("t", sch);
 		map.put("dataStr", sdf.format(new Date()));
 		ObjectMapper mapper = new ObjectMapper();
 		try {
-			socketHandler.sendMessageToLine(schedule.getXlBm(), mapper.writeValueAsString(map));
+			socketHandler.sendMessageToLine(sch.getXlBm(), mapper.writeValueAsString(map));
 		} catch (Exception e) {
 			logger.error("", e);
 		}
@@ -77,11 +83,13 @@ public class SendUtils{
 	 * 			@throws NumberFormatException @Title: sendFcsj @Description:
 	 *             TODO(推送到达终点时间) @param @param schedule 班次 @throws
 	 */
-	public void sendZdsj(ScheduleRealInfo schedule, ScheduleRealInfo nextSch, int finish) {
+	public void sendZdsj(ScheduleRealInfo sch, ScheduleRealInfo nextSch, int finish) {
+		//处理进站即进场的班次
+		connectInSchTime(sch);
 		Map<String, Object> map = new HashMap<>();
 		map.put("fn", "zhongDian");
-		map.put("t", schedule);
+		map.put("t", sch);
 		map.put("nt", nextSch);
 		map.put("finish", finish);
 		map.put("dataStr", sdf.format(new Date()));
@@ -89,7 +97,7 @@ public class SendUtils{
 		ObjectMapper mapper = new ObjectMapper();
 		try {
-			socketHandler.sendMessageToLine(schedule.getXlBm(), mapper.writeValueAsString(map));
+			socketHandler.sendMessageToLine(sch.getXlBm(), mapper.writeValueAsString(map));
 		} catch (Exception e) {
 			logger.error("", e);
 		}
@@ -141,5 +149,38 @@ public class SendUtils{
 		refreshSch(list);
 	}
-	//public void sendReportOutTime(ScheduleRealInfo sch)
+	
+	//出站即出场
+	public void connectOutSchTime(ScheduleRealInfo sch){
+		try{
+			ScheduleRealInfo twins = sch.getTwinsSch();
+			if(twins != null
+					&& lineConfigData.get(sch.getXlBm()).getOutConfig() == 2
+					&& twins.getBcType().equals("out")){
+				
+				twins.setFcsjActualAll(sch.getFcsjActualTime());
+				//刷新关联的出场班次
+				refreshSch(twins);
+			}
+		}catch(Exception e){
+			logger.error("", e);
+		}
+	}
+	
+	//进站即出场
+	public void connectInSchTime(ScheduleRealInfo sch){
+		try{
+			ScheduleRealInfo twins = sch.getTwinsSch();
+			if(twins != null
+					&& lineConfigData.get(sch.getXlBm()).getOutConfig() == 2
+					&& twins.getBcType().equals("in")){
+				
+				twins.setZdsjActualAll(sch.getZdsjActualTime());
+				//刷新关联的出场班次
+				refreshSch(twins);
+			}
+		}catch(Exception e){
+			logger.error("", e);
+		}
+	}
 }
@@ -8,7 +8,7 @@ spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy
 spring.jpa.database= MYSQL
 spring.jpa.show-sql= true
 spring.datasource.driver-class-name= com.mysql.jdbc.Driver
-spring.datasource.url= jdbc:mysql://127.0.0.1:3306/control
+spring.datasource.url= jdbc:mysql://127.0.0.1:3306/qp_control
 spring.datasource.username= root
 spring.datasource.password= panzhao
 #DATASOURCE
@@ -13,3 +13,6 @@ multipart.maxRequestSize = -1
 server.compression.enabled=true
 server.compression.mime-types=application/json,application/xml,text/html,text/xml,text/plain,text/javascript,text/css,application/javascript
+
+# batch insert
+hibernate.jdbc.batch_size = 50
@@ -4,13 +4,13 @@
 datatools.kettle_properties=/datatools/kettle.properties
 # 2、ktr文件通用配置变量（数据库连接，根据不同的环境需要修正）
 #数据库ip地址
-datatools.kvars_dbip=127.0.0.1
+datatools.kvars_dbip=192.168.168.201
 #数据库用户名
 datatools.kvars_dbuname=root
 #数据库密码
-datatools.kvars_dbpwd=
+datatools.kvars_dbpwd=123456
 #数据库库名
-datatools.kvars_dbdname=control
+datatools.kvars_dbdname=mh_control
 # 3、上传数据配置信息
 # 上传文件目录配置（根据不同的环境需要修正）
@@ -6,4 +6,4 @@
 ms.mysql.driver= com.mysql.jdbc.Driver
 ms.mysql.url= jdbc:mysql://192.168.40.82:3306/ms?useUnicode=true&characterEncoding=utf-8
 ms.mysql.username= root
-ms.mysql.password= 123456
 \ No newline at end of file
+ms.mysql.password= 123456
-package com.bsth.service.schedule;
+package com.bsth.service.schedule.shiftloop;
 import org.joda.time.*;
 import java.util.*;
@@ -15,7 +15,7 @@ import com.bsth.service.schedule.rules.shiftloop.ScheduleResults_output;
 //------------------------- 第一阶段、计算规则准备数据（天数） ----------------------------//
 declare Calcu_days_result
-    ruleId : Long // 规则Id
+    ruleId : String // 规则Id
     qyrq_days : Integer // 开始日期离启用日期的天数
     sdays : Integer // 总共需要排班的天数
     calcu_start_date : DateTime // 开始计算日期
@@ -104,18 +104,18 @@ end
 //----------------------- 路牌范围循环计算 ------------------------//
 declare Calcu_guideboard_index_result
-    ruleId : Long // 规则Id
+    ruleId : String // 规则Id
     calcu_index : Integer // 计算之后的起始索引
 end
 declare Calcu_guideboard_index_param_1
-    ruleId : Long // 规则Id
+    ruleId : String // 规则Id
     oindex : Integer // 原始起始索引
     range_size : Integer // 范围大小
     temp : Integer // 原始起始索引距离最后一个索引的大小
     days_temp : Integer // 开始日期离启用日期的天数 － temp
 end
 declare Calcu_guideboard_index_param_2
-    ruleId : Long // 规则Id
+    ruleId : String // 规则Id
     s_value : Integer // 商
     y_value : Integer // 余
 end
@@ -217,18 +217,18 @@ end
 //----------------------- 人员范围循环计算 ------------------------//
 declare Calcu_employee_index_result
-    ruleId : Long // 规则Id
+    ruleId : String // 规则Id
     calcu_index : Integer // 计算之后的起始索引
 end
 declare Calcu_employee_index_param_1
-    ruleId : Long // 规则Id
+    ruleId : String // 规则Id
     oindex : Integer // 原始起始索引
     range_size : Integer // 范围大小
     temp : Integer // 原始起始索引距离最后一个索引的大小
     days_temp : Integer // 开始日期离启用日期的天数 － temp
 end
 declare Calcu_employee_index_param_2
-    ruleId : Long // 规则Id
+    ruleId : String // 规则Id
     s_value : Integer // 商
     y_value : Integer // 余
 end
@@ -332,7 +332,7 @@ end
 //----------------------- 路牌范围循环计算 ------------------------//
 declare Calcu_guideboard_range_loop_result
-    ruleId : Long // 规则Id
+    ruleId : String // 规则Id
     firstLoopSize : Integer // 初始的范围循环个数
     middelLoopCount : Integer // 中间的范围循环次数
     rangeSize : Integer // 范围大小
@@ -340,7 +340,7 @@ declare Calcu_guideboard_range_loop_result
 end
 declare Calcu_guideboard_range_loop_param
-    ruleId : Long // 规则Id
+    ruleId : String // 规则Id
     temp : Integer // 起始索引距离最后一个索引的大小
     sdays : Integer // 总共需要排班的天数
 end
@@ -409,7 +409,7 @@ end
 //----------------------- 人员范围循环计算 ------------------------//
 declare Calcu_employee_range_loop_result
-    ruleId : Long // 规则Id
+    ruleId : String // 规则Id
     firstLoopSize : Integer // 初始的范围循环个数
     middelLoopCount : Integer // 中间的范围循环次数
     rangeSize : Integer // 范围大小
@@ -417,7 +417,7 @@ declare Calcu_employee_range_loop_result
 end
 declare Calcu_employee_range_loop_param
-    ruleId : Long // 规则Id
+    ruleId : String // 规则Id
     temp : Integer // 起始索引距离最后一个索引的大小
     sdays : Integer // 总共需要排班的天数
 end
@@ -489,7 +489,7 @@ end
 //----------------------- 路牌范围循环计算 ------------------------//
 declare Calcu_loop_guideboard_result
-    ruleId : Long // 规则id
+    ruleId : String // 规则id
     go_list : List // 路牌循环的列表
 end
@@ -553,7 +553,7 @@ end
 //----------------------- 人员范围循环计算 ------------------------//
 declare Calcu_loop_employee_result
-    ruleId : Long // 规则id
+    ruleId : String // 规则id
     eo_list : List // 人员循环的列表
 end
+package com.bsth.service.schedule.ttinfo;
+
+import org.joda.time.*;
+import java.util.*;
+
+import com.bsth.service.schedule.rules.ttinfo.TTInfoCalcuParam_input;
+import com.bsth.service.schedule.rules.ttinfo.TTInfo_input;
+import com.bsth.service.schedule.rules.ttinfo.TTInfoResult_output;
+import com.bsth.service.schedule.rules.ttinfo.TTInfoResults_output;
+
+import org.slf4j.Logger;
+
+// 全局日志
+global Logger log;
+// return输出
+global TTInfoResults_output results
+
+
+/*
+    TODO：规则说明，以后待说明
+*/
+
+//----------------- 第一阶段、计算规则准备数据（天数）----------------//
+
+declare Calcu_days_result
+    calcu_day : Integer // 该计算第几天
+    calcu_weekday : Integer // 星期几（1到7）
+    calcu_date : DateTime // 该计算的具体日期
+    calcu_days : Integer // 总共需要计算的天数
+    calcu_start_date : DateTime // 开始计算日期
+    calcu_end_date : DateTime // 结束计算日期
+    xlId : String // 线路Id
+end
+
+rule "calcu_days"
+    when
+        TTInfoCalcuParam_input($fromDate : fromDate, $toDate : toDate, $fromDate.isBefore($toDate), $xlId : xlId)
+    then
+        // 构造Calcu_days_result对象，进行下一阶段计算
+        Calcu_days_result cdr = new Calcu_days_result();
+        Period p = new Period($fromDate, $toDate, PeriodType.days());
+
+        cdr.setCalcu_day(1);
+        cdr.setCalcu_date($fromDate);
+        cdr.setCalcu_days(p.getDays() + 1);
+        cdr.setCalcu_weekday($fromDate.getDayOfWeek());
+        cdr.setCalcu_start_date($fromDate);
+        cdr.setCalcu_end_date(($toDate));
+        cdr.setXlId($xlId);
+
+        log.info("总共需要计算的天数 calcu_days={} 之后的计算从第1天开始 ", p.getDays() + 1);
+
+        insert(cdr); // 插入fact数据，进入下一个阶段
+end
+
+//----------------- 第二阶段、判定时刻表是否启用 ----------------//
+
+declare Calcu_ttinfo_enable_result
+    xlId : String // 线路id
+    ttInfo_input_list : ArrayList // 可用时刻表列表
+    calcu_date : DateTime // 计算日期
+end
+
+rule "calcu_ttinfo_enable"
+    salience 900
+    when
+        $calcu_days_result : Calcu_days_result($calcu_date : calcu_date, calcu_day <= calcu_days, $xlId : xlId)
+        $ttInfo_input_list : ArrayList(size >= 1) from collect (TTInfo_input(xlId == $xlId, isEnable == true))
+    then
+        // 构造Calcu_ttinfo_enable_result对象，进行下一步计算
+        Calcu_ttinfo_enable_result cter = new Calcu_ttinfo_enable_result();
+        cter.setXlId($xlId);
+        cter.setTtInfo_input_list($ttInfo_input_list);
+        cter.setCalcu_date($calcu_date);
+
+        log.info("启用的时刻表：xlId={} 时刻表个数={}", $xlId, $ttInfo_input_list.size());
+
+        insert (cter);
+
+end
+
+//----------------- 第三阶段、时刻表的日期匹配 -------------------//
+
+rule "calcu_ttinfo_special_day" // 特殊日期匹配
+    salience 800
+    when
+        $calcu_ttinfo_enable_result : Calcu_ttinfo_enable_result($xlId : xlId, $calcu_date : calcu_date, $ttInfo_input_list : ttInfo_input_list)
+        $calcu_days_result : Calcu_days_result(calcu_date == $calcu_date, xlId == $xlId, $calcu_day : calcu_day)
+        $ttinfolist : ArrayList(size >= 1) from collect (TTInfo_input(specialDays contains $calcu_date) from $ttInfo_input_list)
+    then
+        // 更新Calcu_days_result对象
+        int new_calcu_day = $calcu_day + 1;
+        $calcu_days_result.setCalcu_day(new_calcu_day);
+        DateTime new_calcu_date = $calcu_date.plusDays(1);
+        $calcu_days_result.setCalcu_date(new_calcu_date);
+        $calcu_days_result.setCalcu_weekday(new_calcu_date.getDayOfWeek());
+
+        log.info("启用特殊日期时刻表：xlId={} 时刻表个数={} 特殊日期={}", $xlId, $ttinfolist.size(), $calcu_date);
+
+        // $ttinfolist按时间倒排序，result输出
+        Collections.sort($ttinfolist);
+        results.addXlTTInfos($xlId, $calcu_date, $ttinfolist);
+
+        update($calcu_days_result);
+end
+
+rule "calcu_ttinfo_normal_day" // 平日匹配
+    salience 700
+    when
+        $calcu_ttinfo_enable_result : Calcu_ttinfo_enable_result($xlId : xlId, $calcu_date : calcu_date, $ttInfo_input_list : ttInfo_input_list)
+        $calcu_days_result : Calcu_days_result(calcu_date == $calcu_date, xlId == $xlId, $calcu_day : calcu_day, $calcu_weekday : calcu_weekday)
+        $ttinfolist : ArrayList(size >= 1) from collect (TTInfo_input(specialDays not contains $calcu_date, weekdays[$calcu_weekday - 1] == true) from $ttInfo_input_list)
+    then
+        // 更新Calcu_days_result对象
+        int new_calcu_day = $calcu_day + 1;
+        $calcu_days_result.setCalcu_day(new_calcu_day);
+        DateTime new_calcu_date = $calcu_date.plusDays(1);
+        $calcu_days_result.setCalcu_date(new_calcu_date);
+        $calcu_days_result.setCalcu_weekday(new_calcu_date.getDayOfWeek());
+
+        log.info("启用常规日期时刻表：xlId={} 时刻表个数={} 常规日期={} 星期几={}", $xlId, $ttinfolist.size(), $calcu_date, $calcu_weekday);
+
+        // $ttinfolist按时间倒排序，result输出
+        Collections.sort($ttinfolist);
+        results.addXlTTInfos($xlId, $calcu_date, $ttinfolist);
+
+        update($calcu_days_result);
+end
+
+rule "calcu_ttinfo_other_day" // 都没有的情况下，匹配
+    salience 500
+    when
+        $calcu_ttinfo_enable_result : Calcu_ttinfo_enable_result($xlId : xlId, $calcu_date : calcu_date, $ttInfo_input_list : ttInfo_input_list)
+        $calcu_days_result : Calcu_days_result(calcu_date == $calcu_date, xlId == $xlId, $calcu_day : calcu_day, $calcu_weekday : calcu_weekday)
+        $ttinfolist : ArrayList(size >= 1) from collect (TTInfo_input(specialDays not contains $calcu_date, weekdays[$calcu_weekday - 1] == false) from $ttInfo_input_list)
+    then
+        // 更新Calcu_days_result对象
+        int new_calcu_day = $calcu_day + 1;
+        $calcu_days_result.setCalcu_day(new_calcu_day);
+        DateTime new_calcu_date = $calcu_date.plusDays(1);
+        $calcu_days_result.setCalcu_date(new_calcu_date);
+        $calcu_days_result.setCalcu_weekday(new_calcu_date.getDayOfWeek());
+
+        log.info("启用默认日期时刻表：xlId={} 时刻表个数={} 常规日期={} 星期几={}", $xlId, $ttinfolist.size(), $calcu_date, $calcu_weekday);
+
+        // $ttinfolist按时间倒排序，result输出
+        Collections.sort($ttinfolist);
+        results.addXlTTInfos($xlId, $calcu_date, $ttinfolist);
+
+        update($calcu_days_result);
+
+end
 \ No newline at end of file
@@ -189,6 +189,24 @@
                     </div>
                  </div>
+                 <!-- 起始站名称 -->
+                 <div class="form-group">
+                 	<label class="control-label col-md-3"> 起始站名称： </label>
+                    <div class="col-md-4">
+                     	<input type="text" class="form-control" name="startStationName" id="startStationNameInput" placeholder="起始站名称">
+                     	<span class="help-block"> 说明 ：上行起始站名称 </span>
+                    </div>
+                 </div>
+                 
+                 <!-- 终点站名称 -->
+                 <div class="form-group">
+                 	<label class="control-label col-md-3"> 终点站名称： </label>
+                    <div class="col-md-4">
+                     	<input type="text" class="form-control" name="endStationName" id="endStationNameInput" placeholder="终点站名称">
+                     	<span class="help-block"> 说明 ：上行终点站名称 </span>
+                    </div>
+                 </div>
+                 
                  <!-- 设备线路编码 -->
                  <div class="form-group">
                  	<label class="control-label col-md-3"> 设备线路编码： </label>
@@ -221,27 +239,12 @@
                     </div>
                  </div>
-                 <!-- 起始站名称 -->
-                 <div class="form-group">
-                 	<label class="control-label col-md-3"> 起始站名称： </label>
-                    <div class="col-md-4">
-                     	<input type="text" class="form-control" name="startStationName" id="startStationNameInput" placeholder="起始站名称">
-                    </div>
-                 </div>
-                 
-                 <!--    终点站名称 -->
-                 <div class="form-group">
-                 	<label class="control-label col-md-3"> 终点站名称： </label>
-                    <div class="col-md-4">
-                     	<input type="text" class="form-control" name="endStationName" id="endStationNameInput" placeholder="终点站名称">
-                    </div>
-                 </div>
-             
                 <!--   起始站首班车时间 -->
                  <div class="form-group">
                  	<label class="control-label col-md-3">  起始站首班车时间： </label>
                     <div class="col-md-4">
                      	<input type="text" class="form-control" name="startStationFirstTime" id="startStationFirstTimeInput" placeholder="起始站首班车时间">
+                     	<span class="help-block"> 例如 ：06:00 </span>
                     </div>
                  </div>
@@ -250,6 +253,7 @@
                  	<label class="control-label col-md-3">  起始站末班车时间： </label>
                     <div class="col-md-4">
                      	<input type="text" class="form-control" name="StartStationEndTime" id="StartStationEndTimeInput" placeholder="起始站末班车时间 ">
+                     	<span class="help-block"> 例如 ：17:00 </span>
                     </div>
                  </div>
@@ -259,6 +263,7 @@
                  	<label class="control-label col-md-3">  终点站首班车时间： </label>
                     <div class="col-md-4">
                      	<input type="text" class="form-control" name="endStationFirstTime" id="endStationFirstTimeInput" placeholder="终点站首班车时间">
+                     	<span class="help-block"> 例如 ：05:00 </span>
                     </div>
                  </div>
@@ -267,6 +272,7 @@
                  	<label class="control-label col-md-3">  终点站末班车时间： </label>
                     <div class="col-md-4">
                      	<input type="text" class="form-control" name="endStationEndTime" id="endStationEndTimeInput" placeholder="终点站末班车时间 ">
+                     	<span class="help-block"> 例如 ：18:00 </span>
                     </div>
                  </div>  
@@ -162,7 +162,23 @@ $(function(){
 				required : true,
 				// 最大长度
-				maxlength: 20
+				maxlength: 30
+			},
+			
+			// 英文名称
+			'es' : {
+				
+				// 最大长度
+				maxlength: 30
+				
+			},
+			
+			// 线路简称
+			'shortName' : {
+				
+				// 最大长度
+				maxlength: 30
+				
 			},
 			// 线路编码
@@ -172,9 +188,49 @@ $(function(){
 				required : true,
 				// 最大长度
-				maxlength: 20
+				maxlength: 30
+			},
+			
+			// 所属公司 
+			'company' : {
+				
+				// 最大长度
+				maxlength: 30
 			},
+			// 线路性质
+			'nature' : {
+				
+				// 最大长度
+				maxlength: 30
+				
+			},
+			
+			// 线路等级
+			'level' : {
+				
+				// 最大长度
+				maxlength: 30
+				
+			},
+			
+			// 起始站名称
+			'startStationName' : {
+				
+				// 最大长度
+				maxlength: 30
+				
+			},
+			
+			// 终点站名称
+			'endStationName' : {
+				
+				// 最大长度
+				maxlength: 30
+				
+			},
+			
+			
 			// 起始站调度电话
 			'startPhone' : {
@@ -185,7 +241,10 @@ $(function(){
 				digits : true,
 				// 电话号码格式
-				isPhone : true
+				isPhone : true,
+				
+				// 最大长度
+				maxlength: 30
 			},
 			// 终点站调度电话
@@ -198,7 +257,10 @@ $(function(){
 				digits : true,
 				// 电话号码格式
-				isPhone : true
+				isPhone : true,
+				
+				// 最大长度
+				maxlength: 30
 			},
 			// 开辟日期
@@ -221,21 +283,27 @@ $(function(){
 			// 上海市线路编码
 			'shanghaiLinecode' : {
-				// 必须输入合法的数字（负数，小数）。
+				/*// 必须输入合法的数字（负数，小数）。
 				number : true,
 				// 必须输入整数。
-				digits : true
+				digits : true,*/
+
+				// 最大长度
+				maxlength: 30
 			},
 			// 设备线路编码
 			'eqLinecode' : {
-				// 必须输入合法的数字（负数，小数）。
+				/*// 必须输入合法的数字（负数，小数）。
 				number : true,
 				// 必须输入整数。
-				digits : true
+				digits : true,*/
+				
+				// 最大长度
+				maxlength: 30
 			},
 			// 车辆总数
@@ -245,7 +313,10 @@ $(function(){
 				number : true,
 				// 必须输入整数。
-				digits : true
+				digits : true,
+				
+				// 最大长度
+				maxlength: 8
 			},
 			// 空调车辆数
@@ -255,7 +326,10 @@ $(function(){
 				number : true,
 				// 必须输入整数。
-				digits : true
+				digits : true,
+				
+				// 最大长度
+				maxlength: 8
 			},
 			// 普通车辆数
@@ -265,7 +339,10 @@ $(function(){
 				number : true,
 				// 必须输入整数。
-				digits : true
+				digits : true,
+				
+				// 最大长度
+				maxlength: 8
 			},
 			// 描述/说明
@@ -14,71 +14,16 @@
 (function(){
-	/** 填充公司下拉框选择值 */
-	$get('/business/all', {upCode_eq: '77'}, function(array){
-		 
-		 // 公司下拉options属性值
-		 var options = '<option value="">请选择...</option>';
-		 
-		 // 遍历array
-		 $.each(array, function(i,d){
-			 
-			 options += '<option value="'+d.businessCode+'">'+d.businessName+'</option>';
-			 
-		 });
-		 
-		 // 填充公司下拉框options
-		 $('#companySelect').html(options)
-		 
-		 /** 闵行没下属公司，这里暂时注释公司值改变事件  */
-		 //$('#companySelect').html(options).on('change', setbrancheCompanySelectOptions);
-		 
-	 });
-	 
-	 /** 填充分公司下拉框。--- 闵行没下属公司，这里暂时注释*/ 
-	/* setbrancheCompanySelectOptions();*/
-	 
-	 /** 填充分公司下拉框选择值 */ 
-	 function setbrancheCompanySelectOptions(){
-		 
-		 // 获取公司下拉框选择值
-		 var businessCode = $('#companySelect').val();
-		 
-		 // 分公司下拉框options属性值
-		 var options = '<option value="">请选择...</option>';
-		 
-		 // 如果公司选择为空则分公司为空 ; 否则查询出所属公司下的分公司名称和相应分公司代码
-		 if(businessCode == null || businessCode ==''){
-			 
-			 // 填充分公司下拉框options
-			 $('#brancheCompanySelect').html(options);
-			 
-		  } else {
-			  
-			  /** 查询出所属公司下的分公司名称和相应分公司代码 @param：<upCode_eq：公司代码> */
-			  $get('/business/all', {upCode_eq: businessCode}, function(array){
-				  
-				  // 遍历array
-				  $.each(array, function(i,d){
-					  
-					  options += '<option value="'+d.businessCode+'">'+d.businessName+'</option>';
-					  
-					  // 填充分公司下拉框options
-					  $('#brancheCompanySelect').html(options);
-					  
-				  });
-			  });
-		  }
-	 }
-	
 	/**  page : 当前页；initPag : */
 	var page = 0,initPag;
 	// 选择框
 	var icheckOptions = {checkboxClass: 'icheckbox_flat-blue',increaseArea: '20%'};
+	$('#destroy').val(0);
+	
 	/** 表格数据分页加载 @param：<null：搜索参数；true：是否重新分页> */
-	loadTableDate(null,true);
+	loadTableDate({'destroy_eq':0},true);
 	/** 重置按钮事件 */
 	$('tr.filter .filter-cancel').on('click',function() {
@@ -161,8 +106,6 @@
 		// 异步请求获取表格数据
 		$.get('/line',params,function(result){
-			debugger;
-			
 			// 添加序号
 			result.content.page =  page;
@@ -258,6 +201,64 @@
 		});
 	}
+	/** 填充公司下拉框选择值 */
+	$get('/business/all', {upCode_eq: '77'}, function(array){
+		 
+		 // 公司下拉options属性值
+		 var options = '<option value="">请选择...</option>';
+		 
+		 // 遍历array
+		 $.each(array, function(i,d){
+			 
+			 options += '<option value="'+d.businessCode+'">'+d.businessName+'</option>';
+			 
+		 });
+		 
+		 // 填充公司下拉框options
+		 $('#companySelect').html(options)
+		 
+		 /** 闵行没下属公司，这里暂时注释公司值改变事件  */
+		 //$('#companySelect').html(options).on('change', setbrancheCompanySelectOptions);
+		 
+	 });
+	 
+	 /** 填充分公司下拉框。--- 闵行没下属公司，这里暂时注释*/ 
+	/* setbrancheCompanySelectOptions();*/
+	 
+	 /** 填充分公司下拉框选择值 */ 
+	 function setbrancheCompanySelectOptions(){
+		 
+		 // 获取公司下拉框选择值
+		 var businessCode = $('#companySelect').val();
+		 
+		 // 分公司下拉框options属性值
+		 var options = '<option value="">请选择...</option>';
+		 
+		 // 如果公司选择为空则分公司为空 ; 否则查询出所属公司下的分公司名称和相应分公司代码
+		 if(businessCode == null || businessCode ==''){
+			 
+			 // 填充分公司下拉框options
+			 $('#brancheCompanySelect').html(options);
+			 
+		  } else {
+			  
+			  /** 查询出所属公司下的分公司名称和相应分公司代码 @param：<upCode_eq：公司代码> */
+			  $get('/business/all', {upCode_eq: businessCode}, function(array){
+				  
+				  // 遍历array
+				  $.each(array, function(i,d){
+					  
+					  options += '<option value="'+d.businessCode+'">'+d.businessName+'</option>';
+					  
+					  // 填充分公司下拉框options
+					  $('#brancheCompanySelect').html(options);
+					  
+				  });
+			  });
+		  }
+	 }
+	
+	
 	/** 生成行单，这里暂时只做了单选生成。 */
 	$('#datatable_ajax_tools #createUsingSingle').on('click', function() {
@@ -110,7 +110,7 @@
 								</td>
 								<td>
 									<!-- 这里没使用字典表，暂时写在页面上 -->
-									<select class="form-control form-filter " name="destroy_eq">
+									<select class="form-control form-filter " id='destroy' name="destroy_eq">
                                          <option value="">请选择...</option>
                                          <option value="0">运营</option>
                                          <option value="1">撤销</option>
@@ -291,4 +291,5 @@
 		</tr>
 	{{/if}}
 </script>
-<script src="/pages/base/line/js/line-list-table.js"></script>
 \ No newline at end of file
+<script src="/pages/base/line/js/line-list-table.js"></script>
+<!-- <a href="/pages/base/stationroute/list.html?no={{obj.id}}" class="btn default blue-stripe btn-sm" data-pjax> 查看 </a> -->
 \ No newline at end of file
+<link href="/pages/base/linecast/css/cast.css" rel="stylesheet" type="text/css" />
+
+<script type="text/javascript" src="/pages/base/linecast/js/jquery.quicksearch.js"></script>
+
+<div class="page-head">
+	<div class="page-title">
+		<h1>线路分配</h1>
+	</div>
+</div>
+<ul class="page-breadcrumb breadcrumb">
+	<li><a href="/pages/home.html" data-pjax>首页</a> <i class="fa fa-circle"></i></li>
+	<li><span class="active">权限管理</span> <i class="fa fa-circle"></i></li>
+	<li><span class="active">线路分配</span></li>
+</ul>
+
+<div class="row">
+	<div class="col-md-4" style="padding-right: 0px;">
+		<div class="portlet light bordered" style="min-height: 520px;">
+			<div class="portlet-title">
+				<div class="caption">
+					  <i class="fa fa-users font-dark"></i>
+					 <span class="caption-subject font-dark sbold uppercase">用户菜单</span>
+				</div>
+			</div>
+			<div class="portlet-body">
+				<div id="modules_tree" ></div>
+			</div>
+		</div>
+	</div>
+	<div class="col-md-6" style="padding-left: 0px;">
+		<div class="portlet light bordered" style="height: 520px;">
+			<div class="portlet-body" style="min-height: 200px;" id="init-text">
+				<div class="text-info" style="text-align: center;line-height: 200px;">
+					<i class="fa fa-info"></i> 单击节点查看详细
+				</div>
+			</div>
+			
+			<div style="display:none" id="line-cast">
+			<!-- BEGIN PORTLET-->
+				<div class="portlet light bordered">
+				     <div class="portlet-title">
+				         <div class="caption">
+				             <i class="icon-bar-chart font-green"></i>
+				             <span class="caption-subject font-green bold uppercase">线路配置</span>
+				         </div>
+				         <div class="actions">
+				             <button class="btn green btn-circle btn-sm"  disabled="disabled" id="saveModuleSett"><i class="fa fa-check"></i> 保存修改</button>
+				         </div>
+				     </div>
+				     <div class="portlet-body">
+				     	<div class="form-group last" >
+							<div>
+								<select multiple="multiple" class="multi-select" id="moduleSettSelect" ></select>
+							</div>
+						</div>
+				     </div>
+	 			</div>
+		  	</div>
+		</div>
+	</div>
+</div>
+
+<script type="text/html" id="left_line_cast">
+	
+</script>
+
+<script>
+
+$(function(){
+	
+	getTreeData(function(treeData){
+		
+		//初始化树
+		$('#modules_tree').on('loaded.jstree', function(e, data){close_all();}).jstree({
+		    'core' : {
+		        'themes' : {
+		            'responsive': false
+		        },
+		        'data': treeData,
+		        'multiple':false
+		    },
+            'types' : {
+            	"default" : {
+                    "icon" : false
+                },
+                'enable_true' : {
+                    "icon" : 'fa fa-check  icon-lg'
+                },
+                'enable_false' : {
+                    'icon' : 'fa fa-close  icon-lg'
+                },
+                'group':{
+                	'icon' : 'fa fa-object-group  icon-lg'
+                }
+            },
+            'plugins': ['types']
+		}).on('select_node.jstree', jstreeClick);
+	});
+	
+	$('.tooltips').tooltip();
+	
+});
+
+function jstreeClick(){
+	
+	var selected = getCurrSelNode();
+	
+	var obj = selected[0].original;
+	
+	$('#saveModuleSett').attr('disabled', 'disabled');
+	
+	if(obj.pId==null) {
+		
+		$('#line-cast').hide();
+		
+		$('#init-text').show();
+	}else {
+		
+		$('#line-cast').show();
+		
+		$('#init-text').hide();
+		
+		var userId = obj.userId;
+		
+		getModuleTreeData(userId);
+		
+	}
+	
+}
+
+function getCurrSelNode(){
+	
+	var array = [];
+	
+	try {
+		
+		array = $.jstree.reference("#modules_tree").get_selected(true);
+		
+	} catch (e) {
+		
+		console.log(e);
+		
+	}
+	
+	return array;
+}
+
+function close_all(){
+	
+	$.jstree.reference("#modules_tree").close_all();
+	
+}
+
+ 
+
+function getTreeData(cb){
+	
+	var treeData = [];
+	
+	$get('/userline/userRoleTree',null, function(arr){
+		
+		//转换为jsTree想要的数据格式
+		treeData = createTreeData(arr);
+		
+		cb && cb(treeData)
+	});
+}
+
+function getModuleTreeData(userId){
+	 
+	
+	$get('/line/all',null, function(linedata){
+		
+		$get('/userline/all',{'user.id_eq':userId}, function(userlinedata){
+			
+			var options = '';
+			
+			var len = userlinedata.length;
+			
+			$.each(linedata, function(i, g){
+				
+				//是否被当前用户持有
+				var selected = '';
+				
+				if(len>0) {
+					
+					for(var j = 0;j<userlinedata.length;j++ ) {
+						
+						if(userlinedata[j].line.id==g.id){
+							
+							selected = 'selected';
+							
+							break;
+							
+						}
+						
+					}
+					
+				}
+				
+				options += '<option value="'+g.id+'" ' + selected +'>'+g.name+'</option>'
+			 
+			});
+			
+			//初始化multiSelect
+			$('#moduleSettSelect').html(options).multiSelect({
+			    selectableOptgroup: true,
+			    
+			    selectableFooter: "<div class='multi-custom-header-left'>未分配</div>",
+			    selectionFooter: "<div class='multi-custom-header-right'>已分配</div>",
+			    
+			    selectableHeader: "<input type='text' class='search-input' style='width: 221px;' autocomplete='off' placeholder='搜索线路'>",
+			    selectionHeader: "<input type='text' class='search-input' style='width: 221px;' autocomplete='off' placeholder='搜索线路'>",
+			    afterInit: function(ms){
+			      var that = this,
+			          $selectableSearch = that.$selectableUl.prev(),
+			          $selectionSearch = that.$selectionUl.prev(),
+			          selectableSearchString = '#'+that.$container.attr('id')+' .ms-elem-selectable:not(.ms-selected)',
+			          selectionSearchString = '#'+that.$container.attr('id')+' .ms-elem-selection.ms-selected';
+
+			      that.qs1 = $selectableSearch.quicksearch(selectableSearchString)
+			      .on('keydown', function(e){
+			        if (e.which === 40){
+			          that.$selectableUl.focus();
+			          return false;
+			        }
+			      });
+
+			      that.qs2 = $selectionSearch.quicksearch(selectionSearchString)
+			      .on('keydown', function(e){
+			        if (e.which == 40){
+			          that.$selectionUl.focus();
+			          return false;
+			        }
+			      });
+			    },
+			    afterSelect: function(){
+			      this.qs1.cache();
+			      this.qs2.cache();
+			    },
+			    afterDeselect: function(){
+			      this.qs1.cache();
+			      this.qs2.cache();
+			    }
+			}).on('change',function(){
+				
+				if( $(this).val() ==null ||  $(this).val().length > 0)
+					$('#saveModuleSett').removeAttr('disabled');
+				else
+					$('#saveModuleSett').attr('disabled', 'disabled');
+			});
+			
+			$('#moduleSettSelect').multiSelect('refresh'); 
+			
+		});
+		
+	});
+}
+
+
+$('#saveModuleSett').on('click', function(){
+	if($(this).attr('disabled'))
+		return;
+	
+	var ids = '';
+	
+	if($('#moduleSettSelect').val() !=null) {
+		
+		$.each($('#moduleSettSelect').val(), function(i, mId){
+			ids += mId + ',';
+		});
+		
+	}
+	
+	var selected = getCurrSelNode();
+	
+	var obj = selected[0].original;
+	
+	if(obj) {
+		
+		$post('/userline/setLineCasts', {'userId': obj.userId,mIds: ids}, function(){
+			$('#saveModuleSett').attr('disabled', 'disabled');
+			layer.msg('修改成功！');
+		});
+		
+	}
+	
+});
+</script>
 \ No newline at end of file
+.jstree-default .jstree-hovered{
+	background-color: rgba(101, 155, 224, 0.19);
+}
+
+.jstree-default .jstree-clicked {
+    background-color: #659BE0;
+    color: white;
+}
+.layui-layer-cfm-delete .layui-layer-btn0{
+	background-color: #e73d4a;
+    border-color: #CE3643;
+}
 \ No newline at end of file
+(function($, window, document, undefined) {
+	$.fn.quicksearch = function (target, opt) {
+		
+		var timeout, cache, rowcache, jq_results, val = '', e = this, options = $.extend({ 
+			delay: 100,
+			selector: null,
+			stripeRows: null,
+			loader: null,
+			noResults: '',
+			matchedResultsCount: 0,
+			bind: 'keyup',
+			onBefore: function () { 
+				return;
+			},
+			onAfter: function () { 
+				return;
+			},
+			show: function () {
+				this.style.display = "";
+			},
+			hide: function () {
+				this.style.display = "none";
+			},
+			prepareQuery: function (val) {
+				return val.toLowerCase().split(' ');
+			},
+			testQuery: function (query, txt, _row) {
+				for (var i = 0; i < query.length; i += 1) {
+					if (txt.indexOf(query[i]) === -1) {
+						return false;
+					}
+				}
+				return true;
+			}
+		}, opt);
+		
+		this.go = function () {
+			
+			var i = 0,
+				numMatchedRows = 0,
+				noresults = true, 
+				query = options.prepareQuery(val),
+				val_empty = (val.replace(' ', '').length === 0);
+			
+			for (var i = 0, len = rowcache.length; i < len; i++) {
+				if (val_empty || options.testQuery(query, cache[i], rowcache[i])) {
+					options.show.apply(rowcache[i]);
+					noresults = false;
+					numMatchedRows++;
+				} else {
+					options.hide.apply(rowcache[i]);
+				}
+			}
+			
+			if (noresults) {
+				this.results(false);
+			} else {
+				this.results(true);
+				this.stripe();
+			}
+			
+			this.matchedResultsCount = numMatchedRows;
+			this.loader(false);
+			options.onAfter();
+			
+			return this;
+		};
+		
+		/*
+		 * External API so that users can perform search programatically. 
+		 * */
+		this.search = function (submittedVal) {
+			val = submittedVal;
+			e.trigger();
+		};
+		
+		/*
+		 * External API to get the number of matched results as seen in 
+		 * https://github.com/ruiz107/quicksearch/commit/f78dc440b42d95ce9caed1d087174dd4359982d6
+		 * */
+		this.currentMatchedResults = function() {
+			return this.matchedResultsCount;
+		};
+		
+		this.stripe = function () {
+			
+			if (typeof options.stripeRows === "object" && options.stripeRows !== null)
+			{
+				var joined = options.stripeRows.join(' ');
+				var stripeRows_length = options.stripeRows.length;
+				
+				jq_results.not(':hidden').each(function (i) {
+					$(this).removeClass(joined).addClass(options.stripeRows[i % stripeRows_length]);
+				});
+			}
+			
+			return this;
+		};
+		
+		this.strip_html = function (input) {
+			var output = input.replace(new RegExp('<[^<]+\>', 'g'), "");
+			output = $.trim(output.toLowerCase());
+			return output;
+		};
+		
+		this.results = function (bool) {
+			if (typeof options.noResults === "string" && options.noResults !== "") {
+				if (bool) {
+					$(options.noResults).hide();
+				} else {
+					$(options.noResults).show();
+				}
+			}
+			return this;
+		};
+		
+		this.loader = function (bool) {
+			if (typeof options.loader === "string" && options.loader !== "") {
+				 (bool) ? $(options.loader).show() : $(options.loader).hide();
+			}
+			return this;
+		};
+		
+		this.cache = function () {
+			
+			jq_results = $(target);
+			
+			if (typeof options.noResults === "string" && options.noResults !== "") {
+				jq_results = jq_results.not(options.noResults);
+			}
+			
+			var t = (typeof options.selector === "string") ? jq_results.find(options.selector) : $(target).not(options.noResults);
+			cache = t.map(function () {
+				return e.strip_html(this.innerHTML);
+			});
+			
+			rowcache = jq_results.map(function () {
+				return this;
+			});
+
+			/*
+			 * Modified fix for sync-ing "val". 
+			 * Original fix https://github.com/michaellwest/quicksearch/commit/4ace4008d079298a01f97f885ba8fa956a9703d1
+			 * */
+			val = val || this.val() || "";
+			
+			return this.go();
+		};
+		
+		this.trigger = function () {
+			this.loader(true);
+			options.onBefore();
+			
+			window.clearTimeout(timeout);
+			timeout = window.setTimeout(function () {
+				e.go();
+			}, options.delay);
+			
+			return this;
+		};
+		
+		this.cache();
+		this.results(true);
+		this.stripe();
+		this.loader(false);
+		
+		return this.each(function () {
+			
+			/*
+			 * Changed from .bind to .on.
+			 * */
+			$(this).on(options.bind, function () {
+				
+				val = $(this).val();
+				e.trigger();
+			});
+		});
+		
+	};
+
+}(jQuery, this, document));
 \ No newline at end of file
@@ -12,6 +12,12 @@ html,body{
 	overflow:hidden;
 }
+.rm3_image {
+	width: 120px;
+    height: 26px;
+	
+}
+
 /* 隐藏百度地图logo */
 .anchorBL,
 .anchorBL,
@@ -443,6 +443,8 @@ $(&#39;#edit_station_mobal&#39;).on(&#39;editSelectMobal_show&#39;, function(e, map_,ajaxd,stati
 					// 弹出添加成功提示消息
 					layer.msg('修改成功...');
+					/** 通知更新缓存区 */
+					$.post('http://192.168.168.171:8800/transport_server/basic/refresh',function(rs){console.log(rs)})
 				}else {
@@ -650,6 +650,8 @@ var PublicFunctions = function () {
 				  				// 中心点坐标字符串
 				  				var bJwpointsStr = resultdata[s].bJwpoints;
+				  				var stationName = resultdata[s].stationName;
+				  				
 				  				// 起个中心点坐标字符串
 				  				var bJwpointsArray = bJwpointsStr.split(' ');
@@ -657,7 +659,7 @@ var PublicFunctions = function () {
 				  				var point_center = new BMap.Point(bJwpointsArray[0],bJwpointsArray[1]);
 				  				/** 在地图上画点 @param：<point_center：中心坐标点> */
-				  				WorldsBMap.drawingUpStationPoint(point_center);
+				  				WorldsBMap.drawingUpStationPoint(point_center,stationName,s+1);
 				  			}
@@ -684,11 +684,26 @@ var WorldsBMap = function () {
 			},
 			/** 在地图上画点 @param：<point_center：中心坐标点> */
-			drawingUpStationPoint : function(point_center) {
+			drawingUpStationPoint : function(point_center,stationName,s) {
 				// 自定义标注物图片
-		  		var icon_target = new BMap.Icon('/pages/base/stationroute/css/img/cz.png',new BMap.Size(20, 20));
-
+			  	var icon_target = new BMap.Icon('/pages/base/stationroute/css/img/gjzd.png',new BMap.Size(10, 10));
+			  		
+			  	var html2 = '<div style="position: absolute; margin: 0pt; padding: 0pt; width: 160px; height: 26px; left: -10px; top: -35px; overflow: hidden;">'
+			            +     		'<img class="rm3_image" style="border:none;left:0px; top:0px; position:absolute;" src="/pages/base/stationroute/css/img/back160.png">'
+						+ 		'</div>'
+						+ 		'<label class=" BMapLabel" unselectable="on" style="position: absolute; -moz-user-select: none; display: inline; cursor: inherit; border: 0px none; padding: 2px 1px 1px; white-space: nowrap; font: 12px arial,simsun; z-index: 80; color: rgb(255, 102, 0); left: 15px; top: -35px;"><span style="float: left; color: #fdfdfd; margin-left: -22px;  font-size: 6px;">'+ s+'</span>'+ stationName+'</label>';
+						 
+						
+				var	myRichMarker1 = new BMapLib.RichMarker(html2, point_center,{
+                        "anchor" : new BMap.Size(-10,8),
+						  "enableDragging" : true});
+				
+			
+				myRichMarker1.disableDragging();
+				mapBValue.addOverlay(myRichMarker1);
+		  		
+		  		
 		  		// 创建标注物
 		  		marker = new BMap.Marker(point_center,{icon : icon_target});
@@ -2554,6 +2554,8 @@ span.nt-coord:before{
 	margin: 8px 0;
 }
+
+
 tr.linjia td:nth-child(1):AFTER {
     content: "\f173";
     font: normal normal normal 14px/1 FontAwesome;
@@ -2565,6 +2567,21 @@ tr.linjia td:nth-child(1):AFTER {
     padding: 1px 3px 1px 3px;
     background: #e7505a;
     border-radius: 15px;
+    box-shadow: 0 2px 5px 0 rgba(0,0,0,0.16),0 2px 10px 0 rgba(0,0,0,0.12);
+}
+
+tr.child_task td:nth-child(1):AFTER{
+    content: "Z";
+    font: normal normal normal 14px/1 FontAwesome;
+    position: absolute;
+    right: 1px;
+    bottom: 2px;
+    color: #ffffff;
+    padding: 1px 3px 1px 3px;
+    background: #3598dc;
+    border-radius: 15px;
+    font-weight: bold;
+    box-shadow: 0 2px 5px 0 rgba(0,0,0,0.16),0 2px 10px 0 rgba(0,0,0,0.12);
 }
 .device_event_str{
@@ -197,10 +197,6 @@ var _data = (function(){
 						if(!lineLpMap[lineCode][this.lpName])
 							lineLpMap[lineCode][this.lpName] = [];
 						lineLpMap[lineCode][this.lpName].push(this);
-						//车辆 ——> 班次数组
-						/*if(!clSchMap[this.clZbh])
-							clSchMap[this.clZbh] = [];
-						clSchMap[this.clZbh].push(this);*/
 					});
 					//按发车时间排序
@@ -571,14 +571,15 @@ var _menu = (function() {
 						var params = $('form#schinfoFineTune').serializeJSON();
 						 if(!customFormValidate('form#schinfoFineTune'))return;
-						 
+						
+						var loadIndex = layer.msg('操作中...', {icon: 16});
 						$post('/realSchedule/schInfoFineTune', params, function(rs){
 							layer.close(index);
+							layer.close(loadIndex);
+							
 							if(rs.ts)
 								_alone.refreshScheduleArray(rs.ts);
-							/*if(rs.nextSch)
-								_alone.refreshSchedule(rs.nextSch);*/
 						});
 					});
 			  }
@@ -104,7 +104,7 @@
 <!-- 班次table -->
 <script id="alone_plan_table_temp" type="text/html">
 {{each list as item i}}
-<tr data-id={{item.id}} class="{{if item.sflj}}linjia{{/if}}">
+<tr data-id={{item.id}} class="{{if item.sflj}}linjia{{/if}} {{if item.cTasks.length > 0}} child_task {{/if}}">
 	<td name="lineNo"></td>
 	<td data-name="lpName"><a href="javascript:;">{{item.lpName}}</a></td>
@@ -138,7 +138,8 @@
 {{else if item.status == 1}}
 	<td data-name="sjfcsj" class="tl-zzzx sfsj-item">{{item.fcsjActual}}<span class="fcsj-diff">{{item.fcsj_diff}}</span></td>
-
+{{else if item.status == 0 && item.late}}
+	<td data-name="sjfcsj" class="tl-wd sfsj-item">{{item.fcsjActual}}<span class="fcsj-diff">{{item.fcsj_diff}}</span></td>
 {{else }}
 	<td data-name="sjfcsj" class="sfsj-item">{{item.fcsjActual}}<span class="fcsj-diff">{{item.fcsj_diff}}</span></td>
 {{/if}}
@@ -211,23 +211,14 @@ butto.line-config-btn:active{
 	  </div>
 	</section>
-	<!--<section>
-	  <h3>出场时间</h3>
-	
-	  <div class="settings-row" >
-	    <p > 使用 <a href="javascript:;" data-type="select" id="outTimeType"></a> 作为出场班次的实际时间。</p>
-	  </div>
-	</section>
--->
-<!--
 	<section>
-	  <h3>进场时间</h3>
+	  <h3>班次进出场时间</h3>
 	  <div class="settings-row" >
-	    <p > 使用 <a href="javascript:;" data-type="select" id="inTimeType"></a> 作为进场班次的实际时间。</p>
+	    <p > 使用 <a href="javascript:;" data-type="select" id="outTimeType"></a> 时间作为出场班次的实际时间。</p>
 	  </div>
 	</section>
--->
+
 </form>
 </script>
@@ -305,7 +296,6 @@ butto.line-config-btn:active{
 		//运营开始时间
 		$('#startOptTimeLink').editable({
 			 type: 'time',
-			 title:'修改线路运营开始时间',
 			 placement: 'right',
 			 display: false,
 			 validate: function(value){
@@ -316,42 +306,41 @@ butto.line-config-btn:active{
 		})
 		.on('save', function(e, params) {
 			var index = showLoad('提交数据...');
-		    var lineCode = $('.line_config_tree li.selected').data('code');
-		    $post('/lineConfig/editTime', {lineCode: lineCode, time: params.newValue}
+		    $post('/lineConfig/editTime', {lineCode: getLineCode(), time: params.newValue}
 		    	,function(rs){
 		    		layer.close(index);
 		    		$('#startOptTimeLink').text(rs.time);
 		    	});
 		});
-/* 		//出场时间类型
+		//进出场时间类型
         $('#outTimeType').editable({
         	value: conf.outConfig,
             inputclass: 'form-control',
             placement: 'right',
             source: [{
                 value: 0,
-                text: '离开缓冲区时间'
+                text: 'gps出场'
             }, {
                 value: 1,
-                text: '请求出场时间'
-            }]
-        });
-		
-		//进场时间类型
-        $('#inTimeType').editable({
-        	value: conf.inConfig,
-            inputclass: 'form-control',
-            placement: 'right',
-            source: [{
-                value: 0,
-                text: '离开缓冲区时间'
+                text: '请求出场'
             }, {
-                value: 1,
-                text: '请求进场时间'
+            	value: 2,
+            	text: '出站即出场'
             }]
-        }); */
-        
+        })
+        .on('save', function(e, params) {
+			var index = showLoad('提交数据...');
+		   $post('/lineConfig/editOutTimeType', {lineCode: lineCode, type: params.newValue}
+		    	,function(rs){
+		    		layer.close(index);
+		    		$('#outTimeType').val(rs.type);
+		    });
+		});
+	}
+	
+	function getLineCode(){
+		return $('.line_config_tree li.selected').data('code');
 	}
 }();
 </script>
 \ No newline at end of file
+暂未开放
 \ No newline at end of file
+暂未开放
 \ No newline at end of file
+#lineConfigPanel{
+    background: #fff;
+    overflow: hidden;
+    font-family: 'Segoe UI',Arial,'Microsoft Yahei',sans-serif !important;
+    min-width: 1392px;
+}
+
+#lineConfigPanel h1{
+	-webkit-margin-start: 23px;
+    color: rgb(92, 97, 102);
+    margin-bottom: 1em;
+    margin-top: 21px;
+    font-size: 1.5em;
+}
+
+#lineConfigPanel .line_config_tree ul {
+	list-style-type: none;
+    padding: 0;
+    height: 100% !important;
+}
+
+#lineConfigPanel .line_config_tree ul li{
+	 -webkit-border-start: 6px solid transparent;
+    -webkit-padding-start: 18px;
+    -webkit-user-select: none;
+    cursor: pointer;
+}
+
+#lineConfigPanel .line_config_tree ul li.selected{
+	-webkit-border-start-color: #1bbc9b;
+    cursor: default;
+    pointer-events: none;
+}
+
+#lineConfigPanel .line_config_tree ul li button{
+	background-color: white;
+    border: 0;
+    color: #999;
+    cursor: pointer;
+    font: inherit;
+    line-height: 1.417em;
+    margin: 6px 0;
+    padding: 0;
+}
+
+#lineConfigPanel .line_config_tree ul li.selected button{
+	color: #1bbc9b;
+}
+
+#lineConfigPanel #trafficChart{
+	display: inline-block;
+    width: calc(100% - 152px);
+    vertical-align: top;
+    height: 100%;
+}
+
+#lineConfigPanel #trafficChart .sample_tags{
+    width: 100%;
+    height: 65px;
+    text-align: right;
+    padding: 20px 40px 0;
+}
+
+#lineConfigPanel #trafficChart .sample_tags a.tag{
+    display: inline-block;
+    line-height: 1;
+    vertical-align: baseline;
+    background-color: #E8E8E8;
+    padding: .5833em .833em;
+    color: rgba(0,0,0,.6);
+    text-transform: none;
+    font-weight: 700;
+    border: 0 solid transparent;
+    border-radius: .28571429rem !important;
+    -webkit-transition: background .1s ease;
+    transition: background .1s ease;
+    font-size: .85714286rem;
+    margin: .8em .5em .5em 0;
+       font-weight: 400;
+}
+
+#lineConfigPanel #trafficChart svg{
+	width: 100%;
+    height: calc(100% - 65px);
+}
+
+#lineConfigPanel #trafficChart svg circle{
+    fill: #b9b7b7;
+    r: 6;
+    stroke: rgb(253, 253, 253);
+    stroke-width: 3;
+}
+
+#lineConfigPanel #trafficChart svg path{
+	stroke-width: 6.4px;
+    opacity: 0.9;
+    stroke: #b2afaf;
+    cursor: pointer;
+}
+
+#lineConfigPanel #trafficChart svg path.active{
+	stroke: #1bbc9b;
+}
+
+#lineConfigPanel #trafficChart svg text{
+    font-size: 85%;
+    fill: #6b6666;
+    font-weight: bold;
+}
+
+#lineConfigPanel #trafficChart .sample_tags a.tag.active{
+	background-color: #1bbc9b;
+    color: white;
+}
+
+.line_config_tree{
+	width: 155px;
+	float: left;
+	height: 100%;
+}
+
+#lineConfigPanel .slimScrollBar{
+	border-radius: 7px !important;
+	background: rgb(176, 173, 173) !important;
+    width: 4px !important;
+}
+
+.line_config_content{
+    width: calc(100% - 155px);
+    float: left;
+    height: 100%;
+}
+
+.line_config_content .body{
+	height: 100% !important;
+    overflow: auto;
+    color: rgb(48, 57, 66);
+    overflow: hidden;
+}
+
+.left_station_route{
+    height: 100%;
+    width: 147px;
+    display: inline-block;
+    padding-top: 7px;
+}
+
+ .left_station_route ul{
+	list-style-type: none;
+	padding-left: 0;
+}
+
+.left_station_route ul li{
+    -webkit-user-select: none;
+    margin: 8px 0;
+}
+
+.left_station_route ul.list li:FIRST-CHILD {
+    margin-top: 0px;
+}
+
+.left_station_route .tabbable-line ul li div{
+	padding-left: 10px;
+	display: block;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+
+.left_station_route .tabbable-line ul li div a{
+	color: #605f5f;
+	text-decoration: none;
+}
+
+.left_station_route ul.list li:FIRST-CHILD div a{
+	cursor: default;
+    color: #bbbaba;
+}
+
+.left_station_route .tabbable-line .tab-content{
+	height: 100% !important;
+	padding: 20px 0 0;
+}
+
+rect.station_rect{
+    fill: #949595;
+    height: 24px;
+    rx: 3px;
+}
+
+rect.f_rect{
+    height: 20px;
+    fill: #32c2a5;
+    rx: 3px;
+}
+
+#lineConfigPanel #trafficChart svg text.f_text{
+	fill: #ffffff;
+}
+
+.select2-container--open{
+	z-index: 100000000;
+}
 \ No newline at end of file
+var sampleSvg = (function(){
+	
+	var rowNum = 5
+		,itemWidth = 240
+		, rowHeight = 130
+		, _count
+		, margin
+		, _opt
+		, svg
+		, _data;
+	
+	var stationMapp = {};
+	//路由
+	var routes;
+	//X比例尺
+	var scaleX = function(d, i){
+		var r = parseInt(i / rowNum)
+			,x = (i % rowNum) * itemWidth;
+		
+		if(r % 2 != 0)
+			x = itemWidth * (rowNum - 1) - x ;
+		return x + margin;
+	}
+	//Y 比例尺
+	var scaleY = function(d, i){
+		return (parseInt(i / rowNum)) * rowHeight + 60;
+	};
+	
+	var dx = function(d){return d.cx;};
+	var dy = function(d){return d.cy;};
+	var text = function(d){return d.stationName;}
+	var transform = function(d, i){
+		var size = d.stationName.length
+			,dx = size / 2 * 12
+			,dy = -15;
+		
+		if((i + 1) % rowNum == 1 && i != 0)
+			dy += 40;
+		return 'translate(-'+dx+', '+dy+')';
+	}
+	
+	var line = d3.svg.line().x(function(d) {
+		return d.cx;
+	}).y(function(d) {
+		return d.cy;
+	});
+	
+	var dataId = function(d, i){
+		if(i >= _count - 1)
+			return null; 
+		else 
+			return _opt.rts[i + 1].stationCode;
+	}
+	
+	function draw(opt){
+		$('#trafficChart svg').remove();
+		svg = d3.select('#trafficChart').append('svg');
+		//容器宽度
+		var width = $('#trafficChart svg').width();
+		margin = (width - (rowNum - 1) * itemWidth) / 2;
+		var rts = opt.rts
+		_count = rts.length;
+		_opt = opt;
+		routes = rts;
+		//附加坐标
+		$.each(rts , function(i, obj){
+			obj.cx = scaleX(obj, i);
+			obj.cy = scaleY(obj, i);
+			stationMapp[obj.stationCode] = obj.stationName;
+		});
+		
+		//画线
+		svg.selectAll('path').data(rts)
+			.enter().append('path')
+			.attr('d', function(d, i){
+				if(i == _count - 1)
+					return;
+				return line([d, rts[i + 1]]);
+			})
+			.attr('data-id', dataId)
+			.attr('data-group', function(d, i){return dataId(d, i - 1) + '_' + dataId(null, i)})
+			.on('click', function(){popAddModal($(this).data('id'))});
+		
+		//画点
+		svg.selectAll('circle').data(rts)
+			.enter().append('circle')
+			.attr('cx', dx)
+			.attr('cy', dy)
+		
+		//站点名
+		drawText(rts);
+		//显示tags
+		showTags();
+	}
+	
+	$('#trafficChart').on('click', '.sample_tags a.tag', function(){
+		$('.sample_tags a.tag.active').removeClass('active');
+		$(this).addClass('active');
+		var tag = $(this).text();
+		clearRunTimeE();
+		//show
+		showRunTimeE(_data[tag])
+		
+	});
+	
+	function showRunTimeE(rs){
+		//改变path颜色
+		$.each(rs, function(){
+			var group = this.sStation + '_' + this.eStation
+				,path = $('#trafficChart path[data-group='+group+']')
+				,d = path.attr('d');
+			this.cp = analysePath(d);
+			path.attr('class', 'active')
+				.attr('data-sid', this.id);
+		});
+		
+		//背景
+		svg.selectAll('.f_rect')
+			.data(rs).enter().append('rect')
+			.attr('x', function(d){return d.cp[0]})
+			.attr('y', function(d){return d.cp[1]})
+			.attr('transform', 'translate(-4, -14)')
+			.attr('width', function(d){
+				return (d.runTime + '').length * 7 + 20;
+			})
+			.classed('f_rect', true);
+		
+		//时间text
+		svg.selectAll('.f_text')
+			.data(rs).enter().append('text')
+			.attr('x', function(d){return d.cp[0]})
+			.attr('y', function(d){return d.cp[1]})
+			.attr('class', 'f_text')
+			.text(function(d){return d.runTime + 'm'});
+	}
+	
+	
+	function clearRunTimeE(){
+		$('#trafficChart path.active').removeAttr('class');
+		$('.f_rect,.f_text').remove();
+	}
+	
+	function showTags(){
+		//查询 耗时信息
+		$.get('/sample/all', {'lineCode_eq': _opt.lineCode, 'updown_eq': _opt.updown}, function(rs){
+			//按tag分组数据
+			_data = {};
+			var tags = '';//
+			$.each(rs, function(i, d){
+				if(!_data[d.tag]){
+					_data[d.tag] = [];
+					tags += '<a class="tag">'+d.tag+'</a>';
+				}
+				_data[d.tag].push(d);
+			});
+			$('#trafficChart .sample_tags').html(tags);
+			//选中第一个tag
+			$('#trafficChart .sample_tags a.tag:eq(0)').click();
+		});
+	}
+	
+	function drawText(rts){
+		svg.selectAll('text').data(rts)
+			.enter().append('text')
+			.attr('x', dx)
+			.attr('y', dy)
+			.attr('transform', transform)
+			.text(text)
+	}
+	
+	var tagRange = {'早高峰': {s: '06:31', e: '08:30'}, '平峰': {s: '08:31', e: '16:00'}, '晚高峰': {s: '16:01', e: '18:00'}};
+	function popAddModal(id){
+		//var eid = id ,sid =  prve(id);
+		//if(!sid)return;
+		
+		//var opts = {sid: sid, eid: eid, sName: stationMapp[sid], eName: stationMapp[eid]};
+		$.get('/pages/forecast/sample/modal.html', function(rs){
+			var index = layer.open({
+				  type: 1,
+				  area: '550px',
+				  content: rs,
+				  shift: 5,
+				 // title: '...',
+				  success: function(){
+					 $('#forecast_sample_modal').trigger('init', {_opt: _opt, _data: _data, id: id});
+					/*$("#addSampleForm select[name=tag]").select2({
+						  maximumSelectionLength: 1,
+						  tags: true
+					})
+					.on('change', function(){
+						var t = $(this).val();
+						if(tagRange[t]){
+							$("#addSampleForm input[name=sDate]").val(tagRange[t].s);
+							$("#addSampleForm input[name=eDate]").val(tagRange[t].e);
+						}
+					});
+					
+					//提交
+					$('#addSampleForm .confirm').on('click', function(){
+						if(customFormValidate('#addSampleForm')){
+							console.log(_opt);
+							var param = $('#addSampleForm').serializeJSON();
+							param.lineCode = _opt.lineCode;
+							param.updown = _opt.updown;
+							$post('/sample', param, function(){layer.close(index);});
+						}
+					});*/
+				  }
+			});
+		});
+	}
+	
+	
+	var drawObject = {
+		draw: draw ,
+		popAddModal: popAddModal
+	}
+	
+	//分析path d 路径中间点
+	function analysePath(d){
+		d = d.replace('M', '');
+		var sp = d.split('L')[0].split(',')
+			,ep = d.split('L')[1].split(',')
+			,cp = [];
+		sp[0] = parseInt(sp[0]);
+		sp[1] = parseInt(sp[1]);
+		ep[0] = parseInt(ep[0]);
+		ep[1] = parseInt(ep[1]);
+		
+		cp = sp;
+		var diff;
+		if(sp[0] != ep[0]){
+			diff = Math.abs(sp[0] - ep[0]) / 2 - 16;
+			cp[0] = sp[0] > ep[0]?ep[0]+diff:sp[0]+diff;
+			cp[1] -= 10;
+		}
+		else if(sp[1] != ep[1]){
+			diff = Math.abs(sp[1] - ep[1]) / 2;
+			cp[1] = sp[1] > ep[1]?ep[1]+diff:sp[1]+diff;
+			
+			cp[0] += 10;
+		}
+		return cp;
+	}
+	
+	/**
+	 * 自定义表单校验
+	 */
+	function customFormValidate(f){
+		var rs = true;
+		//所有可见的项
+		var es = $('input,select', f);
+		
+		for(var i = 0, e; e = es[i++];){
+			if($(e).attr('required') && ( $(e).val() == null || $(e).val() == '')){
+				if($(e).hasClass('select2-hidden-accessible'))
+					$(e).next().find('.select2-selection').addClass('custom-val-error');
+				else
+					$(e).addClass('custom-val-error');
+				rs = false;
+			}
+			else{
+				if($(e).hasClass('select2-hidden-accessible'))
+					$(e).next().find('.select2-selection').removeClass('custom-val-error');
+				else
+					$(e).removeClass('custom-val-error');
+			}
+		}
+		
+		if(!rs){
+			layer.alert('数据完整性校验失败，请检查输入项', {icon: 2, title: '操作失败',  shift: 5});    
+		}
+		return rs;
+	}
+	return drawObject;
+})();
 \ No newline at end of file