1.2023-07-31更新日志

王通
1 parent 8d34972f
Showing 19 changed files with 1516 additions and 1502 deletions
src/main/java/com/bsth/data/LineVersionsData.java
src/main/java/com/bsth/data/car_out_info/CarOutInfoHandler.java
src/main/java/com/bsth/data/directive/DirectivesPstThread.java
src/main/java/com/bsth/data/forecast/SampleTimeDataLoader.java
src/main/java/com/bsth/data/gpsdata_v2/thread/GpsDataLoaderThread.java
src/main/java/com/bsth/data/gpsdata_v2/thread/OfflineMonitorThread.java
src/main/java/com/bsth/data/maintenance_plan/MtPlanDataLoadThread.java
src/main/java/com/bsth/data/safe_driv/SafeDrivDataLoadThread.java
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/java/com/bsth/data/schedule/auto_exec/AutoExecScanThread.java
src/main/java/com/bsth/data/schedule/e_state_check/thread/FixedCheckStationCodeThread.java
src/main/java/com/bsth/data/schedule/edit_logs/SeiPstThread.java
src/main/java/com/bsth/data/schedule/late_adjust/LateAdjustHandle.java
src/main/java/com/bsth/data/schedule/late_adjust/ScheduleLateThread.java
src/main/java/com/bsth/data/schedule/thread/SchedulePstThread.java
src/main/java/com/bsth/data/schedule/thread/ScheduleRefreshThread.java
src/main/java/com/bsth/service/geo_data/impl/GeoDataServiceImpl.java
src/main/resources/logback.xml
src/main/resources/static/pages/home.html
-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("线路版本更新结束");
+    }
+}
@@ -15,12 +15,8 @@ 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 org.springframework.transaction.support.TransactionCallback;
 import org.springframework.transaction.support.TransactionCallbackWithoutResult;
 import org.springframework.transaction.support.TransactionTemplate;
@@ -70,6 +66,7 @@ public class CarOutInfoHandler {
      * 全量更新发车信息表
      */
     public void updateAll() {
+        logger.warn("发车信息更新开始");
         try{
             //将班次按线路分组
             List<ScheduleRealInfo> all = new ArrayList<>(dayOfSchedule.findAll());
@@ -88,6 +85,7 @@ public class CarOutInfoHandler {
         }catch (Exception e){
             logger.error("", e);
         }
+        logger.warn("发车信息更新结束");
     }
     public List<ScheduleRealInfo> update(List<ScheduleRealInfo> list) {
@@ -14,11 +14,10 @@ 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 org.springframework.transaction.support.TransactionCallbackWithoutResult;
+import org.springframework.transaction.support.TransactionTemplate;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
@@ -48,10 +47,14 @@ public class DirectivesPstThread extends Thread {
     @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;
@@ -99,176 +102,172 @@ public class DirectivesPstThread extends Thread {
         }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(?,?,?,?,?,?,?,?,?,?,?)";
-        //编程式事务
-        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();
+        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();
                 }
-            });
-
-            tran.commit(status);
-
-            logger.info("64 入库成功: " + d64s.size());
-        }catch (Exception e){
-            logger.error(String.format("错误数据：%s", JSON.toJSONString(d64s)), e);
-            tran.rollback(status);
-        }
+            }
+        });
+        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=?";
-        //编程式事务
-        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();
+        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();
                 }
-            });
-
-            tran.commit(status);
-
-            logger.info("60 更新成功: " + d60s.size());
-        }catch (Exception e){
-            logger.error(String.format("错误数据：%s", JSON.toJSONString(d60s)), e);
-            tran.rollback(status);
-        }
+            }
+        });
+        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(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
-        //编程式事务
-        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());
+        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();
                 }
-
-                @Override
-                public int getBatchSize() {
-                    return d60s.size();
-                }
-            });
-
-            tran.commit(status);
-
-            logger.info("60 入库成功: " + d60s.size());
-        }catch (Exception e){
-            logger.error(String.format("错误数据：%s", JSON.toJSONString(d60s)), e);
-            tran.rollback(status);
-        }
+            }
+        });
+        logger.warn("60指令保存结束");
     }
     private String isNvl(String v) {
-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();
+		}
+	}
+}
-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
-package com.bsth.data.gpsdata_v2.thread;
-
-import com.bsth.data.gpsdata_v2.GpsRealData;
-import com.bsth.data.gpsdata_v2.entity.GpsEntity;
-import com.bsth.data.gpsdata_v2.handlers.overspeed.OverspeedProcess;
-import com.bsth.websocket.handler.SendUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.Collection;
-
-/**
- * GPS掉离线监控
- * Created by panzhao on 2017/1/11.
- */
-@Component
-public class OfflineMonitorThread extends Thread{
-
-    @Autowired
-    GpsRealData gpsRealData;
-
-    //掉线阈值
-    private final static int LOSE_TIME = 1000 * 60 * 10;
-
-    Logger logger = LoggerFactory.getLogger(this.getClass());
-
-    @Autowired
-    SendUtils sendUtils;
-
-    @Autowired
-    OverspeedProcess overspeedProcess;
-
-    //无任务时 离线阈值
-    //private final static int OFFLINE_TIME = 1000 * 60 * 10;
-
-    @Override
-    public void run() {
-        try{
-            long t = System.currentTimeMillis();
-            Collection<GpsEntity> list = gpsRealData.all();
-
-            String state;
-            for(GpsEntity gps : list){
-                state = gps.getAbnormalStatus();
-
-                if(state != null && state.equals("offline"))
-                    continue;
-
-                if (t - gps.getTimestamp() > LOSE_TIME){
-                    gps.offline();
-
-                    //结束超速
-                    overspeedProcess.offline(gps.getDeviceId());
-                    //通知页面有设备掉线
-                    sendUtils.deviceOffline(gps);
-                }
-            }
-        }catch (Exception e){
-            logger.error("", e);
-        }
-    }
-}
+package com.bsth.data.gpsdata_v2.thread;
+
+import com.bsth.data.gpsdata_v2.GpsRealData;
+import com.bsth.data.gpsdata_v2.entity.GpsEntity;
+import com.bsth.data.gpsdata_v2.handlers.overspeed.OverspeedProcess;
+import com.bsth.websocket.handler.SendUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Collection;
+
+/**
+ * GPS掉离线监控
+ * Created by panzhao on 2017/1/11.
+ */
+@Component
+public class OfflineMonitorThread extends Thread{
+
+    @Autowired
+    GpsRealData gpsRealData;
+
+    //掉线阈值
+    private final static int LOSE_TIME = 1000 * 60 * 10;
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Autowired
+    SendUtils sendUtils;
+
+    @Autowired
+    OverspeedProcess overspeedProcess;
+
+    //无任务时 离线阈值
+    //private final static int OFFLINE_TIME = 1000 * 60 * 10;
+
+    @Override
+    public void run() {
+        logger.warn("GPS离线检查开始");
+        try{
+            long t = System.currentTimeMillis();
+            Collection<GpsEntity> list = gpsRealData.all();
+
+            String state;
+            for(GpsEntity gps : list){
+                state = gps.getAbnormalStatus();
+
+                if(state != null && state.equals("offline"))
+                    continue;
+
+                if (t - gps.getTimestamp() > LOSE_TIME){
+                    gps.offline();
+
+                    //结束超速
+                    overspeedProcess.offline(gps.getDeviceId());
+                    //通知页面有设备掉线
+                    sendUtils.deviceOffline(gps);
+                }
+            }
+        }catch (Exception e){
+            logger.error("", e);
+        }
+        logger.warn("GPS离线检查结束");
+    }
+}
 package com.bsth.data.maintenance_plan;
-import com.alibaba.fastjson.JSON;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.http.HttpEntity;
 import org.apache.http.client.config.RequestConfig;
@@ -27,6 +26,7 @@ import java.util.Map;
 /**
  * 维修保养计划
+ * @author Hill
  */
 @Component
 public class MtPlanDataLoadThread extends Thread implements InitializingBean {
@@ -57,6 +57,7 @@ public class MtPlanDataLoadThread extends Thread implements InitializingBean {
     @Override
     public void run() {
+        logger.warn("维修保养计划获取数据开始");
         List<MaintenancePlan> list;
         StringBuilder sb = new StringBuilder(url);
         try {
@@ -92,6 +93,7 @@ public class MtPlanDataLoadThread extends Thread implements InitializingBean {
         } catch (Exception e) {
             logger.error("维修保养计划接口报错了", e);
         }
+        logger.warn("维修保养计划获取数据结束");
     }
     @Override
-package com.bsth.data.safe_driv;
-
-import com.alibaba.fastjson.JSON;
-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.apache.http.impl.client.HttpClients;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Component;
-
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.util.List;
-
-/**
- * 安全驾驶数据加载线程
- * Created by panzhao on 2017/4/6.
- */
-@Component
-public class SafeDrivDataLoadThread extends Thread {
-
-    Logger logger = LoggerFactory.getLogger(this.getClass());
-
-    static String url;
-    static CloseableHttpClient httpClient;
-    static HttpGet get;
-    static RequestConfig requestConfig;
-    static CloseableHttpResponse response;
-    static HttpEntity entity;
-    static BufferedReader br;
-
-    static {
-        url = "http://211.95.61.66:9008/safedriving/realtimeInterface";
-        httpClient = HttpClients.createDefault();
-        get = new HttpGet(url);
-        requestConfig = RequestConfig.custom()
-                .setConnectTimeout(5500).setConnectionRequestTimeout(5000)
-                .setSocketTimeout(5500).build();
-        get.setConfig(requestConfig);
-    }
-
-    @Override
-    public void run() {
-        List<SafeDriv> list;
-        try {
-
-            response = httpClient.execute(get);
-
-            int statusCode = response.getStatusLine().getStatusCode();
-            if(statusCode != 200){
-                logger.error("http client status code: " + statusCode);
-            }
-
-            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);
-
-
-                list = JSON.parseArray(stringBuffer.toString(), SafeDriv.class);
-
-                for (SafeDriv sd : list) {
-                    SafeDrivCenter.put(sd);
-                }
-            }
-
-            if (null != response)
-                response.close();
-        } catch (Exception e) {
-            logger.error("安全驾驶接口报错了", e);
-        }
-    }
-}
+package com.bsth.data.safe_driv;
+
+import com.alibaba.fastjson.JSON;
+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.apache.http.impl.client.HttpClients;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.util.List;
+
+/**
+ * 安全驾驶数据加载线程
+ * Created by panzhao on 2017/4/6.
+ */
+@Component
+public class SafeDrivDataLoadThread extends Thread {
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    static String url;
+    static CloseableHttpClient httpClient;
+    static HttpGet get;
+    static RequestConfig requestConfig;
+    static CloseableHttpResponse response;
+    static HttpEntity entity;
+    static BufferedReader br;
+
+    static {
+        url = "http://211.95.61.66:9008/safedriving/realtimeInterface";
+        httpClient = HttpClients.createDefault();
+        get = new HttpGet(url);
+        requestConfig = RequestConfig.custom()
+                .setConnectTimeout(5500).setConnectionRequestTimeout(5000)
+                .setSocketTimeout(5500).build();
+        get.setConfig(requestConfig);
+    }
+
+    @Override
+    public void run() {
+        logger.warn("安全驾驶获取数据开始");
+        List<SafeDriv> list;
+        try {
+
+            response = httpClient.execute(get);
+
+            int statusCode = response.getStatusLine().getStatusCode();
+            if(statusCode != 200){
+                logger.error("http client status code: " + statusCode);
+            }
+
+            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);
+
+
+                list = JSON.parseArray(stringBuffer.toString(), SafeDriv.class);
+
+                for (SafeDriv sd : list) {
+                    SafeDrivCenter.put(sd);
+                }
+            }
+
+            if (null != response)
+                response.close();
+        } catch (Exception e) {
+            logger.error("安全驾驶接口报错了", e);
+        }
+        logger.warn("安全驾驶获取数据结束");
+    }
+}
@@ -15,6 +15,8 @@ import com.bsth.entity.schedule.SchedulePlanInfo;
 import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
 import com.bsth.service.schedule.SchedulePlanInfoService;
 import com.bsth.websocket.handler.SendUtils;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.ListMultimap;
@@ -29,11 +31,10 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.dao.DataIntegrityViolationException;
 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 org.springframework.transaction.support.TransactionCallbackWithoutResult;
+import org.springframework.transaction.support.TransactionTemplate;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
@@ -440,85 +441,84 @@ public class DayOfSchedule {
             item.setScheduleDateStr(sdfyyyyMMdd.format(item.getScheduleDate()));
         }
