Merge branch 'minhang' of 192.168.168.201:panzhaov5/bsth_control into

minhang # Conflicts: # src/main/java/com/bsth/data/gpsdata/GpsRealData.java # src/main/resources/ms-jdbc.properties

Merge branch 'minhang' of 192.168.168.201:panzhaov5/bsth_control into
minhang # Conflicts: # src/main/java/com/bsth/data/gpsdata/GpsRealData.java # src/main/resources/ms-jdbc.properties
廖磊
2 parents a1875c52 3f0d21a1
Showing 57 changed files with 2800 additions and 870 deletions
pom.xml
src/main/java/com/bsth/controller/BaseController2.java
src/main/java/com/bsth/controller/forms/ExportController.java
src/main/java/com/bsth/controller/forms/MCY_FormsController.java
src/main/java/com/bsth/controller/gps/GpsController.java
src/main/java/com/bsth/controller/realcontrol/BasicDataController.java
src/main/java/com/bsth/controller/schedule/RerunController.java
src/main/java/com/bsth/controller/schedule/TTInfoController.java
src/main/java/com/bsth/controller/schedule/TTInfoDetailController.java
src/main/java/com/bsth/controller/schedule/core/RerunController.java
src/main/java/com/bsth/controller/schedule/core/TTInfoController.java
src/main/java/com/bsth/data/BasicData.java
src/main/java/com/bsth/data/arrival/AnalyseData.java
src/main/java/com/bsth/data/forecast/ForecastRealServer.java
src/main/java/com/bsth/data/gpsdata/GpsEntity.java
src/main/java/com/bsth/data/gpsdata/GpsRealData.java
src/main/java/com/bsth/data/gpsdata/analyse/CircleQueue.java
src/main/java/com/bsth/data/gpsdata/analyse/GeoCacheData.java
src/main/java/com/bsth/data/gpsdata/analyse/GpsAnalyse.java
src/main/java/com/bsth/data/gpsdata/analyse/StationRoute.java
@@ -225,6 +225,12 @@
 			<artifactId>spring-boot-devtools</artifactId>
 			<optional>true</optional>
 		</dependency>-->
+		<dependency>
+			<groupId>com.vividsolutions</groupId>
+			<artifactId>jts</artifactId>
+			<version>1.13</version>
+		</dependency>
+
 	</dependencies>
  
     <dependencyManagement>
@@ -187,9 +187,11 @@ public class BaseController2&lt;T, ID extends Serializable&gt; {
         }
  
         System.out.println(outputfile.getName());
+        System.out.println(outputfile.getAbsolutePath());
+
         String filePath = outputfile.getAbsolutePath();
-        String fp[] = filePath.split(File.separator);
-        String fileName = fp[fp.length - 1];
+//        String fp[] = filePath.split(File.separator);
+//        String fileName = fp[fp.length - 1];
  
         // TODO：使用ktr获取导出数据
  
@@ -65,10 +65,12 @@ public class ExportController {
 			i++;
 		}
  
