1.lggj合并浦东公交分支，更新部分为线路信息编辑相关

王通
2 parents 9b5372af 7ab6aed4
Showing 29 changed files with 2168 additions and 2336 deletions
pom.xml
src/main/java/com/bsth/Application.java
src/main/java/com/bsth/annotation/BusinessDescription.java
src/main/java/com/bsth/common/SystemParamKeys.java
src/main/java/com/bsth/controller/BaseController.java
src/main/java/com/bsth/controller/IndexController.java
src/main/java/com/bsth/controller/InoutCarparkController.java
src/main/java/com/bsth/controller/LineController.java
src/main/java/com/bsth/controller/LsSectionRouteController.java
src/main/java/com/bsth/controller/LsStationRouteController.java
src/main/java/com/bsth/controller/RoadSpeedController.java
src/main/java/com/bsth/controller/SectionController.java
src/main/java/com/bsth/controller/SectionRouteController.java
src/main/java/com/bsth/controller/SectionSpeedController.java
src/main/java/com/bsth/controller/StationController.java
src/main/java/com/bsth/controller/StationRouteController.java
src/main/java/com/bsth/controller/geo_data/GeoDataController.java
src/main/java/com/bsth/controller/gps/GpsController.java
src/main/java/com/bsth/controller/realcontrol/AdminUtilsController.java
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
@@ -34,8 +34,6 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-security</artifactId>
 		</dependency>
-		<!-- <dependency> <groupId>org.springframework.security</groupId> <artifactId>spring-security-config</artifactId>
-			</dependency> -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-data-jpa</artifactId>
@@ -59,6 +57,10 @@
 			<optional>true</optional>
 		</dependency>
 		<dependency>
+			<groupId>org.springframework.kafka</groupId>
+			<artifactId>spring-kafka</artifactId>
+		</dependency>
+		<dependency>
 			<groupId>mysql</groupId>
 			<artifactId>mysql-connector-java</artifactId>
 			<version>5.1.38</version>
@@ -405,6 +407,11 @@
 			<artifactId>jts-core</artifactId>
 			<version>1.16.1</version>
 		</dependency>
+
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-spatial</artifactId>
+		</dependency>
     </dependencies>
 	<dependencyManagement>
 package com.bsth;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import org.springframework.boot.SpringApplication;
@@ -7,12 +8,14 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
 import org.springframework.context.annotation.Primary;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
+@EnableAspectJAutoProxy
 @EnableTransactionManagement
 @SpringBootApplication
 public class Application extends SpringBootServletInitializer {
@@ -27,10 +30,11 @@ public class Application extends SpringBootServletInitializer {
 	@Bean
 	@Primary
 	public ObjectMapper objectMapper() {
-		ObjectMapper objectMapper = new ObjectMapper();
-		objectMapper.disable(SerializationFeature.FAIL_ON_EMPTY_BEANS);
+		ObjectMapper mapper = new ObjectMapper();
+		mapper.disable(SerializationFeature.FAIL_ON_EMPTY_BEANS);
+		mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
-		return objectMapper;
+		return mapper;
 	}
 	public static void main(String[] args) throws Exception {
+package com.bsth.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * @author Hill
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+public @interface BusinessDescription {
+
+    /**
+     * 业务描述内容
+     * @return
+     */
+    String value();
+}
+package com.bsth.common;
+
+/**
+ * @author Hill
+ */
+public class SystemParamKeys {
+
+    public static final String SPECIAL_ROLES = "special.roles";
+}
-package com.bsth.controller;
-
-import com.bsth.service.BaseService;
-import com.google.common.base.Splitter;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Sort;
-import org.springframework.data.domain.Sort.Direction;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @param <T>
- * @param <ID> 主键类型
- * @author PanZhao
- * @ClassName: BaseController
- * @Description: TODO(基础的Controller实现)
- * @date 2016年3月17日 下午12:44:06
- */
-public class BaseController<T, ID extends Serializable> {
-
-    @Autowired
-    protected BaseService<T, ID> baseService;
-
-    /**
-     * @param @param map 查询条件
-     * @param @param page 页码
-     * @param @param size 每页显示数量
-     * @throws
-     * @Title: list
-     * @Description: TODO(多条件分页查询)
-     */
-    @RequestMapping(method = RequestMethod.GET)
-    public Page<T> 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) {
-
-        // 允许多个字段排序，order可以写单个字段，也可以写多个字段
-        // 多个字段格式：{col1},{col2},{col3},....,{coln}
-        List<String> order_columns = Splitter.on(",").trimResults().splitToList(order);
-        // 多字段排序：DESC,ASC...
-        List<String> order_dirs = Splitter.on(",").trimResults().splitToList(direction);
-
-        if (order_dirs.size() == 1) { // 所有字段采用一种排序
-            if (null != order_dirs.get(0) && order_dirs.get(0).equals("ASC")) {
-                return baseService.list(map, new PageRequest(page, size, new Sort(Direction.ASC, order_columns)));
-            } else {
-                return baseService.list(map, new PageRequest(page, size, new Sort(Direction.DESC, order_columns)));
-            }
-        } else if (order_columns.size() == order_dirs.size()) {
-            List<Sort.Order> orderList = new ArrayList<>();
-            for (int i = 0; i < order_columns.size(); i++) {
-                if (null != order_dirs.get(i) && order_dirs.get(i).equals("ASC")) {
-                    orderList.add(new Sort.Order(Direction.ASC, order_columns.get(i)));
-                } else {
-                    orderList.add(new Sort.Order(Direction.DESC, order_columns.get(i)));
-                }
-            }
-            return baseService.list(map, new PageRequest(page, size, new Sort(orderList)));
-        } else {
-            throw new RuntimeException("多字段排序参数格式问题，排序顺序和字段数不一致");
-        }
-    }
-
-    /**
-     * @param @param map
-     * @throws
-     * @Title: list
-     * @Description: TODO(多条件查询)
-     */
-    @RequestMapping(value = "/all", method = RequestMethod.GET)
-    public Iterable<T> list(@RequestParam Map<String, Object> map) {
-        return baseService.list(map);
-    }
-
-    /**
-     * @param @param  t
-     * @param @return 设定文件
-     * @return Map<String,Object>  {status: 1（成功），-1（失败）}
-     * @throws
-     * @Title: save
-     * @Description: TODO(持久化对象)
-     */
-    @RequestMapping(method = RequestMethod.POST)
-    public Map<String, Object> save(T t) {
-        return baseService.save(t);
-    }
-
-    /**
-     * @param @param id
-     * @throws
-     * @Title: findById
-     * @Description: TODO(根据主键获取单个对象)
-     */
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET)
-    public T findById(@PathVariable("id") ID id) {
-        return baseService.findById(id);
-    }
-
-    /**
-     * @param @param id
-     * @throws
-     * @Title: delete
-     * @Description: TODO(根据主键删除对象)
-     */
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
-    public Map<String, Object> delete(@PathVariable("id") ID id) {
-        return baseService.delete(id);
-    }
-
-}
+package com.bsth.controller;
+
+import com.bsth.service.BaseService;
+import com.google.common.base.Splitter;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.domain.Sort.Direction;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @param <T>
+ * @param <ID> 主键类型
+ * @author PanZhao
+ * @ClassName: BaseController
+ * @Description: TODO(基础的Controller实现)
+ * @date 2016年3月17日 下午12:44:06
+ */
+public class BaseController<T, ID extends Serializable> {
+
+    @Autowired
+    protected BaseService<T, ID> baseService;
+
+    /**
+     * @param @param map 查询条件
+     * @param @param page 页码
+     * @param @param size 每页显示数量
+     * @throws
+     * @Title: list
+     * @Description: TODO(多条件分页查询)
+     */
+    @RequestMapping(method = RequestMethod.GET)
+    public Page<T> 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) {
+
+        // 允许多个字段排序，order可以写单个字段，也可以写多个字段
+        // 多个字段格式：{col1},{col2},{col3},....,{coln}
+        List<String> order_columns = Splitter.on(",").trimResults().splitToList(order);
+        // 多字段排序：DESC,ASC...
+        List<String> order_dirs = Splitter.on(",").trimResults().splitToList(direction);
+
+        if (order_dirs.size() == 1) { // 所有字段采用一种排序
+            if (null != order_dirs.get(0) && order_dirs.get(0).equals("ASC")) {
+                return baseService.list(map, new PageRequest(page, size, new Sort(Direction.ASC, order_columns)));
+            } else {
+                return baseService.list(map, new PageRequest(page, size, new Sort(Direction.DESC, order_columns)));
+            }
+        } else if (order_columns.size() == order_dirs.size()) {
+            List<Sort.Order> orderList = new ArrayList<>();
+            for (int i = 0; i < order_columns.size(); i++) {
+                if (null != order_dirs.get(i) && order_dirs.get(i).equals("ASC")) {
+                    orderList.add(new Sort.Order(Direction.ASC, order_columns.get(i)));
+                } else {
+                    orderList.add(new Sort.Order(Direction.DESC, order_columns.get(i)));
+                }
+            }
+            return baseService.list(map, new PageRequest(page, size, new Sort(orderList)));
+        } else {
+            throw new RuntimeException("多字段排序参数格式问题，排序顺序和字段数不一致");
+        }
+    }
+
+    /**
+     * @param @param map
+     * @throws
+     * @Title: list
+     * @Description: TODO(多条件查询)
+     */
+    @RequestMapping(value = "/all", method = RequestMethod.GET)
+    public Iterable<T> list(@RequestParam Map<String, Object> map) {
+        return baseService.list(map);
+    }
+
+    /**
+     * @param @param map
+     * @throws
+     * @Title: list
+     * @Description: TODO(多条件查询)
+     */
+    @RequestMapping(value = "/findAll", method = RequestMethod.GET)
+    public List<T> findAll(@RequestParam Map<String, Object> map,
+                           @RequestParam(defaultValue = "id") String order,
+                           @RequestParam(defaultValue = "DESC") String direction) {
+        String[] columns = order.split(","), directions = direction.split(",");
+        if (columns.length != directions.length) {
+            throw new IllegalArgumentException("不合法的排序参数");
+        }
+
+        List<Sort.Order> orders = new ArrayList<>();
+        for (int i = 0;i < columns.length;i++) {
+            String column = columns[i], direction1 = directions[i];
+            if ("DESC".equals(direction1)) {
+                orders.add(Sort.Order.desc(column));
+            } else if ("ASC".equals(direction1)) {
+                orders.add(Sort.Order.asc(column));
+            } else {
+                throw new IllegalArgumentException("不合法的排序参数");
+            }
+        }
+
+        return baseService.findAll(map, Sort.by(orders));
+    }
+
+    /**
+     * @param @param  t
+     * @param @return 设定文件
+     * @return Map<String,Object>  {status: 1（成功），-1（失败）}
+     * @throws
+     * @Title: save
+     * @Description: TODO(持久化对象)
+     */
+    @RequestMapping(method = RequestMethod.POST)
+    public Map<String, Object> save(T t) {
+        return baseService.save(t);
+    }
+
+    /**
+     * @param @param id
+     * @throws
+     * @Title: findById
+     * @Description: TODO(根据主键获取单个对象)
+     */
+    @RequestMapping(value = "/{id}", method = RequestMethod.GET)
+    public T findById(@PathVariable("id") ID id) {
+        return baseService.findById(id);
+    }
+
+    /**
+     * @param @param id
+     * @throws
+     * @Title: delete
+     * @Description: TODO(根据主键删除对象)
+     */
+    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
+    public Map<String, Object> delete(@PathVariable("id") ID id) {
+        return baseService.delete(id);
+    }
+
+}
-package com.bsth.controller;
-
-import java.io.BufferedInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-@RequestMapping("/")
-public class IndexController {
-
-	Logger logger = LoggerFactory.getLogger(this.getClass());
-
-	String indexSource;
-
-	/**
-	 * 构造函数
-	 */
-	public IndexController() {
-		BufferedInputStream bis = null;
-
-		try {
-			InputStream is = IndexController.class.getClassLoader().getResourceAsStream("static/index.html");
-			bis = new BufferedInputStream(is);
-			StringBuilder source = new StringBuilder();
-			byte[] buffer = new byte[bis.available()];
-
-			while (bis.read(buffer) != -1) {
-				source.append(new String(buffer));
-			}
-
-			indexSource = source.toString();
-		} catch (Exception e) {
-			logger.error("", e);
-		} finally {
-			try {
-				bis.close();
-			} catch (IOException e) {
-				logger.error("", e);
-			}
-		}
-	}
-
-	/**
-	 * 
-	 * @Title: index 
-	 * @Description: TODO(输出首页 index.html) 
-	 */
-	@RequestMapping
-	public void index(String initFragment, HttpServletResponse resp) {
-
-		// 初始打开的片段地址
-		String outStr = StringUtils.replace(indexSource, "^_^initFragment^_^",
-				initFragment == null ? "" : initFragment);
-
-		resp.setContentType("text/html;charset=UTF-8");
-		try {
-			resp.getOutputStream().write(outStr.getBytes());
-		} catch (IOException e) {
-			logger.error("", e);
-		}
-
-	}
-}
+package com.bsth.controller;
+
+import java.io.BufferedInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/")
+public class IndexController {
+
+	Logger logger = LoggerFactory.getLogger(this.getClass());
+
+	String indexSource;
+
+	/**
+	 * 构造函数
+	 */
+	public IndexController() {
+		load();
+	}
+
+	/**
+	 * 
+	 * @Title: index 
+	 * @Description: TODO(输出首页 index.html) 
+	 */
+	@RequestMapping
+	public void index(String initFragment, HttpServletResponse resp) {
+
+		// 初始打开的片段地址
+		String outStr = StringUtils.replace(indexSource, "^_^initFragment^_^",
+				initFragment == null ? "" : initFragment);
+
+		resp.setContentType("text/html;charset=UTF-8");
+		try {
+			resp.getOutputStream().write(outStr.getBytes());
+		} catch (IOException e) {
+			logger.error("", e);
+		}
+
+	}
+
+	@RequestMapping(value = "/index/load", method = RequestMethod.GET)
+	public void load() {
+		BufferedInputStream bis = null;
+
+		try {
+			InputStream is = IndexController.class.getClassLoader().getResourceAsStream("static/index.html");
+			bis = new BufferedInputStream(is);
+			StringBuilder source = new StringBuilder();
+			byte[] buffer = new byte[bis.available()];
+
+			while (bis.read(buffer) != -1) {
+				source.append(new String(buffer));
+			}
+
+			indexSource = source.toString();
+		} catch (Exception e) {
+			logger.error("", e);
+		} finally {
+			try {
+				bis.close();
+			} catch (IOException e) {
+				logger.error("", e);
+			}
+		}
+	}
+}
-package com.bsth.controller;
-
-import com.bsth.common.ResponseCode;
-import com.bsth.entity.LsInoutSectionRoute;
-import com.bsth.repository.StationRouteCacheRepository;
-import com.bsth.repository.StationRouteRepository;
-import com.bsth.service.InoutCarparkService;
-import com.bsth.service.StationRouteService;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.HashMap;
-import java.util.Map;
-
-@RestController
-@RequestMapping("inout")
-public class InoutCarparkController extends BaseController<LsInoutSectionRoute, Long>{
-
-    private final static Logger logger = LoggerFactory.getLogger(InoutCarparkController.class);
-	
-	@Autowired
-	InoutCarparkService inoutCarparkService;
-    
-    @RequestMapping(value = "/getStartEndByLine", method = RequestMethod.GET)
-    public Map<String, Object> getStartEndByLine(@RequestParam("lineId")int lineId, @RequestParam("version")int version) {
-    	return inoutCarparkService.getStartEndByLine(lineId, version);
-    }
-
-    @RequestMapping(value = "/getRouteByStartEnd", method = RequestMethod.GET)
-    public Map<String, Object> getRouteByStartEnd(@RequestParam("lineId")int lineId, @RequestParam("version")int version, @RequestParam("start")String start, @RequestParam("end")String end) {
-        return inoutCarparkService.getRouteByStartEnd(lineId, version, start, end);
-    }
-
-    /**
-     * 新增路段信息
-     *
-     * @param map：<bsectionVector：折线百度坐标集合；dbType：圆坐标类型；descriptions：描述与说明；destroy：是否撤销；directions：方向；lineId：线路ID
-     *
-     * 			   lineCode ：线路编码；roadCoding：道路编码；sectionCode：路段编码；sectionDistance：路段长度；sectionName：路段名称；sectionTime：路段时长；
-     *
-     * 			   sectionrouteCode：路段序号；speedLimit：路段限速>
-     *
-     * @return map<SUCCESS：成功；ERROR：异常>
-     */
-    @RequestMapping(value="sectionSave" , method = RequestMethod.POST)
-    public Map<String, Object> sectionSave(@RequestParam Map<String, Object> map) {
-        map.put("createBy", "");
-        map.put("updateBy", "");
-        return inoutCarparkService.sectionSave(map);
-    }
-
-    /**
-     * @Description :TODO(编辑线路走向)
-     *
-     * @param map <sectionId:路段ID； sectionJSON：路段信息>
-     *
-     * @return Map<String, Object> <SUCCESS ; ERROR>
-     */
-    @RequestMapping(value="sectionUpdate" , method = RequestMethod.POST)
-    public Map<String, Object> sectionUpdate(@RequestParam Map<String, Object> map) {
-
-        map.put("updateBy", "");
-
-        map.put("createBy", "");
-
-        map.put("createDate", "");
-
-        return inoutCarparkService.sectionUpdate(map);
-
-    }
-
-    /**
-     * @param id //路段路由id
-     * @Description: TODO(撤销路段)
-     */
-    @RequestMapping(value = "/destroy", method = RequestMethod.POST)
-    public Map<String, Object> destroy(@RequestParam Map<String, Object> map) {
-        return inoutCarparkService.destroy(map);
-    }
-
-    /**
-     * 从历史轨迹做进场路径规划
-     * @Description: TODO(撤销路段)
-     */
-    @RequestMapping(value = "/pathPlaningByHistory", method = RequestMethod.POST)
-    public Map<String, Object> pathPlaningByHistory(@RequestParam Map<String, Object> map){
-        Map<String, Object> result = new HashMap<>();
-        result.put("status", ResponseCode.SUCCESS);
-        try {
-            String schId = (String)map.get("schId"), version = (String)map.get("version");
-            if (StringUtils.isEmpty(schId) || StringUtils.isEmpty(version)) {
-                throw new RuntimeException("无效的参数");
-            }
-            inoutCarparkService.pathPlaningByHistory(Long.parseLong(schId), Integer.parseInt(version));
-        } catch (Exception e) {
-            result.put("status", ResponseCode.ERROR);
-            logger.error("路径规划异常", e);
-        }
-
-        return result;
-    }
-}
@@ -136,14 +136,4 @@ public class LineController extends BaseController&lt;Line, Integer&gt; {
 	public Map<String, Object> remove(Integer id){
 		return service.remove(id);
 	}
-
-	/**
-	 * 查询外部行业编码是否有更新
-	 * @param id
-	 * @return
-	 */
-	@RequestMapping(value ="/getLineMatchStationIsUpdate" , method = RequestMethod.GET)
-	public Map<String, Object> getLineMatchStationIsUpdate(@RequestParam(defaultValue = "id") Integer id){
-		return service.getLineMatchStationIsUpdate(id);
-	}
 }