-        //编程式事务
-        DataSourceTransactionManager tran = new DataSourceTransactionManager(jdbcTemplate.getDataSource());
-        DefaultTransactionDefinition def = new DefaultTransactionDefinition();
-        def.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRED);
-        TransactionStatus status = tran.getTransaction(def);
-
-        try{
-            final List<ScheduleRealInfo> pstList = list;
-            //写入
-            jdbcTemplate.batchUpdate("insert into bsth_c_s_sp_info_real(id,bc_type,bcs,bcsj,cl_zbh,create_date,dfsj,directive_state,fcno,fcsj,fcsj_actual,j_gh,j_name,jhlc,lp_name,qdz_code,qdz_name,real_exec_date,remarks,s_gh,s_name,schedule_date,schedule_date_str,sflj,sp_id,status,update_date,xl_bm,xl_dir,xl_name,zdsj,zdsj_actual,zdz_code,zdz_name,ccno,df_auto,fgs_bm,fgs_name,gs_bm,gs_name,online,adjust_exps,reissue,jhlc_orig,sigin_compate,drift_status,cc_service,major_station_name,rfid_state,first_rfid_state)" +
-                    " VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)", new BatchPreparedStatementSetter() {
-                @Override
-                public void setValues(PreparedStatement ps, int i) throws SQLException {
-                    ScheduleRealInfo sch = pstList.get(i);
-                    ps.setLong(1, sch.getId());
-                    ps.setString(2, sch.getBcType());
-                    ps.setInt(3, sch.getBcs()==null?0:sch.getBcs());
-                    ps.setInt(4, sch.getBcsj()==null?0:sch.getBcsj());
-                    ps.setString(5, sch.getClZbh());
-                    ps.setTimestamp(6, new java.sql.Timestamp(sch.getCreateDate().getTime()));
-                    ps.setString(7, sch.getDfsj());
-                    ps.setInt(8, sch.getDirectiveState());
-                    ps.setInt(9, sch.getFcno()==null?0:sch.getFcno());
-                    ps.setString(10, sch.getFcsj());
-                    ps.setString(11, sch.getFcsjActual());
-                    ps.setString(12, sch.getjGh());
-                    ps.setString(13, sch.getjName());
-                    ps.setDouble(14, sch.getJhlc());
-                    ps.setString(15, sch.getLpName());
-                    ps.setString(16, sch.getQdzCode());
-                    ps.setString(17, sch.getQdzName());
-                    ps.setString(18, sch.getRealExecDate());
-                    ps.setString(19, sch.getRemarks());
-                    ps.setString(20, sch.getsGh());
-                    ps.setString(21, sch.getsName());
-                    ps.setTimestamp(22, new java.sql.Timestamp(sch.getScheduleDate().getTime()));
-                    ps.setString(23, sch.getScheduleDateStr());
-                    ps.setBoolean(24, sch.isSflj());
-                    ps.setLong(25, sch.getSpId());
-                    ps.setInt(26, sch.getStatus());
-                    ps.setTimestamp(27, new java.sql.Timestamp(sch.getUpdateDate().getTime()));
-                    ps.setString(28, sch.getXlBm());
-                    ps.setString(29, sch.getXlDir());
-                    ps.setString(30, sch.getXlName());
-                    ps.setString(31, sch.getZdsj());
-                    ps.setString(32, sch.getZdsjActual());
-                    ps.setString(33, sch.getZdzCode());
-                    ps.setString(34, sch.getZdzName());
-                    ps.setInt(35, sch.getCcno()==null?0:sch.getCcno());
-                    ps.setBoolean(36, sch.isDfAuto());
-                    ps.setString(37, sch.getFgsBm());
-                    ps.setString(38, sch.getFgsName());
-                    ps.setString(39, sch.getGsBm());
-                    ps.setString(40, sch.getGsName());
-                    ps.setBoolean(41, sch.isOnline());
-                    ps.setString(42, sch.getAdjustExps());
-                    ps.setBoolean(43, sch.isReissue());
-                    ps.setDouble(44, sch.getJhlcOrig());
-                    ps.setInt(45, sch.getSiginCompate());
-                    ps.setInt(46, sch.getDriftStatus());
-                    ps.setBoolean(47, sch.isCcService());
-                    ps.setString(48, sch.getMajorStationName());
-                    ps.setInt(49, sch.getRfidState());
-                    ps.setInt(50, sch.getFirstRfidState());
-                }
-
-                @Override
-                public int getBatchSize() {
-                    return pstList.size();
+        transactionTemplate.execute(new TransactionCallbackWithoutResult() {
+            @Override
+            protected void doInTransactionWithoutResult(TransactionStatus status) {
+                try{
+                    final List<ScheduleRealInfo> pstList = list;
+                    //写入
+                    jdbcTemplate.batchUpdate("insert into bsth_c_s_sp_info_real(id,bc_type,bcs,bcsj,cl_zbh,create_date,dfsj,directive_state,fcno,fcsj,fcsj_actual,j_gh,j_name,jhlc,lp_name,qdz_code,qdz_name,real_exec_date,remarks,s_gh,s_name,schedule_date,schedule_date_str,sflj,sp_id,status,update_date,xl_bm,xl_dir,xl_name,zdsj,zdsj_actual,zdz_code,zdz_name,ccno,df_auto,fgs_bm,fgs_name,gs_bm,gs_name,online,adjust_exps,reissue,jhlc_orig,sigin_compate,drift_status,cc_service,major_station_name,rfid_state,first_rfid_state)" +
+                            " VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)", new BatchPreparedStatementSetter() {
+                        @Override
+                        public void setValues(PreparedStatement ps, int i) throws SQLException {
+                            ScheduleRealInfo sch = pstList.get(i);
+                            ps.setLong(1, sch.getId());
+                            ps.setString(2, sch.getBcType());
+                            ps.setInt(3, sch.getBcs()==null?0:sch.getBcs());
+                            ps.setInt(4, sch.getBcsj()==null?0:sch.getBcsj());
+                            ps.setString(5, sch.getClZbh());
+                            ps.setTimestamp(6, new java.sql.Timestamp(sch.getCreateDate().getTime()));
+                            ps.setString(7, sch.getDfsj());
+                            ps.setInt(8, sch.getDirectiveState());
+                            ps.setInt(9, sch.getFcno()==null?0:sch.getFcno());
+                            ps.setString(10, sch.getFcsj());
+                            ps.setString(11, sch.getFcsjActual());
+                            ps.setString(12, sch.getjGh());
+                            ps.setString(13, sch.getjName());
+                            ps.setDouble(14, sch.getJhlc());
+                            ps.setString(15, sch.getLpName());
+                            ps.setString(16, sch.getQdzCode());
+                            ps.setString(17, sch.getQdzName());
+                            ps.setString(18, sch.getRealExecDate());
+                            ps.setString(19, sch.getRemarks());
+                            ps.setString(20, sch.getsGh());
+                            ps.setString(21, sch.getsName());
+                            ps.setTimestamp(22, new java.sql.Timestamp(sch.getScheduleDate().getTime()));
+                            ps.setString(23, sch.getScheduleDateStr());
+                            ps.setBoolean(24, sch.isSflj());
+                            ps.setLong(25, sch.getSpId());
+                            ps.setInt(26, sch.getStatus());
+                            ps.setTimestamp(27, new java.sql.Timestamp(sch.getUpdateDate().getTime()));
+                            ps.setString(28, sch.getXlBm());
+                            ps.setString(29, sch.getXlDir());
+                            ps.setString(30, sch.getXlName());
+                            ps.setString(31, sch.getZdsj());
+                            ps.setString(32, sch.getZdsjActual());
+                            ps.setString(33, sch.getZdzCode());
+                            ps.setString(34, sch.getZdzName());
+                            ps.setInt(35, sch.getCcno()==null?0:sch.getCcno());
+                            ps.setBoolean(36, sch.isDfAuto());
+                            ps.setString(37, sch.getFgsBm());
+                            ps.setString(38, sch.getFgsName());
+                            ps.setString(39, sch.getGsBm());
+                            ps.setString(40, sch.getGsName());
+                            ps.setBoolean(41, sch.isOnline());
+                            ps.setString(42, sch.getAdjustExps());
+                            ps.setBoolean(43, sch.isReissue());
+                            ps.setDouble(44, sch.getJhlcOrig());
+                            ps.setInt(45, sch.getSiginCompate());
+                            ps.setInt(46, sch.getDriftStatus());
+                            ps.setBoolean(47, sch.isCcService());
+                            ps.setString(48, sch.getMajorStationName());
+                            ps.setInt(49, sch.getRfidState());
+                            ps.setInt(50, sch.getFirstRfidState());
+                        }
+
+                        @Override
+                        public int getBatchSize() {
+                            return pstList.size();
+                        }
+                    });
+                }catch (Exception e){
+                    status.setRollbackOnly();
+                    try {
+                        logger.error(String.format("翻班实际排班数据批量保存异常: %s", mapper.writeValueAsString(list)), e);
+                    } catch (JsonProcessingException jsonProcessingException) {
+                        jsonProcessingException.printStackTrace();
+                    }
                 }
-            });
-
-            tran.commit(status);
-        }catch (Exception e){
-            tran.rollback(status);
-            logger.error("real schedule batchSave error...", e);
-        }
-        // 入库
-        //new BatchSaveUtils<ScheduleRealInfo>().saveList(list, ScheduleRealInfo.class);
+            }
+        });
     }
     public List<SchedulePlanInfo> cleanSchPlanItr(Iterator<SchedulePlanInfo> itrab) {
@@ -993,6 +993,12 @@ public class DayOfSchedule {
     @Autowired
     JdbcTemplate jdbcTemplate;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
+
+    @Autowired
+    private ObjectMapper mapper;
+
     /**
      * 删除实际排班
      *
-package com.bsth.data.schedule.auto_exec;
-
-import com.bsth.data.LineConfigData;
-import com.bsth.data.schedule.DayOfSchedule;
-import com.bsth.entity.realcontrol.LineConfig;
-import com.bsth.entity.realcontrol.ScheduleRealInfo;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-/**
- * 班次自动执行扫描线程
- * Created by panzhao on 2017/10/31.
- */
-@Component
-public class AutoExecScanThread extends Thread{
-
-
-    @Autowired
-    LineConfigData lineConfigData;
-
-    @Autowired
-    DayOfSchedule dayOfSchedule;
-
-    @Autowired
-    RealScheduleAutoExecHandler realScheduleAutoExecHandler;
-
-    Logger logger = LoggerFactory.getLogger(this.getClass());
-
-    @Override
-    public void run() {
-        try{
-            //要自动执行的线路
-            List<String> autos = new ArrayList<>();
-            Collection<LineConfig> lcs = lineConfigData.getAll();
-
-            for(LineConfig config : lcs){
-                if(config.isAutoExec()){
-                    autos.add(config.getLine().getLineCode());
-                }
-            }
-
-            if(autos.size()==0)
-                return;
-            List<ScheduleRealInfo> all = new ArrayList<>(dayOfSchedule.findAll());
-            for(ScheduleRealInfo sch : all){
-                if(autos.contains(sch.getXlBm())){
-                    realScheduleAutoExecHandler.exec(sch);
-                }
-            }
-        }catch (Exception e){
-            logger.error("", e);
-        }
-    }
-}
+package com.bsth.data.schedule.auto_exec;
+
+import com.bsth.data.LineConfigData;
+import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.entity.realcontrol.LineConfig;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 班次自动执行扫描线程
+ * Created by panzhao on 2017/10/31.
+ */
+@Component
+public class AutoExecScanThread extends Thread{
+
+
+    @Autowired
+    LineConfigData lineConfigData;
+
+    @Autowired
+    DayOfSchedule dayOfSchedule;
+
+    @Autowired
+    RealScheduleAutoExecHandler realScheduleAutoExecHandler;
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Override
+    public void run() {
+        logger.warn("班次自动执行扫描开始");
+        try{
+            //要自动执行的线路
+            List<String> autos = new ArrayList<>();
+            Collection<LineConfig> lcs = lineConfigData.getAll();
+
+            for(LineConfig config : lcs){
+                if(config.isAutoExec()){
+                    autos.add(config.getLine().getLineCode());
+                }
+            }
+
+            if(autos.size()==0)
+                return;
+            List<ScheduleRealInfo> all = new ArrayList<>(dayOfSchedule.findAll());
+            for(ScheduleRealInfo sch : all){
+                if(autos.contains(sch.getXlBm())){
+                    realScheduleAutoExecHandler.exec(sch);
+                }
+            }
+        }catch (Exception e){
+            logger.error("", e);
+        }
+        logger.warn("班次自动执行扫描结束");
+    }
+}
-package com.bsth.data.schedule.e_state_check.thread;
-
-import com.bsth.data.schedule.e_state_check.ScheduleStationCodeChecker;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-/**
- * 定时检查班次站点编码线程
- * Created by panzhao on 2018/4/2.
- */
-@Component
-public class FixedCheckStationCodeThread extends Thread {
-
-    @Autowired
-    ScheduleStationCodeChecker scheduleStationCodeChecker;
-
-    Logger logger = LoggerFactory.getLogger(this.getClass());
-
-    @Override
-    public void run() {
-        try {
-            scheduleStationCodeChecker.checkAll();
-        } catch (Exception e) {
-            logger.error("", e);
-        }
-    }
-}
+package com.bsth.data.schedule.e_state_check.thread;
+
+import com.bsth.data.schedule.e_state_check.ScheduleStationCodeChecker;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 定时检查班次站点编码线程
+ * Created by panzhao on 2018/4/2.
+ */
+@Component
+public class FixedCheckStationCodeThread extends Thread {
+
+    @Autowired
+    ScheduleStationCodeChecker scheduleStationCodeChecker;
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Override
+    public void run() {
+        logger.warn("班次站点编码检查开始");
+        try {
+            scheduleStationCodeChecker.checkAll();
+        } catch (Exception e) {
+            logger.error("", e);
+        }
+        logger.warn("班次站点编码检查结束");
+    }
+}
@@ -28,6 +28,7 @@ public class SeiPstThread extends Thread{
     @Override
     public void run() {
+        log.warn("班次修正日志保存开始");
         try{
             List<SchEditInfo> pstList = new ArrayList<>();
             LinkedList<SchEditInfo> list = ScheduleModifyLogger.list;
@@ -48,5 +49,6 @@ public class SeiPstThread extends Thread{
         }catch (Exception e){
             log.error("", e);
         }
+        log.warn("班次修正日志保存结束");
     }
 }
 \ No newline at end of file
-
-package com.bsth.data.schedule.late_adjust;
-
-import com.bsth.data.LineConfigData;
-import com.bsth.data.gpsdata_v2.entity.GpsEntity;
-import com.bsth.entity.realcontrol.LineConfig;
-import com.bsth.entity.realcontrol.ScheduleRealInfo;
-import com.bsth.util.Arith;
-import com.bsth.websocket.handler.SendUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.BeansException;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
-import org.springframework.stereotype.Component;
-
-import java.util.Collection;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-
-/**
- * 误点自动调整待发 处理程序
- * <p>
- * 注意 ：这里的误点是指应发未到
- * Created by panzhao on 2017/4/16.
- */
-@Component
-public class LateAdjustHandle implements ApplicationContextAware {
-
-    static LineConfigData lineConfigData;
-    static SendUtils sendUtils;
-
-    static Logger logger = LoggerFactory.getLogger(LateAdjustHandle.class);
-
-    /**
-     * 应发未到的班次 key : id
-     */
-    private static ConcurrentMap<Long, ScheduleRealInfo> lateSchMap = new ConcurrentHashMap<>();
-
-
-    /**
-     * 新增一个误点班次
-     *
-     * @param sch
-     */
-    public static void putLate(ScheduleRealInfo sch) {
-        try {
-            //线路配置
-            LineConfig config = lineConfigData.get(sch.getXlBm());
-            if (sch.getLateMinute() == 0) {
-                if (!config.isEnableYjtk())
-                    return;
-
-                sch.setLateMinute(sch.getXlDir().equals("0") ? config.getUpStopMinute() : config.getDownStopMinute());
-            }
-
-            if (sch.getDfsj().compareTo(config.getYjtkStart()) > 0
-                    && sch.getDfsj().compareTo(config.getYjtkEnd()) <= 0) {
-
-                //班次压入
-                if (!lateSchMap.containsKey(sch.getId())) {
-                    logger.info("29【应发未到 班次 " + sch.getClZbh() + " -" + sch.getDfsj() + " -id: " + sch.getId() + " -加入误点调整！");
-
-                    sch.setLate2(true);
-                    lateSchMap.put(sch.getId(), sch);
-                    //通知客户端
-                    sendUtils.sendAutoWdtz(sch, null);
-                }
-            }
-
-        } catch (Exception e) {
-            logger.error("", e);
-        }
-    }
-
-
-    /**
-     * 获取所有应发未到的班次
-     *
-     * @return
-     */
-    public static Collection<ScheduleRealInfo> allLateSch() {
-        return lateSchMap.values();
-    }
-
-    public static void remove(ScheduleRealInfo sch) {
-        try {
-            if (lateSchMap.containsKey(sch.getId())) {
-                lateSchMap.remove(sch.getId());
-
-                sch.setLate2(false);
-                sch.setLateMinute(0);
-                sch.setDfAuto(false);
-
-                logger.info("移除误点调整 -" + sch.getClZbh() + " -time: " + sch.getDfsj() + " -id: " + sch.getId());
-            }
-        } catch (Exception e) {
-            logger.error("", e);
-        }
-    }
-
-    /**
-     * 车辆到站 进站 进 的哪个班次，就调该车辆的下一个班次
-     *
-     * @param gps
-     */
-    public static void carArrive(GpsEntity gps, ScheduleRealInfo sch) {
-        try {
-            if (gps.getInstation() <= 0 || null == sch)
-                return;
-
-            if (!lateSchMap.containsKey(sch.getId())) {
-                //班次是否误点（可能处于误点线程扫描的空隙，所以再判定一次）
-                if (sch.getDfsjT() <= gps.getTimestamp()) {
-                    putLate(sch);
-
-                    if (!lateSchMap.containsKey(sch.getId()))
-                        return;
-
-                    logger.info("线程空隙漏掉的误点，id: " + sch.getId());
-                } else
-                    return;
-            }
-
-
-            //可能是延迟信号，gps时间没有误点
-            if (gps.getTimestamp() <= sch.getDfsjT()) {
-                sch.setLate2(false);
-                lateSchMap.remove(sch.getId());
-                return;
-            }
-
-
-            //自动调整待发 到达时间 + 停靠时间
-            long dt = Arith.addLong(gps.getTimestamp(), (sch.getLateMinute() * 60 * 1000));
-
-            sch.setDfsjAll(dt);
-            sch.setDfAuto(true);
-            //取消应发未到标记
-            sch.setLate2(false);
-
-            lateSchMap.remove(sch.getId());
-            logger.info("【应发未到】车辆到站 " + sch.getClZbh() + " -" + sch.getDfsj() + " -到站时间：" + gps.getTimestamp() + " -停靠时间：" + sch.getLateMinute() + " -自动设置的待发时间：" + dt + " -id:" + sch.getId());
-        } catch (Exception e) {
-            e.printStackTrace();
-            logger.error("late2 car arrive", e);
-        }
-    }
-
-
-    @Override
-    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
-        lineConfigData = applicationContext.getBean(LineConfigData.class);
-        sendUtils = applicationContext.getBean(SendUtils.class);
-    }
+
+package com.bsth.data.schedule.late_adjust;
+
+import com.bsth.data.LineConfigData;
+import com.bsth.data.gpsdata_v2.entity.GpsEntity;
+import com.bsth.entity.realcontrol.LineConfig;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.util.Arith;
+import com.bsth.websocket.handler.SendUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.stereotype.Component;
+
+import java.util.Collection;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
+/**
+ * 误点自动调整待发 处理程序
+ * <p>
+ * 注意 ：这里的误点是指应发未到
+ * Created by panzhao on 2017/4/16.
+ */
+@Component
+public class LateAdjustHandle implements ApplicationContextAware {
+
+    static LineConfigData lineConfigData;
+    static SendUtils sendUtils;
+
+    static Logger logger = LoggerFactory.getLogger(LateAdjustHandle.class);
+
+    /**
+     * 应发未到的班次 key : id
+     */
+    private static ConcurrentMap<Long, ScheduleRealInfo> lateSchMap = new ConcurrentHashMap<>();
+
+
+    /**
+     * 新增一个误点班次
+     *
+     * @param sch
+     */
+    public static void putLate(ScheduleRealInfo sch) {
+        try {
+            //线路配置
+            LineConfig config = lineConfigData.get(sch.getXlBm());
+            if (sch.getLateMinute() == 0) {
+                if (!config.isEnableYjtk())
+                    return;
+
+                sch.setLateMinute(sch.getXlDir().equals("0") ? config.getUpStopMinute() : config.getDownStopMinute());
+            }
+
+            if (sch.getDfsj().compareTo(config.getYjtkStart()) > 0
+                    && sch.getDfsj().compareTo(config.getYjtkEnd()) <= 0) {
+
+                //班次压入
+                if (!lateSchMap.containsKey(sch.getId())) {
+                    logger.info("【应发未到】 班次 " + sch.getClZbh() + " -" + sch.getDfsj() + " -id: " + sch.getId() + " -加入误点调整！");
+
+                    sch.setLate2(true);
+                    lateSchMap.put(sch.getId(), sch);
+                    //通知客户端
+                    sendUtils.sendAutoWdtz(sch, null);
+                }
+            }
+
+        } catch (Exception e) {
+            logger.error("", e);
+        }
+    }
+
+
+    /**
+     * 获取所有应发未到的班次
+     *
+     * @return
+     */
+    public static Collection<ScheduleRealInfo> allLateSch() {
+        return lateSchMap.values();
+    }
+
+    public static void remove(ScheduleRealInfo sch) {
+        try {
+            if (lateSchMap.containsKey(sch.getId())) {
+                lateSchMap.remove(sch.getId());
+
+                sch.setLate2(false);
+                sch.setLateMinute(0);
+                sch.setDfAuto(false);
+
+                logger.info("移除误点调整 -" + sch.getClZbh() + " -time: " + sch.getDfsj() + " -id: " + sch.getId());
+            }
+        } catch (Exception e) {
+            logger.error("", e);
+        }
+    }
+
+    /**
+     * 车辆到站 进站 进 的哪个班次，就调该车辆的下一个班次
+     *
+     * @param gps
+     */
+    public static void carArrive(GpsEntity gps, ScheduleRealInfo sch) {
+        try {
+            if (gps.getInstation() <= 0 || null == sch)
+                return;
+
+            if (!lateSchMap.containsKey(sch.getId())) {
+                //班次是否误点（可能处于误点线程扫描的空隙，所以再判定一次）
+                if (sch.getDfsjT() <= gps.getTimestamp()) {
+                    putLate(sch);
+
+                    if (!lateSchMap.containsKey(sch.getId()))
+                        return;
+
+                    logger.info("线程空隙漏掉的误点，id: " + sch.getId());
+                } else
+                    return;
+            }
+
+
+            //可能是延迟信号，gps时间没有误点
+            if (gps.getTimestamp() <= sch.getDfsjT()) {
+                sch.setLate2(false);
+                lateSchMap.remove(sch.getId());
+                return;
+            }
+
+
+            //自动调整待发 到达时间 + 停靠时间
+            long dt = Arith.addLong(gps.getTimestamp(), (sch.getLateMinute() * 60 * 1000));
+
+            sch.setDfsjAll(dt);
+            sch.setDfAuto(true);
+            //取消应发未到标记
+            sch.setLate2(false);
+
+            lateSchMap.remove(sch.getId());
+            logger.info("【应发未到】车辆到站 " + sch.getClZbh() + " -" + sch.getDfsj() + " -到站时间：" + gps.getTimestamp() + " -停靠时间：" + sch.getLateMinute() + " -自动设置的待发时间：" + dt + " -id:" + sch.getId());
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("late2 car arrive", e);
+        }
+    }
+
+
+    @Override
+    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+        lineConfigData = applicationContext.getBean(LineConfigData.class);
+        sendUtils = applicationContext.getBean(SendUtils.class);
+    }
 }
 \ No newline at end of file
-package com.bsth.data.schedule.late_adjust;
-
-
-import com.bsth.data.schedule.DayOfSchedule;
-import com.bsth.data.schedule.ScheduleComparator;
-import com.bsth.entity.realcontrol.ScheduleRealInfo;
-import com.bsth.websocket.handler.SendUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-
-/**
- *
- * @ClassName: ScheduleLateThread
- * @Description: TODO(班次误点扫描线程)
- * @author PanZhao
- * @date 2016年8月31日 下午3:09:02
- *
- */
-@Component
-public class ScheduleLateThread extends Thread{
-
-	@Autowired
-	DayOfSchedule dayOfSchedule;
-
-	@Autowired
-	SendUtils sendUtils;
-
-	Logger logger = LoggerFactory.getLogger(this.getClass());
-
-	private static Comparator<ScheduleRealInfo> cpm = new ScheduleComparator.DFSJ2();
-
-	@Override
-	public void run() {
-		try{
-			List<ScheduleRealInfo> all = new ArrayList<>(dayOfSchedule.findAll());
-			Collections.sort(all, cpm);
-
-			long t = System.currentTimeMillis();
-			int size = all.size();
-
-			ScheduleRealInfo sch;
-			for(int i = 0; i < size; i ++){
-				sch = all.get(i);
-				if(sch.getDfsjT() > t)
-					break;
-
-				if(sch.isLate())
-					continue;
-
-				if(sch.getStatus() == 0
-						&& StringUtils.isEmpty(sch.getFcsjActual())){
-
-					//检查应发未到 当前班次无起点到达时间
-					if(StringUtils.isEmpty(sch.getQdzArrDatesj())){
-						ScheduleRealInfo prev = dayOfSchedule.prev(sch);
-						//上一个班次也没有实际终点到达时间
-						if(prev != null && StringUtils.isEmpty(prev.getZdsjActual())){
-							//进入误点调整程序
-							LateAdjustHandle.putLate(sch);
-						}
-					}
-
-					//应发未发
-					sch.setLate(true);
-					//通知客户端
-					sendUtils.refreshSch(sch);
-				}
-			}
-		}catch (Exception e){
-			logger.error("", e);
-		}
-	}
+package com.bsth.data.schedule.late_adjust;
+
+
+import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.data.schedule.ScheduleComparator;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.websocket.handler.SendUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+/**
+ *
+ * @ClassName: ScheduleLateThread
+ * @Description: TODO(班次误点扫描线程)
+ * @author PanZhao
+ * @date 2016年8月31日 下午3:09:02
+ *
+ */
+@Component
+public class ScheduleLateThread extends Thread{
+
+	@Autowired
+	DayOfSchedule dayOfSchedule;
+
+	@Autowired
+	SendUtils sendUtils;
+
+	Logger logger = LoggerFactory.getLogger(this.getClass());
+
+	private static Comparator<ScheduleRealInfo> cpm = new ScheduleComparator.DFSJ2();
+
+	@Override
+	public void run() {
+		logger.warn("班次误点扫描开始");
+		try{
+			List<ScheduleRealInfo> all = new ArrayList<>(dayOfSchedule.findAll());
+			Collections.sort(all, cpm);
+
+			long t = System.currentTimeMillis();
+			int size = all.size();
+
+			ScheduleRealInfo sch;
+			for(int i = 0; i < size; i ++){
+				sch = all.get(i);
+				if(sch.getDfsjT() > t)
+					break;
+
+				if(sch.isLate())
+					continue;
+
+				if(sch.getStatus() == 0
+						&& StringUtils.isEmpty(sch.getFcsjActual())){
+
+					//检查应发未到 当前班次无起点到达时间
+					if(StringUtils.isEmpty(sch.getQdzArrDatesj())){
+						ScheduleRealInfo prev = dayOfSchedule.prev(sch);
+						//上一个班次也没有实际终点到达时间
+						if(prev != null && StringUtils.isEmpty(prev.getZdsjActual())){
+							//进入误点调整程序
+							LateAdjustHandle.putLate(sch);
+						}
+					}
+
+					//应发未发
+					sch.setLate(true);
+					//通知客户端
+					sendUtils.refreshSch(sch);
+				}
+			}
+		}catch (Exception e){
+			logger.error("", e);
+		}
+		logger.warn("班次误点扫描结束");
+	}
 }
 \ No newline at end of file
@@ -54,7 +54,7 @@ public class SchedulePstThread extends Thread {
     @Override
     public void run() {
-
+        logger.warn("班次批量保存开始");
         try{
             ScheduleRealInfo schedule;
             for (int i = 0; i < 500; i++) {
@@ -75,6 +75,7 @@ public class SchedulePstThread extends Thread {
         }catch (Exception e){
             logger.error("", e);
         }
+        logger.warn("班次批量保存结束");
     }
     private void save(){
-package com.bsth.data.schedule.thread;
-
-import com.bsth.data.LineConfigData;
-import com.bsth.data.directive.DayOfDirectives;
-import com.bsth.data.gpsdata_v2.cache.GpsCacheData;
-import com.bsth.data.pilot80.PilotReport;
-import com.bsth.data.schedule.DayOfSchedule;
-import com.bsth.data.schedule.f_a_l.FirstAndLastHandler;
-import com.bsth.entity.realcontrol.LineConfig;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.Collection;
-import java.util.Set;
-
-/**
- * 
- * @ClassName: ScheduleRefreshThread
- * @Description: TODO(班次刷新线程，用于在营运开始时间切换到当日排班)
- * @author PanZhao
- * @date 2016年8月17日 下午1:23:34
- *
- */
-@Component
-public class ScheduleRefreshThread extends Thread{
-
-	@Autowired
-	DayOfSchedule dayOfSchedule;
-
-	@Autowired
-	LineConfigData lineConfs;
-	
-	@Autowired
-	DayOfDirectives dayOfDirectives;
-	
-	@Autowired
-	PilotReport pilotReport;
-	
-	Logger logger = LoggerFactory.getLogger(ScheduleRefreshThread.class);
-	
-	@Override
-	public void run() {
-		try {
-			Collection<LineConfig> confs = lineConfs.getAll();
-			
-			String currSchDate, oldSchDate;
-			String lineCode = null;
-			for(LineConfig conf : confs){
-				try{
-					lineCode = conf.getLine().getLineCode();
-					oldSchDate = dayOfSchedule.getCurrSchDate().get(lineCode);
-					currSchDate = dayOfSchedule.calcSchDate(lineCode);
-
-					if(oldSchDate == null || !oldSchDate.equals(currSchDate)){
-
-						try{
-							Set<String> cars = dayOfSchedule.findCarByLineCode(lineCode);
-							for(String car : cars){
-								GpsCacheData.remove(car);
-								dayOfSchedule.resetRepairReport(car);
-							}
-							//清除驾驶员上报数据
-							pilotReport.clear(lineCode);
-							//清除指令数据 指令数据，直接定时全部清空
-							//dayOfDirectives.clear(lineCode);
-						}catch (Exception e){
-							logger.error("清理 60 和 80出现问题", e);
-						}
-
-						//重载排班数据
-						dayOfSchedule.reloadSch(lineCode, currSchDate, false);
-						logger.info(lineCode + "翻班完成， " + currSchDate + " -班次数量：" + dayOfSchedule.findByLineCode(lineCode).size());
-					}
-				}catch (Exception e){
-					logger.error("班次更新失败！！ -" + lineCode, e);
-				}
-			}
-
-			//按公司编码索引数据
-			dayOfSchedule.groupByGsbm();
-
-			//首末班入库（给网关用的数据）
-			FirstAndLastHandler.saveAll();
-		} catch (Exception e) {
-			logger.error("", e);
-		}
-	}
-}
+package com.bsth.data.schedule.thread;
+
+import com.bsth.data.LineConfigData;
+import com.bsth.data.directive.DayOfDirectives;
+import com.bsth.data.gpsdata_v2.cache.GpsCacheData;
+import com.bsth.data.pilot80.PilotReport;
+import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.data.schedule.f_a_l.FirstAndLastHandler;
+import com.bsth.entity.realcontrol.LineConfig;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Collection;
+import java.util.Set;
+
+/**
+ * 
+ * @ClassName: ScheduleRefreshThread
+ * @Description: TODO(班次刷新线程，用于在营运开始时间切换到当日排班)
+ * @author PanZhao
+ * @date 2016年8月17日 下午1:23:34
+ *
+ */
+@Component
+public class ScheduleRefreshThread extends Thread{
+
+	@Autowired
+	DayOfSchedule dayOfSchedule;
+
+	@Autowired
+	LineConfigData lineConfs;
+	
+	@Autowired
+	DayOfDirectives dayOfDirectives;
+	
+	@Autowired
+	PilotReport pilotReport;
+	
+	Logger logger = LoggerFactory.getLogger(ScheduleRefreshThread.class);
+	
+	@Override
+	public void run() {
+		logger.warn("班次刷新开始");
+		try {
+			Collection<LineConfig> confs = lineConfs.getAll();
+			
+			String currSchDate, oldSchDate;
+			String lineCode = null;
+			for(LineConfig conf : confs){
+				try{
+					lineCode = conf.getLine().getLineCode();
+					oldSchDate = dayOfSchedule.getCurrSchDate().get(lineCode);
+					currSchDate = dayOfSchedule.calcSchDate(lineCode);
+
+					if(oldSchDate == null || !oldSchDate.equals(currSchDate)){
+
+						try{
+							Set<String> cars = dayOfSchedule.findCarByLineCode(lineCode);
+							for(String car : cars){
+								GpsCacheData.remove(car);
+								dayOfSchedule.resetRepairReport(car);
+							}
+							//清除驾驶员上报数据
+							pilotReport.clear(lineCode);
+							//清除指令数据 指令数据，直接定时全部清空
+							//dayOfDirectives.clear(lineCode);
+						}catch (Exception e){
+							logger.error("清理 60 和 80出现问题", e);
+						}
+
+						//重载排班数据
+						dayOfSchedule.reloadSch(lineCode, currSchDate, false);
+						logger.info(lineCode + "翻班完成， " + currSchDate + " -班次数量：" + dayOfSchedule.findByLineCode(lineCode).size());
+					}
+				}catch (Exception e){
+					logger.error("班次更新失败！！ -" + lineCode, e);
+				}
+			}
+
+			//按公司编码索引数据
+			dayOfSchedule.groupByGsbm();
+
+			//首末班入库（给网关用的数据）
+			FirstAndLastHandler.saveAll();
+		} catch (Exception e) {
+			logger.error("", e);
+		}
+		logger.warn("班次刷新结束");
+	}
+}
@@ -12,8 +12,8 @@ import com.bsth.service.geo_data.impl.dto.CascadeSaveRoad;
 import com.bsth.service.geo_data.impl.dto.CascadeSaveStation;
 import com.bsth.service.geo_data.impl.dto.SaveRoadRouteDTO;
 import com.bsth.service.geo_data.impl.dto.SaveStationRouteDTO;
-import com.bsth.util.GetUIDAndCode;
 import com.bsth.util.TransGPS;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.base.Splitter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -21,11 +21,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.BatchPreparedStatementSetter;
 import org.springframework.jdbc.core.BeanPropertyRowMapper;
 import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.datasource.DataSourceTransactionManager;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.TransactionDefinition;
 import org.springframework.transaction.TransactionStatus;
-import org.springframework.transaction.support.DefaultTransactionDefinition;
+import org.springframework.transaction.support.TransactionCallback;
+import org.springframework.transaction.support.TransactionTemplate;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
@@ -47,6 +46,12 @@ public class GeoDataServiceImpl implements GeoDataService {
     @Autowired
     StationRepository stationRepository;
+    @Autowired
+    private TransactionTemplate transactionTemplate;
+
+    @Autowired
+    private ObjectMapper mapper;
+
     Logger logger = LoggerFactory.getLogger(this.getClass());
     @Override
@@ -172,141 +177,138 @@ public class GeoDataServiceImpl implements GeoDataService {
     public Map<String, Object> updateStationName(Map<String, Object> map) {
         Map<String, Object> rs = new HashMap<>();
-        //编程式事务
-        DataSourceTransactionManager tran = new DataSourceTransactionManager(jdbcTemplate.getDataSource());
-        DefaultTransactionDefinition def = new DefaultTransactionDefinition();
-        def.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRED);
-        TransactionStatus status = tran.getTransaction(def);
-        try {
-
-            int id = Integer.parseInt(map.get("id").toString());
-            String name = map.get("stationName").toString();
-            String code = map.get("stationCode").toString();
-            String lineCode = map.get("lineCode").toString();
-            String versions = map.get("versions").toString();
-
-            //更新历史站点路由
-            jdbcTemplate.update("update bsth_c_ls_stationroute set station_name=? where id=?", name, id);
-            //更新站点
-            jdbcTemplate.update("update bsth_c_station set station_name=? where station_cod=?", name, code);
-
-            //写一条走向变更记录
-            jdbcTemplate.update("insert into logger_route_synchro(t, line_code, version) values(?, ?, ?)", System.currentTimeMillis(), lineCode, versions);
-
-            tran.commit(status);
-
-            rs.put("station", findOne(id));
-            rs.put("status", ResponseCode.SUCCESS);
-        } catch (Exception e) {
-            tran.rollback(status);
-            logger.error("", e);
-            rs.put("status", ResponseCode.ERROR);
-            rs.put("msg", "服务器出现异常");
-        }
-        return rs;
+        return transactionTemplate.execute(new TransactionCallback<Map<String, Object>>() {
+            @Override
+            public Map<String, Object> doInTransaction(TransactionStatus status) {
+                try {
+
+                    int id = Integer.parseInt(map.get("id").toString());
+                    String name = map.get("stationName").toString();
+                    String code = map.get("stationCode").toString();
+                    String lineCode = map.get("lineCode").toString();
+                    String versions = map.get("versions").toString();
+
+                    //更新历史站点路由
+                    jdbcTemplate.update("update bsth_c_ls_stationroute set station_name=? where id=?", name, id);
+                    //更新站点
+                    jdbcTemplate.update("update bsth_c_station set station_name=? where station_cod=?", name, code);
+
+                    //写一条走向变更记录
+                    jdbcTemplate.update("insert into logger_route_synchro(t, line_code, version) values(?, ?, ?)", System.currentTimeMillis(), lineCode, versions);
+
+                    rs.put("station", findOne(id));
+                    rs.put("status", ResponseCode.SUCCESS);
+                } catch (Exception e) {
+                    status.setRollbackOnly();
+                    logger.error("", e);
+                    rs.put("status", ResponseCode.ERROR);
+                    rs.put("msg", "服务器出现异常");
+                }
+                return rs;
+            }
+        });
     }
     @Override
     public Map<String, Object> addNewRoadRoute(String lineCode, int upDown, int versions, String sectionName, String crosesRoad, String coords, int prevRouteId) {
         Map<String, Object> rs = new HashMap<>();
-        //编程式事务
-        DataSourceTransactionManager tran = new DataSourceTransactionManager(jdbcTemplate.getDataSource());
-        DefaultTransactionDefinition def = new DefaultTransactionDefinition();
-        def.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRED);
-        TransactionStatus status = tran.getTransaction(def);
-        try {
-            //根据线路编码，查询线路ID
-            int lineId = jdbcTemplate.queryForObject("select id from bsth_c_line where line_code=" + lineCode, Integer.class);
-
-            String sql = "select * from bsth_c_ls_sectionroute where line_code='" + lineCode + "' and line=" + lineId + " and directions=" + upDown + " and destroy=0 and versions=" + versions;
-            List<SaveRoadRouteDTO> routes = jdbcTemplate.query(sql, BeanPropertyRowMapper.newInstance(SaveRoadRouteDTO.class));
-
-            Collections.sort(routes, new RoadRouteComp());
-
-            long sCode = sectionRepository.sectionMaxId() + 1;
-            //转wgs
-            String wgsCoord = "LINESTRING(" + bdPolygon2Wgs(coords) + ")";
-            String bdCooed = "LINESTRING(" + coords + ")";
-            //insert 路段
-            sql = "insert into bsth_c_section(id, section_code, section_name, croses_road, bsection_vector, gsection_vector, create_date, update_date, versions) " +
-                    " values(?,?,?,?,ST_GeomFromText('" + bdCooed + "'),ST_GeomFromText('" + wgsCoord + "'),sysdate(),sysdate(),?)";
-
-            jdbcTemplate.update(sql, sCode, sCode, sectionName, crosesRoad, 1);
-
+        return transactionTemplate.execute(new TransactionCallback<Map<String, Object>>() {
-            SaveRoadRouteDTO srr;
-            int currentNo = -1,
-                    no = 100, step = 100;
-
-            if (prevRouteId == -1) {
-                //起点站
-                currentNo = no;
-                no += step;
-            }
-            //重新排序路由
-            for (int i = 0, size = routes.size(); i < size; i++) {
-                srr = routes.get(i);
-                srr.setSectionrouteCode(no += step);
-                if (srr.getId().intValue() == prevRouteId) {
-                    no += step;
-                    currentNo = no;
+            @Override
+            public Map<String, Object> doInTransaction(TransactionStatus status) {
+                try {
+                    //根据线路编码，查询线路ID
+                    int lineId = jdbcTemplate.queryForObject("select id from bsth_c_line where line_code=" + lineCode, Integer.class);
+
+                    String sql = "select * from bsth_c_ls_sectionroute where line_code='" + lineCode + "' and line=" + lineId + " and directions=" + upDown + " and destroy=0 and versions=" + versions;
+                    List<SaveRoadRouteDTO> routes = jdbcTemplate.query(sql, BeanPropertyRowMapper.newInstance(SaveRoadRouteDTO.class));
+
+                    Collections.sort(routes, new RoadRouteComp());
+
+                    long sCode = sectionRepository.sectionMaxId() + 1;
+                    //转wgs
+                    String wgsCoord = "LINESTRING(" + bdPolygon2Wgs(coords) + ")";
+                    String bdCooed = "LINESTRING(" + coords + ")";
+                    //insert 路段
+                    sql = "insert into bsth_c_section(id, section_code, section_name, croses_road, bsection_vector, gsection_vector, create_date, update_date, versions) " +
+                            " values(?,?,?,?,ST_GeomFromText('" + bdCooed + "'),ST_GeomFromText('" + wgsCoord + "'),sysdate(),sysdate(),?)";
+
+                    jdbcTemplate.update(sql, sCode, sCode, sectionName, crosesRoad, 1);
+
+
+                    SaveRoadRouteDTO srr;
+                    int currentNo = -1,
+                            no = 100, step = 100;
+
+                    if (prevRouteId == -1) {
+                        //起点站
+                        currentNo = no;
+                        no += step;
+                    }
+                    //重新排序路由
+                    for (int i = 0, size = routes.size(); i < size; i++) {
+                        srr = routes.get(i);
+                        srr.setSectionrouteCode(no += step);
+                        if (srr.getId().intValue() == prevRouteId) {
+                            no += step;
+                            currentNo = no;
+                        }
+                    }
+
+                    srr = new SaveRoadRouteDTO();
+                    srr.setLine(lineId);
+                    srr.setLineCode(lineCode);
+                    srr.setDirections(upDown);
+                    srr.setVersions(versions);
+
+                    srr.setSectionrouteCode(currentNo);
+                    srr.setSection(sCode);
+                    srr.setSectionCode(sCode + "");
+                    srr.setIsRoadeSpeed(0);
+                    srr.setDestroy(0);
+                    Date d = new Date();
+                    srr.setCreateDate(d);
+                    srr.setUpdateDate(d);
+
+                    final List<SaveRoadRouteDTO> saveList = routes;
+                    //insert 新路由 （ID自增）
+                    jdbcTemplate.update("insert into bsth_c_ls_sectionroute(line_code, section_code, sectionroute_code, directions, line, section, create_date,update_date,versions,destroy,is_roade_speed)" +
+                            " values(?,?,?,?,?,?,?,?,?,?,?)", srr.getLineCode(), srr.getSectionCode(), srr.getSectionrouteCode(), srr.getDirections(), srr.getLine(), srr.getSection(), srr.getCreateDate(), srr.getUpdateDate(), versions, srr.getDestroy(), srr.getIsRoadeSpeed());
+
+                    // update 原路由
+                    jdbcTemplate.batchUpdate("update bsth_c_ls_sectionroute set sectionroute_code=? where id=?"
+                            , new BatchPreparedStatementSetter() {
+                                @Override
+                                public void setValues(PreparedStatement ps, int i) throws SQLException {
+                                    SaveRoadRouteDTO srr = saveList.get(i);
+                                    ps.setInt(1, srr.getSectionrouteCode());
+                                    ps.setInt(2, srr.getId());
+                                }
+
+                                @Override
+                                public int getBatchSize() {
+                                    return saveList.size();
+                                }
+                            });
+
+
+                    //写一条走向变更记录
+                    jdbcTemplate.update("insert into logger_route_synchro(t, line_code, version) values(?, ?, ?)", System.currentTimeMillis(), lineCode, versions);
+
+                    //返回更新之后的数据
+                    List<GeoRoad> list = findRoadByUpdown(lineCode, upDown, versions);
+                    rs.put("list", list);
+                    rs.put("status", ResponseCode.SUCCESS);
+                } catch (Exception e) {
+                    status.setRollbackOnly();
+                    logger.error("", e);
+                    rs.put("status", ResponseCode.ERROR);
+                    rs.put("msg", "服务器出现异常");
                 }
+                return rs;
             }
-
-            srr = new SaveRoadRouteDTO();
-            srr.setLine(lineId);
-            srr.setLineCode(lineCode);
-            srr.setDirections(upDown);
-            srr.setVersions(versions);
-
-            srr.setSectionrouteCode(currentNo);
-            srr.setSection(sCode);
-            srr.setSectionCode(sCode + "");
-            srr.setIsRoadeSpeed(0);
-            srr.setDestroy(0);
-            Date d = new Date();
-            srr.setCreateDate(d);
-            srr.setUpdateDate(d);
-
-            final List<SaveRoadRouteDTO> saveList = routes;
-            //insert 新路由 （ID自增）
-            jdbcTemplate.update("insert into bsth_c_ls_sectionroute(line_code, section_code, sectionroute_code, directions, line, section, create_date,update_date,versions,destroy,is_roade_speed)" +
-                    " values(?,?,?,?,?,?,?,?,?,?,?)", srr.getLineCode(), srr.getSectionCode(), srr.getSectionrouteCode(), srr.getDirections(), srr.getLine(), srr.getSection(), srr.getCreateDate(), srr.getUpdateDate(), versions, srr.getDestroy(), srr.getIsRoadeSpeed());
-
-            // update 原路由
-            jdbcTemplate.batchUpdate("update bsth_c_ls_sectionroute set sectionroute_code=? where id=?"
-                    , new BatchPreparedStatementSetter() {
-                        @Override
-                        public void setValues(PreparedStatement ps, int i) throws SQLException {
-                            SaveRoadRouteDTO srr = saveList.get(i);
-                            ps.setInt(1, srr.getSectionrouteCode());
-                            ps.setInt(2, srr.getId());
-                        }
-
-                        @Override
-                        public int getBatchSize() {
-                            return saveList.size();
-                        }
-                    });
-
-
-            //写一条走向变更记录
-            jdbcTemplate.update("insert into logger_route_synchro(t, line_code, version) values(?, ?, ?)", System.currentTimeMillis(), lineCode, versions);
-
-            tran.commit(status);
-
-            //返回更新之后的数据
-            List<GeoRoad> list = findRoadByUpdown(lineCode, upDown, versions);
-            rs.put("list", list);
-            rs.put("status", ResponseCode.SUCCESS);
-        } catch (Exception e) {
-            tran.rollback(status);
-            logger.error("", e);
-            rs.put("status", ResponseCode.ERROR);
-            rs.put("msg", "服务器出现异常");
-        }
-        return rs;
+        });
     }
     /**
@@ -339,99 +341,100 @@ public class GeoDataServiceImpl implements GeoDataService {
     public Map<String, Object> addNewLineVersion(Map<String, Object> map) {
         Map<String, Object> rs = new HashMap<>();
-        //编程式事务
-        DataSourceTransactionManager tran = new DataSourceTransactionManager(jdbcTemplate.getDataSource());
-        DefaultTransactionDefinition def = new DefaultTransactionDefinition();
-        def.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRED);
-        TransactionStatus status = tran.getTransaction(def);
-        try {
-
-            String lineCode = map.get("lineCode").toString();
-            String remark = map.get("remark").toString();
-            String name = map.get("name").toString();
-            Date startDate = new SimpleDateFormat("yyyy-MM-dd HH:mm").parse(map.get("startDate").toString());
-            int extendsVersion = Integer.parseInt(map.get("extendsVersion").toString());
+        return transactionTemplate.execute(new TransactionCallback<Map<String, Object>>() {
-            if(startDate.getTime() - System.currentTimeMillis() < 1000 * 60 * 3){
-                rs.put("status", ResponseCode.ERROR);
-                rs.put("msg", "启用时间最少需要晚于当前服务器时间3分钟！");
-                return rs;
-            }
-
-            int nameCount = jdbcTemplate.queryForObject("select count(*) from bsth_c_line_versions where line_code=" + lineCode + " and name='"+name+"'", Integer.class);
-            if(nameCount > 0){
-                rs.put("status", ResponseCode.ERROR);
-                rs.put("msg", "你不能使用一个已经存在的版本名称！！");
-                return rs;
-            }
-
-            //当前最大的版本号
-            int maxVersion = jdbcTemplate.queryForObject("select max(versions) as versions from bsth_c_line_versions where line_code=" + lineCode, Integer.class);
-            Date d = new Date();
-
-            //根据线路编码，查询线路ID
-            int lineId = jdbcTemplate.queryForObject("select id from bsth_c_line where line_code=" + lineCode, Integer.class);
-
-            maxVersion += 1;
-            LineVersions lVersion = new LineVersions();
-            lVersion.setName(name);
-            lVersion.setVersions(maxVersion);
-            lVersion.setRemark(remark);
-            lVersion.setStartDate(startDate);
-            lVersion.setStatus(2);
-            lVersion.setCreateDate(d);
-            lVersion.setUpdateDate(d);
-            lVersion.setLineCode(lineCode);
-
-            //如果有待启用的版本，设置为历史版本
-            jdbcTemplate.update("update bsth_c_line_versions set `status`=2, start_date=null,end_date=null where line_code='"+lineCode+"' and `status`=0");
-
-            //入库线路版本
-            jdbcTemplate.update("insert into bsth_c_line_versions(name, line, line_code, versions, start_date, create_date, update_date, remark,status, isupdate) " +
-                            " values(?,?,?,?,?,?,?,?,?,?)", lVersion.getName(), lineId, lVersion.getLineCode()
-                    , lVersion.getVersions(), lVersion.getStartDate(), lVersion.getCreateDate(), lVersion.getUpdateDate(), lVersion.getRemark(), lVersion.getStatus(), lVersion.getIsupdate());
-
-            if (extendsVersion != -1) {
-                //复制站点信息
-                String sql = "SELECT t1.id AS route_id,t1.line,t1.directions,t1.station,t1.station_name,t1.station_route_code,t1.line_code,t1.station_code,t1.station_mark,t1.distances,t1.to_time,t2.id AS station_id,t2.db_type,t2.b_jwpoints,t2.g_lonx,t2.g_laty,t2.radius,ST_AsText(t2.g_polygon_grid) as g_polygon_grid,t2.shapes_type FROM bsth_c_ls_stationroute t1 LEFT JOIN bsth_c_station t2 ON t1.station_code = t2.station_cod where t1.destroy=0 and t1.line_code='" + lineCode + "' and t1.versions="+extendsVersion+" order by t1.directions, t1.station_route_code";
-                List<CascadeSaveStation> cssList = jdbcTemplate.query(sql, BeanPropertyRowMapper.newInstance(CascadeSaveStation.class));
-
-                //新的站点编码
-                long sCode;
-                for (CascadeSaveStation ss : cssList) {
-                    sCode = stationRepository.stationMaxId() + 1;
-                    ss.setRouteId(null);
-                    ss.setStationCode(sCode + "");
-                    ss.setStation((int) sCode);
-                }
-                //入库新版本的站点 和 路由
-                batchInsertStation(cssList, maxVersion);
-
-                //复制路段信息
-                sql = "SELECT t1.id AS route_id,t1.line,t1.line_code,t1.directions,t1.section,t1.section_code,t1.sectionroute_code,t1.versions,t2.section_name,t2.croses_road,ST_AsText(t2.gsection_vector) as gsection_vector,t2.db_type,t2.speed_limit FROM bsth_c_ls_sectionroute t1 LEFT JOIN bsth_c_section t2 ON t1.section_code = t2.section_code WHERE t1.destroy = 0 AND t1.line_code = '"+lineCode+"' and t1.versions="+ extendsVersion +" ORDER BY t1.directions,t1.sectionroute_code";
-                List<CascadeSaveRoad> csrList = jdbcTemplate.query(sql, BeanPropertyRowMapper.newInstance(CascadeSaveRoad.class));
-                //新的路段编码
-                long cCode;
-                for(CascadeSaveRoad csr : csrList){
-                    cCode = sectionRepository.sectionMaxId() + 1;
-                    csr.setRouteId(null);
-                    csr.setSection((int) cCode);
-                    csr.setSectionCode(cCode + "");
+            @Override
+            public Map<String, Object> doInTransaction(TransactionStatus status) {
+                try {
+
+                    String lineCode = map.get("lineCode").toString();
+                    String remark = map.get("remark").toString();
+                    String name = map.get("name").toString();
+                    Date startDate = new SimpleDateFormat("yyyy-MM-dd HH:mm").parse(map.get("startDate").toString());
+                    int extendsVersion = Integer.parseInt(map.get("extendsVersion").toString());
+
+                    if(startDate.getTime() - System.currentTimeMillis() < 1000 * 60 * 3){
+                        rs.put("status", ResponseCode.ERROR);
+                        rs.put("msg", "启用时间最少需要晚于当前服务器时间3分钟！");
+                        return rs;
+                    }
+
+                    int nameCount = jdbcTemplate.queryForObject("select count(*) from bsth_c_line_versions where line_code=" + lineCode + " and name='"+name+"'", Integer.class);
+                    if(nameCount > 0){
+                        rs.put("status", ResponseCode.ERROR);
+                        rs.put("msg", "你不能使用一个已经存在的版本名称！！");
+                        return rs;
+                    }
+
+                    //当前最大的版本号
+                    int maxVersion = jdbcTemplate.queryForObject("select max(versions) as versions from bsth_c_line_versions where line_code=" + lineCode, Integer.class);
+                    Date d = new Date();
+
+                    //根据线路编码，查询线路ID
+                    int lineId = jdbcTemplate.queryForObject("select id from bsth_c_line where line_code=" + lineCode, Integer.class);
+
+                    maxVersion += 1;
+                    LineVersions lVersion = new LineVersions();
+                    lVersion.setName(name);
+                    lVersion.setVersions(maxVersion);
+                    lVersion.setRemark(remark);
+                    lVersion.setStartDate(startDate);
+                    lVersion.setStatus(2);
+                    lVersion.setCreateDate(d);
+                    lVersion.setUpdateDate(d);
+                    lVersion.setLineCode(lineCode);
+
+                    //如果有待启用的版本，设置为历史版本
+                    jdbcTemplate.update("update bsth_c_line_versions set `status`=2, start_date=null,end_date=null where line_code='"+lineCode+"' and `status`=0");
+
+                    //入库线路版本
+                    jdbcTemplate.update("insert into bsth_c_line_versions(name, line, line_code, versions, start_date, create_date, update_date, remark,status, isupdate) " +
+                                    " values(?,?,?,?,?,?,?,?,?,?)", lVersion.getName(), lineId, lVersion.getLineCode()
+                            , lVersion.getVersions(), lVersion.getStartDate(), lVersion.getCreateDate(), lVersion.getUpdateDate(), lVersion.getRemark(), lVersion.getStatus(), lVersion.getIsupdate());
+
+                    if (extendsVersion != -1) {
+                        //复制站点信息
+                        String sql = "SELECT t1.id AS route_id,t1.line,t1.directions,t1.station,t1.station_name,t1.station_route_code,t1.line_code,t1.station_code,t1.station_mark,t1.distances,t1.to_time,t2.id AS station_id,t2.db_type,t2.b_jwpoints,t2.g_lonx,t2.g_laty,t2.radius,ST_AsText(t2.g_polygon_grid) as g_polygon_grid,t2.shapes_type FROM bsth_c_ls_stationroute t1 LEFT JOIN bsth_c_station t2 ON t1.station_code = t2.station_cod where t1.destroy=0 and t1.line_code='" + lineCode + "' and t1.versions="+extendsVersion+" order by t1.directions, t1.station_route_code";
+                        List<CascadeSaveStation> cssList = jdbcTemplate.query(sql, BeanPropertyRowMapper.newInstance(CascadeSaveStation.class));
+
+                        //新的站点编码
+                        long sCode;
+                        for (CascadeSaveStation ss : cssList) {
+                            sCode = stationRepository.stationMaxId() + 1;
+                            ss.setRouteId(null);
+                            ss.setStationCode(sCode + "");
+                            ss.setStation((int) sCode);
+                        }
+                        //入库新版本的站点 和 路由
+                        batchInsertStation(cssList, maxVersion);
+
+                        //复制路段信息
+                        sql = "SELECT t1.id AS route_id,t1.line,t1.line_code,t1.directions,t1.section,t1.section_code,t1.sectionroute_code,t1.versions,t2.section_name,t2.croses_road,ST_AsText(t2.gsection_vector) as gsection_vector,t2.db_type,t2.speed_limit FROM bsth_c_ls_sectionroute t1 LEFT JOIN bsth_c_section t2 ON t1.section_code = t2.section_code WHERE t1.destroy = 0 AND t1.line_code = '"+lineCode+"' and t1.versions="+ extendsVersion +" ORDER BY t1.directions,t1.sectionroute_code";
+                        List<CascadeSaveRoad> csrList = jdbcTemplate.query(sql, BeanPropertyRowMapper.newInstance(CascadeSaveRoad.class));
+                        //新的路段编码
+                        long cCode;
+                        for(CascadeSaveRoad csr : csrList){
+                            cCode = sectionRepository.sectionMaxId() + 1;
+                            csr.setRouteId(null);
+                            csr.setSection((int) cCode);
+                            csr.setSectionCode(cCode + "");
+                        }
+                        //入库新版本的路段 和 路段路由
+                        batchInsertRoad(csrList, maxVersion);
+                    }
+
+                    rs.put("newVersion", maxVersion);
+                    rs.put("status", ResponseCode.SUCCESS);
+                } catch (Exception e) {
+                    status.setRollbackOnly();
+                    logger.error("", e);
+                    rs.put("status", ResponseCode.ERROR);
+                    rs.put("msg", "服务器出现异常");
                 }
-                //入库新版本的路段 和 路段路由
-                batchInsertRoad(csrList, maxVersion);
+                return rs;
             }
+        });
-            tran.commit(status);
-            rs.put("newVersion", maxVersion);
-            rs.put("status", ResponseCode.SUCCESS);
-        } catch (Exception e) {
-            tran.rollback(status);
-            logger.error("", e);
-            rs.put("status", ResponseCode.ERROR);
-            rs.put("msg", "服务器出现异常");
-        }
-        return rs;
     }
     /**
@@ -444,19 +447,17 @@ public class GeoDataServiceImpl implements GeoDataService {
     public Map<String, Object> deleteLineVersion(String lineCode, int version) {
         Map<String, Object> rs = new HashMap<>();
-        //编程式事务
-        DataSourceTransactionManager tran = new DataSourceTransactionManager(jdbcTemplate.getDataSource());
-        DefaultTransactionDefinition def = new DefaultTransactionDefinition();
-        def.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRED);
-        TransactionStatus status = tran.getTransaction(def);
-        try{
-            int enableVersion = jdbcTemplate.queryForObject("select versions from bsth_c_line_versions where line_code='"+lineCode+"' and `status`=1", Integer.class);
-
-            if(enableVersion==version){
-                rs.put("status", ResponseCode.ERROR);
-                rs.put("msg", "你不能删除当前正在启用的走向版本！");
-                return rs;
-            }
+        return transactionTemplate.execute(new TransactionCallback<Map<String, Object>>() {
+            @Override
+            public Map<String, Object> doInTransaction(TransactionStatus status) {
+                try{
+                    int enableVersion = jdbcTemplate.queryForObject("select versions from bsth_c_line_versions where line_code='"+lineCode+"' and `status`=1", Integer.class);
+
+                    if(enableVersion==version){
+                        rs.put("status", ResponseCode.ERROR);
+                        rs.put("msg", "你不能删除当前正在启用的走向版本！");
+                        return rs;
+                    }
             /*int versionCount = jdbcTemplate.queryForObject("select count(*) from bsth_c_line_versions where line_code='"+lineCode+"'", Integer.class);
             if(versionCount == 1){
                 rs.put("status", ResponseCode.ERROR);
@@ -472,27 +473,29 @@ public class GeoDataServiceImpl implements GeoDataService {
             List<Integer> stationRemoves = jdbcTemplate.queryForList(sql, Integer.class);*/
-            //删除站点路由
-            String sql = "delete from bsth_c_ls_stationroute where line_code='"+lineCode+"' and versions=" + version;
-            jdbcTemplate.update(sql);
+                    //删除站点路由
+                    String sql = "delete from bsth_c_ls_stationroute where line_code='"+lineCode+"' and versions=" + version;
+                    jdbcTemplate.update(sql);
-            //删除路段路由
-            sql = "delete from bsth_c_ls_sectionroute where line_code='"+lineCode+"' and versions=" + version;
-            jdbcTemplate.update(sql);
+                    //删除路段路由
+                    sql = "delete from bsth_c_ls_sectionroute where line_code='"+lineCode+"' and versions=" + version;
+                    jdbcTemplate.update(sql);
-            //删除版本信息
-            sql = "delete from bsth_c_line_versions where line_code='"+lineCode+"' and versions=" + version;
-            jdbcTemplate.update(sql);
+                    //删除版本信息
+                    sql = "delete from bsth_c_line_versions where line_code='"+lineCode+"' and versions=" + version;
+                    jdbcTemplate.update(sql);
+
+                    rs.put("status", ResponseCode.SUCCESS);
+                }catch (Exception e){
+                    status.setRollbackOnly();
+                    logger.error("", e);
+                    rs.put("status", ResponseCode.ERROR);
+                    rs.put("msg", "服务器出现异常");
+                }
+                return rs;
+            }
+        });
-            tran.commit(status);
-            rs.put("status", ResponseCode.SUCCESS);
-        }catch (Exception e){
-            tran.rollback(status);
-            logger.error("", e);
-            rs.put("status", ResponseCode.ERROR);
-            rs.put("msg", "服务器出现异常");
-        }
-        return rs;
     }
     /**
@@ -541,7 +544,7 @@ public class GeoDataServiceImpl implements GeoDataService {
     /**
      * 批量入库路段
-     * @param cssList
+     * @param csrList
      * @param version
      */
     private void batchInsertRoad(final List<CascadeSaveRoad> csrList, final int version){
@@ -659,145 +662,144 @@ public class GeoDataServiceImpl implements GeoDataService {
     public Map<String, Object> addNewStationRoute(String lineCode, int upDown, int versions, String stationName, Float lat, Float lng, int prevRouteId) {
         Map<String, Object> rs = new HashMap<>();
-        //编程式事务
-        DataSourceTransactionManager tran = new DataSourceTransactionManager(jdbcTemplate.getDataSource());
-        DefaultTransactionDefinition def = new DefaultTransactionDefinition();
-        def.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRED);
-        TransactionStatus status = tran.getTransaction(def);
-        try {
-            //根据线路编码，查询线路ID
-            int lineId = jdbcTemplate.queryForObject("select id from bsth_c_line where line_code=" + lineCode, Integer.class);
+        return transactionTemplate.execute(new TransactionCallback<Map<String, Object>>() {
+            @Override
+            public Map<String, Object> doInTransaction(TransactionStatus status) {
+                try {
+                    //根据线路编码，查询线路ID
+                    int lineId = jdbcTemplate.queryForObject("select id from bsth_c_line where line_code=" + lineCode, Integer.class);
-            String sql = "select * from bsth_c_ls_stationroute where line_code='" + lineCode + "' and line=" + lineId + " and directions=" + upDown + " and destroy=0 and versions=" + versions;
-            List<SaveStationRouteDTO> routes = jdbcTemplate.query(sql, BeanPropertyRowMapper.newInstance(SaveStationRouteDTO.class));
+                    String sql = "select * from bsth_c_ls_stationroute where line_code='" + lineCode + "' and line=" + lineId + " and directions=" + upDown + " and destroy=0 and versions=" + versions;
+                    List<SaveStationRouteDTO> routes = jdbcTemplate.query(sql, BeanPropertyRowMapper.newInstance(SaveStationRouteDTO.class));
-            for (SaveStationRouteDTO s : routes) {
-                if (s.getStationName().equals(stationName)) {
+                    for (SaveStationRouteDTO s : routes) {
+                        if (s.getStationName().equals(stationName)) {
+                            rs.put("status", ResponseCode.ERROR);
+                            rs.put("msg", "重复的站点路由名称！");
+                            return rs;
+                        }
+                    }
+                    //按路由顺序排列
+                    Collections.sort(routes, new StationRouteComp());
+
+                    //转WGS
+                    TransGPS.Location wgsLoc = TransGPS.transformFromGCJToWGS(TransGPS.bd_decrypt(TransGPS.LocationMake(Double.parseDouble(String.valueOf(lng)), Double.parseDouble(String.valueOf(lat)))));
+
+                    //insert 站点
+                    long sCode = stationRepository.stationMaxId() + 1;
+                    jdbcTemplate.update("insert into bsth_c_station(id, station_cod, station_name, db_type, b_jwpoints, g_lonx, g_laty, destroy, radius, shapes_type, versions) " +
+                            " values(?,?,?,?,?,?,?,?,?,?,?)", sCode, sCode, stationName, "b", lng + " " + lat, wgsLoc.getLng(), wgsLoc.getLat(), 0, 88, "r", 1);
+
+
+                    SaveStationRouteDTO sr;
+                    int currentNo = -1,
+                            no = 100, step = 100;
+
+                    if (prevRouteId == -1) {
+                        //起点站
+                        currentNo = no;
+                        no += step;
+                    }
+                    //重新排序路由
+                    for (int i = 0, size = routes.size(); i < size; i++) {
+                        sr = routes.get(i);
+                        sr.setStationRouteCode(no);
+                        no += step;
+                        if (sr.getId().intValue() == prevRouteId) {
+                            currentNo = no;
+                            no += step;
+                        }
+                    }
+
+                    SaveStationRouteDTO nsr = new SaveStationRouteDTO();
+                    nsr.setLine(lineId);
+                    nsr.setLineCode(lineCode);
+                    nsr.setDirections(upDown);
+                    nsr.setVersions(versions);
+                    nsr.setStationRouteCode(currentNo);
+                    nsr.setStation(sCode);
+                    nsr.setStationCode(sCode + "");
+                    nsr.setStationName(stationName);
+                    nsr.setDistances(0d);
+                    nsr.setToTime(0d);
+                    Date d = new Date();
+                    nsr.setCreateDate(d);
+                    nsr.setUpdateDate(d);
+                    nsr.setDestroy(0);
+                    if (prevRouteId == -1)
+                        nsr.setStationMark("B");
+                    else if(routes.size()==1)
+                        nsr.setStationMark("E");
+
+                    //routes.add(sr);
+
+                    //重新标记mark
+                    Collections.sort(routes, new StationRouteComp());
+                    for (int i = 0, size = routes.size(); i < size; i++) {
+                        routes.get(i).setStationMark("Z");
+                    }
+                    if(routes.size() > 0 && prevRouteId!=-1)
+                        routes.get(0).setStationMark("B");
+                    if(routes.size() > 1)
+                        routes.get(routes.size() - 1).setStationMark("E");
+
+                    final List<SaveStationRouteDTO> saveList = routes;
+                    //insert 新路由 （ID自增）
+                    jdbcTemplate.update("insert into bsth_c_ls_stationroute(line, station, station_name, station_route_code, line_code, station_code, station_mark, distances, to_time, destroy, versions, create_date, update_date,directions) values(?,?,?,?,?,?,?,?,?,?,?,?,?,?)"
+                            , nsr.getLine(), nsr.getStation(), nsr.getStationName(), nsr.getStationRouteCode(), nsr.getLineCode(), nsr.getStationCode(), nsr.getStationMark()
+                            , nsr.getDistances(), nsr.getToTime(), nsr.getDestroy(), nsr.getVersions(), nsr.getCreateDate(), nsr.getUpdateDate(), nsr.getDirections());
+
+                    // update 原路由
+                    jdbcTemplate.batchUpdate("update bsth_c_ls_stationroute set line=?,station=?,station_name=?,station_route_code=?," +
+                                    "line_code=?,station_code=?,station_mark=?,distances=?,to_time=?,destroy=?,versions=?,create_date=?,update_date=?,directions=?" +
+                                    " where id=?"
+                            , new BatchPreparedStatementSetter() {
+                                @Override
+                                public void setValues(PreparedStatement ps, int i) throws SQLException {
+                                    SaveStationRouteDTO sr = saveList.get(i);
+                                    ps.setInt(1, sr.getLine());
+                                    ps.setLong(2, sr.getStation());
+                                    ps.setString(3, sr.getStationName());
+                                    ps.setInt(4, sr.getStationRouteCode());
+                                    ps.setString(5, sr.getLineCode());
+                                    ps.setString(6, sr.getStationCode());
+                                    ps.setString(7, sr.getStationMark());
+                                    ps.setDouble(8, sr.getDistances());
+                                    ps.setDouble(9, sr.getToTime());
+                                    ps.setInt(10, sr.getDestroy());
+                                    ps.setInt(11, sr.getVersions());
+                                    ps.setTimestamp(12, new java.sql.Timestamp(sr.getCreateDate().getTime()));
+                                    ps.setTimestamp(13, new java.sql.Timestamp(sr.getUpdateDate().getTime()));
+                                    ps.setInt(14, sr.getDirections());
+                                    ps.setInt(15, sr.getId());
+                                }
+
+                                @Override
+                                public int getBatchSize() {
+                                    return saveList.size();
+                                }
+                            });
+
+                    //写一条走向变更记录
+                    jdbcTemplate.update("insert into logger_route_synchro(t, line_code, version) values(?, ?, ?)", System.currentTimeMillis(), lineCode, versions);
+
+                    //返回更新之后的数据
+                    List<GeoStation> list = findByUpdown(lineCode, upDown, versions);
+
+                    rs.put("list", list);
+                    rs.put("newStationRouteCode", currentNo);
+                    rs.put("status", ResponseCode.SUCCESS);
+                } catch (Exception e) {
+                    status.setRollbackOnly();
+                    logger.error("", e);
                     rs.put("status", ResponseCode.ERROR);
-                    rs.put("msg", "重复的站点路由名称！");
-                    return rs;
+                    rs.put("msg", "服务器出现异常");
                 }
+                return rs;
             }
-            //按路由顺序排列
-            Collections.sort(routes, new StationRouteComp());
-
-            //转WGS
-            TransGPS.Location wgsLoc = TransGPS.transformFromGCJToWGS(TransGPS.bd_decrypt(TransGPS.LocationMake(Double.parseDouble(String.valueOf(lng)), Double.parseDouble(String.valueOf(lat)))));
-
-            //insert 站点
-            long sCode = stationRepository.stationMaxId() + 1;
-            jdbcTemplate.update("insert into bsth_c_station(id, station_cod, station_name, db_type, b_jwpoints, g_lonx, g_laty, destroy, radius, shapes_type, versions) " +
-                    " values(?,?,?,?,?,?,?,?,?,?,?)", sCode, sCode, stationName, "b", lng + " " + lat, wgsLoc.getLng(), wgsLoc.getLat(), 0, 88, "r", 1);
-
-
-            SaveStationRouteDTO sr;
-            int currentNo = -1,
-                    no = 100, step = 100;
-
-            if (prevRouteId == -1) {
-                //起点站
-                currentNo = no;
-                no += step;
-            }
-            //重新排序路由
-            for (int i = 0, size = routes.size(); i < size; i++) {
-                sr = routes.get(i);
-                sr.setStationRouteCode(no);
-                no += step;
-                if (sr.getId().intValue() == prevRouteId) {
-                    currentNo = no;
-                    no += step;
-                }
-            }
-
-            SaveStationRouteDTO nsr = new SaveStationRouteDTO();
-            nsr.setLine(lineId);
-            nsr.setLineCode(lineCode);
-            nsr.setDirections(upDown);
-            nsr.setVersions(versions);
-            nsr.setStationRouteCode(currentNo);
-            nsr.setStation(sCode);
-            nsr.setStationCode(sCode + "");
-            nsr.setStationName(stationName);
-            nsr.setDistances(0d);
-            nsr.setToTime(0d);
-            Date d = new Date();
-            nsr.setCreateDate(d);
-            nsr.setUpdateDate(d);
-            nsr.setDestroy(0);
-            if (prevRouteId == -1)
-                nsr.setStationMark("B");
-            else if(routes.size()==1)
-                nsr.setStationMark("E");
-
-            //routes.add(sr);
-
-            //重新标记mark
-            Collections.sort(routes, new StationRouteComp());
-            for (int i = 0, size = routes.size(); i < size; i++) {
-                routes.get(i).setStationMark("Z");
-            }
-            if(routes.size() > 0 && prevRouteId!=-1)
-                routes.get(0).setStationMark("B");
-            if(routes.size() > 1)
-                routes.get(routes.size() - 1).setStationMark("E");
-
-            final List<SaveStationRouteDTO> saveList = routes;
-            //insert 新路由 （ID自增）
-            jdbcTemplate.update("insert into bsth_c_ls_stationroute(line, station, station_name, station_route_code, line_code, station_code, station_mark, distances, to_time, destroy, versions, create_date, update_date,directions) values(?,?,?,?,?,?,?,?,?,?,?,?,?,?)"
-                    , nsr.getLine(), nsr.getStation(), nsr.getStationName(), nsr.getStationRouteCode(), nsr.getLineCode(), nsr.getStationCode(), nsr.getStationMark()
-                    , nsr.getDistances(), nsr.getToTime(), nsr.getDestroy(), nsr.getVersions(), nsr.getCreateDate(), nsr.getUpdateDate(), nsr.getDirections());
-
-            // update 原路由
-            jdbcTemplate.batchUpdate("update bsth_c_ls_stationroute set line=?,station=?,station_name=?,station_route_code=?," +
-                            "line_code=?,station_code=?,station_mark=?,distances=?,to_time=?,destroy=?,versions=?,create_date=?,update_date=?,directions=?" +
-                            " where id=?"
-                    , new BatchPreparedStatementSetter() {
-                        @Override
-                        public void setValues(PreparedStatement ps, int i) throws SQLException {
-                            SaveStationRouteDTO sr = saveList.get(i);
-                            ps.setInt(1, sr.getLine());
-                            ps.setLong(2, sr.getStation());
-                            ps.setString(3, sr.getStationName());
-                            ps.setInt(4, sr.getStationRouteCode());
-                            ps.setString(5, sr.getLineCode());
-                            ps.setString(6, sr.getStationCode());
-                            ps.setString(7, sr.getStationMark());
-                            ps.setDouble(8, sr.getDistances());
-                            ps.setDouble(9, sr.getToTime());
-                            ps.setInt(10, sr.getDestroy());
-                            ps.setInt(11, sr.getVersions());
-                            ps.setTimestamp(12, new java.sql.Timestamp(sr.getCreateDate().getTime()));
-                            ps.setTimestamp(13, new java.sql.Timestamp(sr.getUpdateDate().getTime()));
-                            ps.setInt(14, sr.getDirections());
-                            ps.setInt(15, sr.getId());
-                        }
-
-                        @Override
-                        public int getBatchSize() {
-                            return saveList.size();
-                        }
-                    });
-
-            //写一条走向变更记录
-            jdbcTemplate.update("insert into logger_route_synchro(t, line_code, version) values(?, ?, ?)", System.currentTimeMillis(), lineCode, versions);
-
-            tran.commit(status);
-
-            //返回更新之后的数据
-            List<GeoStation> list = findByUpdown(lineCode, upDown, versions);
+        });
-            rs.put("list", list);
-            rs.put("newStationRouteCode", currentNo);
-            rs.put("status", ResponseCode.SUCCESS);
-        } catch (Exception e) {
-            tran.rollback(status);
-            logger.error("", e);
-            rs.put("status", ResponseCode.ERROR);
-            rs.put("msg", "服务器出现异常");
-        }
-        return rs;
     }
     private List<GeoStation> findByUpdown(String lineCode, int upDown, int versions) {
@@ -827,87 +829,86 @@ public class GeoDataServiceImpl implements GeoDataService {
     public Map<String, Object> destroyStation(GeoStation station) {
         Map<String, Object> rs = new HashMap<>();
-        //编程式事务
-        DataSourceTransactionManager tran = new DataSourceTransactionManager(jdbcTemplate.getDataSource());
-        DefaultTransactionDefinition def = new DefaultTransactionDefinition();
-        def.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRED);
-        TransactionStatus status = tran.getTransaction(def);
-        try {
-            String sql = "update bsth_c_ls_stationroute set destroy=1 where id=?";
-            jdbcTemplate.update(sql, station.getId());
-
-            /**
-             * ########## 重新排序路由，标记mark #########
-             */
-            sql = "select * from bsth_c_ls_stationroute where line_code='" + station.getLineCode() + "' and directions=" + station.getDirections() + " and destroy=0 and versions=" + station.getVersions();
-            List<SaveStationRouteDTO> routes = jdbcTemplate.query(sql, BeanPropertyRowMapper.newInstance(SaveStationRouteDTO.class));
-            Collections.sort(routes, new StationRouteComp());
-
-            int no = 0,
-                    step = 100;
-            SaveStationRouteDTO sr;
-            //重新排序路由
-            for (int i = 0, size = routes.size(); i < size; i++) {
-                sr = routes.get(i);
-                sr.setStationRouteCode(no += step);
-            }
-
-            for (int i = 0, size = routes.size(); i < size; i++) {
-                routes.get(i).setStationMark("Z");
+        return transactionTemplate.execute(new TransactionCallback<Map<String, Object>>() {
+            @Override
+            public Map<String, Object> doInTransaction(TransactionStatus status) {
+                try {
+                    String sql = "update bsth_c_ls_stationroute set destroy=1 where id=?";
+                    jdbcTemplate.update(sql, station.getId());
+
+                    /**
+                     * ########## 重新排序路由，标记mark #########
+                     */
+                    sql = "select * from bsth_c_ls_stationroute where line_code='" + station.getLineCode() + "' and directions=" + station.getDirections() + " and destroy=0 and versions=" + station.getVersions();
+                    List<SaveStationRouteDTO> routes = jdbcTemplate.query(sql, BeanPropertyRowMapper.newInstance(SaveStationRouteDTO.class));
+                    Collections.sort(routes, new StationRouteComp());
+
+                    int no = 0,
+                            step = 100;
+                    SaveStationRouteDTO sr;
+                    //重新排序路由
+                    for (int i = 0, size = routes.size(); i < size; i++) {
+                        sr = routes.get(i);
+                        sr.setStationRouteCode(no += step);
+                    }
+
+                    for (int i = 0, size = routes.size(); i < size; i++) {
+                        routes.get(i).setStationMark("Z");
+                    }
+                    if(routes.size() > 0)
+                        routes.get(0).setStationMark("B");
+                    if(routes.size() > 1)
+                        routes.get(routes.size() - 1).setStationMark("E");
+
+                    final List<SaveStationRouteDTO> saveList = routes;
+                    // update 原路由
+                    jdbcTemplate.batchUpdate("update bsth_c_ls_stationroute set line=?,station=?,station_name=?,station_route_code=?," +
+                                    "line_code=?,station_code=?,station_mark=?,distances=?,to_time=?,destroy=?,versions=?,create_date=?,update_date=?,directions=?" +
+                                    " where id=?"
+                            , new BatchPreparedStatementSetter() {
+                                @Override
+                                public void setValues(PreparedStatement ps, int i) throws SQLException {
+                                    SaveStationRouteDTO sr = saveList.get(i);
+                                    ps.setInt(1, sr.getLine());
+                                    ps.setLong(2, sr.getStation());
+                                    ps.setString(3, sr.getStationName());
+                                    ps.setInt(4, sr.getStationRouteCode());
+                                    ps.setString(5, sr.getLineCode());
+                                    ps.setString(6, sr.getStationCode());
+                                    ps.setString(7, sr.getStationMark());
+                                    ps.setDouble(8, sr.getDistances());
+                                    ps.setDouble(9, sr.getToTime());
+                                    ps.setInt(10, sr.getDestroy());
+                                    ps.setInt(11, sr.getVersions());
+                                    ps.setTimestamp(12, new java.sql.Timestamp(sr.getCreateDate().getTime()));
+                                    ps.setTimestamp(13, new java.sql.Timestamp(sr.getUpdateDate().getTime()));
+                                    ps.setInt(14, sr.getDirections());
+                                    ps.setInt(15, sr.getId());
+                                }
+
+                                @Override
+                                public int getBatchSize() {
+                                    return saveList.size();
+                                }
+                            });
+
+                    //写一条走向变更记录
+                    jdbcTemplate.update("insert into logger_route_synchro(t, line_code, version) values(?, ?, ?)", System.currentTimeMillis(), station.getLineCode(), station.getVersions());
+
+                    //返回更新之后的数据
+                    List<GeoStation> list = findByUpdown(station.getLineCode(), station.getDirections(), station.getVersions());
+                    rs.put("list", list);
+                    rs.put("status", ResponseCode.SUCCESS);
+                } catch (Exception e) {
+                    status.setRollbackOnly();
+                    logger.error("", e);
+                    rs.put("status", ResponseCode.ERROR);
+                    rs.put("msg", "服务器出现异常");
+                }
+                return rs;
             }
-            if(routes.size() > 0)
-                routes.get(0).setStationMark("B");
-            if(routes.size() > 1)
-                routes.get(routes.size() - 1).setStationMark("E");
-
-            final List<SaveStationRouteDTO> saveList = routes;
-            // update 原路由
-            jdbcTemplate.batchUpdate("update bsth_c_ls_stationroute set line=?,station=?,station_name=?,station_route_code=?," +
-                            "line_code=?,station_code=?,station_mark=?,distances=?,to_time=?,destroy=?,versions=?,create_date=?,update_date=?,directions=?" +
-                            " where id=?"
-                    , new BatchPreparedStatementSetter() {
-                        @Override
-                        public void setValues(PreparedStatement ps, int i) throws SQLException {
-                            SaveStationRouteDTO sr = saveList.get(i);
-                            ps.setInt(1, sr.getLine());
-                            ps.setLong(2, sr.getStation());
-                            ps.setString(3, sr.getStationName());
-                            ps.setInt(4, sr.getStationRouteCode());
-                            ps.setString(5, sr.getLineCode());
-                            ps.setString(6, sr.getStationCode());
-                            ps.setString(7, sr.getStationMark());
-                            ps.setDouble(8, sr.getDistances());
-                            ps.setDouble(9, sr.getToTime());
-                            ps.setInt(10, sr.getDestroy());
-                            ps.setInt(11, sr.getVersions());
-                            ps.setTimestamp(12, new java.sql.Timestamp(sr.getCreateDate().getTime()));
-                            ps.setTimestamp(13, new java.sql.Timestamp(sr.getUpdateDate().getTime()));
-                            ps.setInt(14, sr.getDirections());
-                            ps.setInt(15, sr.getId());
-                        }
-
-                        @Override
-                        public int getBatchSize() {
-                            return saveList.size();
-                        }
-                    });
-
-            //写一条走向变更记录
-            jdbcTemplate.update("insert into logger_route_synchro(t, line_code, version) values(?, ?, ?)", System.currentTimeMillis(), station.getLineCode(), station.getVersions());
-
-            tran.commit(status);
+        });
-            //返回更新之后的数据
-            List<GeoStation> list = findByUpdown(station.getLineCode(), station.getDirections(), station.getVersions());
-            rs.put("list", list);
-            rs.put("status", ResponseCode.SUCCESS);
-        } catch (Exception e) {
-            tran.rollback(status);
-            logger.error("", e);
-            rs.put("status", ResponseCode.ERROR);
-            rs.put("msg", "服务器出现异常");
-        }
-        return rs;
     }
     @Override
@@ -9,8 +9,7 @@
 		<layout class="ch.qos.logback.classic.PatternLayout">
 			<!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符 -->
-			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] [%file:%line] %-5level-%msg%n
-			</pattern>
+			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] [%file:%line] %-5level -%msg%n</pattern>
 		</layout>
 	</appender>
@@ -31,8 +30,7 @@
 		<layout class="ch.qos.logback.classic.PatternLayout">
 			<!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符 -->
-			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] [%file:%line] %-5level-%msg%n
-			</pattern>
+			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] [%file:%line] %-5level -%msg%n</pattern>
 		</layout>
 	</appender>
@@ -50,8 +48,7 @@
 		<layout class="ch.qos.logback.classic.PatternLayout">
 			<!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符 -->
-			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level -%msg%n
-			</pattern>
+			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] [%file:%line] %-5level -%msg%n</pattern>
 		</layout>
 	</appender>
 	<logger name="com.bsth.filter.AccessLogFilter" level="INFO"
@@ -72,8 +69,7 @@
 		</rollingPolicy>
 		<layout class="ch.qos.logback.classic.PatternLayout">
-			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] [%file:%line] %-5level -%msg%n
-			</pattern>
+			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] [%file:%line] %-5level -%msg%n</pattern>
 		</layout>
 	</appender>
 	<logger name="com.bsth.service.directive.DirectiveServiceImpl"
@@ -102,8 +98,7 @@
 		</rollingPolicy>
 		<layout class="ch.qos.logback.classic.PatternLayout">
-			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] [%file:%line] %-5level -%msg%n
-			</pattern>
+			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] [%file:%line] %-5level -%msg%n</pattern>
 		</layout>
 	</appender>
 	<logger name="com.bsth.service.impl.TrafficManageServiceImpl"
