Merge branch 'minhang' of

http://192.168.168.201:8888/panzhaov5/bsth_control into minhang # Conflicts: # src/main/resources/application-dev.properties

Merge branch 'minhang' of
http://192.168.168.201:8888/panzhaov5/bsth_control into minhang # Conflicts: # src/main/resources/application-dev.properties
mcy123
2 parents 9ce28ebd 1786ccee
Showing 54 changed files with 2238 additions and 1108 deletions
pom.xml
src/main/java/com/bsth/controller/BaseController2.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/basicinfo/CarDeviceController.java
src/main/java/com/bsth/controller/schedule/basicinfo/EmployeeController.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/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
src/main/java/com/bsth/entity/realcontrol/ChildTaskPlan.java
src/main/java/com/bsth/entity/schedule/BEntity.java
src/main/java/com/bsth/entity/schedule/TTInfo.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获取导出数据
 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.basicinfo;
-
-import com.bsth.common.ResponseCode;
-import com.bsth.controller.schedule.BController;
-import com.bsth.entity.CarDevice;
-import com.bsth.service.schedule.CarDeviceService;
-import com.bsth.service.schedule.ScheduleException;
-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/15.
- */
-@RestController(value = "carDeviceController_sc")
-@RequestMapping("cde_sc")
-public class CarDeviceController extends BController<CarDevice, Long> {
-    @Autowired
-    private CarDeviceService carDeviceService;
-
-    @RequestMapping(value = "/validate_qyrq", method = RequestMethod.GET)
-    public Map<String, Object> validate_qyrq(@RequestParam Map<String, Object> param) {
-        Map<String, Object> rtn = new HashMap<>();
-
-        try {
-            // 启用日期验证
-            CarDevice carDevice = new CarDevice(
-                    param.get("id_eq"),
-                    param.get("xl_eq"),
-                    param.get("cl_eq"),
-                    param.get("qyrq_eq")
-            );
-            carDeviceService.validate_qyrq(carDevice);
-            rtn.put("status", ResponseCode.SUCCESS);
-        } catch (ScheduleException exp) {
-            rtn.put("status", ResponseCode.ERROR);
-            rtn.put("msg", exp.getMessage());
-        }
-
-        return rtn;
-    }
-
-}
+package com.bsth.controller.schedule.basicinfo;
+
+import com.bsth.common.ResponseCode;
+import com.bsth.controller.schedule.BController;
+import com.bsth.entity.CarDevice;
+import com.bsth.service.schedule.CarDeviceService;
+import com.bsth.service.schedule.ScheduleException;
+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/15.
+ */
+@RestController(value = "carDeviceController_sc")
+@RequestMapping("cde_sc")
+public class CarDeviceController extends BController<CarDevice, Long> {
+    @Autowired
+    private CarDeviceService carDeviceService;
+
+    @RequestMapping(value = "/validate_qyrq", method = RequestMethod.GET)
+    public Map<String, Object> validate_qyrq(@RequestParam Map<String, Object> param) {
+        Map<String, Object> rtn = new HashMap<>();
+
+        try {
+            // 启用日期验证
+            CarDevice carDevice = new CarDevice(
+                    param.get("id_eq"),
+                    param.get("xl_eq"),
+                    param.get("cl_eq"),
+                    param.get("qyrq_eq")
+            );
+            carDeviceService.validate_qyrq(carDevice);
+            rtn.put("status", ResponseCode.SUCCESS);
+        } catch (ScheduleException exp) {
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", exp.getMessage());
+        }
+
+        return rtn;
+    }
+
+}
-package com.bsth.controller.schedule.basicinfo;
-
-import com.bsth.common.ResponseCode;
-import com.bsth.controller.schedule.BController;
-import com.bsth.entity.Personnel;
-import com.bsth.service.schedule.EmployeeService;
-import com.bsth.service.schedule.ScheduleException;
-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;
-
-/**
- * 人员基础信息Controller
- */
-@RestController
-@RequestMapping("ee")
-public class EmployeeController extends BController<Personnel, Integer> {
-    @Autowired
-    private EmployeeService employeeService;
-
-    @RequestMapping(value = "/validate_gh", method = RequestMethod.GET)
-    public Map<String, Object> validate_gh(@RequestParam Map<String, Object> param) {
-        Map<String, Object> rtn = new HashMap<>();
-        try {
-            // 工号验证
-            Personnel personnel = new Personnel(
-                    param.get("id_eq"),
-                    param.get("companyCode_eq"),
-                    param.get("jobCode_eq")
-            );
-            employeeService.validate_gh(personnel);
-            rtn.put("status", ResponseCode.SUCCESS);
-        } catch (ScheduleException exp) {
-            rtn.put("status", ResponseCode.ERROR);
-            rtn.put("msg", exp.getMessage());
-        }
-
-        return rtn;
-    }
-}
+package com.bsth.controller.schedule.basicinfo;
+
+import com.bsth.common.ResponseCode;
+import com.bsth.controller.schedule.BController;
+import com.bsth.entity.Personnel;
+import com.bsth.service.schedule.EmployeeService;
+import com.bsth.service.schedule.ScheduleException;
+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;
+
+/**
+ * 人员基础信息Controller
+ */
+@RestController
+@RequestMapping("ee")
+public class EmployeeController extends BController<Personnel, Integer> {
+    @Autowired
+    private EmployeeService employeeService;
+
+    @RequestMapping(value = "/validate_gh", method = RequestMethod.GET)
+    public Map<String, Object> validate_gh(@RequestParam Map<String, Object> param) {
+        Map<String, Object> rtn = new HashMap<>();
+        try {
+            // 工号验证
+            Personnel personnel = new Personnel(
+                    param.get("id_eq"),
+                    param.get("companyCode_eq"),
+                    param.get("jobCode_eq")
+            );
+            employeeService.validate_gh(personnel);
+            rtn.put("status", ResponseCode.SUCCESS);
+        } catch (ScheduleException exp) {
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", exp.getMessage());
+        }
+
+        return rtn;
+    }
+}
+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
@@ -74,6 +74,9 @@ public class GpsEntity {
 	/** 是否起终点站 */
 	private boolean sEPoint;
+	/** 站内 */
+	private boolean instation;
+
 	public Integer getCompanyCode() {
 		return companyCode;
 	}
@@ -249,4 +252,12 @@ public class GpsEntity {
 	public void setsEPoint(boolean sEPoint) {
 		this.sEPoint = sEPoint;
 	}
+
+	public boolean isInstation() {
+		return instation;
+	}
+
+	public void setInstation(boolean instation) {
+		this.instation = instation;
+	}
 }
@@ -67,7 +67,7 @@ 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, 20, 15, TimeUnit.SECONDS);
 	}
 	public GpsEntity add(GpsEntity gps) {
@@ -208,20 +208,6 @@ public class GpsRealData implements CommandLineRunner{
 						//纠正走向
 						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);
-						}*/
 					}
 				} else
 					logger.error("result is null");