+package com.bsth.controller;
+
+import com.bsth.common.ResponseCode;
+import com.bsth.entity.LsSectionRoute;
+import com.bsth.entity.LsStationRoute;
+import com.bsth.entity.SectionRoute;
+import com.bsth.service.LsSectionRouteService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+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.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 
+ * @ClassName: SectionRouteController(路段路由控制器)
+ * 
+ * @Extends : BaseController
+ * 
+ * @Description: TODO(路段路由控制层)
+ * 
+ * @Author bsth@lq
+ * 
+ * @Date 2016年05月03日 上午9:21:17
+ *
+ * @Version 公交调度系统BS版 0.1
+ * 
+ */
+
+@RestController
+@RequestMapping("/api/lssectionroute")
+public class LsSectionRouteController extends BaseController<LsSectionRoute, Integer> {
+
+	private final static Logger log = LoggerFactory.getLogger(LsSectionRouteController.class);
+	
+	@Autowired
+	private LsSectionRouteService lsSectionRouteService;
+
+	@RequestMapping(value = "/findPageByParams", method = RequestMethod.GET)
+	public Page<LsSectionRoute> findPageByParams(@RequestParam Map<String, Object> params) {
+		int page = params.get("page") == null ? 0 : Integer.parseInt(params.get("page").toString());
+		int size = params.get("size") == null ? 10 : Integer.parseInt(params.get("size").toString());
+		String order = params.get("order").toString(), direction = params.get("direction").toString();
+
+		return super.list(params, page, size, order, direction);
+	}
+
+	/**
+	 * @param id
+	 * @throws
+	 * @Description: TODO(批量撤销路段)
+	 */
+	@RequestMapping(value = "/destroy", method = RequestMethod.POST)
+	public Map<String, Object> destroy(Integer id) {
+		Map<String, Object> result = new HashMap<>();
+		try {
+			lsSectionRouteService.batchDestroy(Arrays.asList(id));
+			result.put("status", ResponseCode.SUCCESS);
+		} catch (Exception e) {
+			result.put("status", ResponseCode.ERROR);
+			log.error("", e);
+		}
+
+		return result;
+	}
+
+	/**
+     * @param ids
+     * @throws
+     * @Description: TODO(批量撤销路段)
+     */
+    @RequestMapping(value = "/batchDestroy", method = RequestMethod.POST)
+    public Map<String, Object> batchDestroy(@RequestParam(value = "ids[]") List<Integer> ids) {
+    	Map<String, Object> result = new HashMap<>();
+    	try {
+			lsSectionRouteService.batchDestroy(ids);
+			result.put("status", ResponseCode.SUCCESS);
+		} catch (Exception e) {
+    		result.put("status", ResponseCode.ERROR);
+    		log.error("", e);
+		}
+
+    	return result;
+    }
+
+	/**
+	 * @param lineId
+	 * @param version
+	 * @param direction
+	 * @param otherDirection
+	 * @throws
+	 * @Description: 引用另一上下行路段
+	 */
+	@RequestMapping(value = "/quoteOtherSide", method = RequestMethod.POST)
+	public Map<String, Object> quoteOtherSide(int lineId, int version, int direction, int otherDirection) {
+		Map<String, Object> result = new HashMap<>();
+		try {
+			lsSectionRouteService.quoteOtherSide(lineId, version, direction, otherDirection);
+			result.put("status", ResponseCode.SUCCESS);
+		} catch (Exception e) {
+			result.put("status", ResponseCode.ERROR);
+			log.error("", e);
+		}
+
+		return result;
+	}
+
+	@RequestMapping(value = "/add", method = RequestMethod.POST)
+	public Map<String, Object> add(LsSectionRoute sectionRoute) {
+		Map<String, Object> result = new HashMap<>();
+		try {
+			lsSectionRouteService.add(sectionRoute);
+			result.put("status", ResponseCode.SUCCESS);
+		} catch (Exception e) {
+			result.put("status", ResponseCode.ERROR);
+			result.put("msg", e.getMessage());
+			log.error("", e);
+		}
+
+		return result;
+	}
+
+	@RequestMapping(value = "/modify", method = RequestMethod.POST)
+	public Map<String, Object> modify(LsSectionRoute sectionRoute) {
+		Map<String, Object> result = new HashMap<>();
+		try {
+			lsSectionRouteService.modify(sectionRoute);
+			result.put("status", ResponseCode.SUCCESS);
+		} catch (Exception e) {
+			result.put("status", ResponseCode.ERROR);
+			result.put("msg", e.getMessage());
+			log.error("", e);
+		}
+
+		return result;
+	}
+}
+package com.bsth.controller;
+
+import com.bsth.common.ResponseCode;
+import com.bsth.entity.LsSectionRoute;
+import com.bsth.entity.LsStationRoute;
+import com.bsth.service.LsStationRouteService;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.*;
+
+/**
+ * @author Hill
+ */
+@RestController
+@RequestMapping("/api/lsstationroute")
+public class LsStationRouteController extends BaseController<LsStationRoute, Integer> {
+
+    private static final Logger log = LoggerFactory.getLogger(LsStationRouteController.class);
+
+    @Autowired
+    private LsStationRouteService lsStationRouteService;
+
+    @Autowired
+    private ObjectMapper mapper;
+
+    @RequestMapping(value = "/findAllByParams", method = RequestMethod.GET)
+    public Iterable<LsStationRoute> findAllByParams(@RequestParam Map<String, Object> params) {
+        return lsStationRouteService.findAllByParams(params);
+    }
+
+    @RequestMapping(value = "/findPageByParams", method = RequestMethod.GET)
+    public Page<LsStationRoute> findPageByParams(@RequestParam Map<String, Object> params) {
+        int page = params.get("page") == null ? 0 : Integer.parseInt(params.get("page").toString());
+        int size = params.get("size") == null ? 10 : Integer.parseInt(params.get("size").toString());
+        String order = params.get("order").toString(), direction = params.get("direction").toString();
+
+        return super.list(params, page, size, order, direction);
+    }
+
+    /**
+     * @Description :TODO(查询站点的下一个缓存站点)
+     */
+    @RequestMapping(value = "/findCurrentAndNext" , method = RequestMethod.GET)
+    public List<LsStationRoute> findCurrentAndNext(Integer id) {
+        return lsStationRouteService.findCurrentAndNext(id);
+    }
+
+    /**
+     * @param id
+     * @throws
+     * @Description: TODO(批量撤销站点)
+     */
+    @RequestMapping(value = "/destroy", method = RequestMethod.POST)
+    public Map<String, Object> destroy(Integer id) {
+        Map<String, Object> result = new HashMap<>();
+        try {
+            lsStationRouteService.batchDestroy(Arrays.asList(id));
+            result.put("status", ResponseCode.SUCCESS);
+        } catch (Exception e) {
+            result.put("status", ResponseCode.ERROR);
+            result.put("msg", e.getMessage());
+            log.error("", e);
+        }
+
+        return result;
+    }
+
+    /**
+     * @param ids
+     * @throws
+     * @Description: TODO(批量撤销站点)
+     */
+    @RequestMapping(value = "/batchDestroy", method = RequestMethod.POST)
+    public Map<String, Object> batchDestroy(@RequestParam(value = "ids[]") List<Integer> ids) {
+        Map<String, Object> result = new HashMap<>();
+        try {
+            lsStationRouteService.batchDestroy(ids);
+            result.put("status", ResponseCode.SUCCESS);
+        } catch (Exception e) {
+            result.put("status", ResponseCode.ERROR);
+            result.put("msg", e.getMessage());
+            log.error("", e);
+        }
+
+        return result;
+    }
+
+    /**
+     * 保存线路某个版本下单行的站点和路段路由
+     * 常规使用在根据百度地图生成数据或者模板导入的批量保存
+     * @param map
+     * @return
+     */
+    @RequestMapping(value="addRoutes" , method = RequestMethod.POST)
+    public Map<String, Object> addRoutes(@RequestBody Map<String, Object> map) {
+        Map<String, Object> result = new HashMap<>();
+        try {
+            if (map.get("lineId") == null || map.get("versions") == null || map.get("directions") == null) {
+                throw new IllegalArgumentException("需正确传入线路、方向、版本参数");
+            }
+            Integer versions = Integer.parseInt(map.get("versions").toString()), directions = Integer.parseInt(map.get("directions").toString()), lineId = Integer.parseInt(map.get("lineId").toString());
+            List<LsStationRoute> stationRoutes = mapper.convertValue(map.get("stationRoutes"), mapper.constructType(mapper.getTypeFactory().constructParametricType(List.class, LsStationRoute.class)));
+            List<LsSectionRoute> sectionRoutes = mapper.convertValue(map.get("sectionRoutes"), mapper.constructType(mapper.getTypeFactory().constructParametricType(List.class, LsSectionRoute.class)));
+
+            result.putAll(lsStationRouteService.addRoutes(lineId, versions, directions, stationRoutes, sectionRoutes));
+            result.put("status", ResponseCode.SUCCESS);
+        } catch (Exception e) {
+            result.put("status", ResponseCode.ERROR);
+            log.error("", e);
+        }
+
+        return result;
+    }
+
+    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    public Map<String, Object> add(LsStationRoute stationRoute) {
+        Map<String, Object> result = new HashMap<>();
+        try {
+            lsStationRouteService.add(stationRoute);
+            result.put("status", ResponseCode.SUCCESS);
+        } catch (Exception e) {
+            result.put("status", ResponseCode.ERROR);
+            result.put("msg", e.getMessage());
+            log.error("", e);
+        }
+
+        return result;
+    }
+
+    @RequestMapping(value = "/modify", method = RequestMethod.POST)
+    public Map<String, Object> modify(LsStationRoute stationRoute) {
+        Map<String, Object> result = new HashMap<>();
+        try {
+            lsStationRouteService.modify(stationRoute);
+            result.put("status", ResponseCode.SUCCESS);
+        } catch (Exception e) {
+            result.put("status", ResponseCode.ERROR);
+            result.put("msg", e.getMessage());
+            log.error("", e);
+        }
+
+        return result;
+    }
+
+    @RequestMapping(value = "/exchangeDirection", method = RequestMethod.POST)
+    public Map<String, Object> exchangeDirection(int lineId, int version) {
+        Map<String, Object> result = new HashMap<>();
+        try {
+            lsStationRouteService.exchangeDirection(lineId, version);
+            result.put("status", ResponseCode.SUCCESS);
+        } catch (Exception e) {
+            result.put("status", ResponseCode.ERROR);
+            result.put("msg", e.getMessage());
+            log.error("", e);
+        }
+
+        return result;
+    }
+
+    @RequestMapping(value = "/modifyDistance", method = RequestMethod.POST)
+    public Map<String, Object> modifyDistance(@RequestParam Map<String, Object> params) {
+        Map<String, Object> result = new HashMap<>();
+        try {
+            List<Integer> ids = new ArrayList<>();
+            List<Double> distances = new ArrayList<>();
+            for (Map.Entry<String, Object> entry : params.entrySet()) {
+                String key = entry.getKey(), value = String.valueOf(entry.getValue());
+                ids.add(Integer.parseInt(key.split("_")[1]));
+                distances.add(Double.parseDouble(value) / 1000);
+            }
+            if (ids.size() == 0) {
+                throw new IllegalArgumentException("不合法的参数");
+            }
+            lsStationRouteService.modifyDistance(ids, distances);
+            result.put("status", ResponseCode.SUCCESS);
+        } catch (Exception e) {
+            result.put("status", ResponseCode.ERROR);
+            result.put("msg", e.getMessage());
+            log.error("", e);
+        }
+
+        return result;
+    }
+
+    @RequestMapping(value = "/circularRouteHandle", method = RequestMethod.POST)
+    public Map<String, Object> circularRouteHandle(Integer lineId, Integer version) {
+        Map<String, Object> result = new HashMap<>();
+        try {
+            lsStationRouteService.circularRouteHandle(lineId, version);
+            result.put("status", ResponseCode.SUCCESS);
+        } catch (Exception e) {
+            result.put("status", ResponseCode.ERROR);
+            result.put("msg", e.getMessage());
+            log.error("", e);
+        }
+
+        return result;
+    }
+}
-package com.bsth.controller;
-
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.bsth.entity.RoadSpeed;
-import com.bsth.service.RoadSpeedService;
-
-/**
- * 
- * @ClassName: RoadSpeedController(路段限速控制器)
- * 
- * @Extends : BaseController
- * 
- * @Description: TODO(路段限速控制层)
- * 
- * @Author bsth@lq
- *
- * @Version 公交调度系统BS版 0.1
- * 
- */
-@RestController
-@RequestMapping("roadSpeed")
-public class RoadSpeedController extends BaseController<RoadSpeed, Integer> {
-	
-	@Autowired
-	private RoadSpeedService service;
-	
-	/*@RequestMapping(value="all", method = RequestMethod.GET)
-	public List<RoadSpeed> allRoadSpeed(){
-		return service.allRoadSpeed();
-	}*/
-	
-	@RequestMapping(value="save", method = RequestMethod.POST)
-	public Map<String, Object> save(@RequestParam Map<String, Object> map){
-		return service.roadSpeedSave(map);
-	}
-	
-	@RequestMapping(value="update", method = RequestMethod.POST)
-	public Map<String, Object> update(@RequestParam Map<String, Object> map){
-		return service.update(map);
-	}
-	
-	@RequestMapping(value="findById", method = RequestMethod.GET)
-	public RoadSpeed findById(@RequestParam(defaultValue = "id") Integer id){
-		return service.findId(id);
-	}
-}
 package com.bsth.controller;
-import java.util.Map;
-
+import com.bsth.common.ResponseCode;
+import com.bsth.entity.Section;
+import com.bsth.entity.Station;
+import com.bsth.repository.SectionRepository;
+import com.bsth.service.SectionService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
-import com.bsth.entity.Section;
-import com.bsth.repository.SectionRepository;
-import com.bsth.service.SectionService;
-import com.bsth.util.GetUIDAndCode;
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 /**
  * 
@@ -32,113 +37,23 @@ import com.bsth.util.GetUIDAndCode;
 @RestController
 @RequestMapping("section")
 public class SectionController extends BaseController<Section, Integer> {
+
+	private final static Logger log = LoggerFactory.getLogger(SectionController.class);
 	@Autowired
-	SectionService service;
+	SectionService sectionService;
 	@Autowired
 	SectionRepository sectionRepository;
-	
-	/**
-	 * 新增路段信息
-	 * 
-	 * @param map：<bsectionVector：折线百度坐标集合；dbType：圆坐标类型；descriptions：描述与说明；destroy：是否撤销；directions：方向；lineId：线路ID
-	 * 
-	 * 			   lineCode ：线路编码；roadCoding：道路编码；sectionCode：路段编码；sectionDistance：路段长度；sectionName：路段名称；sectionTime：路段时长；
-	 * 			
-	 * 			   sectionrouteCode：路段序号；speedLimit：路段限速>
-	 * 
-	 * @return map<SUCCESS：成功；ERROR：异常>
-	 */
-	@RequestMapping(value="sectionSave" , method = RequestMethod.POST)
-	public Map<String, Object> sectionSave(@RequestParam Map<String, Object> map) {
-		map.put("createBy", "");
-		map.put("updateBy", "");
-		return service.sectionSave(map);
-	}
-	
-	/**
-	 * @Description :TODO(编辑线路走向)
-	 * 
-	 * @param map <sectionId:路段ID； sectionJSON：路段信息>
-	 * 
-	 * @return Map<String, Object> <SUCCESS ; ERROR>
-	 */
-	@RequestMapping(value="sectionCut" , method = RequestMethod.POST)
-	public Map<String, Object> sectionCut(@RequestParam Map<String, Object> map) {
-		
-		map.put("updateBy", "");
-		
-		map.put("createBy", "");
-		
-		map.put("createDate", "");
-		
-		return service.sectionCut(map);
-		
-	}
-	
-	/**
-	 * @Description :TODO(编辑线路走向保存到线路历史表)
-	 * 
-	 * @param map <sectionId:路段ID； sectionJSON：路段信息>
-	 * 
-	 * @return Map<String, Object> <SUCCESS ; ERROR>
-	 */
-	@RequestMapping(value="sectionCutSaveLineLS" , method = RequestMethod.POST)
-	public Map<String, Object> sectionCutSaveLineLS(@RequestParam Map<String, Object> map) {
-		
-		map.put("updateBy", "");
-		
-		map.put("createBy", "");
-		
-		return service.sectionCutSaveLineLS(map);
-		
-	}
-	
-	/**
-	 * @Description :TODO(编辑线路走向)
-	 * 
-	 * @param map <sectionId:路段ID； sectionJSON：路段信息>
-	 * 
-	 * @return Map<String, Object> <SUCCESS ; ERROR>
-	 */
-	@RequestMapping(value="sectionUpdate" , method = RequestMethod.POST)
-	public Map<String, Object> sectionUpdate(@RequestParam Map<String, Object> map) {
-		
-		map.put("updateBy", "");
-		
-		map.put("createBy", "");
-		
-		map.put("createDate", "");
-		
-		return service.sectionUpdate(map);
-		
-	}
-	
-	/**
-	 * @Description :TODO(编辑缓存线路走向)
-	 */
-	@RequestMapping(value="sectionCacheUpdate" , method = RequestMethod.POST)
-	public Map<String, Object> sectionCacheUpdate(@RequestParam Map<String, Object> map) {
-		
-		map.put("updateBy", "");
-		
-		map.put("createBy", "");
-		
-		map.put("createDate", "");
-		
-		return service.sectionCacheUpdate(map);
-		
-	}
-	
+
 	/**
 	 * @Description :TODO(查询路段编码)
 	 * 
 	 * @return int <sectionCode路段编码>
 	 */
-	@RequestMapping(value="getSectionCode" , method = RequestMethod.GET)
+	@RequestMapping(value="getSectionCode", method = RequestMethod.GET)
 	public long getSectionCode() {
-		return sectionRepository.sectionMaxId() + 1;
+		return sectionRepository.findLatestSectionId() + 1;
 	}
 	/**
@@ -146,9 +61,69 @@ public class SectionController extends BaseController&lt;Section, Integer&gt; {
 	 *
 	 * @return int <sectionCode路段编码>
 	 */
-	@RequestMapping(value="doubleName" , method = RequestMethod.POST)
+	@RequestMapping(value="doubleName", method = RequestMethod.POST)
 	public Map<String, Object> doubleName(@RequestParam Map<String, Object> map) {
-		return service.doubleName(map);
+		return sectionService.doubleName(map);
 	}
+	@RequestMapping(value="add", method = RequestMethod.POST)
+	public Map<String, Object> add(Section section) {
+		Map<String, Object> result = new HashMap<>();
+		try {
+			sectionService.add(section);
+			result.put("status", ResponseCode.SUCCESS);
+		} catch (Exception e) {
+			result.put("status", ResponseCode.ERROR);
+			log.error("", e);
+		}
+
+		return result;
+	}
+
+	@RequestMapping(value="modify", method = RequestMethod.POST)
+	public Map<String, Object> modify(Section section) {
+		Map<String, Object> result = new HashMap<>();
+		try {
+			sectionService.modify(section);
+			result.put("status", ResponseCode.SUCCESS);
+		} catch (Exception e) {
+			result.put("status", ResponseCode.ERROR);
+			log.error("", e);
+		}
+
+		return result;
+	}
+
+	@RequestMapping(value="findDistinctSectionName", method = RequestMethod.GET)
+	public Map<String, Object> findDistinctSectionName() {
+		Map<String, Object> result = new HashMap<>();
+		try {
+			result.put("data", sectionService.findDistinctSectionName());
+			result.put("status", ResponseCode.SUCCESS);
+		} catch (Exception e) {
+			result.put("status", ResponseCode.ERROR);
+			log.error("", e);
+		}
+
+		return result;
+	}
+
+	/**
+	 * 根据路段名搜索路段信息
+	 * @param sectionName
+	 * @return 站点列表
+	 */
+	@RequestMapping(value="findSectionByName" , method = RequestMethod.GET)
+	public Map<String, Object> findSectionByName(String sectionName) {
+		Map<String, Object> result = new HashMap<>();
+		try {
+			result.put("data", sectionService.findSectionByName(sectionName));
+			result.put("status", ResponseCode.SUCCESS);
+		} catch (Exception e) {
+			result.put("status", ResponseCode.ERROR);
+			log.error("", e);
+		}
+
+		return result;
+	}
 }
