Merge branch 'minhang' of git@192.168.168.201:panzhaov5/bsth_control.git into minhang

zb
2 parents d84eb3f0 1fe557a5
Showing 29 changed files with 1930 additions and 1791 deletions
src/main/java/com/bsth/controller/directive/DirectiveController.java
src/main/java/com/bsth/controller/directive/UpstreamEntrance.java
src/main/java/com/bsth/controller/realcontrol/LineConfigController.java
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/controller/realcontrol/anomalyCheckController.java
src/main/java/com/bsth/controller/report/ReportController.java
src/main/java/com/bsth/data/directive/DirectiveCreator.java
src/main/java/com/bsth/data/gpsdata/GpsEntity.java
src/main/java/com/bsth/data/gpsdata/arrival/handlers/InOutStationSignalHandle.java
src/main/java/com/bsth/data/gpsdata/thread/OfflineMonitorThread.java
src/main/java/com/bsth/data/msg_queue/DirectivePushQueue.java
src/main/java/com/bsth/data/msg_queue/WebSocketPushQueue.java
src/main/java/com/bsth/data/pilot80/PilotReport.java
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/java/com/bsth/data/schedule/SchAttrCalculator.java
src/main/java/com/bsth/entity/directive/DC0_A4.java
src/main/java/com/bsth/repository/directive/DC0A4Repository.java
src/main/java/com/bsth/service/directive/DirectiveService.java
src/main/java/com/bsth/service/directive/DirectiveServiceImpl.java
src/main/java/com/bsth/service/directive/dto/DeviceConfigDto.java
@@ -173,15 +173,10 @@ public class DirectiveController {
 	}
  
 	@RequestMapping(value = "/c0a4", method = RequestMethod.POST)
-	public int c0a4(@RequestParam String nbbm){
+	public Map<String, Object> c0a4(@RequestParam String nbbm){
 		return directiveService.sendC0A4(nbbm);
 	}
  
-//	@RequestMapping(value = "/c0a3", method = RequestMethod.POST)
-//	public int c0a3(@RequestParam DC0_A4 c0a4){
-//		return directiveService.sendC0A3(c0a4);
-//	}
-	
 	@RequestMapping(value = "/c0a3", method = RequestMethod.POST)
 	public int c0a3(String json){
 		json = StringEscapeUtils.unescapeHtml4(json);
@@ -192,7 +187,18 @@ public class DirectiveController {
 	@RequestMapping(value = "/c0a5", method = RequestMethod.POST)
 	public int c0a5(String json){
 		json = StringEscapeUtils.unescapeHtml4(json);
-		//DC0_A3 c0a3 = JSON.toJavaObject(JSONObject.parseObject(json), DC0_A3.class);
 		return directiveService.sendC0A5(json);
 	}
+
+	/**
+	 * 设备参数查询
+	 * @return
+	 */
+	@RequestMapping(value = "/deviceCofigList", method = RequestMethod.GET)
+	public Map<String, Object> deviceCofigList(
+			@RequestParam Map<String, String> map,
+			@RequestParam(defaultValue = "0") int page,
+			@RequestParam(defaultValue = "10") int size){
+		return directiveService.deviceCofigList(map, page, size);
+	}
 }
 package com.bsth.controller.directive;
  
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -59,7 +60,8 @@ public class UpstreamEntrance {
 					case 0x26:
 						// 驾驶员上报
 						D80 d80 = JSON.toJavaObject(jsonParam, D80.class);
-						pilotReport.report(d80);
+						if(d80!=null && StringUtils.isNotEmpty(d80.getDeviceId()))
+							pilotReport.report(d80);
 						break;
  
 					case 0xA4:
@@ -67,9 +69,9 @@ public class UpstreamEntrance {
 						data.put("posPort", data.getString("posPort").trim());
 						data.put("posIpAddress", data.getString("posIpAddress").trim());
 						data.put("ipAddress", data.getString("ipAddress").trim());
-						
+
 						DC0_A4 c0a4 = JSON.toJavaObject(jsonParam, DC0_A4.class);
-						System.out.println(c0a4);
+						pilotReport.report(c0a4);
 						break;
 					}
  
@@ -101,4 +101,14 @@ public class LineConfigController extends BaseController&lt;LineConfig, Integer&gt;{
 		//System.out.println(map);
 		return lineConfigService.yjtkSet(map);
 	}
+
+	/**
+	 * 修改场既是站的  停车场 和 站点
+	 * @param map
+	 * @return
+	 */
+	@RequestMapping(value = "/parkAndStationSet", method = RequestMethod.POST)
+	public Map<String, Object> parkAndStationSet(@RequestParam Map<String, String> map){
+		return lineConfigService.parkAndStationSet(map);
+	}
 }
@@ -294,6 +294,21 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 		return scheduleRealInfoService.findKMBC(jGh, clZbh,lpName,date,line);
 	}
  
+	/**
+	 * 路单公里统计 （闵行审计专用）
+	 * @param jGh
+	 * @param clZbh
+	 * @param lpName
+	 * @param date
+	 * @param line
+	 * @return
+	 */
+	@RequestMapping(value="/findKMBC_mh_2",method = RequestMethod.GET)
+	public Map<String,Object> findKMBC_mh_2(@RequestParam String jGh,@RequestParam String clZbh,@RequestParam String lpName
+			,@RequestParam String date,@RequestParam String line){
+		return scheduleRealInfoService.findKMBC_mh_2(jGh, clZbh,lpName,date,line);
+	}
+
 	@RequestMapping(value="/findKMBCQp",method = RequestMethod.GET)
 	public Map<String,Object> findKMBCQp(@RequestParam String clZbh
 			,@RequestParam String date,@RequestParam String line){
@@ -337,6 +352,20 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 		return scheduleRealInfoService.queryListWaybill(jName, clZbh,lpName,date,line);
 	}
  
+	/**
+	 * @Title queryListWaybill
+	 * @Description 查询行车路单列表（闵行审计专用路单）
+	 * @param jName 驾驶员名字
+	 * @param clZbh 车辆自编号（内部编号）
+	 * @param lpName 路牌
+	 * @return
+	 */
+	@RequestMapping(value="/queryListWaybill_mh_2",method = RequestMethod.GET)
+	public List<ScheduleRealInfo> queryListWaybill_mh_2(@RequestParam String jName,@RequestParam String clZbh,@RequestParam String lpName
+			,@RequestParam String date,@RequestParam String line){
+		return scheduleRealInfoService.queryListWaybill2(jName, clZbh,lpName,date,line);
+	}
+
 	@RequestMapping(value="/queryListWaybillQp",method = RequestMethod.GET)
 	public List<ScheduleRealInfo> queryListWaybillQp(@RequestParam String clZbh,
 													 @RequestParam String date,@RequestParam String line){
@@ -349,6 +378,12 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 		return scheduleRealInfoService.statisticsDaily(line, date, xlName, type);
 	}
  
+	@RequestMapping(value="/statisticsDaily_mh_2")
+	public List<Map<String,Object>> statisticsDaily_mh_2(@RequestParam String line, @RequestParam String date,
+													@RequestParam String xlName, @RequestParam String type){
+		return scheduleRealInfoService.statisticsDaily_mh_2(line, date, xlName, type);
+	}
+
 	@RequestMapping(value="/statisticsDailyTj")
 	public List<Map<String,Object>> statisticsDailyTj(@RequestParam Map<String, Object> map){
 		String gsdm="";
@@ -404,6 +439,11 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 		return scheduleRealInfoService.realScheduleList(line,date);
 	}
  
+	@RequestMapping(value="/realScheduleList_mh_2")
+	public List<ScheduleRealInfo> realScheduleList_mh_2(@RequestParam String line,@RequestParam String date){
+		return scheduleRealInfoService.realScheduleList_mh_2(line,date);
+	}
+
 	@RequestMapping(value="/realScheduleListQp")
 	public List<ScheduleRealInfo> realScheduleListQp(@RequestParam String line,@RequestParam String date){
 		return scheduleRealInfoService.realScheduleListQp(line,date);
@@ -69,11 +69,21 @@ public class anomalyCheckController {
         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)
@@ -261,4 +261,17 @@ public class ReportController {
 		return service.userList(map);
 	}
  
+	@RequestMapping(value="/countLineMileage")
+	public List<Map<String,Object>> countLineMileage(@RequestParam Map<String, Object> map){
+		
+		return service.countByList(map);
+	}
+	
+	@RequestMapping(value="/countBusMileage")
+	public List<Map<String,Object>> countBusMileage(@RequestParam Map<String, Object> map){
+		
+		return service.countByBusList(map);
+	}
+	
+	
 }
 package com.bsth.data.directive;
  
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.alibaba.fastjson.JSON;
 import com.bsth.data.BasicData;
 import com.bsth.entity.directive.D60;
 import com.bsth.entity.directive.D60.D60Data;
 import com.bsth.entity.directive.D64;
 import com.bsth.entity.directive.D64.D64Data;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
  
 /**
  * 
@@ -81,7 +80,7 @@ public class DirectiveCreator {
 	}
  
  
-	public D60 createD60_02(String nbbm, String text, int upDown, int state, Date alarmTime){
+	public D60 createD60_01(String nbbm, String text, int upDown, int state, Date alarmTime){
 		SimpleDateFormat sdfMMddHHmm = new SimpleDateFormat("MMddHHmm");
  
 		Long timestamp = System.currentTimeMillis();
@@ -102,7 +101,7 @@ public class DirectiveCreator {
 		directive.setMsgId(msgId);
 		// 构造数据
 		data.setDeviceId(deviceId);
-		data.setDispatchInstruct((short) 0x02);
+		data.setDispatchInstruct((short) 0x01);
 		data.setTimestamp(timestamp);
 		data.setCompanyCode(company);
 		data.setMsgId(msgId);
@@ -307,4 +307,28 @@ public class GpsEntity {
 	public void setSource(int source) {
 		this.source = source;
 	}
+
+	public void offline(){
+		this.setAbnormalStatus("offline");
+	}
+
+	public boolean isOnline(){
+		if(isOffline())
+			return false;
+
+		long t = System.currentTimeMillis();
+
+		if((t - this.getTimestamp()) > 1000 * 60){
+			return false;
+		}
+
+		if((this.getTimestamp() - t) > 1000 * 60 * 3){
+			return false;
+		}
+		return true;
+	}
+
+	public boolean isOffline(){
+		return this.getAbnormalStatus() != null && this.getAbnormalStatus().equals("offline");
+	}
 }
@@ -96,9 +96,15 @@ public class InOutStationSignalHandle extends SignalHandle{
         }
  
         //从站内到另一个站内
-        if(prev.getInstation() > 0 && gps.getInstation() > 0
-                && !prev.getStopNo().equals(gps.getStopNo()))
+        if(prev.getInstation() == 1 && gps.getInstation() == 1
+                && !prev.getStopNo().equals(gps.getStopNo())
+                && !prev.getStation().getName().equals(gps.getStation().getName()))
             return true;
+
+        //从场内到站内
+        if(prev.getInstation() == 2 && gps.getInstation() == 1){
+            return true;
+        }
         return false;
     }
  
@@ -45,7 +45,7 @@ public class OfflineMonitorThread extends Thread{
                     continue;
  
                 if (t - gps.getTimestamp() > LOSE_TIME){
-                    gps.setAbnormalStatus("offline");
+                    gps.offline();
  
                     //通知页面有设备掉线
                     sendUtils.deviceOffline(gps);
@@ -10,7 +10,7 @@ import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.stereotype.Component;
  
-import java.util.LinkedList;
+import java.util.concurrent.ConcurrentLinkedQueue;
  
 /**
  * 到网关的指令推送队列 （系统发送的队列， 用户手动发送的不走这里）
@@ -19,14 +19,14 @@ import java.util.LinkedList;
 @Component
 public class DirectivePushQueue implements CommandLineRunner, ApplicationContextAware {
  
-    static LinkedList<QueueData_Directive> linkedList;
+    static ConcurrentLinkedQueue<QueueData_Directive> linkedList;
     static DataPushThread thread;
     static DirectiveService directiveService;
     static long t;
     static final int IDLE_TIME = 1000 * 30;
  
     static {
-        linkedList = new LinkedList<>();
+        linkedList = new ConcurrentLinkedQueue<>();
     }
  
     public static void put6002(ScheduleRealInfo sch, int finish, String sender){
@@ -71,10 +71,15 @@ public class DirectivePushQueue implements CommandLineRunner, ApplicationContext
         if(thread != null){
             thread.interrupt();
         }
+        linkedList.clear();
         thread = new DataPushThread();
         thread.start();
     }
  
+    public static int size(){
+        return linkedList.size();
+    }
+
     @Override
     public void run(String... strings) throws Exception {
         start();
@@ -96,7 +101,7 @@ public class DirectivePushQueue implements CommandLineRunner, ApplicationContext
             String code;
             while (true) {
                 try {
-                    qd = linkedList.pollFirst();
+                    qd = linkedList.poll();
                     if (qd != null) {
                         sleepFlag = false;
                         code = qd.getCode();
@@ -124,13 +129,15 @@ public class DirectivePushQueue implements CommandLineRunner, ApplicationContext
                     t = System.currentTimeMillis();
                 }
                 catch(InterruptedException e){
+                    log.error("", e);
                     break;
                 }
                 catch (Exception e) {
                     log.error("", e);
                 }
-
             }
+
+            log.warn("DirectivePushQueue is break...");
         }
     }
 }
@@ -8,7 +8,7 @@ import org.springframework.stereotype.Component;
 import org.springframework.web.socket.TextMessage;
 import org.springframework.web.socket.WebSocketSession;
  
-import java.util.LinkedList;
+import java.util.concurrent.ConcurrentLinkedQueue;
  
 /**
  * 线调web socket 推送队列
@@ -17,14 +17,14 @@ import java.util.LinkedList;
 @Component
 public class WebSocketPushQueue implements CommandLineRunner {
  
-    static LinkedList<QueueData> linkedList;
+    static ConcurrentLinkedQueue<QueueData> linkedList;
     static DataPushThread thread;
     static Logger log = LoggerFactory.getLogger(WebSocketPushQueue.class);
     static long t;
     static final int IDLE_TIME = 1000 * 30;
  
     static {
-        linkedList = new LinkedList();
+        linkedList = new ConcurrentLinkedQueue();
     }
  
     public static boolean isIdle() {
@@ -45,10 +45,15 @@ public class WebSocketPushQueue implements CommandLineRunner {
         if (thread != null) {
             thread.interrupt();
         }
+        linkedList.clear();
         thread = new DataPushThread();
         thread.start();
     }
  
+    public static int size(){
+        return linkedList.size();
+    }
+
     @Override
     public void run(String... strings) throws Exception {
         start();
@@ -66,7 +71,7 @@ public class WebSocketPushQueue implements CommandLineRunner {
             boolean sleepFlag = false;
             while (true) {
                 try {
-                    qd = linkedList.pollFirst();
+                    qd = linkedList.poll();
                     if (qd != null) {
                         sleepFlag = false;
                         session = qd.getSession();
@@ -84,11 +89,14 @@ public class WebSocketPushQueue implements CommandLineRunner {
                     }
                     t = System.currentTimeMillis();
                 } catch (InterruptedException e) {
+                    log.error("", e);
                     break;
                 } catch (Exception e) {
                     log.error("", e);
                 }
             }
+
+            log.warn("WebSocketPushQueue is break...");
         }
     }
 }
@@ -8,13 +8,16 @@ import com.bsth.data.msg_queue.DirectivePushQueue;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.entity.Line;
 import com.bsth.entity.directive.D80;
+import com.bsth.entity.directive.DC0_A4;
 import com.bsth.entity.realcontrol.D80ReplyTemp;
 import com.bsth.entity.realcontrol.LineConfig;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.repository.directive.D80Repository;
+import com.bsth.repository.directive.DC0A4Repository;
 import com.bsth.service.directive.DirectiveService;
 import com.bsth.websocket.handler.SendUtils;
 import com.google.common.collect.ArrayListMultimap;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,7 +30,7 @@ import java.util.List;
 /**
  * 
  * @ClassName: PilotReport 
- * @Description: TODO(驾驶员上报) 
+ * @Description: TODO(设备80协议上报处理)
  * @author PanZhao
  * @date 2016年8月14日 下午11:37:51 
  *
@@ -37,31 +40,26 @@ public class PilotReport {
  
 	@Autowired
 	D80Repository d80Repository;
-	
 	@Autowired
 	DayOfSchedule dayOfSchedule;
-	
 	@Autowired
 	LineConfigData lineConfigData;
-	
 	@Autowired
 	DirectiveService directiveService;
-	
 	@Autowired
 	GpsRealData gpsRealData;
-	
 	@Autowired
 	SendUtils sendUtils;
-	
-	//private static ScheduleComparator.FCNO schComp;
-	
+
+	@Autowired
+	DC0A4Repository dc0A4Repository;
+
 	private static ArrayListMultimap<String, D80> d80MultiMap;
  
 	Logger logger = LoggerFactory.getLogger(PilotReport.class);
  
 	static{
 		d80MultiMap = ArrayListMultimap.create();
-		//schComp = new ScheduleComparator.FCNO();
 	}
  
 	public void report(D80 d80){
@@ -95,22 +93,31 @@ public class PilotReport {
  
 		case 0xA5:
 			//进场请求
-			ScheduleRealInfo inSch = dayOfSchedule.nextByBcType(nbbm, "in");
+			//ScheduleRealInfo inSch = dayOfSchedule.nextByBcType(nbbm, "in");
 			//如果有对应出场班次
-			if(inSch != null){
-				d80.setRemarks("计划进场时间：" + inSch.getDfsj());
+			//if(inSch != null){
+				/*d80.setRemarks("计划进场时间：" + inSch.getDfsj());
 				//当前GPS位置
 				GpsEntity gps = gpsRealData.get(d80.getDeviceId());
 				if(null != gps)
-					d80.addRemarks("<br> 位置：" + coordHtmlStr(gps));
-			}else
-				d80.setRemarks("没有进场计划");
+					d80.addRemarks("<br> 位置：" + coordHtmlStr(gps));*/
+			//}/*else
+			//	d80.setRemarks("没有进场计划");*/
 			break;
 		}
  
 		//推送到页面
 		sendUtils.send80ToPage(d80);
 	}
+
+	public void report(DC0_A4 c0a4){
+		String deviceId = c0a4.getData().getDeviceId();
+		if(StringUtils.isNotEmpty(deviceId))
+			c0a4.setId(deviceId);
+
+		//入库
+		dc0A4Repository.save(c0a4);
+	}
  
 	/**
 	 * 
@@ -181,7 +188,7 @@ public class PilotReport {
 				sch.setZdsjActualAll(d80.getTimestamp());
  
 				//没有里程的进场班次
-				if(sch.getBcsj() == null && sch.getJhlc() == null)
+				if(isEmpty(sch.getBcsj()) && isEmpty(sch.getJhlc()))
 					sch.setFcsjActualAll(d80.getTimestamp());
  
 				dayOfSchedule.save(sch);
@@ -190,6 +197,14 @@ public class PilotReport {
 			}
 		}
 	}
+
+	public boolean isEmpty(Integer v){
+		return v == null || v.equals(0);
+	}
+
+	public boolean isEmpty(Double v){
+		return v == null || v.equals(0);
+	}
  
 	public void defaultReply(String nbbm, short requestCode, boolean agree){
 		Line line = BasicData.nbbm2LineMap.get(nbbm);
@@ -4,9 +4,12 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.bsth.common.Constants;
 import com.bsth.common.ResponseCode;
+import com.bsth.data.BasicData;
 import com.bsth.data.LineConfigData;
+import com.bsth.data.gpsdata.GpsEntity;
 import com.bsth.data.gpsdata.GpsRealData;
 import com.bsth.data.gpsdata.recovery.GpsDataRecovery;
+import com.bsth.data.msg_queue.DirectivePushQueue;
 import com.bsth.entity.realcontrol.LineConfig;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.entity.schedule.SchedulePlanInfo;
@@ -579,6 +582,37 @@ public class DayOfSchedule {
     }
  
     /**
+     * 下一个班次
+     * @param list 班次集合
+     * @param sch 当前班次
+     * @return
+     */
+    private ScheduleRealInfo next2(Collection<ScheduleRealInfo> list , ScheduleRealInfo sch){
+        int outConfig = -1;
+        LineConfig config = lineConfigData.get(sch.getXlBm());
+        if (config != null)
+            outConfig = config.getOutConfig();
+
+        boolean flag = false;
+        ScheduleRealInfo next = null;
+        for (ScheduleRealInfo temp : list) {
+            if (temp.getId() == sch.getId()) {
+                flag = true;
+                continue;
+            }
+            //忽略烂班
+            if (temp.isDestroy())
+                continue;
+
+            if (flag) {
+                next = temp;
+                break;
+            }
+        }
+        return next;
+    }
+
+    /**
      * 上一个班次
      *
      * @param sch
@@ -906,7 +940,22 @@ public class DayOfSchedule {
     public void reCalcExecPlan(String nbbm){
         List<ScheduleRealInfo> list = nbbmScheduleMap.get(nbbm);
         Collections.sort(list, schFCSJComparator);
-        carExecutePlanMap.put(nbbm, schAttrCalculator.calcCurrentExecSch(list));
+
+        ScheduleRealInfo sch = schAttrCalculator.calcCurrentExecSch(list);
+        carExecutePlanMap.put(nbbm, sch);
+
+        try {
+            GpsEntity gps = gpsRealData.get(BasicData.deviceId2NbbmMap.inverse().get(nbbm));
+            if(gps != null && gps.isOnline()){
+                if(StringUtils.isNotEmpty(gps.getLineId()) && !gps.getLineId().equals(sch.getXlBm())){
+                    //下发线路切换指令
+                    DirectivePushQueue.put64(nbbm, sch.getXlBm(), "系统");
+                    logger.info("车辆" + nbbm + "切换至" + sch.getXlBm() + " -原" + gps.getLineId() + " --重新计算当前执行班次！");
+                }
+            }
+        }catch (Exception e){
+            logger.error("", e);
+        }
     }
  
     /**
@@ -1016,6 +1065,17 @@ public class DayOfSchedule {
         return next(list, sch);
     }
  
+    /**
+     * 获取该班次所在路牌的下一个班次，不考虑场既是站
+     * @param sch
+     * @return
+     */
+    public ScheduleRealInfo nextByLp2(ScheduleRealInfo sch) {
+        List<ScheduleRealInfo> list = lpScheduleMap.get(sch.getXlBm() + "_" + sch.getLpName());
+        Collections.sort(list, schFCSJComparator);
+        return next2(list, sch);
+    }
+
     public ArrayListMultimap<String, ScheduleRealInfo> getLpScheduleMap(){
         return lpScheduleMap;
     }