@@ -271,19 +257,9 @@ public class GpsRealData implements CommandLineRunner{
 			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);
-			}*/
 		}
 	}
 }
+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;
+    }
+}
+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 org.apache.commons.lang3.StringUtils;
+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.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by panzhao on 2016/12/23.
+ */
+@Component
+public class GeoCacheData {
+
+    //每辆车缓存最后50条gps
+    private static final int CACHE_SIZE = 50;
+    private static Map<String, CircleQueue<GpsEntity>> gpsCacheMap = new HashMap<>();
+
+    //线路路段走向
+    private static ArrayListMultimap<String, LineString> sectionCacheMap;
+
+    //线路站点路由
+    private static ArrayListMultimap<String, StationRoute> stationCacheMap;
+
+    @Autowired
+    JdbcTemplate jdbcTemplate;
+
+    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 from bsth_c_stationroute r left join bsth_c_station s on r.station=s.id";
+        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_LONX"), rs.getFloat("G_LATY"))));
+                sRoute.setRadius(rs.getFloat("RADIUS"));
+
+                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);
+            }
+            stationCacheMap = tempMap;
+        }
+
+        System.out.println(stationCacheMap);
+    }
+
+    public Coordinate[] parsePolygon(String polygonStr){
+        String[] coords = polygonStr.substring(11, 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[0]), Float.parseFloat(temps[1]));
+        }
+        return cds;
+    }
+}
+package com.bsth.data.gpsdata.analyse;
+
+import com.bsth.data.gpsdata.GpsEntity;
+import com.vividsolutions.jts.geom.GeometryFactory;
+
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+/**
+ * 分析gps状态信息
+ * Created by panzhao on 2016/12/23.
+ */
+public class GpsAnalyse {
+
+    //线程池
+    ExecutorService threadPool = Executors.newFixedThreadPool(50);
+
+    private static GeometryFactory geometryFactory = new GeometryFactory();
+
+    public void start(GpsEntity gps){
+        threadPool.execute(new ArrivalMatchThread(gps));
+    }
+
+    public class ArrivalMatchThread implements Runnable{
+
+        private GpsEntity gps;
+
+        public ArrivalMatchThread(GpsEntity gps){
+            this.gps = gps;
+        }
+
+        @Override
+        public void run() {
+            //CircleQueue<GpsEntity> queue = gpsCacheMap.get(gps.getNbbm());
+
+            //站内还是站外
+            //Point p = geometryFactory.createPoint(new Coordinate(gps.getLat(), gps.getLon()));
+
+            /*if(queue == null){
+                //首个GPS点
+                queue = new CircleQueue<>(CACHE_SIZE);
+                queue.add(gps);
+            }*/
+        }
+    }
+}
+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;
+
+    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;
+    }
+}
 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.schedule;
-
-import com.bsth.entity.sys.SysUser;
-
-import javax.persistence.*;
-import java.util.Date;
-
-/**
- * Created by xu on 16/12/14.
- */
-@MappedSuperclass
-public class BEntity {
-
-    /** 创建人 */
-    @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.PERSIST)
-    private SysUser createBy;
-    /** 修改人 */
-    @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.PERSIST)
-    private SysUser updateBy;
-
-    /** 创建日期 */
-    @Column(updatable = false, name = "create_date")
-    private Date createDate;
-    /** 修改日期 */
-    @Column(name = "update_date")
-    private Date updateDate;
-
-    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;
-    }
-}
+package com.bsth.entity.schedule;
+
+import com.bsth.entity.sys.SysUser;
+
+import javax.persistence.*;
+import java.util.Date;
+
+/**
+ * Created by xu on 16/12/14.
+ */
+@MappedSuperclass
+public class BEntity {
+
+    /** 创建人 */
+    @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.PERSIST)
+    private SysUser createBy;
+    /** 修改人 */
+    @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.PERSIST)
+    private SysUser updateBy;
+
+    /** 创建日期 */
+    @Column(updatable = false, name = "create_date")
+    private Date createDate;
+    /** 修改日期 */
+    @Column(name = "update_date")
+    private Date updateDate;
+
+    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;
+    }
+}
 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;
