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

娄高锋
2 parents f6ff2976 da339ef1
Showing 8 changed files with 456 additions and 312 deletions
src/main/java/com/bsth/controller/realcontrol/AdminUtilsController.java
src/main/java/com/bsth/controller/realcontrol/ServiceDataInterface.java
src/main/java/com/bsth/data/directive/DayOfDirectives.java
src/main/java/com/bsth/data/directive/DirectivesPstThread.java
src/main/java/com/bsth/data/gpsdata_v2/GpsRealData.java
src/main/java/com/bsth/data/schedule/thread/CalcOilThread.java
src/main/java/com/bsth/filter/AccessLogFilter.java
src/main/java/com/bsth/service/directive/DirectiveServiceImpl.java
-package com.bsth.controller.realcontrol;
-
-import com.bsth.data.directive.DayOfDirectives;
-import com.bsth.data.gpsdata_v2.cache.GeoCacheData;
-import com.bsth.data.gpsdata_v2.handlers.overspeed.OverspeedProcess;
-import com.bsth.data.gpsdata_v2.thread.GpsDataLoaderThread;
-import com.bsth.data.msg_queue.DirectivePushQueue;
-import com.bsth.data.msg_queue.WebSocketPushQueue;
-import com.bsth.data.pilot80.PilotReport;
-import com.bsth.data.schedule.DayOfSchedule;
-import com.bsth.entity.realcontrol.ScheduleRealInfo;
-import com.bsth.websocket.handler.SendUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Created by panzhao on 2017/4/14.
- */
-@RestController
-@RequestMapping("adminUtils")
-public class AdminUtilsController {
-
-
-    Logger logger = LoggerFactory.getLogger(this.getClass());
-
-    @Autowired
-    DayOfSchedule dayOfSchedule;
-
-    @Autowired
-    GeoCacheData geoCacheData;
-
-    @Autowired
-    DayOfDirectives dayOfDirectives;
-
-    @Autowired
-    SendUtils sendUtils;
-
-    @Autowired
-    PilotReport pilotReport;
-
-    /**
-     * 出现重复班次的车辆
-     * @param
-
-     @RequestMapping(value = "/schRepeat", method = RequestMethod.POST)
-     public void schRepeat(@RequestParam String nbbm){
-     logger.info("前端通知，车辆 " + nbbm + "出现重复班次，开始检测...");
-     List<ScheduleRealInfo> list = dayOfSchedule.findByNbbm(nbbm);
-     logger.info("检测前，车辆班次数量：" + list.size());
-
-     Map<Long, ScheduleRealInfo> map = new HashMap<>();
-     for(ScheduleRealInfo sch : list){
-     if(map.containsKey(sch.getId())){
-     logger.info("检测到重复ID： " + sch.getId());
-     }
-     map.put(sch.getId(), sch);
-     }
-
-     logger.info("检测后，车辆班次数量：" + list.size());
-     if(map.values().size() > 0){
-     dayOfSchedule.replaceByNbbm(nbbm, map.values());
-     }
-     }*/
-
-/*    @RequestMapping(value = "/directivePushQueue")
-    public void directivePushQueue(){
-        DirectivePushQueue.start();
-    }*/
-
-    @RequestMapping(value = "/directiveQueueSize")
-    public void directiveQueueSize(){
-        DirectivePushQueue.size();
-    }
-
-    /*@RequestMapping(value = "/webSocketPushQueue")
-    public void webSocketPushQueue(){
-        WebSocketPushQueue.start();
-    }*/
-
-    @RequestMapping(value = "/webSocketQueueSize")
-    public void webSocketQueueSize(){
-        WebSocketPushQueue.size();
-    }
-
-    @RequestMapping(value = "/setHttpFlag")
-    public void setHttpFlag(@RequestParam int flag){
-        if(flag != 0 && flag != -1)
-            return;
-        GpsDataLoaderThread.setFlag(flag);
-    }
-
-    @RequestMapping(value = "/updateCacheBuff")
-    public void updateCacheBuff(){
-        geoCacheData.loadData();
-    }
-
-    @RequestMapping(value = "/reCalcLpSch")
-    public void reCalcLpSch(){
-        dayOfSchedule._test_reCalcLpSch();
-    }
-
-    @RequestMapping(value = "/findSchByLpName")
-    public List<ScheduleRealInfo> findSchByLpName(@RequestParam String lpName){
-        return dayOfSchedule.getLpScheduleMap().get(lpName);
-    }
-
-    @RequestMapping(value = "/findSchByNbbm")
-    public List<ScheduleRealInfo> findSchByNbbm(@RequestParam String nbbm){
-        return dayOfSchedule.findByNbbm(nbbm);
-    }
-
-    @RequestMapping(value = "/removeExecPlan")
-    public int removeExecPlan(@RequestParam String nbbm){
-        dayOfSchedule.removeExecPlan(nbbm);
-        return 1;
-    }
-
-    @RequestMapping(value = "/sch_re_calc_id_maps")
-    public int reCalcIdMaps(){
-        return dayOfSchedule.reCalcIdMaps();
-    }
-
-    @RequestMapping(value = "/sch_size_string")
-    public String schSizeString(){
-        return dayOfSchedule.sizeString();
-    }
-
-    @RequestMapping(value = "/containerSize")
-    public Map<String, Integer> containerSize(){
-        Map<String, Integer> rs = new HashMap<>();
-        rs.put("60_size", dayOfDirectives.all60().size());
-        rs.put("80_size", pilotReport.findAll().size());
-        rs.put("nbbm_sch_size", dayOfSchedule.findAll().size());
-        rs.put("lp_sch_size", dayOfSchedule.findAllByLpContainer().size());
-        rs.put("id_sch_size", dayOfSchedule.findAllByIdContainer().size());
-        rs.put("pst_sch_size", dayOfSchedule.getPstSize());
-        rs.put("speeds_size", OverspeedProcess.size());
-        return rs;
-    }
-
-    @RequestMapping(value = "/websocketRadioText")
-    public int radioText(String t, String lineCode){
-        sendUtils.sendRadioText(t, lineCode);
-        return 0;
-    }
-}
+package com.bsth.controller.realcontrol;
+
+import com.bsth.data.directive.DayOfDirectives;
+import com.bsth.data.directive.DirectivesPstThread;
+import com.bsth.data.gpsdata_v2.cache.GeoCacheData;
+import com.bsth.data.gpsdata_v2.handlers.overspeed.OverspeedProcess;
+import com.bsth.data.gpsdata_v2.thread.GpsDataLoaderThread;
+import com.bsth.data.msg_queue.DirectivePushQueue;
+import com.bsth.data.msg_queue.WebSocketPushQueue;
+import com.bsth.data.pilot80.PilotReport;
+import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.websocket.handler.SendUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by panzhao on 2017/4/14.
+ */
+@RestController
+@RequestMapping("adminUtils")
+public class AdminUtilsController {
+
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Autowired
+    DayOfSchedule dayOfSchedule;
+
+    @Autowired
+    GeoCacheData geoCacheData;
+
+    @Autowired
+    DayOfDirectives dayOfDirectives;
+
+    @Autowired
+    SendUtils sendUtils;
+
+    @Autowired
+    PilotReport pilotReport;
+
+    /**
+     * 出现重复班次的车辆
+     * @param
+
+     @RequestMapping(value = "/schRepeat", method = RequestMethod.POST)
+     public void schRepeat(@RequestParam String nbbm){
+     logger.info("前端通知，车辆 " + nbbm + "出现重复班次，开始检测...");
+     List<ScheduleRealInfo> list = dayOfSchedule.findByNbbm(nbbm);
+     logger.info("检测前，车辆班次数量：" + list.size());
+
+     Map<Long, ScheduleRealInfo> map = new HashMap<>();
+     for(ScheduleRealInfo sch : list){
+     if(map.containsKey(sch.getId())){
+     logger.info("检测到重复ID： " + sch.getId());
+     }
+     map.put(sch.getId(), sch);
+     }
+
+     logger.info("检测后，车辆班次数量：" + list.size());
+     if(map.values().size() > 0){
+     dayOfSchedule.replaceByNbbm(nbbm, map.values());
+     }
+     }*/
+
+/*    @RequestMapping(value = "/directivePushQueue")
+    public void directivePushQueue(){
+        DirectivePushQueue.start();
+    }*/
+
+    @RequestMapping(value = "/directiveQueueSize")
+    public void directiveQueueSize(){
+        DirectivePushQueue.size();
+    }
+
+    /*@RequestMapping(value = "/webSocketPushQueue")
+    public void webSocketPushQueue(){
+        WebSocketPushQueue.start();
+    }*/
+
+    @RequestMapping(value = "/webSocketQueueSize")
+    public void webSocketQueueSize(){
+        WebSocketPushQueue.size();
+    }
+
+    @RequestMapping(value = "/setHttpFlag")
+    public void setHttpFlag(@RequestParam int flag){
+        if(flag != 0 && flag != -1)
+            return;
+        GpsDataLoaderThread.setFlag(flag);
+    }
+
+    @RequestMapping(value = "/updateCacheBuff")
+    public void updateCacheBuff(){
+        geoCacheData.loadData();
+    }
+
+    @RequestMapping(value = "/reCalcLpSch")
+    public void reCalcLpSch(){
+        dayOfSchedule._test_reCalcLpSch();
+    }
+
+    @RequestMapping(value = "/findSchByLpName")
+    public List<ScheduleRealInfo> findSchByLpName(@RequestParam String lpName){
+        return dayOfSchedule.getLpScheduleMap().get(lpName);
+    }
+
+    @RequestMapping(value = "/findSchByNbbm")
+    public List<ScheduleRealInfo> findSchByNbbm(@RequestParam String nbbm){
+        return dayOfSchedule.findByNbbm(nbbm);
+    }
+
+    @RequestMapping(value = "/removeExecPlan")
+    public int removeExecPlan(@RequestParam String nbbm){
+        dayOfSchedule.removeExecPlan(nbbm);
+        return 1;
+    }
+
+    @RequestMapping(value = "/sch_re_calc_id_maps")
+    public int reCalcIdMaps(){
+        return dayOfSchedule.reCalcIdMaps();
+    }
+
+    @RequestMapping(value = "/sch_size_string")
+    public String schSizeString(){
+        return dayOfSchedule.sizeString();
+    }
+
+    @RequestMapping(value = "/containerSize")
+    public Map<String, Integer> containerSize(){
+        Map<String, Integer> rs = new HashMap<>();
+        rs.put("60_size", dayOfDirectives.all60().size());
+        rs.put("80_size", pilotReport.findAll().size());
+        rs.put("nbbm_sch_size", dayOfSchedule.findAll().size());
+        rs.put("lp_sch_size", dayOfSchedule.findAllByLpContainer().size());
+        rs.put("id_sch_size", dayOfSchedule.findAllByIdContainer().size());
+        rs.put("pst_sch_size", dayOfSchedule.getPstSize());
+        rs.put("speeds_size", OverspeedProcess.size());
+        rs.put("60_pst_size", DayOfDirectives.pstSize());
+        return rs;
+    }
+
+    @RequestMapping(value = "/websocketRadioText")
+    public int radioText(String t, String lineCode){
+        sendUtils.sendRadioText(t, lineCode);
+        return 0;
+    }
+
+    @Autowired
+    DirectivesPstThread directivesPstThread;
+
+    @RequestMapping(value = "/_sd_60_pst")
+    public void sd_60_pst(){
+        logger.info("手动入库指令....");
+        directivesPstThread.run();
+    }
+}
 \ No newline at end of file
