Merge branch 'pudong_jdk8' of http://61.169.120.202:8888/panzhaov5/bsth_control into pudong_jdk8

娄高锋
2 parents 90cd03ea 4a3754ef
Showing 14 changed files with 489 additions and 375 deletions
src/main/java/com/bsth/common/SystemParamKeys.java
src/main/java/com/bsth/controller/GeoPremiseController.java
src/main/java/com/bsth/controller/realcontrol/AdminUtilsController.java
src/main/java/com/bsth/controller/realcontrol/BasicDataController.java
src/main/java/com/bsth/controller/realcontrol/dto/StationSpatialData.java
src/main/java/com/bsth/controller/schedule/basicinfo/legacy/EmployeeController.java
src/main/java/com/bsth/controller/schedule/datasync/VehicleDataSyncController.java
src/main/java/com/bsth/data/SystemParamCache.java
src/main/java/com/bsth/data/gpsdata_v2/cache/GeoCacheData.java
src/main/java/com/bsth/entity/GeoPremise.java
src/main/java/com/bsth/entity/Personnel.java
src/main/java/com/bsth/service/impl/LsStationRouteServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ChildTaskPlanServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/RealMapServiceImpl.java
@@ -7,6 +7,8 @@ public class SystemParamKeys {
     public static final String SPECIAL_ROLES = "special.roles";
+    public static final String SPECIAL_DAYS = "special.days";
+
     public static final String URL_HTTP_GPS_REAL_CACHE = "url.http.gps.real.cache";
     public static final String URL_HTTP_GPS_REAL = "url.http.gps.real";
@@ -3,6 +3,7 @@ package com.bsth.controller;
 import com.bsth.common.ResponseCode;
 import com.bsth.entity.GeoPremise;
 import com.bsth.service.GeoPremiseService;
+import com.bsth.util.GeoConverter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -26,6 +27,8 @@ public class GeoPremiseController extends BaseController&lt;GeoPremise, Integer&gt; {
     public Map<String, Object> save(GeoPremise geoPremise) {
         Map<String, Object> result = new HashMap<>();
         try {
+            String coords = geoPremise.getCoords();
+            geoPremise.setCoordsWgs(GeoConverter.polygonBd2wgs(String.format("POLYGON((%s))", coords)).toString().replace("POLYGON((", "").replace("))", ""));
             result.putAll(geoPremiseService.save(geoPremise));
             result.put("status", ResponseCode.SUCCESS);
         } catch (Exception e) {
@@ -8,7 +8,6 @@ import com.bsth.data.BasicData;
 import com.bsth.security.SsoConfig;
 import com.bsth.service.SectionService;
 import com.bsth.service.StationService;
-import com.bsth.data.SystemParamCache;
 import com.bsth.data.directive.DayOfDirectives;
 import com.bsth.data.directive.DirectivesPstThread;
 import com.bsth.data.directive.GatewayHttpUtils;
-package com.bsth.controller.realcontrol;
-
-import com.alibaba.fastjson.serializer.PropertyFilter;
-import com.bsth.common.ResponseCode;
-import com.bsth.data.BasicData;
-import com.bsth.data.Station2ParkBuffer;
-import com.bsth.data.pinyin.PersionPinYin;
-import com.bsth.data.pinyin.PersionPinYinBuffer;
-import com.bsth.entity.Line;
-import com.bsth.entity.realcontrol.StationToPark;
-import com.google.common.base.Splitter;
-import com.google.common.collect.ArrayListMultimap;
-import com.google.common.collect.BiMap;
-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 java.util.*;
-
-@RestController
-@RequestMapping("/basic")
-public class BasicDataController {
-
-	@Autowired
-	BasicData.BasicDataLoader dataLoader;
-
-	@Autowired
-	BasicData basicData;
-
-	Logger logger = LoggerFactory.getLogger(this.getClass());
-
-	@Autowired
-	Station2ParkBuffer station2ParkBuffer;
-
-	@Autowired
-	PersionPinYinBuffer persionPinYinBuffer;
-	
-	@RequestMapping("/cars")
-	public Iterable<String> findAllNbbm(Map<String, Object> map){
-		return BasicData.deviceId2NbbmMap.values();
-	}
-	
-	@RequestMapping("/nbbm2deviceId")
-	public Map<String, String> nbbm2deviceId(Map<String, Object> map){
-		return BasicData.deviceId2NbbmMap.inverse();
-	}
-	
-	@RequestMapping("/lineCode2Name")
-	public Map<String, String> findLineCodeMap(){
-		return BasicData.lineCode2NameMap;
-	}
-	
-	@RequestMapping("/parks")
-	public Map<String, String> findParks(){
-		Map<String, String> rs = new HashMap<>();
-		List<String> codes = BasicData.parkCodeList;
-		for(String code : codes){
-			rs.put(code, BasicData.stationCode2NameMap.get(code));
-		}
-		return rs;
-	}
-	
-	/*@RequestMapping("/personnel")
-	public Map<String, Object> findPersonnelInfo(){
-		Map<String, Object> rs = new HashMap<>();
-		PersonnelFieldFilter filter=new PersonnelFieldFilter();
-		//驾驶员
-		rs.put("jsy", JSON.parse(JSON.toJSONString(BasicData.jsyMap.values(), filter)));
-		//售票员
-		rs.put("spy", JSON.parse(JSON.toJSONString(BasicData.spyMap.values(), filter)));*//*
-		return rs;
-	}*/
-
-	@RequestMapping(value = "/all_personnel_py", method = RequestMethod.GET)
-	public List<PersionPinYin> findAll_PY(){
-		return persionPinYinBuffer.getAll();
-	}
-	
-	@RequestMapping("/all_personnel")
-	public Map<String, String> all_personnel(){
-		return BasicData.allPerson;
-	}
-	
-
-	public class PersonnelFieldFilter implements PropertyFilter{
-		
-		String[] whiteList=new String[]{"jobCode", "personnelName", "brancheCompany"};
-		@Override
-		public boolean apply(Object object, String name, Object value) {
-			for(String f : whiteList){
-				if(name.equals(f))
-					return true;
-			}
-			return false;
-		}
-	}
-
-	/**
-	 * 刷新车辆和设备号对照数据
-	 * @return
-	 */
-	@RequestMapping(value = "/refresh_nbbm2Device", method = RequestMethod.POST)
-	public Map<String, Object> refreshNbbm2DeviceId(){
-		Map<String, Object> rs = new HashMap<>();
-		try {
-			dataLoader.loadDeviceInfo();
-			rs.put("status", ResponseCode.SUCCESS);
-		}catch (Exception e){
-			rs.put("status", ResponseCode.ERROR);
-			rs.put("msg", e.getMessage());
-			logger.error("", e);
-		}
-		return rs;
-	}
-
-	/**
-	 * 刷新员工对照数据
-	 * @return
-	 */
-	@RequestMapping(value = "/refresh_person_data", method = RequestMethod.POST)
-	public Map<String, Object> refreshPersonData(){
-		Map<String, Object> rs = new HashMap<>();
-		try {
-			dataLoader.loadPersonnelInfo();
-			rs.put("status", ResponseCode.SUCCESS);
-		}catch (Exception e){
-			rs.put("status", ResponseCode.ERROR);
-			rs.put("msg", e.getMessage());
-			logger.error("", e);
-		}
-		return rs;
-	}
-
-	/**
-	 * 车辆自编号和车牌号对照
-	 * @return
-	 */
-	@RequestMapping("/nbbm2PlateNo")
-	public Map<String, String> nbbm2PlateNo(){
-		return basicData.nbbmCompanyPlateMap;
-	}
-
-
-	/**
-	 * 获取线路配车信息
-	 * @return
-	 */
-	@RequestMapping("/ccInfo")
-	public Map<String, Collection<String>> ccInfo(){
-
-		ArrayListMultimap<String, String> listMultimap = ArrayListMultimap.create();
-		Set<String> ks = BasicData.nbbm2LineMap.keySet();
-
-		Line line;
-		for(String nbbm : ks){
-			line = BasicData.nbbm2LineMap.get(nbbm);
-			listMultimap.put(line.getLineCode(), nbbm);
-		}
-		return listMultimap.asMap();
-	}
-
-	/**
-	 * 获取车辆信息
-	 * @return
-	 */
-	@RequestMapping("/ccInfo/lineArray")
-	public List<Map<String, String>> ccInfoByLine(@RequestParam String idx){
-		List<String> lines = Splitter.on(",").splitToList(idx);
-		List<Map<String, String>> rs = new ArrayList<>();
-		Map<String, String> map;
-
-		//ArrayListMultimap<String, String> listMultimap = ArrayListMultimap.create();
-		Set<String> ks = BasicData.nbbm2LineMap.keySet();
-		BiMap<String,String> nbbm2deviceMap = BasicData.deviceId2NbbmMap.inverse();
-
-		Line line;
-		for(String nbbm : ks){
-			line = BasicData.nbbm2LineMap.get(nbbm);
-			if(lines.contains(line.getLineCode())){
-				map = new HashMap<>();
-				map.put("nbbm", nbbm);
-				map.put("deviceId", nbbm2deviceMap.get(nbbm));
-				map.put("lineName", line.getName());
-				map.put("lineCode", line.getLineCode());
-				rs.add(map);
-			}
-		}
-		return rs;
-	}
-
-	/**
-	 * 获取站点和停车场历时公里对照表
-	 * @param idx
-	 * @return
-	 */
-	@RequestMapping("/station2ParkData")
-	public Map<String, Collection<StationToPark>> findStation2ParkData(@RequestParam String idx){
-		List<String> lines = Splitter.on(",").splitToList(idx);
-		ArrayListMultimap<String, StationToPark> rs = ArrayListMultimap.create();
-
-		for(String lineCode : lines){
-			rs.putAll(lineCode, Station2ParkBuffer.get(lineCode));
-		}
-		return rs.asMap();
-	}
-
-	@RequestMapping(value = "/deleteStation2Park", method = RequestMethod.POST)
-	public Map<String, Object> deleteStation2Park(@RequestParam String lineCode,@RequestParam Integer id){
-		return station2ParkBuffer.delete(lineCode, id);
-	}
-}
+package com.bsth.controller.realcontrol;
+
+import com.alibaba.fastjson.serializer.PropertyFilter;
+import com.bsth.common.ResponseCode;
+import com.bsth.data.BasicData;
+import com.bsth.data.Station2ParkBuffer;
+import com.bsth.data.pinyin.PersionPinYin;
+import com.bsth.data.pinyin.PersionPinYinBuffer;
+import com.bsth.entity.Line;
+import com.bsth.entity.Personnel;
+import com.bsth.entity.realcontrol.StationToPark;
+import com.google.common.base.Splitter;
+import com.google.common.collect.ArrayListMultimap;
+import com.google.common.collect.BiMap;
+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 java.util.*;
+
+@RestController
+@RequestMapping("/basic")
+public class BasicDataController {
+
+	@Autowired
+	BasicData.BasicDataLoader dataLoader;
+
+	@Autowired
+	BasicData basicData;
+
+	Logger logger = LoggerFactory.getLogger(this.getClass());
+
+	@Autowired
+	Station2ParkBuffer station2ParkBuffer;
+
+	@Autowired
+	PersionPinYinBuffer persionPinYinBuffer;
+	
+	@RequestMapping("/cars")
+	public Iterable<String> findAllNbbm(Map<String, Object> map){
+		return BasicData.deviceId2NbbmMap.values();
+	}
+	
+	@RequestMapping("/nbbm2deviceId")
+	public Map<String, String> nbbm2deviceId(Map<String, Object> map){
+		return BasicData.deviceId2NbbmMap.inverse();
+	}
+	
+	@RequestMapping("/lineCode2Name")
+	public Map<String, String> findLineCodeMap(){
+		return BasicData.lineCode2NameMap;
+	}
+	
+	@RequestMapping("/parks")
+	public Map<String, String> findParks(){
+		Map<String, String> rs = new HashMap<>();
+		List<String> codes = BasicData.parkCodeList;
+		for(String code : codes){
+			rs.put(code, BasicData.stationCode2NameMap.get(code));
+		}
+		return rs;
+	}
+	
+	/*@RequestMapping("/personnel")
+	public Map<String, Object> findPersonnelInfo(){
+		Map<String, Object> rs = new HashMap<>();
+		PersonnelFieldFilter filter=new PersonnelFieldFilter();
+		//驾驶员
+		rs.put("jsy", JSON.parse(JSON.toJSONString(BasicData.jsyMap.values(), filter)));
+		//售票员
+		rs.put("spy", JSON.parse(JSON.toJSONString(BasicData.spyMap.values(), filter)));*//*
+		return rs;
+	}*/
+
+	@RequestMapping(value = "/all_personnel_py", method = RequestMethod.GET)
+	public List<PersionPinYin> findAll_PY(){
+		return persionPinYinBuffer.getAll();
+	}
+	
+	@RequestMapping("/all_personnel")
+	public Map<String, String> all_personnel(){
+		return BasicData.allPerson;
+	}
+
+	@RequestMapping("/allPersonnelMobile")
+	public Map<String, String> allPersonnelMobile(){
+		Map<String, String> result = new HashMap<>();
+		for (Personnel personnel : BasicData.perMap.values()) {
+			result.put(personnel.getJobCode(), personnel.getMobile());
+		}
+
+		return result;
+	}
+
+	public class PersonnelFieldFilter implements PropertyFilter{
+		
+		String[] whiteList=new String[]{"jobCode", "personnelName", "brancheCompany"};
+		@Override
+		public boolean apply(Object object, String name, Object value) {
+			for(String f : whiteList){
+				if(name.equals(f))
+					return true;
+			}
+			return false;
+		}
+	}
+
+	/**
+	 * 刷新车辆和设备号对照数据
+	 * @return
+	 */
+	@RequestMapping(value = "/refresh_nbbm2Device", method = RequestMethod.POST)
+	public Map<String, Object> refreshNbbm2DeviceId(){
+		Map<String, Object> rs = new HashMap<>();
+		try {
+			dataLoader.loadDeviceInfo();
+			rs.put("status", ResponseCode.SUCCESS);
+		}catch (Exception e){
+			rs.put("status", ResponseCode.ERROR);
+			rs.put("msg", e.getMessage());
+			logger.error("", e);
+		}
+		return rs;
+	}
+
+	/**
+	 * 刷新员工对照数据
+	 * @return
+	 */
+	@RequestMapping(value = "/refresh_person_data", method = RequestMethod.POST)
+	public Map<String, Object> refreshPersonData(){
+		Map<String, Object> rs = new HashMap<>();
+		try {
+			dataLoader.loadPersonnelInfo();
+			rs.put("status", ResponseCode.SUCCESS);
+		}catch (Exception e){
+			rs.put("status", ResponseCode.ERROR);
+			rs.put("msg", e.getMessage());
+			logger.error("", e);
+		}
+		return rs;
+	}
+
+	/**
+	 * 车辆自编号和车牌号对照
+	 * @return
+	 */
+	@RequestMapping("/nbbm2PlateNo")
+	public Map<String, String> nbbm2PlateNo(){
+		return basicData.nbbmCompanyPlateMap;
+	}
+
+
+	/**
+	 * 获取线路配车信息
+	 * @return
+	 */
+	@RequestMapping("/ccInfo")
+	public Map<String, Collection<String>> ccInfo(){
+
+		ArrayListMultimap<String, String> listMultimap = ArrayListMultimap.create();
+		Set<String> ks = BasicData.nbbm2LineMap.keySet();
+
+		Line line;
+		for(String nbbm : ks){
+			line = BasicData.nbbm2LineMap.get(nbbm);
+			listMultimap.put(line.getLineCode(), nbbm);
+		}
+		return listMultimap.asMap();
+	}
+
+	/**
+	 * 获取车辆信息
+	 * @return
+	 */
+	@RequestMapping("/ccInfo/lineArray")
+	public List<Map<String, String>> ccInfoByLine(@RequestParam String idx){
+		List<String> lines = Splitter.on(",").splitToList(idx);
+		List<Map<String, String>> rs = new ArrayList<>();
+		Map<String, String> map;
+
+		//ArrayListMultimap<String, String> listMultimap = ArrayListMultimap.create();
+		Set<String> ks = BasicData.nbbm2LineMap.keySet();
+		BiMap<String,String> nbbm2deviceMap = BasicData.deviceId2NbbmMap.inverse();
+
+		Line line;
+		for(String nbbm : ks){
+			line = BasicData.nbbm2LineMap.get(nbbm);
+			if(lines.contains(line.getLineCode())){
+				map = new HashMap<>();
+				map.put("nbbm", nbbm);
+				map.put("deviceId", nbbm2deviceMap.get(nbbm));
+				map.put("lineName", line.getName());
+				map.put("lineCode", line.getLineCode());
+				rs.add(map);
+			}
+		}
+		return rs;
+	}
+
+	/**
+	 * 获取站点和停车场历时公里对照表
+	 * @param idx
+	 * @return
+	 */
+	@RequestMapping("/station2ParkData")
+	public Map<String, Collection<StationToPark>> findStation2ParkData(@RequestParam String idx){
+		List<String> lines = Splitter.on(",").splitToList(idx);
+		ArrayListMultimap<String, StationToPark> rs = ArrayListMultimap.create();
+
+		for(String lineCode : lines){
+			rs.putAll(lineCode, Station2ParkBuffer.get(lineCode));
+		}
+		return rs.asMap();
+	}
+
+	@RequestMapping(value = "/deleteStation2Park", method = RequestMethod.POST)
+	public Map<String, Object> deleteStation2Park(@RequestParam String lineCode,@RequestParam Integer id){
+		return station2ParkBuffer.delete(lineCode, id);
+	}
+}
-package com.bsth.controller.realcontrol.dto;
-
-/**
- * Created by panzhao on 2016/11/23.
- */
-public class StationSpatialData {
-
-    private String lineCode;
-
-    private String stationName;
-
-    private String stationCode;
-
-    private String stationMark;
-
-    private int directions;
-
-    private Float distances;
-
-    private Float toTime;
-
-    private Integer versions;
-
-    private Float gLonx;
-
-    private Float gLaty;
-
-    private Float radius;
-
-    private String shapesType;
-
-    private String gPolygonGrid;
-
-    private Integer stationRouteCode;
-
-    public String getLineCode() {
-        return lineCode;
-    }
-
-    public void setLineCode(String lineCode) {
-        this.lineCode = lineCode;
-    }
-
-    public String getStationName() {
-        return stationName;
-    }
-
-    public void setStationName(String stationName) {
-        this.stationName = stationName;
-    }
-
-    public String getStationCode() {
-        return stationCode;
-    }
-
-    public void setStationCode(String stationCode) {
-        this.stationCode = stationCode;
-    }
-
-    public String getStationMark() {
-        return stationMark;
-    }
-
-    public void setStationMark(String stationMark) {
-        this.stationMark = stationMark;
-    }
-
-    public int getDirections() {
-        return directions;
-    }
-
-    public void setDirections(int directions) {
-        this.directions = directions;
-    }
-
-    public Float getDistances() {
-        return distances;
-    }
-
-    public void setDistances(Float distances) {
-        this.distances = distances;
-    }
-
-    public Float getToTime() {
-        return toTime;
-    }
-
-    public void setToTime(Float toTime) {
-        this.toTime = toTime;
-    }
-
-    public Integer getVersions() {
-        return versions;
-    }
-
-    public void setVersions(Integer versions) {
-        this.versions = versions;
-    }
-
-    public Float getgLonx() {
-        return gLonx;
-    }
-
-    public void setgLonx(Float gLonx) {
-        this.gLonx = gLonx;
-    }
-
-    public Float getgLaty() {
-        return gLaty;
-    }
-
-    public void setgLaty(Float gLaty) {
-        this.gLaty = gLaty;
-    }
-
-    public Float getRadius() {
-        return radius;
-    }
-
-    public void setRadius(Float radius) {
-        this.radius = radius;
-    }
-
-    public String getShapesType() {
-        return shapesType;
-    }
-
-    public void setShapesType(String shapesType) {
-        this.shapesType = shapesType;
-    }
-
-    public String getgPolygonGrid() {
-        return gPolygonGrid;
-    }
-
-    public void setgPolygonGrid(String gPolygonGrid) {
-        this.gPolygonGrid = gPolygonGrid;
-    }
-
-    public Integer getStationRouteCode() {
-        return stationRouteCode;
-    }
-
-    public void setStationRouteCode(Integer stationRouteCode) {
-        this.stationRouteCode = stationRouteCode;
-    }
-}
+package com.bsth.controller.realcontrol.dto;
+
+/**
+ * Created by panzhao on 2016/11/23.
+ */
+public class StationSpatialData {
+
+    private Integer stationRouteId;
+
+    private String lineCode;
+
+    private String stationName;
+
+    private String stationCode;
+
+    private String stationMark;
+
+    private int directions;
+
+    private Float distances;
+
+    private Float toTime;
+
+    private Integer versions;
+
+    private Float gLonx;
+
+    private Float gLaty;
+
+    private Float radius;
+
+    private String shapesType;
+
+    private String gPolygonGrid;
+
+    private Integer stationRouteCode;
+
+    public Integer getStationRouteId() {
+        return stationRouteId;
+    }
+
+    public void setStationRouteId(Integer stationRouteId) {
+        this.stationRouteId = stationRouteId;
+    }
+
+    public String getLineCode() {
+        return lineCode;
+    }
+
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
+    }
+
+    public String getStationName() {
+        return stationName;
+    }
+
+    public void setStationName(String stationName) {
+        this.stationName = stationName;
+    }
+
+    public String getStationCode() {
+        return stationCode;
+    }
+
+    public void setStationCode(String stationCode) {
+        this.stationCode = stationCode;
+    }
+
+    public String getStationMark() {
+        return stationMark;
+    }
+
+    public void setStationMark(String stationMark) {
+        this.stationMark = stationMark;
+    }
+
+    public int getDirections() {
+        return directions;
+    }
+
+    public void setDirections(int directions) {
+        this.directions = directions;
+    }
+
+    public Float getDistances() {
+        return distances;
+    }
+
+    public void setDistances(Float distances) {
+        this.distances = distances;
+    }
+
+    public Float getToTime() {
+        return toTime;
+    }
+
+    public void setToTime(Float toTime) {
+        this.toTime = toTime;
+    }
+
+    public Integer getVersions() {
+        return versions;
+    }
+
+    public void setVersions(Integer versions) {
+        this.versions = versions;
+    }
+
+    public Float getgLonx() {
+        return gLonx;
+    }
+
+    public void setgLonx(Float gLonx) {
+        this.gLonx = gLonx;
+    }
+
+    public Float getgLaty() {
+        return gLaty;
+    }
+
+    public void setgLaty(Float gLaty) {
+        this.gLaty = gLaty;
+    }
+
+    public Float getRadius() {
+        return radius;
+    }
+
+    public void setRadius(Float radius) {
+        this.radius = radius;
+    }
+
+    public String getShapesType() {
+        return shapesType;
+    }
+
+    public void setShapesType(String shapesType) {
+        this.shapesType = shapesType;
+    }
+
+    public String getgPolygonGrid() {
+        return gPolygonGrid;
+    }
+
+    public void setgPolygonGrid(String gPolygonGrid) {
+        this.gPolygonGrid = gPolygonGrid;
+    }
+
+    public Integer getStationRouteCode() {
+        return stationRouteCode;
+    }
+
+    public void setStationRouteCode(Integer stationRouteCode) {
+        this.stationRouteCode = stationRouteCode;
+    }
+}
@@ -3,6 +3,7 @@ package com.bsth.controller.schedule.basicinfo.legacy;
 import com.bsth.common.ResponseCode;
 import com.bsth.controller.schedule.BController;
 import com.bsth.controller.schedule.basicinfo.EmployeeController_facade;
+import com.bsth.data.pinyin.PersionPinYin;
 import com.bsth.entity.Personnel;
 import com.bsth.service.schedule.EmployeeService;
 import com.bsth.service.schedule.exception.ScheduleException;
@@ -14,6 +15,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 /**
@@ -45,4 +47,9 @@ public class EmployeeController extends BController&lt;Personnel, Integer&gt; {
         return rtn;
     }
+
+    @RequestMapping(value = "/all_py", method = RequestMethod.GET)
+    public List<PersionPinYin> findAll_PY(){
+        return this.employeeService.findAll_PY();
+    }
 }
@@ -63,14 +63,16 @@ public class VehicleDataSyncController extends BController&lt;VehicleDataSyncTask, 
     public ApiResult refreshBuffer() {
         try {
             // 1、刷新车辆同步ETL文件
-            // 注意：使用Kettle内部的相关类清除指定ktr的缓存
-            File ktrFile = new File(this.getClass().getResource(
-                    dataToolsProperties.getVehicleDatasyncktr()).toURI());
-            FileObject fileObject = KettleVFS.getFileObject(ktrFile.getAbsolutePath());
-            FileSystem fileSystem = fileObject.getFileSystem();
-            FilesCache filesCache = KettleVFS.getInstance().getFileSystemManager().getFilesCache();
-//            System.out.println(filesCache.getFile(fileSystem, fileObject.getName()));
-            filesCache.removeFile(fileSystem, fileObject.getName());
+            etlCacheRefresh(dataToolsProperties.getVehicleDatasyncktr());
+            // 2、刷新人员配置导入导出ETL文件
+            etlCacheRefresh(dataToolsProperties.getEmployeesconfigDatainputktr());
+            etlCacheRefresh(dataToolsProperties.getEmployeesconfigDataoutputktr());
+            // 3、刷新车辆配置导入导出ETL文件
+            etlCacheRefresh(dataToolsProperties.getCarsconfigDatainputktr());
+            etlCacheRefresh(dataToolsProperties.getCarsconfigDataoutputktr());
+            // 4、刷新规则导入导出ETL文件
+            etlCacheRefresh(dataToolsProperties.getScheduleruleDatainputktr());
+            etlCacheRefresh(dataToolsProperties.getScheduleruleOutput());
             return ApiResult.success(
                     "200",
@@ -84,6 +86,16 @@ public class VehicleDataSyncController extends BController&lt;VehicleDataSyncTask, 
         }
     }
+    private void etlCacheRefresh(String ktrPath) throws Exception {
+        // 注意：使用Kettle内部的相关类清除指定ktr的缓存
+        File ktrFile = new File(this.getClass().getResource(ktrPath).toURI());
+        FileObject fileObject = KettleVFS.getFileObject(ktrFile.getAbsolutePath());
+        FileSystem fileSystem = fileObject.getFileSystem();
+        FilesCache filesCache = KettleVFS.getInstance().getFileSystemManager().getFilesCache();
+//            System.out.println(filesCache.getFile(fileSystem, fileObject.getName()));
+        filesCache.removeFile(fileSystem, fileObject.getName());
+    }
+
     /**
      * 手动添加同步任务。
      * @param vehicleDataSyncTaskRequest
@@ -21,6 +21,10 @@ public class SystemParamCache implements InitializingBean {
         return systemParamService1.getValue(SystemParamKeys.SPECIAL_ROLES);
     }
+    public static String getSpecialDays() {
+        return systemParamService1.getValue(SystemParamKeys.SPECIAL_DAYS);
+    }
+
     public static String getUrlHttpGpsRealCache() {
         return systemParamService1.getValue(SystemParamKeys.URL_HTTP_GPS_REAL_CACHE);
     }
@@ -233,7 +233,7 @@ public class GeoCacheData {
     private void loadPremiseGeoData() {
         ArrayListMultimap<String, PreconditionGeo> premiseGeoMapCopy = ArrayListMultimap.create();
-        String sql = "select * from  bsth_f_geo_premise";
+        String sql = "SELECT name, station_code, line_code, up_down, coords_wgs AS coords FROM  bsth_f_geo_premise";
         List<PreconditionGeo> list = jdbcTemplate.query(sql, BeanPropertyRowMapper.newInstance(PreconditionGeo.class));
         List<String> coordList;
@@ -37,6 +37,11 @@ public class GeoPremise {
 	 */
 	private String coords;
+	/**
+	 * wgs84坐标
+	 */
+	private String coordsWgs;
+
 	public Integer getId() {
 		return id;
 	}
@@ -84,4 +89,12 @@ public class GeoPremise {
 	public void setCoords(String coords) {
 		this.coords = coords;
 	}
+
+	public String getCoordsWgs() {
+		return coordsWgs;
+	}
+
+	public void setCoordsWgs(String coordsWgs) {
+		this.coordsWgs = coordsWgs;
+	}
 }
@@ -79,6 +79,11 @@ public class Personnel extends BEntity {
     private String remark;
     /**
+     * 移动电话
+     */
+    private String mobile;
+
+    /**
      * 0为不锁定 1为锁定
      * 因人员与金蝶同步 但存在调度需要独立添加人员并不会被同步掉的情况
      */
@@ -285,6 +290,14 @@ public class Personnel extends BEntity {
         this.destroy = destroy;
     }
+    public String getMobile() {
+        return mobile;
+    }
+
+    public void setMobile(String mobile) {
+        this.mobile = mobile;
+    }
+
     public Integer getLocked() {
         return locked;
     }
@@ -208,6 +208,11 @@ public class LsStationRouteServiceImpl extends BaseServiceImpl&lt;LsStationRoute, I
             stationRoute.setStationCode(stationRoute.getStation().getStationCode());
             Station station = stationRoute.getStation();
+            stationRoute.setCenterPointWkt(station.getCenterPointWkt());
+            if (!StringUtils.isEmpty(stationRoute.getCenterPointWkt())) {
+                centerPoint(stationRoute);
+            }
+
             if (station.getId() == null) {
                 station.setId(currentId + count);
                 station.setStationCode(station.getId().toString());
@@ -252,10 +257,15 @@ public class LsStationRouteServiceImpl extends BaseServiceImpl&lt;LsStationRoute, I
         Integer currentVersion = lineVersionsRepository.findCurrentVersion(line.getId());
         boolean isPresent = stationRepository.findById(station.getId()).isPresent();
         stationRoute.setLineCode(line.getLineCode());
+        stationRoute.setCenterPointWkt(station.getCenterPointWkt());
         if (stationRoute.getVersions() < currentVersion) {
             throw new IllegalArgumentException("历史版本不可变更");
         }
+        if (!StringUtils.isEmpty(stationRoute.getCenterPointWkt())) {
+            centerPoint(stationRoute);
+        }
+
         // 中心点坐标信息
         if (!isPresent) {
             centerPoint(station);
@@ -11,7 +11,11 @@ import com.bsth.repository.realcontrol.ChildTaskPlanRepository;
 import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
 import com.bsth.service.impl.BaseServiceImpl;
 import com.bsth.service.realcontrol.ChildTaskPlanService;
+import com.bsth.util.PrivilegeUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.joda.time.DateTime;
+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;
@@ -231,7 +235,15 @@ public class ChildTaskPlanServiceImpl extends BaseServiceImpl&lt;ChildTaskPlan, Lon
     public Map<String, Object> saveHistory(ChildTaskPlan t) {
         Map<String, Object> rs = new HashMap();
         try {
-            ScheduleRealInfo sch = t.getSchedule();
+            ScheduleRealInfo sch = scheduleRealInfoRepository.findById(t.getSchedule().getId()).get();
+            // 检查调度日期
+            DateTimeFormatter formatter = DateTimeFormat.forPattern("yyyy-MM-dd");
+            long today = formatter.parseMillis(new DateTime().toString("yyyy-MM-dd")), scheduleDate = formatter.parseMillis(sch.getScheduleDateStr());
+            if (today < scheduleDate || today - scheduleDate > 86400000 * PrivilegeUtils.getHistoryEditDays()) {
+                rs.put("status", ResponseCode.ERROR);
+                rs.put("msg", "无效的调度日期");
+                return rs;
+            }
             //保存起终点名称
             String prefix = sch.getXlBm() + "_" + sch.getXlDir() + "_";
             if(StringUtils.isEmpty(t.getStartStationName()))
@@ -253,6 +265,25 @@ public class ChildTaskPlanServiceImpl extends BaseServiceImpl&lt;ChildTaskPlan, Lon
     @Override
     public Map<String, Object> delHistory(Long id) {
-        return super.delete(id);
+        Map<String, Object> rs = new HashMap();
+        try {
+            ScheduleRealInfo sch = childTaskPlanRepository.findById(id).get().getSchedule();
+            // 检查调度日期
+            DateTimeFormatter formatter = DateTimeFormat.forPattern("yyyy-MM-dd");
+            long today = formatter.parseMillis(new DateTime().toString("yyyy-MM-dd")), scheduleDate = formatter.parseMillis(sch.getScheduleDateStr());
+            if (today < scheduleDate || today - scheduleDate > 86400000 * PrivilegeUtils.getHistoryEditDays()) {
+                rs.put("status", ResponseCode.ERROR);
+                rs.put("msg", "无效的调度日期");
+                return rs;
+            }
+
+            return super.delete(id);
+        } catch (Exception e) {
+            logger.error("", e);
+            rs.put("status", ResponseCode.ERROR);
+            rs.put("msg",  e.getMessage());
+        }
+
+        return rs;
     }
 }
@@ -42,7 +42,7 @@ public class RealMapServiceImpl implements RealMapService {
             }
             inStr = " (" + inStr.substring(1) + ")";
-            String sql = "select r.LINE_CODE,r.STATION_NAME,r.STATION_CODE,r.STATION_MARK,r.DIRECTIONS,r.DISTANCES,r.TO_TIME, r.VERSIONS,ST_X(s.CENTER_POINT_WGS) G_LONX,ST_Y(s.CENTER_POINT_WGS) G_LATY,r.RADIUS,r.SHAPED_TYPE shapes_type,ST_AsText(r.BUFFER_POLYGON_WGS) as G_POLYGON_GRID, r.STATION_ROUTE_CODE from bsth_c_stationroute r inner join bsth_c_station s on r.station=s.id where r.line_code in " + inStr + " and r.destroy=0";
+            String sql = "select r.ID STATION_ROUTE_ID,r.LINE_CODE,r.STATION_NAME,r.STATION_CODE,r.STATION_MARK,r.DIRECTIONS,r.DISTANCES,r.TO_TIME, r.VERSIONS,ST_X(s.CENTER_POINT_WGS) G_LONX,ST_Y(s.CENTER_POINT_WGS) G_LATY,r.RADIUS,r.SHAPED_TYPE shapes_type,ST_AsText(r.BUFFER_POLYGON_WGS) as G_POLYGON_GRID, r.STATION_ROUTE_CODE from bsth_c_stationroute r inner join bsth_c_station s on r.station=s.id where r.line_code in " + inStr + " and r.destroy=0";
             List<StationSpatialData> list = jdbcTemplate.query(sql, new BeanPropertyRowMapper(StationSpatialData.class));
             rs.put("status", ResponseCode.SUCCESS);