@@ -124,8 +119,7 @@
 		</rollingPolicy>
 		<layout class="ch.qos.logback.classic.PatternLayout">
-			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] [%file:%line] %-5level -%msg%n
-			</pattern>
+			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] [%file:%line] %-5level -%msg%n</pattern>
 		</layout>
 	</appender>
 	<!-- schedule 时刻表操作日志 -->
@@ -141,8 +135,7 @@
 		</rollingPolicy>
 		<layout class="ch.qos.logback.classic.PatternLayout">
-			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] [%file:%line] %-5level -%msg%n
-			</pattern>
+			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] [%file:%line] %-5level -%msg%n</pattern>
 		</layout>
 	</appender>
     <logger name="com.bsth.service.schedule.impl.TTInfoServiceImpl"
@@ -171,7 +164,7 @@
                 <file>${LOG_BASE}/datasync/vehicle/vehicle-data-sync.${taskLogKey}.log</file>
                 <append>true</append>
                 <encoder charset="UTF-8">
-                    <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] [%file:%line] %-5level-%msg%n</pattern>
+                    <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] [%file:%line] %-5level -%msg%n</pattern>
                 </encoder>
             </appender>
         </sift>
@@ -234,8 +227,7 @@
 		</rollingPolicy>
 		<layout class="ch.qos.logback.classic.PatternLayout">