@@ -49,25 +49,25 @@ public class SchAttrCalculator {
 			if (null == sch.getFcsjT())
 				calcFcsjTime(sch);
  
-			//計發時間
+			//计发時間
 			if(sch.getFcsj().compareTo(conf.getStartOpt()) < 0){
 				sch.setFcsjAll(fmtyyyyMMddHHmm.parseMillis(sch.getScheduleDateStr()+sch.getFcsj()) + DAY_TIME);
 			}
  
-			//待發時間
+			//待发時間
 			if(sch.getDfsj().compareTo(conf.getStartOpt()) < 0){
 				sch.setDfsjAll(fmtyyyyMMddHHmm.parseMillis(sch.getScheduleDateStr()+sch.getDfsj()) + DAY_TIME);
 			}
 			else
 				sch.setDfsjAll(fmtyyyyMMddHHmm.parseMillis(sch.getScheduleDateStr()+sch.getDfsj()));
  
-			//實發時間
+			//实发時間
 			if(StringUtils.isNotEmpty(sch.getFcsjActual()) &&
 					sch.getFcsjActual().compareTo(conf.getStartOpt()) < 0){
 				sch.setFcsjActualAll(fmtyyyyMMddHHmm.parseMillis(sch.getScheduleDateStr()+sch.getFcsjActual()) + DAY_TIME);
 			}
  
-			//實際終點時間
+			//实际终点時間
 			if(StringUtils.isNotEmpty(sch.getZdsjActual()) &&
 					sch.getZdsjActual().compareTo(conf.getStartOpt()) < 0){
 				sch.setZdsjActualAll(fmtyyyyMMddHHmm.parseMillis(sch.getScheduleDateStr()+sch.getZdsjActual()) + DAY_TIME);
@@ -13,13 +13,21 @@ import javax.persistence.*;
 @Entity
 @Table(name = "bsth_v_C0_A4")
 public class DC0_A4 extends Directive{
-	
+
+
 	@Id
-	@GeneratedValue
-	private Integer id;
+	private String id;
  
 	private DC0A4Data data;
-	
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
 	@Embeddable
 	public static class DC0A4Data {
 		/**
@@ -164,14 +172,6 @@ public class DC0_A4 extends Directive{
 		}
 	}
  
-	public Integer getId() {
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
-
 	public DC0A4Data getData() {
 		return data;
 	}
+package com.bsth.repository.directive;
+
+import com.bsth.entity.directive.DC0_A4;
+import com.bsth.repository.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * C0_A4 设备回复（设备参数）
+ * Created by panzhao on 2017/6/28.
+ */
+@Repository
+public interface DC0A4Repository extends BaseRepository<DC0_A4, String>{
+}
@@ -86,7 +86,7 @@ public interface DirectiveService extends BaseService&lt;D60, Integer&gt;{
  
 	D64 save64(D64 d64);
  
-	int sendC0A4(String nbbm);
+	Map<String, Object> sendC0A4(String nbbm);
  
 	int sendC0A3(DC0_A3 c0a4);
  
@@ -95,4 +95,6 @@ public interface DirectiveService extends BaseService&lt;D60, Integer&gt;{
     int refreshLineFile(String deviceId);
  
     int stateChange(String nbbm, Integer upDown, Integer state, String userName);
+
+    Map<String,Object> deviceCofigList(Map<String, String> map, int page, int size);
 }
@@ -18,6 +18,7 @@ import com.bsth.repository.directive.D60Repository;
 import com.bsth.repository.directive.D64Repository;
 import com.bsth.repository.directive.D80Repository;
 import com.bsth.security.util.SecurityUtils;
+import com.bsth.service.directive.dto.DeviceConfigDto;
 import com.bsth.service.impl.BaseServiceImpl;
 import com.bsth.websocket.handler.RealControlSocketHandler;
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -29,6 +30,8 @@ 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.BeanPropertyRowMapper;
+import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Service;
  
 import java.util.*;
@@ -36,486 +39,540 @@ import java.util.*;
 @Service
 public class DirectiveServiceImpl extends BaseServiceImpl<D60, Integer> implements DirectiveService {
  
-	Logger logger = LoggerFactory.getLogger(this.getClass());
-
-	@Autowired
-	D60Repository d60Repository;
-
-	@Autowired
-	GpsRealData gpsRealDataBuffer;
-
-	@Autowired
-	D64Repository d64Repository;
-
-	@Autowired
-	RealControlSocketHandler socketHandler;
-
-	@Autowired
-	D80Repository d80Repository;
-	
-	@Autowired
-	DayOfDirectives dayOfDirectives;
-	
-	@Autowired
-	PilotReport pilotReport;
-	
-	@Autowired
-	DayOfSchedule dayOfSchedule;
-	
-	//static Long schDiff = 1000 * 60 * 60L;
-
-	private static DateTimeFormatter fmtHHmm = DateTimeFormat.forPattern("HH:mm")
-				,fmtHHmm_CN = DateTimeFormat.forPattern("HH点mm分");
-
-	@Override
-	public int send60Phrase(String nbbm, String text, String sender) {
-		D60 d60 = null;
-		try {
-			d60 = create60Data(nbbm, text, (short) 0x00, null);
-		} catch (Exception e) {
-			logger.error("发送消息短语出现异常", e);
-			return -1;
-		}
-
-		if (null == d60)
-			return -1;
-
-		// 发送指令
-		int code = GatewayHttpUtils.postJson(JSON.toJSONString(d60));
-		if(null != sender)
-			d60.setSender(sender);
-		d60.setHttpCode(code);
-
-		if (code == 0) {
-			// 添加到缓存
-			dayOfDirectives.put60(d60, true);
-		}
-		else{
-			d60.setErrorText("网关通讯失败, code: " + code);
-			d60Repository.save(d60);
-			dayOfDirectives.put60(d60, false);
-		}
-		return code;
-	}
-
-	@Override
-	public int send60Dispatch(ScheduleRealInfo sch, int finish, String sender) {
-		D60 d60 = null;
-		try {
-			if(sch.isDestroy()){
-				logger.warn("烂班不允许发送调度指令....");
-				return -1;
-			}
-			String text = "已完成" + finish + "个班次，下一发车时间" + fmtHHmm_CN.print(sch.getDfsjT()) + "，由"
-					+ sch.getQdzName() + "发往" + sch.getZdzName();
-
-			//下发0x02指令  调度指令(闹钟有效)
-			Long alarmTime = System.currentTimeMillis() + 1000 * 30;
-			d60 = new DirectiveCreator().createD60_02(sch.getClZbh(), text, Integer.parseInt(sch.getXlDir())
-					, 0, new Date(alarmTime));
-		} catch (Exception e) {
-			logger.error("生成调度指令时出现异常", e);
-			return -1;
-		}
-		
-		if (null == d60)
-			return -1;
-		
-		d60.setSender(sender);
-		
-		JSONObject jObj = JSON.parseObject(JSON.toJSONString(d60));
-		
-		//进场或者出场班次时，附加lock 标识
-		if(null != sch.getBcType()
-				&& (sch.getBcType().equals("out") || sch.getBcType().equals("in"))){
-			
-			jObj.put("lock", 1);
-		}
-		
-		// 发送指令
-		int code = GatewayHttpUtils.postJson(jObj.toJSONString());
-
-		d60.setDispatch(true);
-		d60.setSch(sch);
-		d60.setHttpCode(code);
-
-		if (code == 0) {
-			sch.setDirectiveState(60);
-			// 添加到缓存，延迟入库
-			dayOfDirectives.put60(d60, true);
-			// 通知页面
-			sendD60ToPage(sch);
-		}
-		else{
-			d60.setErrorText("网关通讯失败, code: " + code);
-			dayOfDirectives.put60(d60, false);
-			d60Repository.save(d60);
-		}
-		return code;
-	}
-
-	/**
-	 * 
-	 * @Title: sendDirectiveState @Description: TODO(向页面推送班次指令状态) @throws
-	 */
-	@Override
-	public void sendD60ToPage(ScheduleRealInfo sch) {
-		Map<String, Object> map = new HashMap<>();
-		map.put("fn", "directive");
-		map.put("t", sch);
-		
-		ObjectMapper mapper = new ObjectMapper();
-		
-		try {
-			socketHandler.sendMessageToLine(sch.getXlBm(), mapper.writeValueAsString(map));
-		} catch (JsonProcessingException e) {
-			logger.error("", e);
-		}
-	}
-
-	@Override
-	public int send60Dispatch(Long id, String sender) {
-		ScheduleRealInfo sch = dayOfSchedule.get(id);
-		// 车辆已完成班次
-		int finish = dayOfSchedule.doneSum(sch.getClZbh());
-		return send60Dispatch(sch, finish, sender);
-	}
-
-	@Override
-	public int send60Operation(String nbbm, int state, int upDown, ScheduleRealInfo sch, String sender) {
-		logger.info("切换运营状态, nbbm: " + nbbm + " ,state: " + state + " ,upDown:" + upDown);
-
-		String text = "切换为 " + (upDown == 0 ? "上行" : "下行") + (state == 0 ? "营运" : "未营运");
-		D60 d60 = new DirectiveCreator().createD60(nbbm, text, (short) 0x03, upDown, state);
-
-		if (null == d60)
-			return -1;
-		if(null != sender)
-			d60.setSender(sender);
-		else
-			d60.setSender("系统");
-		// 发送指令
-		int code = GatewayHttpUtils.postJson(JSON.toJSONString(d60));
-		// 添加到缓存，等待入库
-		d60.setHttpCode(code);
-		if (null != sch)
-			d60.setSch(sch);
-
-
-		if (code == 0) {
-			dayOfDirectives.put60(d60, true);
-		}
-		else{
-			d60.setErrorText("网关通讯失败, code: " + code);
-			d60Repository.save(d60);
-			dayOfDirectives.put60(d60, false);
-		}
-		return code;
-	}
-
-	/**
-	 * 线路切换
-	 */
-	@Override
-	public int lineChange(String nbbm, String lineCode, String sender) {
-		return lineChangeByDeviceId(BasicData.deviceId2NbbmMap.inverse().get(nbbm), lineCode, sender);
-	}
-
-
-	@Override
-	public int lineChangeByDeviceId(String deviceId, String lineCode, String sender){
-		DirectiveCreator crt = new DirectiveCreator();
-		Long t = System.currentTimeMillis();
-		//生成64数据包
-		D64 d64 = crt.create64(deviceId, lineCode, t);
-
-		if(null != sender)
-			d64.setSender(sender);
-		else
-			d64.setSender("系统");
-
-		//String deviceId = d64.getDeviceId();
-		int code = GatewayHttpUtils.postJson(JSON.toJSONString(d64));
-		// 入库
-		d64.setHttpCode(code);
-		d64.getData().setTxtContent("切换线路[" + lineCode + "]");
-		dayOfDirectives.put64(d64);
-
-		// 通知设备刷新线路文件，忽略结果
-		if (code == 0)
-			GatewayHttpUtils.postJson(crt.createDeviceRefreshData(deviceId, lineCode));
-		else
-			d64.setErrorText(" 网关通讯失败, code: " + code);
-
-		d64Repository.save(d64);
-		return code;
-	}
-
-	public D60 create60Data(String nbbm, String text, Short dispatchInstruct, ScheduleRealInfo sch) {
-
-		String deviceId = BasicData.deviceId2NbbmMap.inverse().get(nbbm);
-		if (null == deviceId) {
-			logger.error("没有设备号对照的车辆：" + nbbm);
-			return null;
-		}
-		// 根据当前GPS确定 上下行和营运状态
-		Byte upDown = null;
-		Integer state = null;
-		if (null == sch) {
-			GpsEntity gpsData = gpsRealDataBuffer.get(deviceId);
-			if (null == gpsData) {
-				/*
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Autowired
+    D60Repository d60Repository;
+
+    @Autowired
+    GpsRealData gpsRealDataBuffer;
+
+    @Autowired
+    D64Repository d64Repository;
+
+    @Autowired
+    RealControlSocketHandler socketHandler;
+
+    @Autowired
+    D80Repository d80Repository;
+
+    @Autowired
+    DayOfDirectives dayOfDirectives;
+
+    @Autowired
+    PilotReport pilotReport;
+
+    @Autowired
+    DayOfSchedule dayOfSchedule;
+
+    @Autowired
+    JdbcTemplate jdbcTemplate;
+
+    //static Long schDiff = 1000 * 60 * 60L;
+
+    private static DateTimeFormatter fmtHHmm = DateTimeFormat.forPattern("HH:mm"), fmtHHmm_CN = DateTimeFormat.forPattern("HH点mm分");
+
+    @Override
+    public int send60Phrase(String nbbm, String text, String sender) {
+        D60 d60 = null;
+        try {
+            d60 = create60Data(nbbm, text, (short) 0x00, null);
+        } catch (Exception e) {
+            logger.error("发送消息短语出现异常", e);
+            return -1;
+        }
+
+        if (null == d60)
+            return -1;
+
+        // 发送指令
+        int code = GatewayHttpUtils.postJson(JSON.toJSONString(d60));
+        if (null != sender)
+            d60.setSender(sender);
+        d60.setHttpCode(code);
+
+        if (code == 0) {
+            // 添加到缓存
+            dayOfDirectives.put60(d60, true);
+        } else {
+            d60.setErrorText("网关通讯失败, code: " + code);
+            d60Repository.save(d60);
+            dayOfDirectives.put60(d60, false);
+        }
+        return code;
+    }
+
+    @Override
+    public int send60Dispatch(ScheduleRealInfo sch, int finish, String sender) {
+        D60 d60 = null;
+        try {
+            if (sch.isDestroy()) {
+                logger.warn("烂班不允许发送调度指令....");
+                return -1;
+            }
+            String text = "已完成" + finish + "个班次，下一发车时间" + fmtHHmm_CN.print(sch.getDfsjT()) + "，由"
+                    + sch.getQdzName() + "发往" + sch.getZdzName();
+
+            //下发0x01指令  调度指令(闹钟有效)
+            long t = System.currentTimeMillis(), alarmTime;
+            alarmTime = sch.getDfsjT();
+            if (sch.getDfsjT() < t)
+                alarmTime = t + 1000 * 30;
+
+            d60 = new DirectiveCreator().createD60_01(sch.getClZbh(), text, Integer.parseInt(sch.getXlDir())
+                    , 0, new Date(alarmTime));
+        } catch (Exception e) {
+            logger.error("生成调度指令时出现异常", e);
+            return -1;
+        }
+
+        if (null == d60)
+            return -1;
+
+        d60.setSender(sender);
+
+        JSONObject jObj = JSON.parseObject(JSON.toJSONString(d60));
+
+        //进场或者出场班次时，附加lock 标识
+        if (null != sch.getBcType()
+                && (sch.getBcType().equals("out") || sch.getBcType().equals("in"))) {
+
+            jObj.put("lock", 1);
+        }
+
+        // 发送指令
+        int code = GatewayHttpUtils.postJson(jObj.toJSONString());
+
+        d60.setDispatch(true);
+        d60.setSch(sch);
+        d60.setHttpCode(code);
+
+        if (code == 0) {
+            sch.setDirectiveState(60);
+            // 添加到缓存，延迟入库
+            dayOfDirectives.put60(d60, true);
+            // 通知页面
+            sendD60ToPage(sch);
+        } else {
+            d60.setErrorText("网关通讯失败, code: " + code);
+            dayOfDirectives.put60(d60, false);
+            d60Repository.save(d60);
+        }
+        return code;
+    }
+
+    /**
+     * @Title: sendDirectiveState @Description: TODO(向页面推送班次指令状态) @throws
+     */
+    @Override
+    public void sendD60ToPage(ScheduleRealInfo sch) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("fn", "directive");
+        map.put("t", sch);
+
+        ObjectMapper mapper = new ObjectMapper();
+
+        try {
+            socketHandler.sendMessageToLine(sch.getXlBm(), mapper.writeValueAsString(map));
+        } catch (JsonProcessingException e) {
+            logger.error("", e);
+        }
+    }
+
+    @Override
+    public int send60Dispatch(Long id, String sender) {
+        ScheduleRealInfo sch = dayOfSchedule.get(id);
+        // 车辆已完成班次
+        int finish = dayOfSchedule.doneSum(sch.getClZbh());
+        return send60Dispatch(sch, finish, sender);
+    }
+
+    @Override
+    public int send60Operation(String nbbm, int state, int upDown, ScheduleRealInfo sch, String sender) {
+        logger.info("切换运营状态, nbbm: " + nbbm + " ,state: " + state + " ,upDown:" + upDown);
+
+        String text = "切换为 " + (upDown == 0 ? "上行" : "下行") + (state == 0 ? "营运" : "未营运");
+        D60 d60 = new DirectiveCreator().createD60(nbbm, text, (short) 0x03, upDown, state);
+
+        if (null == d60)
+            return -1;
+        if (null != sender)
+            d60.setSender(sender);
+        else
+            d60.setSender("系统");
+        // 发送指令
+        int code = GatewayHttpUtils.postJson(JSON.toJSONString(d60));
+        // 添加到缓存，等待入库
+        d60.setHttpCode(code);
+        if (null != sch)
+            d60.setSch(sch);
+
+
+        if (code == 0) {
+            dayOfDirectives.put60(d60, true);
+        } else {
+            d60.setErrorText("网关通讯失败, code: " + code);
+            d60Repository.save(d60);
+            dayOfDirectives.put60(d60, false);
+        }
+        return code;
+    }
+
+    /**
+     * 线路切换
+     */
+    @Override
+    public int lineChange(String nbbm, String lineCode, String sender) {
+        return lineChangeByDeviceId(BasicData.deviceId2NbbmMap.inverse().get(nbbm), lineCode, sender);
+    }
+
+
+    @Override
+    public int lineChangeByDeviceId(String deviceId, String lineCode, String sender) {
+        DirectiveCreator crt = new DirectiveCreator();
+        Long t = System.currentTimeMillis();
+        //生成64数据包
+        D64 d64 = crt.create64(deviceId, lineCode, t);
+
+        if (null != sender)
+            d64.setSender(sender);
+        else
+            d64.setSender("系统");
+
+        //String deviceId = d64.getDeviceId();
+        int code = GatewayHttpUtils.postJson(JSON.toJSONString(d64));
+        // 入库
+        d64.setHttpCode(code);
+        d64.getData().setTxtContent("切换线路[" + lineCode + "]");
+        dayOfDirectives.put64(d64);
+
+        // 通知设备刷新线路文件，忽略结果
+        if (code == 0)
+            GatewayHttpUtils.postJson(crt.createDeviceRefreshData(deviceId, lineCode));
+        else
+            d64.setErrorText(" 网关通讯失败, code: " + code);
+
+        d64Repository.save(d64);
+        return code;
+    }
+
+    public D60 create60Data(String nbbm, String text, Short dispatchInstruct, ScheduleRealInfo sch) {
+
+        String deviceId = BasicData.deviceId2NbbmMap.inverse().get(nbbm);
+        if (null == deviceId) {
+            logger.error("没有设备号对照的车辆：" + nbbm);
+            return null;
+        }
+        // 根据当前GPS确定 上下行和营运状态
+        Byte upDown = null;
+        Integer state = null;
+        if (null == sch) {
+            GpsEntity gpsData = gpsRealDataBuffer.get(deviceId);
+            if (null == gpsData) {
+                /*
 				 * 短语指令不会变更设备状态，所以在没有gps状态对照的情况下可以下发
 				 * 其他指令在不确定状态的情况下，一律不允许
 				 */
-				if(dispatchInstruct == 0){
-					upDown = 0;
-					state = 0;
-				}
-				else{
-					logger.error("没有找到gps对照，无法确认营运状态和上下行：" + nbbm);
-					return null;
-				}
-			}
-			else{
-				upDown = gpsData.getUpDown();
-				state = gpsData.getState();
-			}
-		} else {
-			upDown = Byte.parseByte(sch.getXlDir());
-			state = 0;
-		}
-
-		return new DirectiveCreator().createD60(nbbm, text, dispatchInstruct, upDown, state);
-	}
-
-	@Override
-	public int upDownChange(String nbbm, Integer upDown, String sender) {
-		return send60Operation(nbbm, 0, upDown, null, sender);
-	}
-
-
-	@Override
-	public Map<String, List<D80>> findNoCofm80(String lineCodes) {
-		List<String> lineList = Splitter.on(",").trimResults().splitToList(lineCodes);
-
-		Map<String, List<D80>> rs = new HashMap<>();
-		for (String code : lineList) 
-			rs.put(code, pilotReport.unconfirmed80(Integer.parseInt(code)));
-
-		return rs;
-	}
-
-	@Override
-	public Map<String, Object> reply80(int id, int reply) {
-		Map<String, Object> rs = new HashMap<>();
-
-		D80 d80 = pilotReport.findById(id);
-		if (null == d80) {
-			rs.put("status", ResponseCode.ERROR);
-			rs.put("msg", "服务器没有找到对应数据！");
-		} else if (d80.isConfirm()) {
-			rs.put("status", ResponseCode.ERROR);
-			rs.put("msg", "该数据已经被处理了！");
-		} else {
-			SysUser user = SecurityUtils.getCurrentUser();
-			d80.setC0(reply, user.getUserName());
-			// 入库
-			d80Repository.save(d80);
-			//回复网关
-			int code = GatewayHttpUtils.postJson(JSON.toJSONString(d80.getC0()));
-
-			rs.put("status", ResponseCode.SUCCESS);
-			if (code != 0)
-				rs.put("msg", "发送C0响应指令到车载设备失败，但该操作已经被系统记录！");
-
-			pilotReport.reply(d80);
-			// 通知页面
-			Map<String, Object> sockMap = new HashMap<>();
-			sockMap.put("fn", "d80Confirm");
-			sockMap.put("id", d80.getId());
-			sockMap.put("lineId", d80.getData().getLineId());
-			socketHandler.sendMessageToLine(d80.getData().getLineId().toString(), JSON.toJSONString(sockMap));
-		}
-
-		return rs;
-	}
-
-	@Override
-	public Map<String, Object> findDirective(String nbbm, int dType, int page, int size) {
-		Map<String, Object> rsMap = new HashMap<>();
-		List<Directive> list = new ArrayList<>();
-		
-		switch (dType) {
-		case -1:
-			//所有指令
-			list = new ArrayList<>(dayOfDirectives.all());
-			break;
-		case 0:
-			//调度指令
-			Collection<D60> dptArray = dayOfDirectives.all60();
-			for(D60 d60 : dptArray){
-				if(d60.isDispatch())
-					list.add(d60);
-			}
-			break;
-		case 1: 
-			//运营指令
-			Collection<D60> yyArray = dayOfDirectives.all60();
-			for(D60 d60 : yyArray){
-				if(d60 != null && d60.getData().getDispatchInstruct() == (short)0x03
-						&& !d60.isDispatch())
-					list.add(d60);
-			}
-			break;
-		case 2:
-			//线路切换指令
-			list.addAll(dayOfDirectives.all64());
-			break;
-		case 3:
-			//消息短语
-			Collection<D60> dyArray = dayOfDirectives.all60();
-			for(D60 d60 : dyArray){
-				if(d60 != null && d60.getData().getDispatchInstruct() == (short)0x00
-						&& !d60.isDispatch())
-					list.add(d60);
-			}
-			break;
-		}
-
-		// 时间倒序
-		Collections.sort(list, new DayOfDirectives.DComparator());
-		if(StringUtils.isNotBlank(nbbm)){
-			String deviceId = BasicData.deviceId2NbbmMap.inverse().get(nbbm);
-			//按车辆过滤
-			List<Directive> subList = new ArrayList<>();
-			for(Directive d : list){
-				if(d.getDeviceId().equals(deviceId)){
-					subList.add(d);
-				}
-			}
-			list = subList;
-		}
-		
-		int count = list.size();
-		// 分页
-		int s = page * size, e = s + size;
-
-		if (e > count)
-			e = count;
-
-		List<Directive> rs = list.subList(s, e);
-
-		// 时间格式化，车辆自编号转换
-		for (Directive d : rs) {
-			if (d.getTimeHHmm() == null)
-				d.setTimeHHmm(fmtHHmm.print(d.getTimestamp()));
-			if (d.getNbbm() == null)
-				d.setNbbm(BasicData.deviceId2NbbmMap.get(d.getDeviceId()));
-		}
-
-		rsMap.put("list", rs);
-		rsMap.put("totalPages", count % size == 0 ? (count / size - 1) : count / size);
-		rsMap.put("page", page);
-		return rsMap;
-	}
-
-	@Override
-	public Map<String, Object> findAll80(Map<String, Object> map, int page, int size) {
-		List<D80> d80s = new ArrayList<>();
-		
-		Object nbbm = map.get("nbbm");
-		if(null != nbbm && StringUtils.isNotEmpty(nbbm.toString())){
-			d80s.addAll(pilotReport.findByCar(nbbm.toString()));
-		}
-		else{
-			d80s.addAll(pilotReport.findAll());
-		}
-		
-		Short requestCode = Short.parseShort(map.get("requestCode").toString());
-		if(requestCode != -1){
-			List<D80> temps = new ArrayList<>();
-			for(D80 d80 : d80s){
-				if(d80.getData().getRequestCode().equals(requestCode))
-					temps.add(d80);
-			}
-			d80s = temps;
-		}
-		
-		//排序
-		Collections.sort(d80s, new Comparator<D80>() {
-			@Override
-			public int compare(D80 o1, D80 o2) {
-				return (int) (o2.getTimestamp() - o1.getTimestamp());
-			}
-		});
-		
-		//分页
-		int count = d80s.size();
-		// 分页
-		int s = page * size, e = s + size;
-
-		if (e > count)
-			e = count;
-
-		//SimpleDateFormat sdfHHmm = new SimpleDateFormat("HH:mm");
-		List<D80> rs = d80s.subList(s, e);
-		for(D80 d80 : rs){
-			d80.setTimeStr(fmtHHmm.print(d80.getTimestamp()));
-		}
-		
-		Map<String, Object> rsMap = new HashMap<>();
-		rsMap.put("list", rs);
-		rsMap.put("totalPages", count % size == 0 ? count / size -1 : count / size);
-		rsMap.put("page", page);
-		
-		return rsMap;
-	}
-
-	@Override
-	public D64 save64(D64 d64) {
-		return d64Repository.save(d64);
-	}
-
-	@Override
-	public int sendC0A4(String nbbm) {
-		String deviceId = BasicData.deviceId2NbbmMap.inverse().get(nbbm);
-		
-		Map<String, Object> c0a4 = new HashMap<>();
-		c0a4.put("deviceId", deviceId);
-		c0a4.put("timestamp", System.currentTimeMillis());
-		c0a4.put("operCode", (short)0xC0);
-		
-		Map<String, Object> data = new HashMap<>();
-		data.put("deviceId", deviceId);
-		data.put("operCode2", (short)0xA4);
-		c0a4.put("data", data);
-		
-		return GatewayHttpUtils.postJson(JSON.toJSONString(c0a4));
-	}
-
-	@Override
-	public int sendC0A3(DC0_A3 c0a3) {
-		GatewayHttpUtils.postJson(JSON.toJSONString(c0a3));
-		return 0;
-	}
-
-	@Override
-	public int sendC0A5(String json) {
-		return GatewayHttpUtils.postJson(json);
-	}
-
-	@Override
-	public int refreshLineFile(String deviceId) {
-		GpsEntity gps = gpsRealDataBuffer.get(deviceId);
-		if(gps == null)
-			return -1;
-
-		return GatewayHttpUtils.postJson(new DirectiveCreator().createDeviceRefreshData(deviceId, gps.getLineId()));
-	}
-
-	@Override
-	public int stateChange(String nbbm, Integer upDown, Integer state, String userName) {
-		return send60Operation(nbbm, state, upDown, null, userName);
-	}
+                if (dispatchInstruct == 0) {
+                    upDown = 0;
+                    state = 0;
+                } else {
+                    logger.error("没有找到gps对照，无法确认营运状态和上下行：" + nbbm);
+                    return null;
+                }
+            } else {
+                upDown = gpsData.getUpDown();
+                state = gpsData.getState();
+            }
+        } else {
+            upDown = Byte.parseByte(sch.getXlDir());
+            state = 0;
+        }
+
+        return new DirectiveCreator().createD60(nbbm, text, dispatchInstruct, upDown, state);
+    }
+
+    @Override
+    public int upDownChange(String nbbm, Integer upDown, String sender) {
+        return send60Operation(nbbm, 0, upDown, null, sender);
+    }
+
+
+    @Override
+    public Map<String, List<D80>> findNoCofm80(String lineCodes) {
+        List<String> lineList = Splitter.on(",").trimResults().splitToList(lineCodes);
+
+        Map<String, List<D80>> rs = new HashMap<>();
+        for (String code : lineList)
+            rs.put(code, pilotReport.unconfirmed80(Integer.parseInt(code)));
+
+        return rs;
+    }
+
+    @Override
+    public Map<String, Object> reply80(int id, int reply) {
+        Map<String, Object> rs = new HashMap<>();
+        D80 d80 = pilotReport.findById(id);
+        try {
+            if (null == d80) {
+                rs.put("status", ResponseCode.ERROR);
+                rs.put("msg", "服务器没有找到对应数据！");
+            } else if (d80.isConfirm()) {
+                rs.put("status", ResponseCode.ERROR);
+                rs.put("msg", "该数据已经被处理了！");
+            } else {
+                SysUser user = SecurityUtils.getCurrentUser();
+                d80.setC0(reply, user.getUserName());
+                // 入库
+                d80Repository.save(d80);
+                //回复网关
+                int code = GatewayHttpUtils.postJson(JSON.toJSONString(d80.getC0()));
+
+                rs.put("status", ResponseCode.SUCCESS);
+                if (code != 0)
+                    rs.put("msg", "发送C0响应指令到车载设备失败，但该操作已经被系统记录！");
+
+                pilotReport.reply(d80);
+            }
+        } catch (Exception e) {
+            logger.error("80响应出现异常...", e);
+            rs.put("status", ResponseCode.SUCCESS);
+        }
+        // 通知页面
+        Map<String, Object> sockMap = new HashMap<>();
+        sockMap.put("fn", "d80Confirm");
+        sockMap.put("id", d80.getId());
+        sockMap.put("lineId", d80.getData().getLineId());
+        socketHandler.sendMessageToLine(d80.getData().getLineId().toString(), JSON.toJSONString(sockMap));
+
+        return rs;
+    }
+
+    @Override
+    public Map<String, Object> findDirective(String nbbm, int dType, int page, int size) {
+        Map<String, Object> rsMap = new HashMap<>();
+        List<Directive> list = new ArrayList<>();
+
+        switch (dType) {
+            case -1:
+                //所有指令
+                list = new ArrayList<>(dayOfDirectives.all());
+                break;
+            case 0:
+                //调度指令
+                Collection<D60> dptArray = dayOfDirectives.all60();
+                for (D60 d60 : dptArray) {
+                    if (d60.isDispatch())
+                        list.add(d60);
+                }
+                break;
+            case 1:
+                //运营指令
+                Collection<D60> yyArray = dayOfDirectives.all60();
+                for (D60 d60 : yyArray) {
+                    if (d60 != null && d60.getData().getDispatchInstruct() == (short) 0x03
+                            && !d60.isDispatch())
+                        list.add(d60);
+                }
+                break;
+            case 2:
+                //线路切换指令
+                list.addAll(dayOfDirectives.all64());
+                break;
+            case 3:
+                //消息短语
+                Collection<D60> dyArray = dayOfDirectives.all60();
+                for (D60 d60 : dyArray) {
+                    if (d60 != null && d60.getData().getDispatchInstruct() == (short) 0x00
+                            && !d60.isDispatch())
+                        list.add(d60);
+                }
+                break;
+        }
+
+        // 时间倒序
+        Collections.sort(list, new DayOfDirectives.DComparator());
+        if (StringUtils.isNotBlank(nbbm)) {
+            String deviceId = BasicData.deviceId2NbbmMap.inverse().get(nbbm);
+            //按车辆过滤
+            List<Directive> subList = new ArrayList<>();
+            for (Directive d : list) {
+                if (d.getDeviceId().equals(deviceId)) {
+                    subList.add(d);
+                }
+            }
+            list = subList;
+        }
+
+        int count = list.size();
+        // 分页
+        int s = page * size, e = s + size;
+
+        if (e > count)
+            e = count;
+
+        List<Directive> rs = list.subList(s, e);
+
+        // 时间格式化，车辆自编号转换
+        for (Directive d : rs) {
+            if (d.getTimeHHmm() == null)
+                d.setTimeHHmm(fmtHHmm.print(d.getTimestamp()));
+            if (d.getNbbm() == null)
+                d.setNbbm(BasicData.deviceId2NbbmMap.get(d.getDeviceId()));
+        }
+
+        rsMap.put("list", rs);
+        rsMap.put("totalPages", count % size == 0 ? (count / size - 1) : count / size);
+        rsMap.put("page", page);
+        return rsMap;
+    }
+
+    @Override
+    public Map<String, Object> findAll80(Map<String, Object> map, int page, int size) {
+        List<D80> d80s = new ArrayList<>();
+
+        Object nbbm = map.get("nbbm");
+        if (null != nbbm && StringUtils.isNotEmpty(nbbm.toString())) {
+            d80s.addAll(pilotReport.findByCar(nbbm.toString()));
+        } else {
+            d80s.addAll(pilotReport.findAll());
+        }
+
+        Short requestCode = Short.parseShort(map.get("requestCode").toString());
+        if (requestCode != -1) {
+            List<D80> temps = new ArrayList<>();
+            for (D80 d80 : d80s) {
+                if (d80.getData().getRequestCode().equals(requestCode))
+                    temps.add(d80);
+            }
+            d80s = temps;
+        }
+
+        //排序
+        Collections.sort(d80s, new Comparator<D80>() {
+            @Override
+            public int compare(D80 o1, D80 o2) {
+                return (int) (o2.getTimestamp() - o1.getTimestamp());
+            }
+        });
+
+        //分页
+        int count = d80s.size();
+        // 分页
+        int s = page * size, e = s + size;
+
+        if (e > count)
+            e = count;
+
+        //SimpleDateFormat sdfHHmm = new SimpleDateFormat("HH:mm");
+        List<D80> rs = d80s.subList(s, e);
+        for (D80 d80 : rs) {
+            d80.setTimeStr(fmtHHmm.print(d80.getTimestamp()));
+        }
+
+        Map<String, Object> rsMap = new HashMap<>();
+        rsMap.put("list", rs);
+        rsMap.put("totalPages", count % size == 0 ? count / size - 1 : count / size);
+        rsMap.put("page", page);
+
+        return rsMap;
+    }
+
+    @Override
+    public D64 save64(D64 d64) {
+        return d64Repository.save(d64);
+    }
+
+    @Override
+    public Map<String, Object> sendC0A4(String nbbm) {
+        Map<String, Object> rs = new HashMap<>();
+
+        String deviceId = BasicData.deviceId2NbbmMap.inverse().get(nbbm);
+
+        GpsEntity gps = gpsRealDataBuffer.get(deviceId);
+        if(gps == null || gps.isOffline()){
+            rs.put("status", ResponseCode.ERROR);
+            rs.put("msg", "下发指令失败，设备离线");
+            return rs;
+        }
+
+        Map<String, Object> c0a4 = new HashMap<>();
+        c0a4.put("deviceId", deviceId);
+        c0a4.put("timestamp", System.currentTimeMillis());
+        c0a4.put("operCode", (short) 0xC0);
+
+        Map<String, Object> data = new HashMap<>();
+        data.put("deviceId", deviceId);
+        data.put("operCode2", (short) 0xA4);
+        c0a4.put("data", data);
+
+        int code = GatewayHttpUtils.postJson(JSON.toJSONString(c0a4));
+        if(code != 0){
+            rs.put("status", ResponseCode.ERROR);
+            rs.put("msg", "和网关通讯失败， code " + code);
+        }
+        else{
+            rs.put("status", ResponseCode.SUCCESS);
+        }
+        return rs;
+    }
+
+    @Override
+    public int sendC0A3(DC0_A3 c0a3) {
+        GatewayHttpUtils.postJson(JSON.toJSONString(c0a3));
+        return 0;
+    }
+
+    @Override
+    public int sendC0A5(String json) {
+        return GatewayHttpUtils.postJson(json);
+    }
+
+    @Override
+    public int refreshLineFile(String deviceId) {
+        GpsEntity gps = gpsRealDataBuffer.get(deviceId);
+        if (gps == null)
+            return -1;
+
+        return GatewayHttpUtils.postJson(new DirectiveCreator().createDeviceRefreshData(deviceId, gps.getLineId()));
+    }
+
+    @Override
+    public int stateChange(String nbbm, Integer upDown, Integer state, String userName) {
+        return send60Operation(nbbm, state, upDown, null, userName);
+    }
+
+    @Override
+    public Map<String, Object> deviceCofigList(Map<String, String> map, int page, int size) {
+        Map<String, Object> rs = new HashMap<>();
+        try {
+            String conts="";
+            if(StringUtils.isNotBlank(map.get("lineId"))){
+                conts+=" AND xl='" + map.get("lineId")+"'";
+            }
+            if(StringUtils.isNotBlank(map.get("nbbm"))){
+                conts+=" AND inside_code like '%" + map.get("nbbm")+"%'";
+            }
+            if(StringUtils.isNotBlank(map.get("deviceId"))){
+                conts+=" AND equipment_code like '%" + map.get("deviceId")+"%'";
+            }
+
+            String sql = "select * from (SELECT * FROM (SELECT id AS cl_id,inside_code,equipment_code FROM bsth_c_cars ) t1 LEFT JOIN bsth_v_c0_a4 t2 ON t1.equipment_code = t2.id LEFT JOIN (SELECT xl,cl FROM bsth_c_s_ccinfo WHERE id IN (SELECT max(id) FROM bsth_c_s_ccinfo GROUP BY cl)) t3 ON t1.cl_id = t3.cl ORDER BY t2.`timestamp` DESC) t4 where 1=1 "+conts;
+
+            int count = jdbcTemplate.queryForObject("select count(*) from ("+sql+") c1", Integer.class);
+            int totalPages = count % size == 0 ? count / size : count / size + 1;
+            int s = page * size;
+            List<DeviceConfigDto> list = jdbcTemplate.query(sql + " LIMIT " + s + "," + size, new BeanPropertyRowMapper<>(DeviceConfigDto.class));
+
+            rs.put("status", ResponseCode.SUCCESS);
+            rs.put("list", list);
+            rs.put("totalPages", totalPages);
+            rs.put("page", page);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("", e);
+            rs.put("status", ResponseCode.ERROR);
+        }
+        return rs;
+    }
 }
+package com.bsth.service.directive.dto;
+
+/**
+ * Created by panzhao on 2017/6/28.
+ */
+public class DeviceConfigDto {
+
+    private String xl;
+    private String id;
+    private String insideCode;
+    private String equipmentCode;
+    /** 网关IP地址 */
+    private String ipAddress;
+    /** 网关端口 */
+    private Integer port;
+    /** 定时定距上报模式 */
+    private Short reportMode;
+    /** 定时上报时间间隔 */
+    private Integer interval;
+    /** 定距上报距离间隔 */
+    private String distance;
+    /** 非线路状态超速阀门 */
+    private Short speedingThreshold;
+    /** 预警阀门 */
+    private Short alarmThreshold;
+    /** pos机IP地址 */
+    private String posIpAddress;
+    /** pos机端口 */
+    private String posPort;
+    /** 延迟机关时间 */
+    private Integer delay;
+    /** 中门视频切换到码表界面速度阀门 默认45 */
+    private Short speedThreshold1;
+    /** 码表界面切换到中门视频速度阀门 默认35 */
+    private Short speedThreshold2;
+    /** 对比度 */
+    private Short contrast;
+    /** 亮度 */
+    private Short brightness;
+    /** 饱和度 */
+    private Short saturation;
+
+    private Long timestamp;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getEquipmentCode() {
+        return equipmentCode;
+    }
+
+    public void setEquipmentCode(String equipmentCode) {
+        this.equipmentCode = equipmentCode;
+    }
+
+    public String getIpAddress() {
+        return ipAddress;
+    }
+
+    public void setIpAddress(String ipAddress) {
+        this.ipAddress = ipAddress;
+    }
+
+    public Integer getPort() {
+        return port;
+    }
+
+    public void setPort(Integer port) {
+        this.port = port;
+    }
+
+    public Short getReportMode() {
+        return reportMode;
+    }
+
+    public void setReportMode(Short reportMode) {
+        this.reportMode = reportMode;
+    }
+
+    public Integer getInterval() {
+        return interval;
+    }
+
+    public void setInterval(Integer interval) {
+        this.interval = interval;
+    }
+
+    public String getDistance() {
+        return distance;
+    }
+
+    public void setDistance(String distance) {
+        this.distance = distance;
+    }
+
+    public Short getSpeedingThreshold() {
+        return speedingThreshold;
+    }
+
+    public void setSpeedingThreshold(Short speedingThreshold) {
+        this.speedingThreshold = speedingThreshold;
+    }
+
+    public Short getAlarmThreshold() {
+        return alarmThreshold;
+    }
+
+    public void setAlarmThreshold(Short alarmThreshold) {
+        this.alarmThreshold = alarmThreshold;
+    }
+
+    public String getPosIpAddress() {
+        return posIpAddress;
+    }
+
+    public void setPosIpAddress(String posIpAddress) {
+        this.posIpAddress = posIpAddress;
+    }
+
+    public String getPosPort() {
+        return posPort;
+    }
+
+    public void setPosPort(String posPort) {
+        this.posPort = posPort;
+    }
+
+    public Integer getDelay() {
+        return delay;
+    }
+
+    public void setDelay(Integer delay) {
+        this.delay = delay;
+    }
+
+    public Short getSpeedThreshold1() {
+        return speedThreshold1;
+    }
+
+    public void setSpeedThreshold1(Short speedThreshold1) {
+        this.speedThreshold1 = speedThreshold1;
+    }
+
+    public Short getSpeedThreshold2() {
+        return speedThreshold2;
+    }
+
+    public void setSpeedThreshold2(Short speedThreshold2) {
+        this.speedThreshold2 = speedThreshold2;
+    }
+
+    public Short getContrast() {
+        return contrast;
+    }
+
+    public void setContrast(Short contrast) {
+        this.contrast = contrast;
+    }
+
+    public Short getBrightness() {
+        return brightness;
+    }
+
+    public void setBrightness(Short brightness) {
+        this.brightness = brightness;
+    }
+
+    public Short getSaturation() {
+        return saturation;
+    }
+
+    public void setSaturation(Short saturation) {
+        this.saturation = saturation;
+    }
+
+    public Long getTimestamp() {
+        return timestamp;
+    }
+
+    public void setTimestamp(Long timestamp) {
+        this.timestamp = timestamp;
+    }
+
+    public String getInsideCode() {
+        return insideCode;
+    }
+
+    public void setInsideCode(String insideCode) {
+        this.insideCode = insideCode;
+    }
+
+    public String getXl() {
+        return xl;
+    }
+
+    public void setXl(String xl) {
+        this.xl = xl;
+    }
+}
-package com.bsth.service.gps.entity;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.bsth.data.forecast.entity.ArrivalEntity;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.vividsolutions.jts.geom.Coordinate;
-import com.vividsolutions.jts.geom.GeometryFactory;
-import com.vividsolutions.jts.geom.Point;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 历史GPS DTO
- * Created by panzhao on 2017/4/5.
- */
-public class HistoryGps_DTOV3 {
-
-    public static List<HistoryGps_DTOV3> craete(List<Map<String, Object>> mapList) {
-        List<HistoryGps_DTOV3> list = JSONObject.parseArray(JSON.toJSONString(mapList), HistoryGps_DTOV3.class);
-
-        GeometryFactory geometryFactory = new GeometryFactory();
-        Point point;
-        for (HistoryGps_DTOV3 gps : list) {
-            point = geometryFactory.createPoint(new Coordinate(gps.getLat(), gps.getLon()));
-            gps.setPoint(point);
-        }
-        return list;
-    }
-
-
-    private double bd_lon;
-    private double bd_lat;
-
-    private double lon;
-    private double lat;
-
-    private String deviceId;
-    private long ts;
-    private long timestamp;
-    private String stopNo;
-    private float direction;
-
-    private String lineId;
-    private float speed;
-    private ArrivalEntity inout_stop_info;
-    private int inout_stop;
-
-    private String nbbm;
-    private int state;
-    private int upDown;
-
-    private String section_code;
-    private String section_name;
-
-    @JsonIgnore
-    private Point point;
-
-    @Override
-    public int hashCode() {
-        return this.toString().hashCode();
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        HistoryGps_DTOV3 g2 = (HistoryGps_DTOV3) obj;
-        return this.toString().equals(g2.toString());
-    }
-
-
-    @Override
-    public String toString() {
-        return (this.getDeviceId() + "_" + (inout_stop_info==null?this.getStopNo():inout_stop_info.getStopName()) + "_" + this.getTs() + "_" + this.getLon() + "_" + this.getLat());
-    }
-
-    public double getBd_lon() {
-        return bd_lon;
-    }
-
-    public void setBd_lon(double bd_lon) {
-        this.bd_lon = bd_lon;
-    }
-
-    public double getBd_lat() {
-        return bd_lat;
-    }
-
-    public void setBd_lat(double bd_lat) {
-        this.bd_lat = bd_lat;
-    }
-
-    public String getDeviceId() {
-        return deviceId;
-    }
-
-    public void setDeviceId(String deviceId) {
-        this.deviceId = deviceId;
-    }
-
-    public long getTs() {
-        return ts;
-    }
-
-    public void setTs(long ts) {
-        this.ts = ts;
-    }
-
-    public long getTimestamp() {
-        return timestamp;
-    }
-
-    public void setTimestamp(long timestamp) {
-        this.timestamp = timestamp;
-    }
-
-    public String getStopNo() {
-        return stopNo;
-    }
-
-    public void setStopNo(String stopNo) {
-        this.stopNo = stopNo;
-    }
-
-    public float getDirection() {
-        return direction;
-    }
-
-    public void setDirection(float direction) {
-        this.direction = direction;
-    }
-
-    public String getLineId() {
-        return lineId;
-    }
-
-    public void setLineId(String lineId) {
-        this.lineId = lineId;
-    }
-
-    public float getSpeed() {
-        return speed;
-    }
-
-    public void setSpeed(float speed) {
-        this.speed = speed;
-    }
-
-    public ArrivalEntity getInout_stop_info() {
-        return inout_stop_info;
-    }
-
-    public void setInout_stop_info(ArrivalEntity inout_stop_info) {
-        this.inout_stop_info = inout_stop_info;
-    }
-
-    public int getInout_stop() {
-        return inout_stop;
-    }
-
-    public void setInout_stop(int inout_stop) {
-        this.inout_stop = inout_stop;
-    }
-
-    public String getNbbm() {
-        return nbbm;
-    }
-
-    public void setNbbm(String nbbm) {
-        this.nbbm = nbbm;
-    }
-
-    public int getState() {
-        return state;
-    }
-
-    public void setState(int state) {
-        this.state = state;
-    }
-
-    public int getUpDown() {
-        return upDown;
-    }
-
-    public void setUpDown(int upDown) {
-        this.upDown = upDown;
-    }
-
-    public double getLon() {
-        return lon;
-    }
-
-    public void setLon(double lon) {
-        this.lon = lon;
-    }
-
-    public double getLat() {
-        return lat;
-    }
-
-    public void setLat(double lat) {
-        this.lat = lat;
-    }
-
-    public Point getPoint() {
-        return point;
-    }
-
-    public void setPoint(Point point) {
-        this.point = point;
-    }
-
-    public String getSection_code() {
-        return section_code;
-    }
-
-    public void setSection_code(String section_code) {
-        this.section_code = section_code;
-    }
-
-    public String getSection_name() {
-        return section_name;
-    }
-
-    public void setSection_name(String section_name) {
-        this.section_name = section_name;
-    }
-}
+package com.bsth.service.gps.entity;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.bsth.data.forecast.entity.ArrivalEntity;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.vividsolutions.jts.geom.Coordinate;
+import com.vividsolutions.jts.geom.GeometryFactory;
+import com.vividsolutions.jts.geom.Point;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 历史GPS DTO
+ * Created by panzhao on 2017/4/5.
+ */
+public class HistoryGps_DTOV3 {
+
+    public static List<HistoryGps_DTOV3> craete(List<Map<String, Object>> mapList) {
+        List<HistoryGps_DTOV3> list = JSONObject.parseArray(JSON.toJSONString(mapList), HistoryGps_DTOV3.class);
+
+        GeometryFactory geometryFactory = new GeometryFactory();
+        Point point;
+        for (HistoryGps_DTOV3 gps : list) {
+            point = geometryFactory.createPoint(new Coordinate(gps.getLat(), gps.getLon()));
+            gps.setPoint(point);
+        }
+        return list;
+    }
+
+
+    private double bd_lon;
+    private double bd_lat;
+
+    private double lon;
+    private double lat;
+
+    private String deviceId;
+    private long ts;
+    private long timestamp;
+    private String stopNo;
+    private float direction;
+
+    private String lineId;
+    private float speed;
+    private ArrivalEntity inout_stop_info;
+    private int inout_stop;
+
+    private String nbbm;
+    private int state;
+    private int upDown;
+
+    private String section_code;
+    private String section_name;
+
+    @JsonIgnore
+    private Point point;
+
+    @Override
+    public int hashCode() {
+        return this.toString().hashCode();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        HistoryGps_DTOV3 g2 = (HistoryGps_DTOV3) obj;
+        return this.toString().equals(g2.toString());
+    }
+
+
+    @Override
+    public String toString() {
+        return (this.getDeviceId() + "_" + (inout_stop_info==null?this.getStopNo():inout_stop_info.getStopName()) + "_" + this.getTs() + "_" + this.getLon() + "_" + this.getLat());
+    }
+
+    public double getBd_lon() {
+        return bd_lon;
+    }
+
+    public void setBd_lon(double bd_lon) {
+        this.bd_lon = bd_lon;
+    }
+
+    public double getBd_lat() {
+        return bd_lat;
+    }
+
+    public void setBd_lat(double bd_lat) {
+        this.bd_lat = bd_lat;
+    }
+
+    public String getDeviceId() {
+        return deviceId;
+    }
+
+    public void setDeviceId(String deviceId) {
+        this.deviceId = deviceId;
+    }
+
+    public long getTs() {
+        return ts;
+    }
+
+    public void setTs(long ts) {
+        this.ts = ts;
+    }
+
+    public long getTimestamp() {
+        return timestamp;
+    }
+
+    public void setTimestamp(long timestamp) {
+        this.timestamp = timestamp;
+    }
+
+    public String getStopNo() {
+        return stopNo;
+    }
+
+    public void setStopNo(String stopNo) {
+        this.stopNo = stopNo;
+    }
+
+    public float getDirection() {
+        return direction;
+    }
+
+    public void setDirection(float direction) {
+        this.direction = direction;
+    }
+
+    public String getLineId() {
+        return lineId;
+    }
+
+    public void setLineId(String lineId) {
+        this.lineId = lineId;
+    }
+
+    public float getSpeed() {
+        return speed;
+    }
+
+    public void setSpeed(float speed) {
+        this.speed = speed;
+    }
+
+    public ArrivalEntity getInout_stop_info() {
+        return inout_stop_info;
+    }
+
+    public void setInout_stop_info(ArrivalEntity inout_stop_info) {
+        this.inout_stop_info = inout_stop_info;
+    }
+
+    public int getInout_stop() {
+        return inout_stop;
+    }
+
+    public void setInout_stop(int inout_stop) {
+        this.inout_stop = inout_stop;
+    }
+
+    public String getNbbm() {
+        return nbbm;
+    }
+
+    public void setNbbm(String nbbm) {
+        this.nbbm = nbbm;
+    }
+
+    public int getState() {
+        return state;
+    }
+
+    public void setState(int state) {
+        this.state = state;
+    }
+
+    public int getUpDown() {
+        return upDown;
+    }
+
+    public void setUpDown(int upDown) {
+        this.upDown = upDown;
+    }
+
+    public double getLon() {
+        return lon;
+    }
+
+    public void setLon(double lon) {
+        this.lon = lon;
+    }
+
+    public double getLat() {
+        return lat;
+    }
+
+    public void setLat(double lat) {
+        this.lat = lat;
+    }
+
+    public Point getPoint() {
+        return point;
+    }
+
+    public void setPoint(Point point) {
+        this.point = point;
+    }
+
+    public String getSection_code() {
+        return section_code;
+    }
+
+    public void setSection_code(String section_code) {
+        this.section_code = section_code;
+    }
+
+    public String getSection_name() {
+        return section_name;
+    }
+
+    public void setSection_name(String section_name) {
+        this.section_name = section_name;
+    }
+}
@@ -69,10 +69,6 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 	@Autowired
 	private StationRouteRepository stationRouteRepository;
  
-	// 线路标准信息repository
-	@Autowired
-	private LineInformationRepository lineInformationRepository;
-
 	// 车辆repository
 	@Autowired
 	private CarsRepository carsRepository;
@@ -89,14 +85,6 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 	@Autowired
 	private TTInfoDetailRepository ttInfoDetailRepository;
  
-	// 车辆配置信息repository
-	@Autowired
-	private CarConfigInfoRepository carConfigInfoRepository;
-
-	// 人员配置信息repository
-	@Autowired
-	private EmployeeConfigInfoRepository employeeConfigInfoRepository;
-
 	// 排班计划明细repository
 	@Autowired
 	private SchedulePlanInfoRepository schedulePlanInfoRepository;
@@ -109,6 +97,10 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 	@Autowired
 	private SKBUploadLoggerRepository skbUploadLoggerRepository;
  
+	// 线路站点repository
+	@Autowired
+	private StationRepository stationRepository;
+
  
 	// 运管处接口
 	private InternalPortType portType = null;//new Internal().getInternalHttpSoap11Endpoint();
@@ -367,7 +359,6 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 								continue;
 							}
  
-							scheduleRealInfo.getQdzCode();
 							sf.append("<LD>");
 							sf.append("<SJGH>"+scheduleRealInfo.getjGh()+"</SJGH>");
 							sf.append("<SXX>"+scheduleRealInfo.getXlDir()+"</SXX>");
@@ -822,13 +813,15 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 						sBuffer.append("<BC>");
 						sBuffer.append("<LPBH>").append(ttInfoDetail.getLp().getLpNo()).append("</LPBH>");
 						sBuffer.append("<SXX>").append(ttInfoDetail.getXlDir()).append("</SXX>");
-						sBuffer.append("<FCZDMC>").append(ttInfoDetail.getQdz().getStationName()).append("</FCZDMC>");
+						sBuffer.append("<FCZDMC>").append(BasicData.stationCode2NameMap.get(ttInfoDetail.getXl().getLineCode()+"_"+ttInfoDetail.getXlDir()
+								+"_"+ttInfoDetail.getQdzCode())).append("</FCZDMC>");
 						// 起点站的参数
 						otherMap.put("stationMark","B");
 						paramMap = packageYgcStationNumParam(ttInfoDetail,otherMap);
 						sBuffer.append("<ZDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(paramMap)).append("</ZDXH>");
 						sBuffer.append("<JHFCSJ>").append(changeTimeFormat(ttInfoDetail)).append("</JHFCSJ>");
-						sBuffer.append("<DDZDMC>").append(ttInfoDetail.getZdz().getStationName()).append("</DDZDMC>");
+						sBuffer.append("<DDZDMC>").append(BasicData.stationCode2NameMap.get(ttInfoDetail.getXl().getLineCode()+"_"+ttInfoDetail.getXlDir()
+								+"_"+ttInfoDetail.getZdzCode())).append("</DDZDMC>");
 						// 起点站的参数
 						otherMap.put("stationMark","E");
 						paramMap = packageYgcStationNumParam(ttInfoDetail,otherMap);
@@ -1331,9 +1324,9 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 			if(otherParam != null && otherParam.get("stationMark") != null){
 				stationMark = otherParam.get("stationMark");
 				if(stationMark.equals("B")){ // 起点站
-					stationCode = ttid.getQdz().getStationCod();
+					stationCode = ttid.getQdzCode();
 				}else if(stationMark.equals("E")){ // 终点站
-					stationCode = ttid.getZdz().getStationCod();
+					stationCode = ttid.getZdzCode();
 				}
 			}
 		}
@@ -22,4 +22,6 @@ public interface LineConfigService extends BaseService&lt;LineConfig, Integer&gt;{
     Map<String,Object> bufferTimeDiff(String lineCode, String field, String value);
  
     Map<String,Object> yjtkSet(Map<String, String> map);
+
+    Map<String,Object> parkAndStationSet(Map<String, String> map);
 }
@@ -172,4 +172,12 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
     Map<String,Object> addToHistory(ScheduleRealInfo sch);
  
 	Map<String, Object> deleteToHistory(Long id);
+
+    List<ScheduleRealInfo> queryListWaybill2(String jName, String clZbh, String lpName, String date, String line);
+
+    Map<String,Object> findKMBC_mh_2(String jGh, String clZbh, String lpName, String date, String line);
+
+    List<Map<String,Object>> statisticsDaily_mh_2(String line, String date, String xlName, String type);
+
+	List<ScheduleRealInfo> realScheduleList_mh_2(String line, String date);
 }
@@ -179,4 +179,28 @@ public class LineConfigServiceImpl extends BaseServiceImpl&lt;LineConfig, Integer&gt; 
         }
         return rs;
     }