+		
+		
 		try {
 			listI.add(resList.iterator());
 			String path = this.getClass().getResource("/").getPath() + "static\\pages\\forms\\";
-			ee.excelReplace(listI, new Object[] { map }, path + "mould\\linepassengerflow.xls",
+			ee.excelReplace(listI, new Object[] { map }, path + "mould\\linepasswengerflow.xls",
 					path + "export\\线路客流量报表" + sdfSimple.format(sdfMonth.parse(map.get("date").toString())) + ".xls");
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -189,7 +191,7 @@ public class ExportController {
 			listI.add(resList.iterator());
 			String path = this.getClass().getResource("/").getPath() + "static\\pages\\forms\\";
 			ee.excelReplace(listI, new Object[] { map }, path + "mould\\singledata.xls",
-					path + "export\\路单报表" + sdfSimple.format(sdfMonth.parse(map.get("startDate").toString())) + ".xls");
+					path + "export\\路单数据" + sdfSimple.format(sdfMonth.parse(map.get("startDate").toString())) + ".xls");
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
@@ -203,8 +205,8 @@ public class ExportController {
 		SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"), sdfSimple = new SimpleDateFormat("yyyyMMdd");
 		List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
 		ReportUtils ee = new ReportUtils();
-		List<Vehicleloading> vehicleloading = formsService.vehicleloading(/*map.get("gsdmVehic").toString(),map.get("fgsdmVehic").toString(),*/map.get("line").toString(),
-				map.get("date").toString());
+		List<Vehicleloading> vehicleloading = formsService.vehicleloading(map.get("gsdmVehic").toString(),map.get("fgsdmVehic").toString(),map.get("line").toString(),
+				map.get("data").toString());
 		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
 		int i = 1;
 		for (Vehicleloading l : vehicleloading) {
@@ -214,8 +216,8 @@ public class ExportController {
 			m.put("gS", l.getgS());
 			m.put("xL", l.getxL());
 			m.put("clzbh", l.getClzbh());
-			m.put("hyl", l.getHyl());
 			m.put("jzl", l.getJzl());
+			m.put("hyl", l.getHyl());
 			m.put("ls", l.getLs());
 			m.put("jhlc", l.getJhlc());
 			m.put("unyyyl", l.getUnyyyl());
@@ -229,7 +231,7 @@ public class ExportController {
 			listI.add(resList.iterator());
 			String path = this.getClass().getResource("/").getPath() + "static\\pages\\forms\\";
 			ee.excelReplace(listI, new Object[] { map }, path + "mould\\vehicleloading.xls",
-					path + "export\\车辆加注" + sdfSimple.format(sdfMonth.parse(map.get("date").toString())) + ".xls");
+					path + "export\\车辆加注" + sdfSimple.format(sdfMonth.parse(map.get("dat").toString())) + ".xls");
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
@@ -417,5 +419,9 @@ public class ExportController {
 		}
 		return resList;
 	}
+	
+	
+	
+	
  
 }
@@ -80,9 +80,9 @@ public class MCY_FormsController {
  
 	// 车辆加注
 	@RequestMapping(value = "/vehicleloading", method = RequestMethod.POST)
-	public List<Vehicleloading> vehicleloading(/*@RequestParam String gsdmVehic, @RequestParam String fgsdmVehic,*/
+	public List<Vehicleloading> vehicleloading(@RequestParam String gsdmVehic, @RequestParam String fgsdmVehic,
 			@RequestParam String line, @RequestParam String data) {
-		return formsService.vehicleloading(/*gsdmVehic, fgsdmVehic, */line, data);
+		return formsService.vehicleloading(gsdmVehic, fgsdmVehic, line, data);
 	}
  
 	// 运营服务阶段报表
 package com.bsth.controller.gps;
  
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
 import com.bsth.data.BasicData;
 import com.bsth.data.gpsdata.GpsEntity;
 import com.bsth.data.gpsdata.GpsRealData;
 import com.bsth.service.gps.GpsService;
 import com.google.common.base.Splitter;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
  
 @RestController
 @RequestMapping("gps")
@@ -70,7 +69,7 @@ public class GpsController {
 		return gpsService.history(nbbmArray, st, et);
 	}
  
-	/*@RequestMapping(value = "/arrival/ram")
+	/*@RequestMapping(value = "/analyse/ram")
 	public List<ArrivalInfo> ramData(@RequestParam String nbbm) {
 		return ArrivalDataBuffer.allMap.get(nbbm);
 	}*/
@@ -84,4 +83,9 @@ public class GpsController {
 	public Map<String, Object> findBuffAeraByCode(@RequestParam String code,@RequestParam String type){
 		return gpsService.findBuffAeraByCode(code, type);
 	}
+
+	@RequestMapping(value = "/findRoadSpeed")
+	public Map<String, Object> findRoadSpeed(@RequestParam String lineCode){
+		return gpsService.findRoadSpeed(lineCode);
+	}
 }
 package com.bsth.controller.realcontrol;
  
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.serializer.PropertyFilter;
 import com.bsth.data.BasicData;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
  
 @RestController
 @RequestMapping("/basic")
-package com.bsth.controller.schedule;
-
-import com.bsth.controller.BaseController;
-import com.bsth.entity.schedule.rule.RerunRule;
-import com.bsth.repository.schedule.RerunRuleRepository;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Map;
-
-/**
- * Created by xu on 16/10/20.
- */
-@RestController
-@RequestMapping("rms")
-public class RerunController extends BaseController<RerunRule, Long> {
-
-    @Autowired
-    private RerunRuleRepository rerunRuleRepository;
-
-    @Override
-    public RerunRule findById(@PathVariable("id") Long aLong) {
-        return rerunRuleRepository.findOneExtend(aLong);
-    }
-
-    /**
-     * 覆写方法，因为form提交的方式参数不全，改用 json形式提交 @RequestBody
-     * @Title: save
-     * @Description: TODO(持久化对象)
-     * @param @param t
-     * @param @return    设定文件
-     * @return Map<String,Object>  {status: 1（成功），-1（失败）}
-     * @throws
-     */
-    @RequestMapping(method = RequestMethod.POST)
-    public Map<String, Object> save(@RequestBody RerunRule t){
-        return baseService.save(t);
-    }
-
-
-}
-package com.bsth.controller.schedule;
-
-import com.bsth.controller.BaseController2;
-import com.bsth.entity.schedule.TTInfo;
-import com.bsth.repository.schedule.TTInfoDetailRepository;
-import com.bsth.repository.schedule.TTInfoRepository;
-import com.bsth.service.schedule.utils.DataToolsProperties;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.data.domain.Page;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Map;
-
-/**
- * Created by xu on 16/5/12.
- */
-@RestController
-@RequestMapping("tic")
-@EnableConfigurationProperties(DataToolsProperties.class)
-public class TTInfoController extends BaseController2<TTInfo, Long> {
-    @Autowired
-    private DataToolsProperties dataToolsProperties;
-    @Autowired
-    private TTInfoRepository ttInfoRepository;
-    @Autowired
-    private TTInfoDetailRepository ttInfoDetailRepository;
-
-    @Override
-    protected String getDataImportKtrClasspath() {
-        return dataToolsProperties.getTtinfoDatainputktr();
-    }
-
-    @Override
-    public TTInfo findById(@PathVariable("id") Long aLong) {
-        return ttInfoRepository.findOneExtend(aLong);
-    }
-
-    /**
-     * 验证。
-     * @param map
-     * @return
-     */
-    @RequestMapping(value = "/validate/equale", method = RequestMethod.GET)
-    public Map<String, Object> validateData(@RequestParam Map<String, Object> map) {
-        // 一般比较自编号是否重复
-        return baseService.validateEquale(map);
-    }
-
-    @Override
-    public Page<TTInfo> 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) {
-        // 如果有isCancel键值，将其值变成boolean
-        if (map.get("isCancel_eq") != null)
-            map.put("isCancel_eq", new Boolean(map.get("isCancel_eq").toString()));
-
-        return super.list(map, page, size, order, direction);
-    }
-}
@@ -113,6 +113,9 @@ public class TTInfoDetailController extends BaseController2&lt;TTInfoDetail, Long&gt; 
                                 p1.put("stationName_eq", cell_con.trim());
                                 p1.put("stationMark_eq", "B");
  
+
+                                // TODO：这里要修改（起点站有启用撤销的标志的）
+
                                 List<StationRoute> stationRouteList = (List<StationRoute>) stationRouteService.list(p1);
                                 if (CollectionUtils.isEmpty(stationRouteList)) {
                                     rtn.put("status", ResponseCode.ERROR);
+package com.bsth.controller.schedule.core;
+
+import com.bsth.controller.schedule.BController;
+import com.bsth.entity.schedule.rule.RerunRule;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * Created by xu on 16/10/20.
+ */
+@RestController
+@RequestMapping("rms")
+public class RerunController extends BController<RerunRule, Long> {
+
+
+}
+package com.bsth.controller.schedule.core;
+
+import com.bsth.common.ResponseCode;
+import com.bsth.controller.schedule.BController;
+import com.bsth.entity.schedule.TTInfo;
+import com.bsth.service.schedule.ScheduleException;
+import com.bsth.service.schedule.TTInfoService;
+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 java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Created by xu on 16/12/20.
+ */
+@RestController(value = "tTInfoController_ec")
+@RequestMapping(value = "tic_ec")
+public class TTInfoController extends BController<TTInfo, Long> {
+    @Autowired
+    private TTInfoService ttInfoService;
+
+    @RequestMapping(value = "/validate_name", method = RequestMethod.GET)
+    public Map<String, Object> validate_name(@RequestParam Map<String, Object> param) {
+        Map<String, Object> rtn = new HashMap<>();
+        try {
+            // 名字重复验证
+            TTInfo ttInfo = new TTInfo(
+                    param.get("id_eq"),
+                    param.get("xl.id_eq"),
+                    param.get("name_eq"),
+                    param.get("rule_days_eq"),
+                    param.get("special_days_eq")
+            );
+            ttInfoService.validate_name(ttInfo);
+            rtn.put("status", ResponseCode.SUCCESS);
+        } catch (ScheduleException exp) {
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", exp.getMessage());
+        }
+
+        return rtn;
+    }
+
+    @RequestMapping(value = "/validate_n_d", method = RequestMethod.GET)
+    public Map<String, Object> validate_n_d(@RequestParam Map<String, Object> param) {
+        Map<String, Object> rtn = new HashMap<>();
+        try {
+            // 常规有效日重复验证
+            TTInfo ttInfo = new TTInfo(
+                    param.get("id_eq"),
+                    param.get("xl.id_eq"),
+                    param.get("name_eq"),
+                    param.get("rule_days_eq"),
+                    param.get("special_days_eq")
+            );
+            ttInfoService.validate_n_d(ttInfo);
+            rtn.put("status", ResponseCode.SUCCESS);
+        } catch (ScheduleException exp) {
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", exp.getMessage());
+        }
+        return rtn;
+    }
+
+    @RequestMapping(value = "/validate_s_d", method = RequestMethod.GET)
+    public Map<String, Object> validate_s_d(@RequestParam Map<String, Object> param) {
+        Map<String, Object> rtn = new HashMap<>();
+        try {
+            // 特殊有效日重复判定
+            TTInfo ttInfo = new TTInfo(
+                    param.get("id_eq"),
+                    param.get("xl.id_eq"),
+                    param.get("name_eq"),
+                    param.get("rule_days_eq"),
+                    param.get("special_days_eq")
+            );
+            ttInfoService.validate_s_d(ttInfo);
+            rtn.put("status", ResponseCode.SUCCESS);
+        } catch (ScheduleException exp) {
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", exp.getMessage());
+        }
+        return rtn;
+    }
+
+}
+
+//
+//@Autowired
+//private DataToolsProperties dataToolsProperties;
+//@Autowired
+//private TTInfoRepository ttInfoRepository;
+//@Autowired
+//private TTInfoDetailRepository ttInfoDetailRepository;
+//
+//    @Override
+//    protected String getDataImportKtrClasspath() {
+//        return dataToolsProperties.getTtinfoDatainputktr();
+//    }
+//
+//    @Override
+//    public TTInfo findById(@PathVariable("id") Long aLong) {
+//        return ttInfoRepository.findOneExtend(aLong);
+//    }
+//
+//    /**
+//     * 验证。
+//     * @param map
+//     * @return
+//     */
+//    @RequestMapping(value = "/validate/equale", method = RequestMethod.GET)
+//    public Map<String, Object> validateData(@RequestParam Map<String, Object> map) {
+//        // 一般比较自编号是否重复
+//        return baseService.validateEquale(map);
+//    }
+//
+//    @Override
+//    public Page<TTInfo> 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) {
+//        // 如果有isCancel键值，将其值变成boolean
+//        if (map.get("isCancel_eq") != null)
+//            map.put("isCancel_eq", new Boolean(map.get("isCancel_eq").toString()));
+//
+//        return super.list(map, page, size, order, direction);
+//    }
 \ No newline at end of file
 package com.bsth.data;
  
 import com.bsth.Application;
+import com.bsth.data.gpsdata.analyse.GeoCacheData;
 import com.bsth.entity.*;
 import com.bsth.entity.schedule.CarConfigInfo;
 import com.bsth.repository.*;
@@ -57,7 +58,7 @@ public class BasicData implements CommandLineRunner {
     public static Map<String, String> lineCode2NameMap;
  
     //线路编码_站点编码 == 0|1  上下行
-    public static Map<String, Integer> lineStationUpDownMap;
+    //public static Map<String, Integer> lineStationUpDownMap;
  
     //停车场
     public static List<String> parkCodeList;
@@ -86,7 +87,7 @@ public class BasicData implements CommandLineRunner {
  
     @Override
     public void run(String... arg0) throws Exception {
-        Application.mainServices.scheduleWithFixedDelay(dataLoader, 0, 1, TimeUnit.HOURS);
+        Application.mainServices.scheduleWithFixedDelay(dataLoader, 2, 2, TimeUnit.HOURS);
     }
  
  
@@ -117,6 +118,9 @@ public class BasicData implements CommandLineRunner {
         @Autowired
         BusinessRepository businessRepository;
  
+        @Autowired
+        GeoCacheData geoCacheData;
+
  
         @Override
         public void run() {
@@ -138,11 +142,13 @@ public class BasicData implements CommandLineRunner {
                 //车辆和线路映射信息
                 loadNbbm2LineInfo();
                 //站点路由信息
-                loadStationRouteInfo();
+                //loadStationRouteInfo();
                 //人员信息
                 loadPersonnelInfo();
                 //公司信息
                 loadBusinessInfo();
+
+                geoCacheData.loadData();
                 logger.info("加载基础数据成功！，");
             } catch (Exception e) {
                 logger.error("加载基础数据时出现异常，", e);
@@ -151,7 +157,7 @@ public class BasicData implements CommandLineRunner {
         }
  
  
-        private void loadStationRouteInfo() {
+/*        private void loadStationRouteInfo() {
             Iterator<StationRoute> iterator = stationRouteRepository.findAllEffective().iterator();
  
             Map<String, String> sePointMap = new HashMap<>();
@@ -172,7 +178,7 @@ public class BasicData implements CommandLineRunner {
             }
             lineStationUpDownMap = map;
             lineSEPointMap = sePointMap;
-        }
+        }*/
  
         /**
          * loadBusinessInfo
@@ -280,7 +286,7 @@ public class BasicData implements CommandLineRunner {
                 /**
                  * 加载运管处的站点及序号
                  * 上行从1开始，下行顺序续编
-                 */
+
                 List<Object[]> ygcLines = stationRouteRepository.findAllLineWithYgc();
                 if(ygcLines != null && ygcLines.size() > 0){
                     int size = ygcLines.size();
@@ -299,7 +305,7 @@ public class BasicData implements CommandLineRunner {
                         key = tempArray[0] + "_"+tempArray[1] + "_"+tempArray[2];
                         tempStationName2YgcNumber.put(key,num++);
                     }
-                }
+                }*/
             }
  
             lineId2CodeMap = biMap;
 package com.bsth.data.arrival;
  
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
  
-import com.bsth.data.BasicData;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
  
 /**
  * 
@@ -98,14 +96,15 @@ public class AnalyseData {
 	}
  
 	private boolean effective(ArrivalEntity arr){
-		//停车场
+		/*//停车场
 		if(BasicData.parkCodeList.contains(arr.getStopNo())){
 			arr.setTcc(true);
 			return true;
 		}
-		
+
 		Integer upDown = BasicData.lineStationUpDownMap.get(arr.getLineCode() + "_" + arr.getStopNo());
-		
-		return arr.getUpDown() == upDown || BasicData.parkCodeList.contains(arr.getStopNo());
+
+		return arr.getUpDown() == upDown || BasicData.parkCodeList.contains(arr.getStopNo());*/
+		return false;
 	}
 }
@@ -70,7 +70,7 @@ public class ForecastRealServer implements CommandLineRunner {
 /*	public void forecast(String nbbm){
 		logger.info("预测，" + nbbm);
 		//当前执行班次
-		ScheduleRealInfo sch = dayOfSchedule.execPlamMap().get(nbbm);
+		ScheduleRealInfo sch = dayOfSchedule.execPlanMap().get(nbbm);
 		if(null == sch)
 			return;
  
@@ -86,7 +86,7 @@ public class ForecastRealServer implements CommandLineRunner {
 			//终点站
 			String eStation = null;
 			//当前执行班次
-			ScheduleRealInfo sch = dayOfSchedule.execPlamMap().get(nbbm);
+			ScheduleRealInfo sch = dayOfSchedule.execPlanMap().get(nbbm);
 			if(null != sch)
 				eStation = sch.getZdzCode();
  
 package com.bsth.data.gpsdata;
  
+import com.bsth.data.gpsdata.analyse.StationRoute;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
 /**
  * 
  * @ClassName: GpsRealData
@@ -58,21 +61,32 @@ public class GpsEntity {
 	/** 预计到达终点时间 */
 	private Float expectStopTime;
  
-	/** 设备是否在线 */
+	/** 设备是否在线
 	private boolean online;
-	
+	 */
 	/** 当前执行班次ID */
 	private Long schId;
  
 	/** 是否异常数据 */
 	private boolean abnormal;
-	
-	private int valid;
+/*
+	private int valid;*/
  
 	private int version;
  
-	/** 是否起终点站 */
+	/** 是否起终点站
 	private boolean sEPoint;
+	 */
+
+	/** 站内 */
+	private boolean instation;
+
+	/** 站点信息，站内时有值 */
+	@JsonIgnore
+	private StationRoute station;
+
+	/** 状态 */
+	private String state2;
  
 	public Integer getCompanyCode() {
 		return companyCode;
@@ -178,14 +192,6 @@ public class GpsEntity {
 		this.stationName = stationName;
 	}
  
-	public boolean isOnline() {
-		return online;
-	}
-
-	public void setOnline(boolean online) {
-		this.online = online;
-	}
-
 	public long getArrTime() {
 		return arrTime;
 	}
@@ -218,35 +224,44 @@ public class GpsEntity {
 		this.schId = schId;
 	}
  
-	public boolean isAbnormal() {
-		return abnormal;
+
+	public int getVersion() {
+		return version;
 	}
  
-	public void setAbnormal(boolean abnormal) {
-		this.abnormal = abnormal;
+	public void setVersion(int version) {
+		this.version = version;
 	}
  
-	public int getValid() {
-		return valid;
+	public boolean isInstation() {
+		return instation;
 	}
  
-	public void setValid(int valid) {
-		this.valid = valid;
+	public void setInstation(boolean instation) {
+		this.instation = instation;
 	}
  
-	public int getVersion() {
-		return version;
+	public StationRoute getStation() {
+		return station;
 	}
  
-	public void setVersion(int version) {
-		this.version = version;
+	public void setStation(StationRoute station) {
+		this.station = station;
+	}
+
+	public boolean isAbnormal() {
+		return abnormal;
+	}
+
+	public void setAbnormal(boolean abnormal) {
+		this.abnormal = abnormal;
 	}
  
-	public boolean issEPoint() {
-		return sEPoint;
+	public String getState2() {
+		return state2;
 	}
  
-	public void setsEPoint(boolean sEPoint) {
-		this.sEPoint = sEPoint;
+	public void setState2(String state2) {
+		this.state2 = state2;
 	}
 }
@@ -5,6 +5,8 @@ import com.alibaba.fastjson.JSONObject;
 import com.bsth.Application;
 import com.bsth.data.BasicData;
 import com.bsth.data.forecast.ForecastRealServer;
+import com.bsth.data.gpsdata.analyse.GpsAnalyse;
+import com.bsth.data.gpsdata.recovery.GpsDataRecovery;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.util.ConfigUtil;
@@ -55,6 +57,9 @@ public class GpsRealData implements CommandLineRunner{
  
 	@Autowired
 	ForecastRealServer forecastRealServer;
+
+
+
 	/**
 	 * 构造函数
 	 */
@@ -67,13 +72,17 @@ public class GpsRealData implements CommandLineRunner{
 	@Override
 	public void run(String... arg0) throws Exception {
 		logger.info("gpsDataLoader,20,6");
-		//Application.mainServices.scheduleWithFixedDelay(gpsDataLoader, 20, 5, TimeUnit.SECONDS);
+		Application.mainServices.scheduleWithFixedDelay(gpsDataLoader, 40, 20, TimeUnit.SECONDS);
 	}
  
 	public GpsEntity add(GpsEntity gps) {
 		String device = gps.getDeviceId();
 		GpsEntity old = gpsMap.get(device);
  
+		//分析gps
+		if(isAvailable(gps) && (old == null || old.getTimestamp() != gps.getTimestamp()))
+			GpsAnalyse.start(gps);
+
 		if(!StringUtils.isEmpty(gps.getStopNo())){
 			//定时定距数据附带站点编码改变
 			if(null == old || !gps.getStopNo().equals(old.getStopNo())){
@@ -94,6 +103,11 @@ public class GpsRealData implements CommandLineRunner{
 		return gps;
 	}
  
+	public boolean isAvailable(GpsEntity gps){
+		return StringUtils.isNotEmpty(gps.getLineId()) &&
+				dayOfSchedule.getCurrSchDate().containsKey(gps.getLineId());
+	}
+
 	/**
 	 *
 	 * @Title: get @Description: TODO(设备号获取GPS)
@@ -118,7 +132,7 @@ public class GpsRealData implements CommandLineRunner{
 			if(gps.isAbnormal())
 				continue;
  
-			sch = dayOfSchedule.execPlamMap().get(gps.getNbbm());
+			sch = dayOfSchedule.execPlanMap().get(gps.getNbbm());
 			if(null != sch)
 				gps.setSchId(sch.getId());
 			rs.add(gps);
@@ -161,6 +175,11 @@ public class GpsRealData implements CommandLineRunner{
 		@Override
 		public void run() {
 			try{
+				//如果正在恢复数据
+				if(GpsDataRecovery.run){
+					return;
+				}
+
 				load();
 			}catch(Exception e){
 				logger.error("", e);
@@ -207,21 +226,7 @@ public class GpsRealData implements CommandLineRunner{
 						gpsRealData.add(gps);
  
 						//纠正走向
-						correctUpdown(gps);
-						/*if(issEPoint(gps))
-							continue;
-
-						//如果走向未知，尝试根据站点纠正走向
-						if(gps.getUpDown() == -1){
-							updown=stationUpDownMap.get(gps.getLineId()+"_"+gps.getStopNo());
-							if(updown != null)
-								gps.setUpDown(updown);
-						}
-						//如果站点编码和走向相反（即上行站点ID，走向为下行），尝试根据站点纠正走向
-						updown=stationUpDownMap.get(gps.getLineId()+"_"+gps.getStopNo());
-						if(updown != null && !gps.getUpDown().equals(updown)){
-							gps.setUpDown(updown);
-						}*/
+						//correctUpdown(gps);
 					}
 				} else
 					logger.error("result is null");
@@ -240,7 +245,7 @@ public class GpsRealData implements CommandLineRunner{
 		 * 是否是起终点
 		 * @param gps
 		 * @return
-		 */
+
 		public boolean isSEPoint(GpsEntity gps){
 			String key = gps.getLineId()+"_"+gps.getUpDown()+"_"
 					,stationCode;
@@ -261,29 +266,19 @@ public class GpsRealData implements CommandLineRunner{
 				}
 			}
 			return false;
-		}
+		}*/
  
 		/**
 		 * 纠正上下行
 		 * @param gps
-		 */
+
 		public void correctUpdown(GpsEntity gps){
 			Integer updown=BasicData.lineStationUpDownMap.get(gps.getLineId()+"_"+gps.getStopNo());
 			if(updown != null && !updown.equals(gps.getUpDown()))
 				gps.setUpDown(updown);
-			/*//如果走向未知，尝试根据站点纠正走向
-			if(gps.getUpDown() == -1){
-
-			}*/
  
 			if(isSEPoint(gps))
 				return;
-
-			/*//如果站点编码和走向相反（即上行站点ID，走向为下行），尝试根据站点纠正走向
-			updown=BasicData.lineStationUpDownMap.get(gps.getLineId()+"_"+gps.getStopNo());
-			if(updown != null && !gps.getUpDown().equals(updown)){
-				gps.setUpDown(updown);
-			}*/
-		}
+		}*/
 	}
-}
+}
 \ No newline at end of file
+package com.bsth.data.gpsdata.analyse;
+
+import java.util.Arrays;
+
+/**
+ * 循环队列
+ * Created by panzhao on 2016/12/23.
+ */
+public class CircleQueue<T> {
+
+    /**
+     * (循环队列)数组的容量
+     */
+    public int capacity;
+
+    /**
+     * 数组：保存循环队列的元素
+     */
+    public Object[] elementData;
+
+    /**
+     * 队头(先进先出)
+     */
+    public int head = 0;
+
+    /**
+     * 队尾
+     */
+    public int tail = 0;
+
+    /**
+     * 以指定长度的数组来创建循环队列
+     *
+     * @param initSize
+     */
+    public CircleQueue(final int initSize) {
+        capacity = initSize;
+        elementData = new Object[capacity];
+    }
+
+    /**
+     * 获取循环队列的大小(包含元素的个数)
+     */
+    public int size() {
+        if (isEmpty()) {
+            return 0;
+        } else if (isFull()) {
+            return capacity;
+        } else {
+            return tail + 1;
+        }
+    }
+
+    /**
+     * 插入队尾一个元素
+     */
+    public void add(final T element) {
+        if (isEmpty()) {
+            elementData[0] = element;
+        } else if (isFull()) {
+            elementData[head] = element;
+            head++;
+            tail++;
+            head = head == capacity ? 0 : head;
+            tail = tail == capacity ? 0 : tail;
+        } else {
+            elementData[tail + 1] = element;
+            tail++;
+        }
+    }
+
+    public boolean isEmpty() {
+        return tail == head && tail == 0 && elementData[tail] == null;
+    }
+
+    public boolean isFull() {
+        return head != 0 && head - tail == 1 || head == 0 && tail == capacity - 1;
+    }
+
+    public void clear() {
+        Arrays.fill(elementData, null);
+        head = 0;
+        tail = 0;
+    }
+
+    /**
+     * @return 取 循环队列里的值（先进的index=0）
+     */
+    public Object[] getQueue() {
+        final Object[] elementDataSort = new Object[capacity];
+        final Object[] elementDataCopy = elementData.clone();
+        if (isEmpty()) {
+        } else if (isFull()) {
+            int indexMax = capacity;
+            int indexSort = 0;
+            for (int i = head; i < indexMax;) {
+                elementDataSort[indexSort] = elementDataCopy[i];
+                indexSort++;
+                i++;
+                if (i == capacity) {
+                    i = 0;
+                    indexMax = head;
+                }
+            }
+        } else {
+            for (int i = 0; i < tail; i++) {
+                elementDataSort[i] = elementDataCopy[i];
+            }
+        }
+        return elementDataSort;
+    }
+
+    public T getTail(){
+        return elementData[tail] == null?null:(T)elementData[tail];
+    }
+}
 \ No newline at end of file
+package com.bsth.data.gpsdata.analyse;
+
+import com.bsth.data.gpsdata.GpsEntity;
+import com.google.common.collect.ArrayListMultimap;
+import com.vividsolutions.jts.geom.Coordinate;
+import com.vividsolutions.jts.geom.GeometryFactory;
+import com.vividsolutions.jts.geom.LineString;
+import com.vividsolutions.jts.geom.Polygon;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.RowMapper;
+import org.springframework.stereotype.Component;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.*;
+
+/**
+ * Created by panzhao on 2016/12/23.
+ */
+@Component
+public class GeoCacheData {
+
+    static Logger logger = LoggerFactory.getLogger(GeoCacheData.class);
+
+    //每辆车缓存最后200条gps
+    private static final int CACHE_SIZE = 200;
+    private static Map<String, CircleQueue<GpsEntity>> gpsCacheMap = new HashMap<>();
+
+    //线路路段走向
+    private static ArrayListMultimap<String, LineString> sectionCacheMap;
+
+    //线路站点路由
+    private static ArrayListMultimap<String, StationRoute> stationCacheMap;
+
+    //停车场
+    public static Map<String, Polygon> tccMap;
+
+    @Autowired
+    JdbcTemplate jdbcTemplate;
+
+    public static CircleQueue<GpsEntity> getGps(String nbbm) {
+        return gpsCacheMap.get(nbbm);
+    }
+
+    public static void putGps(GpsEntity gps) {
+        CircleQueue<GpsEntity> queue = gpsCacheMap.get(gps.getNbbm());
+        if (queue == null) {
+            //第一个点从站内开始
+            if(!gps.isInstation())
+                return;
+
+            queue = new CircleQueue<>(CACHE_SIZE);
+            gpsCacheMap.put(gps.getNbbm(), queue);
+        }
+        queue.add(gps);
+    }
+
+    public static List<StationRoute> getStationRoute(String lineCode, int directions) {
+        return stationCacheMap.get(lineCode + "_" + directions);
+    }
+
+    public static StationRoute getStation(String lineCode, int directions, String code) {
+        List<StationRoute> list = getStationRoute(lineCode, directions);
+
+        for (StationRoute sr : list) {
+            if (sr.getCode().equals(code)) {
+                return sr;
+            }
+        }
+        return null;
+    }
+
+    public static Polygon getTccPolygon(String code){
+        return tccMap.get(code);
+    }
+
+    public void loadData() {
+        final GeometryFactory geometryFactory = new GeometryFactory();
+        //加载站点路由
+        String sql = "select r.LINE_CODE,r.DIRECTIONS,r.STATION_CODE,r.STATION_MARK,s.SHAPES_TYPE,s.G_LONX,s.G_LATY,ST_AsText(s.G_POLYGON_GRID) as G_POLYGON_GRID,s.RADIUS, r.STATION_ROUTE_CODE from bsth_c_stationroute r left join bsth_c_station s on r.station=s.id where r.destroy=0 order by r.station_route_code";
+        List<StationRoute> routeList = jdbcTemplate.query(sql, new RowMapper<StationRoute>() {
+            @Override
+            public StationRoute mapRow(ResultSet rs, int rowNum) throws SQLException {
+                StationRoute sRoute = new StationRoute();
+                sRoute.setCode(rs.getString("STATION_CODE"));
+                sRoute.setLineCode(rs.getString("LINE_CODE"));
+                sRoute.setDirections(rs.getInt("DIRECTIONS"));
+                sRoute.setPoint(geometryFactory.createPoint(new Coordinate(rs.getFloat("G_LATY"), rs.getFloat("G_LONX"))));
+                sRoute.setRadius(rs.getFloat("RADIUS"));
+                sRoute.setRouteSort(rs.getInt("STATION_ROUTE_CODE"));
+                sRoute.setMark(rs.getString("STATION_MARK"));
+
+                String shapesType = rs.getString("SHAPES_TYPE");
+                //多边形电子围栏
+                if (StringUtils.isNotEmpty(shapesType) && shapesType.equals("d")) {
+                    geometryFactory.createPolygon(parsePolygon(rs.getString("G_POLYGON_GRID")));
+                }
+                return sRoute;
+            }
+        });
+        //按线路和走向分组
+        if (routeList.size() > 0) {
+            ArrayListMultimap<String, StationRoute> tempMap = ArrayListMultimap.create();
+            for (StationRoute sr : routeList) {
+                tempMap.put(sr.getLineCode() + "_" + sr.getDirections(), sr);
+            }
+
+            StationRouteComp srCom = new StationRouteComp();
+            //连接路由
+            Set<String> set = tempMap.keySet();
+            for (String key : set) {
+                Collections.sort(tempMap.get(key), srCom);
+                connectStationRoute(tempMap.get(key));
+            }
+
+            stationCacheMap = tempMap;
+        }
+
+        //加载停车场数据
+        sql = "select PARK_CODE, ST_AsText(G_PARK_POINT) as G_PARK_POINT from bsth_c_car_park where park_code is not null and b_park_point is not null";
+        List<Map<String, Object>> tccList = jdbcTemplate.queryForList(sql);
+        Map<String, Polygon> tccTempMap = new HashMap<>();
+
+        Polygon polygon;
+        for (Map<String, Object> tMap : tccList) {
+
+            try {
+                polygon = geometryFactory.createPolygon(parsePolygon(tMap.get("G_PARK_POINT").toString()));
+                tccTempMap.put(tMap.get("PARK_CODE").toString()
+                        , polygon);
+            } catch (Exception e) {
+                logger.error("停车场：" + tMap.get("PARK_CODE") , e);
+            }
+        }
+
+        if(tccTempMap.size() > 0)
+            tccMap = tccTempMap;
+    }
+
+    private void connectStationRoute(List<StationRoute> list) {
+        int size = list.size();
+        StationRoute sr = null;
+        for (int i = 0; i < size; i++) {
+            sr = list.get(i);
+            //上一个
+            if (i > 0)
+                sr.setPrve(list.get(i - 1));
+            //下一个
+            if (i < size - 1)
+                sr.setNext(list.get(i + 1));
+        }
+    }
+
+    public Coordinate[] parsePolygon(String polygonStr) {
+        String[] coords = polygonStr.substring(9, polygonStr.length() - 2).split(","), temps;
+
+        Coordinate[] cds = new Coordinate[coords.length];
+        int len = coords.length;
+        for (int i = 0; i < len; i++) {
+            temps = coords[i].split(" ");
+            cds[i] = new Coordinate(Float.parseFloat(temps[1]), Float.parseFloat(temps[0]));
+        }
+        return cds;
+    }
+
+}
 \ No newline at end of file
+package com.bsth.data.gpsdata.analyse;
+
+import com.bsth.data.gpsdata.GpsEntity;
+import com.bsth.data.gpsdata.analyse.components.GpsArrival;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+/**
+ * 分析gps状态信息
+ * Created by panzhao on 2016/12/23.
+ */
+public class GpsAnalyse {
+
+    static Logger logger = LoggerFactory.getLogger(GpsAnalyse.class);
+
+    //线程池
+    static ExecutorService threadPool = Executors.newFixedThreadPool(50);
+
+    public static void start(GpsEntity gps) {
+        threadPool.execute(new ArrivalMatchThread(gps));
+    }
+
+    public static class ArrivalMatchThread implements Runnable {
+
+        private GpsEntity gps;
+
+        public ArrivalMatchThread(GpsEntity gps) {
+            this.gps = gps;
+        }
+
+        @Override
+        public void run() {
+            GpsArrival.arrival(gps);
+        }
+    }
+}
 \ No newline at end of file
+package com.bsth.data.gpsdata.analyse;
+
+import com.vividsolutions.jts.geom.Point;
+import com.vividsolutions.jts.geom.Polygon;
+
+/**
+ * Created by panzhao on 2016/12/23.
+ */
+public class StationRoute {
+
+    /**
+     * 线路编码
+     */
+    private String lineCode;
+
+    /**
+     * 上下行
+     */
+    private int directions;
+
+    /**
+     * 站点编码
+     */
+    private String code;
+
+    /**
+     * 路由顺序
+     */
+    private int routeSort;
+
+    /**
+     * 站点位置
+     */
+    private Point point;
+
+    /**
+     * 圆形半径
+     */
+    private Float radius;
+
+    /**
+     * 多边形电子围栏
+     */
+    private Polygon polygon;
+
+    /**
+     * 站点标记
+     */
+    private String mark;
+
+    /**
+     * 下一站
+     */
+    private StationRoute next;
+
+    /**
+     * 上一站
+     */
+    private StationRoute prve;
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public int getRouteSort() {
+        return routeSort;
+    }
+
+    public void setRouteSort(int routeSort) {
+        this.routeSort = routeSort;
+    }
+
+    public Point getPoint() {
+        return point;
+    }
+
+    public void setPoint(Point point) {
+        this.point = point;
+    }
+
+    public Float getRadius() {
+        return radius;
+    }
+
+    public void setRadius(Float radius) {
+        this.radius = radius;
+    }
+
+    public Polygon getPolygon() {
+        return polygon;
+    }
+
+    public void setPolygon(Polygon polygon) {
+        this.polygon = polygon;
+    }
+
+    public String getLineCode() {
+        return lineCode;
+    }
+
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
+    }
+
+    public int getDirections() {
+        return directions;
+    }
+
+    public void setDirections(int directions) {
+        this.directions = directions;
+    }
+
+    public StationRoute getNext() {
+        return next;
+    }
+
+    public void setNext(StationRoute next) {
+        this.next = next;
+    }
+
+    public StationRoute getPrve() {
+        return prve;
+    }
+
+    public void setPrve(StationRoute prve) {
+        this.prve = prve;
+    }
+
+    public String getMark() {
+        return mark;
+    }
+
+    public void setMark(String mark) {
+        this.mark = mark;
+    }
+}
+
+package com.bsth.data.gpsdata.analyse;
+
+import java.util.Comparator;
+
+/**
+ * Created by panzhao on 2016/12/24.
+ */
+public class StationRouteComp implements Comparator<StationRoute>{
+    @Override
+    public int compare(StationRoute s1, StationRoute s2) {
+        return s1.getRouteSort() - s2.getRouteSort();
+    }
+}
+package com.bsth.data.gpsdata.analyse.components;
+
+import com.bsth.data.LineConfigData;
+import com.bsth.data.gpsdata.GpsEntity;
+import com.bsth.data.gpsdata.analyse.CircleQueue;
+import com.bsth.data.gpsdata.analyse.GeoCacheData;
+import com.bsth.data.gpsdata.analyse.StationRoute;
+import com.bsth.data.gpsdata.analyse.util.GeoUtils;
+import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.entity.realcontrol.LineConfig;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * gps 到离站判断
+ * Created by panzhao on 2016/12/24.
+ */
+@Component
+public class GpsArrival implements ApplicationContextAware {
+
+    static Logger logger = LoggerFactory.getLogger(GpsArrival.class);
+
+    static DayOfSchedule dayOfSchedule;
+
+    static LineConfigData lineConfigData;
+
+    public static void arrival(GpsEntity gps) {
+
+        if (gps.getLat() == 0 || gps.getLon() == 0) {
+            //logger.error("无效的gps");
+            return;
+        }
+
+        Object task = DayOfSchedule.executeCurr(gps.getNbbm());
+        if (task == null)
+            return;
+        if (task.getClass().isAssignableFrom(ScheduleRealInfo.class)) {
+            ScheduleRealInfo sch = (ScheduleRealInfo) task;
+            //和班次同步走向
+            gps.setUpDown(Integer.parseInt(sch.getXlDir()));
+
+            //出场
+            if (sch.getBcType().equals("out")) {
+                outCarpark(gps, sch);
+            }
+            else if (sch.getBcType().equals("normal"))
+                normalInOut(gps, sch);
+            else if(sch.getBcType().equals("in")){
+                inCarpark(gps, sch);
+            }
+        }
+
+        GeoCacheData.putGps(gps);
+    }
+
+    /**
+     * 正常班次
+     *
+     * @param gps
+     * @param sch
+     */
+    private static void normalInOut(GpsEntity gps, ScheduleRealInfo sch) {
+        CircleQueue<GpsEntity> queue = GeoCacheData.getGps(gps.getNbbm());
+        GpsEntity prev = null;
+        if (queue != null)
+            prev = queue.getTail();
+
+        List<StationRoute> srs = GeoCacheData.getStationRoute(sch.getXlBm(), gps.getUpDown());
+        StationRoute station = GeoUtils.gpsInStation(gps, srs);
+
+        if (station != null) {
+            //站内
+            gps.setStopNo(station.getCode());
+            gps.setInstation(true);
+            stationInside(gps, prev, sch);
+        } else {
+            //站外
+            stationOutside(gps, prev, sch);
+        }
+    }
+
+    /**
+     * GPS在站点内
+     *
+     * @param gps
+     * @param prev
+     * @param sch
+     */
+    private static void stationInside(GpsEntity gps, GpsEntity prev, ScheduleRealInfo sch) {
+        if(prev == null)
+            return;
+
+        if (gps.getStopNo().equals(sch.getZdzCode()) && sch.getZdsjActual() == null) {
+            //到终点站
+            arriveEnd(sch, gps);
+            return;
+        }
+
+        //上一个点在站外
+        if(!prev.isInstation())
+            return;
+        //超过 （待发时间 + 90%的单程运送时间），还在起点站。默认烂一圈
+        if (prev.getStopNo().equals(gps.getStopNo())){
+            if(gps.getStopNo().equals(sch.getQdzCode())
+                    && gps.getTimestamp() > sch.getDfsjT() + (sch.getBcsj() * 60 * 1000 * 0.9)){
+
+                ScheduleRealInfo next = dayOfSchedule.next(dayOfSchedule.next(sch));
+                dayOfSchedule.addExecPlan(next);
+            }
+            return;
+        }
+
+        //发车
+        if (prev.getStopNo().equals(sch.getQdzCode())) {
+            busWillDepart(sch, gps);
+            return;
+        }
+
+        //中途站
+        StationRoute prevStation = GeoCacheData.getStation(prev.getLineId(), prev.getUpDown(), prev.getStopNo());
+        StationRoute currStation = GeoCacheData.getStation(gps.getLineId(), gps.getUpDown(), gps.getStopNo());
+        if (currStation.getRouteSort() < prevStation.getRouteSort()) {
+            //开始下一个班次
+            finishPlan(sch);
+
+            logger.info("路由反向。。。。。。:" + gps.getTimestamp());
+            //为班次补上实际时间
+
+        }
+    }
+
+    /**
+     * GPS在站点外
+     *
+     * @param gps
+     * @param prev
+     * @param sch
+     */
+    private static void stationOutside(GpsEntity gps, GpsEntity prev, ScheduleRealInfo sch) {
+        if(prev == null)
+            return;
+
+        gps.setStopNo(prev.getStopNo());
+        if (prev.isInstation() && prev.getStopNo().equals(sch.getQdzCode())) {
+            //发车
+            busWillDepart(sch, gps);
+            return;
+        }
+    }
+
+    /**
+     * 公交车起点发出
+     */
+    final static long DRIFT_VAL_TIME = 1000 * 60 * 10;
+    //班次最大差值1小时
+    final static long MAX_DIFF = 1000 * 60 * 60;
+    private static void busWillDepart(ScheduleRealInfo sch, GpsEntity gps) {
+        //实发时间不覆盖
+        if (sch.getFcsjActual() == null && Math.abs(gps.getTimestamp() - sch.getDfsjT()) < MAX_DIFF) {
+
+            //提前10分钟以上发出，判断一下是否是漂移
+            if(sch.getDfsjT() - gps.getTimestamp() > DRIFT_VAL_TIME){
+                ScheduleRealInfo schPrev = dayOfSchedule.prev(sch);
+                if(schPrev != null && schPrev.getZdsjActual() != null){
+                    //计划停站时间
+                    long stopTimeJH = sch.getDfsjT() - schPrev.getZdsjT();
+                    //实际停站时间
+                    long actualStopTime = gps.getTimestamp() - schPrev.getZdsjActualTime();
+                    /*
+                        没停够计划百分之60的，算漂移
+                        （这里出现的误判，由程序在车辆到中途站的时候进行补偿）
+                     */
+                    if(stopTimeJH * 0.6 < actualStopTime){
+                        logger.info("漂移.... 车辆：" + gps.getNbbm() + " ts: " + gps.getTimestamp());
+                        return;
+                    }
+                }
+            }
+
+            LineConfig config = lineConfigData.get(sch.getXlBm());
+            if(config != null && config.getOutConfig() == 2){
+                //出站既出场
+                ScheduleRealInfo schPrev = dayOfSchedule.prev(sch);
+                if(schPrev.getBcType().equals("out")){
+                    schPrev.setFcsjActualAll(schPrev.getDfsjT());
+                    schPrev.setZdsjActualAll(schPrev.getZdsjT());
+                }
+            }
+
+            sch.setFcsjActualAll(gps.getTimestamp());
+            logger.info("（站外）班次：" + sch.getDfsj() + "发车， 时间：" + sch.getFcsjActual());
+        }
+    }
+
+    /**
+     * 公交车到达终点
+     *
+     * @param sch
+     * @param gps
+     */
+    private static void arriveEnd(ScheduleRealInfo sch, GpsEntity gps) {
+        sch.setZdsjActualAll(gps.getTimestamp());
+        ScheduleRealInfo next = finishPlan(sch);
+        logger.info("班次：" + sch.getDfsj() + "到达终点， 时间：" + sch.getZdsjActual());
+
+        if (next == null)
+            return;
+
+        //将gps转换为下一个班次走向的站内信号
+        int updown = Integer.parseInt(next.getXlDir());
+        List<StationRoute> srs = GeoCacheData.getStationRoute(next.getXlBm(), updown);
+        StationRoute station = GeoUtils.gpsInStation(gps, srs);
+        if (station != null) {
+            gps.setUpDown(updown);
+            gps.setStopNo(station.getCode());
+        }
+    }
+
+    /**
+     * 出场班次
+     *
+     * @param gps
+     * @param sch
+     */
+    private static void outCarpark(GpsEntity gps, ScheduleRealInfo sch) {
+        String carpark = GeoUtils.gpsInCarpark(gps);
+        if (carpark != null) {
+            gps.setInstation(true);
+            gps.setStopNo(carpark);
+            return; // 还在场内
+        }
+
+        CircleQueue<GpsEntity> queue = GeoCacheData.getGps(gps.getNbbm());
+        if (queue == null)
+            return;
+        //上一个gps
+        GpsEntity prev = queue.getTail();
+
+        if (carpark == null && prev.isInstation() && prev.getStopNo().equals(sch.getQdzCode())) {
+            gps.setStopNo(prev.getStopNo());
+            //停车场发出
+            busWillDepart(sch, gps);
+            return;
+        }
+
+        List<StationRoute> srs = GeoCacheData.getStationRoute(sch.getXlBm(), gps.getUpDown());
+        StationRoute station = GeoUtils.gpsInStation(gps, srs);
+
+        if (station != null && station.getCode().equals(sch.getZdzCode())) {
+            gps.setStopNo(station.getCode());
+            //到达终点
+            arriveEnd(sch, gps);
+        }
+    }
+
+
+    /**
+     * 进场班次
+     * @param gps
+     * @param sch
+     */
+    private static void inCarpark(GpsEntity gps, ScheduleRealInfo sch) {
+        String carpark = GeoUtils.gpsInCarpark(gps);
+        if (carpark != null && carpark.equals(sch.getZdzCode())) {
+            //进场班次取第一个实际进场时间
+            if(sch.getZdsjActual() != null)
+                return;
+
+            //进场
+            arriveEnd(sch, gps);
+            return;
+        }
+
+        CircleQueue<GpsEntity> queue = GeoCacheData.getGps(gps.getNbbm());
+        if (queue == null)
+            return;
+        //上一个gps
+        GpsEntity prev = queue.getTail();
+
+        if (carpark == null && prev.isInstation() && prev.getStopNo().equals(sch.getQdzCode())) {
+            gps.setStopNo(prev.getStopNo());
+            //进场班次发出
+            busWillDepart(sch, gps);
+            return;
+        }
+    }
+
+    /**
+     * 完成班次 -返回下一个班次
+     *
+     * @param sch
+     */
+    private static ScheduleRealInfo finishPlan(ScheduleRealInfo sch) {
+        ScheduleRealInfo next = dayOfSchedule.next(sch);
+        if (next != null) {
+            next.setQdzArrDatesj(sch.getZdsjActual());
+            dayOfSchedule.addExecPlan(next);
+        }
+        return next;
+    }
+
+    @Override
+    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+        dayOfSchedule = applicationContext.getBean(DayOfSchedule.class);
+        lineConfigData = applicationContext.getBean(LineConfigData.class);
+    }
+}
+package com.bsth.data.gpsdata.analyse.components;
+
+import com.bsth.data.gpsdata.GpsEntity;
+import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.vividsolutions.jts.geom.GeometryFactory;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.stereotype.Component;
+
+/**
+ * GPS状态纠正
+ * Created by panzhao on 2016/12/23.
+ */
+@Component
+public class GpsStateCorrective implements ApplicationContextAware {
+
+    static Logger logger = LoggerFactory.getLogger(GpsStateCorrective.class);
+
+    static DayOfSchedule dayOfSchedule;
+
+    private static GeometryFactory geometryFactory = new GeometryFactory();
+
+    public static void correct(GpsEntity gps, ScheduleRealInfo sch){
+/*        int upDown = Integer.parseInt(sch.getXlDir());
+        gps.setUpDown(upDown);
+        List<StationRoute> srs = GeoCacheData.getStationRoute(sch.getXlBm(), upDown);
+
+        Point point = geometryFactory.createPoint(new Coordinate(gps.getLat(), gps.getLon()));
+
+        //之前的点位
+        CircleQueue<GpsEntity> queue = GeoCacheData.getGps(gps.getNbbm());
+        GpsEntity prev = null;
+        if(queue != null)
+            prev = queue.getTail();
+
+        //线路上，站点间
+        StationRoute station = GeoUtils.pointInStation(point, srs);
+        //在站内
+        if(station != null){
+            gps.setStopNo(station.getCode());
+            gps.setInstation(true);
+            gps.setStation(station);
+
+            if(prev != null && prev.getUpDown() == upDown){
+                StationRoute prevStation = GeoCacheData.getStation(prev.getLineId(), upDown, prev.getStopNo());
+
+                //倒着开？？
+                if(prevStation.getRouteSort() > station.getRouteSort()){
+                    reversalHandle(gps, prev, sch);
+                }
+            }
+        }
+        else{
+            if(prev != null)
+                gps.setStopNo(prev.getStopNo());
+        }
+
+        //是否在停车场内
+        Map<String, Polygon> carparkMap = GeoCacheData.tccMap;
+        Set<String> codes = carparkMap.keySet();
+        Polygon p;
+        for(String code : codes){
+            p = carparkMap.get(code);
+            //场内
+            if(p.contains(point)){
+                gps.setCarparkNo(code);
+                if(sch.getBcType().equals("out")){
+                    gps.setInstation(true);
+                    gps.setStopNo(code);
+                }
+            }
+        }*/
+    }
+
+    private static DateTimeFormatter fmt = DateTimeFormat.forPattern("HH:mm");
+
+    private static void reversalHandle(GpsEntity gps, GpsEntity prev, ScheduleRealInfo sch){
+        /*if(sch.getBcType().equals("out") && gps.getTimestamp() < sch.getZdsjT())
+            return;
+
+        //先假设没到终点，直接开始了下一个班次
+        ScheduleRealInfo next = dayOfSchedule.next(sch);
+        String log = "倒着开？？？ nbbm: " + gps.getNbbm() + " 当前：" + gps.getStopNo() + " 上一站：" + prev.getStopNo() + " 当前班次：" + sch.getDfsj();
+        if(next != null){
+            dayOfSchedule.addExecPlan(next);
+
+            log += (" 下一个班次：" + next.getDfsj());
+        }
+
+        log += (" GPS时间：" + fmt.print(gps.getTimestamp()));
+
+        logger.info(log);*/
+    }
+
+    @Override
+    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+        dayOfSchedule = applicationContext.getBean(DayOfSchedule.class);
+    }
+}
+package com.bsth.data.gpsdata.analyse.util;
+
+import com.bsth.data.gpsdata.GpsEntity;
+import com.bsth.data.gpsdata.analyse.GeoCacheData;
+import com.bsth.data.gpsdata.analyse.StationRoute;
+import com.vividsolutions.jts.geom.Coordinate;
+import com.vividsolutions.jts.geom.GeometryFactory;
+import com.vividsolutions.jts.geom.Point;
+import com.vividsolutions.jts.geom.Polygon;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Created by panzhao on 2016/12/23.
+ */
+public class GeoUtils {
+
+    private final static double EARTHRADIUS = 6378137;
+
+    private static GeometryFactory geometryFactory = new GeometryFactory();
+    /**
+     * gps是否在路由上的某个站内
+     *
+     * @param gps
+     * @param srs
+     * @return
+     */
+    public static StationRoute gpsInStation(GpsEntity gps, List<StationRoute> srs) {
+        Point point = geometryFactory.createPoint(new Coordinate(gps.getLat(), gps.getLon()));
+        double min = -1, distance, distance2;
+        StationRoute stationRoute = null;
+
+        for (StationRoute sr : srs) {
+            if (sr.getPolygon() == null) {
+                //圆形
+                distance = getDistance(sr.getPoint(), point);//sr.getPoint().distance(point);
+
+                if (distance > sr.getRadius())
+                    continue;
+
+                if (min > distance || min == -1) {
+                    min = distance;
+                    stationRoute = sr;
+                }
+            } else {
+                //多边形
+                if (sr.getPolygon().contains(point)) {
+                    stationRoute = sr;
+                    break;
+                }
+            }
+        }
+        return stationRoute;
+    }
+
+    public static double getDistance(Point p1, Point p2) {
+        double lng1 = getLoop(p1.getY(), -180, 180), lat1 = getRange(
+                p1.getX(), -74, 74);
+        double lng2 = getLoop(p2.getY(), -180, 180), lat2 = getRange(
+                p2.getX(), -74, 74);
+
+        double x1, x2, y1, y2;
+        x1 = degreeToRad(lng1);
+        y1 = degreeToRad(lat1);
+        x2 = degreeToRad(lng2);
+        y2 = degreeToRad(lat2);
+        return EARTHRADIUS
+                * Math.acos((Math.sin(y1) * Math.sin(y2) + Math.cos(y1)
+                * Math.cos(y2) * Math.cos(x2 - x1)));
+    }
+
+    private static double getLoop(double v, double a, double b) {
+        while (v > b) {
+            v -= b - a;
+        }
+        while (v < a) {
+            v += b - a;
+        }
+        return v;
+    }
+
+    private static double getRange(double v, double a, double b) {
+        v = Math.min(Math.max(v, a), b);
+        return v;
+    }
+
+    private static double degreeToRad(double degree) {
+        return Math.PI * degree / 180;
+    }
+
+
+    /**
+     * gps 是否在某个停车场内
+     * @param gps
+     * @return
+     */
+    public static String gpsInCarpark(GpsEntity gps){
+        Point point = geometryFactory.createPoint(new Coordinate(gps.getLat(), gps.getLon()));
+
+        Map<String, Polygon> carparkMap = GeoCacheData.tccMap;
+        Set<String> codes = carparkMap.keySet();
+        Polygon polygon;
+        for(String code : codes){
+            polygon = carparkMap.get(code);
+            if(point.within(polygon)){
+                return code;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * 是否是有效的连续点
+     * @param prevGps
+     * @param gps
+     * @return
+     */
+    public static boolean overdue(GpsEntity prevGps, GpsEntity gps) {
+        return gps.getTimestamp() - prevGps.getTimestamp() < 120000;
+    }
+}
+package com.bsth.data.gpsdata.recovery;
+
+import com.bsth.data.BasicData;
+import com.bsth.data.gpsdata.GpsEntity;
+import com.bsth.data.gpsdata.analyse.components.GpsArrival;
+import com.bsth.util.db.DBUtils_MS;
+import com.google.common.collect.ArrayListMultimap;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.RowMapper;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.*;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+/**
+ * 数据恢复
+ * Created by panzhao on 2016/12/24.
+ */
+public class GpsDataRecovery {
+
+    static Logger logger = LoggerFactory.getLogger(GpsDataRecovery.class);
+
+    public static boolean run;
+
+    static ExecutorService threadPool = Executors.newFixedThreadPool(50);
+
+    private static CountDownLatch count;
+
+    public static void recovery() {
+        List<GpsEntity> list = loadData();
+
+        //按车辆分组数据
+        ArrayListMultimap<String, GpsEntity> listMap = ArrayListMultimap.create();
+        for (GpsEntity gps : list) {
+            if(gps.getNbbm() != null)
+                listMap.put(gps.getNbbm(), gps);
+        }
+
+        count = new CountDownLatch(listMap.keySet().size());
+
+        Set<String> keys = listMap.keySet();
+        for (String nbbm : keys) {
+            threadPool.execute(new RecoveryDataThread(listMap.get(nbbm), count));
+            /*if(nbbm.equals("W9A-250"))
+                new RecoveryDataThread(listMap.get(nbbm), count).run();*/
+        }
+        try {
+            //等待子线程结束
+            count.await();
+            logger.info("GPS 数据恢复完成....");
+        } catch (InterruptedException e) {
+            logger.error("", e);
+        }
+    }
+
+    /**
+     * 加载当天的gps数据
+     *
+     * @return
+     */
+    public static List<GpsEntity> loadData() {
+        Calendar calendar = Calendar.getInstance();
+        int dayOfYear = calendar.get(Calendar.DAY_OF_YEAR);
+
+        String sql = "select DEVICE_ID,LAT,LON,TS,SPEED_GPS,LINE_ID,SERVICE_STATE from BSTH_C_GPS_INFO where days_year=" + dayOfYear;
+        JdbcTemplate jdbcTemplate = new JdbcTemplate(DBUtils_MS.getDataSource());
+
+        List<GpsEntity> list =
+                jdbcTemplate.query(sql, new RowMapper<GpsEntity>() {
+                    @Override
+                    public GpsEntity mapRow(ResultSet rs, int rowNum) throws SQLException {
+                        GpsEntity gps = new GpsEntity();
+
+                        gps.setDeviceId(rs.getString("DEVICE_ID"));
+                        gps.setNbbm(BasicData.deviceId2NbbmMap.get(gps.getDeviceId()));
+                        gps.setSpeed(rs.getFloat("SPEED_GPS"));
+                        gps.setLat(rs.getFloat("LAT"));
+                        gps.setLon(rs.getFloat("LON"));
+                        gps.setLineId(rs.getString("LINE_ID"));
+                        gps.setTimestamp(rs.getLong("TS"));
+                        gps.setUpDown(getUpOrDown(rs.getLong("SERVICE_STATE")));
+                        return gps;
+                    }
+                });
+        return list;
+    }
+
+    /**
+     * 王通 2016/6/29 9:23:24 获取车辆线路上下行
+     *
+     * @return -1无效 0上行 1下行
+     */
+    public static int getUpOrDown(long serviceState) {
+        if ((serviceState & 0x00020000) == 0x00020000 || (serviceState & 0x80000000) == 0x80000000
+                || (serviceState & 0x01000000) == 0x01000000 || (serviceState & 0x08000000) == 0x08000000)
+            return -1;
+        return (((serviceState & 0x10000000) == 0x10000000) ? 1 : 0);
+    }
+
+    public static class RecoveryDataThread implements Runnable {
+
+        List<GpsEntity> list;
+        CountDownLatch count;
+
+        public RecoveryDataThread(List<GpsEntity> list, CountDownLatch count) {
+            this.list = list;
+            this.count = count;
+        }
+
+        @Override
+        public void run() {
+            try {
+                //排序
+                Collections.sort(list, new GpsComp());
+                //依次跑完gps
+                //int i = 0;
+                for(GpsEntity gps : list){
+                   /* i++;
+                    if(i == 383){
+                        System.out.println("aaa");
+                    }*/
+                    GpsArrival.arrival(gps);
+                }
+            } catch (Exception e) {
+                logger.error("", e);
+            } finally {
+                count.countDown();
+            }
+        }
+    }
+
+    public static class GpsComp implements Comparator<GpsEntity>{
+
+        @Override
+        public int compare(GpsEntity g1, GpsEntity g2) {
+            return (int) (g1.getTimestamp() - g2.getTimestamp());
+        }
+    }
+}
@@ -3,9 +3,11 @@ package com.bsth.data.schedule;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.bsth.Application;
+import com.bsth.data.BasicData;
 import com.bsth.data.LineConfigData;
 import com.bsth.data.directive.FirstScheduleCheckThread;
 import com.bsth.data.gpsdata.GpsRealData;
+import com.bsth.data.gpsdata.recovery.GpsDataRecovery;
 import com.bsth.data.schedule.thread.ScheduleLateThread;
 import com.bsth.data.schedule.thread.SchedulePstThread;
 import com.bsth.data.schedule.thread.ScheduleRefreshThread;
@@ -111,19 +113,30 @@ public class DayOfSchedule implements CommandLineRunner {
 	@Autowired
 	SubmitToTrafficManage submitToTrafficManage;
  
+	@Autowired
+	LineConfigData lineConfigs;
+
+	@Autowired
+	BasicData.BasicDataLoader dataLoader;
+
 	private static DateTimeFormatter fmtyyyyMMdd = DateTimeFormat.forPattern("yyyy-MM-dd")
 				,fmtHHmm = DateTimeFormat.forPattern("HH:mm");
  
 	@Override
 	public void run(String... arg0) throws Exception {
+		//加载基础数据
+		dataLoader.loadAllData();
+		//从数据库恢复排班
+		//dataRecovery();
+
 		//翻班线程
 		Application.mainServices.scheduleWithFixedDelay(scheduleRefreshThread, 15, 240, TimeUnit.SECONDS);
 		//入库
-//		Application.mainServices.scheduleWithFixedDelay(schedulePstThread, 60, 60, TimeUnit.SECONDS);
+		Application.mainServices.scheduleWithFixedDelay(schedulePstThread, 60, 60, TimeUnit.SECONDS);
 		//首班出场指令补发器
 //		Application.mainServices.scheduleWithFixedDelay(firstScheduleCheckThread, 30, 240, TimeUnit.SECONDS);
 		//班次误点扫描
-//		Application.mainServices.scheduleWithFixedDelay(scheduleLateThread, 60, 60, TimeUnit.SECONDS);
+		Application.mainServices.scheduleWithFixedDelay(scheduleLateThread, 60, 60, TimeUnit.SECONDS);
  
 		//每天凌晨2点20提交数据到运管处
 		long diff = (DateUtils.getTimestamp() + 1000*60*140) - System.currentTimeMillis();
@@ -134,6 +147,23 @@ public class DayOfSchedule implements CommandLineRunner {
 		//Application.mainServices.scheduleWithFixedDelay(submitToTrafficManage, diff / 1000, 60 * 60 * 24, TimeUnit.SECONDS);
 	}
  
+	//数据恢复
+	private void dataRecovery() {
+		GpsDataRecovery.run = true;
+
+		Collection<LineConfig> confs = lineConfigs.getAll();
+		String lineCode, currSchDate;
+		for(LineConfig conf : confs){
+			lineCode = conf.getLine().getLineCode();
+			currSchDate = calcSchDate(lineCode);
+			//加载班次数据
+			reloadSch(lineCode, currSchDate, false);
+		}
+
+		//恢复gps数据
+		GpsDataRecovery.recovery();
+	}
+
 	public Map<String, String> getCurrSchDate() {
 		return currSchDateMap;
 	}
@@ -189,17 +219,20 @@ public class DayOfSchedule implements CommandLineRunner {
 			putAll(list);
  
 			Set<String> cars = searchAllCars(list);
-			//计算“起点站应到”时间
-			for(String nbbm : cars)
+			for(String nbbm : cars){
+				//计算“起点站应到”时间
 				schAttrCalculator.calcQdzTimePlan(nbbmScheduleMap.get(nbbm));
-			
+				//车辆 ——> 要执行的班次对照
+				carExecutePlanMap.put(nbbm, schAttrCalculator.calcCurrentExecSch(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) {
@@ -451,6 +484,10 @@ public class DayOfSchedule implements CommandLineRunner {
 	public ScheduleRealInfo next(ScheduleRealInfo sch) {
  
 		List<ScheduleRealInfo> list = nbbmScheduleMap.get(sch.getClZbh());
+		int outConfig = -1;
+		LineConfig config = lineConfigData.get(sch.getXlBm());
+		if(config != null)
+			outConfig = config.getOutConfig();
  
 		boolean flag = false;
 		ScheduleRealInfo next = null;
@@ -462,6 +499,10 @@ public class DayOfSchedule implements CommandLineRunner {
 			//忽略烂班
 			if(temp.isDestroy())
 				continue;
+
+			//出站既出场，忽略出场班次
+			if(outConfig == 2 && temp.getBcType().equals("out"))
+				continue;
  
 			if(flag){
 				next = temp;
@@ -471,6 +512,30 @@ public class DayOfSchedule implements CommandLineRunner {
 		return next;
 	}
  
+	/**
+	 * 上一个班次
+	 * @param sch
+	 * @return
+	 */
+	public ScheduleRealInfo prev(ScheduleRealInfo sch){
+		List<ScheduleRealInfo> list = nbbmScheduleMap.get(sch.getClZbh());
+
+		//boolean flag = false;
+		ScheduleRealInfo prev = null;
+		int size = list.size();
+
+		for(int i = 0; i < size; i ++){
+			if(list.get(i).isDestroy())
+				continue;
+
+			if(list.get(i).getId().equals(sch.getId())){
+				return prev;
+			}
+			prev = list.get(i);
+		}
+		return prev;
+	}
+
 	public void put(ScheduleRealInfo sch) {
 		schAttrCalculator
 			.calcRealDate(sch)
@@ -666,9 +731,18 @@ public class DayOfSchedule implements CommandLineRunner {
 		carExecutePlanMap.remove(clzbh);
 	}
  
-	public Map<String, ScheduleRealInfo> execPlamMap(){
+	public Map<String, ScheduleRealInfo> execPlanMap(){
 		return carExecutePlanMap;
 	}
+
+	/**
+	 * 车辆当前执行的班次
+	 * @param nbbm
+	 * @return
+	 */
+	public static ScheduleRealInfo executeCurr(String nbbm){
+		return carExecutePlanMap.get(nbbm);
+	}
  
 	/**
 	 * @Title: changeCar 
@@ -215,4 +215,30 @@ public class SchAttrCalculator {
 		if(sch.getZdsjActualTime() == null && sch.getZdsjActual() != null)
 			sch.setZdsjActualAll(sch.getZdsjActual());
 	}
+
+	/**
+	 * 计算当前要执行的班次
+	 * @param list
+	 * @return
+	 */
+	public ScheduleRealInfo calcCurrentExecSch(List<ScheduleRealInfo> list){
+		String lineCode = list.get(0).getXlBm();
+		LineConfig conf = lineConfigData.get(lineCode);
+		int outConfig = -1;
+		if(conf != null)
+			outConfig = conf.getOutConfig();
+
+		for(ScheduleRealInfo sch : list){
+			//如果是出站既出场，忽略出场班次
+			if(outConfig == 2 && sch.getBcType().equals("out"))
+				continue;
+
+			//已执行
+			if(StringUtils.isNotEmpty(sch.getZdsjActual()))
+				continue;
+
+			return sch;
+		}
+		return null;
+	}
 }
 package com.bsth.data.schedule.thread;
  
-import java.util.Collection;
-import java.util.Set;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
 import com.bsth.data.BasicData;
 import com.bsth.data.LineConfigData;
 import com.bsth.data.arrival.ArrivalData_GPS;
@@ -15,6 +7,13 @@ import com.bsth.data.directive.DayOfDirectives;
 import com.bsth.data.pilot80.PilotReport;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.entity.realcontrol.LineConfig;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Collection;
+import java.util.Set;
  
 /**
  * 
@@ -57,6 +56,7 @@ public class ScheduleRefreshThread extends Thread{
 				currSchDate = dayOfSchedule.calcSchDate(lineCode);
  
 				if(oldSchDate == null || !oldSchDate.equals(currSchDate)){
+
 					logger.info(lineCode + "开始翻班， " + currSchDate);
 					//清除进出站数据
 					arrivalData.clearRAMData(lineCode);
 package com.bsth.entity.mcy_forms;
  
-import java.util.Date;
-
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 package com.bsth.entity.realcontrol;
  
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-import javax.persistence.NamedAttributeNode;
-import javax.persistence.NamedEntityGraph;
-import javax.persistence.NamedEntityGraphs;
-import javax.persistence.Table;
-
 import com.fasterxml.jackson.annotation.JsonIgnore;
  
+import javax.persistence.*;
+import java.util.Date;
+
  
 /**
  * 
@@ -95,6 +88,10 @@ public class ChildTaskPlan {
 	 */
 	private String destroyReason;
  
+	/** 创建日期 */
+	@Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
+	private Date createDate;
+
 	/**
 	 * 主排班计划
 	 */
@@ -233,4 +230,12 @@ public class ChildTaskPlan {
 	public boolean equals(Object obj) {
 		return this.id.equals(((ChildTaskPlan)obj).getId());
 	}
+
+	public Date getCreateDate() {
+		return createDate;
+	}
+
+	public void setCreateDate(Date createDate) {
+		this.createDate = createDate;
+	}
 }
+package com.bsth.entity.realcontrol;
+
+/**
+ * 班次类型
+ * Created by panzhao on 2016/12/23.
+ */
+public enum ScheduleType {
+
+    normal, //正常班次
+    out,    //出场
+    in,     //进场
+    region, //区间
+    venting,//直放
+    major   //放站
+}
 package com.bsth.entity.schedule;
  
 import com.bsth.entity.Line;
-import com.bsth.entity.sys.SysUser;
  
 import javax.persistence.*;
 import java.util.Date;
@@ -18,7 +17,7 @@ import java.util.Date;
                 @NamedAttributeNode("updateBy")
         })
 })
-public class TTInfo {
+public class TTInfo extends BEntity {
  
     /** 主键Id */
     @Id
@@ -50,9 +49,9 @@ public class TTInfo {
  
     // TODO：还有很多判定条件，这里先不放
  
-    /** 路牌数 */
+    /** 路牌数（这两个字段暂时不用） */
     private int lpCount;
-    /** 圈数 */
+    /** 圈数（这两个字段暂时不倒） */
     private int loopCount;
  
     // TODO：原系统里的分别在，圈后圈进场，意思不知道，再议
@@ -62,19 +61,25 @@ public class TTInfo {
     /** 特殊有效日期（格式：2001-01-01，多个用逗号隔开） */
     private String special_days;
  
-    /** 操作人员关联 */
-    @ManyToOne(cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
-    private SysUser createBy;
-    /** 更新人员关联 */
-    @ManyToOne(cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
-    private SysUser updateBy;
-    // 创建日期
-    @Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
-    private Date createDate;
-    // 修改日期
-    @Column(name = "update_date", columnDefinition = "TIMESTAMP  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
-    private Date updateDate;
-
+    public TTInfo() {}
+    public TTInfo(Object id, Object xlid, Object name, Object nds, Object sds) {
+        if (id != null) {
+            this.id = Long.parseLong(id.toString());
+        }
+        if (xlid != null) {
+            this.xl = new Line();
+            this.xl.setId(Integer.valueOf(xlid.toString()));
+        }
+        if (name != null) {
+            this.name = String.valueOf(name);
+        }
+        if (nds != null) {
+            this.rule_days = String.valueOf(nds);
+        }
+        if (sds != null) {
+            this.special_days = String.valueOf(sds);
+        }
+    }
  
     public Long getId() {
         return id;
@@ -164,38 +169,6 @@ public class TTInfo {
         this.special_days = special_days;
     }
  
-    public SysUser getCreateBy() {
-        return createBy;
-    }
-
-    public void setCreateBy(SysUser createBy) {
-        this.createBy = createBy;
-    }
-
-    public SysUser getUpdateBy() {
-        return updateBy;
-    }
-
-    public void setUpdateBy(SysUser updateBy) {
-        this.updateBy = updateBy;
-    }
-
-    public Date getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(Date createDate) {
-        this.createDate = createDate;
-    }
-
-    public Date getUpdateDate() {
-        return updateDate;
-    }
-
-    public void setUpdateDate(Date updateDate) {
-        this.updateDate = updateDate;
-    }
-
     public Boolean getIsCancel() {
         return isCancel;
     }
@@ -3,10 +3,8 @@ package com.bsth.entity.schedule;
 import com.bsth.entity.CarPark;
 import com.bsth.entity.Line;
 import com.bsth.entity.Station;
-import com.bsth.entity.sys.SysUser;
  
 import javax.persistence.*;
-import java.util.Date;
  
 /**
  * 时刻表明细
@@ -23,7 +21,7 @@ import java.util.Date;
                 @NamedAttributeNode("tcc")
         })
 })
-public class TTInfoDetail {
+public class TTInfoDetail extends BEntity {
  
     /** 主健Id */
     @Id
@@ -85,20 +83,6 @@ public class TTInfoDetail {
     /** 备注 */
     private String remark;
  
-    /** 创建人 */
-    @ManyToOne(cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
-    private SysUser createBy;
-    /** 修改人 */
-    @ManyToOne(cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
-    private SysUser updateBy;
-
-    /** 创建日期 */
-    @Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
-    private Date createDate;
-    /** 修改日期 */
-    @Column(name = "update_date", columnDefinition = "TIMESTAMP  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
-    private Date updateDate;
-
     public Long getId() {
         return id;
     }
@@ -235,38 +219,6 @@ public class TTInfoDetail {
         this.remark = remark;
     }
  
-    public SysUser getCreateBy() {
-        return createBy;
-    }
-
-    public void setCreateBy(SysUser createBy) {
-        this.createBy = createBy;
-    }
-
-    public SysUser getUpdateBy() {
-        return updateBy;
-    }
-
-    public void setUpdateBy(SysUser updateBy) {
-        this.updateBy = updateBy;
-    }
-
-    public Date getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(Date createDate) {
-        this.createDate = createDate;
-    }
-
-    public Date getUpdateDate() {
-        return updateDate;
-    }
-
-    public void setUpdateDate(Date updateDate) {
-        this.updateDate = updateDate;
-    }
-
     public CarPark getTcc() {
         return tcc;
     }
 package com.bsth.entity.schedule.rule;
  
 import com.bsth.entity.Line;
-import com.bsth.entity.schedule.CarConfigInfo;
-import com.bsth.entity.schedule.EmployeeConfigInfo;
-import com.bsth.entity.schedule.GuideboardInfo;
-import com.bsth.entity.schedule.TTInfo;
-import com.bsth.entity.sys.SysUser;
+import com.bsth.entity.schedule.*;
  
 import javax.persistence.*;
-import java.util.Date;
  
 /**
  * 套跑规则。
@@ -41,7 +36,7 @@ import java.util.Date;
 })
  
  
-public class RerunRule {
+public class RerunRule extends BEntity {
     /** 主键Id */
     @Id
     @GeneratedValue
@@ -84,19 +79,6 @@ public class RerunRule {
     @Column(nullable = false)
     private Boolean isCancel = false;
  
-    /** 创建人 */
-    @ManyToOne(cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
-    private SysUser createBy;
-    /** 修改人 */
-    @ManyToOne(cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
-    private SysUser updateBy;
-    /** 创建日期 */
-    @Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
-    private Date createDate;
-    /** 修改日期 */
-    @Column(name = "update_date", columnDefinition = "TIMESTAMP  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
-    private Date updateDate;
-
     public Long getId() {
         return id;
     }
@@ -177,34 +159,6 @@ public class RerunRule {
         this.useEmployeeConfig = useEmployeeConfig;
     }
  
-    public SysUser getCreateBy() {
-        return createBy;
-    }
-
-    public void setCreateBy(SysUser createBy) {
-        this.createBy = createBy;
-    }
-
-    public SysUser getUpdateBy() {
-        return updateBy;
-    }
-
-    public void setUpdateBy(SysUser updateBy) {
-        this.updateBy = updateBy;
-    }
-
-    public Date getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(Date createDate) {
-        this.createDate = createDate;
-    }
-
-    public Date getUpdateDate() {
-        return updateDate;
-    }
-
     public Boolean getIsCancel() {
         return isCancel;
     }
@@ -213,7 +167,4 @@ public class RerunRule {
         this.isCancel = isCancel;
     }
  
-    public void setUpdateDate(Date updateDate) {
-        this.updateDate = updateDate;
-    }
 }
@@ -30,7 +30,7 @@ public interface FormsService {
  
 	public List<Singledata> singledata(Map<String, Object> map);
  
-	public List<Vehicleloading> vehicleloading(/*String gsdmVehic,String fgsdmVehic,*/String line,String data);
+	public List<Vehicleloading> vehicleloading(String gsdmVehic,String fgsdmVehic,String line,String data);
  
 	public List<Operationservice> operationservice(Map<String, Object> map);
  
@@ -26,6 +26,7 @@ import com.bsth.entity.mcy_forms.Waybillday;
 import com.bsth.entity.mcy_forms.Allline;
 import com.bsth.entity.mcy_forms.Changetochange;
 import com.bsth.entity.mcy_forms.Executionrate;
+import com.bsth.service.forms.CommonService;
 import com.bsth.service.forms.FormsService;
 import com.bsth.service.realcontrol.ScheduleRealInfoService;
  
@@ -38,20 +39,32 @@ public class FormsServiceImpl implements FormsService {
 	@Autowired
 	ScheduleRealInfoService scheduleRealInfoService;
  
+	@Autowired
+	CommonService commonService;
+
 	// 行车路单日报表
 	@Override
 	public List<Waybillday> waybillday(Map<String, Object> map) {
+		
 		String sql ="select x.j_gh,x.cl_zbh,z.JZL,z.YH,z.personnel_name,x.schedule_date,x.gs_bm,x.gs_name,x.fgs_bm,x.fgs_name "
 				+ " from bsth_c_s_sp_info_real x  INNER join "
 				+ " ( select  y.RQ,y.XLBM,y.NBBM,y.JSY,y.JZL,y.YH,c.personnel_name from"
 				+ " bsth_c_ylb y LEFT JOIN bsth_c_personnel c  ON c.job_code=y.JSY   " 
-				+ " where to_days(y.RQ)=to_days('"+map.get("date").toString() + "')  and y.XLBM= '"+ map.get("line").toString()+"' GROUP BY y.NBBM) "
-				+ " z on x.cl_zbh=z.nbbm  where  to_days( x.schedule_date)=to_days('"+map.get("date").toString()+"')  "
-				+ " and x.xl_bm='"+map.get("line").toString()+"'"
-				/*+ " and x.gs_bm='"+map.get("gsdmWaybillday").toString()+"'"
-				+ " and x.fgs_bm='"+map.get("fgsdmWaybillday").toString()+"'"*/
-				+ " GROUP BY x.j_gh,x.cl_zbh,z.JZL,z.YH,z.personnel_name,x.schedule_date,x.gs_bm,x.gs_name,x.fgs_bm,x.fgs_name";
-		//x.cl_zbh,j_gh 
+				+ " where 1=1  ";
+		if(map.get("date").toString()!=""){
+			sql+=" and to_days(y.RQ)=to_days('"+map.get("date").toString() + "') ";
+		}
+		if( map.get("line").toString()!=""){
+			sql+=" and y.XLBM= '"+ map.get("line").toString()+"' GROUP BY y.NBBM) ";
+		}
+			sql+= " z on x.cl_zbh=z.nbbm  where  to_days( x.schedule_date)=to_days('"+map.get("date").toString()+"') ";
+		if(map.get("gsdmWaybillday").toString()!=""){
+			sql+=" and x.gs_bm='"+map.get("gsdmWaybillday").toString()+"'";
+		}
+		if(map.get("fgsdmWaybillday").toString()!=""){
+			sql+=" and x.fgs_bm='"+map.get("fgsdmWaybillday").toString()+"'";
+		}	
+			sql	+= " GROUP BY x.j_gh,x.cl_zbh,z.JZL,z.YH,z.personnel_name,x.schedule_date,x.gs_bm,x.gs_name,x.fgs_bm,x.fgs_name ";
 		List<Waybillday> list = jdbcTemplate.query(sql, new RowMapper<Waybillday>() {
 			@Override
 			public Waybillday mapRow(ResultSet arg0, int arg1) throws SQLException {
@@ -60,21 +73,16 @@ public class FormsServiceImpl implements FormsService {
 				wbd.setJzl(arg0.getString("JZL"));
 				wbd.setYh(arg0.getString("YH"));
 				wbd.setjName(arg0.getString("personnel_name"));
-				// wbd.setZlc(arg0.getInt("zlc"));
-				// System.out.println(arg0.getObject("yl"));
-				// wbd.setYl(arg0.getString("yl"));
-				// wbd.setNbbm(arg0.getString("nbbm"));
 				wbd.setRq(arg0.getString("schedule_date"));
 				wbd.setJgh(arg0.getString("j_gh"));
 				return wbd;
-
 			}
 		});
  
 		for(int i=0;i<list.size();i++){
 			Waybillday w=list.get(i);
 			Map<String, Object> maps = new HashMap<>();
-			maps = scheduleRealInfoService.findKMBC2(w.getJgh(), w.getCarPlate(),
+			maps = commonService.findKMBC2(w.getJgh(), w.getCarPlate(),
 					w.getRq());
 			w.setJzl1(maps.get("ksgl").toString());
 			w.setZlc(maps.get("realMileage").toString());
@@ -86,18 +94,25 @@ public class FormsServiceImpl implements FormsService {
 	// 线路客流量报表
 	@Override
 	public List<Linepasswengerflow> linepasswengerflow(Map<String, Object> map) {
-		String sql = " SELECT s.station_name,l.name,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name"
+		String sql = " SELECT r.schedule_date,s.station_name,l.name,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name"
 				+ " from bsth_c_stationroute s "
 				+ " LEFT JOIN bsth_c_line l on s.line_code=l.line_code "
 				+ " LEFT JOIN bsth_c_s_sp_info_real r on r.xl_bm=l.line_code" 
-				+ " where to_days(l.create_date)=to_days('"+map.get("date").toString() + "') " 
-				+ " and l.line_code=" + map.get("line").toString() 
-				+ " AND r.gs_bm is not null"
-				/*+ " and r.gs_bm='"+map.get("gsdmLine").toString()+"'"
-				+ " and r.fgs_bm='"+map.get("fgsdmLine").toString()+"'"*/
-				+ " GROUP BY s.station_name,l.name,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name ";
-
-		//s.station_name
+		        + " where 1=1  ";
+		if(map.get("date").toString()!=""){
+			sql+="and  to_days(r.schedule_date)=to_days('"+map.get("date").toString() + "') ";
+		}
+		if( map.get("line").toString()!=""){
+			sql+=" and l.line_code=" + map.get("line").toString();
+		}
+			sql+= " AND r.gs_bm is not null";
+		if(map.get("gsdmLine").toString()!=""){
+			sql+=" and r.gs_bm='"+map.get("gsdmLine").toString()+"' ";
+		}
+		if(map.get("fgsdmLine").toString()!=""){
+			sql+=" and r.fgs_bm='"+map.get("fgsdmLine").toString()+"'";
+		}	
+			sql	+= " GROUP BY s.station_name,l.name,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name ";
 		List<Linepasswengerflow> list = jdbcTemplate.query(sql, new RowMapper<Linepasswengerflow>() {
  
 			@Override
@@ -109,8 +124,6 @@ public class FormsServiceImpl implements FormsService {
 			}
 		});
  
-		
-		
 		return list;
 	}
  
@@ -122,16 +135,26 @@ public class FormsServiceImpl implements FormsService {
 	public List<Shiftuehiclemanth> shiftuehiclemanth(Map<String, Object> map) {
 		String sql = "select r.j_name,r.cl_zbh,r.j_gh,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name,r.bc_type " 
 		        + " from bsth_c_s_sp_info_real r "
-				+ " where  to_days(r.schedule_date_str) BETWEEN to_days('" + map.get("startDate").toString() + "') "
-				+ " and  to_days('" + map.get("endDate").toString() + "') " 
-				+ " and r.xl_bm='"+ map.get("line").toString() + "'" 
-				+ " AND r.gs_bm is not null"
-				+ " and r.bc_type not in('in','out')"
-			/*	+ " and r.gs_bm='"+map.get("gsdmManth").toString()+"'"
-				+ " and r.fgs_bm='"+map.get("fgsdmManth").toString()+"'"*/
-				+ " GROUP BY r.j_name,r.cl_zbh,r.j_gh,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name" 
-				+ " ORDER BY r.j_name";
-		//r.j_name 
+		    	+ " where 1=1  ";
+		if(map.get("startDate").toString()!=""){
+			sql+=" and  to_days(r.schedule_date_str) BETWEEN to_days('" + map.get("startDate").toString() + "') ";
+		}
+		
+		if(map.get("endDate").toString()!=""){
+			sql+=" and  to_days('" + map.get("endDate").toString() + "') ";
+		}
+		if( map.get("line").toString()!=""){
+			sql+=" and r.xl_bm='"+ map.get("line").toString() + "' ";
+		}
+			sql+= " AND r.gs_bm is not null and r.bc_type not in('in','out')";
+		if(map.get("gsdmManth").toString()!=""){
+			sql+=" and r.gs_bm='"+map.get("gsdmManth").toString()+"' ";
+		}
+		if(map.get("fgsdmManth").toString()!=""){
+			sql+=" and r.fgs_bm='"+map.get("fgsdmManth").toString()+"' ";
+		}	
+			sql	+= " GROUP BY r.j_name,r.cl_zbh,r.j_gh,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name,r.bc_type ";
+			
 		startDate = map.get("startDate").toString();
 		endDate = map.get("endDate").toString();
 		List<Shiftuehiclemanth> list = jdbcTemplate.query(sql, new RowMapper<Shiftuehiclemanth>() {
@@ -150,7 +173,7 @@ public class FormsServiceImpl implements FormsService {
 			Shiftuehiclemanth s=list.get(i);
 			Map<String, Object> maps = new HashMap<>();
  
-			maps = scheduleRealInfoService.findKMBC1(s.getjName(),s.getZbh(), startDate,
+			maps = commonService.findKMBC1(s.getjName(),s.getZbh(), startDate,
 					endDate);
  
 			s.setJhlc(maps.get("jhlc").toString());
@@ -172,13 +195,22 @@ public class FormsServiceImpl implements FormsService {
 		String sql = " select r.schedule_date,r.lp_name,r.xl_name,r.j_name,r.s_name, r.cl_zbh,r.xl_bm,"
 				+ " r.cl_zbh,r.j_gh,r.j_gh,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name,r.bc_type   "
 				+ " FROM bsth_c_s_sp_info_real r " 
-				+ " where to_days(r.schedule_date)=to_days('"
-				+  map.get("date").toString() + "') and r.xl_bm=" + map.get("line").toString()
-				+ " and r.bc_type not in('in','out')"
-				/*+ " and r.gs_bm='"+map.get("gsdmShif").toString()+"'"
-				+ " and r.fgs_bm='"+map.get("fgsdmShif").toString()+"'"*/
-				+ " GROUP BY r.schedule_date,r.lp_name,r.xl_name,r.j_name,r.s_name, r.cl_zbh,r.xl_bm,r.cl_zbh,r.j_gh,r.j_gh,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name "
-				+ " ORDER BY  r.lp_name asc";
+				+ " where 1=1  ";
+		if(map.get("date").toString()!=""){
+			sql+=" and to_days(r.schedule_date)=to_days('"+  map.get("date").toString() + "') ";
+		}
+		if( map.get("line").toString()!=""){
+			sql+=" and r.xl_bm=" + map.get("line").toString();
+		}
+			sql+= " and r.bc_type not in('in','out')";
+		if(map.get("gsdmShif").toString()!=""){
+			sql+=" and r.gs_bm='"+map.get("gsdmShif").toString()+"'";
+		}
+		if(map.get("fgsdmShif").toString()!=""){
+			sql+=" and r.fgs_bm='"+map.get("fgsdmShif").toString()+"'";
+		}	
+			sql	+= " GROUP BY r.schedule_date,r.lp_name,r.xl_name,r.j_name,r.s_name, r.cl_zbh,r.xl_bm,r.cl_zbh,r.j_gh,r.j_gh,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name "
+				+ "  ORDER BY  r.lp_name asc";
  
 		List<Shifday> list = jdbcTemplate.query(sql, new RowMapper<Shifday>() {
  
@@ -200,7 +232,7 @@ public class FormsServiceImpl implements FormsService {
 		for(int i=0;i<list.size();i++){
 			Shifday shi=list.get(i);
 			Map<String, Object> maps = new HashMap<>();
-			maps = scheduleRealInfoService.findKMBC2(shi.getJgh(), shi.getCarPlate(),
+			maps = commonService.findKMBC2(shi.getJgh(), shi.getCarPlate(),
 					shi.getRq());
 			shi.setJhlc(maps.get("jhlc").toString());// 计划里程
 			//shifday.setSjjhlc(map.get("remMileage").toString());//实际计划里程
@@ -261,7 +293,6 @@ public class FormsServiceImpl implements FormsService {
 			@Override
 			public Changetochange mapRow(ResultSet arg0, int arg1) throws SQLException {
 				Changetochange chan = new Changetochange();
-
 				chan.setRq(rq);
 				chan.setGs(arg0.getString("gs"));
 				chan.setFgs(arg0.getString("fgs"));
@@ -302,18 +333,22 @@ public class FormsServiceImpl implements FormsService {
  
 		rq = rq2 + "-" + rq3;
  
-		String sql = " SELECT r.xl_bm,r.cl_zbh,r.j_gh,r.j_name,y.YH,y.JZL,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name " 
+		String sql = " SELECT r.xl_bm,r.xl_name,r.cl_zbh,r.j_gh,r.j_name,y.YH,y.JZL,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name " 
 		          + "  FROM bsth_c_s_sp_info_real r "
-		          + "  INNER join ( select  y.RQ,y.XLBM,y.NBBM,y.JSY,y.JZL,y.YH from bsth_c_ylb y   "
-		          + "  where y.RQ BETWEEN '" + map.get("startDate").toString() + "' and '"+ map.get("endDate").toString() + "'"
-		          + "  and y.XLBM= '" + map.get("line").toString() + "' GROUP BY y.RQ,y.XLBM,y.NBBM,y.JSY,y.JZL,y.YH)  y on r.cl_zbh=y.nbbm "
+		          + "  left join bsth_c_ylb y"
+		          + " ON r.cl_zbh = y.nbbm   "
 				  + "  where r.schedule_date_str BETWEEN '" + map.get("startDate").toString() + "'"
 		          + "  and '"+ map.get("endDate").toString() + "'" 
 				  + "  and r.xl_bm='" + map.get("line").toString() + "'"
-				  + " AND r.gs_bm is not null"
-				/*  + " and r.gs_bm='"+map.get("gsdmSing").toString()+"'"
-				  + " and r.fgs_bm='"+map.get("fgsdmSing").toString()+"'"*/
-				  + "  GROUP BY r.xl_bm,r.cl_zbh,r.j_gh,r.j_name,y.YH,y.JZL,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name ";
+				  + "  AND r.gs_bm is not null";
+				  
+			if(map.get("gsdmSing").toString()!=""){
+				sql+=" and r.gs_bm='"+map.get("gsdmSing").toString()+"'";
+			}
+			if(map.get("fgsdmSing").toString()!=""){
+				sql+=" and r.fgs_bm='"+map.get("fgsdmSing").toString()+"'";
+			}
+				 sql += "  GROUP BY r.xl_bm,r.cl_zbh,r.j_gh,r.j_name,y.YH,y.JZL,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name ";
  
 		startDate = map.get("startDate").toString();
 		endDate = map.get("endDate").toString();
@@ -324,7 +359,7 @@ public class FormsServiceImpl implements FormsService {
 				Singledata sin = new Singledata();
 				sin.setrQ(rq);
 				sin.setgS(arg0.getString("gs_name"));
-				sin.setxL(arg0.getString("xl_bm"));
+				sin.setxL(arg0.getString("xl_name"));
 				sin.setClzbh(arg0.getString("cl_zbh"));
 				sin.setJsy(arg0.getString("j_gh"));
 				sin.setjName(arg0.getString("j_name"));
@@ -339,7 +374,7 @@ public class FormsServiceImpl implements FormsService {
 			for(int i=0;i<list.size();i++){
 				Singledata si=list.get(i);
 				Map<String, Object> maps = new HashMap<>();
-				maps = scheduleRealInfoService.findKMBC1(si.getjName(),si.getClzbh(), startDate,
+				maps = commonService.findKMBC1(si.getjName(),si.getClzbh(), startDate,
 						endDate);
 				//sin.setjName(maps.get("j_name") == null ? "" : maps.get("j_name").toString());
 				si.setSgh(maps.get("s_gh") == null ? "" : maps.get("s_gh").toString());
@@ -356,24 +391,30 @@ public class FormsServiceImpl implements FormsService {
 	@Override
 	public List<Operationservice> operationservice(Map<String, Object> map) {
  
-		String sql = " SELECT r.xl_bm,r.xl_name,r.cl_zbh,r.j_gh,r.j_name,y.YH,y.JZL,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name,r.bc_type " 
+		String sql = " SELECT r.schedule_date_str,r.xl_bm,r.xl_name,r.cl_zbh,r.j_gh,r.j_name,y.YH,y.JZL,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name,r.bc_type " 
 		        + "  FROM bsth_c_s_sp_info_real r "
 		       // + "LEFT JOIN bsth_c_s_sp_info_real r on r.cl_zbh=y.NBBM"
-		        + "  INNER join ( select  y.RQ,y.XLBM,y.NBBM,y.JSY,y.JZL,y.YH from bsth_c_ylb y   "
-		        + "  where y.RQ BETWEEN '" + map.get("startDate").toString() + "' and '"+ map.get("endDate").toString() + "'"
-		        + "  and y.XLBM= '" + map.get("line").toString() + "' GROUP BY y.RQ,y.XLBM,y.NBBM,y.JSY,y.JZL,y.YH)  y on r.cl_zbh=y.nbbm "
-				+ "  where r.schedule_date_str BETWEEN '"+ map.get("startDate").toString() 
-		        + "'" + "  and '" + map.get("endDate").toString() + "'"
-				+ "  and r.xl_bm='" + map.get("line").toString() + "'" 
-				+ " and r.bc_type not in('in','out')"
-			   /* + " and r.gs_bm='"+map.get("gsdmOperat").toString()+"'"
-				+ " and r.fgs_bm='"+map.get("fgsdmOperat").toString()+"'"*/
-				+ "  AND r.gs_bm is not null"
-				+ "  GROUP BY r.xl_bm,r.xl_name,r.cl_zbh,r.j_gh,r.j_name,y.YH,y.JZL,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name";
+		        + "  left join bsth_c_ylb y ON r.cl_zbh = y.nbbm "
+				+ "  where 1=1 ";
+		if(map.get("startDate").toString()!=""){
+			sql+=" and  to_days(r.schedule_date_str) BETWEEN to_days('" + map.get("startDate").toString() + "') ";
+		}
  
-		//r.j_name
-		startDate = map.get("startDate").toString();
-		endDate = map.get("endDate").toString();
+		if(map.get("endDate").toString()!=""){
+			sql+=" and  to_days('" + map.get("endDate").toString() + "') ";
+		}
+			sql+="  and r.xl_bm='" + map.get("line").toString() + "'" ;
+			sql+="  and r.bc_type not in('in','out')";
+		if(map.get("gsdmOperat").toString()!=""){
+			sql+=" and r.gs_bm='"+map.get("gsdmOperat").toString()+"'";
+		}
+		if(map.get("fgsdmOperat").toString()!=""){
+			sql+=" and r.fgs_bm='"+map.get("fgsdmOperat").toString()+"'";
+		}
+			sql	+= "  AND r.gs_bm is not null";
+			sql	+= "  GROUP BY r.xl_bm,r.xl_name,r.cl_zbh,r.j_gh,r.j_name,y.YH,y.JZL,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name";
+			startDate = map.get("startDate").toString();
+			endDate = map.get("endDate").toString();
 		List<Operationservice> list = jdbcTemplate.query(sql, new RowMapper<Operationservice>() {
  
 			@Override
@@ -392,9 +433,9 @@ public class FormsServiceImpl implements FormsService {
 		for(int i=0;i<list.size();i++){
 			Operationservice o=list.get(i);
 			Map<String, Object> maps = new HashMap<>();
-			maps = scheduleRealInfoService.findKMBC1(o.getJname(), o.getClzbh(), startDate,
+			maps = commonService.findKMBC1(o.getJname(), o.getClzbh(), startDate,
 					endDate);
-			o.setXsgl(maps.get("yygl").toString() == null ? "" : maps.get("yygl").toString());
+			o.setXsgl(maps.get("jhlc").toString() == null ? "" : maps.get("jhlc").toString());
 			o.setEmptMileage(maps.get("ksgl").toString() == null ? "" : maps.get("ksgl").toString());
 			o.setSjbc(maps.get("sjbc").toString() == null ? "" : maps.get("sjbc").toString());
 		}
@@ -404,7 +445,7 @@ public class FormsServiceImpl implements FormsService {
  
 	// 车辆加注
 	@Override
-	public List<Vehicleloading> vehicleloading(/*String gsdmVehic,String fgsdmVehic,*/String line, String date) {
+	public List<Vehicleloading> vehicleloading(String gsdmVehic,String fgsdmVehic,String line, String date) {
  
 		String sql = " SELECT r.schedule_date_str,r.xl_bm,r.xl_name,r.cl_zbh,r.j_name,y.YH,y.JZL,r.j_gh,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name,r.bc_type  " 
 		        + "  FROM bsth_c_s_sp_info_real r "
@@ -414,13 +455,14 @@ public class FormsServiceImpl implements FormsService {
 				+ "  where to_days(r.schedule_date_str)=to_days('" + date + "')" 
 		        + "  and r.xl_bm='" + line + "' "
 		        + " AND r.gs_bm is not null"
-		        + " and r.bc_type not in('in','out')"
-		        /* + " and r.gs_bm='"+gsdmVehic +"'"
-				+ " and r.fgs_bm='"+fgsdmVehic +"'"*/
-				+ "  GROUP BY r.schedule_date_str,r.xl_bm,r.xl_name,r.cl_zbh,r.j_name,y.YH,y.JZL,r.j_gh,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name ";
-
-		
-		//r.cl_zbh
+		        + " and r.bc_type not in('in','out')";
+		if(gsdmVehic.toString()!=""){
+			sql+=" and r.gs_bm='"+gsdmVehic+"'";
+		}
+		if(fgsdmVehic.toString()!=""){
+			sql+=" and r.fgs_bm='"+fgsdmVehic +"'";
+		}
+			sql	+= "  GROUP BY r.schedule_date_str,r.xl_bm,r.xl_name,r.cl_zbh,r.j_name,y.YH,y.JZL,r.j_gh,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name ";
 		List<Vehicleloading> list = jdbcTemplate.query(sql, new RowMapper<Vehicleloading>() {
 			@Override
 			public Vehicleloading mapRow(ResultSet arg0, int arg1) throws SQLException {
@@ -429,8 +471,8 @@ public class FormsServiceImpl implements FormsService {
 				ve.setgS(arg0.getString("gs_name"));
 				ve.setxL(arg0.getString("xl_name"));
 				ve.setClzbh(arg0.getString("cl_zbh"));
-				ve.setHyl(arg0.getString("YH"));
 				ve.setJzl(arg0.getString("JZL"));
+				ve.setHyl(arg0.getString("YH"));
 				// ve.setLs(arg0.getString("").toString());//尿素
 				ve.setJgh(arg0.getString("j_gh").toString());
 				return ve;
@@ -440,9 +482,9 @@ public class FormsServiceImpl implements FormsService {
 		for(int i=0;i<list.size();i++){
 			Vehicleloading v=list.get(i);
 			Map<String, Object> maps = new HashMap<>();
-			maps = scheduleRealInfoService.findKMBC2(v.getJgh(), line,
-					date);
-			v.setJhlc(maps.get("yygl") == null ? "" : maps.get("yygl").toString());
+			maps = commonService.findKMBC2(v.getJgh(), v.getClzbh(),
+					v.getrQ());
+			v.setJhlc(maps.get("jhlc") == null ? "" : maps.get("jhlc").toString());
 			v.setJhbc(maps.get("jhbc").toString() == null ? "" : maps.get("jhbc").toString());// 计划班次
 			v.setSjbc(maps.get("sjbc").toString() == null ? "" : maps.get("sjbc").toString());// 实际班次
 		}
@@ -476,8 +518,8 @@ public class FormsServiceImpl implements FormsService {
 				+ " and '" + map.get("endDate").toString() + "'  and xl_bm='"+ map.get("line").toString() + "' "
 				+ " AND gs_bm is not null "
 				+ " AND bc_type NOT IN ('in', 'out')"
-				/*+ " and gs_bm='"+ map.get("gsdmTurn").toString() + "'"
-				+ " and fgs_bm='"+ map.get("fgsdmTurn").toString() + "'"*/
+				+ " and gs_bm='"+ map.get("gsdmTurn").toString() + "'"
+				+ " and fgs_bm='"+ map.get("fgsdmTurn").toString() + "'"
 				+ "  GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name,bc_type ) a left JOIN ("
 				+ " SELECT  COUNT(*) as xlgs,b.gs_bm,b.fgs_bm,b.xl_bm,b.gs_name,b.fgs_name, b.sbc,b.sxl ,b.scl,t.warrant_car   "
 				+ " from bsth_c_line t RIGHT  JOIN (select  gs_bm,fgs_bm,xl_bm,gs_name,fgs_name, count(*) as sbc,COUNT(DISTINCT xl_bm) as sxl ,COUNT(DISTINCT cl_zbh) as scl,bc_type  from bsth_c_s_sp_info_real	 "
@@ -510,7 +552,7 @@ public class FormsServiceImpl implements FormsService {
 				tu.setBcjh(arg0.getString("jbc").toString());
 				tu.setBcsj(arg0.getString("sbc").toString());
 				tu.setBbzxl(result2 + "%");// 班次执行率
-				// tu.setSm(arg0.getString("gs_name").toString());
+				tu.setSm(arg0.getString("gs_name").toString());
 				tu.setGsgs(arg0.getString("gslsbm").toString());
 				tu.setFgsgs(arg0.getString("fgsbm").toString());
 				return tu;
@@ -547,8 +589,8 @@ public class FormsServiceImpl implements FormsService {
 				+ "   from bsth_c_s_sp_info" + "  where DATE_FORMAT(schedule_date,'%Y-%m-%d') BETWEEN '"
 				+ map.get("startDate").toString() + "'  and '" + map.get("endDate").toString() + "'  and xl_bm='"
 				+ map.get("line").toString() + "'   AND gs_bm is not null  AND bc_type NOT IN ('in', 'out')"
-				/*+ " and gs_bm='"+ map.get("gsdmEcecut").toString() + "'"
-				+ " and fgs_bm='"+ map.get("fgsdmEcecut").toString() + "'"*/
+				+ " and gs_bm='"+ map.get("gsdmEcecut").toString() + "'"
+				+ " and fgs_bm='"+ map.get("fgsdmEcecut").toString() + "'"
 				+ "  GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name,bc_type ) a left JOIN ("
 				+ "SELECT  COUNT(*) as xlgs,b.gs_bm,b.fgs_bm,b.xl_bm,b.xl_name,b.gs_name,b.fgs_name, b.sbc,b.sxl ,b.scl  "
 				+ "from bsth_c_line t RIGHT  JOIN (select  gs_bm,fgs_bm,xl_bm,xl_name,gs_name,fgs_name, count(*) as sbc,COUNT(DISTINCT xl_bm) as sxl ,COUNT(DISTINCT cl_zbh) as scl,bc_type  from bsth_c_s_sp_info_real	 "
@@ -618,8 +660,8 @@ public class FormsServiceImpl implements FormsService {
 				+ "   from bsth_c_s_sp_info" + "  where DATE_FORMAT(schedule_date,'%Y-%m-%d') BETWEEN '"
 				+ map.get("startDate").toString() + "'  and '" + map.get("endDate").toString() + "'  and xl_bm='"
 				+ map.get("line").toString() + "'   AND gs_bm is not null  AND bc_type NOT IN ('in', 'out') "
-				/*+ " and gs_bm='"+ map.get("gsdmAllline").toString() + "'"
-				+ " and fgs_bm='"+ map.get("fgsdmAllline").toString() + "'"*/
+				+ " and gs_bm='"+ map.get("gsdmAllline").toString() + "'"
+				+ " and fgs_bm='"+ map.get("fgsdmAllline").toString() + "'"
 				+ "  GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name,bc_type ) a left JOIN ("
 				+ "SELECT  COUNT(*"
 				+ ") as xlgs,b.gs_bm,b.fgs_bm,b.xl_bm,b."
@@ -655,18 +697,13 @@ public class FormsServiceImpl implements FormsService {
 				tu.setBcsj(arg0.getString("sbc").toString());
 				tu.setBbzxl(result2 + "%");// 班次执行率
  
-				// tu.setSm(arg0.getString("xl_name").toString());
+			    tu.setSm(arg0.getString("xl_name").toString());
 				tu.setGsgs(arg0.getString("gslsbm").toString());
 				tu.setFgsgs(arg0.getString("fgsbm").toString());
 				return tu;
-			}
-
-			
+			}			
 		});
  
-
-		
-		
 		return list;
 	}
 }
@@ -14,4 +14,6 @@ public interface GpsService {
 	Map<String, Object> search(Map<String, Object> map, int page, int size, String order, String direction);
  
     Map<String,Object> removeRealGps(String device);
+
+    Map<String,Object> findRoadSpeed(String lineCode);
 }
 package com.bsth.service.gps;
  
-import java.lang.reflect.Field;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import com.bsth.common.ResponseCode;
 import com.bsth.data.BasicData;
 import com.bsth.data.arrival.ArrivalEntity;
@@ -31,6 +11,19 @@ import com.bsth.util.DateUtils;
 import com.bsth.util.TransGPS;
 import com.bsth.util.TransGPS.Location;
 import com.bsth.util.db.DBUtils_MS;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Service;
+
+import java.lang.reflect.Field;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.util.*;
  
 @Service
 public class GpsServiceImpl implements GpsService {
@@ -51,6 +44,9 @@ public class GpsServiceImpl implements GpsService {
     @Autowired
     GpsRealData gpsRealData;
  
+    @Autowired
+    JdbcTemplate jdbcTemplate;
+
     // 历史gps查询
     @Override
     public List<Map<String, Object>> history(String device, Long startTime, Long endTime, int directions) {
@@ -199,9 +195,9 @@ public class GpsServiceImpl implements GpsService {
         inv = inv.substring(0, inv.length() - 1);
  
         // 查询到离站数据
-        Map<String, ArrivalEntity> arrivalMap = findArrivalByTs(weekOfYear/* 30 */, st, et, inv);
+        //Map<String, ArrivalEntity> arrivalMap = findArrivalByTs(weekOfYear/* 30 */, st, et, inv);
  
-        String sql = "select DEVICE_ID,LON,LAT,TS,INOUT_STOP,SERVICE_STATE ,STOP_NO from bsth_c_gps_info where days_year=? and device_id in ("
+        String sql = "select DEVICE_ID,LON,LAT,TS,INOUT_STOP,SERVICE_STATE ,STOP_NO,DIRECTION,LINE_ID,SPEED_GPS from bsth_c_gps_info where days_year=? and device_id in ("
                 + inv + ") and ts > ? and ts < ?";
         try {
             conn = DBUtils_MS.getConnection();
@@ -235,15 +231,19 @@ public class GpsServiceImpl implements GpsService {
                 map.put("ts", rs.getLong("TS"));
                 map.put("timestamp", rs.getLong("TS"));
                 map.put("stopNo", rs.getString("STOP_NO"));
+                map.put("direction", rs.getFloat("DIRECTION"));
+
+                map.put("lineId", rs.getString("LINE_ID"));
+                map.put("speed", rs.getFloat("SPEED_GPS"));
  
                 inOutStop = rs.getInt("INOUT_STOP");
                 map.put("inout_stop", inOutStop);
  
-                arrival = arrivalMap.get(rs.getString("DEVICE_ID") + "_" + rs.getLong("TS"));
-                if (arrival != null) {
-                    map.put("inout_stop_info", arrival);
-                    map.put("inout_stop", arrival.getInOut());
-                }
+                /*analyse = arrivalMap.get(rs.getString("DEVICE_ID") + "_" + rs.getLong("TS"));
+                if (analyse != null) {
+                    map.put("inout_stop_info", analyse);
+                    map.put("inout_stop", analyse.getInOut());
+                }*/
                 map.put("nbbm", BasicData.deviceId2NbbmMap.get(rs.getString("DEVICE_ID")));
                 map.put("state", 0);
                 // 上下行
@@ -388,6 +388,22 @@ public class GpsServiceImpl implements GpsService {
         return rs;
     }
  
+    @Override
+    public Map<String, Object> findRoadSpeed(String lineCode) {
+        Map<String, Object> rs = new HashMap<>();
+
+        try {
+            String sql = "select ID, ST_AsText(GROAD_VECTOR) as GROAD_VECTOR,ROAD_CODE,ROAD_NAME,SPEED from bsth_c_road where road_code in(select section_code from bsth_c_sectionroute where line_code=? and destroy=0)";
+            List<Map<String, Object>> list = jdbcTemplate.queryForList(sql, lineCode);
+            rs.put("status", ResponseCode.SUCCESS);
+            rs.put("roads", list);
+        } catch (DataAccessException e) {
+            logger.error("", e);
+            rs.put("status", ResponseCode.ERROR);
+        }
+        return rs;
+    }
+
     private void sortGpsList(final Field f, List<GpsEntity> rs) {
         Collections.sort(rs, new Comparator<GpsEntity>() {
  
@@ -573,6 +573,7 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 			String tomorrow = sdfnyr.format(DateUtils.addDays(new Date(), +1));
 			// 查询所有班次
 			List<SchedulePlanInfo> schedulePlanList = schedulePlanInfoRepository.findLineScheduleBc(tomorrow);
+			int j = 0; // 初始化标识
 			if(schedulePlanList != null ){
 				int size = schedulePlanList.size();
 				for (int i = 0; i < size; i++) {
@@ -583,7 +584,7 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 					if(line.getInUse() == null || line.getInUse() == 0){
 						continue;
 					}
-					if(i == 0){// 第一次，则初始化值
+					if(++j == 1){// 第一次，则初始化值
 						zbh = schedulePlanInfo.getClZbh();
 						lp = schedulePlanInfo.getLp();
 						// 拼装XML
@@ -6,6 +6,6 @@ import com.bsth.entity.schedule.CarConfigInfo;
  * Created by xu on 16/5/9.
  */
 public interface CarConfigInfoService extends BService<CarConfigInfo, Long> {
-    public void validate_cars(CarConfigInfo carConfigInfo) throws ScheduleException;
-    public void toggleCancel(Long id) throws ScheduleException;
+    void validate_cars(CarConfigInfo carConfigInfo) throws ScheduleException;
+    void toggleCancel(Long id) throws ScheduleException;
 }
@@ -912,7 +912,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
 		List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
 		Map<String, List<Map<String, Object>>> keyMap = new HashMap<String, List<Map<String, Object>>>();
-		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH-mm-ss");
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
  
 		String company = map.get("company").toString();
 		String subCompany = map.get("subCompany").toString();
 package com.bsth.service.schedule;
  
 import com.bsth.entity.schedule.rule.RerunRule;
-import com.bsth.service.BaseService;
  
 /**
  * Created by xu on 16/10/20.
  */
-public interface RerunService extends BaseService<RerunRule, Long> {
+public interface RerunService extends BService<RerunRule, Long> {
 }
-package com.bsth.service.schedule;
-
-import com.bsth.common.ResponseCode;
-import com.bsth.entity.schedule.rule.RerunRule;
-import com.bsth.repository.schedule.RerunRuleRepository;
-import com.bsth.service.impl.BaseServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import javax.transaction.Transactional;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Created by xu on 16/10/20.
- */
-@Service
-public class RerunServiceImpl extends BaseServiceImpl<RerunRule, Long> implements RerunService {
-
-    @Autowired
-    private RerunRuleRepository rerunRuleRepository;
-
-    @Override
-    @Transactional
-    public Map<String, Object> delete(Long aLong) {
-        // 获取带作废的数据
-        RerunRule rerunRule = rerunRuleRepository.findOne(aLong);
-
-        toogleIsCancel(rerunRule);
-
-        Map<String, Object> map = new HashMap<>();
-        map.put("status", ResponseCode.SUCCESS);
-
-        return map;
-
-    }
-
-    /**
-     * 撤销/作废切换。
-     * @param rerunRule
-     */
-    private void toogleIsCancel(RerunRule rerunRule) {
-        boolean isCancel = rerunRule.getIsCancel();
-        if (isCancel) {
-            rerunRule.setIsCancel(false);
-        } else {
-            rerunRule.setIsCancel(true);
-        }
-    }
-}
 package com.bsth.service.schedule;
  
 import com.bsth.entity.schedule.TTInfo;
-import com.bsth.service.BaseService;
  
 /**
  * Created by xu on 16/5/12.
  */
-public interface TTInfoService extends BaseService<TTInfo, Long> {
+public interface TTInfoService extends BService<TTInfo, Long> {
+    void validate_name(TTInfo ttInfo) throws ScheduleException;
+    void validate_n_d(TTInfo ttInfo) throws ScheduleException;
+    void validate_s_d(TTInfo ttInfo) throws ScheduleException;
+    void toggleCancel(Long id) throws ScheduleException;
+
 }
-package com.bsth.service.schedule;
-
-import com.bsth.common.ResponseCode;
-import com.bsth.entity.schedule.TTInfo;
-import com.bsth.repository.schedule.TTInfoRepository;
-import com.bsth.service.impl.BaseServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import javax.transaction.Transactional;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Created by xu on 16/5/12.
- */
-@Service
-@Transactional
-public class TTInfoServiceImpl extends BaseServiceImpl<TTInfo, Long> implements TTInfoService {
-    @Autowired
-    private TTInfoRepository ttInfoRepository;
-
-    @Transactional
-    @Override
-    public Map<String, Object> delete(Long aLong) {
-        // 获取待作废的数据
-        TTInfo ttInfo = ttInfoRepository.findOne(aLong);
-
-        toogleIsCancel(ttInfo);
-
-        Map<String, Object> map = new HashMap<>();
-        map.put("status", ResponseCode.SUCCESS);
-
-        return map;
-    }
-
-
-
-    private void toogleIsCancel(TTInfo ttInfo) {
-        boolean isCancel = ttInfo.getIsCancel();
-        if (isCancel) {
-            ttInfo.setIsCancel(false);
-        } else {
-            ttInfo.setIsCancel(true);
-        }
-    }
-}
+package com.bsth.service.schedule.impl;
+
+import com.bsth.entity.schedule.rule.RerunRule;
+import com.bsth.service.schedule.RerunService;
+import com.bsth.service.schedule.ScheduleException;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * Created by xu on 16/10/20.
+ */
+@Service
+public class RerunServiceImpl extends BServiceImpl<RerunRule, Long> implements RerunService {
+
+    @Transactional
+    @Override
+    public void delete(Long aLong) throws ScheduleException {
+        toggleCancel(aLong);
+    }
+
+    private void toggleCancel(Long id) throws ScheduleException {
+        RerunRule rerunRule = findById(id);
+        if (rerunRule.getIsCancel()) {
+            rerunRule.setIsCancel(false);
+        } else {
+            rerunRule.setIsCancel(true);
+        }
+    }
+}
+package com.bsth.service.schedule.impl;
+
+import com.bsth.entity.schedule.TTInfo;
+import com.bsth.service.schedule.ScheduleException;
+import com.bsth.service.schedule.TTInfoService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by xu on 16/12/20.
+ */
+@Service
+public class TTInfoServiceImpl extends BServiceImpl<TTInfo, Long> implements TTInfoService {
+
+    @Override
+    public void validate_name(TTInfo ttInfo) throws ScheduleException {
+        // 名字重复验证
+        Map<String, Object> param = new HashMap<>();
+        if (ttInfo.getId() != null) {
+            param.put("id_ne", ttInfo.getId());
+        }
+        param.put("xl.id_eq", ttInfo.getXl().getId());
+        param.put("name_eq", ttInfo.getName());
+
+        if (!CollectionUtils.isEmpty(list(param))) {
+            throw new ScheduleException("名字重复");
+        }
+    }
+
+    @Override
+    public void validate_n_d(TTInfo ttInfo) throws ScheduleException {
+        // 常规有效日重复验证
+        // 找出所有未作废，已启用的时刻表，验证
+        Map<String, Object> param = new HashMap<>();
+        if (ttInfo.getId() != null) {
+            param.put("id_ne", ttInfo.getId());
+        }
+        param.put("xl.id_eq", ttInfo.getXl().getId());
+        param.put("isCancel_eq", false);
+        param.put("isEnableDisTemplate_eq", true);
+        List<TTInfo> ttInfos = list(param);
+        if (StringUtils.isEmpty(ttInfo.getRule_days())) {
+            throw new ScheduleException("常规有效日为空");
+        } else {
+            String[] nds = ttInfo.getRule_days().split(",");
+            for (TTInfo t : ttInfos) {
+                String[] nds_e = t.getRule_days().split(",");
+                for (int i = 0; i < 7; i++) {
+                    if ("0".equals(nds[i])) {
+                        //
+                    } else {
+                        if (nds[i].equals(nds_e[i])) {
+                            throw new ScheduleException("当前常规有效日期已经使用");
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    @Override
+    public void validate_s_d(TTInfo ttInfo) throws ScheduleException {
+        // 特殊有效日重复验证
+        // 找出所有未作废，已启用的时刻表，验证
+        Map<String, Object> param = new HashMap<>();
+        if (ttInfo.getId() != null) {
+            param.put("id_ne", ttInfo.getId());
+        }
+
+        param.put("xl.id_eq", ttInfo.getXl().getId());
+        param.put("isCancel_eq", false);
+        param.put("isEnableDisTemplate_eq", true);
+        List<TTInfo> ttInfos = list(param);
+        if (StringUtils.isEmpty(ttInfo.getSpecial_days())) {
+            //
+        } else {
+            String[] sds = ttInfo.getSpecial_days().split(",");
+            for (TTInfo t : ttInfos) {
+                if (StringUtils.isEmpty(t.getSpecial_days())) {
+                    //
+                } else {
+                    for (String sd : sds) {
+                        if (t.getSpecial_days().indexOf(sd) != -1) {
+                            throw new ScheduleException("当前特殊日期已经使用");
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+
+    @Transactional
+    @Override
+    public void delete(Long aLong) throws ScheduleException {
+        toggleCancel(aLong);
+    }
+
+    @Transactional
+    @Override
+    public void toggleCancel(Long id) throws ScheduleException {
+        TTInfo ttInfo = findById(id);
+        if (ttInfo.getIsCancel()) {
+            ttInfo.setIsCancel(false);
+        } else {
+            ttInfo.setIsCancel(true);
+        }
+    }
+}
@@ -116,6 +116,27 @@
       <bordercolorblue>100</bordercolorblue>
       <drawshadow>Y</drawshadow>
     </notepad>
+    <notepad>
+      <note>&#x8fd9;&#x91cc;&#x6709;&#x4e9b;&#x95ee;&#x9898;&#xa;&#x5728;window2012&#x7684;&#x73af;&#x5883;&#x4e0b;&#xff0c;&#xa;MySql&#x6570;&#x636e;&#x5e93;&#x67e5;&#x8be2;&#x4e2d;&#x5982;&#x679c;&#x8fd4;&#x56de;&#x4e2d;&#x6587;&#x5185;&#x5bb9;&#x7684;&#x5b57;&#x6bb5;&#xff0c;&#x8fd9;&#x4e2a;&#x5185;&#x5bb9;&#x4e71;&#x7801;&#xa;&#x89e3;&#x51b3;&#x529e;&#x6cd5;&#xff0c;&#x5c31;&#x662f;&#x6570;&#x636e;&#x5e93;&#x67e5;&#x8be2;&#x5168;&#x90e8;&#x7f13;&#x5b58;&#xff0c;&#x5c31;&#x4e0d;&#x4e71;&#x7801;&#xa;linux&#x73af;&#x5883;&#x4e0b;&#x6ca1;&#x95ee;&#x9898;</note>
+      <xloc>721</xloc>
+      <yloc>762</yloc>
+      <width>333</width>
+      <heigth>90</heigth>
+      <fontname>YaHei Consolas Hybrid</fontname>
+      <fontsize>12</fontsize>
+      <fontbold>N</fontbold>
+      <fontitalic>N</fontitalic>
+      <fontcolorred>0</fontcolorred>
+      <fontcolorgreen>0</fontcolorgreen>
+      <fontcolorblue>0</fontcolorblue>
+      <backgroundcolorred>255</backgroundcolorred>
+      <backgroundcolorgreen>205</backgroundcolorgreen>
+      <backgroundcolorblue>112</backgroundcolorblue>
+      <bordercolorred>100</bordercolorred>
+      <bordercolorgreen>100</bordercolorgreen>
+      <bordercolorblue>100</bordercolorblue>
+      <drawshadow>Y</drawshadow>
+    </notepad>
   </notepads>
   <connection>
     <name>bus_control_variable</name>
@@ -130,6 +151,7 @@
     <data_tablespace/>
     <index_tablespace/>
     <attributes>
+      <attribute><code>EXTRA_OPTION_MYSQL.characterEncoding</code><attribute>utf8</attribute></attribute>
       <attribute><code>EXTRA_OPTION_MYSQL.defaultFetchSize</code><attribute>500</attribute></attribute>
       <attribute><code>EXTRA_OPTION_MYSQL.useCursorFetch</code><attribute>true</attribute></attribute>
       <attribute><code>FORCE_IDENTIFIERS_TO_LOWERCASE</code><attribute>N</attribute></attribute>
@@ -437,7 +459,7 @@
     <optimizationLevel>9</optimizationLevel>
     <jsScripts>      <jsScript>        <jsScript_type>0</jsScript_type>
         <jsScript_name>Script 1</jsScript_name>
-        <jsScript_script>&#x2f;&#x2f;Script here&#xa;&#xa;&#x2f;&#x2f; &#x6dfb;&#x52a0;&#x7ad9;&#x70b9;&#x6807;&#x8bc6;&#xa;var cc_groups &#x3d; qdzgroups.split&#x28;&#x22;,&#x22;&#x29;&#x3b; &#x2f;&#x2f; &#x6240;&#x6709;&#x73ed;&#x6b21;&#x8d77;&#x70b9;&#x7ad9;&#x6570;&#x7ec4;&#xa;var zdzname &#x3d; cc_groups&#x5b;gno&#x5d;&#x3b; &#x2f;&#x2f; &#x51fa;&#x573a;&#x73ed;&#x6b21;&#x7684;&#x7ec8;&#x70b9;&#x7ad9;&#x662f;&#x4e0b;&#x4e2a;&#x73ed;&#x6b21;&#x7684;&#x8d77;&#x59cb;&#x7ad9;&#xa;var endZdtype &#x3d; &#x27;E&#x27;&#x3b;</jsScript_script>
+        <jsScript_script>&#x2f;&#x2f;Script here&#xa;&#xa;&#x2f;&#x2f; &#x6dfb;&#x52a0;&#x7ad9;&#x70b9;&#x6807;&#x8bc6;&#xa;var cc_groups &#x3d; qdzgroups.split&#x28;&#x22;,&#x22;&#x29;&#x3b; &#x2f;&#x2f; &#x6240;&#x6709;&#x73ed;&#x6b21;&#x8d77;&#x70b9;&#x7ad9;&#x6570;&#x7ec4;&#xa;var zdzname &#x3d; cc_groups&#x5b;gno&#x5d;&#x3b; &#x2f;&#x2f; &#x51fa;&#x573a;&#x73ed;&#x6b21;&#x7684;&#x7ec8;&#x70b9;&#x7ad9;&#x662f;&#x4e0b;&#x4e2a;&#x73ed;&#x6b21;&#x7684;&#x8d77;&#x59cb;&#x7ad9;&#xa;var endZdtype &#x3d; &#x27;E&#x27;&#x3b;&#xa;&#xa;var destory &#x3d; 0&#x3b; &#x2f;&#x2f; &#x672a;&#x64a4;&#x9500;flag</jsScript_script>
       </jsScript>    </jsScripts>    <fields>      <field>        <name>zdzname</name>
         <rename>zdzname</rename>
         <type>String</type>
@@ -450,6 +472,12 @@
         <length>-1</length>
         <precision>-1</precision>
         <replace>N</replace>
+      </field>      <field>        <name>destory</name>
+        <rename>destory</rename>
+        <type>Integer</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <replace>N</replace>
       </field>    </fields>     <cluster_schema/>
  <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
       <xloc>575</xloc>
@@ -1341,6 +1369,12 @@
         <condition>&#x3d;</condition>
         <name2/>
       </key>
+      <key>
+        <name>destory</name>
+        <field>destroy</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
       <value>
         <name>station</name>
         <rename>zdzid</rename>
@@ -1677,6 +1711,12 @@
         <condition>&#x3d;</condition>
         <name2/>
       </key>
+      <key>
+        <name>destory</name>
+        <field>destroy</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
       <value>
         <name>station_name</name>
         <rename>zdzname</rename>
@@ -1737,6 +1777,12 @@
         <condition>&#x3d;</condition>
         <name2/>
       </key>
+      <key>
+        <name>destory</name>
+        <field>destroy</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
       <value>
         <name>station</name>
         <rename>qdzid</rename>
@@ -1845,6 +1891,12 @@
         <condition>&#x3d;</condition>
         <name2/>
       </key>
+      <key>
+        <name>destory</name>
+        <field>destroy</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
       <value>
         <name>directions</name>
         <rename>sxx</rename>
@@ -1872,8 +1924,8 @@
            <schema_name/>
            </partitioning>
     <connection>bus_control_variable</connection>
-    <cache>N</cache>
-    <cache_load_all>N</cache_load_all>
+    <cache>Y</cache>
+    <cache_load_all>Y</cache_load_all>
     <cache_size>0</cache_size>
     <lookup>
       <schema/>
@@ -1899,6 +1951,12 @@
         <condition>&#x3d;</condition>
         <name2/>
       </key>
+      <key>
+        <name>destory</name>
+        <field>destroy</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
       <value>
         <name>station_name</name>
         <rename>zdzname_calcu</rename>
@@ -1953,6 +2011,12 @@
         <condition>&#x3d;</condition>
         <name2/>
       </key>
+      <key>
+        <name>destory</name>
+        <field>destroy</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
       <value>
         <name>directions</name>
         <rename>sxx2</rename>
@@ -1989,7 +2053,7 @@
     <optimizationLevel>9</optimizationLevel>
     <jsScripts>      <jsScript>        <jsScript_type>0</jsScript_type>
         <jsScript_name>Script 1</jsScript_name>
-        <jsScript_script>&#x2f;&#x2f;Script here&#xa;&#xa;&#x2f;&#x2f; &#x6dfb;&#x52a0;&#x7ad9;&#x70b9;&#x6807;&#x8bc6;&#xa;var sendZdtype &#x3d; &#x27;B&#x27;&#x3b;&#xa;var endZdtype &#x3d; &#x27;E&#x27;&#x3b;&#xa;</jsScript_script>
+        <jsScript_script>&#x2f;&#x2f;Script here&#xa;&#xa;&#x2f;&#x2f; &#x6dfb;&#x52a0;&#x7ad9;&#x70b9;&#x6807;&#x8bc6;&#xa;var sendZdtype &#x3d; &#x27;B&#x27;&#x3b;&#xa;var endZdtype &#x3d; &#x27;E&#x27;&#x3b;&#xa;&#xa;var destory &#x3d; 0&#x3b; &#x2f;&#x2f; &#x672a;&#x64a4;&#x9500;flag</jsScript_script>
       </jsScript>    </jsScripts>    <fields>      <field>        <name>sendZdtype</name>
         <rename>sendZdtype</rename>
         <type>String</type>
@@ -2002,6 +2066,12 @@
         <length>-1</length>
         <precision>-1</precision>
         <replace>N</replace>
+      </field>      <field>        <name>destory</name>
+        <rename>destory</rename>
+        <type>Integer</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <replace>N</replace>
       </field>    </fields>     <cluster_schema/>
  <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
       <xloc>588</xloc>
@@ -2539,7 +2609,7 @@
     <optimizationLevel>9</optimizationLevel>
     <jsScripts>      <jsScript>        <jsScript_type>0</jsScript_type>
         <jsScript_name>Script 1</jsScript_name>
-        <jsScript_script>&#x2f;&#x2f;Script here&#xa;&#xa;&#x2f;&#x2f; &#x6dfb;&#x52a0;&#x7ad9;&#x70b9;&#x6807;&#x8bc6;&#xa;var cc_groups &#x3d; qdzgroups.split&#x28;&#x22;,&#x22;&#x29;&#x3b; &#x2f;&#x2f; &#x6240;&#x6709;&#x73ed;&#x6b21;&#x8d77;&#x70b9;&#x7ad9;&#x6570;&#x7ec4;&#xa;var qdzname_calcu &#x3d; cc_groups&#x5b;gno - 2&#x5d;&#x3b; &#x2f;&#x2f; &#x8fdb;&#x573a;&#x73ed;&#x6b21;&#x7684;&#x8d77;&#x70b9;&#x7ad9;&#x662f;&#x4e0a;&#x4e00;&#x4e2a;&#x73ed;&#x6b21;&#x7684;&#x7ec8;&#x70b9;&#x7ad9;&#xff0c;&#x8fd9;&#x91cc;&#x53ea;&#x6709;&#x4e0a;&#x4e00;&#x4e2a;&#x73ed;&#x6b21;&#x7684;&#x8d77;&#x70b9;&#x7ad9;&#xff0c;&#x8fd8;&#x9700;&#x8981;&#x8ba1;&#x7b97;&#xa;var startZdtype_calcu &#x3d; &#x27;B&#x27;&#x3b;&#xa;var endZdtype_calcu &#x3d; &#x27;E&#x27;&#x3b;</jsScript_script>
+        <jsScript_script>&#x2f;&#x2f;Script here&#xa;&#xa;&#x2f;&#x2f; &#x6dfb;&#x52a0;&#x7ad9;&#x70b9;&#x6807;&#x8bc6;&#xa;var cc_groups &#x3d; qdzgroups.split&#x28;&#x22;,&#x22;&#x29;&#x3b; &#x2f;&#x2f; &#x6240;&#x6709;&#x73ed;&#x6b21;&#x8d77;&#x70b9;&#x7ad9;&#x6570;&#x7ec4;&#xa;var qdzname_calcu &#x3d; cc_groups&#x5b;gno - 2&#x5d;&#x3b; &#x2f;&#x2f; &#x8fdb;&#x573a;&#x73ed;&#x6b21;&#x7684;&#x8d77;&#x70b9;&#x7ad9;&#x662f;&#x4e0a;&#x4e00;&#x4e2a;&#x73ed;&#x6b21;&#x7684;&#x7ec8;&#x70b9;&#x7ad9;&#xff0c;&#x8fd9;&#x91cc;&#x53ea;&#x6709;&#x4e0a;&#x4e00;&#x4e2a;&#x73ed;&#x6b21;&#x7684;&#x8d77;&#x70b9;&#x7ad9;&#xff0c;&#x8fd8;&#x9700;&#x8981;&#x8ba1;&#x7b97;&#xa;var startZdtype_calcu &#x3d; &#x27;B&#x27;&#x3b;&#xa;var endZdtype_calcu &#x3d; &#x27;E&#x27;&#x3b;&#xa;&#xa;var destory &#x3d; 0&#x3b; &#x2f;&#x2f; &#x672a;&#x64a4;&#x9500;flag</jsScript_script>
       </jsScript>    </jsScripts>    <fields>      <field>        <name>qdzname_calcu</name>
         <rename>qdzname_calcu</rename>
         <type>String</type>
@@ -2558,6 +2628,12 @@
         <length>-1</length>
         <precision>-1</precision>
         <replace>N</replace>
+      </field>      <field>        <name>destory</name>
+        <rename>destory</rename>
+        <type>Integer</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <replace>N</replace>
       </field>    </fields>     <cluster_schema/>
  <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
       <xloc>754</xloc>
@@ -74,6 +74,27 @@
     <is_key_private>N</is_key_private>
   </info>
   <notepads>
+    <notepad>
+      <note>&#x8fd9;&#x91cc;&#x6709;&#x4e9b;&#x95ee;&#x9898;&#xa;&#x5728;window2012&#x7684;&#x73af;&#x5883;&#x4e0b;&#xff0c;&#xa;MySql&#x6570;&#x636e;&#x5e93;&#x67e5;&#x8be2;&#x4e2d;&#x5982;&#x679c;&#x8fd4;&#x56de;&#x4e2d;&#x6587;&#x5185;&#x5bb9;&#x7684;&#x5b57;&#x6bb5;&#xff0c;&#x8fd9;&#x4e2a;&#x5185;&#x5bb9;&#x4e71;&#x7801;&#xa;&#x89e3;&#x51b3;&#x529e;&#x6cd5;&#xff0c;&#x5c31;&#x662f;&#x6570;&#x636e;&#x5e93;&#x67e5;&#x8be2;&#x5168;&#x90e8;&#x7f13;&#x5b58;&#xff0c;&#x5c31;&#x4e0d;&#x4e71;&#x7801;&#xa;linux&#x73af;&#x5883;&#x4e0b;&#x6ca1;&#x95ee;&#x9898;</note>
+      <xloc>114</xloc>
+      <yloc>227</yloc>
+      <width>333</width>
+      <heigth>90</heigth>
+      <fontname>YaHei Consolas Hybrid</fontname>
+      <fontsize>12</fontsize>
+      <fontbold>N</fontbold>
+      <fontitalic>N</fontitalic>
+      <fontcolorred>0</fontcolorred>
+      <fontcolorgreen>0</fontcolorgreen>
+      <fontcolorblue>0</fontcolorblue>
+      <backgroundcolorred>255</backgroundcolorred>
+      <backgroundcolorgreen>205</backgroundcolorgreen>
+      <backgroundcolorblue>112</backgroundcolorblue>
+      <bordercolorred>100</bordercolorred>
+      <bordercolorgreen>100</bordercolorgreen>
+      <bordercolorblue>100</bordercolorblue>
+      <drawshadow>Y</drawshadow>
+    </notepad>
   </notepads>
   <connection>
     <name>bus_control_variable</name>
@@ -88,6 +109,7 @@
     <data_tablespace/>
     <index_tablespace/>
     <attributes>
+      <attribute><code>EXTRA_OPTION_MYSQL.characterEncoding</code><attribute>utf8</attribute></attribute>
       <attribute><code>EXTRA_OPTION_MYSQL.defaultFetchSize</code><attribute>500</attribute></attribute>
       <attribute><code>EXTRA_OPTION_MYSQL.useCursorFetch</code><attribute>true</attribute></attribute>
       <attribute><code>FORCE_IDENTIFIERS_TO_LOWERCASE</code><attribute>N</attribute></attribute>
@@ -243,6 +265,73 @@
   <hop> <from>&#x8def;&#x724c;&#x540d;&#x5b57;&#x67e5;&#x627e;</from><to>&#x6392;&#x5e8f;&#x8bb0;&#x5f55;</to><enabled>Y</enabled> </hop>
   </order>
   <step>
+    <name>Excel&#x8f93;&#x51fa;</name>
+    <type>ExcelOutput</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+    <header>Y</header>
+    <footer>N</footer>
+    <encoding/>
+    <append>N</append>
+    <add_to_result_filenames>Y</add_to_result_filenames>
+    <file>
+      <name>&#x24;&#x7b;filepath&#x7d;</name>
+      <extention/>
+      <do_not_open_newfile_init>N</do_not_open_newfile_init>
+      <create_parent_folder>N</create_parent_folder>
+      <split>N</split>
+      <add_date>N</add_date>
+      <add_time>N</add_time>
+      <SpecifyFormat>N</SpecifyFormat>
+      <date_time_format/>
+      <sheetname>Sheet1</sheetname>
+      <autosizecolums>N</autosizecolums>
+      <nullisblank>N</nullisblank>
+      <protect_sheet>N</protect_sheet>
+      <password>Encrypted </password>
+      <splitevery>0</splitevery>
+      <usetempfiles>N</usetempfiles>
+      <tempdirectory/>
+      </file>
+    <template>
+      <enabled>N</enabled>
+      <append>N</append>
+      <filename>template.xls</filename>
+    </template>
+    <fields>
+    </fields>
+    <custom>
+    <header_font_name>arial</header_font_name>
+    <header_font_size>10</header_font_size>
+    <header_font_bold>N</header_font_bold>
+    <header_font_italic>N</header_font_italic>
+    <header_font_underline>no</header_font_underline>
+    <header_font_orientation>horizontal</header_font_orientation>
+    <header_font_color>black</header_font_color>
+    <header_background_color>none</header_background_color>
+    <header_row_height>255</header_row_height>
+    <header_alignment>left</header_alignment>
+    <header_image/>
+    <row_font_name>arial</row_font_name>
+    <row_font_size>10</row_font_size>
+    <row_font_color>black</row_font_color>
+    <row_background_color>none</row_background_color>
+      </custom>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>731</xloc>
+      <yloc>65</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
     <name>&#x5217;&#x8f6c;&#x884c;</name>
     <type>Denormaliser</type>
     <description/>
@@ -368,6 +457,30 @@
     </step>
  
   <step>
+    <name>&#x5b57;&#x6bb5;&#x9009;&#x62e9;</name>
+    <type>SelectValues</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+    <fields>      <field>        <name>lp_name</name>
+        <rename>&#x8def;&#x724c;</rename>
+        <length>-2</length>
+        <precision>-2</precision>
+      </field>        <select_unspecified>Y</select_unspecified>
+    </fields>     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>534</xloc>
+      <yloc>243</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
     <name>&#x6392;&#x5e8f;&#x8bb0;&#x5f55;</name>
     <type>SortRows</type>
     <description/>
@@ -434,97 +547,6 @@
     </step>
  
   <step>
-    <name>Excel&#x8f93;&#x51fa;</name>
-    <type>ExcelOutput</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-         <partitioning>
-           <method>none</method>
-           <schema_name/>
-           </partitioning>
-    <header>Y</header>
-    <footer>N</footer>
-    <encoding/>
-    <append>N</append>
-    <add_to_result_filenames>Y</add_to_result_filenames>
-    <file>
-      <name>&#x24;&#x7b;filepath&#x7d;</name>
-      <extention/>
-      <do_not_open_newfile_init>N</do_not_open_newfile_init>
-      <create_parent_folder>N</create_parent_folder>
-      <split>N</split>
-      <add_date>N</add_date>
-      <add_time>N</add_time>
-      <SpecifyFormat>N</SpecifyFormat>
-      <date_time_format/>
-      <sheetname>Sheet1</sheetname>
-      <autosizecolums>N</autosizecolums>
-      <nullisblank>N</nullisblank>
-      <protect_sheet>N</protect_sheet>
-      <password>Encrypted </password>
-      <splitevery>0</splitevery>
-      <usetempfiles>N</usetempfiles>
-      <tempdirectory/>
-      </file>
-    <template>
-      <enabled>N</enabled>
-      <append>N</append>
-      <filename>template.xls</filename>
-    </template>
-    <fields>
-    </fields>
-    <custom>
-    <header_font_name>arial</header_font_name>
-    <header_font_size>10</header_font_size>
-    <header_font_bold>N</header_font_bold>
-    <header_font_italic>N</header_font_italic>
-    <header_font_underline>no</header_font_underline>
-    <header_font_orientation>horizontal</header_font_orientation>
-    <header_font_color>black</header_font_color>
-    <header_background_color>none</header_background_color>
-    <header_row_height>255</header_row_height>
-    <header_alignment>left</header_alignment>
-    <header_image/>
-    <row_font_name>arial</row_font_name>
-    <row_font_size>10</row_font_size>
-    <row_font_color>black</row_font_color>
-    <row_background_color>none</row_background_color>
-      </custom>
-     <cluster_schema/>
- <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
-      <xloc>731</xloc>
-      <yloc>65</yloc>
-      <draw>Y</draw>
-      </GUI>
-    </step>
-
-  <step>
-    <name>&#x5b57;&#x6bb5;&#x9009;&#x62e9;</name>
-    <type>SelectValues</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-         <partitioning>
-           <method>none</method>
-           <schema_name/>
-           </partitioning>
-    <fields>      <field>        <name>lp_name</name>
-        <rename>&#x8def;&#x724c;</rename>
-        <length>-2</length>
-        <precision>-2</precision>
-      </field>        <select_unspecified>Y</select_unspecified>
-    </fields>     <cluster_schema/>
- <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
-      <xloc>534</xloc>
-      <yloc>243</yloc>
-      <draw>Y</draw>
-      </GUI>
-    </step>
-
-  <step>
     <name>&#x8def;&#x724c;&#x540d;&#x5b57;&#x67e5;&#x627e;</name>
     <type>DBLookup</type>
     <description/>
@@ -536,8 +558,8 @@
            <schema_name/>
            </partitioning>
     <connection>bus_control_variable</connection>
-    <cache>N</cache>
-    <cache_load_all>N</cache_load_all>
+    <cache>Y</cache>
+    <cache_load_all>Y</cache_load_all>
     <cache_size>0</cache_size>
     <lookup>
       <schema/>
@@ -89,6 +89,27 @@
     <is_key_private>N</is_key_private>
   </info>
   <notepads>
+    <notepad>
+      <note>&#x8fd9;&#x91cc;&#x6709;&#x4e9b;&#x95ee;&#x9898;&#xa;&#x5728;window2012&#x7684;&#x73af;&#x5883;&#x4e0b;&#xff0c;&#xa;MySql&#x6570;&#x636e;&#x5e93;&#x67e5;&#x8be2;&#x4e2d;&#x5982;&#x679c;&#x8fd4;&#x56de;&#x4e2d;&#x6587;&#x5185;&#x5bb9;&#x7684;&#x5b57;&#x6bb5;&#xff0c;&#x8fd9;&#x4e2a;&#x5185;&#x5bb9;&#x4e71;&#x7801;&#xa;&#x89e3;&#x51b3;&#x529e;&#x6cd5;&#xff0c;&#x5c31;&#x662f;&#x6570;&#x636e;&#x5e93;&#x67e5;&#x8be2;&#x5168;&#x90e8;&#x7f13;&#x5b58;&#xff0c;&#x5c31;&#x4e0d;&#x4e71;&#x7801;&#xa;linux&#x73af;&#x5883;&#x4e0b;&#x6ca1;&#x95ee;&#x9898;</note>
+      <xloc>165</xloc>
+      <yloc>402</yloc>
+      <width>333</width>
+      <heigth>90</heigth>
+      <fontname>YaHei Consolas Hybrid</fontname>
+      <fontsize>12</fontsize>
+      <fontbold>N</fontbold>
+      <fontitalic>N</fontitalic>
+      <fontcolorred>0</fontcolorred>
+      <fontcolorgreen>0</fontcolorgreen>
+      <fontcolorblue>0</fontcolorblue>
+      <backgroundcolorred>255</backgroundcolorred>
+      <backgroundcolorgreen>205</backgroundcolorgreen>
+      <backgroundcolorblue>112</backgroundcolorblue>
+      <bordercolorred>100</bordercolorred>
+      <bordercolorgreen>100</bordercolorgreen>
+      <bordercolorblue>100</bordercolorblue>
+      <drawshadow>Y</drawshadow>
+    </notepad>
   </notepads>
   <connection>
     <name>bus_control_variable</name>
@@ -103,6 +124,7 @@
     <data_tablespace/>
     <index_tablespace/>
     <attributes>
+      <attribute><code>EXTRA_OPTION_MYSQL.characterEncoding</code><attribute>utf8</attribute></attribute>
       <attribute><code>EXTRA_OPTION_MYSQL.defaultFetchSize</code><attribute>500</attribute></attribute>
       <attribute><code>EXTRA_OPTION_MYSQL.useCursorFetch</code><attribute>true</attribute></attribute>
       <attribute><code>FORCE_IDENTIFIERS_TO_LOWERCASE</code><attribute>N</attribute></attribute>
@@ -322,8 +344,8 @@
     </step>
  
   <step>
-    <name>&#x65f6;&#x523b;&#x8868;&#x660e;&#x7ec6;&#x5206;&#x7ec4;&#x6570;&#x636e;</name>
-    <type>TableInput</type>
+    <name>&#x5b57;&#x6bb5;&#x9009;&#x62e9;</name>
+    <type>SelectValues</type>
     <description/>
     <distribute>Y</distribute>
     <custom_distribution/>
@@ -332,24 +354,30 @@
            <method>none</method>
            <schema_name/>
            </partitioning>
-    <connection>bus_control_variable</connection>
-    <sql>select &#xa;fcno&#xa;, min&#x28;xl_dir&#x29; xl_dir&#xa;,min&#x28;qdz&#x29; qdz&#xa;,min&#x28;zdz&#x29; zdz&#xa;,bc_type &#xa;from bsth_c_s_ttinfo_detail&#xa;where ttinfo &#x3d; &#x24;&#x7b;ttinfoid&#x7d;&#xa;group by fcno,bc_type</sql>
-    <limit>0</limit>
-    <lookup/>
-    <execute_each_row>N</execute_each_row>
-    <variables_active>Y</variables_active>
-    <lazy_conversion_active>N</lazy_conversion_active>
-     <cluster_schema/>
+    <fields>      <field>        <name>fieldname</name>
+        <rename/>
+        <length>-2</length>
+        <precision>-2</precision>
+      </field>      <field>        <name>fieldtype</name>
+        <rename/>
+        <length>-2</length>
+        <precision>-2</precision>
+      </field>      <field>        <name>fcno</name>
+        <rename/>
+        <length>-2</length>
+        <precision>-2</precision>
+      </field>        <select_unspecified>N</select_unspecified>
+    </fields>     <cluster_schema/>
  <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
-      <xloc>56</xloc>
-      <yloc>185</yloc>
+      <xloc>533</xloc>
+      <yloc>325</yloc>
       <draw>Y</draw>
       </GUI>
     </step>
  
   <step>
-    <name>&#x8fc7;&#x6ee4;&#x8bb0;&#x5f55;</name>
-    <type>FilterRows</type>
+    <name>&#x6392;&#x5e8f;&#x8bb0;&#x5f55;</name>
+    <type>SortRows</type>
     <description/>
     <distribute>Y</distribute>
     <custom_distribution/>
@@ -358,27 +386,32 @@
            <method>none</method>
            <schema_name/>
            </partitioning>
-<send_true_to/>
-<send_false_to/>
-    <compare>
-<condition>
- <negated>N</negated>
- <leftvalue>bc_type</leftvalue>
- <function>IS NOT NULL</function>
- <rightvalue/>
- </condition>
-    </compare>
+      <directory>&#x25;&#x25;java.io.tmpdir&#x25;&#x25;</directory>
+      <prefix>out</prefix>
+      <sort_size>1000000</sort_size>
+      <free_memory/>
+      <compress>N</compress>
+      <compress_variable/>
+      <unique_rows>N</unique_rows>
+    <fields>
+      <field>
+        <name>fcno</name>
+        <ascending>Y</ascending>
+        <case_sensitive>N</case_sensitive>
+        <presorted>N</presorted>
+      </field>
+    </fields>
      <cluster_schema/>
  <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
-      <xloc>182</xloc>
-      <yloc>189</yloc>
+      <xloc>642</xloc>
+      <yloc>325</yloc>
       <draw>Y</draw>
       </GUI>
     </step>
  
   <step>
-    <name>&#x8ba1;&#x7b97;&#x7ad9;&#x70b9;</name>
-    <type>ScriptValueMod</type>
+    <name>&#x65f6;&#x523b;&#x8868;&#x660e;&#x7ec6;&#x5206;&#x7ec4;&#x6570;&#x636e;</name>
+    <type>TableInput</type>
     <description/>
     <distribute>Y</distribute>
     <custom_distribution/>
@@ -387,21 +420,17 @@
            <method>none</method>
            <schema_name/>
            </partitioning>
-    <compatible>N</compatible>
-    <optimizationLevel>9</optimizationLevel>
-    <jsScripts>      <jsScript>        <jsScript_type>0</jsScript_type>
-        <jsScript_name>Script 1</jsScript_name>
-        <jsScript_script>&#x2f;&#x2f;Script here&#xa;&#xa;var zd&#x3b;&#xa;&#xa;if &#x28;bc_type &#x3d;&#x3d; &#x27;in&#x27;&#x29; &#x7b;&#xa;	zd &#x3d; qdz&#x3b;&#xa;&#x7d; else if &#x28;bc_type &#x3d;&#x3d; &#x27;out&#x27;&#x29; &#x7b;&#xa;	zd &#x3d; zdz&#x3b;&#xa;&#x7d; else if &#x28;bc_type &#x3d;&#x3d; &#x27;normal&#x27;&#x29; &#x7b;&#xa;	zd &#x3d; qdz&#x3b;&#xa;&#x7d; else &#x7b;&#xa;	zd &#x3d; qdz&#x3b;&#xa;&#x7d;&#xa;</jsScript_script>
-      </jsScript>    </jsScripts>    <fields>      <field>        <name>zd</name>
-        <rename>zd</rename>
-        <type>String</type>
-        <length>-1</length>
-        <precision>-1</precision>
-        <replace>N</replace>
-      </field>    </fields>     <cluster_schema/>
+    <connection>bus_control_variable</connection>
+    <sql>select &#xa;fcno&#xa;, min&#x28;xl_dir&#x29; xl_dir&#xa;,min&#x28;qdz&#x29; qdz&#xa;,min&#x28;zdz&#x29; zdz&#xa;,bc_type &#xa;from bsth_c_s_ttinfo_detail&#xa;where ttinfo &#x3d; &#x24;&#x7b;ttinfoid&#x7d;&#xa;group by fcno,bc_type</sql>
+    <limit>0</limit>
+    <lookup/>
+    <execute_each_row>N</execute_each_row>
+    <variables_active>Y</variables_active>
+    <lazy_conversion_active>N</lazy_conversion_active>
+     <cluster_schema/>
  <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
-      <xloc>300</xloc>
-      <yloc>190</yloc>
+      <xloc>56</xloc>
+      <yloc>185</yloc>
       <draw>Y</draw>
       </GUI>
     </step>
@@ -418,8 +447,8 @@
            <schema_name/>
            </partitioning>
     <connection>bus_control_variable</connection>
-    <cache>N</cache>
-    <cache_load_all>N</cache_load_all>
+    <cache>Y</cache>
+    <cache_load_all>Y</cache_load_all>
     <cache_size>0</cache_size>
     <lookup>
       <schema/>
@@ -455,8 +484,8 @@
     </step>
  
   <step>
-    <name>&#x8ba1;&#x7b97;&#x53cd;&#x8303;&#x5f0f;&#x5143;&#x6570;&#x636e;</name>
-    <type>ScriptValueMod</type>
+    <name>&#x751f;&#x6210;&#x8def;&#x724c;&#x5b57;&#x6bb5;</name>
+    <type>RowGenerator</type>
     <description/>
     <distribute>Y</distribute>
     <custom_distribution/>
@@ -465,39 +494,53 @@
            <method>none</method>
            <schema_name/>
            </partitioning>
-    <compatible>N</compatible>
-    <optimizationLevel>9</optimizationLevel>
-    <jsScripts>      <jsScript>        <jsScript_type>0</jsScript_type>
-        <jsScript_name>Script 1</jsScript_name>
-        <jsScript_script>&#x2f;&#x2f;Script here&#xa;&#xa;var targetfieldname&#x3b; &#x2f;&#x2f; &#x76ee;&#x6807;&#x5b57;&#x6bb5;&#x540d;&#xa;var targettype&#x3b; &#x2f;&#x2f; &#x76ee;&#x6807;&#x7c7b;&#x578b;&#xa;var valuefieldname&#x3b; &#x2f;&#x2f; &#x503c;&#x5b57;&#x6bb5;&#x540d;&#xa;var keyvalue&#x3b; &#x2f;&#x2f; &#x5173;&#x952e;&#x5b57;&#x503c;&#xa;&#xa;if &#x28;bc_type &#x3d;&#x3d; &#x27;in&#x27;&#x29; &#x7b;&#xa;	targetfieldname &#x3d; &#x27;&#x8fdb;&#x573a;&#x27; &#x2b; fcno&#x3b;&#xa;&#x7d; else if &#x28;bc_type &#x3d;&#x3d; &#x27;out&#x27;&#x29; &#x7b;&#xa;	targetfieldname &#x3d; &#x27;&#x51fa;&#x573a;&#x27; &#x2b; fcno&#x3b;&#xa;&#x7d; else if &#x28;bc_type &#x3d;&#x3d; &#x27;normal&#x27;&#x29; &#x7b;&#xa;	targetfieldname &#x3d; zdname &#x2b; fcno&#x3b;&#xa;&#x7d; else &#x7b;&#xa;	targetfieldname &#x3d; zdname &#x2b; fcno&#x3b;&#xa;&#x7d; &#xa;&#xa;targettype &#x3d; &#x27;String&#x27;&#x3b;&#xa;valuefieldname &#x3d; &#x27;fcsj&#x27;&#x3b;&#xa;keyvalue &#x3d; fcno&#x3b;&#xa;</jsScript_script>
-      </jsScript>    </jsScripts>    <fields>      <field>        <name>targetfieldname</name>
-        <rename>targetfieldname</rename>
-        <type>String</type>
-        <length>-1</length>
-        <precision>-1</precision>
-        <replace>N</replace>
-      </field>      <field>        <name>targettype</name>
-        <rename>targettype</rename>
+    <fields>
+      <field>
+        <name>fieldname</name>
         <type>String</type>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+        <nullif>&#x8def;&#x724c;</nullif>
         <length>-1</length>
         <precision>-1</precision>
-        <replace>N</replace>
-      </field>      <field>        <name>valuefieldname</name>
-        <rename>valuefieldname</rename>
+        <set_empty_string>N</set_empty_string>
+      </field>
+      <field>
+        <name>fieldtype</name>
         <type>String</type>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+        <nullif>String</nullif>
         <length>-1</length>
         <precision>-1</precision>
-        <replace>N</replace>
-      </field>      <field>        <name>keyvalue</name>
-        <rename>keyvalue</rename>
-        <type>String</type>
+        <set_empty_string>N</set_empty_string>
+      </field>
+      <field>
+        <name>fcno</name>
+        <type>Integer</type>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+        <nullif>0</nullif>
         <length>-1</length>
         <precision>-1</precision>
-        <replace>N</replace>
-      </field>    </fields>     <cluster_schema/>
+        <set_empty_string>N</set_empty_string>
+      </field>
+    </fields>
+    <limit>1</limit>
+    <never_ending>N</never_ending>
+    <interval_in_ms>5000</interval_in_ms>
+    <row_time_field>now</row_time_field>
+    <last_time_field>FiveSecondsAgo</last_time_field>
+     <cluster_schema/>
  <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
-      <xloc>410</xloc>
-      <yloc>64</yloc>
+      <xloc>530</xloc>
+      <yloc>194</yloc>
       <draw>Y</draw>
       </GUI>
     </step>
@@ -539,8 +582,8 @@
     </step>
  
   <step>
-    <name>&#x5b57;&#x6bb5;&#x9009;&#x62e9;</name>
-    <type>SelectValues</type>
+    <name>&#x8ba1;&#x7b97;&#x53cd;&#x8303;&#x5f0f;&#x5143;&#x6570;&#x636e;</name>
+    <type>ScriptValueMod</type>
     <description/>
     <distribute>Y</distribute>
     <custom_distribution/>
@@ -549,30 +592,46 @@
            <method>none</method>
            <schema_name/>
            </partitioning>
-    <fields>      <field>        <name>fieldname</name>
-        <rename/>
-        <length>-2</length>
-        <precision>-2</precision>
-      </field>      <field>        <name>fieldtype</name>
-        <rename/>
-        <length>-2</length>
-        <precision>-2</precision>
-      </field>      <field>        <name>fcno</name>
-        <rename/>
-        <length>-2</length>
-        <precision>-2</precision>
-      </field>        <select_unspecified>N</select_unspecified>
-    </fields>     <cluster_schema/>
+    <compatible>N</compatible>
+    <optimizationLevel>9</optimizationLevel>
+    <jsScripts>      <jsScript>        <jsScript_type>0</jsScript_type>
+        <jsScript_name>Script 1</jsScript_name>
+        <jsScript_script>&#x2f;&#x2f;Script here&#xa;&#xa;var targetfieldname&#x3b; &#x2f;&#x2f; &#x76ee;&#x6807;&#x5b57;&#x6bb5;&#x540d;&#xa;var targettype&#x3b; &#x2f;&#x2f; &#x76ee;&#x6807;&#x7c7b;&#x578b;&#xa;var valuefieldname&#x3b; &#x2f;&#x2f; &#x503c;&#x5b57;&#x6bb5;&#x540d;&#xa;var keyvalue&#x3b; &#x2f;&#x2f; &#x5173;&#x952e;&#x5b57;&#x503c;&#xa;&#xa;if &#x28;bc_type &#x3d;&#x3d; &#x27;in&#x27;&#x29; &#x7b;&#xa;	targetfieldname &#x3d; &#x27;&#x8fdb;&#x573a;&#x27; &#x2b; fcno&#x3b;&#xa;&#x7d; else if &#x28;bc_type &#x3d;&#x3d; &#x27;out&#x27;&#x29; &#x7b;&#xa;	targetfieldname &#x3d; &#x27;&#x51fa;&#x573a;&#x27; &#x2b; fcno&#x3b;&#xa;&#x7d; else if &#x28;bc_type &#x3d;&#x3d; &#x27;normal&#x27;&#x29; &#x7b;&#xa;	targetfieldname &#x3d; zdname &#x2b; fcno&#x3b;&#xa;&#x7d; else &#x7b;&#xa;	targetfieldname &#x3d; zdname &#x2b; fcno&#x3b;&#xa;&#x7d; &#xa;&#xa;targettype &#x3d; &#x27;String&#x27;&#x3b;&#xa;valuefieldname &#x3d; &#x27;fcsj&#x27;&#x3b;&#xa;keyvalue &#x3d; fcno&#x3b;&#xa;</jsScript_script>
+      </jsScript>    </jsScripts>    <fields>      <field>        <name>targetfieldname</name>
+        <rename>targetfieldname</rename>
+        <type>String</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <replace>N</replace>
+      </field>      <field>        <name>targettype</name>
+        <rename>targettype</rename>
+        <type>String</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <replace>N</replace>
+      </field>      <field>        <name>valuefieldname</name>
+        <rename>valuefieldname</rename>
+        <type>String</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <replace>N</replace>
+      </field>      <field>        <name>keyvalue</name>
+        <rename>keyvalue</rename>
+        <type>String</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <replace>N</replace>
+      </field>    </fields>     <cluster_schema/>
  <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
-      <xloc>533</xloc>
-      <yloc>325</yloc>
+      <xloc>410</xloc>
+      <yloc>64</yloc>
       <draw>Y</draw>
       </GUI>
     </step>
  
   <step>
-    <name>&#x751f;&#x6210;&#x8def;&#x724c;&#x5b57;&#x6bb5;</name>
-    <type>RowGenerator</type>
+    <name>&#x8ba1;&#x7b97;&#x7ad9;&#x70b9;</name>
+    <type>ScriptValueMod</type>
     <description/>
     <distribute>Y</distribute>
     <custom_distribution/>
@@ -581,60 +640,28 @@
            <method>none</method>
            <schema_name/>
            </partitioning>
-    <fields>
-      <field>
-        <name>fieldname</name>
-        <type>String</type>
-        <format/>
-        <currency/>
-        <decimal/>
-        <group/>
-        <nullif>&#x8def;&#x724c;</nullif>
-        <length>-1</length>
-        <precision>-1</precision>
-        <set_empty_string>N</set_empty_string>
-      </field>
-      <field>
-        <name>fieldtype</name>
+    <compatible>N</compatible>
+    <optimizationLevel>9</optimizationLevel>
+    <jsScripts>      <jsScript>        <jsScript_type>0</jsScript_type>
+        <jsScript_name>Script 1</jsScript_name>
+        <jsScript_script>&#x2f;&#x2f;Script here&#xa;&#xa;var zd&#x3b;&#xa;&#xa;if &#x28;bc_type &#x3d;&#x3d; &#x27;in&#x27;&#x29; &#x7b;&#xa;	zd &#x3d; qdz&#x3b;&#xa;&#x7d; else if &#x28;bc_type &#x3d;&#x3d; &#x27;out&#x27;&#x29; &#x7b;&#xa;	zd &#x3d; zdz&#x3b;&#xa;&#x7d; else if &#x28;bc_type &#x3d;&#x3d; &#x27;normal&#x27;&#x29; &#x7b;&#xa;	zd &#x3d; qdz&#x3b;&#xa;&#x7d; else &#x7b;&#xa;	zd &#x3d; qdz&#x3b;&#xa;&#x7d;&#xa;</jsScript_script>
+      </jsScript>    </jsScripts>    <fields>      <field>        <name>zd</name>
+        <rename>zd</rename>
         <type>String</type>
-        <format/>
-        <currency/>
-        <decimal/>
-        <group/>
-        <nullif>String</nullif>
-        <length>-1</length>
-        <precision>-1</precision>
-        <set_empty_string>N</set_empty_string>
-      </field>
-      <field>
-        <name>fcno</name>
-        <type>Integer</type>
-        <format/>
-        <currency/>
-        <decimal/>
-        <group/>
-        <nullif>0</nullif>
         <length>-1</length>
         <precision>-1</precision>
-        <set_empty_string>N</set_empty_string>
-      </field>
-    </fields>
-    <limit>1</limit>
-    <never_ending>N</never_ending>
-    <interval_in_ms>5000</interval_in_ms>
-    <row_time_field>now</row_time_field>
-    <last_time_field>FiveSecondsAgo</last_time_field>
-     <cluster_schema/>
+        <replace>N</replace>
+      </field>    </fields>     <cluster_schema/>
  <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
-      <xloc>530</xloc>
-      <yloc>194</yloc>
+      <xloc>300</xloc>
+      <yloc>190</yloc>
       <draw>Y</draw>
       </GUI>
     </step>
  
   <step>
-    <name>&#x6392;&#x5e8f;&#x8bb0;&#x5f55;</name>
-    <type>SortRows</type>
+    <name>&#x8fc7;&#x6ee4;&#x8bb0;&#x5f55;</name>
+    <type>FilterRows</type>
     <description/>
     <distribute>Y</distribute>
     <custom_distribution/>
@@ -643,25 +670,20 @@
            <method>none</method>
            <schema_name/>
            </partitioning>
-      <directory>&#x25;&#x25;java.io.tmpdir&#x25;&#x25;</directory>
-      <prefix>out</prefix>
-      <sort_size>1000000</sort_size>
-      <free_memory/>
-      <compress>N</compress>
-      <compress_variable/>
-      <unique_rows>N</unique_rows>
-    <fields>
-      <field>
-        <name>fcno</name>
-        <ascending>Y</ascending>
-        <case_sensitive>N</case_sensitive>
-        <presorted>N</presorted>
-      </field>
-    </fields>
+<send_true_to/>
+<send_false_to/>
+    <compare>
+<condition>
+ <negated>N</negated>
+ <leftvalue>bc_type</leftvalue>
+ <function>IS NOT NULL</function>
+ <rightvalue/>
+ </condition>
+    </compare>
      <cluster_schema/>
  <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
-      <xloc>642</xloc>
-      <yloc>325</yloc>
+      <xloc>182</xloc>
+      <yloc>189</yloc>
       <draw>Y</draw>
       </GUI>
     </step>
@@ -89,6 +89,27 @@
     <is_key_private>N</is_key_private>
   </info>
   <notepads>
+    <notepad>
+      <note>&#x8fd9;&#x91cc;&#x6709;&#x4e9b;&#x95ee;&#x9898;&#xa;&#x5728;window2012&#x7684;&#x73af;&#x5883;&#x4e0b;&#xff0c;&#xa;MySql&#x6570;&#x636e;&#x5e93;&#x67e5;&#x8be2;&#x4e2d;&#x5982;&#x679c;&#x8fd4;&#x56de;&#x4e2d;&#x6587;&#x5185;&#x5bb9;&#x7684;&#x5b57;&#x6bb5;&#xff0c;&#x8fd9;&#x4e2a;&#x5185;&#x5bb9;&#x4e71;&#x7801;&#xa;&#x89e3;&#x51b3;&#x529e;&#x6cd5;&#xff0c;&#x5c31;&#x662f;&#x6570;&#x636e;&#x5e93;&#x67e5;&#x8be2;&#x5168;&#x90e8;&#x7f13;&#x5b58;&#xff0c;&#x5c31;&#x4e0d;&#x4e71;&#x7801;&#xa;linux&#x73af;&#x5883;&#x4e0b;&#x6ca1;&#x95ee;&#x9898;</note>
+      <xloc>135</xloc>
+      <yloc>299</yloc>
+      <width>333</width>
+      <heigth>90</heigth>
+      <fontname>YaHei Consolas Hybrid</fontname>
+      <fontsize>12</fontsize>
+      <fontbold>N</fontbold>
+      <fontitalic>N</fontitalic>
+      <fontcolorred>0</fontcolorred>
+      <fontcolorgreen>0</fontcolorgreen>
+      <fontcolorblue>0</fontcolorblue>
+      <backgroundcolorred>255</backgroundcolorred>
+      <backgroundcolorgreen>205</backgroundcolorgreen>
+      <backgroundcolorblue>112</backgroundcolorblue>
+      <bordercolorred>100</bordercolorred>
+      <bordercolorgreen>100</bordercolorgreen>
+      <bordercolorblue>100</bordercolorblue>
+      <drawshadow>Y</drawshadow>
+    </notepad>
   </notepads>
   <connection>
     <name>bus_control_variable</name>
@@ -103,6 +124,7 @@
     <data_tablespace/>
     <index_tablespace/>
     <attributes>
+      <attribute><code>EXTRA_OPTION_MYSQL.characterEncoding</code><attribute>utf8</attribute></attribute>
       <attribute><code>EXTRA_OPTION_MYSQL.defaultFetchSize</code><attribute>500</attribute></attribute>
       <attribute><code>EXTRA_OPTION_MYSQL.useCursorFetch</code><attribute>true</attribute></attribute>
       <attribute><code>FORCE_IDENTIFIERS_TO_LOWERCASE</code><attribute>N</attribute></attribute>
@@ -4544,8 +4566,8 @@
            <schema_name/>
            </partitioning>
     <connection>bus_control_variable</connection>
-    <cache>N</cache>
-    <cache_load_all>N</cache_load_all>
+    <cache>Y</cache>
+    <cache_load_all>Y</cache_load_all>
     <cache_size>0</cache_size>
     <lookup>
       <schema/>
@@ -4598,8 +4620,8 @@
            <schema_name/>
            </partitioning>
     <connection>bus_control_variable</connection>
-    <cache>N</cache>
-    <cache_load_all>N</cache_load_all>
+    <cache>Y</cache>
+    <cache_load_all>Y</cache_load_all>
     <cache_size>0</cache_size>
     <lookup>
       <schema/>
@@ -3,12 +3,7 @@
 #ms.mysql.username= root
 #ms.mysql.password= 123456
  
-#ms.mysql.driver= com.mysql.jdbc.Driver
-#ms.mysql.url= jdbc:mysql://192.168.168.171:3306/ms?useUnicode=true&characterEncoding=utf-8
-#ms.mysql.username= root
-#ms.mysql.password= root2jsp
-
 ms.mysql.driver= com.mysql.jdbc.Driver
-ms.mysql.url= jdbc:mysql://192.168.168.117:3306/ms?useUnicode=true&characterEncoding=utf-8
+ms.mysql.url= jdbc:mysql://192.168.168.171:3306/ms?useUnicode=true&characterEncoding=utf-8
 ms.mysql.username= root
-ms.mysql.password= root
 \ No newline at end of file
+ms.mysql.password= root2jsp
 \ No newline at end of file
+{
+  "name": "handsontable",
+  "description": "Spreadsheet-like data grid editor that provides copy/paste functionality compatible with Excel/Google Docs",
+  "version": "0.24.3",
+  "main": [
+    "./dist/handsontable.js",
+    "./dist/handsontable.css"
+  ],
+  "homepage": "http://handsontable.com/",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/handsontable/handsontable.git"
+  },
+  "authors": [
+    "Handsoncode",
+    "Handsoncode <hello@handsontable.com>"
+  ],
+  "keywords": [
+    "data",
+    "grid",
+    "table",
+    "editor",
+    "grid-editor",
+    "data-grid",
+    "data-table",
+    "spreadsheet",
+    "excel",
+    "tabular-data",
+    "edit-cell",
+    "editable-table",
+    "data-spreadsheet"
+  ],
+  "ignore": [
+    "**/.*",
+    "components",
+    "demo",
+    "node_modules",
+    "src",
+    "test"
+  ],
+  "dependencies": {
+    "zeroclipboard": "^2.2.0",
+    "moment": "^2.9.0",
+    "pikaday": "^1.3.2"
+  },
+  "devDependencies": {
+    "chroma-js": "~0.5.6"
+  },
+  "_release": "0.24.3",
+  "_resolution": {
+    "type": "version",
+    "tag": "0.24.3",
+    "commit": "eb19e2e0a364f0f535380238ddb10a2dd4fc150a"
+  },
+  "_source": "https://github.com/handsontable/handsontable.git",
+  "_target": "~0.24.0",
+  "_originalSource": "handsontable"
+}
 \ No newline at end of file
+All releases are described at https://github.com/handsontable/handsontable/releases
+handsontable.com
+# Contributing to Handsontable
+
+Your contributions to the project are very welcome. If you would like to fix a bug or propose a new feature, you can submit a Pull Request.
+
+To help us merge your Pull Request, please make sure you follow these points:
+
+1. Please make your fix on a separate branch. This makes merging much easier.
+2. Do not edit files in `dist/` directory (e.g: `handsontable.js`, `handsontable.css`, `handsontable.full.js`, `handsontable.full.css`). Instead, try to edit files inside the `src/` directory and then use `grunt` to make a build. More information about this on wiki page [Building](https://github.com/handsontable/handsontable/wiki/Building).
+3. **Very important:** For any change that you make, **please try to also add a test case(s)** in `tests/jasmine/spec/` or `src/3rdparty/walkontable/test/jasmine/spec/`. This helps us understand the issue and make sure that it will stay fixed forever. See [Testing](https://github.com/handsontable/handsontable/wiki/Testing)
+4. **Very important:** Please review our [coding style](https://github.com/handsontable/handsontable/wiki/Coding-style) for instructions on how to maintain a fork and submit patches.
+5. Describe the problem in the Pull Request description (of course you would do it, why do I mention that?)
+
+Thank you for your commitment!
+
+## Team rules
+
+The Handsontable team utilizes Git-Flow. See [How we use Git-Flow](https://github.com/handsontable/handsontable/wiki/How-we-use-Git-Flow)
+/**
+ * This file is used to build Handsontable from `src/*`
+ *
+ * Installation:
+ * 1. Install Grunt CLI (`npm install -g grunt-cli`)
+ * 1. Install Grunt 0.4.0 and other dependencies (`npm install`)
+ *
+ * Build:
+ * Execute `grunt` from root directory of this directory (where Gruntfile.js is)
+ * To execute automatically after each change, execute `grunt --force default watch`
+ * To execute build followed by the test run, execute `grunt test`
+ *
+ * Result:
+ * building Handsontable will create files:
+ *  - dist/handsontable.js
+ *  - dist/handsontable.css
+ *  - dist/handsontable.full.js
+ *  - dist/handsontable.full.css
+ *  - dist/handsontable.full.min.js
+ *  - dist/handsontable.full.min.css
+ *
+ * See http://gruntjs.com/getting-started for more information about Grunt
+ */
+var browsers = [
+  {
+    browserName: 'firefox',
+    platform: 'Windows 7'
+  },
+  {
+    browserName: 'chrome',
+    platform: 'Windows 7'
+  },
+  {
+    browserName: 'opera',
+    platform: 'Windows 7'
+  },
+  //{
+  //  browserName: 'internet explorer',
+  //  version: '8',
+  //  platform: 'Windows 7'
+  //},
+  //{
+  //  browserName: 'internet explorer',
+  //  version: '9',
+  //  platform: 'Windows 7'
+  //},
+  {
+    browserName: 'internet explorer',
+    version: '10',
+    platform: 'Windows 8'
+  }
+];
+
+module.exports = function(grunt) {
+
+  require('time-grunt')(grunt);
+  require('load-grunt-tasks')(grunt);
+
+  grunt.initConfig({
+    pkg: grunt.file.readJSON('package.json'),
+    gitinfo: {},
+
+    meta: {
+      src: [
+        'src/*.js',
+        'src/editors/*.js',
+        'src/plugins/**/!(*.spec).js',
+        'src/renderers/*.js',
+        'src/validators/*.js',
+        'src/shims/*.js',
+        'src/3rdparty/*.js'
+      ],
+      walkontable: [
+        'src/3rdparty/walkontable/src/**/*.js'
+      ],
+      vendor: [
+        'lib/numeral/numeral.js'
+      ]
+    },
+
+    watch: {
+      options: {
+        livereload: true // works with Chrome LiveReload extension. See: https://github.com/gruntjs/grunt-contrib-watch
+      },
+      files: [
+        'src/**/*(*.js|*.css|*.html)',
+        '!src/3rdparty/walkontable/test/**/*',
+        'lib/**/*(*.js|*.css)'
+      ],
+      tasks: ['build-dev']
+    },
+
+    jasmine: {
+      options: {
+        page: {
+          viewportSize: {
+            width: 1200,
+            height: 1000
+          }
+        },
+      },
+      handsontableStandalone: {
+        src: [
+          'dist/handsontable.js',
+          'demo/js/numeral.de-de.js',
+          'demo/js/backbone/lodash.underscore.js',
+          'demo/js/backbone/backbone.js',
+          'demo/js/backbone/backbone-relational/backbone-relational.js',
+          'demo/js/jquery-ui/js/jquery-ui.custom.js',
+          'plugins/removeRow/handsontable.removeRow.js'
+        ],
+        options: {
+          specs: [
+            'test/jasmine/spec/*Spec.js',
+            'test/jasmine/spec/!(mobile)*/*Spec.js',
+            'src/plugins/*/test/*.spec.js',
+            'plugins/*/test/*.spec.js',
+            'test/jasmine/spec/MemoryLeakTest.js'
+          ],
+          styles: [
+            'test/jasmine/css/SpecRunner.css',
+            'dist/handsontable.min.css',
+            'plugins/removeRow/handsontable.removeRow.css',
+            'demo/js/jquery-ui/css/ui-bootstrap/jquery-ui.custom.css',
+            'demo/js/pikaday/css/pikaday.css'
+          ],
+          vendor: [
+            'demo/js/jquery.min.js',
+            'lib/numeral/numeral.js',
+            'demo/js/moment/moment.js',
+            'demo/js/pikaday/pikaday.js',
+            'demo/js/ZeroClipboard.js',
+            'test/jasmine/lib/jasmine-extensions.js'
+          ],
+          helpers: [
+            'test/jasmine/spec/SpecHelper.js',
+            'test/jasmine/lib/nodeShim.js',
+            'test/jasmine/spec/test-init.js'
+          ],
+          outfile: 'test/jasmine/SpecRunner.html',
+          template: 'test/jasmine/templates/SpecRunner.tmpl',
+          keepRunner: true
+        }
+      },
+      handsontableFull: {
+        src: [
+          'dist/handsontable.full.min.js',
+          'demo/js/numeral.de-de.js',
+          'demo/js/backbone/lodash.underscore.js',
+          'demo/js/backbone/backbone.js',
+          'demo/js/backbone/backbone-relational/backbone-relational.js',
+          'demo/js/jquery-ui/js/jquery-ui.custom.js',
+          'plugins/removeRow/handsontable.removeRow.js'
+        ],
+        options: {
+          specs: [
+            'test/jasmine/spec/*Spec.js',
+            'test/jasmine/spec/!(mobile)*/*Spec.js',
+            'src/plugins/*/test/*.spec.js',
+            'plugins/*/test/*.spec.js',
+            'test/jasmine/spec/MemoryLeakTest.js'
+          ],
+          styles: [
+            'test/jasmine/css/SpecRunner.css',
+            'dist/handsontable.min.css',
+            'plugins/removeRow/handsontable.removeRow.css',
+            'demo/js/jquery-ui/css/ui-bootstrap/jquery-ui.custom.css',
+            'demo/js/pikaday/css/pikaday.css'
+          ],
+          vendor: [
+            'demo/js/jquery.min.js',
+            'demo/js/moment/moment.js',
+            'test/jasmine/lib/jasmine-extensions.js'
+          ],
+          helpers: [
+            'test/jasmine/spec/SpecHelper.js',
+            'test/jasmine/lib/nodeShim.js',
+            'test/jasmine/spec/test-init.js'
+          ],
+          outfile: 'test/jasmine/SpecRunner.html',
+          template: 'test/jasmine/templates/SpecRunner.tmpl',
+          keepRunner: true
+        }
+      },
+      walkontable: {
+        src: [
+          'dist/handsontable.min.js'
+        ],
+        options: {
+          specs: [
+            'src/3rdparty/walkontable/test/jasmine/spec/**/*.spec.js'
+          ],
+          styles: [
+            'src/3rdparty/walkontable/css/walkontable.css'
+          ],
+          vendor: [
+            'demo/js/jquery.min.js',
+            'lib/numeral/numeral.js',
+            'demo/js/moment/moment.js',
+            'demo/js/pikaday/pikaday.js',
+            'demo/js/ZeroClipboard.js',
+            'demo/js/numeral.de-de.js'
+          ],
+          helpers: [
+            'src/3rdparty/walkontable/test/jasmine/SpecHelper.js',
+            'test/jasmine/lib/nodeShim.js',
+            'src/3rdparty/walkontable/test/jasmine/test-init.js'
+
+          ],
+          outfile: 'src/3rdparty/walkontable/test/jasmine/SpecRunner.html',
+          template: 'test/jasmine/templates/SpecRunner.tmpl',
+          keepRunner: true
+        }
+      },
+      mobile: {
+        src: [
+          'dist/handsontable.min.js',
+          'demo/js/numeral.de-de.js',
+          'demo/js/backbone/lodash.underscore.js',
+          'demo/js/backbone/backbone.js',
+          'demo/js/backbone/backbone-relational/backbone-relational.js',
+          'demo/js/jquery-ui/js/jquery-ui.custom.js',
+          'plugins/removeRow/handsontable.removeRow.js'
+        ],
+        options: {
+          specs: [
+            'test/jasmine/spec/mobile/*Spec.js',
+            'src/plugins/*/test/mobile/*.spec.js'
+          ],
+          styles: [
+            'test/jasmine/css/SpecRunner.css',
+            'dist/handsontable.min.css',
+            'plugins/removeRow/handsontable.removeRow.css',
+            'demo/js/jquery-ui/css/ui-bootstrap/jquery-ui.custom.css',
+            'demo/js/pikaday/css/pikaday.css'
+          ],
+          vendor: [
+            'demo/js/jquery.min.js',
+            'lib/numeral/numeral.js',
+            'demo/js/ZeroClipboard.js',
+            'demo/js/moment/moment.js',
+            'demo/js/pikaday/pikaday.js',
+            'test/jasmine/lib/jasmine-extensions.js'
+          ],
+          helpers: [
+            'test/jasmine/spec/SpecHelper.js',
+            'test/jasmine/spec/MobileSpecHelper.js',
+            'test/jasmine/lib/nodeShim.js',
+            'test/jasmine/spec/test-init.js'
+          ],
+          outfile: 'test/jasmine/MobileSpecRunner.html',
+          template: 'test/jasmine/templates/SpecRunner.tmpl',
+          keepRunner: true
+        }
+      }
+    },
+
+    connect: {
+      server: {
+        options: {
+          port: 8080,
+          base: '.',
+          keepalive: true
+        }
+      },
+      sauce: {
+        options: {
+          port: 9999,
+          base: '.',
+          keepalive: false
+        }
+      }
+    },
+    'saucelabs-jasmine': {
+      handsontable: {
+        options: {
+          urls: ['http://localhost:9999/test/jasmine/SpecRunner.html'],
+          build: '<%= pkg.version %>-<%= gitinfo.local.branch.current.name %>',
+          concurrency: 3,
+          browsers: browsers,
+          testname: 'Development test (Handsontable)'
+        }
+      },
+      walkontable: {
+        options: {
+          urls: ['http://localhost:9999/src/3rdparty/walkontable/test/jasmine/SpecRunner.html'],
+          build: '<%= pkg.version %>-<%= gitinfo.local.branch.current.name %>',
+          concurrency: 3,
+          browsers: browsers,
+          testname: 'Development test (Walkontable)'
+        }
+      }
+    },
+
+    jshint: {
+      options: {
+        jshintrc: true
+      },
+      handsontable: '<%= meta.src %>',
+      walkontable: '<%= meta.walkontable %>'
+    },
+
+    jscs: {
+      handsontable: {
+        files: {
+          src: ['<%= meta.src %>', '!src/shims/classes.js']
+        }
+      },
+      walkontable: {
+        files: {
+          src: ['<%= meta.walkontable %>', '!src/shims/classes.js']
+        }
+      },
+      options: {
+        config: '.jscsrc',
+        esnext: true,
+        verbose: true
+      }
+    },
+
+    hotBuilder: {
+      handsontable: {
+        files: {
+          dist: 'package.json'
+        }
+      },
+      handsontableDev: {
+        files: {
+          dist: 'package.json'
+        },
+        options: {
+          devMode: true
+        }
+      },
+      handsontableCustom: {
+        files: {
+          dist: 'package.json'
+        },
+        options: {
+          disableUI: false
+        }
+      },
+      options: {
+        minify: true
+      }
+    }
+  });
+
+  // Default task.
+  grunt.registerTask('default', ['jscs', 'jshint', 'gitinfo', 'build']);
+  grunt.registerTask('build', ['hotBuilder:handsontable']);
+  grunt.registerTask('build-dev', ['hotBuilder:handsontableDev']);
+  grunt.registerTask('build-custom', ['hotBuilder:handsontableCustom']);
+  grunt.registerTask('test', ['default', 'jasmine:handsontableStandalone', 'jasmine:handsontableFull', 'jasmine:walkontable', 'jasmine:mobile:build']);
+  grunt.registerTask('test:handsontable', ['default', 'jasmine:handsontableStandalone']);
+  grunt.registerTask('test:handsontableStandalone', ['test:handsontable']);
+  grunt.registerTask('test:handsontableFull', ['default', 'jasmine:handsontableFull']);
+  grunt.registerTask('test:walkontable', ['default', 'jasmine:walkontable']);
+  grunt.registerTask('test:mobile', ['default', 'jasmine:mobile:build']);
+  grunt.registerTask('sauce', ['default', 'connect:sauce', 'saucelabs-jasmine:walkontable', 'saucelabs-jasmine:handsontable']);
+  grunt.registerTask('sauce:handsontable', ['default', 'connect:sauce', 'saucelabs-jasmine:handsontable']);
+  grunt.registerTask('sauce:walkontable', ['default', 'connect:sauce', 'saucelabs-jasmine:walkontable']);
+
+  grunt.registerTask('test-handsontable-standalone', ['default', 'jasmine:handsontableStandalone']);
+  grunt.registerTask('test-handsontable-full', ['default', 'jasmine:handsontableFull']);
+  grunt.registerTask('test-handsontable', ['test-handsontable-standalone']);
+
+  grunt.loadTasks('tasks');
+  grunt.loadNpmTasks('hot-builder');
+  grunt.loadNpmTasks('grunt-jscs');
+};