-			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] [%file:%line] %-5level -%msg%n
-			</pattern>
+			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] [%file:%line] %-5level -%msg%n</pattern>
 		</layout>
 	</appender>
 	<logger name="com.bsth.data.gpsdata_v2"
@@ -256,8 +248,7 @@
 		</rollingPolicy>
 		<layout class="ch.qos.logback.classic.PatternLayout">
-			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] [%file:%line] %-5level -%msg%n
-			</pattern>
+			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] [%file:%line] %-5level -%msg%n</pattern>
 		</layout>
 	</appender>
 	<logger name="com.bsth.data.gpsdata.status_manager"
@@ -278,8 +269,7 @@
 		</rollingPolicy>
 		<layout class="ch.qos.logback.classic.PatternLayout">
-			<pattern>%d{MM-dd HH:mm:ss.SSS} %-5level -%msg%n
-			</pattern>
+			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] [%file:%line] %-5level -%msg%n</pattern>
 		</layout>
 	</appender>
 	<logger name="com.bsth.data.msg_queue.WebSocketPushQueue"
@@ -298,8 +288,7 @@
 		</rollingPolicy>
 		<layout class="ch.qos.logback.classic.PatternLayout">
-			<pattern>%d{MM-dd HH:mm:ss.SSS} %-5level -%msg%n
-			</pattern>
+			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] [%file:%line] %-5level -%msg%n</pattern>
 		</layout>
 	</appender>
 	<logger name="com.bsth.data.msg_queue.DirectivePushQueue"
@@ -325,8 +314,7 @@
 		</rollingPolicy>
 		<layout class="ch.qos.logback.classic.PatternLayout">
-			<pattern>%d{MM-dd HH:mm:ss.SSS} %-5level -%msg%n
-			</pattern>
+			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] [%file:%line] %-5level -%msg%n</pattern>
 		</layout>
 	</appender>
 	<logger name="com.bsth.data.schedule.thread.SchedulePstThread"
@@ -59,7 +59,7 @@
     }
 </style>
 <div class="system_change_log">
-    <h2 style="text-indent: 35px;margin: 10px 0 5px;">2023-07-31 更新说明 Changelog</h2>
+    <h2 style="text-indent: 35px;margin: 10px 0 5px;">2023-08-06 更新说明 Changelog</h2>
     <br><br>
     <ul>
         <li class="sub_title"><h6>线调</h6></li>