@@ -194,15 +194,10 @@ public class ServiceDataInterface {
             int code = GatewayHttpUtils.postJson(JSON.toJSONString(d60));
             d60.setHttpCode(code);
-            if (code == 0) {
-                // 添加到缓存
-                dayOfDirectives.put60(d60, true);
-            } else {
+            if (code != 0)
                 d60.setErrorText("网关通讯失败, code: " + code);
-                d60Repository.save(d60);
-                dayOfDirectives.put60(d60, false);
-            }
+            dayOfDirectives.put60(d60);
             return d60.getMsgId();
         }catch (Exception e){
             logger.error("", e);
@@ -35,8 +35,10 @@ public class DayOfDirectives {
 	// 线路切换指令 64
 	public static ConcurrentMap<String, D64> d64Map;
-	//等待入库的指令
+	//等待插入的指令
 	public static LinkedList<Directive> pstDirectives;
+	//等待更新的指令
+	public static LinkedList<D60> pstD60s;
 	@Autowired
 	DirectiveService directiveService;
@@ -54,13 +56,13 @@ public class DayOfDirectives {
 		d60Map = new ConcurrentHashMap<>();
 		d64Map = new ConcurrentHashMap<>();
 		pstDirectives = new LinkedList<>();
+		pstD60s = new LinkedList<>();
 	}
-	public void put60(D60 d60, boolean pst) {
+	public void put60(D60 d60) {
 		d60Map.put(d60.getMsgId(), d60);
 		//等待持久化
-		if(pst)
-			pstDirectives.add(d60);
+		pstDirectives.add(d60);
 	}
 	public void put64(D64 d64) {
@@ -69,6 +71,10 @@ public class DayOfDirectives {
 		pstDirectives.add(d64);
 	}
+	public static int pstSize(){
+		return pstDirectives.size();
+	}
+
 	/**
 	 * 
 	 * @Title: reply @Description: TODO(指令 46，47 响应) @throws
@@ -100,9 +106,9 @@ public class DayOfDirectives {
 			d60.setReply47Time(System.currentTimeMillis());
 			break;
 		}
-		// 等待持久化
-		if(!pstDirectives.contains(d60))
-			pstDirectives.add(d60);
+
+		//更新60数据
+		pstD60s.add(d60);
 		ScheduleRealInfo sch = d60.getSch();
 		if (null == sch)
@@ -133,110 +139,16 @@ public class DayOfDirectives {
 			if (null == data)
 				logger.warn("64响应 data is null ，json： " + json);
 			else {
-				d64.setRespAck(data.getShort("requestAck"));
-				// 持久化
-				if(!pstDirectives.contains(d64))
-					pstDirectives.add(d64);
+				logger.info(d64.getDeviceId() + "_" + d64.getData().getLineId() + "响应：" + data.getShort("requestAck"));
+				/*d64.setRespAck(data.getShort("requestAck"));
+				// 持久化*/
+				//64 响应不入库了...
 			}
 		}
 	}
-/*	private void saveD60(D60 d60) {
-		// 等47再入库
-		if (d60.getReply47() == null)
-			return;
-
-		directiveService.save(d60);
-	}
-
-	public void clear(String lineCode){
-		int c60 = 0, c64 = 0;
-
-		Collection<D60> d60s = d60Map.values();
-		List<D60> rem60List = new ArrayList<>();
-		for(D60 d60 : d60s){
-			if(d60.getLineCode().equals(lineCode))
-				rem60List.add(d60);
-		}
-
-		//清除60数据
-		for(D60 d60 : rem60List){
-			if(d60.getReply47() == null)
-				directiveService.save(d60);
-			if(null != d60Map.remove(d60.getMsgId()))
-				c60 ++;
-		}
-
-		rem60List.clear();
-		if(c60 > 0)
-			logger.info("清除60数据 ，" + c60);
-
-		//找到该设备的64数据
-		Collection<D64> d64s = d64Map.values();
-		List<D64> rem64List = new ArrayList<>();
-		for(D64 d64 : d64s){
-			if(d64.get)
-				rem64List.add(d64);
-		}
-
-		//清除64数据
-		for(D64 d64 : rem64List){
-			if(d64.getRespAck() == null)
-				directiveService.save64(d64);
-
-			if(null != d64Map.remove(d64.getKey()))
-				c64 ++;
-		}
-
-		rem64List.clear();
-		if(c64 > 0)
-			logger.info("清除64数据 ，" + c64);
-	}*/
-
-/*	public void clear(String device){
-		int c60 = 0, c64 = 0;
-
-		Collection<D60> d60s = d60Map.values();
-		List<D60> rem60List = new ArrayList<>();
-		for(D60 d60 : d60s){
-			if(device.equals(d60.getDeviceId()))
-				rem60List.add(d60);
-		}
-
-		//清除60数据
-		for(D60 d60 : rem60List){
-			if(d60.getReply47() == null)
-				directiveService.save(d60);
-			if(null != d60Map.remove(d60.getMsgId()))
-				c60 ++;
-		}
-
-		rem60List.clear();
-		if(c60 > 0)
-			logger.info("清除60数据 ，" + c60);
-		
-		//找到该设备的64数据
-		Collection<D64> d64s = d64Map.values();
-		List<D64> rem64List = new ArrayList<>();
-		for(D64 d64 : d64s){
-			if(device.equals(d64.getDeviceId()))
-				rem64List.add(d64);
-		}
-		
-		//清除64数据
-		for(D64 d64 : rem64List){
-			if(d64.getRespAck() == null)
-				directiveService.save64(d64);
-			
-			if(null != d64Map.remove(d64.getKey()))
-				c64 ++;
-		}
-
-		rem64List.clear();
-		if(c64 > 0)
-			logger.info("清除64数据 ，" + c64);
-	}*/
-
+	@Autowired
+	DirectivesPstThread directivesPstThread;
 	public void clearAll(){
 		d60Map = new ConcurrentHashMap<>();
 		d64Map = new ConcurrentHashMap<>();
 package com.bsth.data.directive;
+import com.alibaba.fastjson.JSON;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.entity.directive.D60;
 import com.bsth.entity.directive.D64;
 import com.bsth.entity.directive.Directive;
-import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.repository.directive.D60Repository;
 import com.bsth.repository.directive.D64Repository;
 import org.joda.time.format.DateTimeFormat;
@@ -12,9 +12,20 @@ import org.joda.time.format.DateTimeFormatter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.BatchPreparedStatementSetter;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.datasource.DataSourceTransactionManager;
 import org.springframework.stereotype.Component;
+import org.springframework.transaction.TransactionDefinition;
+import org.springframework.transaction.TransactionStatus;
+import org.springframework.transaction.support.DefaultTransactionDefinition;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.sql.Types;
+import java.util.ArrayList;
 import java.util.LinkedList;
+import java.util.List;
 /**
  * 指令持久化线程
@@ -34,40 +45,259 @@ public class DirectivesPstThread extends Thread {
     @Autowired
     DayOfSchedule dayOfSchedule;
+    @Autowired
+    JdbcTemplate jdbcTemplate;
+
     private static DateTimeFormatter fmtyyyyMMdd = DateTimeFormat.forPattern("yyyy-MM-dd");
     @Override
     public void run() {
+        try{
+            LinkedList<Directive> list = DayOfDirectives.pstDirectives;
+            logger.info("开始指令入库: " + list.size());
-        LinkedList<Directive> list = DayOfDirectives.pstDirectives;
-
-        Directive directive;
-        for (int i = 0; i < 1000; i++) {
-            try {
+            List<D60> d60s = new ArrayList<>();
+            List<D64> d64s = new ArrayList<>();
+            //按 60 和 64 分组
+            Directive directive;
+            D60 d60;
+            for (int i = 0; i < 2000; i++) {
                 directive = list.poll();
                 if(null == directive)
                     break;
+
                 //日期
                 directive.setRq(fmtyyyyMMdd.print(directive.getTimestamp()));
+
                 if (directive instanceof D60) {
-                    D60 d60 = (D60) directive;
-                    if(d60.isDispatch()){
-                        ScheduleRealInfo sch = d60.getSch();
-                        //如果关联的班次已经不存在了，放弃入库
-                        if(sch.isDeleted()){
-                            logger.warn("save 指令，发现 deleted=true 的班次，id=" + sch.getId());
-                            continue;
-                        }
-                    }
-                    d60Repository.save(d60);
+                    d60 = (D60) directive;
+                    if(isDelete(d60))
+                        continue;
+                    d60s.add(d60);
+                }
+                else if(directive instanceof D64)
+                    d64s.add((D64) directive);
+            }
+
+            //入库60
+            save60(d60s);
+            //入库64
+            save64(d64s);
+
+
+            // 60 指令更新（车载响应）
+            LinkedList<D60> updateD60s = DayOfDirectives.pstD60s;
+            d60s = new ArrayList<>();
+            for (int i = 0; i < 2000; i++) {
+                d60 = updateD60s.poll();
+                if(null == d60)
+                    break;
+                d60s.add(d60);
+            }
+
+            if(d60s.size() > 0)
+                update60(d60s);
+        }catch (Exception e){
+            logger.error("指令入库出现异常", e);
+        }
+    }
+
+    private void save64(final List<D64> d64s) {
+        if(null == d64s || d64s.size() == 0)
+            return;
+
+        String sql = "insert into bsth_v_directive_64(device_id,error_text,http_code,oper_code,rq,sender,timestamp,city_code,line_id,txt_content,resp_ack) " +
+                " values(?,?,?,?,?,?,?,?,?,?,?)";
+
+        //编程式事务
+        DataSourceTransactionManager tran = new DataSourceTransactionManager(jdbcTemplate.getDataSource());
+        DefaultTransactionDefinition def = new DefaultTransactionDefinition();
+        def.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRED);
+        TransactionStatus status = tran.getTransaction(def);
+
+        try{
+            jdbcTemplate.batchUpdate(sql, new BatchPreparedStatementSetter() {
+                @Override
+                public void setValues(PreparedStatement ps, int i) throws SQLException {
+                    D64 d64 = d64s.get(i);
+                    ps.setString(1 , d64.getDeviceId());
+                    ps.setString(2, isNvl(d64.getErrorText()));
+                    ps.setInt(3, d64.getHttpCode());
+                    ps.setShort(4, isNvl(d64.getOperCode()));
+                    ps.setString(5, d64.getRq());
+
+                    ps.setString(6, isNvl(d64.getSender()));
+                    ps.setLong(7, d64.getTimestamp());
+
+                    ps.setShort(8, isNvl(d64.getData().getCityCode()));
+                    ps.setString(9, isNvl(d64.getData().getLineId()));
+                    ps.setString(10, isNvl(d64.getData().getTxtContent()));
+                    ps.setShort(11, isNvl(d64.getRespAck()));
+                }
+
+                @Override
+                public int getBatchSize() {
+                    return d64s.size();
                 }
+            });
+
+            tran.commit(status);
+
+            logger.info("64 入库成功: " + d64s.size());
+        }catch (Exception e){
+            tran.rollback(status);
+            logger.error("", e);
+            logger.warn("失败的数据：" + JSON.toJSONString(d64s));
+        }
+    }
+
+    private void update60(final List<D60> d60s) {
+        if(null == d60s || d60s.size() == 0)
+            return;
+
+        String sql = "update bsth_v_directive_60 set reply46=?,reply46time=?,reply47=?,reply47time=? where device_id=? and timestamp=? and msg_id=?";
+
+        //编程式事务
+        DataSourceTransactionManager tran = new DataSourceTransactionManager(jdbcTemplate.getDataSource());
+        DefaultTransactionDefinition def = new DefaultTransactionDefinition();
+        def.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRED);
+        TransactionStatus status = tran.getTransaction(def);
+
+        try{
+            jdbcTemplate.batchUpdate(sql, new BatchPreparedStatementSetter() {
+                @Override
+                public void setValues(PreparedStatement ps, int i) throws SQLException {
+                    D60 d60 = d60s.get(i);
+                    ps.setShort(1, isNvl(d60.getReply46()));
+                    if(null == d60.getReply46Time())
+                        ps.setNull(2, Types.BIGINT);
+                    else
+                        ps.setLong(2, d60.getReply46Time());
+
+                    ps.setShort(3, isNvl(d60.getReply47()));
-                if (directive instanceof D64) {
-                    d64Repository.save((D64) directive);
+                    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());
                 }
-            } catch (Exception e) {
-                logger.error("", e);
+
+                @Override
+                public int getBatchSize() {
+                    return d60s.size();
+                }
+            });
+
+            tran.commit(status);
+
+            logger.info("60 更新成功: " + d60s.size());
+        }catch (Exception e){
+            tran.rollback(status);
+            logger.error("", e);
+            logger.warn("失败的数据：" + JSON.toJSONString(d60s));
+        }
+    }
+
+    private void save60(final List<D60> d60s) {
+        if(null == d60s || d60s.size() == 0)
+            return;
+
+        String sql = "insert into bsth_v_directive_60(device_id,error_text,http_code,oper_code,rq,sender,timestamp" +
+                ",alarm_time,company_code,dispatch_instruct,instruct_type,msg_id,service_state,txt_content,is_dispatch" +
+                ",line_code,reply46,reply46time,reply47,reply47time,sch) " +
+                " values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
+
+        //编程式事务
+        DataSourceTransactionManager tran = new DataSourceTransactionManager(jdbcTemplate.getDataSource());
+        DefaultTransactionDefinition def = new DefaultTransactionDefinition();
+        def.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRED);
+        TransactionStatus status = tran.getTransaction(def);
+
+        try{
+            jdbcTemplate.batchUpdate(sql, new BatchPreparedStatementSetter() {
+                @Override
+                public void setValues(PreparedStatement ps, int i) throws SQLException {
+                    D60 d60 = d60s.get(i);
+                    ps.setString(1, d60.getDeviceId());
+                    ps.setString(2, isNvl(d60.getErrorText()));
+                    ps.setInt(3, d60.getHttpCode());
+                    ps.setShort(4, d60.getOperCode());
+                    ps.setString(5, d60.getRq());
+                    ps.setString(6, d60.getSender());
+                    ps.setLong(7, d60.getTimestamp());
+
+                    ps.setLong(8, isNvl(d60.getData().getAlarmTime()));
+                    ps.setShort(9, isNvl(d60.getData().getCompanyCode()));
+                    ps.setShort(10, isNvl(d60.getData().getDispatchInstruct()));
+                    ps.setInt(11, d60.getData().getInstructType());
+                    ps.setInt(12, d60.getData().getMsgId());
+                    ps.setLong(13, d60.getData().getServiceState());
+                    ps.setString(14, d60.getData().getTxtContent());
+                    ps.setBoolean(15, d60.isDispatch());
+
+                    ps.setString(16, isNvl(d60.getLineCode()));
+                    ps.setShort(17, isNvl(d60.getReply46()));
+
+                    if(null == d60.getReply46Time())
+                        ps.setNull(18, Types.BIGINT);
+                    else
+                        ps.setLong(18, d60.getReply46Time());
+
+                    ps.setShort(19, isNvl(d60.getReply47()));
+
+                    if(null == d60.getReply47Time())
+                        ps.setNull(20, Types.BIGINT);
+                    else
+                        ps.setLong(20, d60.getReply47Time());
+
+                    if(d60.getSch()==null)
+                        ps.setNull(21, Types.BIGINT);
+                    else
+                        ps.setLong(21, d60.getSch().getId());
+                }
+
+                @Override
+                public int getBatchSize() {
+                    return d60s.size();
+                }
+            });
+
+            tran.commit(status);
+
+            logger.info("60 入库成功: " + d60s.size());
+        }catch (Exception e){
+            tran.rollback(status);
+            logger.error("", e);
+            logger.warn("失败的数据：" + JSON.toJSONString(d60s));
+        }
+    }
+
+    private String isNvl(String v) {
+        return v==null?"":v;
+    }
+
+    private short isNvl(Short v) {
+        return v==null?0:v;
+    }
+
+    private long isNvl(Long v) {
+        return v==null?0:v;
+    }
+
+    private boolean isDelete(D60 d60){
+        try{
+            //如果关联的班次已经不存在了，放弃入库，很低概率出现
+            if(d60.isDispatch() && d60.getSch().isDeleted()){
+                logger.warn("save 指令，发现 deleted=true 的班次，id=" + d60.getSch().getId());
+                return true;
             }
+        }catch (Exception e){
+            logger.error("", e);
         }
+
+        return false;
     }
 }
@@ -124,6 +124,8 @@ public class GpsRealData {
      */
     public List<GpsEntity> getByLine(String lineCode) {
         NavigableSet<String> set = lineCode2Devices.get(lineCode);//实际车载
+        if(null == set)
+            set = new TreeSet();
         Set<String> nbbmSet = dayOfSchedule.findCarByLineCode(lineCode);//计划用车
         Map<String, String> nbbm2deviceMap = BasicData.deviceId2NbbmMap.inverse();
@@ -2,6 +2,7 @@ package com.bsth.data.schedule.thread;
 import com.bsth.data.directive.DayOfDirectives;
 import com.bsth.data.gpsdata_v2.handlers.overspeed.OverspeedProcess;
+import com.bsth.data.gpsdata_v2.thread.GpsDataLoaderThread;
 import com.bsth.service.oil.DlbService;
 import com.bsth.data.safe_driv.SafeDrivCenter;
 import com.bsth.service.oil.YlbService;
@@ -51,5 +52,8 @@ public class CalcOilThread extends Thread{
         SafeDrivCenter.clear();
         //清除超速缓存数据
         OverspeedProcess.clear();
+
+        GpsDataLoaderThread.setFlag(0);
+
     }
 }
@@ -46,6 +46,7 @@ public class AccessLogFilter extends BaseFilter {
 		String url = request.getRequestURI();
 		String params = getParams(request);
 		String headers = getHeaders(request);
+		String method = request.getMethod();
 		StringBuilder s = new StringBuilder();
 		s.append(getBlock(username + " -" + name));
@@ -53,6 +54,7 @@ public class AccessLogFilter extends BaseFilter {
 		s.append(getBlock(ip));
 		s.append(getBlock(userAgent));
 		s.append(getBlock(url));
+		s.append(getBlock(method));
 		s.append(getBlock(params));
 		s.append(getBlock(headers));
 		s.append(getBlock(request.getHeader("Referer")));
@@ -96,14 +96,10 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
             d60.setSender(sender);
         d60.setHttpCode(code);
-        if (code == 0) {
-            // 添加到缓存
-            dayOfDirectives.put60(d60, true);
-        } else {
+        if (code != 0)
             d60.setErrorText("网关通讯失败, code: " + code);
-            d60Repository.save(d60);
-            dayOfDirectives.put60(d60, false);
-        }
+
+        dayOfDirectives.put60(d60);
         return code;
     }
@@ -171,16 +167,13 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
         if (code == 0) {
             sch.setDirectiveState(60);
-            // 添加到缓存，延迟入库
-            dayOfDirectives.put60(d60, true);
             // 通知页面
             sendD60ToPage(sch);
         } else {
             d60.setErrorText("网关通讯失败, code: " + code);
-            dayOfDirectives.put60(d60, false);
-            d60Repository.save(d60);
         }
+        dayOfDirectives.put60(d60);
         return code;
     }
@@ -227,18 +220,15 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
         int code = GatewayHttpUtils.postJson(JSON.toJSONString(d60));
         // 添加到缓存，等待入库
         d60.setHttpCode(code);
-        /*if (null != sch){
-            d60.setSch(sch);
-            d60.setLineCode(sch.getXlBm());
-        }*/
-        if (code == 0) {
-            dayOfDirectives.put60(d60, true);
-        } else {
+        GpsEntity gps = gpsRealDataBuffer.getByNbbm(nbbm);
+        if(null != gps)
+            d60.setLineCode(gps.getLineId());
+
+        if (code != 0)
             d60.setErrorText("网关通讯失败, code: " + code);
-            d60Repository.save(d60);
-            dayOfDirectives.put60(d60, false);
-        }
+
+        dayOfDirectives.put60(d60);
         return code;
     }
@@ -268,15 +258,13 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
         // 入库
         d64.setHttpCode(code);
         d64.getData().setTxtContent("切换线路[" + BasicData.lineCode2NameMap.get(lineCode) + "]");
-        dayOfDirectives.put64(d64);
-
         // 通知设备刷新线路文件，忽略结果
         if (code == 0)
             GatewayHttpUtils.postJson(crt.createDeviceRefreshData(deviceId, lineCode));
         else
             d64.setErrorText(" 网关通讯失败, code: " + code);
-        d64Repository.save(d64);
+        dayOfDirectives.put64(d64);
         return code;
     }