-package com.bsth.controller;
-
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.bsth.entity.SectionRoute;
-import com.bsth.entity.StationRouteCache;
-import com.bsth.service.SectionRouteService;
-
-/**
- * 
- * @ClassName: SectionRouteController(路段路由控制器)
- * 
- * @Extends : BaseController
- * 
- * @Description: TODO(路段路由控制层)
- * 
- * @Author bsth@lq
- * 
- * @Date 2016年05月03日 上午9:21:17
- *
- * @Version 公交调度系统BS版 0.1
- * 
- */
-
-@RestController
-@RequestMapping("sectionroute")
-public class SectionRouteController extends BaseController<SectionRoute, Integer> {
-	
-	@Autowired
-	SectionRouteService routeService;
-	
-	  @RequestMapping(value = "/allls", method = RequestMethod.GET)
-	    public Map allls(@RequestParam Map<String, Object> map) {
-	    	
-	        return routeService.pageLs(map);
-	    }
-	    
-	
-	/**
-     * @param map
-     * @throws
-     * @Description: TODO(批量撤销路段)
-     */
-    @RequestMapping(value = "/batchDestroy", method = RequestMethod.POST)
-    public Map<String, Object> updateBatch(@RequestParam Map<String, Object> map) {
-    	return routeService.updateSectionRouteInfoFormId(map);
-    }
-    /**
-     * @param id //路段路由id
-     * @Description: TODO(撤销路段)
-     */
-    @RequestMapping(value = "/destroy", method = RequestMethod.POST)
-    public Map<String, Object> destroy(@RequestParam Map<String, Object> map) {
-    	
-    	int id = Integer.parseInt(map.get("id").toString());
-    	
-    	if(map.get("status") == null || Integer.parseInt(map.get("status").toString()) == 1) {
-    		return routeService.destroy(id);
-    	}else if(Integer.parseInt(map.get("status").toString()) == 2){
-    		return routeService.destroyHistory(id);
-    	}else {
-    		return map;
-    	}
-    }
-	
-	 /**
-     * @param @param map
-     * @throws
-     * @Title: list
-     * @Description: TODO(多条件查询)
-     */
-    @RequestMapping(value = "/all", method = RequestMethod.GET)
-    public Iterable<SectionRoute> list(@RequestParam Map<String, Object> map) {
-        return routeService.list(map);
-    }
-    
-    @RequestMapping(value = "/cacheList", method = RequestMethod.GET)
-    public List<StationRouteCache> cacheList(@RequestParam Map<String, Object> map) {
-//    	 routeService.cacheList(map)
-        return null;
-    }
-	
-	/**
-	 * @Description :TODO(查询路段信息)
-	 * 
-	 * @param map <line.id_eq:线路ID； directions_eq：方向>
-	 * 
-	 * @return Map<String, Object> 
-	 */
-	@RequestMapping(value = "/findSection" , method = RequestMethod.GET)
-	public  List<Map<String, Object>> findPoints(@RequestParam Map<String, Object> map) {
-		return routeService.getSectionRoute(map);
-	}
-	
-	
-	/**
-	 * @Description :TODO(查询路段信息)
-	 * 
-	 * @param map <line.id_eq:线路ID； directions_eq：方向>
-	 * 
-	 * @return Map<String, Object> 
-	 */
-	@RequestMapping(value = "/findCacheSection" , method = RequestMethod.GET)
-	public  List<Map<String, Object>> getSectionRouteCache(@RequestParam Map<String, Object> map) {
-		return routeService.getSectionRouteCache(map);
-	}
-	
-	/**
-	 * @Description : TODO(根据路段路由Id查询详情)
-	 * 
-	 * @param  map <id:路段路由ID> 
-	 * 
-	 * @return List<Map<String, Object>>
-	 */
-	@RequestMapping(value = "/findSectionRouteInfoFormId",method = RequestMethod.GET)
-	public List<Map<String, Object>> findSectionRouteInfoFormId(@RequestParam Map<String, Object> map) {
-		return routeService.findSectionRouteInfoFormId(map);
-	}
-	
-	/**
-	 * @Description :TODO(查询线路某方向下的上一个路段序号)
-	 * 
-	 * @param map <lineId:线路ID； direction：方向；sectionRouteCode：路段编码>
-	 * 
-	 * @return List<Map<String, Object>> 
-	 */
-	@RequestMapping(value = "/findUpSectionRouteCode" , method = RequestMethod.GET)
-	public List<Map<String, Object>> findUpStationRouteCode(@RequestParam Map<String, Object> map) {
-		return routeService.findUpSectionRouteCode(map);
-	}
-	
-	@RequestMapping(value = "/findCacheUpSectionRouteCode" , method = RequestMethod.GET)
-	public List<Map<String, Object>> findCacheUpSectionRouteCode(@RequestParam Map<String, Object> map) {
-		return routeService.findCacheUpSectionRouteCode(map);
-	}
-	
-	/**
-	 * @Description :TODO(引用路段)
-	 * 
-	 * @return List<Map<String, Object>> 
-	 */
-	@RequestMapping(value = "/quoteSection" , method = RequestMethod.POST)
-	public Map<String, Object> quoteSection(@RequestParam Map<String, Object> map) {
-		return routeService.quoteSection(map);
-	}
-}
+package com.bsth.controller;
+
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.bsth.entity.SectionRoute;
+import com.bsth.service.SectionRouteService;
+
+/**
+ * 
+ * @ClassName: SectionRouteController(路段路由控制器)
+ * 
+ * @Extends : BaseController
+ * 
+ * @Description: TODO(路段路由控制层)
+ * 
+ * @Author bsth@lq
+ * 
+ * @Date 2016年05月03日 上午9:21:17
+ *
+ * @Version 公交调度系统BS版 0.1
+ * 
+ */
+
+@RestController
+@RequestMapping("sectionroute")
+public class SectionRouteController extends BaseController<SectionRoute, Integer> {
+	
+	@Autowired
+	SectionRouteService routeService;
+	
+	 /**
+     * @param @param map
+     * @throws
+     * @Title: list
+     * @Description: TODO(多条件查询)
+     */
+    @RequestMapping(value = "/all", method = RequestMethod.GET)
+    public Iterable<SectionRoute> list(@RequestParam Map<String, Object> map) {
+        return routeService.list(map);
+    }
+	
+	/**
+	 * @Description :TODO(查询路段信息)
+	 * 
+	 * @param map <line.id_eq:线路ID； directions_eq：方向>
+	 * 
+	 * @return Map<String, Object> 
+	 */
+	@RequestMapping(value = "/findSection" , method = RequestMethod.GET)
+	public  List<Map<String, Object>> findPoints(@RequestParam Map<String, Object> map) {
+		return routeService.getSectionRoute(map);
+	}
+	
+	/**
+	 * @Description :TODO(查询线路某方向下的上一个路段序号)
+	 * 
+	 * @param map <lineId:线路ID； direction：方向；sectionRouteCode：路段编码>
+	 * 
+	 * @return List<Map<String, Object>> 
+	 */
+	@RequestMapping(value = "/findUpSectionRouteCode" , method = RequestMethod.GET)
+	public List<Map<String, Object>> findUpStationRouteCode(@RequestParam Map<String, Object> map) {
+		return routeService.findUpSectionRouteCode(map);
+	}
+}
-package com.bsth.controller;
-
-import java.util.List;
-import java.util.Map;
-
-import com.bsth.entity.SectionSpeed;
-import com.bsth.service.SectionSpeedService;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-
-@RestController
-@RequestMapping("sectionspeed")
-public class SectionSpeedController extends BaseController<SectionSpeed, Integer> {
-	
-	@Autowired
-	private SectionSpeedService sectionSpeedService;
-	
-	/**@description TODO(新增路段限速) */
-	@RequestMapping(value="add" , method = RequestMethod.POST)
-	public Map<String, Object> collectionSave(@RequestParam Map<String, Object> map) {
-		return sectionSpeedService.add(map);
-	}
-	
-	/**@description TODO(修改路段) */
-	@RequestMapping(value="roadUpd" , method = RequestMethod.POST)
-	public Map<String, Object> roadUpd(@RequestParam Map<String, Object> map) {
-		return sectionSpeedService.roadUpd(map);
-	}
-	
-	/** @description TODO(根据线路ID与编码及方向查询路段限速信息) */
-	@RequestMapping(value="getSectionSpeedInfoList",method=RequestMethod.GET)
-	public List<Map<String, Object>> getSectionSpeedInfoList(@RequestParam Map<String, Object> map){
-		return sectionSpeedService.getSectionSpeedInfo(map);
-	}
-	
-	/**
-	 * @Description :TODO(查询路段信息)
-	 * 
-	 * @param map <line.id_eq:线路ID； directions_eq：方向>
-	 * 
-	 * @return Map<String, Object> 
-	 */
-	@RequestMapping(value = "/analyticSection" , method = RequestMethod.GET)
-	public  List<Map<String, Object>> findPoints(@RequestParam Map<String, Object> map) {
-		return sectionSpeedService.analyticSection(map);
-	}
-	
-}
 package com.bsth.controller;
+import com.bsth.common.ResponseCode;
+import com.bsth.entity.LsSectionRoute;
+import com.bsth.entity.LsStationRoute;
 import com.bsth.entity.Station;
 import com.bsth.repository.StationRepository;
 import com.bsth.service.StationService;
-import com.bsth.util.GetUIDAndCode;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 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 org.springframework.web.bind.annotation.*;
+import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 /**
@@ -35,162 +37,88 @@ import java.util.Map;
 public class StationController extends BaseController<Station, Integer> {
 	@Autowired
-	private StationService service;
+	private StationService stationService;
 	@Autowired
-	StationRepository stationRepository;
+	private ObjectMapper mapper;
 	/** 日志记录器 */
-	private static final Logger LOGGER = LoggerFactory.getLogger(StationController.class);
+	private static final Logger log = LoggerFactory.getLogger(StationController.class);
 	/**
 	 * @Description :TODO(根据坐标点匹配数据库中的站点)
-	 * 
-	 * @param map: <point:坐标点； name:站点名>
-	 * 
 	 */