+
+    @Override
+    public Map<String, Object> parkAndStationSet(Map<String, String> map) {
+        String lineCode = map.get("lineCode").toString();
+        String twinsPark = map.get("twinsPark").toString();
+        String twinsStation = map.get("twinsStation").toString();
+
+        Map<String, Object> rs = new HashMap<>();
+        try {
+            LineConfig conf = lineConfigData.get(lineCode);
+            conf.setTwinsPark(twinsPark);
+            conf.setTwinsStation(twinsStation);
+
+            lineConfigData.set(conf);
+
+            rs.put("status", ResponseCode.SUCCESS);
+            rs.put("conf", conf);
+        } catch (Exception e) {
+            rs.put("status", ResponseCode.ERROR);
+            rs.put("msg", e.getMessage());
+            logger.error("", e);
+        }
+        return rs;
+    }
 }
@@ -235,7 +235,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             ts.add(schedule);
             //调整终点时间和下一个班次的应到时间
             schedule.calcEndTime();
-            ScheduleRealInfo nextSch = dayOfSchedule.nextByLp(schedule);
+            ScheduleRealInfo nextSch = dayOfSchedule.nextByLp2(schedule);
             if (null != nextSch) {
                 nextSch.setQdzArrDatejh(schedule.getZdsj());
                 ts.add(nextSch);
@@ -260,6 +260,16 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 schedule.setLate2(false);
                 LateAdjustHandle.remove(schedule);
             }
