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

游瑞烽
2 parents f0aeb349 2cf067bd
Showing 24 changed files with 310 additions and 109 deletions
src/main/java/com/bsth/controller/realcontrol/AdminUtilsController.java
src/main/java/com/bsth/data/directive/DayOfDirectives.java
src/main/java/com/bsth/data/directive/DirectiveCreator.java
src/main/java/com/bsth/data/directive/GatewayHttpUtils.java
src/main/java/com/bsth/data/gpsdata_v2/entity/GpsEntity.java
src/main/java/com/bsth/data/gpsdata_v2/handlers/GpsStateProcess.java
src/main/java/com/bsth/data/gpsdata_v2/handlers/InStationProcess.java
src/main/java/com/bsth/data/gpsdata_v2/handlers/overspeed/OverspeedProcess.java
src/main/java/com/bsth/data/gpsdata_v2/utils/GpsDataUtils.java
src/main/java/com/bsth/data/msg_queue/DirectivePushQueue.java
src/main/java/com/bsth/data/safe_driv/SafeDrivCenter.java
src/main/java/com/bsth/data/schedule/thread/CalcOilThread.java
src/main/java/com/bsth/data/schedule/thread/ScheduleRefreshThread.java
src/main/java/com/bsth/service/directive/DirectiveServiceImpl.java
src/main/java/com/bsth/service/gps/GpsServiceImpl.java
src/main/java/com/bsth/service/impl/BusIntervalServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
src/main/resources/static/pages/electricity/list/list.html
src/main/resources/static/pages/forms/statement/waybill.html
@@ -2,9 +2,11 @@ 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;
@@ -41,29 +43,32 @@ public class AdminUtilsController {
     @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 = "/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(){
@@ -132,10 +137,12 @@ public class AdminUtilsController {
     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;
     }
@@ -16,6 +16,7 @@ import org.springframework.stereotype.Component;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
 /**
  * 
@@ -29,13 +30,10 @@ import java.util.concurrent.ConcurrentHashMap;
 public class DayOfDirectives {
 	// 当日60指令缓存
-	private static Map<Integer, D60> d60Map;
+	private static ConcurrentMap<Integer, D60> d60Map;
 	// 线路切换指令 64
-	public static Map<String, D64> d64Map;
-	
-	//等待C0_A4回复的用户
-	//public static Map<K, V>
+	public static ConcurrentMap<String, D64> d64Map;
 	//等待入库的指令
 	public static LinkedList<Directive> pstDirectives;
@@ -149,9 +147,53 @@ public class DayOfDirectives {
 			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){
+
+/*	public void clear(String device){
 		int c60 = 0, c64 = 0;
 		Collection<D60> d60s = d60Map.values();
@@ -193,6 +235,12 @@ public class DayOfDirectives {
 		rem64List.clear();
 		if(c64 > 0)
 			logger.info("清除64数据 ，" + c64);
+	}*/
+
+	public void clearAll(){
+		d60Map = new ConcurrentHashMap<>();
+		d64Map = new ConcurrentHashMap<>();
+		logger.info("清除指令数据 ,,,");
 	}
 	public Collection<D60> all60(){
@@ -81,7 +81,7 @@ public class DirectiveCreator {
 	}
-	public D60 createD60_01(String nbbm, String text, int upDown, int state, Date alarmTime){
+	public D60 createD60_02(String nbbm, String text, int upDown, int state, Date alarmTime){
 		SimpleDateFormat sdfMMddHHmm = new SimpleDateFormat("MMddHHmm");
 		Long timestamp = System.currentTimeMillis();
@@ -102,7 +102,7 @@ public class DirectiveCreator {
 		directive.setMsgId(msgId);
 		// 构造数据
 		data.setDeviceId(deviceId);
-		data.setDispatchInstruct((short) 0x01);
+		data.setDispatchInstruct((short) 0x02);
 		data.setTimestamp(timestamp);
 		data.setCompanyCode(company);
 		data.setMsgId(msgId);
@@ -48,9 +48,7 @@ public class GatewayHttpUtils {
             int statusCode = response.getStatusLine().getStatusCode();
             if(statusCode != 200){
-                //post.abort();
                 logger.error("http client status code: " + statusCode);
-                //return code;
             }
             JSONObject json = JSONObject.parseObject(EntityUtils.toString(response.getEntity()));
@@ -13,6 +13,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 public class GpsEntity implements Cloneable{
 	/** 公司代码 */
+	@JsonIgnore
 	private Short companyCode;
 	/** 线路编码 */
@@ -31,6 +32,7 @@ public class GpsEntity implements Cloneable{
 	private String stationName;
 	/** 到站时间  */
+	@JsonIgnore
 	private long arrTime;
 	/** 经度 */
@@ -56,6 +58,12 @@ public class GpsEntity implements Cloneable{
 	/** 上下行（0 上行 ， 1 下行 ， -1 无效） */
 	private Byte upDown;
+
+	/**
+	 * 设备原始走向_营运状态
+	 * 当设备状态和系统不一致时，该字段有值
+	 */
+	private String origStateStr;
 	/** 车辆内部编码 */
 	private String nbbm;
@@ -379,4 +387,12 @@ public class GpsEntity implements Cloneable{
 	public void setPlanCode(String planCode) {
 		this.planCode = planCode;
 	}
+
+	public String getOrigStateStr() {
+		return origStateStr;
+	}
+
+	public void setOrigStateStr(String origStateStr) {
+		this.origStateStr = origStateStr;
+	}
 }
@@ -7,6 +7,9 @@ import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
 /**
  * GPS 状态处理
  * Created by panzhao on 2017/11/15.
@@ -20,6 +23,13 @@ public class GpsStateProcess {
     @Autowired
     GpsStatusManager gpsStatusManager;
+    /**
+     * 设置状态差异连续次数
+     */
+    private static ConcurrentMap<String, Integer> stateDiffMap = new ConcurrentHashMap<>();
+
+    private final static int CHANGE_THRESHOLD = 2;
+
     public void process(GpsEntity gps) {
         //在执行的任务
         ScheduleRealInfo sch = dayOfSchedule.executeCurr(gps.getNbbm());
@@ -27,16 +37,40 @@ public class GpsStateProcess {
         if (null == sch)
             return;
-        byte upDown = Byte.parseByte(sch.getXlDir());
+        int upDown = Integer.parseInt(sch.getXlDir());
         int schState = dayOfSchedule.emptyService(sch)?1:0;
-
+        String device = gps.getDeviceId();
+        /**
+         * 网关在进终点的时候，会直接将当前点位状态改变
+         * 为避免出现单个点的状态跳动，设置一下切换阈值
+         */
         if(gps.getState() != schState || gps.getUpDown() != upDown){
-            //下发指令纠正车载的 营运状态 和 走向
-            gpsStatusManager.changeServiceState(gps.getNbbm(), upDown, schState, "同步@系统");
+            Integer count = 0;
+            if(stateDiffMap.containsKey(device))
+                count = stateDiffMap.get(device);
+
+            count ++;
+
+            if(count >= CHANGE_THRESHOLD){
+                //下发指令纠正车载的 营运状态 和 走向
+                gpsStatusManager.changeServiceState(gps.getNbbm(), upDown, schState, "同步@系统");
+                count = 0;
+            }
+
+            stateDiffMap.put(device, count);
+
+            //记录原始设备状态
+            gps.setOrigStateStr(gps.getUpDown() + "_" + gps.getState());
         }
+        else
+            stateDiffMap.put(device, 0);
         if (gps.getUpDown() != upDown) {
-            gps.setUpDown(upDown);//修正走向
+            gps.setUpDown((byte) upDown);//修正走向
+        }
+
+        if(gps.getState() != schState){
+            gps.setState(schState);//修正营运状态
         }
         if (!sch.getXlBm().equals(gps.getLineId())) {
@@ -144,6 +144,8 @@ public class InStationProcess {
             dayOfSchedule.addExecPlan(next);
             inStationAndInPark(sch, next);//进站既进场
         }
+        else
+            dayOfSchedule.removeExecPlan(nbbm);
         //路牌的下一个班次，页面显示起点实际到达时间
         ScheduleRealInfo lpNext = dayOfSchedule.nextByLp(sch);
@@ -176,9 +178,14 @@ public class InStationProcess {
         if(null == next && gps.isService()){
             nonService(sch, "结束@系统");//营运结束
         }
-        //下发运营指令
-        DirectivePushQueue.put6003(next, "到站@系统");
+        /**
+         *  下一班不是全程班次的时候，下发运营指令
+         *  全程班次时，由网关根据进出起终点，自动切换走向
+
+        if(null != next && !next.getBcType().equals("normal"))
+            DirectivePushQueue.put6003(next, "到站@系统");
+         */
         //下发调度指令
         DirectivePushQueue.put6002(next, doneSum, "到站@系统", "");
     }
@@ -43,7 +43,7 @@ public class OverspeedProcess {
      */
     private static Map<String, Integer> contSpeedMap;
-    Logger logger = LoggerFactory.getLogger(this.getClass());
+    static Logger logger = LoggerFactory.getLogger(OverspeedProcess.class);
     static{
         multimap = ArrayListMultimap.create();
@@ -51,6 +51,10 @@ public class OverspeedProcess {
         realOverspeedMap = new HashMap();
     }
+    public static int size(){
+        return multimap.size();
+    }
+
     public static void clear(){
         multimap = null;
         multimap = ArrayListMultimap.create();
@@ -60,6 +64,8 @@ public class OverspeedProcess {
         realOverspeedMap = null;
         realOverspeedMap = new HashMap();
+
+        logger.info("清理超速缓存数据，，，");
     }
     public boolean process(GpsEntity gps){
@@ -15,6 +15,8 @@ public class GpsDataUtils {
     static Logger logger = LoggerFactory.getLogger(GpsDataUtils.class);
+    private final static long MAX_DIFF = 1000 * 60 * 60 * 24;
+
     /**
      * 过滤无效的gps点位
      *
@@ -24,9 +26,16 @@ public class GpsDataUtils {
     public static List<GpsEntity> clearInvalid(List<GpsEntity> list) {
         List<GpsEntity> rs = new ArrayList<>();
+        long t = System.currentTimeMillis();
         try {
             GpsEntity prev;
             for (GpsEntity gps : list) {
+                if(Math.abs(gps.getTimestamp() - t) > MAX_DIFF){
+                    //尝试校准GPS时间
+                    gps.setTimestamp(t + 1);
+                    gps.setAbnormalStatus("timeError");
+                }
+
                 prev = GpsRealData.get(gps.getDeviceId());
                 //不接收过期数据
@@ -48,7 +57,7 @@ public class GpsDataUtils {
             if (rs.size() < list.size())
                 logger.info("过滤无效的点位 : " + (list.size() - rs.size()));
         } catch (Exception e) {
-            logger.error("", e);
+            logger.error("过滤GPS出现异常", e);
             rs = list;
         }
         return rs;
@@ -24,7 +24,7 @@ public class DirectivePushQueue implements ApplicationContextAware {
     static ConcurrentLinkedQueue<QueueData_Directive> linkedList;
     static DataPushThread thread;
     static DirectiveService directiveService;
-    static long t;
+    static long threadT;
     /**
      * 下发运营指令6003的最小间隔时间
@@ -34,11 +34,11 @@ public class DirectivePushQueue implements ApplicationContextAware {
     /**
      * 车辆 ——> 上次下发6003的时间
      */
-    static ConcurrentMap<String, Long> lastSend6003Map;
+    static ConcurrentMap<String, Long> lastSend60TimeMap;
     static {
         linkedList = new ConcurrentLinkedQueue<>();
-        lastSend6003Map = new ConcurrentHashMap<>();
+        lastSend60TimeMap = new ConcurrentHashMap<>();
     }
     public static void put6002(ScheduleRealInfo sch, int finish, String sender, String txtPrefix){
@@ -52,12 +52,13 @@ public class DirectivePushQueue implements ApplicationContextAware {
         qd6002.setTxtPrefix(txtPrefix);
         linkedList.add(qd6002);
+        lastSend60TimeMap.put(sch.getClZbh(), System.currentTimeMillis());
     }
     public static void put6003(String nbbm, int state, int upDown, String sender){
         long t = System.currentTimeMillis();
-        if(lastSend6003Map.containsKey(nbbm)
-                && t - lastSend6003Map.get(nbbm) < MIN_SEND6003_SPACE)
+        if(lastSend60TimeMap.containsKey(nbbm)
+                && t - lastSend60TimeMap.get(nbbm) < MIN_SEND6003_SPACE)
             return; //最短下发间隔
         QueueData_Directive qd6003 = new QueueData_Directive();
@@ -68,7 +69,7 @@ public class DirectivePushQueue implements ApplicationContextAware {
         qd6003.setCode("60_03");
         linkedList.add(qd6003);
-        lastSend6003Map.put(nbbm, t);
+        lastSend60TimeMap.put(nbbm, t);
     }
     public static void put6003(ScheduleRealInfo sch, String sender){
@@ -146,7 +147,7 @@ public class DirectivePushQueue implements ApplicationContextAware {
                             sleepFlag = true;
                         }
                     }
-                    t = System.currentTimeMillis();
+                    threadT = System.currentTimeMillis();
                 }
                 catch(InterruptedException e){
                     log.error("", e);
@@ -3,6 +3,8 @@ package com.bsth.data.safe_driv;
 import com.bsth.websocket.handler.SendUtils;
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
@@ -33,6 +35,8 @@ public class SafeDrivCenter implements ApplicationContextAware {
      */
     private static Map<String, SafeDriv> safeMap;
+    static Logger logger = LoggerFactory.getLogger(SafeDrivCenter.class);
+
     static {
         data = new HashSet<>();
         safeMap = new HashMap<>();
@@ -61,6 +65,7 @@ public class SafeDrivCenter implements ApplicationContextAware {
     public static void clear(){
         data = new HashSet<>();
         safeMap = new HashMap<>();
+        logger.info("清除安全驾驶数据，，，");
     }
     @Override
 package com.bsth.data.schedule.thread;
+import com.bsth.data.directive.DayOfDirectives;
 import com.bsth.data.gpsdata_v2.handlers.overspeed.OverspeedProcess;
 import com.bsth.service.oil.DlbService;
 import com.bsth.data.safe_driv.SafeDrivCenter;
@@ -27,6 +28,9 @@ public class CalcOilThread extends Thread{
     SheetService sheetService;
     Logger logger = LoggerFactory.getLogger(this.getClass());
+    @Autowired
+    DayOfDirectives dayOfDirectives;
+
     @Override
     public void run() {
         try{
@@ -37,12 +41,15 @@ public class CalcOilThread extends Thread{
             logger.info("开始计算班次准点率....");
             sheetService.saveSheetList("");
             logger.info("计算班次准点率结束！");
-            //清除安全驾驶数据 先临时蹭这个线程
-            SafeDrivCenter.clear();
-            //清除超速缓存数据
-            OverspeedProcess.clear();
         } catch(Exception e){
             logger.error("计算路单里程加注量失败",e);
         }
+
+        //清除指令数据
+        dayOfDirectives.clearAll();
+        //清除安全驾驶数据
+        SafeDrivCenter.clear();
+        //清除超速缓存数据
+        OverspeedProcess.clear();
     }
 }
 package com.bsth.data.schedule.thread;
-import com.bsth.data.BasicData;
 import com.bsth.data.LineConfigData;
 import com.bsth.data.directive.DayOfDirectives;
 import com.bsth.data.gpsdata_v2.cache.GpsCacheData;
@@ -56,17 +55,15 @@ public class ScheduleRefreshThread extends Thread{
 					if(oldSchDate == null || !oldSchDate.equals(currSchDate)){
-						//logger.info(lineCode + "开始翻班， " + currSchDate);
-
 						try{
-							//清除指令数据
 							Set<String> cars = dayOfSchedule.findCarByLineCode(lineCode);
 							for(String car : cars){
-								dayOfDirectives.clear(BasicData.deviceId2NbbmMap.inverse().get(car));
 								GpsCacheData.remove(car);
 							}
 							//清除驾驶员上报数据
 							pilotReport.clear(lineCode);
+							//清除指令数据 指令数据，直接定时全部清空
+							//dayOfDirectives.clear(lineCode);
 						}catch (Exception e){
 							logger.error("清理 60 和 80出现问题", e);
 						}
@@ -128,7 +128,7 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
                 text += " (放站到"+sch.getMajorStationName()+"带客)";
             }
-            //下发0x01指令  调度指令(闹钟有效)
+            //下发0x02指令  调度指令(闹钟有效)
             long t = System.currentTimeMillis() + 1000 * 30,
                     alarmTime = sch.getDfsjT() < t?t:sch.getDfsjT();
@@ -139,7 +139,7 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
             int state = 0;//营运状态
             if(dayOfSchedule.emptyService(sch))
                 state = 1;
-            d60 = new DirectiveCreator().createD60_01(sch.getClZbh(), text, Integer.parseInt(sch.getXlDir())
+            d60 = new DirectiveCreator().createD60_02(sch.getClZbh(), text, Integer.parseInt(sch.getXlDir())
                     , state, new Date(alarmTime));
             d60.setLineCode(sch.getXlBm());
@@ -5,6 +5,7 @@ import com.bsth.data.BasicData;
 import com.bsth.data.forecast.entity.ArrivalEntity;
 import com.bsth.data.gpsdata_v2.GpsRealData;
 import com.bsth.data.gpsdata_v2.cache.GeoCacheData;
+import com.bsth.data.gpsdata_v2.cache.GpsCacheData;
 import com.bsth.data.gpsdata_v2.entity.GpsEntity;
 import com.bsth.data.gpsdata_v2.utils.GeoUtils;
 import com.bsth.data.pilot80.PilotReport;
@@ -492,6 +493,7 @@ public class GpsServiceImpl implements GpsService {
         try {
             gpsRealData.remove(device);
+            GpsCacheData.remove(BasicData.deviceId2NbbmMap.get(device));
             rs.put("status", ResponseCode.SUCCESS);
         } catch (Exception e) {
             rs.put("status", ResponseCode.ERROR);
@@ -2762,13 +2762,25 @@ public class BusIntervalServiceImpl implements BusIntervalService {
                  	    		!zdsj.equals(zdsjActual) && 
                  	    		!zdsj.equals("")&&
                  	    		!zdsjActual.equals("")) {
-                        	 if (zdsj.compareTo(zdsjActual) > 0) {
-                        		 maps.put("fast", TimeUtils.getTimeDifference(zdsj, zdsjActual));
-                        		 maps.put("slow", "");
-                        	 } else {
-                        		 maps.put("fast", "");
-                        		 maps.put("slow", TimeUtils.getTimeDifference(zdsj, zdsjActual));
-                        	 }
+                 	    	int zdsjT = Integer.valueOf(zdsj.split(":")[0])*60 + Integer.valueOf(zdsj.split(":")[1]);
+                 	    	int zdsjAT = Integer.valueOf(zdsjActual.split(":")[0])*60 + Integer.valueOf(zdsjActual.split(":")[1]);
+                        	if (zdsj.compareTo(zdsjActual) > 0) {
+                        		if(zdsjT - zdsjAT > 1000){
+                            		maps.put("fast", "");
+                            		maps.put("slow", zdsjAT - zdsjT + 1440);
+                        		} else {
+	                        		maps.put("fast", TimeUtils.getTimeDifference(zdsj, zdsjActual));
+	                        		maps.put("slow", "");
+                        		}
+                        	} else {
+                              	if(zdsjAT - zdsjT > 1000){
+        	                        maps.put("fast", zdsjT - zdsjAT + 1440);
+        	                        maps.put("slow", "");
+                          	} else {
+        	                        maps.put("fast", "");
+        	                        maps.put("slow", TimeUtils.getTimeDifference(zdsj, zdsjActual));
+                          	}
+                        	}
                  	    } else {
                  	    	maps.put("fast", "");
                  	    	maps.put("slow", "");
@@ -698,13 +698,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             //数据库删除
             rs = super.delete(id);
             if(rs.get("status").equals(ResponseCode.SUCCESS)){
-                /*ScheduleRealInfo temp = super.findById(id);
-                if(temp != null){
-                    rs.put("status", ResponseCode.ERROR);
-                    rs.put("msg", "删除失败，请重试！");
-                    return rs;
-                }*/
-
                 dayOfSchedule.delete(sch);
                 //更新起点应到时间
                 List<ScheduleRealInfo> ts = dayOfSchedule.updateQdzTimePlan(sch);
@@ -1027,12 +1020,24 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                         !zdsj.equals(zdsjActual) && 
                         !zdsj.equals("")&&
                         !zdsjActual.equals("")) {
+                	int zdsjT = Integer.valueOf(zdsj.split(":")[0])*60 + Integer.valueOf(zdsj.split(":")[1]);
+                	int zdsjAT = Integer.valueOf(zdsjActual.split(":")[0])*60 + Integer.valueOf(zdsjActual.split(":")[1]);
                     if (zdsj.compareTo(zdsjActual) > 0) {
-                        maps.put("fast", TimeUtils.getTimeDifference(zdsj, zdsjActual));
-                        maps.put("slow", "");
+                    	if(zdsjT - zdsjAT > 1000){
+                    		maps.put("fast", "");
+                    		maps.put("slow", zdsjAT - zdsjT + 1440);
+                    	} else {
+	                        maps.put("fast", TimeUtils.getTimeDifference(zdsj, zdsjActual));
+	                        maps.put("slow", "");
+                    	}
                     } else {
-                        maps.put("fast", "");
-                        maps.put("slow", TimeUtils.getTimeDifference(zdsj, zdsjActual));
+                    	if(zdsjAT - zdsjT > 1000){
+	                        maps.put("fast", zdsjT - zdsjAT + 1440);
+	                        maps.put("slow", "");
+                    	} else {
+	                        maps.put("fast", "");
+	                        maps.put("slow", TimeUtils.getTimeDifference(zdsj, zdsjActual));
+                    	}
                     }
                 } else {
                     maps.put("fast", "");
@@ -3707,12 +3712,24 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                         String zdsjActual = scheduleRealInfo.getZdsjActual();
                         if (zdsj != null && zdsjActual != null &&
                                 !zdsj.equals(zdsjActual)) {
+                        	int zdsjT = Integer.valueOf(zdsj.split(":")[0])*60 + Integer.valueOf(zdsj.split(":")[1]);
+                        	int zdsjAT = Integer.valueOf(zdsjActual.split(":")[0])*60 + Integer.valueOf(zdsjActual.split(":")[1]);
                             if (zdsj.compareTo(zdsjActual) > 0) {
-                                map.put("fast", TimeUtils.getTimeDifference(zdsj, zdsjActual));
-                                map.put("slow", "");
+                            	if(zdsjT - zdsjAT > 1000){
+                            		map.put("fast", "");
+                            		map.put("slow", zdsjAT - zdsjT + 1440);
+                            	} else {
+        	                        map.put("fast", TimeUtils.getTimeDifference(zdsj, zdsjActual));
+        	                        map.put("slow", "");
+                            	}
                             } else {
-                                map.put("fast", "");
-                                map.put("slow", TimeUtils.getTimeDifference(zdsj, zdsjActual));
+                            	if(zdsjAT - zdsjT > 1000){
+        	                        map.put("fast", zdsjT - zdsjAT + 1440);
+        	                        map.put("slow", "");
+                            	} else {
+        	                        map.put("fast", "");
+        	                        map.put("slow", TimeUtils.getTimeDifference(zdsj, zdsjActual));
+                            	}
                             }
                         } else {
                             map.put("fast", "");
@@ -4703,12 +4720,24 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                       !zdsj.equals(zdsjActual) && 
                       !zdsj.equals("")&&
                       !zdsjActual.equals("")) {
+            	  int zdsjT = Integer.valueOf(zdsj.split(":")[0])*60 + Integer.valueOf(zdsj.split(":")[1]);
+              	int zdsjAT = Integer.valueOf(zdsjActual.split(":")[0])*60 + Integer.valueOf(zdsjActual.split(":")[1]);
                   if (zdsj.compareTo(zdsjActual) > 0) {
-                      maps.put("fast", TimeUtils.getTimeDifference(zdsj, zdsjActual));
-                      maps.put("slow", "");
+                  	if(zdsjT - zdsjAT > 1000){
+                  		maps.put("fast", "");
+                  		maps.put("slow", zdsjAT - zdsjT + 1440);
+                  	} else {
+	                        maps.put("fast", TimeUtils.getTimeDifference(zdsj, zdsjActual));
+	                        maps.put("slow", "");
+                  	}
                   } else {
-                      maps.put("fast", "");
-                      maps.put("slow", TimeUtils.getTimeDifference(zdsj, zdsjActual));
+                  	if(zdsjAT - zdsjT > 1000){
+	                        maps.put("fast", zdsjT - zdsjAT + 1440);
+	                        maps.put("slow", "");
+                  	} else {
+	                        maps.put("fast", "");
+	                        maps.put("slow", TimeUtils.getTimeDifference(zdsj, zdsjActual));
+                  	}
                   }
               } else {
                   maps.put("fast", "");
@@ -93,8 +93,10 @@ public class ReportServiceImpl implements ReportService{
 			String sbbb=BasicData.deviceId2NbbmMap.inverse().get(clzbh);
 			SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 			SimpleDateFormat sdf = new SimpleDateFormat("HH:mm:ss");
-			Long date1=simpleDateFormat.parse(date+" "+sjfc+":00").getTime();
-			Long date2=simpleDateFormat.parse(date+" "+sjdd+":00").getTime();
+//			Long date1=simpleDateFormat.parse(date+" "+sjfc+":00").getTime();
+//			Long date2=simpleDateFormat.parse(date+" "+sjdd+":00").getTime();
+			Long date1=simpleDateFormat.parse(sjfc+":00").getTime();
+			Long date2=simpleDateFormat.parse(sjdd+":00").getTime();
 			Date dates=simpleDateFormat.parse(date+" 00:00:00");
 			List<ArrivalInfo> lists=load(line,sbbb,date1,date2,dates,date);
@@ -129,20 +131,22 @@ public class ReportServiceImpl implements ReportService{
 		cal.setTime(dates);
 		//周数，表分区字段
 		int weeks_year = cal.get(Calendar.WEEK_OF_YEAR);
-
+		int weeks_year_next=weeks_year +1;
 		Connection conn = null;
 		PreparedStatement ps = null;
 		ResultSet rs = null;
 		String year=date.substring(0,4);
-		String sql = "select * from bsth_c_arrival_info_"+year+" where  device_id=? AND line_id=? AND weeks_year=? AND ts > ? AND ts <=? order by ts";
+		String sql = "select * from bsth_c_arrival_info_"+year+" where  device_id=? AND line_id=? "
+				+ " AND weeks_year>=? AND weeks_year<=? AND ts >= ? AND ts <=? order by ts";
 		try{
 			conn = DBUtils_MS.getConnection();
 			ps = conn.prepareStatement(sql);
 			ps.setString(1, sbbb);
 			ps.setString(2,line);
 			ps.setInt(3, weeks_year);
-			ps.setLong(4, date1);
-			ps.setLong(5, date2);
+			ps.setInt(4, weeks_year_next);
+			ps.setLong(5, date1);
+			ps.setLong(6, date2);
 			rs = ps.executeQuery();
 			list = resultSet2Set(rs);
@@ -588,12 +588,13 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
         function jsyUpdate(){
         	var params=getParamsList();
+			var id = $(this).data('id');
         	$get('/ylb/checkDate',params,function(status){
         		if(status=='2'){
            		 layer.msg('只能操作三天内数据.');
            		}else{
-					var id = $(this).data('id');
 		    		var jsy=$('.in_carpark_jsy[data-id='+id+']', '#dl_oil_list').val();
+		    		console.log(id+"修改驾驶员:"+jsy);
 		    		$get('/dlb/updateJsy',{id:id,jsy:jsy}, function(result){
 						layer.msg('修改成功.');
 		                page = 0;
@@ -375,10 +375,18 @@
                     var zdsjActual = (obj.zdsjActual).split(":");
                     var zdsj = (obj.zdsj).split(":");
                     if(zdsjActual[0]*60+Number(zdsjActual[1]) > zdsj[0]*60+Number(zdsj[1])){
-                        obj["slow"] = (zdsjActual[0]*60+Number(zdsjActual[1])) - (zdsj[0]*60+Number(zdsj[1]));
+                    	if(zdsjActual[0]*60+Number(zdsjActual[1]) - zdsj[0]*60+Number(zdsj[1]) > 1000){
+                    		obj["fast"] = (zdsj[0]*60+Number(zdsj[1])) - (zdsjActual[0]*60+Number(zdsjActual[1])) + 1440;
+                    	} else {
+                        	obj["slow"] = (zdsjActual[0]*60+Number(zdsjActual[1])) - (zdsj[0]*60+Number(zdsj[1]));
+                    	}
                     }
                     else if(zdsjActual[0]*60+Number(zdsjActual[1]) < zdsj[0]*60+Number(zdsj[1])){
-                        obj["fast"] = (zdsj[0]*60+Number(zdsj[1])) - (zdsjActual[0]*60+Number(zdsjActual[1]));
+                    	if((zdsj[0]*60+Number(zdsj[1])) - (zdsjActual[0]*60+Number(zdsjActual[1])) > 1000){
+                    		obj["slow"] = (zdsjActual[0]*60+Number(zdsjActual[1])) - (zdsj[0]*60+Number(zdsj[1])) + 1440;
+                    	} else {
+                        	obj["fast"] = (zdsj[0]*60+Number(zdsj[1])) - (zdsjActual[0]*60+Number(zdsjActual[1]));
+                    	}
                     }
                 }
             }); 
@@ -764,10 +764,10 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
         function jsyUpdate(){
         	var params=getParamsList();
         	$get('/ylb/checkDate',params,function(status){
+				var id = $(this).data('id');
 	            if(status=='2'){
 	               	layer.msg('只能操作三天内数据.');
 	            }else{
-					var id = $(this).data('id');
 		    		var jsy=$('.in_carpark_jsy[data-id='+id+']', '#ll_oil_list').val();
 		    		$get('/ylb/updateJsy',{id:id,jsy:jsy}, function(result){
 						layer.msg('修改成功.');
@@ -389,6 +389,14 @@
 			var id=params[0].split("\\")[0];
 			 var fcsj =  $('.in_carpark_fcsj[data-id='+id+']', '#forms').html();
 			 var ddsj=   $('.in_carpark_zdsj[data-id='+id+']', '#forms').html();
+			 var d1 = new Date(fcsj+":00");
+             var d2 = new Date(ddsj+":00");
+             console.log(parseInt(d1 - d2) / 1000 / 60);//两个时间相差的分钟数
+             if(parseInt(d1 - d2)>0){
+            	 d2.setDate(d2.getDate()+1);//设置天数 -1 天  
+            	 ddsj = d2.getFullYear() + '-' + (d2.getMonth() + 1) + '-' + d2.getDate() + ' ' + d2.getHours() + ':' + d2.getMinutes(); 
+			}
+             
 			 if(!(typeof(fcsj)=='undefined'|| typeof(ddsj)=='undefined')){
 					$get('/report/queryListZdxx',{clzbh:nbbm,date:rq,line:line,fcsj:fcsj,ddsj:ddsj},function(result){
 					    var xlmc="线路: "+$("#select2-line-container").html();
@@ -396,8 +404,8 @@
 					    var rqmc="日期: "+rq;
 					    var bcmc="班次: "+fcsj+"-"+ddsj;
 					    $("#dlzmx").html("到离站详细                "+xlmc+"   "+clmc+"   "+rqmc+"   "+bcmc);
-					    $("#fcsj_xx").val(fcsj);
-					    $("#ddsj_xx").val(ddsj);
+	                    $("#fcsj_xx").val(fcsj);
+ 					    $("#ddsj_xx").val(ddsj);
 						var ludan_ll_1 = template('ludan_ll_1',{list:result});
 							// 把渲染好的模版html文本追加到表格中
 						$('#forms1 .ludan_ll_1').html(ludan_ll_1);
@@ -419,7 +427,7 @@
 				layer.msg("请选择时间");
 			}else if(zdlx=="" || zdlx==null){
 				layer.msg("请选择方向");
-			}else if(zd=="" || zd==null){
+			}else if(zd=="" || zd==null||zd==" "){
 				layer.msg("请选择站点");
 			}else{
 				   var xlmc="线路: "+$("#select2-line-container").html();
@@ -557,8 +565,8 @@
 							整点
 						{{/if}}
 						)
-						<span class="in_carpark_fcsj" data-id="{{i+1}}" style="display:none">{{obj.fcsjActual}}</span>
-						<span class="in_carpark_zdsj" data-id="{{i+1}}" style="display:none">{{obj.zdsjActual}}</span>
+						<span class="in_carpark_fcsj" data-id="{{i+1}}" style="display:none">{{obj.realExecDate}} {{obj.fcsjActual}}</span>
+						<span class="in_carpark_zdsj" data-id="{{i+1}}" style="display:none">{{obj.realExecDate}} {{obj.zdsjActual}}</span>
 					</a>
 				{{/if}}
 			</td>
@@ -110,6 +110,7 @@
 <!-- jquery.serializejson JSON序列化插件 -->
 <script src="/assets/plugins/jquery.serializejson.js" merge="uikit_js"></script>
+<script src="/assets/plugins/pinyin.js" merge="plugins"></script>
 </body>
 <script>
     gb_data_gps.fixedTimeRefresh();
@@ -36,6 +36,7 @@
                     <div class="uk-autocomplete uk-form " >
                         <select name="abnormalStatus">
                             <option value="">全部</option>
+                            <option value="timeError">时间戳异常</option>
                             <option value="outBounds">越界</option>
                             <option value="overspeed">超速</option>
                             <option value="offline">离线</option>
@@ -58,11 +59,11 @@
                     <th style="width: 14%;">站点</th>
                     <th style="width: 11%;">车辆</th>
                     <th style="width: 11%;">设备号</th>
-                    <th style="width: 9%;">走向/营运</th>
+                    <th style="width: 12%;">走向/营运</th>
                     <th style="width: 9%;">程序版本</th>
                     <th>最后GPS时间</th>
-                    <th style="width: 9%;">状态</th>
-                    <th style="width: 8%;">来源</th>
+                    <th style="width: 8%;">状态</th>
+                    <th style="width: 6%;">源</th>
                 </tr>
                 </thead>
                 <tbody>
@@ -81,7 +82,11 @@
             <td>{{gps.stationName}}</td>
             <td>{{gps.nbbm}}</td>
             <td>{{gps.deviceId}}</td>
-            <td>{{gps.upDown}}/{{gps.state}}</td>
+            <td>{{gps.upDown}}/{{gps.state}}
+                {{if gps.origStateStr!=null}}
+                    （<span style="color: #fe6262;">{{gps.origStateStr}}</span>）
+                {{/if}}
+            </td>
             <td>{{gps.version}}</td>
             <td>{{gps.timeStr}}</td>
             <td>
@@ -95,18 +100,14 @@
                     <span class="sm-red">GPS (0,0)</span>
                 {{else if gps.abnormalStatus=='offline'}}
                     <span>离线</span>
+                {{else if gps.abnormalStatus=='timeError'}}
+                    <span class="sm-red" title="设备时间戳异常，尝试以服务器时间修正">time_ex</span>
                 {{else}}
                     ...
                 {{/if}}
             </td>
             <td>
-                {{if gps.source==1}}
-                    <span style="color: #1e1ef5;" title="已切换至新网关">网关</span>
-                {{else if gps.source==0}}
-                    <span style="color: #8e8e8e;" title="转接的数据，无法下发指令">转发</span>
-                {{else}}
-                    <span class="sm-grey">未知</span>
-                {{/if}}
+                <span class="sm-grey">{{gps.source}}</span>
             </td>
         </tr>
         {{/each}}