-	@RequestMapping(value="matchStation" , method = RequestMethod.GET)
-	public Map<String, Object> matchStation(@RequestParam Map<String, Object> map) {
-		return service.matchStation(map);
-	}	
-	
-	/**
-	 * @Description :TODO(系统规划保存数据)
-	 * 
-	 * @param map <stationJSON:站点信息；
-	 * 
-	 * - - - - - - sectionJSON：路段信息；
-	 * 
-	 * - - - - - - dbType：坐标类型；
-	 * 
-	 * - - - - - - destroy：是否撤销；
-	 * 
-	 * - - - - - - directions：方向；
-	 * 
-	 * - - - - - - lineId：线路ID；
-	 * 
-	 * - - - - - - radius：圆半径
-	 * 
-	 * - - - - - - shapesType：图形类型
-	 * 
-	 * - - - - - - speedLimit：限速>
-	 * 
-	 * @return Map<String, Object> <SUCCESS ; ERROR>
-	 */
-	@RequestMapping(value="collectionSave" , method = RequestMethod.POST)
-	public Map<String, Object> collectionSave(@RequestParam Map<String, Object> map) {
-		return service.systemSaveStations(map);
-	}
-	
-	@RequestMapping(value="manualSave" , method = RequestMethod.POST)
-	public Map<String, Object> manualSave(@RequestParam Map<String, Object> map) {
-		return service.manualSave(map);
-	}
-	
-	@RequestMapping(value="cacheSave" , method = RequestMethod.POST)
-	public Map<String, Object> cacheSave(@RequestParam Map<String, Object> map) {
-		return service.cacheSave(map);
-	}
-	
-	/**
-	 * @Description :TODO(新增站点保存)
-	 * 
-	 * @param map <bJwpoints：中心点百度坐标；bPolygonGrid：多边形图形百度坐标；dbType：原坐标类型；
-	 * 
-	 * 			  descriptions：说明；destroy：是否撤销；directions：方向；distances：到站距离；gJwpoints：中心点WGS坐标；
-	 * 
-	 * 			  gPolygonGrid：多边形图形WGS坐标；lineId：线路ID；radius：圆半径；roadCoding：道路编码；shapesType：图形类型；
-	 * 
-	 * 			  stationCod：站点编码；stationMark：站点类型；stationName：站点名称；stationRouteCode：站点序号；toTime：到站时间
-	 * 			  
-	 * 			  versions：版本号；x：城建坐标x；y：城建坐标y>
-	 * 
-	 * @return Map<String, Object> <SUCCESS ; ERROR>
-	 */
-	@RequestMapping(value="stationSave" , method = RequestMethod.POST)
-	public Map<String, Object> stationSave(@RequestParam Map<String, Object> map) {
-		map.put("createBy", "");
-		map.put("updateBy", "");
-		return service.stationSaveMap(map);
-	}
-	
-	/**
-	 * @Description :TODO(更新站点保存)
-	 * 
-	 * @param map <bJwpoints：中心点百度坐标；bPolygonGrid：多边形图形百度坐标；dbType：原坐标类型；
-	 * 
-	 * 			  descriptions：说明；destroy：是否撤销；directions：方向；distances：到站距离；gJwpoints：中心点WGS坐标；
-	 * 
-	 * 			  gPolygonGrid：多边形图形WGS坐标；lineId：线路ID；radius：圆半径；roadCoding：道路编码；shapesType：图形类型；
-	 * 
-	 * 			  stationCod：站点编码；stationMark：站点类型；stationName：站点名称；stationRouteCode：站点序号；toTime：到站时间
-	 * 			  
-	 * 			  versions：版本号；x：城建坐标x；y：城建坐标y>
-	 * 
-	 * @return Map<String, Object> <SUCCESS ; ERROR>
-	 */
-	@RequestMapping(value="stationUpdate" , method = RequestMethod.POST)
-	public Map<String, Object> stationUpdate(@RequestParam Map<String, Object> map) {
-		map.put("updateBy", ""); //??
-		return service.stationUpdate(map);
+	@RequestMapping(value="matchStation")
+	public Map<String, Object> matchStation(@RequestBody List<Station> stations) {
+		Map<String, Object> result = new HashMap<>();
+		try {
+			stationService.matchStation(stations);
+			result.put("status", ResponseCode.SUCCESS);
+			result.put("data", stations);
+		} catch (Exception e) {
+			result.put("status", ResponseCode.ERROR);
+			log.error("", e);
+		}
+
+		return result;
 	}
-	
+
 	/**
-	 * @Description :TODO(更新缓存站点保存)
-	 * 
-	 * @param map <bJwpoints：中心点百度坐标；bPolygonGrid：多边形图形百度坐标；dbType：原坐标类型；
-	 * 
-	 * 			  descriptions：说明；destroy：是否撤销；directions：方向；distances：到站距离；gJwpoints：中心点WGS坐标；
-	 * 
-	 * 			  gPolygonGrid：多边形图形WGS坐标；lineId：线路ID；radius：圆半径；roadCoding：道路编码；shapesType：图形类型；
-	 * 
-	 * 			  stationCod：站点编码；stationMark：站点类型；stationName：站点名称；stationRouteCode：站点序号；toTime：到站时间
-	 * 			  
-	 * 			  versions：版本号；x：城建坐标x；y：城建坐标y>
-	 * 
-	 * @return Map<String, Object> <SUCCESS ; ERROR>
+	 * 新增站点
+	 * @param station
+	 * @return
 	 */
-	@RequestMapping(value="stationCacheUpdate" , method = RequestMethod.POST)
-	public Map<String, Object> stationCacheUpdate(@RequestParam Map<String, Object> map) {
-		map.put("updateBy", "");
-		return service.stationCacheUpdate(map);
+	@RequestMapping(value = "/add", method = RequestMethod.POST)
+	public Map<String, Object> add(Station station) {
+		Map<String, Object> result = new HashMap<>();
+		try {
+			stationService.add(station);
+			result.put("status", ResponseCode.SUCCESS);
+		} catch (Exception e) {
+			result.put("status", ResponseCode.ERROR);
+			result.put("msg", e.getMessage());
+			log.error("", e);
+		}
+
+		return result;
 	}
+
 	/**
-	 * @Description :TODO(更新内部编码)
-	 * @param stationCount,sectionCount 更新数
+	 * 更新站点、站点路由信息
+	 * @param station
+	 * @return
 	 */
-	@RequestMapping(value="updateStationAndSectionCode" , method = RequestMethod.GET)
-	public int updateStationAndSectionCode(@RequestParam Integer stationCount, Integer sectionCount) {
-//		System.out.println(stationCount+" _ "+ sectionCount );
-//		for(int i = 0; i <  stationCount; i++) {
-////			System.out.println(i);
-//			stationRepository.stationMaxId() + 1;
-//		}
-//		for(int j = 0; j <  sectionCount; j++) {
-////			System.out.println(j);
-//			sectionRepository.sectionMaxId() + 1;
-//		}
-		return 1;
+	@RequestMapping(value="modify" , method = RequestMethod.POST)
+	public Map<String, Object> modify(Station station) {
+		Map<String, Object> result = new HashMap<>();
+		try {
+			stationService.modify(station);
+			result.put("status", ResponseCode.SUCCESS);
+		} catch (Exception e) {
+			result.put("status", ResponseCode.ERROR);
+			throw new RuntimeException(e);
+		}
+
+		return result;
 	}
+
 	/**
 	 * @Description :TODO(查询站点编码)
 	 *
 	 * @return int <stationCode站点编码>
 	 */
-	@RequestMapping(value="getStationCode" , method = RequestMethod.GET)
-	public long getStationCode() {
-		return stationRepository.stationMaxId() + 1;
-
+	@RequestMapping(value="findStationCode" , method = RequestMethod.GET)
+	public long findStationCode() {
+		return stationService.findLatestStationId() + 1;
 	}
+
 	/**
-	 * @Description :TODO(查询站点编码)
-	 * 
-	 * @return int <stationCode站点编码>
+	 * 根据站名模糊搜索站点信息
+	 * @param stationName
+	 * @return 站点列表
 	 */
-	@RequestMapping(value="stationCacheSave" , method = RequestMethod.POST)
-	public Map<String, Object> stationCacheSave(@RequestParam Map<String, Object> map) {
-		map.put("createBy", "");
-		map.put("updateBy", "");
-		return service.stationCacheSave(map);
+	@RequestMapping(value="findStationByName" , method = RequestMethod.GET)
+	public List<Station> findStationByName(String stationName) {
+		return stationService.findStationByName(stationName);
 	}
 }
-package com.bsth.controller;
-
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletResponse;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.bsth.entity.LsStationRoute;
-import com.bsth.entity.StationRoute;
-import com.bsth.entity.StationRouteCache;
-import com.bsth.repository.StationRouteCacheRepository;
-import com.bsth.repository.StationRouteRepository;
-import com.bsth.service.StationRouteService;
-
-/**
- * 
- * @ClassName: StationRouteController(站点路由控制器)
- * 
- * @Extends : BaseController
- * 
- * @Description: TODO(站点路由控制层)
- * 
- * @Author bsth@lq
- * 
- * @Date 2016年5月03日 上午9:21:17
- *
- * @Dersion 公交调度系统BS版 0.1
- * 
- */
-@RestController
-@RequestMapping("stationroute")
-public class StationRouteController extends BaseController<StationRoute, Integer> {
-	
-	@Autowired
-	StationRouteService service;
-    @Autowired
-    StationRouteRepository stationRouteRepository;
-    @Autowired
-    StationRouteCacheRepository stationRouteCacheRepository;
-
-    
-    @RequestMapping(value = "/allls", method = RequestMethod.GET)
-    public Map allls(@RequestParam Map<String, Object> map) {
-    	
-        return service.pageLs(map);
-    }
-    
-    @RequestMapping(value = "/all_ls", method = RequestMethod.GET)
-    public Iterable<LsStationRoute> list_ls(@RequestParam Map<String, Object> map) {
-        return service.list_ls(map);
-    }
-    
-    
-    @RequestMapping(value = "/all", method = RequestMethod.GET)
-    public Iterable<StationRoute> list(@RequestParam Map<String, Object> map) {
-        return service.list(map);
-    }
-    
-    @RequestMapping(value = "/cacheList", method = RequestMethod.GET)
-    public List<StationRouteCache> cacheList(@RequestParam Map<String, Object> map) {
-        return service.cacheList(map);
-    }
-    
-    /**
-	 * @Description :TODO(查询路段信息)
-	 * 
-	 * @param id
-	 * 
-	 * @return Map<String, Object> 
-	 */
-	@RequestMapping(value = "/export" , method = RequestMethod.GET)
-	public Map<String, Object> export(@RequestParam Integer id, HttpServletResponse resp) {
-		return service.getSectionRouteExport(id, resp);
-	}
-    
-    /**
-     * @param map
-     * @throws
-     * @Description: TODO(批量撤销站点)
-     */
-    @RequestMapping(value = "/batchDestroy", method = RequestMethod.POST)
-    public Map<String, Object> updateBatch(@RequestParam Map<String, Object> map) {
-    	return service.updateStationRouteInfoFormId(map);
-    }
-    
-	/**
-	 * @Description :TODO(查询树站点与路段数据)
-	 * 
-	 * @param map <line.id_eq:线路ID； directions_eq：方向>
-	 * 
-	 * @return List<Map<String, Object>>
-	 */
-	@RequestMapping(value = "/findStations" , method = RequestMethod.GET)
-	public  List<Map<String, Object>> findStations(@RequestParam Map<String, Object> map) {
-		return service.findPoints(map);
-	}
-	
-	@RequestMapping(value = "/systemQuote" , method = RequestMethod.POST)
-	public Map<String, Object> systemQuote(@RequestParam Map<String, Object> map) {
-		return service.systemQuote(map);
-	}
-	
-	/**
-	 * @Description :TODO(查询线路某方向下的站点序号与类型)
-	 * 
-	 * @param map <lineId:线路ID； direction：方向；stationRouteCode：站点编码>
-	 * 
-	 * @return List<Map<String, Object>> 
-	 */
-	@RequestMapping(value = "/findUpStationRouteCode" , method = RequestMethod.GET)
-	public List<Map<String, Object>> findUpStationRouteCode(@RequestParam Map<String, Object> map) {
-		return service.findUpStationRouteCode(map);
-	}
-	
-	/**
-	 * @Description :TODO(查询线路某方向下的站点序号与类型)
-	 */
-	@RequestMapping(value = "/findCacheUpStationRouteCode" , method = RequestMethod.GET)
-	public List<Map<String, Object>> findCacheUpStationRouteCode(@RequestParam Map<String, Object> map) {
-		return service.findCacheUpStationRouteCode(map);
-	}
-
-	/**
-	 * @Description :TODO(查询站点的下一个缓存站点)
-	 */
-	@RequestMapping(value = "/findDownStationRoute" , method = RequestMethod.GET)
-	public List<Map<String, Object>> findDownStationRoute(@RequestParam Map<String, Object> map) {
-		return service.findDownStationRoute(map);
-	}
-	
-	/**
-	 * @Description :TODO(查询线路某方向下所有站点的中心百度坐标)
-	 * 
-	 * @param map <lineId:线路ID； direction：方向>
-	 * 
-	 * @return List<Map<String, Object>> 
-	 */
-	@RequestMapping(value = "/getStationRouteCenterPoints" , method = RequestMethod.GET)
-	public List<Map<String, Object>> getStationRouteCenterPoints(@RequestParam Map<String, Object> map) {
-		return service.getStationRouteCenterPoints(map);
-	}
-
-	/**
-	 * @Description :TODO(查询线路某方向下所有站点)
-	 *
-	 * @param map <lineId:线路ID； direction：方向>
-	 *
-	 * @return List<Map<String, Object>>
-	 */
-	@RequestMapping(value = "/getStationRouteList" , method = RequestMethod.GET)
-	public List<Map<String, Object>> getStationRouteList(@RequestParam Map<String, Object> map) {
-		return service.getStationRouteList(map);
-	}
-	
-	/**
-	 * @Description :TODO(查询线路某方向下所有站点的中心百度坐标)
-	 * 
-	 * @param map <lineId:线路ID； direction：方向>
-	 * 
-	 * @return List<Map<String, Object>> 
-	 */
-	@RequestMapping(value = "/getStationRouteCacheCenterPoints" , method = RequestMethod.GET)
-	public List<Map<String, Object>> getStationRouteCacheCenterPoints(@RequestParam Map<String, Object> map) {
-		return service.getStationRouteCacheCenterPoints(map);
-	}
-	
-	/**
-	 * @Description :TODO(撤销站点)
-	 * 
-	 * @param map <lineId:线路ID； destroy：是否撤销（0：否；1：是）>
-	 * 
-	 * @return Map<String, Object> <SUCCESS ; ERROR>
-	 */
-	@RequestMapping(value = "/stationRouteIsDestroy" , method = RequestMethod.POST)
-	public Map<String, Object> stationRouteIsDestroy(@RequestParam Map<String, Object> map) {
-		return service.stationRouteIsDestroy(map);
-	}
-	
-	/**
-	 * @Description : TODO(根据线路ID生成行单)
-	 * 
-	 * @param map <id:线路ID>
-	 * 
-	 * @return Map<String, Object> <SUCCESS ; ERROR ; NOTDATA>
-	 */
-	@RequestMapping(value = "/usingSingle",method = RequestMethod.POST)
-	public Map<String, Object> usingSingle(@RequestParam Map<String, Object> map) {
-		return service.usingSingle(map);
-	}
-	
-	
-	/**
-	 * @Description : TODO(根据站点路由Id查询详情)
-	 * 
-	 * @param  map <id:站点路由ID> 
-	 * 
-	 * @return List<Map<String, Object>>
-	 */
-	@RequestMapping(value = "/findStationRouteInfo",method = RequestMethod.GET)
-	public List<Map<String, Object>> findStationRouteInfo(@RequestParam Map<String, Object> map) {
-		return service.findStationRouteInfo(map);
-	}
-
-    @RequestMapping(value = "/stations", method = RequestMethod.GET)
-    public List<Map<String, Object>> findStations(Integer xlid, Integer xldir) {
-        return stationRouteRepository.findStations(xlid, xldir);
-    }
-
-    /**
-     * 
-     * @Title: findByMultiLine 
-     * @Description: TODO(多线路路由查询) 
-     */
-    @RequestMapping(value = "/multiLine", method = RequestMethod.GET)
-    public Map<String, Object> findByMultiLine(@RequestParam String lineIds){
-    	return service.findByMultiLine(lineIds);
-    }
-	
-    /**
-     * 
-     * @Title: updSwitchDir 
-     * @Description: TODO(上下行切换) 
-     */
-    @RequestMapping(value = "/updSwitchDir", method = RequestMethod.POST)
-    public Map<String, Object> updSwitchDir(@RequestParam String lineIds, @RequestParam(value = "status", required = false)int status){
-    	return service.updSwitchDir(lineIds,status);
-    }
-	
-    /**
-     * 
-     * @Title: upddis 
-     * @Description: TODO(更新站距) 
-     */
-    @RequestMapping(value = "/upddis",method = RequestMethod.POST)
-	public Map<String, Object> upddis(@RequestParam Map<String, Object> map) {
-		return service.upddis(map);
-	}
-
-    /**
-     * 
-     * @Title: findCacheStationRoute 
-     * @Description: TODO(查询缓存路由) 
-     */
-    @RequestMapping(value = "/findCacheStationRoute",method = RequestMethod.GET)
-    public List<StationRouteCache> findCacheStationRoute(@RequestParam Map<String, Object> map) {
-    	int lineId = Integer.parseInt(map.get("lineId").toString());
-    	int dir = Integer.parseInt(map.get("dir").toString());
-    	return stationRouteCacheRepository.findstationRoute(lineId, dir);
-    }
-    
-    /**
-     * 
-     * @Title: findCachePoint 
-     * 
-     *  @param map <lineId:线路ID； dir：方向>
-     * 
-     * @Description: TODO(查询缓存路由) 
-     */
-    @RequestMapping(value = "/findCachePoint",method = RequestMethod.GET)
-    public List<Map<String, Object>> findCachePoint(@RequestParam Map<String, Object> map) {
-    	int lineId = Integer.parseInt(map.get("lineId").toString());
-    	int dir = Integer.parseInt(map.get("dir").toString());
-    	return service.findCachePoint(lineId, dir);
-    }
-
-
-	/**
-	 * 查询博协站点
-	 * @param map
-	 * @return
-	 */
-	@RequestMapping(value = "/findMatchStation", method = RequestMethod.GET)
-	public Map<String, Object> findMatchStation(@RequestParam Map<String, Object> map){
-		return service.findMatchStation(map);
-	}
-
-	/**
-	 * 批量修改行业编码
-	 * @param map
-	 * @return
-	 */
-	@RequestMapping(value = "/updIndustryCode",method = RequestMethod.POST)
-	public Map<String, Object> updIndustryCode(@RequestParam Map<String, Object> map) {
-		return service.updIndustryCode(map);
-	}
-
-	/**
-	 * 匹配外部站点行业编码
-	 * @param map
-	 * @return
-	 */
-	@RequestMapping(value = "/matchIndustryCode",method = RequestMethod.POST)
-	public Map<String, Object> matchIndustryCode(@RequestParam Map<String, Object> map) {
-		return service.matchIndustryCode(map);
-	}
-	/**
-	 * 匹配附近站点行业编码
-	 * @param map
-	 * @return
-	 */
-	@RequestMapping(value = "/matchNearbyStation",method = RequestMethod.GET)
-	public Map<String, Object> matchNearbyStation(@RequestParam Map<String, Object> map) {
-		return service.matchNearbyStation(map);
-	}
-}
+package com.bsth.controller;
+
+import com.bsth.entity.LsStationRoute;
+import com.bsth.entity.StationRoute;
+import com.bsth.repository.StationRouteRepository;
+import com.bsth.service.StationRouteService;
+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 javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 
+ * @ClassName: StationRouteController(站点路由控制器)
+ * 
+ * @Extends : BaseController
+ * 
+ * @Description: TODO(站点路由控制层)
+ * 
+ * @Author bsth@lq
+ * 
+ * @Date 2016年5月03日 上午9:21:17
+ *
+ * @Dersion 公交调度系统BS版 0.1
+ * 
+ */
+@RestController
+@RequestMapping("stationroute")
+public class StationRouteController extends BaseController<StationRoute, Integer> {
+	
+	@Autowired
+	StationRouteService stationRouteService;
+    @Autowired
+    StationRouteRepository stationRouteRepository;
+
+    @RequestMapping(value = "/all", method = RequestMethod.GET)
+	@Override
+    public Iterable<StationRoute> list(@RequestParam Map<String, Object> map) {
+        return stationRouteService.list(map);
+    }
+    
+    /**
+	 * @Description :TODO(查询路段信息)
+	 * 
+	 * @param id
+	 * 
+	 * @return Map<String, Object> 
+	 */
+	@RequestMapping(value = "/export" , method = RequestMethod.GET)
+	public Map<String, Object> export(@RequestParam Integer id, HttpServletResponse resp) {
+		return stationRouteService.getSectionRouteExport(id, resp);
+	}
+    
+	/**
+	 * @Description :TODO(查询树站点与路段数据)
+	 * 
+	 * @param map <line.id_eq:线路ID； directions_eq：方向>
+	 * 
+	 * @return List<Map<String, Object>>
+	 */
+	@RequestMapping(value = "/findStations" , method = RequestMethod.GET)
+	public  Map<String, Object> findStations(@RequestParam Map<String, Object> map) {
+		map.put("destroy_eq", 0);
+		if (map.get("line.id_eq") == null || map.get("directions_eq") == null || map.get("versions_eq") == null) {
+			throw new IllegalArgumentException("需正确传入线路、方向、版本参数");
+		}
+
+		return stationRouteService.findPoints(map);
+	}
+	
+	@RequestMapping(value = "/systemQuote" , method = RequestMethod.POST)
+	public Map<String, Object> systemQuote(@RequestParam Map<String, Object> map) {
+		return stationRouteService.systemQuote(map);
+	}
+
+	/**
+	 * @Description :TODO(查询线路某方向下的站点序号与类型)
+	 *
+	 * @param map <lineId:线路ID； direction：方向；stationRouteCode：站点编码>
+	 *
+	 * @return List<Map<String, Object>>
+	 */
+	@RequestMapping(value = "/findUpStationRouteCode" , method = RequestMethod.GET)
+	public List<Map<String, Object>> findUpStationRouteCode(@RequestParam Map<String, Object> map) {
+		return stationRouteService.findUpStationRouteCode(map);
+	}
+	
+	/**
+	 * @Description :TODO(查询线路某方向下所有站点的中心百度坐标)
+	 * 
+	 * @param map <lineId:线路ID； direction：方向>
+	 * 
+	 * @return List<Map<String, Object>> 
+	 */
+	@RequestMapping(value = "/getStationRouteCenterPoints" , method = RequestMethod.GET)
+	public List<Map<String, Object>> getStationRouteCenterPoints(@RequestParam Map<String, Object> map) {
+		return stationRouteService.getStationRouteCenterPoints(map);
+	}
+
+	/**
+	 * @Description :TODO(查询线路某方向下所有站点)
+	 *
+	 * @param map <lineId:线路ID； direction：方向>
+	 *
+	 * @return List<Map<String, Object>>
+	 */
+	@RequestMapping(value = "/getStationRouteList" , method = RequestMethod.GET)
+	public List<Map<String, Object>> getStationRouteList(@RequestParam Map<String, Object> map) {
+		return stationRouteService.getStationRouteList(map);
+	}
+	
+	/**
+	 * @Description : TODO(根据线路ID生成行单)
+	 * 
+	 * @param map <id:线路ID>
+	 * 
+	 * @return Map<String, Object> <SUCCESS ; ERROR ; NOTDATA>
+	 */
+	@RequestMapping(value = "/usingSingle",method = RequestMethod.POST)
+	public Map<String, Object> usingSingle(@RequestParam Map<String, Object> map) {
+		return stationRouteService.usingSingle(map);
+	}
+
+    @RequestMapping(value = "/stations", method = RequestMethod.GET)
+    public List<Map<String, Object>> findStations(Integer xlid, Integer xldir) {
+        return stationRouteRepository.findStations(xlid, xldir);
+    }
+
+    /**
+     * 
+     * @Title: findByMultiLine 
+     * @Description: TODO(多线路路由查询) 
+     */
+    @RequestMapping(value = "/multiLine", method = RequestMethod.GET)
+    public Map<String, Object> findByMultiLine(@RequestParam String lineIds){
+    	return stationRouteService.findByMultiLine(lineIds);
+    }
+}
-package com.bsth.controller.geo_data;
-
-import com.bsth.entity.geo_data.GeoRoad;
-import com.bsth.entity.geo_data.GeoStation;
-import com.bsth.service.geo_data.GeoDataService;
-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.Map;
-
-/**
- * Created by panzhao on 2017/12/7.
- */
-@RestController
-@RequestMapping("/_geo_data")
-public class GeoDataController {
-
-    @Autowired
-    GeoDataService geoDataService;
-
-    @RequestMapping("findGeoStations")
-    public Map<String, Object> findGeoStations(@RequestParam String lineCode, Integer version){
-        return geoDataService.findGeoStations(lineCode, version);
-    }
-
-
-    @RequestMapping("findGeoRoad")
-    public Map<String, Object> findGeoRoad(@RequestParam String lineCode,Integer version){
-        return geoDataService.findGeoRoad(lineCode, version);
-    }
-
-    @RequestMapping(value = "updateBufferInfo",method = RequestMethod.POST)
-    public Map<String, Object> updateBufferInfo(GeoStation station){
-        return geoDataService.updateBufferInfo(station);
-    }
-
-    @RequestMapping(value = "updateStationName",method = RequestMethod.POST)
-    public Map<String, Object> updateStationName(@RequestParam Map<String, Object> map){
-        return geoDataService.updateStationName(map);
-    }
-
-    @RequestMapping(value = "addNewStationRoute",method = RequestMethod.POST)
-    public Map<String, Object> addNewStationRoute(@RequestParam String lineCode,@RequestParam int versions,@RequestParam int upDown
-            ,@RequestParam String stationName,@RequestParam Float lat,@RequestParam Float lng,@RequestParam int prevRouteId){
-        return geoDataService.addNewStationRoute(lineCode, upDown, versions, stationName, lat, lng, prevRouteId);
-    }
-
-    @RequestMapping(value = "addNewRoadRoute",method = RequestMethod.POST)
-    public Map<String, Object> addNewRoadRoute(@RequestParam String lineCode,@RequestParam int versions,@RequestParam int upDown
-            ,@RequestParam String sectionName,@RequestParam String crosesRoad,@RequestParam String coords,@RequestParam int prevRouteId){
-        return geoDataService.addNewRoadRoute(lineCode, upDown, versions, sectionName, crosesRoad, coords, prevRouteId);
-    }
-
-    @RequestMapping(value = "destroyStation",method = RequestMethod.POST)
-    public Map<String, Object> destroyStation(GeoStation station){
-        return geoDataService.destroyStation(station);
-    }
-
-    @RequestMapping(value = "updateRoadInfo",method = RequestMethod.POST)
-    public Map<String, Object> updateRoadInfo(GeoRoad road){
-        return geoDataService.updateRoadInfo(road);
-    }
-
-    @RequestMapping(value = "destroyRoad",method = RequestMethod.POST)
-    public Map<String, Object> destroyRoad(GeoRoad road){
-        return geoDataService.destroyRoad(road);
-    }
-
-    @RequestMapping("findVersionInfo")
-    public Map<String, Object> findVersionInfo(@RequestParam String lineCode){
-        return geoDataService.findVersionInfo(lineCode);
-    }
-
-    @RequestMapping(value = "addNewLineVersion",method = RequestMethod.POST)
-    public Map<String, Object> addNewLineVersion(@RequestParam Map<String, Object> map){
-        return geoDataService.addNewLineVersion(map);
-    }
-
-    @RequestMapping(value = "deleteLineVersion",method = RequestMethod.POST)
-    public Map<String, Object> deleteLineVersion(@RequestParam String lineCode,@RequestParam int version){
-        return geoDataService.deleteLineVersion(lineCode, version);
-    }
-
-    @RequestMapping("findFutureVersion")
-    public Map<String, Object> findFutureVersion(@RequestParam String lineCode){
-        return  geoDataService.findFutureVersion(lineCode);
-    }
-
-    @RequestMapping(value = "addEnableInfo",method = RequestMethod.POST)
-    public Map<String, Object> addEnableInfo(@RequestParam String lineCode,@RequestParam int versions, @RequestParam String startDate){
-        return geoDataService.addEnableInfo(lineCode, versions, startDate);
-    }
-}
 \ No newline at end of file
-package com.bsth.controller.gps;
-
-import com.bsth.data.BasicData;
-import com.bsth.data.gpsdata_v2.GpsRealData;
-import com.bsth.data.gpsdata_v2.entity.GpsEntity;
-import com.bsth.data.gpsdata_v2.handlers.overspeed.GpsOverspeed;
-import com.bsth.data.gpsdata_v2.handlers.overspeed.OverspeedProcess;
-import com.bsth.data.schedule.e_state_check.ScheduleStationCodeChecker;
-import com.bsth.data.schedule.e_state_check.entity.SCodeInfo;
-import com.bsth.service.gps.GpsService;
-import com.bsth.service.gps.entity.GpsSpeed;
-import com.google.common.base.Splitter;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
-import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@RestController
-@RequestMapping("gps")
-public class GpsController {
-
-    @Autowired
-    GpsRealData gpsRealData;
-
-    @Autowired
-    GpsService gpsService;
-
-    @Autowired
-    OverspeedProcess overspeedProcess;
-
-    @RequestMapping(value = "/real/all")
-    public Map<String, Object> search(@RequestParam Map<String, Object> map,
-                                      @RequestParam(defaultValue = "0") int page,
-                                      @RequestParam(defaultValue = "15") int size,
-                                      @RequestParam(defaultValue = "timestamp") String order,
-                                      @RequestParam(defaultValue = "DESC") String direction) {
-
-
-        return gpsService.search(map, page, size, order, direction);
-    }
-
-    @RequestMapping(value = "/real/line/{lineCode}")
-    public List<GpsEntity> findByLineCode(@PathVariable("lineCode") String lineCode) {
-        return gpsRealData.getByLine(lineCode);
-    }
-
-    @RequestMapping(value = "/real/line")
-    public Map<String, Object> findByLineCodes(@RequestParam String lineCodes) {
-        Map<String, Object> rs = new HashMap();
-        List<String> lineArray = Splitter.on(",").splitToList(lineCodes);
-        //实时gps
-        List<GpsEntity> gpsList = gpsRealData.get(lineArray);
-
-        //超速信息
-        List<GpsOverspeed> overspeedList = overspeedProcess.findByLines(lineArray);
-
-        //班次站点检查信息
-        List<SCodeInfo> scis = ScheduleStationCodeChecker.findByLineIdx(lineArray);
-
-        rs.put("gpsList", gpsList);
-        rs.put("overspeedList", overspeedList);
-        rs.put("scis", scis);
-        return rs;
-    }
-
-    @RequestMapping(value = "/allDevices")
-    public Iterable<String> allDevices() {
-        return gpsRealData.allDevices();
-    }
-
-    @RequestMapping(value = "/removeRealGps", method = RequestMethod.POST)
-    public Map<String, Object> removeRealGps(@RequestParam String device) {
-        return gpsService.removeRealGps(device);
-    }
-
-    /**
-     * @Title: history @Description: TODO(这个方法给测试页面用) @throws
-     */
-    @RequestMapping(value = "/history/{device}")
-    public List<Map<String, Object>> history(@PathVariable("device") String device, @RequestParam Long startTime,
-                                             @RequestParam Long endTime, @RequestParam int directions) {
-
-        return gpsService.history(device, startTime, endTime, directions);
-    }
-
-    @RequestMapping(value = "/gpsHistory/multiple")
-    public List<Map<String, Object>> gpsHistory(@RequestParam String[] nbbmArray, @RequestParam Long st,
-                                                @RequestParam Long et) {
-        return (List<Map<String, Object>>) gpsService.history(nbbmArray, st, et).get("list");
-    }
-
-	/*@RequestMapping(value = "/analyse/ram")
-    public List<ArrivalInfo> ramData(@RequestParam String nbbm) {
-		return ArrivalDataBuffer.allMap.get(nbbm);
-	}*/
-
-    @RequestMapping(value = "/Car2DeviceId")
-    public Map<String, String> findCarDeviceIdMap() {
-        return BasicData.deviceId2NbbmMap.inverse();
-    }
-
-    @RequestMapping(value = "/buffAera")
-    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);
-    }
-
-    /**
-     * gps补全
-     * type 0 : 实时GPS 1：走补传
-     * @return
-     */
-    @RequestMapping(value = "/gpsCompletion", method = RequestMethod.POST)
-    public Map<String, Object> gpsCompletion(@RequestParam long schId, @RequestParam int type) {
-        return gpsService.gpsCompletion(schId, type);
-    }
-
-    /**
-     * 历史GPS查询 ，第二版轨迹回放用
-     * @param nbbm
-     * @param st
-     * @param et
-     * @return
-     */
-    @RequestMapping(value = "/history_v2/{nbbm}")
-    public Map<String, Object> history_v2(@PathVariable("nbbm") String nbbm, @RequestParam long st, @RequestParam long et){
-        return gpsService.history_v2(nbbm, st, et);
-    }
-
-    /**
-     * 历史GPS查询 ，第三版轨迹回放用
-     * @param nbbm
-     * @param st
-     * @param et
-     * @return
-     */
-    @RequestMapping(value = "/history_v3/{nbbm}")
-    public Map<String, Object> history_v3(@PathVariable("nbbm") String nbbm, @RequestParam long st, @RequestParam long et){
-        return gpsService.history_v3(nbbm, st, et);
-    }
-
-    /**
-     * 轨迹导出
-     * @param nbbm
-     * @param st
-     * @param et
-     * @return
-     */
-    @RequestMapping(value = "/history_v3/excel/{nbbm}")
-    public void trailExcel(@PathVariable("nbbm") String nbbm, @RequestParam long st, @RequestParam long et, HttpServletResponse resp){
-        gpsService.trailExcel(nbbm, st, et, resp);
-    }
-
-    /**
-     * 轨迹异常数据导出
-     * @param nbbm
-     * @param st
-     * @param et
-     * @return
-     */
-    @RequestMapping(value = "/history_v3/excel_abnormal/{nbbm}")
-    public void abnormalExcel(@PathVariable("nbbm") String nbbm, @RequestParam long st, @RequestParam long et, HttpServletResponse resp){
-        gpsService.abnormalExcel(nbbm, st, et, resp);
-    }
-
-    /**
-     * 到离站数据导出
-     * @param nbbm
-     * @param st
-     * @param et
-     * @return
-     */
-    @RequestMapping(value = "/history_v3/excel_arrival/{nbbm}")
-    public void arrivalExcel(@PathVariable("nbbm") String nbbm, @RequestParam long st, @RequestParam long et, HttpServletResponse resp){
-        gpsService.arrivalExcel(nbbm, st, et, resp);
-    }
-
-
-
-
-    /**
-     * 安全驾驶数据 分页查询
-     * @param map
-     * @param page
-     * @param size
-     * @param order
-     * @param direction
-     * @return
-     */
-    @RequestMapping(value = "/safeDriv")
-    public Map<String, Object> safeDrivList(@RequestParam Map<String, Object> map,
-                                       @RequestParam(defaultValue = "0") int page,
-                                       @RequestParam(defaultValue = "15") int size,
-                                       @RequestParam(defaultValue = "timestamp") String order,
-                                       @RequestParam(defaultValue = "DESC") String direction){
-        return gpsService.safeDrivList(map , page, size, order, direction);
-    }
-    
-    @RequestMapping(value = "/findPosition", method = RequestMethod.GET)
-    public List<GpsSpeed> findPosition(@RequestParam String vehicle,@RequestParam String startdate,@RequestParam String enddate) throws ParseException {
-    	String deviceid = BasicData.deviceId2NbbmMap.inverse().get(vehicle);
-    	List<GpsSpeed> listGpsSpeed = new ArrayList<GpsSpeed>();
-    	listGpsSpeed = gpsService.findPosition(deviceid,startdate,enddate);
-    	return listGpsSpeed;
-    }
-    
-	@RequestMapping(value = "/pagequery",method = RequestMethod.GET)
-	public Map<String, Object> pagequery(@RequestParam Map<String, Object> map){
-		map.put("curPage", map.get("page").toString());
-		map.put("pageData","10");
-		return gpsService.Pagequery(map);
-	}
-
-    /**
-     * 获取线路下所有车辆，包括实时设备 和 计划排班
-     * @param lineCode
-     * @return
-     */
-    @RequestMapping(value = "/allCarsByLine",method = RequestMethod.GET)
-	public Map<String, Object> allCarsByLine(String lineCode){
-        return gpsService.allCarsByLine(lineCode);
-    }
-    
-}
+package com.bsth.controller.gps;
+
+import com.bsth.data.BasicData;
+import com.bsth.data.gpsdata_v2.GpsRealData;
+import com.bsth.data.gpsdata_v2.entity.GpsEntity;
+import com.bsth.data.gpsdata_v2.handlers.overspeed.GpsOverspeed;
+import com.bsth.data.gpsdata_v2.handlers.overspeed.OverspeedProcess;
+import com.bsth.data.schedule.e_state_check.ScheduleStationCodeChecker;
+import com.bsth.data.schedule.e_state_check.entity.SCodeInfo;
+import com.bsth.service.gps.GpsService;
+import com.bsth.service.gps.entity.GpsSpeed;
+import com.google.common.base.Splitter;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@RequestMapping("gps")
+public class GpsController {
+
+    @Autowired
+    GpsRealData gpsRealData;
+
+    @Autowired
+    GpsService gpsService;
+
+    @Autowired
+    OverspeedProcess overspeedProcess;
+
+    @RequestMapping(value = "/real/all")
+    public Map<String, Object> search(@RequestParam Map<String, Object> map,
+                                      @RequestParam(defaultValue = "0") int page,
+                                      @RequestParam(defaultValue = "15") int size,
+                                      @RequestParam(defaultValue = "timestamp") String order,
+                                      @RequestParam(defaultValue = "DESC") String direction) {
+
+
+        return gpsService.search(map, page, size, order, direction);
+    }
+
+    @RequestMapping(value = "/real/line/{lineCode}")
+    public List<GpsEntity> findByLineCode(@PathVariable("lineCode") String lineCode) {
+        return gpsRealData.getByLine(lineCode);
+    }
+
+    @RequestMapping(value = "/real/line")
+    public Map<String, Object> findByLineCodes(@RequestParam String lineCodes) {
+        Map<String, Object> rs = new HashMap();
+        List<String> lineArray = Splitter.on(",").splitToList(lineCodes);
+        //实时gps
+        List<GpsEntity> gpsList = gpsRealData.get(lineArray);
+
+        //超速信息
+        List<GpsOverspeed> overspeedList = overspeedProcess.findByLines(lineArray);
+
+        //班次站点检查信息
+        List<SCodeInfo> scis = ScheduleStationCodeChecker.findByLineIdx(lineArray);
+
+        rs.put("gpsList", gpsList);
+        rs.put("overspeedList", overspeedList);
+        rs.put("scis", scis);
+        return rs;
+    }
+
+    @RequestMapping(value = "/allDevices")
+    public Iterable<String> allDevices() {
+        return gpsRealData.allDevices();
+    }
+
+    @RequestMapping(value = "/removeRealGps", method = RequestMethod.POST)
+    public Map<String, Object> removeRealGps(@RequestParam String device) {
+        return gpsService.removeRealGps(device);
+    }
+
+    /**
+     * @Title: history @Description: TODO(这个方法给测试页面用) @throws
+     */
+    @RequestMapping(value = "/history/{device}")
+    public List<Map<String, Object>> history(@PathVariable("device") String device, @RequestParam Long startTime,
+                                             @RequestParam Long endTime, @RequestParam int directions) {
+
+        return gpsService.history(device, startTime, endTime, directions);
+    }
+
+    @RequestMapping(value = "/gpsHistory/multiple")
+    public List<Map<String, Object>> gpsHistory(@RequestParam String[] nbbmArray, @RequestParam Long st,
+                                                @RequestParam Long et) {
+        return (List<Map<String, Object>>) gpsService.history(nbbmArray, st, et).get("list");
+    }
+
+	/*@RequestMapping(value = "/analyse/ram")
+    public List<ArrivalInfo> ramData(@RequestParam String nbbm) {
+		return ArrivalDataBuffer.allMap.get(nbbm);
+	}*/
+
+    @RequestMapping(value = "/Car2DeviceId")
+    public Map<String, String> findCarDeviceIdMap() {
+        return BasicData.deviceId2NbbmMap.inverse();
+    }
+
+    @RequestMapping(value = "/buffAera")
+    public Map<String, Object> findBuffAeraByCode(@RequestParam String lineCode, @RequestParam String code, @RequestParam String type) {
+        return gpsService.findBuffAeraByCode(lineCode, code, type);
+    }
+
+    @RequestMapping(value = "/findRoadSpeed")
+    public Map<String, Object> findRoadSpeed(@RequestParam String lineCode) {
+        return gpsService.findRoadSpeed(lineCode);
+    }
+
+    /**
+     * gps补全
+     * type 0 : 实时GPS 1：走补传
+     * @return
+     */
+    @RequestMapping(value = "/gpsCompletion", method = RequestMethod.POST)
+    public Map<String, Object> gpsCompletion(@RequestParam long schId, @RequestParam int type) {
+        return gpsService.gpsCompletion(schId, type);
+    }
+
+    /**
+     * 历史GPS查询 ，第二版轨迹回放用
+     * @param nbbm
+     * @param st
+     * @param et
+     * @return
+     */
+    @RequestMapping(value = "/history_v2/{nbbm}")
+    public Map<String, Object> history_v2(@PathVariable("nbbm") String nbbm, @RequestParam long st, @RequestParam long et){
+        return gpsService.history_v2(nbbm, st, et);
+    }
+
+    /**
+     * 历史GPS查询 ，第三版轨迹回放用
+     * @param nbbm
+     * @param st
+     * @param et
+     * @return
+     */
+    @RequestMapping(value = "/history_v3/{nbbm}")
+    public Map<String, Object> history_v3(@PathVariable("nbbm") String nbbm, @RequestParam long st, @RequestParam long et){
+        return gpsService.history_v3(nbbm, st, et);
+    }
+
+    /**
+     * 轨迹导出
+     * @param nbbm
+     * @param st
+     * @param et
+     * @return
+     */
+    @RequestMapping(value = "/history_v3/excel/{nbbm}")
+    public void trailExcel(@PathVariable("nbbm") String nbbm, @RequestParam long st, @RequestParam long et, HttpServletResponse resp){
+        gpsService.trailExcel(nbbm, st, et, resp);
+    }
+
+    /**
+     * 轨迹异常数据导出
+     * @param nbbm
+     * @param st
+     * @param et
+     * @return
+     */
+    @RequestMapping(value = "/history_v3/excel_abnormal/{nbbm}")
+    public void abnormalExcel(@PathVariable("nbbm") String nbbm, @RequestParam long st, @RequestParam long et, HttpServletResponse resp){
+        gpsService.abnormalExcel(nbbm, st, et, resp);
+    }
+
+    /**
+     * 到离站数据导出
+     * @param nbbm
+     * @param st
+     * @param et
+     * @return
+     */
+    @RequestMapping(value = "/history_v3/excel_arrival/{nbbm}")
+    public void arrivalExcel(@PathVariable("nbbm") String nbbm, @RequestParam long st, @RequestParam long et, HttpServletResponse resp){
+        gpsService.arrivalExcel(nbbm, st, et, resp);
+    }
+
+
+
+
+    /**
+     * 安全驾驶数据 分页查询
+     * @param map
+     * @param page
+     * @param size
+     * @param order
+     * @param direction
+     * @return
+     */
+    @RequestMapping(value = "/safeDriv")
+    public Map<String, Object> safeDrivList(@RequestParam Map<String, Object> map,
+                                       @RequestParam(defaultValue = "0") int page,
+                                       @RequestParam(defaultValue = "15") int size,
+                                       @RequestParam(defaultValue = "timestamp") String order,
+                                       @RequestParam(defaultValue = "DESC") String direction){
+        return gpsService.safeDrivList(map , page, size, order, direction);
+    }
+    
+    @RequestMapping(value = "/findPosition", method = RequestMethod.GET)
+    public List<GpsSpeed> findPosition(@RequestParam String vehicle,@RequestParam String startdate,@RequestParam String enddate) throws ParseException {
+    	String deviceid = BasicData.deviceId2NbbmMap.inverse().get(vehicle);
+    	List<GpsSpeed> listGpsSpeed = new ArrayList<GpsSpeed>();
+    	listGpsSpeed = gpsService.findPosition(deviceid,startdate,enddate);
+    	return listGpsSpeed;
+    }
+    
+	@RequestMapping(value = "/pagequery",method = RequestMethod.GET)
+	public Map<String, Object> pagequery(@RequestParam Map<String, Object> map){
+		map.put("curPage", map.get("page").toString());
+		map.put("pageData","10");
+		return gpsService.Pagequery(map);
+	}
+
+    /**
+     * 获取线路下所有车辆，包括实时设备 和 计划排班
+     * @param lineCode
+     * @return
+     */
+    @RequestMapping(value = "/allCarsByLine",method = RequestMethod.GET)
+	public Map<String, Object> allCarsByLine(String lineCode){
+        return gpsService.allCarsByLine(lineCode);
+    }
+    
+}
 package com.bsth.controller.realcontrol;
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-import java.text.SimpleDateFormat;
-import java.util.*;
-
+import ch.qos.logback.classic.Level;
+import ch.qos.logback.classic.LoggerContext;
+import com.bsth.common.ResponseCode;
 import com.bsth.data.BasicData;
+import com.bsth.data.directive.DayOfDirectives;
+import com.bsth.data.directive.DirectivesPstThread;
+import com.bsth.data.gpsdata_v2.cache.GeoCacheData;
+import com.bsth.data.gpsdata_v2.handlers.overspeed.OverspeedProcess;
+import com.bsth.data.gpsdata_v2.thread.GpsDataLoaderThread;
+import com.bsth.data.msg_queue.DirectivePushQueue;
+import com.bsth.data.msg_queue.WebSocketPushQueue;
+import com.bsth.data.pilot80.PilotReport;
+import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.filter.SQLInjectFilter;
+import com.bsth.service.SectionService;
 import com.bsth.service.schedule.utils.SpringUtils;
 import com.bsth.util.MailUtils;
+import com.bsth.websocket.handler.SendUtils;
 import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.MapperFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import org.slf4j.Logger;
@@ -20,21 +29,12 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
-import com.bsth.common.ResponseCode;
-import com.bsth.data.directive.DayOfDirectives;
-import com.bsth.data.directive.DirectivesPstThread;
-import com.bsth.data.gpsdata_v2.cache.GeoCacheData;
-import com.bsth.data.gpsdata_v2.handlers.overspeed.OverspeedProcess;
-import com.bsth.data.gpsdata_v2.thread.GpsDataLoaderThread;
-import com.bsth.data.msg_queue.DirectivePushQueue;
-import com.bsth.data.msg_queue.WebSocketPushQueue;
-import com.bsth.data.pilot80.PilotReport;
-import com.bsth.data.schedule.DayOfSchedule;
-import com.bsth.entity.realcontrol.ScheduleRealInfo;
-import com.bsth.websocket.handler.SendUtils;
-
-import ch.qos.logback.classic.Level;
-import ch.qos.logback.classic.LoggerContext;
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 /**
  * Created by panzhao on 2017/4/14.
@@ -70,6 +70,9 @@ public class AdminUtilsController {
     @Autowired
     private SQLInjectFilter sqlInjectFilter;
+    @Autowired
+    private SectionService sectionService;
+
     /**
      * 出现重复班次的车辆
      *
@@ -336,4 +339,30 @@ public class AdminUtilsController {
         return "error";
     }
+
+    @RequestMapping("/reloadSystemParam")
+    public String reloadSystemParam() {
+        Map<String, Object> result = new HashMap<>();
+        try {
+            basicDataLoader.loadSystemParam();
+            return "success";
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        return "error";
+    }
+
+    @RequestMapping("/section/translateWgs2Bd")
+    public String translateWgs2Bd() {
+        Map<String, Object> result = new HashMap<>();
+        try {
+            sectionService.translateWgs2Bd();
+            return "success";
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        return "error";
+    }
 }
 \ No newline at end of file
 package com.bsth.controller.realcontrol;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.HttpURLConnection;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLEncoder;
-import java.sql.Connection;
-import java.sql.Date;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.util.*;
-
-import com.bsth.data.forecast.entity.ArrivalEntity;
-import com.bsth.entity.sys.SysUser;
-import com.bsth.security.util.SecurityUtils;
-import com.bsth.util.ReportUtils;
-import com.bsth.util.db.DBUtils_MS;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang3.StringEscapeUtils;
-import org.joda.time.DateTime;
-import org.joda.time.format.DateTimeFormat;
-import org.joda.time.format.DateTimeFormatter;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.web.bind.annotation.*;
-
 import com.alibaba.fastjson.JSONArray;
 import com.bsth.common.ResponseCode;
 import com.bsth.controller.BaseController;
@@ -40,12 +11,39 @@ import com.bsth.data.schedule.edit_logs.service.dto.SchEditInfoDto;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.entity.report.RepairReport;
 import com.bsth.entity.schedule.SchedulePlanInfo;
+import com.bsth.entity.sys.SysUser;
+import com.bsth.security.util.SecurityUtils;
 import com.bsth.service.realcontrol.ScheduleRealInfoService;
+import com.bsth.util.HttpClientUtils;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringEscapeUtils;
+import org.apache.http.HttpEntity;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.*;
+
+import java.io.*;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLEncoder;
+import java.util.*;
 @RestController
 @RequestMapping("/realSchedule")
 public class ScheduleRealInfoController extends BaseController<ScheduleRealInfo, Long> {
+	private final static Logger log = LoggerFactory.getLogger(ScheduleRealInfoController.class);
+
 	@Autowired
 	ScheduleRealInfoService scheduleRealInfoService;
@@ -827,26 +825,30 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	@RequestMapping(value = "ackCp", method = RequestMethod.POST)
 	public Map<String, Object> ackCp(@RequestParam Map<String, Object> param){
 		Map<String, Object> res = new HashMap<>();
-		InputStream in = null;
-		SysUser user = SecurityUtils.getCurrentUser();
-		DateTimeFormatter fmt = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss");
+		BufferedReader br = null;
 		StringBuilder url = new StringBuilder(cpUrl);
-		HttpURLConnection con = null;
 		try {
-			con = (HttpURLConnection)new URL(url.append(param.get("id")).toString()).openConnection();
-			con.setDoInput(true);
-			con.setRequestMethod("GET");
-			con.setConnectTimeout(5000);
-			con.setReadTimeout(5000);
-			con.setRequestProperty("keep-alive", "true");
-			con.setRequestProperty("accept", "*/*");
-
-			if (con.getResponseCode() == 200) {
-				in = con.getInputStream();
-				ByteArrayOutputStream bout = new ByteArrayOutputStream();
-				IOUtils.copy(in, bout);
-				Map<String, Object> map = new ObjectMapper().readValue(bout.toByteArray(), Map.class);
-				System.out.println(map);
+			url.append(param.get("id"));
+			CloseableHttpClient httpClient = HttpClientUtils.defaultHttpClient(url.toString());
+			HttpGet get = new HttpGet(url.toString());
+			RequestConfig requestConfig = RequestConfig.custom().setConnectTimeout(5500).setConnectionRequestTimeout(5000).setSocketTimeout(5500).build();
+			get.setConfig(requestConfig);
+			CloseableHttpResponse response = httpClient.execute(get);
+
+			int statusCode = response.getStatusLine().getStatusCode();
+			if(statusCode != 200){
+				log.error("http client status code: " + statusCode);
+			}
+			HttpEntity entity = response.getEntity();
+			if (null != entity) {
+				br = new BufferedReader(new InputStreamReader(entity.getContent()));
+				StringBuffer stringBuffer = new StringBuffer();
+				String str = "";
+				while ((str = br.readLine()) != null) {
+					stringBuffer.append(str);
+				}
+				br.close();
+				log.info(stringBuffer.toString());
 			}
 		} catch (MalformedURLException e) {
 			// TODO Auto-generated catch block
@@ -854,10 +856,6 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 		} catch (IOException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
-		} finally {
-			if (con != null) {
-				con.disconnect();
-			}
 		}
 		return res;
@@ -20,7 +20,8 @@ import java.util.Map;
 @RequestMapping("/sch/reCalc")
 public class ReCalcDataController {
-    private static String reCalcUrl = "http://10.10.150.24:30571/reCalc/scheduleDetail";
+//    private static String reCalcUrl = "http://10.10.150.24:30571/reCalc/scheduleDetail";
+    private static String reCalcUrl = "http://127.0.0.1:30571/reCalc/scheduleDetail";
     Logger logger = LoggerFactory.getLogger(this.getClass());
-package com.bsth.controller.test;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.bsth.service.StationRouteService;
-
-@RestController
-@RequestMapping("/test/gps")
-public class GpsTestController {
-
-	@Autowired
-	StationRouteService stationRouteService;
-	
-	@RequestMapping(value = "/route")
-	public List<Map<String, Object>> findRouteByLineId(@RequestParam int xl,@RequestParam int directions){
-		Map<String, Object> map = new HashMap<>();
-		map.put("line.id_eq", xl);
-		map.put("directions_eq", directions);
-		
-		List<Map<String, Object>> list = stationRouteService.findPoints(map);
-		return list;
-	}
-}
+package com.bsth.controller.test;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.bsth.service.StationRouteService;
+
+@RestController
+@RequestMapping("/test/gps")
+public class GpsTestController {
+
+	@Autowired
+	StationRouteService stationRouteService;
+	
+	@RequestMapping(value = "/route")
+	public Map<String, Object> findRouteByLineId(@RequestParam int xl,@RequestParam int directions){
+		Map<String, Object> map = new HashMap<>();
+		map.put("line.id_eq", xl);
+		map.put("directions_eq", directions);
+		
+		return stationRouteService.findPoints(map);
+	}
+}
@@ -12,6 +12,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import com.bsth.entity.*;
+import com.bsth.repository.*;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -28,13 +30,6 @@ import com.bsth.entity.Personnel;
 import com.bsth.entity.StationRoute;
 import com.bsth.entity.calc.CalcInterval;
 import com.bsth.entity.schedule.CarConfigInfo;
-import com.bsth.repository.BusinessRepository;
-import com.bsth.repository.CarParkRepository;
-import com.bsth.repository.CarsRepository;
-import com.bsth.repository.LineRepository;
-import com.bsth.repository.PersonnelRepository;
-import com.bsth.repository.StationRepository;
-import com.bsth.repository.StationRouteRepository;
 import com.bsth.repository.calc.CalcIntervalRepository;
 import com.bsth.repository.schedule.CarConfigInfoRepository;
 import com.google.common.collect.BiMap;
@@ -82,6 +77,9 @@ public class BasicData {
     //线路编码和名称对照
     public static Map<String, String> lineCode2NameMap;
+    //名称和线路编码对照
+    public static Map<String, String> lineName2CodeMap;
+
     public static Map<String, String> lineCodeAllNameMap;
     //停车场
     public static List<String> parkCodeList;
@@ -107,6 +105,9 @@ public class BasicData {
     // 线路编码_日期 等级
     public static Map<String, String> lineDate2Level;
+
+    private static Map<String, SystemParam> key2param = new HashMap<>();
+
     static Logger logger = LoggerFactory.getLogger(BasicData.class);
     public static String getStationNameByCode(String code, String prefix){
@@ -165,6 +166,9 @@ public class BasicData {
         @Autowired
         CalcIntervalRepository calcIntervalRepository;
+        @Autowired
+        private SystemParamRepository systemParamRepository;
+
         @Override
         public void run() {
             loadAllData();
@@ -196,6 +200,7 @@ public class BasicData {
                 logger.info("load geo cache..，");
                 geoCacheData.loadData();
                 station2ParkBuffer.saveAll();
+                loadSystemParam();
                 logger.info("加载基础数据成功！，");
             } catch (Exception e) {
                 logger.error("加载基础数据时出现异常，", e);
@@ -327,11 +332,12 @@ public class BasicData {
          * @Description: TODO(加载线路相关信息)
          */
         public void loadLineInfo() {
-            Iterator<Line> iterator = lineRepository.findAllService().iterator();
+            Iterator<Line> iterator = lineRepository.findAllLine().iterator();
             Line line;
             BiMap<Integer, String> biMap = HashBiMap.create();
             Map<String, String> code2name = new HashMap<>();
+            Map<String, String> name2code = new HashMap<>();
             Map<Integer, String> id2SHcode = new HashMap<Integer, String>();
             Map<String, String> code2SHcode = new HashMap<String, String>();
             Map<String, Integer> tempStationName2YgcNumber = new HashMap<String, Integer>();
@@ -365,12 +371,14 @@ public class BasicData {
                 line = iterator.next();
                 biMap.put(line.getId(), line.getLineCode());
                 code2name.put(line.getLineCode(), line.getName());
+                name2code.put(line.getName(), line.getLineCode());
                 id2SHcode.put(line.getId(), line.getShanghaiLinecode());
                 code2SHcode.put(line.getLineCode(), line.getShanghaiLinecode());
             }
             lineId2CodeMap = biMap;
             lineCode2NameMap = code2name;
+            lineName2CodeMap = name2code;
             lineId2ShangHaiCodeMap = id2SHcode;
             lineCode2ShangHaiCodeMap = code2SHcode;
             stationName2YgcNumber = tempStationName2YgcNumber;
@@ -448,5 +456,25 @@ public class BasicData {
         	lineDate2Level = result;
         }
+
+        /**
+         * 加载系统配置参数
+         */
+        public void loadSystemParam() {
+            Map<String, SystemParam> key2param = new HashMap<>();
+            Iterator<SystemParam> systemParamIterator = systemParamRepository.findAll().iterator();
+            while (systemParamIterator.hasNext()) {
+                SystemParam systemParam = systemParamIterator.next();
+                key2param.put(systemParam.getKey(), systemParam);
+            }
+
+            if (key2param.size() > 0) {
+                BasicData.key2param = key2param;
+            }
+        }
+    }
+
+    public static Map<String, SystemParam> getSystemParam() {
+        return key2param;
     }
 }
-package com.bsth.data;
-
-import com.bsth.entity.LineVersions;
-import com.bsth.service.LineVersionsService;
-import com.bsth.service.StationRouteService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.annotation.Order;
-import org.springframework.stereotype.Component;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @ClassName: LineVersionsData
- * @Description: TODO(线路版本数据管理)
- */
-@Component
-@Order(20)
-public class LineVersionsData extends Thread {
-
-    static Logger logger = LoggerFactory.getLogger(LineVersionsData.class);
-
-    @Autowired
-    LineVersionsService lineVersionsService;
-
-    @Autowired
-    StationRouteService stationRouteService;
-
-    @Override
-    public void run() {
-    	try {
-    		List<LineVersions> list = lineVersionsService.lineUpdate();
-    		if(list.size() == 0){
-				logger.info("没有需要更新的线路！");
-				return;
-			}
-    		for (LineVersions lineVersions : list) {
-        		Integer lineId = lineVersions.getLine().getId();
-        		// 更新线路文件
-    			Map<String, Object> map = new HashMap<>();
-    			map.put("lineId", lineId);
-    			stationRouteService.usingSingle(map);
-    			logger.info("线路版本更新成功！");
-    		}
-		} catch (Exception e) {
-			e.printStackTrace();
-			logger.error("线路版本更新出现异常!", e);
-		}
-    }
-}
+package com.bsth.data;
+
+import com.bsth.entity.LineVersions;
+import com.bsth.service.LineVersionsService;
+import com.bsth.service.StationRouteService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @ClassName: LineVersionsData
+ * @Description: TODO(线路版本数据管理)
+ */
+@Component
+@Order(20)
+public class LineVersionsData extends Thread {
+
+    static Logger logger = LoggerFactory.getLogger(LineVersionsData.class);
+
+    @Autowired
+    LineVersionsService lineVersionsService;
+
+    @Autowired
+    StationRouteService stationRouteService;
+
+    @Override
+    public void run() {
+		logger.warn("线路版本更新开始");
+    	try {
+    		List<LineVersions> list = lineVersionsService.lineUpdate();
+    		if(list.size() == 0){
+				logger.info("没有需要更新的线路！");
+				return;
+			}
+    		for (LineVersions lineVersions : list) {
+        		Integer lineId = lineVersions.getLine().getId();
+        		// 更新线路文件
+    			Map<String, Object> map = new HashMap<>();
+    			map.put("lineId", lineId);
+    			stationRouteService.usingSingle(map);
+    			logger.info("线路版本更新成功！");
+    		}
+		} catch (Exception e) {
+			e.printStackTrace();
+			logger.error("线路版本更新出现异常!", e);
+		}
+		logger.warn("线路版本更新结束");
+    }
+}
-package com.bsth.data.car_out_info;
-
-import com.bsth.data.BasicData;
-import com.bsth.data.gpsdata_v2.cache.GeoCacheData;
-import com.bsth.data.gpsdata_v2.entity.StationRoute;
-import com.bsth.data.schedule.DayOfSchedule;
-import com.bsth.data.schedule.ScheduleComparator;
-import com.bsth.entity.realcontrol.ScheduleRealInfo;
-import com.google.common.collect.ArrayListMultimap;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.BatchPreparedStatementSetter;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.datasource.DataSourceTransactionManager;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.TransactionDefinition;
-import org.springframework.transaction.TransactionStatus;
-import org.springframework.transaction.support.DefaultTransactionDefinition;
-
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-import java.util.*;
-
-/**
- * 发车信息表处理程序
- * Created by panzhao on 2017/5/5.
- */
-@Component
-public class CarOutInfoHandler {
-
-    @Autowired
-    DayOfSchedule dayOfSchedule;
-
-    //班次类型对照表
-    static Map<String, String> bcTypeMap;
-
-    static{
-        bcTypeMap = new HashMap<>();
-        bcTypeMap.put("normal", "正常班次");
-        bcTypeMap.put("region", "区间");
-        bcTypeMap.put("venting", "直放");
-        bcTypeMap.put("major", "放站");
-        bcTypeMap.put("ldks", "两点间空驶");
-    }
-
-    private static ScheduleComparator.DFSJ2 schDFSJComparator = new ScheduleComparator.DFSJ2();
-
-    @Autowired
-    JdbcTemplate jdbcTemplate;
-
-    Logger logger = LoggerFactory.getLogger(this.getClass());
-
-
-    ArrayListMultimap<String, ScheduleRealInfo> xlMaps  = ArrayListMultimap.create();
-    List<ScheduleRealInfo> pstList = new ArrayList<>();
-    /**
-     * 全量更新发车信息表
-     */
-    public void updateAll() {
-        try{
-            //将班次按线路分组
-            List<ScheduleRealInfo> all = new ArrayList<>(dayOfSchedule.findAll());
-            for(ScheduleRealInfo sch : all){
-                xlMaps.put(sch.getXlBm(), sch);
-            }
-
-            Set<String> ks = xlMaps.keySet();
-            for (String k : ks) {
-                pstList.addAll(update(xlMaps.get(k)));
-            }
-
-            save(pstList);
-            pstList.clear();
-            xlMaps.clear();
-        }catch (Exception e){
-            logger.error("", e);
-        }
-    }
-
-    public List<ScheduleRealInfo> update(List<ScheduleRealInfo> list) {
-        if (list.size() == 0)
-            return new ArrayList<>();
-        //按上下行分组
-        List<ScheduleRealInfo> ups = new ArrayList<>(), downs = new ArrayList<>();
-        for (ScheduleRealInfo sch : list) {
-            if (sch.getXlDir().equals("0"))
-                ups.add(sch);
-            else
-                downs.add(sch);
-        }
-
-        ScheduleRealInfo[] upArray = nexts(ups),
-                downArray = nexts(downs);
-
-        List<ScheduleRealInfo> pstArray = mergeArray(upArray, downArray);
-
-        return pstArray;
-    }
-
-    private void save(final List<ScheduleRealInfo> pstList){
-        //编程式事务
-        DataSourceTransactionManager tran = new DataSourceTransactionManager(jdbcTemplate.getDataSource());
-        DefaultTransactionDefinition def = new DefaultTransactionDefinition();
-        def.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRED);
-        TransactionStatus status = tran.getTransaction(def);
-
-        try{
-            //删除
-            jdbcTemplate.update("delete from bsth_t_clfcxxb");
-            //重新写入
-            jdbcTemplate.batchUpdate("insert into bsth_t_clfcxxb(rq, line_code, line_name, lp_name, lp_sn, dfsj, nbbm, cph, bc_type, end_station_name, updown, jGh, jName, remarks, sn)" +
-                    " VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", new BatchPreparedStatementSetter() {
-                @Override
-                public void setValues(PreparedStatement ps, int i) throws SQLException {
-                    ScheduleRealInfo sch = pstList.get(i);
-                    ps.setString(1, sch.getScheduleDateStr());
-                    ps.setString(2, sch.getXlBm());
-                    ps.setString(3, sch.getXlName());
-                    ps.setString(4, /*sch.getLpName()*/"0");
-                    ps.setInt(5, sch.getFcno()==null?-1:sch.getFcno());
-                    ps.setString(6, sch.getDfsj().replace(":", ""));
-                    ps.setString(7, sch.getClZbh().replace("-", ""));
-                    ps.setString(8, BasicData.nbbmCompanyPlateMap.get(sch.getClZbh()));
-                    ps.setString(9, bcTypeMap.containsKey(sch.getBcType()) ? bcTypeMap.get(sch.getBcType()) : sch.getBcType());
-                    ps.setString(10, sch.getZdzName());
-                    ps.setInt(11, Integer.parseInt(sch.getXlDir()));
-                    ps.setString(12, sch.getjGh());
-                    ps.setString(13, sch.getjName());
-                    ps.setString(14, sch.getRemarks());
-                    ps.setInt(15, sch.getFcpSn());
-                }
-
-                @Override
-                public int getBatchSize() {
-                    return pstList.size();
-                }
-            });
-
-            tran.commit(status);
-        }catch (Exception e){
-            tran.rollback(status);
-        }
-    }
-
-    private List<ScheduleRealInfo> mergeArray(ScheduleRealInfo[] upArray, ScheduleRealInfo[] downArray) {
-        List<ScheduleRealInfo> list = new ArrayList<>();
-        for (int i = 0; i < upArray.length; i++) {
-            if (upArray[i] != null) {
-                upArray[i].setFcpSn(i + 1);
-                list.add(upArray[i]);
-            }
-        }
-        for (int i = 0; i < downArray.length; i++) {
-            if (downArray[i] != null) {
-                downArray[i].setFcpSn(i + 1);
-                list.add(downArray[i]);
-            }
-        }
-        return list;
-    }
-
-    /**
-     * 接下来要执行的3个班次
-     *
-     * @param list
-     * @return
-     */
-    private static String[] fls = new String[]{"in","out","ldks","venting","major"};
-    private static List<String> clearTypes;
-    static {
-        clearTypes = Arrays.asList(fls);
-    }
-    private ScheduleRealInfo[] nexts(List<ScheduleRealInfo> list) {
-        ScheduleRealInfo[] array = new ScheduleRealInfo[3];
-        Collections.sort(list, schDFSJComparator);
-
-        int count = 0;//, threshold = 1000 * 60 * 60 * 4;
-        //long t = System.currentTimeMillis();
-        for (ScheduleRealInfo sch : list) {
-            if (count == 3)
-                break;
-
-            //烂班
-            if (sch.isDestroy())
-                continue;
-
-            //进场、出场、2点间空驶
-            if (clearTypes.contains(sch.getBcType()))
-                continue;
-
-            //区间
-            if (sch.getBcType().equals("region")){
-                //是否起点发出
-                if(!isStartOut(sch))
-                    continue;
-            }
-
-            //有实发实达时间的
-            if (StringUtils.isNotEmpty(sch.getFcsjActual())
-                    || StringUtils.isNotEmpty(sch.getZdsjActual()))
-                continue;
-
-            /*if (t - sch.getDfsjT() > threshold)
-                continue;*/
-
-            array[count] = sch;
-            count++;
-        }
-        return array;
-    }
-
-    private static StationRouteComp sComp = new StationRouteComp();
-    private boolean isStartOut(ScheduleRealInfo sch) {
-        try{
-            List<StationRoute> list = GeoCacheData.getStationRoute(sch.getXlBm(), Integer.parseInt(sch.getXlDir()));
-
-            if(null == list && list.size() == 0)
-                return false;
-            //排序
-            Collections.sort(list, sComp);
-
-            if(sch.getQdzName().equals(list.get(0).getName()))
-                return true;
-        }catch (Exception e){
-            logger.error("", e);
-        }
-        return false;
-    }
-
-    private static class StationRouteComp implements Comparator<StationRoute> {
-
-        @Override
-        public int compare(StationRoute s1, StationRoute s2) {
-            return s1.getRouteSort() - s2.getRouteSort();
-        }
-    }
-}
+package com.bsth.data.car_out_info;
+
+import com.bsth.data.BasicData;
+import com.bsth.data.gpsdata_v2.cache.GeoCacheData;
+import com.bsth.data.gpsdata_v2.entity.StationRoute;
+import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.data.schedule.ScheduleComparator;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.common.collect.ArrayListMultimap;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.BatchPreparedStatementSetter;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.TransactionStatus;
+import org.springframework.transaction.support.TransactionCallbackWithoutResult;
+import org.springframework.transaction.support.TransactionTemplate;
+
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.util.*;
+
+/**
+ * 发车信息表处理程序
+ * Created by panzhao on 2017/5/5.
+ */
+@Component
+public class CarOutInfoHandler {
+
+    @Autowired
+    DayOfSchedule dayOfSchedule;
+
+    //班次类型对照表
+    static Map<String, String> bcTypeMap;
+
+    static{
+        bcTypeMap = new HashMap<>();
+        bcTypeMap.put("normal", "正常班次");
+        bcTypeMap.put("region", "区间");
+        bcTypeMap.put("venting", "直放");
+        bcTypeMap.put("major", "放站");
+        bcTypeMap.put("ldks", "两点间空驶");
+    }
+
+    private static ScheduleComparator.DFSJ2 schDFSJComparator = new ScheduleComparator.DFSJ2();
+
+    @Autowired
+    JdbcTemplate jdbcTemplate;
+
+    @Autowired
+    private TransactionTemplate transactionTemplate;
+
+    @Autowired
+    private ObjectMapper mapper;
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+
+    ArrayListMultimap<String, ScheduleRealInfo> xlMaps  = ArrayListMultimap.create();
+    List<ScheduleRealInfo> pstList = new ArrayList<>();
+    /**
+     * 全量更新发车信息表
+     */
+    public void updateAll() {
+        logger.warn("发车信息更新开始");
+        try{
+            //将班次按线路分组
+            List<ScheduleRealInfo> all = new ArrayList<>(dayOfSchedule.findAll());
+            for(ScheduleRealInfo sch : all){
+                xlMaps.put(sch.getXlBm(), sch);
+            }
+
+            Set<String> ks = xlMaps.keySet();
+            for (String k : ks) {
+                pstList.addAll(update(xlMaps.get(k)));
+            }
+
+            save(pstList);
+            pstList.clear();
+            xlMaps.clear();
+        }catch (Exception e){
+            logger.error("", e);
+        }
+        logger.warn("发车信息更新结束");
+    }
+
+    public List<ScheduleRealInfo> update(List<ScheduleRealInfo> list) {
+        if (list.size() == 0)
+            return new ArrayList<>();
+        //按上下行分组
+        List<ScheduleRealInfo> ups = new ArrayList<>(), downs = new ArrayList<>();
+        for (ScheduleRealInfo sch : list) {
+            if (sch.getXlDir().equals("0"))
+                ups.add(sch);
+            else
+                downs.add(sch);
+        }
+
+        ScheduleRealInfo[] upArray = nexts(ups),
+                downArray = nexts(downs);
+
+        List<ScheduleRealInfo> pstArray = mergeArray(upArray, downArray);
+
+        return pstArray;
+    }
+
+    private void save(final List<ScheduleRealInfo> pstList){
+        transactionTemplate.execute(new TransactionCallbackWithoutResult() {
+
+            @Override
+            public void doInTransactionWithoutResult(TransactionStatus status) {
+                try {
+                    //删除
+                    jdbcTemplate.update("delete from bsth_t_clfcxxb");
+                    //重新写入
+                    jdbcTemplate.batchUpdate("insert into bsth_t_clfcxxb(rq, line_code, line_name, lp_name, lp_sn, dfsj, nbbm, cph, bc_type, end_station_name, updown, jGh, jName, remarks, sn)" +
+                            " VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", new BatchPreparedStatementSetter() {
+                        @Override
+                        public void setValues(PreparedStatement ps, int i) throws SQLException {
+                            ScheduleRealInfo sch = pstList.get(i);
+                            ps.setString(1, sch.getScheduleDateStr());
+                            ps.setString(2, sch.getXlBm());
+                            ps.setString(3, sch.getXlName());
+                            ps.setString(4, /*sch.getLpName()*/"0");
+                            ps.setInt(5, sch.getFcno()==null?-1:sch.getFcno());
+                            ps.setString(6, sch.getDfsj().replace(":", ""));
+                            ps.setString(7, sch.getClZbh().replace("-", ""));
+                            ps.setString(8, BasicData.nbbmCompanyPlateMap.get(sch.getClZbh()));
+                            ps.setString(9, bcTypeMap.containsKey(sch.getBcType()) ? bcTypeMap.get(sch.getBcType()) : sch.getBcType());
+                            ps.setString(10, sch.getZdzName());
+                            ps.setInt(11, Integer.parseInt(sch.getXlDir()));
+                            ps.setString(12, sch.getjGh());
+                            ps.setString(13, sch.getjName());
+                            ps.setString(14, sch.getRemarks());
+                            ps.setInt(15, sch.getFcpSn());
+                        }
+
+                        @Override
+                        public int getBatchSize() {
+                            return pstList.size();
+                        }
+                    });
+                } catch (Exception e) {
+                    status.setRollbackOnly();
+                    try {
+                        logger.error(String.format("发车信息批量保存异常: %s", mapper.writeValueAsString(pstList)), e);
+                    } catch (JsonProcessingException jsonProcessingException) {
+                        jsonProcessingException.printStackTrace();
+                    }
+                }
+            }
+        });
+    }
+
+    private List<ScheduleRealInfo> mergeArray(ScheduleRealInfo[] upArray, ScheduleRealInfo[] downArray) {
+        List<ScheduleRealInfo> list = new ArrayList<>();
+        for (int i = 0; i < upArray.length; i++) {
+            if (upArray[i] != null) {
+                upArray[i].setFcpSn(i + 1);
+                list.add(upArray[i]);
+            }
+        }
+        for (int i = 0; i < downArray.length; i++) {
+            if (downArray[i] != null) {
+                downArray[i].setFcpSn(i + 1);
+                list.add(downArray[i]);
+            }
+        }
+        return list;
+    }
+
+    /**
+     * 接下来要执行的3个班次
+     *
+     * @param list
+     * @return
+     */
+    private static String[] fls = new String[]{"in","out","ldks","venting","major"};
+    private static List<String> clearTypes;
+    static {
+        clearTypes = Arrays.asList(fls);
+    }
+    private ScheduleRealInfo[] nexts(List<ScheduleRealInfo> list) {
+        ScheduleRealInfo[] array = new ScheduleRealInfo[3];
+        Collections.sort(list, schDFSJComparator);
+
+        int count = 0;//, threshold = 1000 * 60 * 60 * 4;
+        //long t = System.currentTimeMillis();
+        for (ScheduleRealInfo sch : list) {
+            if (count == 3)
+                break;
+
+            //烂班
+            if (sch.isDestroy())
+                continue;
+
+            //进场、出场、2点间空驶
+            if (clearTypes.contains(sch.getBcType()))
+                continue;
+
+            //区间
+            if (sch.getBcType().equals("region")){
+                //是否起点发出
+                if(!isStartOut(sch))
+                    continue;
+            }
+
+            //有实发实达时间的
+            if (StringUtils.isNotEmpty(sch.getFcsjActual())
+                    || StringUtils.isNotEmpty(sch.getZdsjActual()))
+                continue;
+
+            /*if (t - sch.getDfsjT() > threshold)
+                continue;*/
+
+            array[count] = sch;
+            count++;
+        }
+        return array;
+    }
+
+    private static StationRouteComp sComp = new StationRouteComp();
+    private boolean isStartOut(ScheduleRealInfo sch) {
+        try{
+            List<StationRoute> list = GeoCacheData.getStationRoute(sch.getXlBm(), Integer.parseInt(sch.getXlDir()));
+
+            if(null == list && list.size() == 0)
+                return false;
+            //排序
+            Collections.sort(list, sComp);
+
+            if(sch.getQdzName().equals(list.get(0).getName()))
+                return true;
+        }catch (Exception e){
+            logger.error("", e);
+        }
+        return false;
+    }
+
+    private static class StationRouteComp implements Comparator<StationRoute> {
+
+        @Override
+        public int compare(StationRoute s1, StationRoute s2) {
+            return s1.getRouteSort() - s2.getRouteSort();
+        }
+    }
+}
-package com.bsth.data.directive;
-
-import com.alibaba.fastjson.JSON;
-import com.bsth.data.schedule.DayOfSchedule;
-import com.bsth.entity.directive.D60;
-import com.bsth.entity.directive.D64;
-import com.bsth.entity.directive.Directive;
-import com.bsth.repository.directive.D60Repository;
-import com.bsth.repository.directive.D64Repository;
-import org.joda.time.format.DateTimeFormat;
-import org.joda.time.format.DateTimeFormatter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.BatchPreparedStatementSetter;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.datasource.DataSourceTransactionManager;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.TransactionDefinition;
-import org.springframework.transaction.TransactionStatus;
-import org.springframework.transaction.support.DefaultTransactionDefinition;
-
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-import java.sql.Types;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.ConcurrentLinkedQueue;
-
-/**
- * 指令持久化线程
- * Created by panzhao on 2017/3/6.
- */
-@Component
-public class DirectivesPstThread extends Thread {
-
-    Logger logger = LoggerFactory.getLogger(this.getClass());
-
-    @Autowired
-    D60Repository d60Repository;
-
-    @Autowired
-    D64Repository d64Repository;
-
-    @Autowired
-    DayOfSchedule dayOfSchedule;
-
-    @Autowired
-    JdbcTemplate jdbcTemplate;
-
-    private static DateTimeFormatter fmtyyyyMMdd = DateTimeFormat.forPattern("yyyy-MM-dd");
-
-    @Override
-    public void run() {
-        try{
-            ConcurrentLinkedQueue<Directive> list = DayOfDirectives.pstDirectives;
-
-            List<D60> d60s = new ArrayList<>();
-            List<D64> d64s = new ArrayList<>();
-            //按 60 和 64 分组
-            Directive directive;
-            D60 d60;
-            for (int i = 0; i < 2000; i++) {
-                directive = list.poll();
-                if(null == directive)
-                    break;
-
-                //日期
-                directive.setRq(fmtyyyyMMdd.print(directive.getTimestamp()));
-
-                if (directive instanceof D60) {
-                    d60 = (D60) directive;
-                    if(isDelete(d60))
-                        continue;
-                    d60s.add(d60);
-                }
-                else if(directive instanceof D64)
-                    d64s.add((D64) directive);
-            }
-
-            //入库60
-            save60(d60s);
-            //入库64
-            save64(d64s);
-
-
-            // 60 指令更新（车载响应）
-            ConcurrentLinkedQueue<D60> updateD60s = DayOfDirectives.pstD60s;
-            d60s = new ArrayList<>();
-            for (int i = 0; i < 2000; i++) {
-                d60 = updateD60s.poll();
-                if(null == d60)
-                    break;
-                d60s.add(d60);
-            }
-
-            if(d60s.size() > 0)
-                update60(d60s);
-        }catch (Exception e){
-            logger.error("指令入库出现异常", e);
-        }
-    }
-
-    private void save64(final List<D64> d64s) {
-        if(null == d64s || d64s.size() == 0)
-            return;
-
-        String sql = "insert into bsth_v_directive_64(device_id,error_text,http_code,oper_code,rq,sender,timestamp,city_code,line_id,txt_content,resp_ack) " +
-                " values(?,?,?,?,?,?,?,?,?,?,?)";
-
-        //编程式事务
-        DataSourceTransactionManager tran = new DataSourceTransactionManager(jdbcTemplate.getDataSource());
-        DefaultTransactionDefinition def = new DefaultTransactionDefinition();
-        def.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRED);
-        TransactionStatus status = tran.getTransaction(def);
-
-        try{
-            jdbcTemplate.batchUpdate(sql, new BatchPreparedStatementSetter() {
-                @Override
-                public void setValues(PreparedStatement ps, int i) throws SQLException {
-                    D64 d64 = d64s.get(i);
-                    ps.setString(1 , d64.getDeviceId());
-                    ps.setString(2, isNvl(d64.getErrorText()));
-                    ps.setInt(3, d64.getHttpCode());
-                    ps.setShort(4, isNvl(d64.getOperCode()));
-                    ps.setString(5, d64.getRq());
-
-                    ps.setString(6, isNvl(d64.getSender()));
-                    ps.setLong(7, d64.getTimestamp());
-
-                    ps.setShort(8, isNvl(d64.getData().getCityCode()));
-                    ps.setString(9, isNvl(d64.getData().getLineId()));
-                    ps.setString(10, isNvl(d64.getData().getTxtContent()));
-                    ps.setShort(11, isNvl(d64.getRespAck()));
-                }
-
-                @Override
-                public int getBatchSize() {
-                    return d64s.size();
-                }
-            });
-
-            tran.commit(status);
-
-            logger.info("64 入库成功: " + d64s.size());
-        }catch (Exception e){
-            tran.rollback(status);
-            logger.error("", e);
-            logger.warn("失败的数据：" + JSON.toJSONString(d64s));
-        }
-    }
-
-    private void update60(final List<D60> d60s) {
-        if(null == d60s || d60s.size() == 0)
-            return;
-
-        String sql = "update bsth_v_directive_60 set reply46=?,reply46time=?,reply47=?,reply47time=? where device_id=? and timestamp=? and msg_id=?";
-
-        //编程式事务
-        DataSourceTransactionManager tran = new DataSourceTransactionManager(jdbcTemplate.getDataSource());
-        DefaultTransactionDefinition def = new DefaultTransactionDefinition();
-        def.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRED);
-        TransactionStatus status = tran.getTransaction(def);
-
-        try{
-            jdbcTemplate.batchUpdate(sql, new BatchPreparedStatementSetter() {
-                @Override
-                public void setValues(PreparedStatement ps, int i) throws SQLException {
-                    D60 d60 = d60s.get(i);
-                    ps.setShort(1, isNvl(d60.getReply46()));
-                    if(null == d60.getReply46Time())
-                        ps.setNull(2, Types.BIGINT);
-                    else
-                        ps.setLong(2, d60.getReply46Time());
-
-                    ps.setShort(3, isNvl(d60.getReply47()));
-
-                    if(null == d60.getReply47Time())
-                        ps.setNull(4, Types.BIGINT);
-                    else
-                        ps.setLong(4, d60.getReply47Time());
-                    ps.setString(5, d60.getDeviceId());
-                    ps.setLong(6, d60.getTimestamp());
-                    ps.setInt(7, d60.getMsgId());
-                }
-
-                @Override
-                public int getBatchSize() {
-                    return d60s.size();
-                }
-            });
-
-            tran.commit(status);
-
-            logger.info("60 更新成功: " + d60s.size());
-        }catch (Exception e){
-            tran.rollback(status);
-            logger.error("", e);
-            logger.warn("失败的数据：" + JSON.toJSONString(d60s));
-        }
-    }
-
-    private void save60(final List<D60> d60s) {
-        if(null == d60s || d60s.size() == 0)
-            return;
-
-        String sql = "insert into bsth_v_directive_60(device_id,error_text,http_code,oper_code,rq,sender,timestamp" +
-                ",alarm_time,company_code,dispatch_instruct,instruct_type,msg_id,service_state,txt_content,is_dispatch" +
-                ",line_code,reply46,reply46time,reply47,reply47time,sch) " +
-                " values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
-
-        //编程式事务
-        DataSourceTransactionManager tran = new DataSourceTransactionManager(jdbcTemplate.getDataSource());
-        DefaultTransactionDefinition def = new DefaultTransactionDefinition();
-        def.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRED);
-        TransactionStatus status = tran.getTransaction(def);
-
-        try{
-            jdbcTemplate.batchUpdate(sql, new BatchPreparedStatementSetter() {
-                @Override
-                public void setValues(PreparedStatement ps, int i) throws SQLException {
-                    D60 d60 = d60s.get(i);
-                    ps.setString(1, d60.getDeviceId());
-                    ps.setString(2, isNvl(d60.getErrorText()));
-                    ps.setInt(3, d60.getHttpCode());
-                    ps.setShort(4, d60.getOperCode());
-                    ps.setString(5, d60.getRq());
-                    ps.setString(6, d60.getSender());
-                    ps.setLong(7, d60.getTimestamp());
-
-                    ps.setLong(8, isNvl(d60.getData().getAlarmTime()));
-                    ps.setShort(9, isNvl(d60.getData().getCompanyCode()));
-                    ps.setShort(10, isNvl(d60.getData().getDispatchInstruct()));
-                    ps.setInt(11, d60.getData().getInstructType());
-                    ps.setInt(12, d60.getData().getMsgId());
-                    ps.setLong(13, d60.getData().getServiceState());
-                    ps.setString(14, d60.getData().getTxtContent());
-                    ps.setBoolean(15, d60.isDispatch());
-
-                    ps.setString(16, isNvl(d60.getLineCode()));
-                    ps.setShort(17, isNvl(d60.getReply46()));
-
-                    if(null == d60.getReply46Time())
-                        ps.setNull(18, Types.BIGINT);
-                    else
-                        ps.setLong(18, d60.getReply46Time());
-
-                    ps.setShort(19, isNvl(d60.getReply47()));
-
-                    if(null == d60.getReply47Time())
-                        ps.setNull(20, Types.BIGINT);
-                    else
-                        ps.setLong(20, d60.getReply47Time());
-
-                    if(d60.getSch()==null)
-                        ps.setNull(21, Types.BIGINT);
-                    else
-                        ps.setLong(21, d60.getSch().getId());
-                }
-
-                @Override
-                public int getBatchSize() {
-                    return d60s.size();
-                }
-            });
-
-            tran.commit(status);
-
-            logger.info("60 入库成功: " + d60s.size());
-        }catch (Exception e){
-            tran.rollback(status);
-            logger.error("", e);
-            logger.warn("失败的数据：" + JSON.toJSONString(d60s));
-        }
-    }
-
-    private String isNvl(String v) {
-        return v==null?"":v;
-    }
-
-    private short isNvl(Short v) {
-        return v==null?0:v;
-    }
-
-    private long isNvl(Long v) {
-        return v==null?0:v;
-    }
-
-    private boolean isDelete(D60 d60){
-        try{
-            //如果关联的班次已经不存在了，放弃入库，很低概率出现
-            if(d60.isDispatch() && d60.getSch().isDeleted()){
-                logger.warn("save 指令，发现 deleted=true 的班次，id=" + d60.getSch().getId());
-                return true;
-            }
-        }catch (Exception e){
-            logger.error("", e);
-        }
-
-        return false;
-    }
-}
+package com.bsth.data.directive;
+
+import com.alibaba.fastjson.JSON;
+import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.entity.directive.D60;
+import com.bsth.entity.directive.D64;
+import com.bsth.entity.directive.Directive;
+import com.bsth.repository.directive.D60Repository;
+import com.bsth.repository.directive.D64Repository;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.BatchPreparedStatementSetter;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.TransactionStatus;
+import org.springframework.transaction.support.TransactionCallbackWithoutResult;
+import org.springframework.transaction.support.TransactionTemplate;
+
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.sql.Types;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.ConcurrentLinkedQueue;
+
+/**
+ * 指令持久化线程
+ * Created by panzhao on 2017/3/6.
+ */
+@Component
+public class DirectivesPstThread extends Thread {
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Autowired
+    D60Repository d60Repository;
+
+    @Autowired
+    D64Repository d64Repository;
+
+    @Autowired
+    DayOfSchedule dayOfSchedule;
+
+    @Autowired
+    JdbcTemplate jdbcTemplate;
+
+    @Autowired
+    private TransactionTemplate transactionTemplate;
+
+    private static DateTimeFormatter fmtyyyyMMdd = DateTimeFormat.forPattern("yyyy-MM-dd");
+
+    @Override
+    public void run() {
+        logger.warn("指令持久化开始");
+        try{
+            ConcurrentLinkedQueue<Directive> list = DayOfDirectives.pstDirectives;
+
+            List<D60> d60s = new ArrayList<>();
+            List<D64> d64s = new ArrayList<>();
+            //按 60 和 64 分组
+            Directive directive;
+            D60 d60;
+            for (int i = 0; i < 2000; i++) {
+                directive = list.poll();
+                if(null == directive)
+                    break;
+
+                //日期
+                directive.setRq(fmtyyyyMMdd.print(directive.getTimestamp()));
+
+                if (directive instanceof D60) {
+                    d60 = (D60) directive;
+                    if(isDelete(d60))
+                        continue;
+                    d60s.add(d60);
+                }
+                else if(directive instanceof D64)
+                    d64s.add((D64) directive);
+            }
+
+            //入库60
+            save60(d60s);
+            //入库64
+            save64(d64s);
+
+
+            // 60 指令更新（车载响应）
+            ConcurrentLinkedQueue<D60> updateD60s = DayOfDirectives.pstD60s;
+            d60s = new ArrayList<>();
+            for (int i = 0; i < 2000; i++) {
+                d60 = updateD60s.poll();
+                if(null == d60)
+                    break;
+                d60s.add(d60);
+            }
+
+            if(d60s.size() > 0)
+                update60(d60s);
+        }catch (Exception e){
+            logger.error("指令入库出现异常", e);
+        }
+        logger.warn("指令持久化结束");
+    }
+
+    private void save64(final List<D64> d64s) {
+        if(null == d64s || d64s.size() == 0)
+            return;
+
+        logger.warn("64指令保存开始");
+
+        String sql = "insert into bsth_v_directive_64(device_id,error_text,http_code,oper_code,rq,sender,timestamp,city_code,line_id,txt_content,resp_ack) " +
+                " values(?,?,?,?,?,?,?,?,?,?,?)";
+
+        transactionTemplate.execute(new TransactionCallbackWithoutResult() {
+
+            @Override
+            protected void doInTransactionWithoutResult(TransactionStatus status) {
+                try {
+                    jdbcTemplate.batchUpdate(sql, new BatchPreparedStatementSetter() {
+                        @Override
+                        public void setValues(PreparedStatement ps, int i) throws SQLException {
+                            D64 d64 = d64s.get(i);
+                            ps.setString(1 , d64.getDeviceId());
+                            ps.setString(2, isNvl(d64.getErrorText()));
+                            ps.setInt(3, d64.getHttpCode());
+                            ps.setShort(4, isNvl(d64.getOperCode()));
+                            ps.setString(5, d64.getRq());
+
+                            ps.setString(6, isNvl(d64.getSender()));
+                            ps.setLong(7, d64.getTimestamp());
+
+                            ps.setShort(8, isNvl(d64.getData().getCityCode()));
+                            ps.setString(9, isNvl(d64.getData().getLineId()));
+                            ps.setString(10, isNvl(d64.getData().getTxtContent()));
+                            ps.setShort(11, isNvl(d64.getRespAck()));
+                        }
+
+                        @Override
+                        public int getBatchSize() {
+                            return d64s.size();
+                        }
+                    });
+                } catch (Exception e) {
+                    logger.error(String.format("错误数据：%s", JSON.toJSONString(d64s)), e);
+                    status.setRollbackOnly();
+                }
+            }
+        });
+        logger.warn("64指令保存结束");
+    }
+
+    private void update60(final List<D60> d60s) {
+        if(null == d60s || d60s.size() == 0)
+            return;
+
+        logger.warn("60指令更新开始");
+        String sql = "update bsth_v_directive_60 set reply46=?,reply46time=?,reply47=?,reply47time=? where device_id=? and timestamp=? and msg_id=?";
+
+        transactionTemplate.execute(new TransactionCallbackWithoutResult() {
+
+            @Override
+            protected void doInTransactionWithoutResult(TransactionStatus status) {
+                try{
+                    jdbcTemplate.batchUpdate(sql, new BatchPreparedStatementSetter() {
+                        @Override
+                        public void setValues(PreparedStatement ps, int i) throws SQLException {
+                            D60 d60 = d60s.get(i);
+                            ps.setShort(1, isNvl(d60.getReply46()));
+                            if(null == d60.getReply46Time())
+                                ps.setNull(2, Types.BIGINT);
+                            else
+                                ps.setLong(2, d60.getReply46Time());
+
+                            ps.setShort(3, isNvl(d60.getReply47()));
+
+                            if(null == d60.getReply47Time())
+                                ps.setNull(4, Types.BIGINT);
+                            else
+                                ps.setLong(4, d60.getReply47Time());
+                            ps.setString(5, d60.getDeviceId());
+                            ps.setLong(6, d60.getTimestamp());
+                            ps.setInt(7, d60.getMsgId());
+                        }
+
+                        @Override
+                        public int getBatchSize() {
+                            return d60s.size();
+                        }
+                    });
+                }catch (Exception e){
+                    logger.error(String.format("错误数据：%s", JSON.toJSONString(d60s)), e);
+                    status.setRollbackOnly();
+                }
+            }
+        });
+        logger.warn("60指令更新结束");
+    }
+
+    private void save60(final List<D60> d60s) {
+        if(null == d60s || d60s.size() == 0)
+            return;
+
+        logger.warn("60指令保存开始");
+        String sql = "insert into bsth_v_directive_60(device_id,error_text,http_code,oper_code,rq,sender,timestamp" +
+                ",alarm_time,company_code,dispatch_instruct,instruct_type,msg_id,service_state,txt_content,is_dispatch" +
+                ",line_code,reply46,reply46time,reply47,reply47time,sch) " +
+                " values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
+
+        transactionTemplate.execute(new TransactionCallbackWithoutResult() {
+
+            @Override
+            protected void doInTransactionWithoutResult(TransactionStatus status) {
+                try{
+                    jdbcTemplate.batchUpdate(sql, new BatchPreparedStatementSetter() {
+                        @Override
+                        public void setValues(PreparedStatement ps, int i) throws SQLException {
+                            D60 d60 = d60s.get(i);
+                            ps.setString(1, d60.getDeviceId());
+                            ps.setString(2, isNvl(d60.getErrorText()));
+                            ps.setInt(3, d60.getHttpCode());
+                            ps.setShort(4, d60.getOperCode());
+                            ps.setString(5, d60.getRq());
+                            ps.setString(6, d60.getSender());
+                            ps.setLong(7, d60.getTimestamp());
+
+                            ps.setLong(8, isNvl(d60.getData().getAlarmTime()));
+                            ps.setShort(9, isNvl(d60.getData().getCompanyCode()));
+                            ps.setShort(10, isNvl(d60.getData().getDispatchInstruct()));
+                            ps.setInt(11, d60.getData().getInstructType());
+                            ps.setInt(12, d60.getData().getMsgId());
+                            ps.setLong(13, d60.getData().getServiceState());
+                            ps.setString(14, d60.getData().getTxtContent());
+                            ps.setBoolean(15, d60.isDispatch());
+
+                            ps.setString(16, isNvl(d60.getLineCode()));
+                            ps.setShort(17, isNvl(d60.getReply46()));
+
+                            if(null == d60.getReply46Time())
+                                ps.setNull(18, Types.BIGINT);
+                            else
+                                ps.setLong(18, d60.getReply46Time());
+
+                            ps.setShort(19, isNvl(d60.getReply47()));
+
+                            if(null == d60.getReply47Time())
+                                ps.setNull(20, Types.BIGINT);
+                            else
+                                ps.setLong(20, d60.getReply47Time());
+
+                            if(d60.getSch()==null)
+                                ps.setNull(21, Types.BIGINT);
+                            else
+                                ps.setLong(21, d60.getSch().getId());
+                        }
+
+                        @Override
+                        public int getBatchSize() {
+                            return d60s.size();
+                        }
+                    });
+                }catch (Exception e){
+                    logger.error(String.format("错误数据：%s", JSON.toJSONString(d60s)), e);
+                    status.setRollbackOnly();
+                }
+            }
+        });
+        logger.warn("60指令保存结束");
+    }
+
+    private String isNvl(String v) {
+        return v==null?"":v;
+    }
+
+    private short isNvl(Short v) {
+        return v==null?0:v;
+    }
+
+    private long isNvl(Long v) {
+        return v==null?0:v;
+    }
+
+    private boolean isDelete(D60 d60){
+        try{
+            //如果关联的班次已经不存在了，放弃入库，很低概率出现
+            if(d60.isDispatch() && d60.getSch().isDeleted()){
+                logger.warn("save 指令，发现 deleted=true 的班次，id=" + d60.getSch().getId());
+                return true;
+            }
+        }catch (Exception e){
+            logger.error("", e);
+        }
+
+        return false;
+    }
+}
-package com.bsth.data.forecast;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.joda.time.format.DateTimeFormat;
-import org.joda.time.format.DateTimeFormatter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import com.bsth.data.forecast.entity.SimpleRoute;
-import com.bsth.data.forecast.entity.SimpleRoute.TimeRange;
-import com.bsth.entity.StationRoute;
-import com.bsth.entity.forecast.Sample;
-import com.bsth.repository.StationRouteRepository;
-import com.bsth.repository.forecast.SampleRepository;
-import com.google.common.collect.ArrayListMultimap;
-
-/**
- * 
- * @Title: loadData
- * @Description: TODO(从数据库加载数据)
- */
-@Component
-public class SampleTimeDataLoader extends Thread {
-
-	@Autowired
-	SampleRepository sampleRepository;
-
-	@Autowired
-	StationRouteRepository stationRouteRepository;
-
-	// 当天日期
-	String rq;
-
-	private static DateTimeFormatter fmtyyyyMMddHHmm = DateTimeFormat.forPattern("yyyy-MM-ddHH:mm")
-				,fmtyyyyMMdd = DateTimeFormat.forPattern("yyyy-MM-dd");
-
-	Logger logger = LoggerFactory.getLogger(this.getClass());
-
-	@Override
-	public void run() {
-		rq = fmtyyyyMMdd.print(new Date().getTime());
-
-		Iterator<Sample> iterator = sampleRepository.findAll().iterator();
-		ArrayListMultimap<String, Sample> sampleMap = ArrayListMultimap.create();
-
-		Sample sample;
-		String key;
-		while (iterator.hasNext()) {
-			sample = iterator.next();
-			key = sample.getLineCode() + "_" + sample.getUpdown() + "_" + sample.getsStation() + "_"
-					+ sample.geteStation();
-			sampleMap.put(key, sample);
-		}
-
-		// 加载全部路由信息
-		List<StationRoute> allRoutes = stationRouteRepository.findAllEffective();
-		// 线路和走向分组
-		ArrayListMultimap<String, StationRoute> groupMap = ArrayListMultimap.create();
-		for (StationRoute sr : allRoutes)
-			groupMap.put(sr.getLineCode() + "_" + sr.getDirections(), sr);
-
-		ArrayListMultimap<String, SimpleRoute> lineSampleMapCopy = ArrayListMultimap.create();
-		// 排序路由链并附加各个时区耗时信息
-		StationRouteComp comp = new StationRouteComp();
-		Set<String> kys = groupMap.keySet();
-		List<StationRoute> routeList;
-		StationRoute sRoute;
-		
-		List<Sample> sapList;
-		for (String k : kys) {
-			routeList = groupMap.get(k);
-			// 排序
-			Collections.sort(routeList, comp);
-
-			for (int i = 1; i < routeList.size(); i++) {
-				sRoute = routeList.get(i);
-
-				sapList = sampleMap.get(k + "_" +routeList.get(i - 1).getStationCode() + "_" + sRoute.getStationCode());
-				
-				lineSampleMapCopy.put(k, createSimpleRoute(sRoute, sapList));
-			}
-		}
-
-		ForecastRealServer.lineSampleMap = lineSampleMapCopy;
-		logger.info("SampleTimeDataLoader.... over...");
-	}
-
-	private SimpleRoute createSimpleRoute(StationRoute sRoute, List<Sample> list) {
-		SimpleRoute simple = new SimpleRoute();
-
-		simple.stationCode = sRoute.getStationCode();
-		simple.ranges = new ArrayList<>();
-
-		try{
-			TimeRange tg;
-			for (Sample s : list) {
-				tg = new TimeRange();
-
-				tg.startTime = fmtyyyyMMddHHmm.parseMillis(rq + s.getsDate());
-				tg.endTime = fmtyyyyMMddHHmm.parseMillis(rq + s.geteDate());
-				tg.runTime = s.getRunTime();
-				simple.ranges.add(tg);
-			}
-			
-			//排序
-			Collections.sort(simple.ranges);
-		}catch(Exception e){
-			logger.error("", e);
-		}
-		return simple;
-	}
-	
-	public static class StationRouteComp implements Comparator<StationRoute> {
-
-		@Override
-		public int compare(StationRoute o1, StationRoute o2) {
-			return o1.getStationRouteCode() - o2.getStationRouteCode();
-		}
-	}
-}
+package com.bsth.data.forecast;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import com.bsth.data.forecast.entity.SimpleRoute;
+import com.bsth.data.forecast.entity.SimpleRoute.TimeRange;
+import com.bsth.entity.StationRoute;
+import com.bsth.entity.forecast.Sample;
+import com.bsth.repository.StationRouteRepository;
+import com.bsth.repository.forecast.SampleRepository;
+import com.google.common.collect.ArrayListMultimap;
+
+/**
+ * 
+ * @Title: loadData
+ * @Description: TODO(从数据库加载数据)
+ */
+@Component
+public class SampleTimeDataLoader extends Thread {
+
+	@Autowired
+	SampleRepository sampleRepository;
+
+	@Autowired
+	StationRouteRepository stationRouteRepository;
+
+	// 当天日期
+	String rq;
+
+	private static DateTimeFormatter fmtyyyyMMddHHmm = DateTimeFormat.forPattern("yyyy-MM-ddHH:mm")
+				,fmtyyyyMMdd = DateTimeFormat.forPattern("yyyy-MM-dd");
+
+	Logger logger = LoggerFactory.getLogger(this.getClass());
+
+	@Override
+	public void run() {
+		logger.warn("到离站预测样本加载开始");
+		rq = fmtyyyyMMdd.print(System.currentTimeMillis());
+
+		Iterator<Sample> iterator = sampleRepository.findAll().iterator();
+		ArrayListMultimap<String, Sample> sampleMap = ArrayListMultimap.create();
+
+		Sample sample;
+		String key;
+		while (iterator.hasNext()) {
+			sample = iterator.next();
+			key = sample.getLineCode() + "_" + sample.getUpdown() + "_" + sample.getsStation() + "_"
+					+ sample.geteStation();
+			sampleMap.put(key, sample);
+		}
+
+		// 加载全部路由信息
+		List<StationRoute> allRoutes = stationRouteRepository.findAllEffective();
+		// 线路和走向分组
+		ArrayListMultimap<String, StationRoute> groupMap = ArrayListMultimap.create();
+		for (StationRoute sr : allRoutes)
+			groupMap.put(sr.getLineCode() + "_" + sr.getDirections(), sr);
+
+		ArrayListMultimap<String, SimpleRoute> lineSampleMapCopy = ArrayListMultimap.create();
+		// 排序路由链并附加各个时区耗时信息
+		StationRouteComp comp = new StationRouteComp();
+		Set<String> kys = groupMap.keySet();
+		List<StationRoute> routeList;
+		StationRoute sRoute;
+		
+		List<Sample> sapList;
+		for (String k : kys) {
+			routeList = groupMap.get(k);
+			// 排序
+			Collections.sort(routeList, comp);
+
+			for (int i = 1; i < routeList.size(); i++) {
+				sRoute = routeList.get(i);
+
+				sapList = sampleMap.get(k + "_" +routeList.get(i - 1).getStationCode() + "_" + sRoute.getStationCode());
+				
+				lineSampleMapCopy.put(k, createSimpleRoute(sRoute, sapList));
+			}
+		}
+
+		ForecastRealServer.lineSampleMap = lineSampleMapCopy;
+		logger.warn("到离站预测样本加载结束");
+	}
+
+	private SimpleRoute createSimpleRoute(StationRoute sRoute, List<Sample> list) {
+		SimpleRoute simple = new SimpleRoute();
+
+		simple.stationCode = sRoute.getStationCode();
+		simple.ranges = new ArrayList<>();
+
+		try{
+			TimeRange tg;
+			for (Sample s : list) {
+				tg = new TimeRange();
+
+				tg.startTime = fmtyyyyMMddHHmm.parseMillis(rq + s.getsDate());
+				tg.endTime = fmtyyyyMMddHHmm.parseMillis(rq + s.geteDate());
+				tg.runTime = s.getRunTime();
+				simple.ranges.add(tg);
+			}
+			
+			//排序
+			Collections.sort(simple.ranges);
+		}catch(Exception e){
+			logger.error("", e);
+		}
+		return simple;
+	}
+	
+	public static class StationRouteComp implements Comparator<StationRoute> {
+
+		@Override
+		public int compare(StationRoute o1, StationRoute o2) {
+			return o1.getStationRouteCode() - o2.getStationRouteCode();
+		}
+	}
+}
@@ -94,7 +94,7 @@ public class GeoCacheData {
     }
     private void loadStationRoutesData(){
-        String sql = "select r.LINE_CODE,r.DIRECTIONS,r.STATION_CODE,r.STATION_MARK,s.SHAPES_TYPE,s.G_LONX,s.G_LATY,ST_AsText(s.G_POLYGON_GRID) as G_POLYGON_GRID,s.RADIUS, r.STATION_ROUTE_CODE,s.STATION_NAME from bsth_c_stationroute r left join bsth_c_station s on r.station=s.id where r.destroy=0 order by r.station_route_code";
+        String sql = "select r.LINE_CODE,r.DIRECTIONS,r.STATION_CODE,r.STATION_MARK,r.SHAPED_TYPE,ST_X(s.CENTER_POINT_WGS) G_LONX, ST_Y(s.CENTER_POINT_WGS) G_LATY,ST_AsText(r.BUFFER_POLYGON_WGS) as G_POLYGON_GRID,r.RADIUS, r.STATION_ROUTE_CODE,r.STATION_NAME from bsth_c_stationroute r left join bsth_c_station s on r.station=s.id where r.destroy=0 order by r.station_route_code";
         List<StationRoute> routeList = jdbcTemplate.query(sql, new RowMapper() {
             @Override
@@ -109,10 +109,11 @@ public class GeoCacheData {
                 sRoute.setMark(rs.getString("STATION_MARK"));
                 sRoute.setName(rs.getString("STATION_NAME"));
-                String shapesType = rs.getString("SHAPES_TYPE");
+                String shapesType = rs.getString("SHAPED_TYPE");
                 //多边形电子围栏
-                if (StringUtils.isNotEmpty(shapesType) && shapesType.equals("d"))
+                if (StringUtils.isNotEmpty(shapesType) && shapesType.equals("d")) {
                     sRoute.setPolygon(parsePolygon(rs.getString("G_POLYGON_GRID")));
+                }
                 return sRoute;
             }
         });
-package com.bsth.data.gpsdata_v2.thread;
-
-import com.bsth.data.gpsdata_v2.DataHandleProcess;
-import com.bsth.data.gpsdata_v2.entity.GpsEntity;
-import com.bsth.data.gpsdata_v2.load.GatewayHttpLoader;
-import com.bsth.data.gpsdata_v2.load.SocketClientLoader;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-/**
- * Created by panzhao on 2017/1/11.
- */
-@Component
-public class GpsDataLoaderThread extends Thread {
-
-    Logger logger = LoggerFactory.getLogger(this.getClass());
-
-    //0：从GPS客户端内存获取  -1：从网关获取
-    private static int flag = 0;
-
-    public static void setFlag(int v) {
-        flag = v;
-    }
-
-    @Autowired
-    DataHandleProcess handleProcess;
-
-    @Override
-    public void run() {
-        try {
-            List<GpsEntity> list;
-            if (flag == 0)
-                list = SocketClientLoader.load();
-            else
-                list = GatewayHttpLoader.load();
-
-            if(null != list && list.size() > 0)
-                handleProcess.handle(list);
-        } catch (Exception e) {
-            logger.error("", e);
-        }
-    }
+package com.bsth.data.gpsdata_v2.thread;
+
+import com.bsth.data.gpsdata_v2.DataHandleProcess;
+import com.bsth.data.gpsdata_v2.entity.GpsEntity;
+import com.bsth.data.gpsdata_v2.load.GatewayHttpLoader;
+import com.bsth.data.gpsdata_v2.load.SocketClientLoader;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * Created by panzhao on 2017/1/11.
+ */
+@Component
+public class GpsDataLoaderThread extends Thread {
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    //0：从GPS客户端内存获取  -1：从网关获取
+    private static int flag = 0;
+
+    public static void setFlag(int v) {
+        flag = v;
+    }
+
+    @Autowired
+    DataHandleProcess handleProcess;
+
+    @Override
+    public void run() {
+        logger.warn("GPS获取数据开始");
+        try {
+            List<GpsEntity> list;
+            if (flag == 0)
+                list = SocketClientLoader.load();
+            else
+                list = GatewayHttpLoader.load();
+
+            if(null != list && list.size() > 0)
+                handleProcess.handle(list);
+        } catch (Exception e) {
+            logger.error("", e);
+        }
+        logger.warn("GPS获取数据结束");
+    }
 }
 \ No newline at end of file