+
+            try {
+                if(!schedule.getDirectiveState().equals(-1) && schedule.getStatus()==0){
+                    //重新下发调度指令
+                    directiveService.send60Dispatch(schedule.getId(), "待发@系统");
+                }
+            }catch (Exception e){
+                logger.error("", e);
+            }
+
             // 持久化到数据库
             dayOfSchedule.save(schedule);
  
@@ -544,9 +554,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             t.setZdsjT(sdfyyyyMMddHHmm.parse(schDate + t.getZdsj()).getTime());
             t.setJhlcOrig(t.getJhlc());
  
-            //班次历时
-            t.setBcsj(DateUtils.calcHHmmDiff(t.getFcsj(), t.getZdsj()) / 1000 / 60);
-
             //起终点名称
             String prefix = t.getXlBm() + "_" + t.getXlDir() + "_";
             t.setQdzName(BasicData.getStationNameByCode(t.getQdzCode(), prefix));
@@ -554,6 +561,15 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
  
             //计算班次实际执行时间
             schAttrCalculator.calcRealDate(t).calcAllTimeByFcsj(t);
+
+            //处理计达跨24点
+            LineConfig conf = lineConfigData.get(t.getXlBm());
+            if(t.getZdsj().compareTo(conf.getStartOpt()) < 0){
+                t.setZdsjT(sdfyyyyMMddHHmm.parse(t.getScheduleDateStr() + t.getZdsj()).getTime() + (1000 * 60 * 60 * 24));
+            }
+
+            //班次历时
+            t.setBcsj((int) ((t.getZdsjT() - t.getDfsjT()) / 1000 / 60));
             if (t.getZdsjT() < t.getFcsjT()) {
                 rs.put("status", ResponseCode.ERROR);
                 rs.put("msg", "起终点时间异常！");
@@ -733,13 +749,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             state = state + "+1";
             type = "ASC";
         }