-    }
 }
@@ -33,11 +33,13 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 			+ " s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 group by clZbh,jGh,jName")
 	List<Map<String, Object>> dailyInfo(String line,String date);
-	@Query(value="SELECT r.xl_name,r.lp_name,r.cl_zbh,d.sender,d.timestamp,"
-			+ " d.txt_content FROM bsth_c_s_sp_info_real r RIGHT JOIN bsth_v_directive_60 "
-			+ "d ON r.id = d.sch WHERE d.is_dispatch = 1 AND r.xl_bm like %?1% AND "
-			+ " DATE_FORMAT(r.schedule_date,'%Y-%m-%d') = ?2 and r.cl_zbh like %?3% order by d.timestamp",nativeQuery=true)
-	List<Object[]> historyMessage(String line,String date,String code);
+	@Query(value="select t.car_code,d.sender,d.txt_content,d.timestamp,0 as xlbm from  ("
+			+ "  select equipment_code,car_code  from bsth_c_cars where id in("
+			+ " select cl from bsth_c_s_ccinfo where  xl in ( "
+			+ " select id from bsth_c_line where line_code=?1 ))) t"
+			+ " left join bsth_v_directive_60 d on t.equipment_code=d.device_id "
+			+ " where d.timestamp >=?2 and  d.timestamp <=?3 and t.car_code like %?4% ",nativeQuery=true)
+	List<Object[]> historyMessage(String line,long d,long t,String code);
 	@Query(value="SELECT r.xl_name,r.lp_name,r.cl_zbh,count(*) as cs "
 			+ " FROM bsth_c_s_sp_info_real r RIGHT JOIN bsth_v_directive_60 d "
@@ -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
@@ -613,11 +613,32 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 	@Override
 	public List<Object[]> historyMessage(String line, String date, String code) {
+		
+		String sql="select t.car_code,d.sender,d.txt_content,d.timestamp from  ("
+				+ "  select equipment_code,car_code  from bsth_c_cars where id in("
+				+ " select cl from bsth_c_s_ccinfo where  xl in ( "
+				+ " select id from bsth_c_line where line_code=?1 ))) t"
+				+ " left join bsth_v_directive_60 d on t.equipment_code=d.device_id "
+				+ " where d.timestamp >=?2 and  d.timestamp <=?3 and t.car_code like '%?4%'";
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-		List<Object[]> list = scheduleRealInfoRepository.historyMessage(line, date, code);
+		long d= 0;
+		long t=0;
+		if(date.length()>0){
+			try {
+				d=sdf.parse(date+" 00:00:00").getTime();
+				t=sdf.parse(date+" 23:59:59").getTime();
+			} catch (ParseException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+			
+		}
+		
+		List<Object[]> list = scheduleRealInfoRepository.historyMessage(line,d,t, code);
 		for(Object[] obj:list){
 			if(obj != null){
-				obj[4] = sdf.format(new Date(Long.parseLong(obj[4].toString())));
+				obj[3] = sdf.format(new Date(Long.parseLong(obj[3].toString())));
+				obj[4] = BasicData.lineCode2NameMap.get(line);
 			}
 		}
 		return list;
@@ -1129,10 +1150,12 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 					addMileage += tempJhlc;
 					ljbc++;
 				}else{
-					if(scheduleRealInfo.getBcType().equals("normal")){
+					if( !(scheduleRealInfo.getBcType().equals("in")
+							||scheduleRealInfo.getBcType().equals("out")) ){
 						jhbc++;
+						jhlc += tempJhlc;
 					}
-					jhlc += tempJhlc;
+					
 					if(scheduleRealInfo.getStatus() == -1){
 						remMileage += tempJhlc;
 						cjbc++;
@@ -1143,11 +1166,13 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 				if(childTaskPlans.isEmpty()){
 					if(scheduleRealInfo.getBcType().equals("in") || 
 							scheduleRealInfo.getBcType().equals("out")){
-						ksgl += tempJhlc;
 						jcclc +=tempJhlc;
-					}else if(scheduleRealInfo.getBcType().equals("venting")){
-						ksgl += tempJhlc;
-					}else{
+					}
+					//主任务 放空班次属于营运
+//					else if(scheduleRealInfo.getBcType().equals("venting")){
+//						ksgl += tempJhlc;
+//					}
+					else{
 						if(scheduleRealInfo.getStatus() != -1){
 							yygl += tempJhlc;
 						}
@@ -1160,8 +1185,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 							ksgl += childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
 						}else{
 							if(childTaskPlan.isDestroy()){
-								remMileage += tempJhlc;
-								cjbc++;
+								remMileage += childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
+//								cjbc++;
 							}else{
 								yygl += childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
 							}
@@ -1175,12 +1200,13 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 		map.put("addMileage", format.format(addMileage));
 		map.put("yygl", format.format(yygl));
 		map.put("ksgl", format.format(ksgl));
-		map.put("realMileage", format.format(yygl+ksgl));
+		map.put("realMileage", format.format(yygl+ksgl+jcclc));
 		map.put("jhbc", jhbc);
 		map.put("cjbc", cjbc);
 		map.put("ljbc", ljbc);
 		map.put("sjbc", jhbc-cjbc+ljbc);
 		map.put("jcclc", jcclc);
+		map.put("zkslc", ksgl+jcclc);
 		return map;
 	}
@@ -1259,115 +1285,121 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 		Map<String,Object> map = new HashMap<String, Object>();
 		for(ScheduleRealInfo scheduleRealInfo: list){
 			if(scheduleRealInfo != null){
-				Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
-				//计算实际里程，少驶里程，计划里程=实际里程+少驶里程
-				if(childTaskPlans.isEmpty()){
-					tempJhlc = scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc();
-					jhlc += tempJhlc;
-					if(scheduleRealInfo.getStatus() == 2){
-						sjgl += tempJhlc;
-					}else if(scheduleRealInfo.getStatus() == -1){
-						ssgl += tempJhlc;
-						if((scheduleRealInfo.getRemarks()==null?"":scheduleRealInfo.getRemarks()).indexOf("路阻") != -1){
-							ssgl_lz += tempJhlc;
-						}else if((scheduleRealInfo.getRemarks()==null?"":scheduleRealInfo.getRemarks()).indexOf("吊慢") != -1){
-							ssgl_dm += tempJhlc;
-						}else if((scheduleRealInfo.getRemarks()==null?"":scheduleRealInfo.getRemarks()).indexOf("故障") != -1){
-							ssgl_gz += tempJhlc;
-						}else if((scheduleRealInfo.getRemarks()==null?"":scheduleRealInfo.getRemarks()).indexOf("纠纷") != -1){
-							ssgl_jf += tempJhlc;
-						}else if((scheduleRealInfo.getRemarks()==null?"":scheduleRealInfo.getRemarks()).indexOf("肇事") != -1){
-							ssgl_zs += tempJhlc;
-						}else if((scheduleRealInfo.getRemarks()==null?"":scheduleRealInfo.getRemarks()).indexOf("缺人") != -1){
-							ssgl_qr += tempJhlc;
-						}else if((scheduleRealInfo.getRemarks()==null?"":scheduleRealInfo.getRemarks()).indexOf("缺车") != -1){
-							ssgl_qc += tempJhlc;
-						}else if((scheduleRealInfo.getRemarks()==null?"":scheduleRealInfo.getRemarks()).indexOf("客稀") != -1){
-							ssgl_kx += tempJhlc;
-						}else if((scheduleRealInfo.getRemarks()==null?"":scheduleRealInfo.getRemarks()).indexOf("气候") != -1){
-							ssgl_qh += tempJhlc;
-						}else if((scheduleRealInfo.getRemarks()==null?"":scheduleRealInfo.getRemarks()).indexOf("援外") != -1){
-							ssgl_yw += tempJhlc;
-						}else{
-							ssgl_other += tempJhlc;
-						}
-						
+				
+				if(!(scheduleRealInfo.getBcType().equals("in")
+							||scheduleRealInfo.getBcType().equals("out")) ){
+					Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
+					//计算实际里程，少驶里程，计划里程=实际里程+少驶里程
+					if(childTaskPlans.isEmpty()){
+						tempJhlc = scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc();
 						//临加公里
 						if(scheduleRealInfo.isSflj()){
 							ljgl += tempJhlc;
+						}else{
+							jhlc += tempJhlc;
 						}
-					}else{
-						ssgl += tempJhlc;
-						ssgl_other += tempJhlc;
-					}
-				}else{
-					Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
-					while(it.hasNext()){
-						ChildTaskPlan childTaskPlan = it.next();
-						childMileage = childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
-						jhlc += childMileage;
-						if(childTaskPlan.isDestroy()){
-							ssgl += childMileage;
-							if(childTaskPlan.getDestroyReason().equals("路阻")){
-								ssgl_lz += childTaskPlan.getMileage();
-							}else if(childTaskPlan.getDestroyReason().equals("吊慢")){
-								ssgl_dm += childTaskPlan.getMileage();
-							}else if(childTaskPlan.getDestroyReason().equals("故障")){
-								ssgl_gz += childTaskPlan.getMileage();
-							}else if(childTaskPlan.getDestroyReason().equals("纠纷")){
-								ssgl_jf += childTaskPlan.getMileage();
-							}else if(childTaskPlan.getDestroyReason().equals("肇事")){
-								ssgl_zs += childTaskPlan.getMileage();
-							}else if(childTaskPlan.getDestroyReason().equals("缺人")){
-								ssgl_qr += childTaskPlan.getMileage();
-							}else if(childTaskPlan.getDestroyReason().equals("缺车")){
-								ssgl_qc += childTaskPlan.getMileage();
-							}else if(childTaskPlan.getDestroyReason().equals("客稀")){
-								ssgl_kx += childTaskPlan.getMileage();
-							}else if(childTaskPlan.getDestroyReason().equals("气候")){
-								ssgl_qh += childTaskPlan.getMileage();
-							}else if(childTaskPlan.getDestroyReason().equals("援外")){
-								ssgl_yw += childTaskPlan.getMileage();
+						if(scheduleRealInfo.getStatus() == 2){
+							sjgl += tempJhlc;
+						}else if(scheduleRealInfo.getStatus() == -1){
+							ssgl += tempJhlc;
+							if((scheduleRealInfo.getRemarks()==null?"":scheduleRealInfo.getRemarks()).indexOf("路阻") != -1){
+								ssgl_lz += tempJhlc;
+							}else if((scheduleRealInfo.getRemarks()==null?"":scheduleRealInfo.getRemarks()).indexOf("吊慢") != -1){
+								ssgl_dm += tempJhlc;
+							}else if((scheduleRealInfo.getRemarks()==null?"":scheduleRealInfo.getRemarks()).indexOf("故障") != -1){
+								ssgl_gz += tempJhlc;
+							}else if((scheduleRealInfo.getRemarks()==null?"":scheduleRealInfo.getRemarks()).indexOf("纠纷") != -1){
+								ssgl_jf += tempJhlc;
+							}else if((scheduleRealInfo.getRemarks()==null?"":scheduleRealInfo.getRemarks()).indexOf("肇事") != -1){
+								ssgl_zs += tempJhlc;
+							}else if((scheduleRealInfo.getRemarks()==null?"":scheduleRealInfo.getRemarks()).indexOf("缺人") != -1){
+								ssgl_qr += tempJhlc;
+							}else if((scheduleRealInfo.getRemarks()==null?"":scheduleRealInfo.getRemarks()).indexOf("缺车") != -1){
+								ssgl_qc += tempJhlc;
+							}else if((scheduleRealInfo.getRemarks()==null?"":scheduleRealInfo.getRemarks()).indexOf("客稀") != -1){
+								ssgl_kx += tempJhlc;
+							}else if((scheduleRealInfo.getRemarks()==null?"":scheduleRealInfo.getRemarks()).indexOf("气候") != -1){
+								ssgl_qh += tempJhlc;
+							}else if((scheduleRealInfo.getRemarks()==null?"":scheduleRealInfo.getRemarks()).indexOf("援外") != -1){
+								ssgl_yw += tempJhlc;
 							}else{
-								ssgl_other += childTaskPlan.getMileage();
+								ssgl_other += tempJhlc;
 							}
+							
+							
 						}else{
-							sjgl += childMileage;
+							ssgl += tempJhlc;
+							ssgl_other += tempJhlc;
+						}
+					}else{
+						Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+						while(it.hasNext()){
+							ChildTaskPlan childTaskPlan = it.next();
+							childMileage = childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
+							jhlc += childMileage;
+							if(childTaskPlan.isDestroy()){
+								ssgl += childMileage;
+								if(childTaskPlan.getDestroyReason().equals("路阻")){
+									ssgl_lz += childTaskPlan.getMileage();
+								}else if(childTaskPlan.getDestroyReason().equals("吊慢")){
+									ssgl_dm += childTaskPlan.getMileage();
+								}else if(childTaskPlan.getDestroyReason().equals("故障")){
+									ssgl_gz += childTaskPlan.getMileage();
+								}else if(childTaskPlan.getDestroyReason().equals("纠纷")){
+									ssgl_jf += childTaskPlan.getMileage();
+								}else if(childTaskPlan.getDestroyReason().equals("肇事")){
+									ssgl_zs += childTaskPlan.getMileage();
+								}else if(childTaskPlan.getDestroyReason().equals("缺人")){
+									ssgl_qr += childTaskPlan.getMileage();
+								}else if(childTaskPlan.getDestroyReason().equals("缺车")){
+									ssgl_qc += childTaskPlan.getMileage();
+								}else if(childTaskPlan.getDestroyReason().equals("客稀")){
+									ssgl_kx += childTaskPlan.getMileage();
+								}else if(childTaskPlan.getDestroyReason().equals("气候")){
+									ssgl_qh += childTaskPlan.getMileage();
+								}else if(childTaskPlan.getDestroyReason().equals("援外")){
+									ssgl_yw += childTaskPlan.getMileage();
+								}else{
+									ssgl_other += childTaskPlan.getMileage();
+								}
+							}else{
+								sjgl += childMileage;
+							}
 						}
 					}
-				}
-				
-				//班次
-				jhbc++;
-				String[] fcsj = scheduleRealInfo.getFcsj().split(":");
-				String[] fcsjActual = (scheduleRealInfo.getFcsjActual()==null?"0:00":scheduleRealInfo.getFcsjActual()).split(":");
-				if((Integer.parseInt(fcsj[0])*60+Integer.parseInt(fcsj[1])) > sj_0 && (Integer.parseInt(fcsj[0])*60+Integer.parseInt(fcsj[1])) < sj_1){
-					jhbc_m++;
-				}else if((Integer.parseInt(fcsj[0])*60+Integer.parseInt(fcsj[1])) > sj_2 && (Integer.parseInt(fcsj[0])*60+Integer.parseInt(fcsj[1])) < sj_3){
-					jhbc_a++;
-				}
-				if(scheduleRealInfo.getStatus() == 2){
-					sjbc++;
-					if((Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) > sj_0 && (Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) < sj_1){
-						sjbc_m++;
-					}else if((Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) > sj_2 && (Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) < sj_3){
-						sjbc_a++;
+					
+					//班次
+					jhbc++;
+					String[] fcsj = scheduleRealInfo.getFcsj().split(":");
+					String[] fcsjActual = (scheduleRealInfo.getFcsjActual()==null?"0:00":scheduleRealInfo.getFcsjActual()).split(":");
+					if((Integer.parseInt(fcsj[0])*60+Integer.parseInt(fcsj[1])) > sj_0 && (Integer.parseInt(fcsj[0])*60+Integer.parseInt(fcsj[1])) < sj_1){
+						jhbc_m++;
+					}else if((Integer.parseInt(fcsj[0])*60+Integer.parseInt(fcsj[1])) > sj_2 && (Integer.parseInt(fcsj[0])*60+Integer.parseInt(fcsj[1])) < sj_3){
+						jhbc_a++;
 					}
-				}
-				if(scheduleRealInfo.isSflj()){
-					ljbc++;
-					if((Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) > sj_0 && (Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) < sj_1){
-						ljbc_m++;
-					}else if((Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) > sj_2 && (Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) < sj_3){
-						ljbc_a++;
+					if(scheduleRealInfo.getStatus() == 2){
+						sjbc++;
+						if((Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) > sj_0 && (Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) < sj_1){
+							sjbc_m++;
+						}else if((Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) > sj_2 && (Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) < sj_3){
+							sjbc_a++;
+						}
 					}
-				}
-				if(scheduleRealInfo.getBcType().equals("venting")){
-					fzbc++;
-					if((Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) > sj_0 && (Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) < sj_1){
-						fzbc_m++;
-					}else if((Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) > sj_2 && (Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) < sj_3){
-						fzbc_a++;
+					if(scheduleRealInfo.isSflj()){
+						ljbc++;
+						if((Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) > sj_0 && (Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) < sj_1){
+							ljbc_m++;
+						}else if((Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) > sj_2 && (Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) < sj_3){
+							ljbc_a++;
+						}
+					}
+					if(scheduleRealInfo.getBcType().equals("venting")){
+						fzbc++;
+						if((Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) > sj_0 && (Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) < sj_1){
+							fzbc_m++;
+						}else if((Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) > sj_2 && (Integer.parseInt(fcsjActual[0])*60+Integer.parseInt(fcsjActual[1])) < sj_3){
+							fzbc_a++;
+						}
 					}
 				}
 			}	
@@ -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;
 }
-package com.bsth.service.schedule;
-
-import com.bsth.entity.CarDevice;
-
-/**
- * Created by xu on 16/12/15.
- */
-public interface CarDeviceService extends BService<CarDevice, Long> {
-    void validate_qyrq(CarDevice carDevice) throws ScheduleException;
-}
+package com.bsth.service.schedule;
+
+import com.bsth.entity.CarDevice;
+
+/**
+ * Created by xu on 16/12/15.
+ */
+public interface CarDeviceService extends BService<CarDevice, Long> {
+    void validate_qyrq(CarDevice carDevice) throws ScheduleException;
+}
-package com.bsth.service.schedule;
-
-import com.bsth.entity.Personnel;
-
-/**
- * Created by xu on 16/12/15.
- */
-public interface EmployeeService extends BService<Personnel, Integer> {
-    public void validate_gh(Personnel personnel) throws ScheduleException;
-}
+package com.bsth.service.schedule;
+
+import com.bsth.entity.Personnel;
+
+/**
+ * Created by xu on 16/12/15.
+ */
+public interface EmployeeService extends BService<Personnel, Integer> {
+    public void validate_gh(Personnel personnel) 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.CarDevice;
-import com.bsth.entity.Cars;
-import com.bsth.service.CarsService;
-import com.bsth.service.schedule.CarDeviceService;
-import com.bsth.service.schedule.ScheduleException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Created by xu on 16/12/15.
- */
-@Service(value = "carDeviceServiceImpl_sc")
-public class CarDeviceServiceImpl extends BServiceImpl<CarDevice, Long> implements CarDeviceService {
-    @Autowired
-    private CarsService carsService;
-
-    @Transactional
-    @Override
-    public CarDevice save(CarDevice carDevice) {
-        // 查找对应的车辆基础信息，更新设备编号数据
-        Cars cars = carsService.findById(carDevice.getCl());
-        cars.setEquipmentCode(carDevice.getNewDeviceNo());
-        return super.save(carDevice);
-    }
-
-    @Transactional
-    @Override
-    public void validate_qyrq(CarDevice carDevice) throws ScheduleException {
-        if (carDevice.getXl() == null) {
-            throw new ScheduleException("线路未选择");
-        }
-        if (carDevice.getCl() == null) {
-            throw new ScheduleException("车辆未选择");
-        }
-        Map<String, Object> param = new HashMap<>();
-        if (carDevice.getId() != null) {
-            param.put("id_ne", carDevice.getId());
-        }
-        param.put("xl_eq", carDevice.getXl());
-        param.put("cl_eq", carDevice.getCl());
-        param.put("qyrq_ge", carDevice.getQyrq());
-        if (!CollectionUtils.isEmpty(list(param))) {
-            throw new ScheduleException("启用日期必须比历史的启用日期大");
-        }
-    }
-
-    @Transactional
-    @Override
-    public void delete(Long aLong) throws ScheduleException {
-        toggleCancel(aLong);
-    }
-
-    @Transactional
-    public void toggleCancel(Long id) throws ScheduleException {
-        CarDevice carDevice = findById(id);
-        if (carDevice.getIsCancel()) {
-            carDevice.setIsCancel(false);
-        } else {
-            carDevice.setIsCancel(true);
-        }
-    }
-}
+package com.bsth.service.schedule.impl;
+
+import com.bsth.entity.CarDevice;
+import com.bsth.entity.Cars;
+import com.bsth.service.CarsService;
+import com.bsth.service.schedule.CarDeviceService;
+import com.bsth.service.schedule.ScheduleException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Created by xu on 16/12/15.
+ */
+@Service(value = "carDeviceServiceImpl_sc")
+public class CarDeviceServiceImpl extends BServiceImpl<CarDevice, Long> implements CarDeviceService {
+    @Autowired
+    private CarsService carsService;
+
+    @Transactional
+    @Override
+    public CarDevice save(CarDevice carDevice) {
+        // 查找对应的车辆基础信息，更新设备编号数据
+        Cars cars = carsService.findById(carDevice.getCl());
+        cars.setEquipmentCode(carDevice.getNewDeviceNo());
+        return super.save(carDevice);
+    }
+
+    @Transactional
+    @Override
+    public void validate_qyrq(CarDevice carDevice) throws ScheduleException {
+        if (carDevice.getXl() == null) {
+            throw new ScheduleException("线路未选择");
+        }
+        if (carDevice.getCl() == null) {
+            throw new ScheduleException("车辆未选择");
+        }
+        Map<String, Object> param = new HashMap<>();
+        if (carDevice.getId() != null) {
+            param.put("id_ne", carDevice.getId());
+        }
+        param.put("xl_eq", carDevice.getXl());
+        param.put("cl_eq", carDevice.getCl());
+        param.put("qyrq_ge", carDevice.getQyrq());
+        if (!CollectionUtils.isEmpty(list(param))) {
+            throw new ScheduleException("启用日期必须比历史的启用日期大");
+        }
+    }
+
+    @Transactional
+    @Override
+    public void delete(Long aLong) throws ScheduleException {
+        toggleCancel(aLong);
+    }
+
+    @Transactional
+    public void toggleCancel(Long id) throws ScheduleException {
+        CarDevice carDevice = findById(id);
+        if (carDevice.getIsCancel()) {
+            carDevice.setIsCancel(false);
+        } else {
+            carDevice.setIsCancel(true);
+        }
+    }
+}
-package com.bsth.service.schedule.impl;
-
-import com.bsth.entity.Personnel;
-import com.bsth.service.schedule.EmployeeService;
-import com.bsth.service.schedule.ScheduleException;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Created by xu on 16/12/15.
- */
-@Service
-public class EmployeeServiceImpl extends BServiceImpl<Personnel, Integer> implements EmployeeService {
-    @Override
-    @Transactional
-    public void validate_gh(Personnel personnel) throws ScheduleException {
-        // 查询条件
-        Map<String, Object> param = new HashMap<>();
-        if (personnel.getId() != null) {
-            param.put("id_ne", personnel.getId());
-        }
-        param.put("companyCode_eq", personnel.getCompanyCode());
-        param.put("jobCode_eq", personnel.getJobCode());
-        if (!CollectionUtils.isEmpty(list(param))) {
-            throw new ScheduleException("相同公司工号重复");
-        }
-    }
-}
+package com.bsth.service.schedule.impl;
+
+import com.bsth.entity.Personnel;
+import com.bsth.service.schedule.EmployeeService;
+import com.bsth.service.schedule.ScheduleException;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Created by xu on 16/12/15.
+ */
+@Service
+public class EmployeeServiceImpl extends BServiceImpl<Personnel, Integer> implements EmployeeService {
+    @Override
+    @Transactional
+    public void validate_gh(Personnel personnel) throws ScheduleException {
+        // 查询条件
+        Map<String, Object> param = new HashMap<>();
+        if (personnel.getId() != null) {
+            param.put("id_ne", personnel.getId());
+        }
+        param.put("companyCode_eq", personnel.getCompanyCode());
+        param.put("jobCode_eq", personnel.getJobCode());
+        if (!CollectionUtils.isEmpty(list(param))) {
+            throw new ScheduleException("相同公司工号重复");
+        }
+    }
+}
+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);
+        }
+    }
+}
@@ -32,38 +32,4 @@ spring.datasource.validation-query=select 1
 http.gps.real.url= http://192.168.168.201:9090/transport_server/rtgps/
 #http.gps.real.url= http://27.115.69.123:8800/transport_server/rtgps/
 ##\u6D88\u606F\u4E0B\u53D1
-http.send.directive = http://192.168.168.201:9090/transport_server/message/server.port=9088
-management.port= 9001
-management.address= 127.0.0.1
-
-spring.jpa.hibernate.ddl-auto= update
-spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy
-#DATABASE
-spring.jpa.database= MYSQL
-spring.jpa.show-sql= true
-spring.datasource.driver-class-name= com.mysql.jdbc.Driver
-spring.datasource.url= jdbc:mysql://127.0.0.1/qp_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
-spring.datasource.username= root
-spring.datasource.password=
-#spring.datasource.url= jdbc:mysql://192.168.168.117/pd_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
-#spring.datasource.username= root
-#spring.datasource.password= root
-#DATASOURCE
-spring.datasource.max-active=100
-spring.datasource.max-idle=8
-spring.datasource.min-idle=8
-spring.datasource.initial-size=5
-
-spring.datasource.test-on-borrow=true
-spring.datasource.test-on-connect=true
-spring.datasource.test-on-return=true
-spring.datasource.test-while-idle=true
-spring.datasource.validation-query=select 1
-
-##
-#222.66.0.204:5555
-##\u5B9E\u65F6gps
-http.gps.real.url= http://192.168.168.201:9090/transport_server/rtgps/
-#http.gps.real.url= http://27.115.69.123:8800/transport_server/rtgps/
-##\u6D88\u606F\u4E0B\u53D1
 http.send.directive = http://192.168.168.201:9090/transport_server/message/
 \ No newline at end of file
@@ -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,7 +3,13 @@
 #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.171:3306/ms?useUnicode=true&characterEncoding=utf-8
+ms.mysql.url= jdbc:mysql://192.168.168.117:3306/ms?useUnicode=true&characterEncoding=utf-8&useSSL=false
 ms.mysql.username= root
-ms.mysql.password= root2jsp
 \ No newline at end of file
+ms.mysql.password= root
+{
+  "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');
+};
+(The MIT License)
+
+Copyright (c) 2012-2014 Marcin Warpechowski
+Copyright (c) 2015 Handsoncode sp. z o.o. <hello@handsoncode.net>
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+# Handsontable [![Build Status](https://travis-ci.org/handsontable/handsontable.png?branch=master)](https://travis-ci.org/handsontable/handsontable)
+
+Handsontable is a data grid component with an Excel-like appearance. Built in JavaScript, it integrates with any data source and comes with [features](http://docs.handsontable.com/0.17.0/tutorial-features.html) like data validation, sorting, grouping, data binding or column ordering. Actively supported by the Handsoncode team and the GitHub community.
+
+Check out the demos at http://handsontable.com/examples.html or fork the example on
+[JSFiddle](http://jsfiddle.net/js_ziggle/hU6Kz/3228/) to see Handsontable in action.
+
+- - -
+
+### Quick start
+
+1. A recommended way to install Handsontable is through [Bower](http://bower.io/search/?q=handsontable) package manager using the following command:
+
+  `bower install handsontable --save`
+
+  Alternatively, you can [download it in a ZIP file](https://github.com/handsontable/handsontable/archive/master.zip).
+
+2. After Handsontable is downloaded, embed the code into your project. All the files that you need are in the `dist\` directory:
+
+  ```html
+  <script src="dist/handsontable.full.js"></script>
+  <link rel="stylesheet" media="screen" href="dist/handsontable.full.css">
+  ```
+
+3. Then, create a new `Handsontable` object, passing a reference to an empty div as a first argument. After that, load some data if you wish:
+
+  ```html
+  <div id="example"></div>
+
+  <script>
+    var data = [
+      ["", "Kia", "Nissan", "Toyota", "Honda"],
+      ["2008", 10, 11, 12, 13],
+      ["2009", 20, 11, 14, 13],
+      ["2010", 30, 15, 12, 13]
+    ];
+    
+   var container = document.getElementById('example');
+    var hot = new Handsontable(container,
+     {
+       data: data
+      });
+  </script>
+  ```
+
+### API Reference
+
+- [Core methods](http://docs.handsontable.com/Core.html)
+- [Options](http://docs.handsontable.com/Options.html)
+- [Hooks](http://docs.handsontable.com/Hooks.html)
+
+## AMD support
+
+If you use a modular script loader than Handsontable is not bound to the global object and will fit nicely in your build process. You can require Handsontable just like any other module.
+
+```javascript
+require(['handsontable'], function(Handsontable) {
+    var hot = new Handsontable(document.getElementById('example'), {
+      data: [[1, 2, 3, 4], [1, 2, 3, 4]]
+    });
+});
+```
+
+## CommonJS module support
+
+If you use a CommonJS compatible environment you can use the require function to import Handsontable.
+
+
+```javascript
+var handsontable = require('handsontable');
+```
+
+To bundle handsontable with [Browserify](http://browserify.org) you must specify the module names of all required modules by Handsontable:
+
+`browserify main.js -o bundle.js -r moment -r pikaday -r zeroclipboard`
+
+### Troubleshooting
+
+Please follow this guidelines when reporting bugs and feature requests:
+
+1. Use [GitHub Issues](https://github.com/handsontable/handsontable/issues) board to report bugs and feature requests (not our email address)
+2. Please **always** write steps to reproduce the error. That way we can focus on fixing the bug, not scratching our heads trying to reproduce it.
+3. If possible, please add a JSFiddle link that shows the problem (start by forking [this fiddle](http://jsfiddle.net/js_ziggle/hU6Kz/3228/)). It saves us much time.
+4. If you can't reproduce it on JSFiddle, please add a screenshot that shows the problem. JSFiddle is much more appreciated because it lets us start fixing straight away.
+
+Thanks for understanding!
+
+### Compatibility
+
+Handsontable is compatible with IE 9+, Firefox, Chrome, Safari and Opera.
+
+### Want to help?
+
+Please see [CONTRIBUTING.md](CONTRIBUTING.md)
+
+### Changelog
+
+To see the list of recent changes, see [Releases section](https://github.com/handsontable/handsontable/releases).
+
+### License
+
+The MIT License (see the [LICENSE](https://github.com/handsontable/handsontable/blob/master/LICENSE) file for the full text)
+
+### Contact
+
+You can contact us at hello@handsontable.com.
+{
+  "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"
+  }
+}
+# Handsontable distributions
+
+## Full distribution (recommended)
+
+The full distribution allows you to use Handsontable by just including 2 files:
+```html
+<script src="dist/handsontable.full.js"></script>
+<link rel="stylesheet" media="screen" href="dist/handsontable.full.css">
+```
+(It may also require Pikaday and moment.js, if you're using the Datepicker for date input)
+
+**handsontable.full.js** and **handsontable.full.css** are compiled with ___all___ the needed dependencies.
+
+Using this has the same effect as loading all the dependencies from the Bare distribution (see below).
+
+## Bare distribution
+
+If you are a "Bob the Builder" kind of hacker, you will need to load Handsontable JS, CSS and their dependencies:
+```html
+<!-- Required dependencies (as external scripts) -->
+<script src="lib/pikaday/pikaday.js"></script>
+<script src="lib/moment/moment.js"></script>
+<script src="lib/zeroclipboard/ZeroClipboard.js"></script>
+<!-- Handsontable bare files -->
+<script src="dist/handsontable.js"></script>
+<link rel="stylesheet" media="screen" href="dist/handsontable.css">
+```
+
+**handsontable.js** and **handsontable.css** are compiled ___without___ the needed dependencies.
+
+## Custom distribution
+
+If you want to build your own custom Handsontable package distribution check out our [tool](https://github.com/handsontable/hot-builder) designed for this.