-        /*String sqlPlan = "select min(s.id) as id,s.j_Gh as jGh,s.cl_Zbh as clZbh,"
-                + " s.lp_Name as lpName,s.j_Name as jName,min(s.schedule_date_str) as dateStr ,"
-                + " min(s.fcsj) as fcsj, min(s.schedule_date) as date"
-                + " from bsth_c_s_sp_info_real s "
-                + " where s.xl_Bm = '" + line + "' and DATE_FORMAT(s.schedule_Date,'%Y-%m-%d') ='" + date + "' "
-                + " GROUP BY s.j_Gh,s.cl_Zbh,s.lp_Name ,s.j_Name"
-                + " order by (" + state + "),dateStr,fcsj " + type;*/
         String sqlMinYysj="select start_opt from bsth_c_line_config where "
          		+ " id = ("
          		+ "select max(id) from bsth_c_line_config where line ='"+BasicData.lineId2CodeMap.inverse().get(line) +"'"
@@ -773,43 +782,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                     }
                 });
         if (lpname.equals("lpName")) {
-        	/* SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm");
-             String sqlMinYysj="select start_opt from bsth_c_line_config where "
-             		+ " id = ("
-             		+ "select max(id) from bsth_c_line_config where line ='"+BasicData.lineId2CodeMap.inverse().get(line) +"'"
-             		+ ")";
-             String minfcsj=jdbcTemplate.queryForObject(sqlMinYysj, String.class);
-     		String[] minSjs = minfcsj.split(":");
-     		Long minSj=Long.parseLong(minSjs[0])*60+Long.parseLong(minSjs[1]);
-     		for (int i = 0; i < list.size(); i++) {
-     			 ScheduleRealInfo s=list.get(i);
-                 String[] fcsj= s.getFcsj().split(":");
-                 Long fcsjL=Long.parseLong(fcsj[0])*60+Long.parseLong(fcsj[1]);
-
-                 Long fscjT=0L;
-                 if(fcsjL<minSj){
-                     Calendar   calendar   =   new   GregorianCalendar();
-                     calendar.setTime(s.getScheduleDate());
-                     calendar.add(calendar.DATE,1);
-                     s.setScheduleDate(calendar.getTime());
-                     try {
-                         fscjT = sdf.parse(sdf.format(s.getScheduleDate())+" "+s.getFcsj()).getTime();
-                     } catch (ParseException e) {
-                         // TODO Auto-generated catch block
-                         e.printStackTrace();
-                     }
-
-                 }else{
-                     try {
-                         fscjT =sdf.parse(s.getScheduleDateStr()+" "+s.getFcsj()).getTime();
-                     } catch (ParseException e) {
-                         // TODO Auto-generated catch block
-                         e.printStackTrace();
-                     };
-                 }
-                 s.setFcsjT(fscjT);
-			}
-     		Collections.sort(list, new ComparableReal());*/
+
             List<ScheduleRealInfo> listNew = new ArrayList<ScheduleRealInfo>();
             Pattern pattern = Pattern.compile("^[-\\+]?[\\d]*$");
 //            if (px.equals("desc")) {
@@ -826,9 +799,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                             listNew.add(t);
                         }
                     } else {
-//                            if (zt == 2) {
-//                                listNew.add(t);
-//                            }
                         continue;
                     }
                 }
@@ -846,30 +816,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                     listNew.add(t);
                 }
             }
-            /*} else {
-                int zt = 0;
-                for (int l = 0; l < 3; l++) {
-                    for (int i = 0; i < list.size(); i++) {
-                        ScheduleRealInfo t = list.get(i);
-                        if (t.getLpName().indexOf("+") != -1) {
-                            if (zt == 2) {
-                                listNew.add(t);
-                            }
-
-                        } else if (pattern.matcher(t.getLpName()).matches()) {
-                            if (zt == 1) {
-                                listNew.add(t);
-                            }
-                        } else {
-                            if (zt == 0) {
-                                listNew.add(t);
-                            }
-                        }
-                    }
-                    zt++;
-                }
-
-            }*/
             return listNew;
         } else {
             return list;
@@ -1089,14 +1035,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         List<String> lineList = Lists.newArrayList(Splitter.on(',').trimResults().omitEmptyStrings().split(lineStr));
  
         Map<Integer, Integer> map = new HashMap<>();
-		/*Integer code;
-		for (String lineCode : lineList) {
-			code = Integer.parseInt(lineCode);
-			if (!ScheduleBuffer.trustMap.containsKey(lineCode))
-				ScheduleBuffer.trustMap.put(code, 0);
-
-			map.put(code, ScheduleBuffer.trustMap.get(code));
-		}*/
         return map;
     }
  
@@ -1184,17 +1122,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 rs.put("status", ResponseCode.ERROR);
                 rs.put("msg", "无实发时间，无法撤销！");
             } else {
-                //将对应的到离站数据标记为不可信  ### 废弃的代码 ####
-                /*List<ArrivalEntity> list = ArrivalData_GPS.findByNbbm(sch.getClZbh());
-                for (ArrivalEntity arr : list) {
-                    if (arr.getInOut() == 1
-                            && arr.getUpDown() == Integer.parseInt(sch.getXlDir())
-                            && arr.getStopNo().equals(sch.getQdzCode())
-                            && Math.abs(arr.getTs() - sch.getFcsjActualTime()) < 1000 * 60) {
-                        arr.setEnable(false);
-                        break;
-                    }
-                }*/
                 //日志记录
                 ScheduleModifyLogger.cxsf(sch);
  
@@ -1378,7 +1305,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 fLog.log("调整实达时间", sch.getZdsjActual(), zdsjActual);
                 sch.setZdsjActualAll(zdsjActual);
                 //路牌下一班起点到达时间
-                ScheduleRealInfo next = dayOfSchedule.nextByLp(sch);
+                ScheduleRealInfo next = dayOfSchedule.nextByLp2(sch);
                 if (null != next) {
                     next.setQdzArrDatesj(zdsjActual);
                     next.setLate2(false);
@@ -1671,122 +1598,66 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
     }
  
  
- /*   @Override
-    public Map<String, Object> findKMBC(String jName, String clZbh,
+    public Map<String, Object> findKMBC(String jGh, String clZbh,
                                         String lpName, String date, String line) {
-        List<ScheduleRealInfo> list = scheduleRealInfoRepository.queryListWaybill(jName, clZbh, lpName, date, line);
-        DecimalFormat format = new DecimalFormat("0.00");
-//		int cjbc = scheduleRealInfoRepository.findCjbc(jName, clZbh, lpName);
-//		int ljbc = scheduleRealInfoRepository.findLjbc(jName, clZbh, lpName);
-        int jhbc = 0, cjbc = 0, ljbc = 0;
-        double jhlc = 0, yygl = 0, ksgl = 0, tempJhlc = 0,jhlcOrig=0, jcclc = 0;
-        float addMileage = 0l, remMileage = 0l,addMileageYy = 0l,addMileageJc =0l;
         Map<String, Object> map = new HashMap<String, Object>();
-        for (ScheduleRealInfo scheduleRealInfo : list) {
-            if (scheduleRealInfo != null) {
-                //计划里程（主任务过滤掉临加班次），
-                //烂班里程（主任务烂班），
-                //临加里程（主任务临加），
-                //计划班次，烂班班次，增加班次
-                tempJhlc = scheduleRealInfo.getJhlc() == null ? 0 : scheduleRealInfo.getJhlc();
-                jhlcOrig = scheduleRealInfo.getJhlcOrig()==null?0:scheduleRealInfo.getJhlcOrig();
-                
-                if (scheduleRealInfo.isSflj()) {
-                    addMileage += tempJhlc;
-                    if (scheduleRealInfo.getBcType().equals("in")
-                            || scheduleRealInfo.getBcType().equals("out")) {
-                    	addMileageJc +=tempJhlc;
-                    }else{
-                    	 ljbc++;
-                    	addMileageYy +=tempJhlc;
-                    }
-                   
-                } else {
-                    if (!(scheduleRealInfo.getBcType().equals("in")
-                            || scheduleRealInfo.getBcType().equals("out"))) {
-                    	 jhbc++;
-                         jhlc += jhlcOrig;
-                         if (scheduleRealInfo.getStatus() == -1) {
-                             remMileage += jhlcOrig;
-                             cjbc++;
-                         }
-                    }
-
-                }
-                Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
-                //计算营运里程，空驶里程
-                if (childTaskPlans.isEmpty()) {
-                    if (scheduleRealInfo.getBcType().equals("in") ||
-                            scheduleRealInfo.getBcType().equals("out")) {
-                        if (scheduleRealInfo.getStatus() != -1) {
-                            jcclc += tempJhlc;
-                        }
-
-                    }
-                    //主任务 放空班次属于营运
-//					else if(scheduleRealInfo.getBcType().equals("venting")){
-//						ksgl += tempJhlc;
-//					}
-                    else {
-                        if (scheduleRealInfo.getStatus() != -1) {
-                            yygl += tempJhlc;
-                        }
-                    }
-                } else {
-                    Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
-                    while (it.hasNext()) {
-                        ChildTaskPlan childTaskPlan = it.next();
-                        if (childTaskPlan.getMileageType().equals("empty")) {
-                            if (childTaskPlan.isDestroy()) {
-                                remMileage += childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage();
-                            } else {
-                                ksgl += childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage();
-                            }
-                        } else {
-                            if (childTaskPlan.isDestroy()) {
-                                remMileage += childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage();
-//								cjbc++;
-                            } else {
-                                yygl += childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage();
-                            }
-                        }
-                    }
-                }
+        List<ScheduleRealInfo> list=scheduleRealInfoRepository.queryListWaybillXcld(jGh, clZbh, lpName, date, line);
+        List<ScheduleRealInfo> lists=new ArrayList<ScheduleRealInfo>();
+        for (int i = 0; i < list.size(); i++) {
+            ScheduleRealInfo s=list.get(i);
+            Set<ChildTaskPlan> cts = s.getcTasks();
+            if(cts != null && cts.size() > 0){
+            	lists.add(s);
+            }else{
+	            if(s.getZdsjActual()!=null){
+	            	lists.add(s);
+	            }
             }
         }
-        
-        //yygl 包含了临加的营运公里  jcclc包含了临加的进出场里程
-        map.put("jhlc", format.format(jhlc));
-        map.put("remMileage", format.format(remMileage));
-        map.put("addMileage", format.format(addMileage));
-        map.put("yygl", format.format(yygl));
-        map.put("ksgl", format.format(ksgl));
-        map.put("realMileage", format.format(yygl + ksgl + jcclc));
-//        map.put("realMileage", format.format(yygl + ksgl + jcclc+addMileage));
-        map.put("jhbc", jhbc);
-        map.put("cjbc", cjbc);
-        map.put("ljbc", ljbc);
-        map.put("sjbc", jhbc - cjbc + ljbc);
-        map.put("jcclc", jcclc);
-        map.put("zkslc", format.format(ksgl + jcclc));
-//        map.put("zkslc", format.format(ksgl + jcclc+addMileageJc));
+        double ksgl=culateService.culateKsgl(list);
+        double sjgl=culateService.culateSjgl(lists);
+        double jccgl=culateService.culateJccgl(lists);
+        double ljgl=culateService.culateLjgl(lists);
+
+        map.put("jhlc", Arith.add(culateService.culateJhgl(list),culateService.culateJhJccgl(list))); //计划里程
+        map.put("remMileage", culateService.culateLbgl(list)); //烂班公里
+        map.put("addMileage", ljgl); //临加公里
+        map.put("yygl",Arith.add(sjgl,ljgl)); //实际公里
+        map.put("ksgl", ksgl);//空驶公里
+        map.put("realMileage",Arith.add(Arith.add(ksgl,jccgl ),Arith.add(sjgl,ljgl)));
+//         map.put("realMileage", format.format(yygl + ksgl + jcclc+addMileage));
+        map.put("jhbc", culateService.culateJhbc(list,""));
+        map.put("cjbc", culateService.culateLbbc(list));
+        map.put("ljbc", culateService.culateLjbc(lists,""));
+        map.put("sjbc", culateService.culateJhbc(lists,"") -  culateService.culateLbbc(lists) + culateService.culateLjbc(lists,""));
+        map.put("jcclc", jccgl);
+        map.put("zkslc", Arith.add(ksgl,jccgl));
+//         map.put("zkslc", format.format(ksgl + jcclc+addMileageJc));
         return map;
-    }*/
+    }
  
-    public Map<String, Object> findKMBC(String jGh, String clZbh,
+    public Map<String, Object> findKMBC_mh_2(String jGh, String clZbh,
                                         String lpName, String date, String line) {
         Map<String, Object> map = new HashMap<String, Object>();
         List<ScheduleRealInfo> list=scheduleRealInfoRepository.queryListWaybillXcld(jGh, clZbh, lpName, date, line);
         List<ScheduleRealInfo> lists=new ArrayList<ScheduleRealInfo>();
         for (int i = 0; i < list.size(); i++) {
             ScheduleRealInfo s=list.get(i);
+            if(s.isDestroy() && s.isReissue()){
+                s.setRemark("");
+                s.setFcsjActual(s.getDfsj());
+                s.setZdsjActual(s.getZdsj());
+                s.setStatus(2);
+                s.setJhlc(s.getJhlcOrig());
+            }
+
             Set<ChildTaskPlan> cts = s.getcTasks();
             if(cts != null && cts.size() > 0){
-            	lists.add(s);
+                lists.add(s);
             }else{
-	            if(s.getZdsjActual()!=null){
-	            	lists.add(s);
-	            }
+                if(s.getZdsjActual()!=null){
+                    lists.add(s);
+                }
             }
         }
         double ksgl=culateService.culateKsgl(list);
@@ -1905,63 +1776,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
  
         return listMap;
     }
-
-   /* @Override
-    public List<ScheduleRealInfo> correctForm(String line, String startDate,
-                                              String endDate, String lpName, String code, String type) {
-        List<ScheduleRealInfo> list = scheduleRealInfoRepository.correctForm(line, startDate, endDate, lpName, code);
-
-        if (type != null && type.length() != 0 && type.equals("export")) {
-            SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
-                    sdfSimple = new SimpleDateFormat("yyyyMMdd");
-            List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
-            Map<String, Object> m = new HashMap<String, Object>();
-            ReportUtils ee = new ReportUtils();
-            m.put("dates", startDate + " 至 " + endDate);
-            List<Map<String, Object>> tempList = new ArrayList<Map<String, Object>>();
-            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-            for (ScheduleRealInfo schedule : list) {
-                Map<String, Object> tempMap = new HashMap<String, Object>();
-                tempMap.put("xlName", schedule.getXlName() != null ? schedule.getXlName() : "");
-                tempMap.put("lpName", schedule.getLpName() != null ? schedule.getLpName() : "");
-                tempMap.put("clZbh", schedule.getClZbh() != null ? schedule.getClZbh() : "");
-                tempMap.put("jName", schedule.getjName() != null ? schedule.getjName() : "");
-                tempMap.put("sName", schedule.getsName() != null ? schedule.getsName() : "");
-                tempMap.put("fcsj", schedule.getFcsj() != null ? schedule.getFcsj() : "");
-                tempMap.put("fcsjActual", schedule.getFcsjActual() != null ? schedule.getFcsjActual() : "");
-                tempMap.put("zdsj", schedule.getZdsj() != null ? schedule.getZdsj() : "");
-                tempMap.put("zdsjActual", schedule.getZdsjActual() != null ? schedule.getZdsjActual() : "");
-                if (schedule.getUpdateBy() != null) {
-                    if (schedule.getUpdateBy().getName() != null)
-                        tempMap.put("userName", schedule.getUpdateBy().getName());
-                    else
-                        tempMap.put("userName", "");
-                } else {
-                    tempMap.put("userName", "");
-                }
-                if (schedule.getUpdateDate() != null) {
-                    tempMap.put("updateDate", sdf.format(schedule.getUpdateDate()));
-                } else {
-                    tempMap.put("updateDate", "");
-                }
-                tempMap.put("remarks", schedule.getRemarks() != null ? schedule.getRemarks() : "");
-                tempList.add(tempMap);
-            }
-            try {
-                listI.add(tempList.iterator());
-                String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
-                ee.excelReplace(listI, new Object[]{m}, path + "mould/correctForm.xls",
-                        path + "export/修正报表" + sdfSimple.format(sdfMonth.parse(startDate)) + "-" + sdfSimple.format(sdfMonth.parse(endDate)) + ".xls");
-            } catch (Exception e) {
-                // TODO: handle exception
-                e.printStackTrace();
-            }
-            Map<String, Object> map = tempList.get(tempList.size() - 1);
-            System.out.println("tempMap:" + map);
-        }
-
-        return list;
-    }*/
  
     @Override
     public List<SchEditInfoDto> correctForm(String line,String date,String endDate,
@@ -2141,32 +1955,112 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                     t.setAdjustExps("子");
                     listSchedule.add(t);
                 }
-            	 /* String sqlPc = "select * from bsth_c_s_child_task where schedule=" + s.getId() + "  order by start_date ";
-                List<ScheduleRealInfo> lists = jdbcTemplate.query(sqlPc,
-                        new RowMapper<ScheduleRealInfo>() {
-                            @Override
-                            public ScheduleRealInfo mapRow(ResultSet rs, int rowNum) throws SQLException {
-                                ScheduleRealInfo t = new ScheduleRealInfo();
-                                if (rs.getInt("destroy") == 0) {
-                                    t.setFcsjActual(rs.getString("start_date"));
-                                    t.setZdsjActual(rs.getString("end_date"));
-                                    t.setJhlc(rs.getDouble("mileage"));
-                                } else {
-                                    t.setFcsjActual("");
-                                    t.setZdsjActual("");
-                                    t.setJhlc(0.0);
-                                }
-                                t.setQdzName(rs.getString("start_station_name"));
-                                t.setZdzName(rs.getString("end_station_name"));
-                                t.setRemarks(rs.getString("remarks"));
-                                t.setAdjustExps("子");
-                                return t;
-                            }
-                        });
-                for (int j = 0; j < lists.size(); j++) {
-                    ScheduleRealInfo t = lists.get(j);
+            }
+        }
+
+        return listSchedule;
+    }
+
+    @Override
+    public List<ScheduleRealInfo> queryListWaybill2(String jName, String clZbh,
+                                                   String lpName, String date, String line) {
+        List<ScheduleRealInfo> listSchedule = new ArrayList<ScheduleRealInfo>();
+        List<ScheduleRealInfo> list = null;
+        list = scheduleRealInfoRepository.queryListWaybill(jName, clZbh, lpName, date, line);
+        SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm");
+        String sqlMinYysj="select start_opt from bsth_c_line_config where "
+                + " id = ("
+                + "select max(id) from bsth_c_line_config where line ='"+BasicData.lineId2CodeMap.inverse().get(line) +"'"
+                + ")";
+        String minfcsj=jdbcTemplate.queryForObject(sqlMinYysj, String.class);
+        String[] minSjs = minfcsj.split(":");
+        Long minSj=Long.parseLong(minSjs[0])*60+Long.parseLong(minSjs[1]);
+
+        for (int i = 0; i < list.size(); i++) {
+            ScheduleRealInfo s=list.get(i);
+            String[] fcsj= s.getFcsj().split(":");
+            Long fcsjL=Long.parseLong(fcsj[0])*60+Long.parseLong(fcsj[1]);
+
+            Long fscjT=0L;
+            if(fcsjL<minSj){
+                Calendar   calendar   =   new   GregorianCalendar();
+                calendar.setTime(s.getScheduleDate());
+                calendar.add(calendar.DATE,1);
+                s.setScheduleDate(calendar.getTime());
+                try {
+                    fscjT = sdf.parse(sdf.format(s.getScheduleDate())+" "+s.getFcsj()).getTime();
+                } catch (ParseException e) {
+                    // TODO Auto-generated catch block
+                    e.printStackTrace();
+                }
+
+            }else{
+                try {
+                    fscjT =sdf.parse(s.getScheduleDateStr()+" "+s.getFcsj()).getTime();
+                } catch (ParseException e) {
+                    // TODO Auto-generated catch block
+                    e.printStackTrace();
+                };
+            }
+            s.setFcsjT(fscjT);
+        }
+        Collections.sort(list, new ComparableReal());
+        for (int i = 0; i < list.size(); i++) {
+            ScheduleRealInfo s = list.get(i);
+            s.setAdjustExps(i + 1 + "");
+            String remarks = "";
+            if (s.getRemarks() != null) {
+                remarks += s.getRemarks();
+            }
+
+            Set<ChildTaskPlan> childTaskPlans = s.getcTasks();
+            if (!childTaskPlans.isEmpty()) {
+                s.setFcsjActual("");
+                s.setZdsjActual("");
+                s.setJhlc(0.0);
+            }
+
+            if (s.isDestroy()) {
+                if(s.isReissue()){
+                    s.setFcsjActual(s.getDfsj());
+                    s.setZdsjActual(s.getZdsj());
+                    s.setRemarks("");
+                    s.setStatus(2);
+                    s.setJhlc(s.getJhlcOrig());
+                }
+                else{
+                    s.setFcsjActual("");
+                    s.setZdsjActual("");
+                    s.setJhlc(0.0);
+                    remarks += "(烂班)";
+                    s.setRemarks(remarks);
+                }
+            }
+
+            listSchedule.add(s);
+            //计算营运里程，空驶里程
+            if (!childTaskPlans.isEmpty()) {
+//            	 Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+                List<ChildTaskPlan> listit=new ArrayList<ChildTaskPlan>(childTaskPlans);
+                Collections.sort(listit, new ComparableChild());
+                for (int j = 0; j < listit.size(); j++) {
+                    ScheduleRealInfo t = new ScheduleRealInfo();
+                    ChildTaskPlan childTaskPlan = listit.get(j);
+                    if (childTaskPlan.isDestroy()) {
+                        t.setFcsjActual("");
+                        t.setZdsjActual("");
+                        t.setJhlc(0.0);
+                    } else {
+                        t.setFcsjActual(childTaskPlan.getStartDate());
+                        t.setZdsjActual(childTaskPlan.getEndDate());
+                        t.setJhlc(Double.parseDouble(String.valueOf(childTaskPlan.getMileage())));
+                    }
+                    t.setQdzName(childTaskPlan.getStartStationName());
+                    t.setZdzName(childTaskPlan.getEndStationName());
+                    t.setRemarks(childTaskPlan.getRemarks());
+                    t.setAdjustExps("子");
                     listSchedule.add(t);
-                }*/
+                }
             }
         }
  
@@ -2256,551 +2150,79 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         return lMap;
     }
  
-  /*  @Override
-    public List<Map<String, Object>> statisticsDaily(String line, String date,
+    @Override
+    public List<Map<String, Object>> statisticsDaily_mh_2(String line, String date,
                                                      String xlName, String type) {
-        List<ScheduleRealInfo> list = new ArrayList<ScheduleRealInfo>();
-        if (date.length() == 10)
-            list = scheduleRealInfoRepository.scheduleByDateAndLine2(line, date);
-        else if (date.length() == 7)
-            list = scheduleRealInfoRepository.scheduleByDateAndLine3(line, date);
-
-
-        List<Map<String, Object>> lMap = new ArrayList<Map<String, Object>>();
-        DecimalFormat format = new DecimalFormat("0.00");
-        double jhlc = 0, tempJhlc = 0, childMileage = 0,jhlcOrig=0;
-        float sjgl = 0f, ssgl = 0f, ssgl_lz = 0f, ssgl_dm = 0f, ssgl_gz = 0f, ssgl_jf = 0f, ssgl_zs = 0f, ssgl_qr = 0f, ssgl_qc = 0f, ssgl_kx = 0f, ssgl_qh = 0f, ssgl_yw = 0f, ssgl_other = 0f, ljgl = 0f;
-        //班次
-        int ssbc = 0, ssbc_lz = 0, ssbc_dm = 0, ssbc_gz = 0, ssbc_jf = 0, ssbc_zs = 0, ssbc_qr = 0, ssbc_qc = 0, ssbc_kx = 0, ssbc_qh = 0, ssbc_yw = 0, ssbc_other = 0;
-        int sj_0 = 6 * 60 + 31, sj_1 = 8 * 60 + 30, sj_2 = 16 * 60 + 1, sj_3 = 18 * 60;
-        int jhbc = 0, jhbc_m = 0, jhbc_a = 0;
-        int sjbc = 0, sjbc_m = 0, sjbc_a = 0;
-        int ljbc = 0, ljbc_m = 0, ljbc_a = 0;
-        int fzbc = 0, fzbc_m = 0, fzbc_a = 0;
-        int dtbc = 0, dtbc_m = 0, dtbc_a = 0;
-        int djg = 0, djg_m = 0, djg_a = 0, djg_time = 0;
-
-        double jhlcZ = 0, tempJhlcZ = 0, childMileageZ = 0;
-        float sjglZ = 0f, ssglZ = 0f, ssgl_lzZ = 0f, ssgl_dmZ = 0f,
-                ssgl_gzZ = 0f, ssgl_jfZ = 0f, ssgl_zsZ = 0f, ssgl_qrZ = 0f, ssgl_qcZ = 0f,
-                ssgl_kxZ = 0f, ssgl_qhZ = 0f, ssgl_ywZ = 0f, ssgl_otherZ = 0f, ljglZ = 0f;
-        //班次
-        int ssbcZ = 0, ssbc_lzZ = 0, ssbc_dmZ = 0, ssbc_gzZ = 0, ssbc_jfZ = 0, ssbc_zsZ = 0, ssbc_qrZ = 0, ssbc_qcZ = 0, ssbc_kxZ = 0, ssbc_qhZ = 0, ssbc_ywZ = 0, ssbc_otherZ = 0;
-        int jhbcZ = 0, jhbc_mZ = 0, jhbc_aZ = 0;
-        int sjbcZ = 0, sjbc_mZ = 0, sjbc_aZ = 0;
-        int ljbcZ = 0, ljbc_mZ = 0, ljbc_aZ = 0;
-        int fzbcZ = 0, fzbc_mZ = 0, fzbc_aZ = 0;
-        int dtbcZ = 0, dtbc_mZ = 0, dtbc_aZ = 0;
-        int djgZ = 0, djg_mZ = 0, djg_aZ = 0, djg_timeZ = 0;
-        Map<String, Object> map = null;
-
-        double xgssgl=0,xgljgl=0,lj=0,cj=0;
-        for (int i = 0; i < list.size(); i++) {
-            ScheduleRealInfo scheduleRealInfo = list.get(i);
+        List<Map<String, Object>> lMap= new ArrayList<Map<String, Object>>();
+        List<ScheduleRealInfo>list_s=scheduleRealInfoRepository.scheduleByDateAndLine2(line, date);
+        List<ScheduleRealInfo>  lists =new ArrayList<ScheduleRealInfo>();
+        for (int i = 0; i < list_s.size(); i++) {
+            ScheduleRealInfo s=list_s.get(i);
+            if(s.isDestroy() && s.isReissue()){
+                s.setRemark("");
+                s.setFcsjActual(s.getDfsj());
+                s.setZdsjActual(s.getZdsj());
+                s.setStatus(2);
+                s.setJhlc(s.getJhlcOrig());
+            }
  
-            if (scheduleRealInfo != null) {
-                Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
-                //计算实际里程，少驶里程，计划里程=实际里程+少驶里程
-                if(!scheduleRealInfo.isSflj()){
-                    jhlc += tempJhlc;
-                    jhlcZ += tempJhlc;
-                }
-                if (childTaskPlans.isEmpty()) {
-                    tempJhlc = scheduleRealInfo.getJhlc() == null ? 0 : scheduleRealInfo.getJhlc();
-                    jhlcOrig = scheduleRealInfo.getJhlcOrig() == null ? 0 : scheduleRealInfo.getJhlcOrig();
-
-                    if(jhlcOrig-tempJhlc>0){
-                    	xgssgl +=jhlcOrig-tempJhlc;
-                    	cj += jhlcOrig-tempJhlc;
-                    }else{
-                    	xgljgl +=tempJhlc-jhlcOrig;
-                    	lj +=tempJhlc-jhlcOrig;
-                    }
-                    //临加公里
-                    if (scheduleRealInfo.isSflj()) {
-                        ljgl += tempJhlc;
-                        ljglZ += tempJhlc;
-                    }
-
-                    if (scheduleRealInfo.getStatus() == -1) {
-                        ssgl += tempJhlc;
-                        ssglZ += tempJhlc;
-                        ssbc++;
-                        ssbcZ++;
-                        if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("路阻") != -1) {
-                            ssgl_lz += tempJhlc;
-                            ssgl_lzZ += tempJhlc;
-                            ssbc_lz++;
-                            ssbc_lzZ++;
-                        } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("吊慢") != -1) {
-                            ssgl_dm += tempJhlc;
-                            ssgl_dmZ += tempJhlc;
-                            ssbc_dm++;
-                            ssbc_dmZ++;
-                        } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("故障") != -1) {
-                            ssgl_gz += tempJhlc;
-                            ssgl_gzZ += tempJhlc;
-                            ssbc_gz++;
-                            ssbc_gzZ++;
-                        } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("纠纷") != -1) {
-                            ssgl_jf += tempJhlc;
-                            ssgl_jfZ += tempJhlc;
-                            ssbc_jf++;
-                            ssbc_jfZ++;
-                        } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("肇事") != -1) {
-                            ssgl_zs += tempJhlc;
-                            ssgl_zsZ += tempJhlc;
-                            ssbc_zs++;
-                            ssbc_zsZ++;
-                        } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("缺人") != -1) {
-                            ssgl_qr += tempJhlc;
-                            ssgl_qrZ += tempJhlc;
-                            ssbc_qr++;
-                            ssbc_qrZ++;
-                        } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("缺车") != -1) {
-                            ssgl_qc += tempJhlc;
-                            ssgl_qcZ += tempJhlc;
-                            ssbc_qc++;
-                            ssbc_qcZ++;
-                        } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("客稀") != -1) {
-                            ssgl_kx += tempJhlc;
-                            ssgl_kxZ += tempJhlc;
-                            ssbc_kx++;
-                            ssbc_kxZ++;
-                        } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("气候") != -1) {
-                            ssgl_qh += tempJhlc;
-                            ssgl_qhZ += tempJhlc;
-                            ssbc_qh++;
-                            ssbc_qhZ++;
-                        } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("援外") != -1) {
-                            ssgl_yw += tempJhlc;
-                            ssgl_ywZ += tempJhlc;
-                            ssbc_yw++;
-                            ssbc_ywZ++;
-                        } else {
-                            ssgl_other += tempJhlc;
-                            ssgl_otherZ += tempJhlc;
-                            ssbc_other++;
-                            ssbc_otherZ++;
-                        }
-                    } else {
-                        sjgl += tempJhlc;
-                        sjglZ += tempJhlc;
-                    }
-                } else {
-                    Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
-                    while (it.hasNext()) {
-                        ChildTaskPlan childTaskPlan = it.next();
-                        childMileage = childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage();
-                        if (childTaskPlan.isDestroy()) {
-                            ssgl += childMileage;
-                            ssglZ += childMileage;
-                            ssbc++;
-                            ssbcZ++;
-                            if (childTaskPlan.getDestroyReason().equals("路阻")) {
-                                ssgl_lz += childTaskPlan.getMileage();
-                                ssgl_lzZ += childTaskPlan.getMileage();
-                                ssbc_lzZ++;
-                                ssbc_lzZ++;
-                            } else if (childTaskPlan.getDestroyReason().equals("吊慢")) {
-                                ssgl_dm += childTaskPlan.getMileage();
-                                ssgl_dmZ += childTaskPlan.getMileage();
-                                ssbc_dm++;
-                                ssbc_dmZ++;
-                            } else if (childTaskPlan.getDestroyReason().equals("故障")) {
-                                ssgl_gz += childTaskPlan.getMileage();
-                                ssgl_gzZ += childTaskPlan.getMileage();
-                                ssbc_gz++;
-                                ssbc_gzZ++;
-                            } else if (childTaskPlan.getDestroyReason().equals("纠纷")) {
-                                ssgl_jf += childTaskPlan.getMileage();
-                                ssgl_jfZ += childTaskPlan.getMileage();
-                                ssbc_jf++;
-                                ssbc_jfZ++;
-                            } else if (childTaskPlan.getDestroyReason().equals("肇事")) {
-                                ssgl_zs += childTaskPlan.getMileage();
-                                ssgl_zsZ += childTaskPlan.getMileage();
-                                ssbc_zs++;
-                                ssbc_zsZ++;
-                            } else if (childTaskPlan.getDestroyReason().equals("缺人")) {
-                                ssgl_qr += childTaskPlan.getMileage();
-                                ssgl_qrZ += childTaskPlan.getMileage();
-                                ssbc_qr++;
-                                ssbc_qrZ++;
-                            } else if (childTaskPlan.getDestroyReason().equals("缺车")) {
-                                ssgl_qc += childTaskPlan.getMileage();
-                                ssgl_qcZ += childTaskPlan.getMileage();
-                                ssbc_qc++;
-                                ssbc_qcZ++;
-                            } else if (childTaskPlan.getDestroyReason().equals("客稀")) {
-                                ssgl_kx += childTaskPlan.getMileage();
-                                ssgl_kxZ += childTaskPlan.getMileage();
-                                ssbc_kx++;
-                                ssbc_kxZ++;
-                            } else if (childTaskPlan.getDestroyReason().equals("气候")) {
-                                ssgl_qh += childTaskPlan.getMileage();
-                                ssgl_qhZ += childTaskPlan.getMileage();
-                                ssbc_qh++;
-                                ssbc_qhZ++;
-                            } else if (childTaskPlan.getDestroyReason().equals("援外")) {
-                                ssgl_yw += childTaskPlan.getMileage();
-                                ssgl_ywZ += childTaskPlan.getMileage();
-                                ssbc_yw++;
-                                ssbc_ywZ++;
-                            } else {
-                                ssgl_other += childTaskPlan.getMileage();
-                                ssgl_otherZ += childTaskPlan.getMileage();
-                                ssbc_other++;
-                                ssbc_otherZ++;
-                            }
-                        } else {
-                        	if (scheduleRealInfo.isSflj()) {
-                                ljgl += tempJhlc;
-                                ljglZ += tempJhlc;
-                            } else{
-                            	sjgl += childMileage;
-                                sjglZ += childMileage;
-                            }
-                        }
-                    }
-                }
-
-                //班次
-                jhbc++;
-                jhbcZ++;
-                String[] fcsj = scheduleRealInfo.getFcsj().split(":");
-                String[] fcsjActual = (scheduleRealInfo.getFcsjActual() == null ? "0:00" : scheduleRealInfo.getFcsjActual()).split(":");
-                if ((Integer.parseInt(fcsj[0]) * 60 + Integer.parseInt(fcsj[1])) > sj_0 && (Integer.parseInt(fcsj[0]) * 60 + Integer.parseInt(fcsj[1])) < sj_1) {
-                    jhbc_m++;
-                    jhbc_mZ++;
-                } else if ((Integer.parseInt(fcsj[0]) * 60 + Integer.parseInt(fcsj[1])) > sj_2 && (Integer.parseInt(fcsj[0]) * 60 + Integer.parseInt(fcsj[1])) < sj_3) {
-                    jhbc_a++;
-                    jhbc_aZ++;
-                }
-                if (scheduleRealInfo.getStatus() != -1) {
-                    sjbc++;
-                    sjbcZ++;
-                    if ((Integer.parseInt(fcsjActual[0]) * 60 + Integer.parseInt(fcsjActual[1])) > sj_0 && (Integer.parseInt(fcsjActual[0]) * 60 + Integer.parseInt(fcsjActual[1])) < sj_1) {
-                        sjbc_m++;
-                        sjbc_mZ++;
-                    } else if ((Integer.parseInt(fcsjActual[0]) * 60 + Integer.parseInt(fcsjActual[1])) > sj_2 && (Integer.parseInt(fcsjActual[0]) * 60 + Integer.parseInt(fcsjActual[1])) < sj_3) {
-                        sjbc_a++;
-                        sjbc_aZ++;
-                    }
-                }
-                if (scheduleRealInfo.isSflj()) {
-                    ljbc++;
-                    ljbcZ++;
-                    if ((Integer.parseInt(fcsjActual[0]) * 60 + Integer.parseInt(fcsjActual[1])) > sj_0 && (Integer.parseInt(fcsjActual[0]) * 60 + Integer.parseInt(fcsjActual[1])) < sj_1) {
-                        ljbc_m++;
-                        ljbc_mZ++;
-                    } else if ((Integer.parseInt(fcsjActual[0]) * 60 + Integer.parseInt(fcsjActual[1])) > sj_2 && (Integer.parseInt(fcsjActual[0]) * 60 + Integer.parseInt(fcsjActual[1])) < sj_3) {
-                        ljbc_a++;
-                        ljbc_aZ++;
-                    }
-                }
-                if (scheduleRealInfo.getBcType().equals("venting")) {
-                    fzbc++;
-                    fzbcZ++;
-                    if ((Integer.parseInt(fcsjActual[0]) * 60 + Integer.parseInt(fcsjActual[1])) > sj_0 && (Integer.parseInt(fcsjActual[0]) * 60 + Integer.parseInt(fcsjActual[1])) < sj_1) {
-                        fzbc_m++;
-                        fzbc_mZ++;
-                    } else if ((Integer.parseInt(fcsjActual[0]) * 60 + Integer.parseInt(fcsjActual[1])) > sj_2 && (Integer.parseInt(fcsjActual[0]) * 60 + Integer.parseInt(fcsjActual[1])) < sj_3) {
-                        fzbc_a++;
-                        fzbc_aZ++;
-                    }
-                }
-
-                if (i < list.size() - 1) {
-                    if (!scheduleRealInfo.getXlBm().equals(list.get(i + 1).getXlBm())) {
-                        map = new HashMap<String, Object>();
-                        map.put("xlName", scheduleRealInfo.getXlName());
-                        map.put("jhlc", format.format(jhlc));
-                        map.put("sjgl", format.format(sjgl));
-                        map.put("ssgl", format.format(ssgl+cj));
-                        map.put("ssgl_lz", ssgl_lz == 0 ? 0 : format.format(ssgl_lz));
-                        map.put("ssgl_dm", ssgl_dm == 0 ? 0 : format.format(ssgl_dm));
-                        map.put("ssgl_gz", ssgl_gz == 0 ? 0 : format.format(ssgl_gz));
-                        map.put("ssgl_jf", ssgl_jf == 0 ? 0 : format.format(ssgl_jf));
-                        map.put("ssgl_zs", ssgl_zs == 0 ? 0 : format.format(ssgl_zs));
-                        map.put("ssgl_qr", ssgl_qr == 0 ? 0 : format.format(ssgl_qr));
-                        map.put("ssgl_qc", ssgl_qc == 0 ? 0 : format.format(ssgl_qc));
-                        map.put("ssgl_kx", ssgl_kx == 0 ? 0 : format.format(ssgl_kx));
-                        map.put("ssgl_qh", ssgl_qh == 0 ? 0 : format.format(ssgl_qh));
-                        map.put("ssgl_yw", ssgl_yw == 0 ? 0 : format.format(ssgl_yw));
-                        map.put("ssgl_other", ssgl_other == 0 ? 0 : format.format(ssgl_other));
-                        map.put("ssbc", ssbc);
-                        map.put("ssbc_lz", ssbc_lz);
-                        map.put("ssbc_dm", ssbc_dm);
-                        map.put("ssbc_gz", ssbc_gz);
-                        map.put("ssbc_jf", ssbc_jf);
-                        map.put("ssbc_zs", ssbc_zs);
-                        map.put("ssbc_qr", ssbc_qr);
-                        map.put("ssbc_qc", ssbc_qc);
-                        map.put("ssbc_kx", ssbc_kx);
-                        map.put("ssbc_qh", ssbc_qh);
-                        map.put("ssbc_yw", ssbc_yw);
-                        map.put("ssbc_other", ssbc_other);
-                        map.put("ljgl", format.format(ljgl+lj));
-                        map.put("jhbc", jhbc);
-                        map.put("jhbc_m", jhbc_m);
-                        map.put("jhbc_a", jhbc_a);
-                        map.put("sjbc", sjbc);
-                        map.put("sjbc_m", sjbc_m);
-                        map.put("sjbc_a", sjbc_a);
-                        map.put("ljbc", ljbc);
-                        map.put("ljbc_m", ljbc_m);
-                        map.put("ljbc_a", ljbc_a);
-                        map.put("fzbc", fzbc);
-                        map.put("fzbc_m", fzbc_m);
-                        map.put("fzbc_a", fzbc_a);
-                        map.put("dtbc", dtbc);
-                        map.put("dtbc_m", dtbc_m);
-                        map.put("dtbc_a", dtbc_a);
-                        map.put("djg", djg);
-                        map.put("djg_m", djg_m);
-                        map.put("djg_a", djg_a);
-                        map.put("djg_time", djg_time);
-                        lMap.add(map);
-                        jhlc = 0;
-                        tempJhlc = 0;
-                        childMileage = 0;
-                        sjgl = 0f;
-                        ssgl = 0f;
-                        ssgl_lz = 0f;
-                        ssgl_dm = 0f;
-                        ssgl_gz = 0f;
-                        ssgl_jf = 0f;
-                        ssgl_zs = 0f;
-                        ssgl_qr = 0f;
-                        ssgl_qc = 0f;
-                        ssgl_kx = 0f;
-                        ssgl_qh = 0f;
-                        ssgl_yw = 0f;
-                        ssgl_other = 0f;
-                        ljgl = 0f;
-                        //班次
-                        jhbc = 0;
-                        jhbc_m = 0;
-                        jhbc_a = 0;
-                        sjbc = 0;
-                        sjbc_m = 0;
-                        sjbc_a = 0;
-                        ljbc = 0;
-                        ljbc_m = 0;
-                        ljbc_a = 0;
-                        fzbc = 0;
-                        fzbc_m = 0;
-                        fzbc_a = 0;
-                        dtbc = 0;
-                        dtbc_m = 0;
-                        dtbc_a = 0;
-                        djg = 0;
-                        djg_m = 0;
-                        djg_a = 0;
-                        djg_time = 0;
-                        lj=0;
-                        cj=0;
-                    }
-                } else {
-                    map = new HashMap<String, Object>();
-                    map.put("xlName", scheduleRealInfo.getXlName());
-                    map.put("jhlc", format.format(jhlc));
-                    map.put("sjgl", format.format(sjgl));
-                    map.put("ssgl", format.format(ssgl+cj));
-                    map.put("ssgl_lz", ssgl_lz == 0 ? 0 : format.format(ssgl_lz));
-                    map.put("ssgl_dm", ssgl_dm == 0 ? 0 : format.format(ssgl_dm));
-                    map.put("ssgl_gz", ssgl_gz == 0 ? 0 : format.format(ssgl_gz));
-                    map.put("ssgl_jf", ssgl_jf == 0 ? 0 : format.format(ssgl_jf));
-                    map.put("ssgl_zs", ssgl_zs == 0 ? 0 : format.format(ssgl_zs));
-                    map.put("ssgl_qr", ssgl_qr == 0 ? 0 : format.format(ssgl_qr));
-                    map.put("ssgl_qc", ssgl_qc == 0 ? 0 : format.format(ssgl_qc));
-                    map.put("ssgl_kx", ssgl_kx == 0 ? 0 : format.format(ssgl_kx));
-                    map.put("ssgl_qh", ssgl_qh == 0 ? 0 : format.format(ssgl_qh));
-                    map.put("ssgl_yw", ssgl_yw == 0 ? 0 : format.format(ssgl_yw));
-                    map.put("ssgl_other", ssgl_other == 0 ? 0 : format.format(ssgl_other));
-                    map.put("ssbc", ssbc);
-                    map.put("ssbc_lz", ssbc_lz);
-                    map.put("ssbc_dm", ssbc_dm);
-                    map.put("ssbc_gz", ssbc_gz);
-                    map.put("ssbc_jf", ssbc_jf);
-                    map.put("ssbc_zs", ssbc_zs);
-                    map.put("ssbc_qr", ssbc_qr);
-                    map.put("ssbc_qc", ssbc_qc);
-                    map.put("ssbc_kx", ssbc_kx);
-                    map.put("ssbc_qh", ssbc_qh);
-                    map.put("ssbc_yw", ssbc_yw);
-                    map.put("ssbc_other", ssbc_other);
-                    map.put("ljgl", format.format(ljgl+lj));
-                    map.put("jhbc", jhbc);
-                    map.put("jhbc_m", jhbc_m);
-                    map.put("jhbc_a", jhbc_a);
-                    map.put("sjbc", sjbc);
-                    map.put("sjbc_m", sjbc_m);
-                    map.put("sjbc_a", sjbc_a);
-                    map.put("ljbc", ljbc);
-                    map.put("ljbc_m", ljbc_m);
-                    map.put("ljbc_a", ljbc_a);
-                    map.put("fzbc", fzbc);
-                    map.put("fzbc_m", fzbc_m);
-                    map.put("fzbc_a", fzbc_a);
-                    map.put("dtbc", dtbc);
-                    map.put("dtbc_m", dtbc_m);
-                    map.put("dtbc_a", dtbc_a);
-                    map.put("djg", djg);
-                    map.put("djg_m", djg_m);
-                    map.put("djg_a", djg_a);
-                    map.put("djg_time", djg_time);
-                    lMap.add(map);
-                    jhlc = 0;
-                    tempJhlc = 0;
-                    childMileage = 0;
-                    sjgl = 0f;
-                    ssgl = 0f;
-                    ssgl_lz = 0f;
-                    ssgl_dm = 0f;
-                    ssgl_gz = 0f;
-                    ssgl_jf = 0f;
-                    ssgl_zs = 0f;
-                    ssgl_qr = 0f;
-                    ssgl_qc = 0f;
-                    ssgl_kx = 0f;
-                    ssgl_qh = 0f;
-                    ssgl_yw = 0f;
-                    ssgl_other = 0f;
-                    ljgl = 0f;
-                    //班次
-                    jhbc = 0;
-                    jhbc_m = 0;
-                    jhbc_a = 0;
-                    sjbc = 0;
-                    sjbc_m = 0;
-                    sjbc_a = 0;
-                    ljbc = 0;
-                    ljbc_m = 0;
-                    ljbc_a = 0;
-                    fzbc = 0;
-                    fzbc_m = 0;
-                    fzbc_a = 0;
-                    dtbc = 0;
-                    dtbc_m = 0;
-                    dtbc_a = 0;
-                    djg = 0;
-                    djg_m = 0;
-                    djg_a = 0;
-                    djg_time = 0;
-                    lj=0;
-                    cj=0;
+            Set<ChildTaskPlan> cts = s.getcTasks();
+            if(cts != null && cts.size() > 0){
+                lists.add(s);
+            }else{
+                if(s.getZdsjActual()!=null){
+                    lists.add(s);
                 }
             }
         }
-        map = new HashMap<String, Object>();
-        map.put("xlName", "合计");
-        map.put("jhlc", format.format(jhlcZ));
-        map.put("sjgl", format.format(sjglZ));
-        map.put("ssgl", format.format(ssglZ+xgssgl));
-        map.put("ssgl_lz", ssgl_lzZ == 0 ? 0 : format.format(ssgl_lzZ));
-        map.put("ssgl_dm", ssgl_dmZ == 0 ? 0 : format.format(ssgl_dmZ));
-        map.put("ssgl_gz", ssgl_gzZ == 0 ? 0 : format.format(ssgl_gzZ));
-        map.put("ssgl_jf", ssgl_jfZ == 0 ? 0 : format.format(ssgl_jfZ));
-        map.put("ssgl_zs", ssgl_zsZ == 0 ? 0 : format.format(ssgl_zsZ));
-        map.put("ssgl_qr", ssgl_qrZ == 0 ? 0 : format.format(ssgl_qrZ));
-        map.put("ssgl_qc", ssgl_qcZ == 0 ? 0 : format.format(ssgl_qcZ));
-        map.put("ssgl_kx", ssgl_kxZ == 0 ? 0 : format.format(ssgl_kxZ));
-        map.put("ssgl_qh", ssgl_qhZ == 0 ? 0 : format.format(ssgl_qhZ));
-        map.put("ssgl_yw", ssgl_ywZ == 0 ? 0 : format.format(ssgl_ywZ));
-        map.put("ssgl_other", ssgl_otherZ == 0 ? 0 : format.format(ssgl_otherZ));
-        map.put("ssbc", ssbcZ);
-        map.put("ssbc_lz", ssbc_lzZ);
-        map.put("ssbc_dm", ssbc_lzZ);
-        map.put("ssbc_gz", ssbc_gzZ);
-        map.put("ssbc_jf", ssbc_jfZ);
-        map.put("ssbc_zs", ssbc_zsZ);
-        map.put("ssbc_qr", ssbc_qrZ);
-        map.put("ssbc_qc", ssbc_qcZ);
-        map.put("ssbc_kx", ssbc_qcZ);
-        map.put("ssbc_qh", ssbc_qhZ);
-        map.put("ssbc_yw", ssbc_ywZ);
-        map.put("ssbc_other", ssbc_otherZ);
-        map.put("ljgl", format.format(ljglZ+xgljgl));
-        map.put("jhbc", jhbcZ);
-        map.put("jhbc_m", jhbc_mZ);
-        map.put("jhbc_a", jhbc_aZ);
-        map.put("sjbc", sjbcZ);
-        map.put("sjbc_m", sjbc_mZ);
-        map.put("sjbc_a", sjbc_aZ);
-        map.put("ljbc", ljbcZ);
-        map.put("ljbc_m", ljbc_mZ);
-        map.put("ljbc_a", ljbc_aZ);
-        map.put("fzbc", fzbcZ);
-        map.put("fzbc_m", fzbc_mZ);
-        map.put("fzbc_a", fzbc_aZ);
-        map.put("dtbc", dtbcZ);
-        map.put("dtbc_m", dtbc_mZ);
-        map.put("dtbc_a", dtbc_aZ);
-        map.put("djg", djgZ);
-        map.put("djg_m", djg_mZ);
-        map.put("djg_a", djg_aZ);
-        map.put("djg_time", djg_timeZ);
+        Map<String, Object> map = new HashMap<String, Object>();
+        map.put("xlName", xlName);
+        double jhlc=culateService.culateJhgl(list_s);
+        map.put("jhlc",jhlc);
+        map.put("sjgl", Arith.add(culateService.culateSjgl(lists),culateService.culateLjgl(lists)));
+        double lbgl=culateService.culateLbgl(list_s);
+        map.put("ssgl", lbgl);
+        map.put("ssgl_lz", culateService.culateCJLC(list_s, "路阻"));
+        map.put("ssgl_dm", culateService.culateCJLC(list_s, "吊慢"));
+        map.put("ssgl_gz", culateService.culateCJLC(list_s, "故障"));
+        map.put("ssgl_jf", culateService.culateCJLC(list_s, "纠纷"));
+        map.put("ssgl_zs", culateService.culateCJLC(list_s, "肇事"));
+        map.put("ssgl_qr", culateService.culateCJLC(list_s, "缺人"));
+        map.put("ssgl_qc", culateService.culateCJLC(list_s, "缺车"));
+        map.put("ssgl_kx", culateService.culateCJLC(list_s, "客稀"));
+        map.put("ssgl_qh", culateService.culateCJLC(list_s, "气候"));
+        map.put("ssgl_yw", culateService.culateCJLC(list_s, "援外"));
+        double ssgl_pc=culateService.culateCJLC(list_s, "配车");
+        double ssgl_by=culateService.culateCJLC(list_s, "保养");
+        double ssgl_cj=culateService.culateCJLC(list_s, "抽减");
+        double ssgl_qt=culateService.culateCJLC(list_s, "其他");
+        map.put("ssgl_other", Arith.add(Arith.add(ssgl_pc, ssgl_by),Arith.add(ssgl_cj, ssgl_qt)));
+        map.put("ssbc", culateService.culateLbbc(list_s));
+        double ljgl=culateService.culateLjgl(lists);
+        map.put("ljgl", ljgl);
+        map.put("jhbc", culateService.culateJhbc(list_s,""));
+        map.put("jhbc_m", culateService.culateJhbc(list_s, "zgf"));
+        map.put("jhbc_a", culateService.culateJhbc(list_s, "wgf"));
+        map.put("sjbc", culateService.culateSjbc(lists,""));
+        map.put("sjbc_m", culateService.culateSjbc(lists,"zgf"));
+        map.put("sjbc_a", culateService.culateSjbc(lists,"wgf"));
+        map.put("ljbc", culateService.culateLjbc(lists,""));
+        map.put("ljbc_m", culateService.culateLjbc(lists,"zgf"));
+        map.put("ljbc_a", culateService.culateLjbc(lists,"wgf"));
+        map.put("fzbc", culateService.culateFzbc(lists, ""));
+        map.put("fzbc_m", culateService.culateFzbc(lists, "zgf"));
+        map.put("fzbc_a",  culateService.culateFzbc(lists, "wgf"));
+        map.put("dtbc", 0);
+        map.put("dtbc_m", 0);
+        map.put("dtbc_a", 0);
+        map.put("djg", 0);
+        map.put("djg_m", 0);
+        map.put("djg_a", 0);
+        map.put("djg_time", 0);
+        map.put("jls", Arith.sub(Arith.add(jhlc, ljgl), lbgl));
         lMap.add(map);
-        for (int i = 0; i < lMap.size(); i++) {
-        	Map<String, Object> m=lMap.get(i);
-//        	m.get(""))
-        	jhlc +=  Double.parseDouble(m.get("jhlc").toString());
-        	sjgl +=   Double.parseDouble(m.get("sjgl").toString());
-        	ssgl += Double.parseDouble( m.get("ssgl").toString());
-        	ssgl_lz += Double.parseDouble( m.get("ssgl_lz").toString());
-        	ssgl_dm += Double.parseDouble(m.get("ssgl_dm").toString());
-        	ssgl_gz += Double.parseDouble( m.get("ssgl_gz").toString());
-        	ssgl_jf += m.get("ssgl_jf", ssgl_jf == 0 ? 0 : format.format(ssgl_jf));
-            m.get("ssgl_zs", ssgl_zs == 0 ? 0 : format.format(ssgl_zs));
-            m.get("ssgl_qr", ssgl_qr == 0 ? 0 : format.format(ssgl_qr));
-            m.get("ssgl_qc", ssgl_qc == 0 ? 0 : format.format(ssgl_qc));
-            m.get("ssgl_kx", ssgl_kx == 0 ? 0 : format.format(ssgl_kx));
-            m.get("ssgl_qh", ssgl_qh == 0 ? 0 : format.format(ssgl_qh));
-            m.get("ssgl_yw", ssgl_yw == 0 ? 0 : format.format(ssgl_yw));
-            m.get("ssgl_other", ssgl_other == 0 ? 0 : format.format(ssgl_other));
-            m.get("ljgl", ljgl == 0 ? 0 : format.format(ljgl));
-            m.get("jhbc", jhbc);
-            m.get("jhbc_m", jhbc_m);
-            m.get("jhbc_a", jhbc_a);
-            m.get("sjbc", sjbc);
-            m.get("sjbc_m", sjbc_m);
-            m.get("sjbc_a", sjbc_a);
-            m.get("ljbc", ljbc);
-            m.get("ljbc_m", ljbc_m);
-            m.get("ljbc_a", ljbc_a);
-            m.get("fzbc", fzbc);
-            m.get("fzbc_m", fzbc_m);
-            m.get("fzbc_a", fzbc_a);
-            m.get("dtbc", dtbc);
-            m.get("dtbc_m", dtbc_m);
-            m.get("dtbc_a", dtbc_a);
-            m.get("djg", djg);
-            m.get("djg_m", djg_m);
-            m.get("djg_a", djg_a);
-            m.get("djg_time", djg_time);
-		}
-
-        if (type != null && type.length() != 0 && type.equals("export")) {
-            SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
-                    sdfSimple = new SimpleDateFormat("yyyyMMdd");
-            List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
-            Map<String, Object> m = new HashMap<String, Object>();
-            ReportUtils ee = new ReportUtils();
-            try {
-                listI.add(lMap.iterator());
-                String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
-                ee.excelReplace(listI, new Object[]{m}, path + "mould/statisticsDaily_.xls",
-                        path + "export/统计日报" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
-            } catch (Exception e) {
-                // TODO: handle exception
-                e.printStackTrace();
-            }
-        }
-
         return lMap;
-    }*/
+    }
  
     public final Map<String, Object> staticTj(List<ScheduleRealInfo> list){
  
@@ -3094,15 +2516,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
  
     @Override
     public List<ScheduleRealInfo> realScheduleList(String line, String date) {
-		/*List<ScheduleRealInfo> listInfo = scheduleRealInfoRepository.queryUserInfo(line, date);
-		List<ScheduleRealInfo> listTotal = scheduleRealInfoRepository.scheduleByDateAndLine(line, date);
-		for(ScheduleRealInfo info:listInfo){
-			for(ScheduleRealInfo total:listTotal){
-				if(info.getjGh().equals(total.getjGh()) && info.getLpName().equals(total.getLpName()) && info.getClZbh().equals(total.getClZbh())){
-
-				}
-			}
-		}*/
         List<ScheduleRealInfo> list = new ArrayList<ScheduleRealInfo>();
         String lpName = "lpName";
         String zdsj = "";
@@ -3189,16 +2602,103 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
     }
  
     @Override
-    public List<ScheduleRealInfo> realScheduleListQp(String line, String date) {
-		/*List<ScheduleRealInfo> listInfo = scheduleRealInfoRepository.queryUserInfo(line, date);
-		List<ScheduleRealInfo> listTotal = scheduleRealInfoRepository.scheduleByDateAndLine(line, date);
-		for(ScheduleRealInfo info:listInfo){
-			for(ScheduleRealInfo total:listTotal){
-				if(info.getjGh().equals(total.getjGh()) && info.getLpName().equals(total.getLpName()) && info.getClZbh().equals(total.getClZbh())){
+    public List<ScheduleRealInfo> realScheduleList_mh_2(String line, String date) {
+        List<ScheduleRealInfo> list = new ArrayList<ScheduleRealInfo>();
+        String lpName = "lpName";
+        String zdsj = "";
+        String zdsjActual = "";
+        String zdsj1 = "";
+        String zdsjActual1 = "";
+        List<ScheduleRealInfo> listInfo = scheduleRealInfoRepository.scheduleByDateAndLineQp(line, date);
  
-				}
-			}
-		}*/
+        for(ScheduleRealInfo s : listInfo){
+            if(s.isDestroy() && s.isReissue()){
+                s.setRemark("");
+                s.setFcsjActual(s.getDfsj());
+                s.setZdsjActual(s.getZdsj());
+                s.setStatus(2);
+                s.setJhlc(s.getJhlcOrig());
+            }
+        }
+
+        for (int i = 0; i < listInfo.size(); i++) {
+            ScheduleRealInfo t = listInfo.get(i);
+            if (!lpName.equals(t.getLpName())) {
+                zdsjActual = t.getZdsjActual();
+                zdsj = t.getZdsj();
+                t.setZdsjActual("");
+                t.setZdsj("");
+            } else {
+                zdsj1 = t.getZdsj();
+                zdsjActual1 = t.getZdsjActual();
+                t.setZdsjActual(zdsjActual);
+                t.setZdsj(zdsj);
+                zdsj = zdsj1;
+                zdsjActual = zdsjActual1;
+            }
+            lpName = t.getLpName();
+            list.add(t);
+        }
+
+        List<ScheduleRealInfo> listInfo2 = scheduleRealInfoRepository.scheduleByDateAndLineQp2(line, date);
+        List<ScheduleRealInfo> xList = new ArrayList<ScheduleRealInfo>();
+        List<ScheduleRealInfo> yList = new ArrayList<ScheduleRealInfo>();
+        List<ScheduleRealInfo> zList = new ArrayList<ScheduleRealInfo>();
+        List<ScheduleRealInfo> newList = new ArrayList<ScheduleRealInfo>();
+        if (listInfo2.size() > 0) {
+            int a = listInfo2.size() % 3;
+            int b = listInfo2.size() / 3;
+            int x = 0, y = 0;
+            if (a == 2) {
+                x = b + 1;
+                y = x * 2;
+            } else if (b == 1) {
+                x = b + 1;
+                y = x * 2 - 1;
+            } else {
+                x = b;
+                y = 2 * x;
+
+            }
+            for (int i = 0; i < listInfo2.size(); i++) {
+                ScheduleRealInfo s = listInfo2.get(i);
+                if (i + 1 <= x) {
+                    xList.add(s);
+                } else if ((i + 1) > x && (i + 1) <= y) {
+                    yList.add(s);
+                } else {
+                    zList.add(s);
+                }
+            }
+            for (int i = 0; i < x; i++) {
+                newList.add(xList.get(i));
+                if (yList.size() > i) {
+                    newList.add(yList.get(i));
+                } else {
+                    newList.add(new ScheduleRealInfo());
+                }
+                if (zList.size() > i) {
+                    newList.add(zList.get(i));
+                } else {
+                    newList.add(new ScheduleRealInfo());
+                }
+
+            }
+        }
+        for (int i = 0; i < newList.size(); i++) {
+            ScheduleRealInfo t1 = newList.get(i);
+            for (int j = 0; j < list.size(); j++) {
+                ScheduleRealInfo t2 = list.get(j);
+                if (t1.getId() == t2.getId()) {
+                    t1 = t2;
+                }
+            }
+        }
+        return newList;
+    }
+
+    @Override
+    public List<ScheduleRealInfo> realScheduleListQp(String line, String date) {
         List<ScheduleRealInfo> list = new ArrayList<ScheduleRealInfo>();
         String lpName = "lpName";
         String zdsj = "";
@@ -3221,18 +2721,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 zdsj = zdsj1;
                 zdsjActual = zdsjActual1;
             }
-    		/*if(i<listInfo.size()-1){
-    			if(s.getLpName().equals(listInfo.get(i+1).getLpName())){
-    				zdsj=s.getZdsj();
-    	    		zdsjActual=s.getZdsjActual();
-    			}else{
-    				zdsj="";
-    		    	zdsjActual="";
-    			}
-    		}else{
-    			zdsj=s.getZdsj();
-	    		zdsjActual=s.getZdsjActual();
-    		}*/
  
             lpName = t.getLpName();
             list.add(t);
@@ -3241,12 +2729,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
     }
  
     public List<Map<String, Object>> yesterdayDataList(String line, String date,String gsbm,String fgsbm,String jGh,String nbbm) {
-//    	Arith arith=new Arith();
-        //前一天日期
-//		String date = sdfMonth.format(org.apache.commons.lang.time.DateUtils.addDays(new Date(), -1));
-//		String date = "2016-09-20";
-//    	  System.out.println("shijian1:"+new Date());
-    	
         List<Map<String, Object>> yesterdayDataList = new ArrayList<Map<String, Object>>();
         if(line.equals("")){
         	yesterdayDataList=scheduleRealInfoRepository.yesterdayDataList(line, date,gsbm,fgsbm,nbbm);
@@ -3279,67 +2761,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                         fage = false;
                     }
                     listS.add(scheduleRealInfo);
-
-	               /* if (scheduleRealInfo != null) {
-	                    //计划里程（主任务过滤掉临加班次），
-	                    //烂班里程（主任务烂班），
-	                    //临加里程（主任务临加），
-	                    //计划班次，烂班班次，增加班次
-	                    tempJhlc = scheduleRealInfo.getJhlc() == null ? 0 : scheduleRealInfo.getJhlc();
-	                    if (scheduleRealInfo.isSflj()) {
-	                    	if(scheduleRealInfo.getStatus() == -1){
-	                    		addMileage =Arith.add(addMileage, tempJhlc);
-	                    	}
-	                    } else {
-	                        if (!(scheduleRealInfo.getBcType().equals("in")
-	                                || scheduleRealInfo.getBcType().equals("out"))) {
-	                            jhlc =Arith.add(jhlc,tempJhlc);
-	                        }
-
-	                        if (scheduleRealInfo.getStatus() == -1) {
-	                            remMileage =Arith.add(remMileage,tempJhlc);
-	                        }
-	                    }
-	                    Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
-	                    //计算营运里程，空驶里程
-	                    if (childTaskPlans.isEmpty()) {
-	                        if (scheduleRealInfo.getBcType().equals("in") ||
-	                                scheduleRealInfo.getBcType().equals("out")) {
-	                        	if (scheduleRealInfo.getStatus() != -1) {
-	                        		jcclc=Arith.add(jcclc,tempJhlc);
-	                        	}
-	                        }
-	                        //主任务 放空班次属于营运
-	//						else if(scheduleRealInfo.getBcType().equals("venting")){
-	//							ksgl += tempJhlc;
-	//						}
-	                        else {
-	                            if (scheduleRealInfo.getStatus() != -1) {
-	                                yygl=Arith.add(yygl,tempJhlc);
-	                            }
-	                        }
-	                    } else {
-	                        Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
-	                        while (it.hasNext()) {
-	                            ChildTaskPlan childTaskPlan = it.next();
-	                            if (childTaskPlan.getMileageType().equals("empty")) {
-	                                if (childTaskPlan.isDestroy()) {
-	                                    remMileage=Arith.add(remMileage,childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage());
-	                                } else {
-	                                    ksgl += Arith.add(ksgl,childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage());
-	                                }
-	                            } else {
-	                                if (childTaskPlan.isDestroy()) {
-	                                    remMileage=Arith.add(remMileage,childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage());
-
-	                                } else {
-	                                    yygl=Arith.add(yygl,childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage());
-
-	                                }
-	                            }
-	                        }
-	                    }
-	                }*/
                 }
             }
  
@@ -3802,10 +3223,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                             ) {
                         jcclc += tempJhlc;
                     }
-                    //主任务 放空班次属于营运
-//						else if(scheduleRealInfo.getBcType().equals("venting")){
-//							ksgl += tempJhlc;
-//						}
                     else {
                         if (scheduleRealInfo.getStatus() != -1) {
                             if (scheduleRealInfo.isSflj()) {
@@ -3973,86 +3390,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         double jhlc = 0, yygl = 0, ksgl = 0, tempJhlc = 0, jcclc = 0,ljjcclc=0,jhjcclc=0;
         double addMileage = 0, remMileage = 0, addgl = 0, remgl = 0;
         Map<String, Object> map = new HashMap<String, Object>();
-       /* for (ScheduleRealInfo scheduleRealInfo : list) {
-            if (scheduleRealInfo != null) {
-                //计划里程（主任务过滤掉临加班次），
-                //烂班里程（主任务烂班），
-                //临加里程（主任务临加），
-                //计划班次，烂班班次，增加班次
-                double jh = 0, sj = 0;
-                tempJhlc = scheduleRealInfo.getJhlc() == null ? 0 : scheduleRealInfo.getJhlc();
-                if (scheduleRealInfo.isSflj()) {
-                	if(!(scheduleRealInfo.getBcType().equals("in")
-                            || scheduleRealInfo.getBcType().equals("out"))){
-                		ljbc++;
-                	}
-                } else {
-                    if (!(scheduleRealInfo.getBcType().equals("in")
-                            || scheduleRealInfo.getBcType().equals("out"))) {
-                        jhbc++;
-                        jh += tempJhlc;
-                    }
-
-                    if (scheduleRealInfo.getStatus() == -1) {
-                        remMileage += tempJhlc;
-                        cjbc++;
-                    }
-                }
-                Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
-                //计算营运里程，空驶里程
-                if (childTaskPlans.isEmpty()) {
-                    if (scheduleRealInfo.getBcType().equals("in") ||
-                            scheduleRealInfo.getBcType().equals("out")) {
-                    	if(scheduleRealInfo.getStatus() != -1){
-                    		if(scheduleRealInfo.isSflj()){
-                    			ljjcclc += tempJhlc;
-                    		}else{
-                    			jcclc += tempJhlc;
-                    		}
-                    	}
-                    }else {
-                        if (scheduleRealInfo.getStatus() != -1) {
-                            if (scheduleRealInfo.isSflj()) {
-                                addMileage += tempJhlc;
-                            }
-                            sj += tempJhlc;
-                        }
-                    }
-                } else {
-                    Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
-                    while (it.hasNext()) {
-                        ChildTaskPlan childTaskPlan = it.next();
-                        if (childTaskPlan.getMileageType().equals("empty")) {
-                            if (childTaskPlan.isDestroy()) {
-                                remMileage += childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage();
-                            } else {
-                                if (scheduleRealInfo.isSflj()) {
-                                    addMileage += tempJhlc;
-                                }
-                                ksgl += childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage();
-                            }
-                        } else {
-                            if (childTaskPlan.isDestroy()) {
-                                remMileage += childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage();
-//								cjbc++;
-                            } else {
-                                if (scheduleRealInfo.isSflj()) {
-                                    addMileage += tempJhlc;
-                                }
-                                sj += childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage();
-                            }
-                        }
-                    }
-                }
-                jhlc += jh;
-                yygl += sj;
-                if (jh > sj) {
-                    remgl += jh - sj;
-                } else if (sj > jh) {
-                    addgl += sj - jh;
-                }
-            }
-        }*/
         jhlc=culateMieageService.culateJhgl(lists);
         jcclc=culateMieageService.culateJccgl(lists);
         jhjcclc=culateMieageService.culateJhJccgl(lists);
@@ -30,5 +30,23 @@ public interface CulateMileageService {
  
 	 int culateFzbc(List<ScheduleRealInfo> lists,String item);
  
+	 
+	 
+	 //以下计算方法供新报表使用
+	 Map<String, Double> culateSjlcMap(List<ScheduleRealInfo> lists);//计划内营运and计划外营运
+	 
+	 Map<String, Double> culateSjJcclcMap(List<ScheduleRealInfo> lists);//计划内进出场and计划外进出场
+	 
+	 Map<String, Double> culateLjMile(List<ScheduleRealInfo> lists);//临加营运and临加进出场空驶
+	 
+	 double culateSsMile(List<ScheduleRealInfo> lists); //烂班少驶
+	 
+	 double culateSsMileXx(List<ScheduleRealInfo> lists,String item);//烂班少驶详细
+	 
+	 double culateZrwJccLc(List<ScheduleRealInfo> lists,String item);//子任务进出场
+	 
+	 double culateKfksLc(List<ScheduleRealInfo> lists);
+	 
+	 
 }
  
@@ -42,4 +42,8 @@ public interface ReportService {
 	 List<Map<String, String>> carList(Map<String, Object> map);
  
 	 List<Map<String, String>> userList(Map<String, Object> map);
+	 
+	 List<Map<String, Object>> countByList(Map<String, Object> map);
+	 
+	 List<Map<String, Object>> countByBusList(Map<String, Object> map);
  }
@@ -16,6 +16,7 @@ import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.service.report.CulateMileageService;
 import com.bsth.util.Arith;
 import com.bsth.util.ComparableJob;
+import com.google.common.util.concurrent.AbstractScheduledService.Scheduler;
  
 @Service
 public class CulateMileageServiceImpl  implements CulateMileageService{
@@ -135,9 +136,11 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 					Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
 	                while (it.hasNext()) {
 	                    ChildTaskPlan childTaskPlan = it.next();
-	                    if (childTaskPlan.isDestroy()) {
-	    					zlblc=Arith.add(zlblc,childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage());
-	                    } 
+	                    if(childTaskPlan.getMileageType().equals("service")){
+		                    if (childTaskPlan.isDestroy()) {
+		    					zlblc=Arith.add(zlblc,childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage());
+		                    } 
+	                    }
 	                }
 				}
 			}
@@ -625,5 +628,279 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 		}
 		return fzbc;
 	}
+     
+	
+	//
+	//
+	//新报表公里计算方法开始
+	//
+	//
+	
+	//计划内营运and计划外营运
+	@Override
+	public Map<String, Double> culateSjlcMap(List<ScheduleRealInfo> lists) {
+		// TODO Auto-generated method stub
+		double jhnlc=0.0;
+		double jhwlc=0.0;
+		for (int i = 0; i < lists.size(); i++) {
+			ScheduleRealInfo t=lists.get(i);
+			if(!isInOut(t)){
+				if(!t.isSflj()){
+					Set<ChildTaskPlan> childTaskPlans = t.getcTasks();
+					if(childTaskPlans.isEmpty()){
+						if(!t.isDestroy()){
+							if( Math.abs(t.getJhlc()-t.getJhlcOrig())>0){
+								jhwlc =Arith.add(jhwlc, t.getJhlcOrig());
+							}else{
+								jhnlc =Arith.add(jhnlc, t.getJhlc());
+							}
+						}
+					}else{
+						Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+						double zrwlc=0.0;
+						boolean fage=false;
+		                while (it.hasNext()) {
+		                    ChildTaskPlan childTaskPlan = it.next();
+		                    if(childTaskPlan.getMileageType().equals("service")){
+		                    	 if (childTaskPlan.isDestroy()) {
+		 	                    	fage=true;
+		 	                     }else{
+		 	                    	 zrwlc =Arith.add(zrwlc, childTaskPlan.getMileage());
+		 	                     }
+		                    }
+		                }
+		                if(fage){
+		                	jhwlc =Arith.add(jhwlc, zrwlc);
+		                }else{
+		                	jhnlc =Arith.add(jhnlc, zrwlc);
+		                }
+					}
+				}
+			}
+		}
+		
+		Map<String, Double> map=new HashMap<String, Double>();
+		map.put("jhnlc", jhnlc);
+		map.put("jhwlc", jhwlc);
+		return map;
+	}
+
+	//计划内进出场and计划外进出场
+	@Override
+	public Map<String, Double> culateSjJcclcMap(List<ScheduleRealInfo> lists) {
+		// TODO Auto-generated method stub
+		double jhwlc=0.0;
+		double jhnlc=0.0;
+		for (int i = 0; i < lists.size(); i++) {
+			ScheduleRealInfo t=lists.get(i);
+			if(t.getBcType().equals("in") || t.getBcType().equals("out")){
+				if(!t.isSflj()){
+					Set<ChildTaskPlan> childTaskPlans = t.getcTasks();
+					if(childTaskPlans.isEmpty()){
+						if(!t.isDestroy()){
+							if( Math.abs(t.getJhlc()-t.getJhlcOrig())>0){
+								jhwlc =Arith.add(jhwlc, t.getJhlcOrig());
+							}else{
+								jhnlc =Arith.add(jhnlc, t.getJhlc());
+							}
+						}
+					}else{
+						Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+						double zrwlc=0.0;
+						boolean fage=false;
+		                while (it.hasNext()) {
+		                    ChildTaskPlan childTaskPlan = it.next();
+		                    if(childTaskPlan.getMileageType().equals("empty")){
+		                    	 if (childTaskPlan.isDestroy()) {
+		 	                    	fage=true;
+		 	                     }else{
+		 	                    	 zrwlc =Arith.add(zrwlc, childTaskPlan.getMileage());
+		 	                     }
+		                    }
+		                }
+		                if(fage){
+		                	jhwlc =Arith.add(jhwlc, zrwlc);
+		                }else{
+		                	jhnlc =Arith.add(jhnlc, zrwlc);
+		                }
+				    }
+			    }
+			}
+		}
+		Map<String, Double> map=new HashMap<String, Double>();
+		map.put("jhnlc", jhnlc);
+		map.put("jhwlc", jhwlc);
+		return map;
+	}
+
+	@Override
+	public Map<String, Double> culateLjMile(List<ScheduleRealInfo> lists) {
+		// TODO Auto-generated method stub
+		double ljjcc=0.0;
+		double ljyy=0.0;
+		for (int i = 0; i < lists.size(); i++) {
+			ScheduleRealInfo t=lists.get(i);
+			if(t.isSflj()){
+				if(t.getBcType().equals("in") || t.getBcType().equals("out")){
+					Set<ChildTaskPlan> childTaskPlans = t.getcTasks();
+					if(childTaskPlans.isEmpty()){
+						if(!t.isDestroy()){
+							ljjcc =Arith.add(ljjcc, t.getJhlc());
+						}
+						
+					}
+					/*else{
+						//临加进出场子任务 待统计
+						Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+						double zrwlc=0.0;
+						boolean fage=false;
+		                while (it.hasNext()) {
+		                    ChildTaskPlan childTaskPlan = it.next();
+		                }
+					}*/
+				}
+				
+				if(!isInOut(t)){
+					Set<ChildTaskPlan> childTaskPlans = t.getcTasks();
+					if(childTaskPlans.isEmpty()){
+						if(!t.isDestroy()){
+							ljyy =Arith.add(ljyy, t.getJhlc());
+						}
+					}else{
+						Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+		                while (it.hasNext()) {
+		                    ChildTaskPlan childTaskPlan = it.next();
+		                    if(!childTaskPlan.isDestroy()){
+		                    	 if(childTaskPlan.getMileageType().equals("service")){
+		                    		 ljyy =Arith.add(ljyy,childTaskPlan.getMileage());
+		                    	 }
+		                    }
+		                }
+					}
+				}
+			}
+		}
+		
+		Map<String, Double> map=new HashMap<String,Double>();
+		map.put("ljjcc", ljjcc);
+		map.put("ljyy", ljyy);
+		return map;
+	}
+
+	@Override
+	public double culateSsMile(List<ScheduleRealInfo> lists) {
+		double zlblc =0.0;
+		for (int i = 0; i < lists.size(); i++) {
+			ScheduleRealInfo scheduleRealInfo=lists.get(i);
+			if (!isInOut(scheduleRealInfo)) {
+				Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
+				if(childTaskPlans.isEmpty()){
+					if(scheduleRealInfo.isDestroy()){
+						zlblc=Arith.add(zlblc,scheduleRealInfo.getJhlcOrig()==null?0:scheduleRealInfo.getJhlcOrig());
+					}
+				}else{
+					Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+	                while (it.hasNext()) {
+	                    ChildTaskPlan childTaskPlan = it.next();
+	                    if(childTaskPlan.getMileageType().equals("service")){
+		                    if (childTaskPlan.isDestroy()) {
+		    					zlblc=Arith.add(zlblc,childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage());
+		                    } 
+	                    }
+	                }
+				}
+			}
+		}
+		return zlblc;
+	}
  
+	@Override
+	public double culateSsMileXx(List<ScheduleRealInfo> lists, String item) {
+		// TODO Auto-generated method stub
+		double sum = 0;
+        Set<ChildTaskPlan> cts;
+        for(ScheduleRealInfo sch : lists){
+            if (sch.isSflj())
+                continue;
+            cts = sch.getcTasks();
+            //有子任务
+            if (cts != null && cts.size() > 0) {
+                for(ChildTaskPlan c : cts){
+                	if(item.equals("其他")){
+                		if(c.isDestroy() && 
+                				((c.getDestroyReason()==null?"": c.getDestroyReason()).equals(item)||
+                						(c.getDestroyReason()==null?"": c.getDestroyReason()).equals("")))
+                            sum = Arith.add(sum, c.getMileage());
+                	}else{
+                		if(c.isDestroy() && (c.getDestroyReason()==null?"": c.getDestroyReason()).equals(item))
+                            sum = Arith.add(sum, c.getMileage());
+                	}
+                    
+                }
+            }
+            else if(isInOut(sch))
+                continue;
+            //主任务烂班
+            else if(sch.getStatus() == -1){
+                if(sch.getAdjustExps().equals(item) ||
+                        (StringUtils.isEmpty(sch.getAdjustExps()) && item.equals("其他"))){
+                    sum = Arith.add(sum, sch.getJhlcOrig());
+                }
+            }
+           
+        }
+        return sum;
+	}
+
+	@Override
+	public double culateZrwJccLc(List<ScheduleRealInfo> lists, String item) {
+		// TODO Auto-generated method stub
+		double zrwjcclc=0.0;
+		for (int i = 0; i < lists.size(); i++) {
+			ScheduleRealInfo t=lists.get(i);
+			if(!isInOut(t)){
+				Set<ChildTaskPlan> childTaskPlans = t.getcTasks();
+				if(!childTaskPlans.isEmpty()){
+					Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+	                while (it.hasNext()) {
+	                    ChildTaskPlan childTaskPlan = it.next();
+	                    if(childTaskPlan.getType2().equals("2")||childTaskPlan.getType2().equals("3")){
+		                    if (childTaskPlan.isDestroy()) {
+		                    	zrwjcclc=Arith.add(zrwjcclc,childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage());
+		                    } 
+	                    }
+	                }
+				}
+			}
+		}
+		return zrwjcclc;
+	}
+
+	@Override
+	public double culateKfksLc(List<ScheduleRealInfo> lists) {
+		// TODO Auto-generated method stub
+		double kfks=0.0;
+		for (int i = 0; i < lists.size(); i++) {
+			ScheduleRealInfo t=lists.get(i);
+			if(t.getBcType().equals("ldks")){
+				Set<ChildTaskPlan> childTaskPlans = t.getcTasks();
+				if(childTaskPlans.isEmpty()){
+					if(!t.isDestroy()){
+						kfks=Arith.add(kfks,t.getJhlcOrig()==null?0:t.getJhlcOrig());
+					}
+				}else{
+					Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+	                while (it.hasNext()) {
+	                    ChildTaskPlan childTaskPlan = it.next();
+	                    if (!childTaskPlan.isDestroy()) {
+	                    	kfks=Arith.add(kfks,childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage());
+	                    } 
+	                }
+				}
+			}
+		}
+		return kfks;
+	}
+	
+	
 }