Merge branch 'minhang' into jiading

潘钊
2 parents 8ecfd352 48436fa4
Showing 28 changed files with 1842 additions and 784 deletions
src/main/java/com/bsth/controller/realcontrol/RealMapController.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/car_out_info/CarOutInfoHandler.java
src/main/java/com/bsth/data/gpsdata/arrival/GeoCacheData.java
src/main/java/com/bsth/data/gpsdata/arrival/entity/TimedEnableStationRoute.java
src/main/java/com/bsth/data/gpsdata/arrival/handlers/InOutStationSignalHandle.java
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/java/com/bsth/data/schedule/SchAttrCalculator.java
src/main/java/com/bsth/data/schedule/signal/SchSiginUpdateDBThread.java
src/main/java/com/bsth/data/schedule/signal/SignalComplateHandler.java
src/main/java/com/bsth/data/schedule/signal/entity/SchSiginCompate.java
src/main/java/com/bsth/entity/excep/ArrivalInfo.java
src/main/java/com/bsth/entity/report/MileageReport.java
src/main/java/com/bsth/entity/report/ScheduleCorrectionReport.java
src/main/java/com/bsth/repository/oil/DlbRepository.java
src/main/java/com/bsth/repository/oil/JdlRepository.java
src/main/java/com/bsth/repository/realcontrol/ScheduleRealInfoRepository.java
src/main/java/com/bsth/service/impl/BusIntervalServiceImpl.java
 package com.bsth.controller.realcontrol;
+import com.bsth.data.gpsdata.arrival.GeoCacheData;
+import com.bsth.data.gpsdata.arrival.entity.TimedEnableStationRoute;
 import com.bsth.service.realcontrol.RealMapService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
@@ -74,4 +77,9 @@ public class RealMapController {
     public Map<String, Object> multiSectionRoute(@RequestParam String codeIdx){
         return realMapService.multiSectionRoute(codeIdx);
     }
+
+    @RequestMapping(value = "/lockAndFlxedTimeEnabled", method = RequestMethod.POST)
+    public void lockAndFlxedTimeEnabled(TimedEnableStationRoute tes){
+        GeoCacheData.tesMap.put(tes.getLineCode(), tes);
+    }
 }
@@ -417,6 +417,70 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 		}
 		return scheduleRealInfoService.statisticsDailyTj(gsdm,fgsdm,line, date,date2, xlName, type);
 	}
+	
+	/*
+	 * 公里修正报表
+	 */
+	@RequestMapping(value="/mileageReportTj")
+	public List<Map<String,Object>> mileageReport(@RequestParam Map<String, Object> map){
+		String gsdm="";
+		if(map.get("gsdm")!=null){
+			gsdm=map.get("gsdm").toString();
+		}
+		String fgsdm="";
+		if(map.get("fgsdm")!=null){
+			fgsdm=map.get("fgsdm").toString();
+		}
+		String line="";
+		if(map.get("line")!=null){
+			line=map.get("line").toString();
+		}
+		String date="";
+		if(map.get("date")!=null){
+			date=map.get("date").toString();
+		}
+		String date2="";
+		if(map.get("date2")!=null){
+			date2=map.get("date2").toString();
+		}
+		String xlName="";
+		if(map.get("xlName")!=null){
+			xlName=map.get("xlName").toString();
+		}
+		return scheduleRealInfoService.mileageReport(gsdm,fgsdm,line, date,date2);
+	}
+	
+	/*
+	 * 班次修正报表
+	 */
+	@RequestMapping(value="/scheduleCorrectionReport")
+	public List<Map<String,Object>> scheduleCorrectionReport(@RequestParam Map<String, Object> map){
+		String gsdm="";
+		if(map.get("gsdm")!=null){
+			gsdm=map.get("gsdm").toString();
+		}
+		String fgsdm="";
+		if(map.get("fgsdm")!=null){
+			fgsdm=map.get("fgsdm").toString();
+		}
+		String line="";
+		if(map.get("line")!=null){
+			line=map.get("line").toString();
+		}
+		String date="";
+		if(map.get("date")!=null){
+			date=map.get("date").toString();
+		}
+		String date2="";
+		if(map.get("date2")!=null){
+			date2=map.get("date2").toString();
+		}
+		String xlName="";
+		if(map.get("xlName")!=null){
+			xlName=map.get("xlName").toString();
+		}
+		return scheduleRealInfoService.scheduleCorrectionReport(gsdm,fgsdm,line, date,date2);
+	}
 	@RequestMapping(value="/MapById",method = RequestMethod.GET)
 	public Map<String, Object> MapById(@RequestParam("id") Long id){
@@ -95,4 +95,14 @@ public class anomalyCheckController {
     public void updateCacheBuff(){
         geoCacheData.loadData();
     }
+
+    @RequestMapping(value = "/reCalcLpSch")
+    public void reCalcLpSch(){
+        dayOfSchedule._test_reCalcLpSch();
+    }
+
+    @RequestMapping(value = "/findSchByLpName")
+    public List<ScheduleRealInfo> findSchByLpName(@RequestParam String lpName){
+        return dayOfSchedule.getLpScheduleMap().get(lpName);
+    }
 }
@@ -84,12 +84,19 @@ public class ReportController {
 			@RequestParam int zd){
 		return service.queryStrinon(line,zd);
 	}
+	//根据排班查到离站
 	@RequestMapping(value="/queryInOutStrtion" ,method = RequestMethod.GET)
 	public List<Map<String, Object>> queryInOutStrtion(@RequestParam String line,
 			@RequestParam String date,@RequestParam int zd,@RequestParam String lzsj){
 		return service.queryInOutStrtion(line,date,zd,lzsj);
 	}
+	//根据GPS数据查到离站
+	@RequestMapping(value="/queryInOutStrtions" ,method = RequestMethod.GET)
+	public List<Map<String, Object>> queryInOutStrtions(@RequestParam String line,
+			@RequestParam String date,@RequestParam int zd,@RequestParam String lzsj){
+		return service.queryInOutStrtions(line,date,zd,lzsj);
+	}
 	@RequestMapping(value="/queryListClzd" ,method = RequestMethod.GET)
 	public List<ArrivalInfo> queryListClzd(@RequestParam String zd,@RequestParam String line,
 			@RequestParam String zdlx,@RequestParam String fcsj,@RequestParam String ddsj){
@@ -54,27 +54,19 @@ public class CarOutInfoHandler {
      * 全量更新发车信息表
      */
     public void updateAll() {
-        Set<String> ks = BasicData.lineCode2NameMap.keySet();
-        for (String lineCode : ks) {
-            update(lineCode);
-        }
-    }
-
-    public void update(String lineCode) {
-        try {
-            ArrayListMultimap<String, ScheduleRealInfo> lpScheduleMap = dayOfSchedule.getLpScheduleMap();
-            List<ScheduleRealInfo> list = new ArrayList<>();
+        try{
+            //将班次按线路分组
+            List<ScheduleRealInfo> all = new ArrayList<>(dayOfSchedule.findAll());
+            ArrayListMultimap<String, ScheduleRealInfo> xlMaps = ArrayListMultimap.create();
+            for(ScheduleRealInfo sch : all){
+                xlMaps.put(sch.getXlBm(), sch);
+            }
-            Set<String> ks = lpScheduleMap.keySet();
-            String prefix = lineCode + "_";
+            Set<String> ks = xlMaps.keySet();
             for (String k : ks) {
-                if (k.startsWith(prefix)) {
-                    list.addAll(lpScheduleMap.get(k));
-                }
+                update(xlMaps.get(k));
             }
-
-            update(list);
-        } catch (Exception e) {
+        }catch (Exception e){
             logger.error("", e);
         }
     }
@@ -2,6 +2,7 @@ package com.bsth.data.gpsdata.arrival;
 import com.bsth.data.gpsdata.GpsEntity;
 import com.bsth.data.gpsdata.arrival.entity.StationRoute;
+import com.bsth.data.gpsdata.arrival.entity.TimedEnableStationRoute;
 import com.bsth.data.gpsdata.arrival.utils.CircleQueue;
 import com.bsth.data.gpsdata.arrival.utils.StationRouteComp;
 import com.google.common.collect.ArrayListMultimap;
@@ -53,6 +54,10 @@ public class GeoCacheData {
     //线路限速信息
     private static Map<String, Double> speedLimitMap;
+    //需要定时刷新的站点路由
+    public static Map<String, TimedEnableStationRoute> tesMap = new HashMap<>();
+    //TimedEnableStationRoute
+
     @Autowired
     JdbcTemplate jdbcTemplate;
@@ -282,6 +287,28 @@ public class GeoCacheData {
                 connectStationRoute(tempMap.get(key));
             }
+            //定时启用的站点走向
+            if(tesMap.size() > 0){
+                List<String> rems = new ArrayList<>();
+                long t = System.currentTimeMillis();
+                for(TimedEnableStationRoute tes : tesMap.values()){
+                    if(tes.getEnableTime() > t){
+                        logger.info("锁住站点路由，"  + tes.getLineCode());
+                        tempMap.replaceValues(tes.getLineCode() + "_0", stationCacheMap.get(tes.getLineCode() + "_0"));
+                        tempMap.replaceValues(tes.getLineCode() + "_1", stationCacheMap.get(tes.getLineCode() + "_1"));
+                    }
+                    else
+                        rems.add(tes.getLineCode());
+                }
+
+                //remove
+                if(rems.size() > 0){
+                    for(String lineCode : rems){
+                        logger.info("启用路由，"  + lineCode);
+                        tesMap.remove(lineCode);
+                    }
+                }
+            }
             stationCacheMap = tempMap;
             routeCodeMap = codeMap;
         }
+package com.bsth.data.gpsdata.arrival.entity;
+
+/**
+ * 定时启用站点路由
+ * Created by panzhao on 2017/8/28.
+ */
+public class TimedEnableStationRoute {
+
+    private String lineCode;
+
+    private Long enableTime;
+
+    public String getLineCode() {
+        return lineCode;
+    }
+
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
+    }
+
+    public Long getEnableTime() {
+        return enableTime;
+    }
+
+    public void setEnableTime(Long enableTime) {
+        this.enableTime = enableTime;
+    }
+}
@@ -338,6 +338,9 @@ public class InOutStationSignalHandle extends SignalHandle{
             if(lpNext != null){
                 lpNext.setQdzArrDatesj(sch.getZdsjActual());
             }
+            else{
+                logger.info(sch.getClZbh() + " 到终点，无下一班");
+            }
             //通知客户端
             sendUtils.sendZdsj(sch, lpNext, doneSum);
@@ -278,12 +278,14 @@ public class DayOfSchedule {
         List<String> lprms = new ArrayList<>();
         Set<String> lps = lpScheduleMap.keySet();
         for (String lp : lps) {
-            if (lp.indexOf(lineCode + "_") != -1)
+            if (lp.startsWith(lineCode + "_"))
                 lprms.add(lp);
         }
-        for (String lp : lprms)
+        for (String lp : lprms){
+            logger.info("清理路牌映射 " + lp);
             lpScheduleMap.removeAll(lp);
+        }
         logger.info(lineCode + "排班清理 " + count);
     }
@@ -1137,4 +1139,16 @@ public class DayOfSchedule {
     public ArrayListMultimap<String, ScheduleRealInfo> getLpScheduleMap() {
         return lpScheduleMap;
     }
+
+    /**
+     * 重新全量计算路牌下的班次关联性
+     * 临时性的函数
+     */
+    public void _test_reCalcLpSch() {
+        Map<String ,Collection<ScheduleRealInfo>> map = lpScheduleMap.asMap();
+        Set<String> ks = map.keySet();
+        for(String k : ks){
+            schAttrCalculator.calcQdzTimePlan(new ArrayList<ScheduleRealInfo>(map.get(k)));
+        }
+    }
 }
 \ No newline at end of file
@@ -117,8 +117,7 @@ public class SchAttrCalculator {
 		for(int i = 1; i < len; i ++){
 			curr = list.get(i);
-			if(prve.getZdzName().equals(curr.getQdzName())
-					|| prve.getZdzCode().equals(curr.getQdzCode())){
+			if(isJoin(prve, curr)){
 				curr.setQdzArrDatejh(prve.getZdsj());
 				if(StringUtils.isNotEmpty(prve.getZdsjActual()))
 					curr.setQdzArrDatesj(prve.getZdsjActual());
@@ -126,6 +125,13 @@ public class SchAttrCalculator {
 			prve = curr;
 		}
 	}
+
+	private boolean isJoin(ScheduleRealInfo prve, ScheduleRealInfo curr) {
+		return prve.getZdzName().equals(curr.getQdzName())//名称相等
+				|| prve.getZdzCode().equals(curr.getQdzCode())//编码相等
+				|| prve.getZdzName().startsWith(curr.getQdzName())//起始包括
+				|| curr.getQdzName().startsWith(prve.getZdzName());//起始包括
+	}
 	/**
 	 * 
-package com.bsth.data.schedule.signal;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-/**
- * Created by panzhao on 2017/8/14.
- */
-@Component
-public class SchSiginUpdateDBThread extends Thread{
-
-    @Autowired
-    SignalComplateHandler signalComplateHandler;
-
-    Logger logger = LoggerFactory.getLogger(this.getClass());
-
-    @Override
-    public void run() {
-        try{
-            signalComplateHandler.handler();
-        }catch (Exception e){
-            logger.error("", e);
-        }
-    }
-}
+package com.bsth.data.schedule.signal;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * Created by panzhao on 2017/8/14.
+ */
+@Component
+public class SchSiginUpdateDBThread extends Thread{
+
+    @Autowired
+    SignalComplateHandler signalComplateHandler;
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Override
+    public void run() {
+        try{
+            signalComplateHandler.handler();
+        }catch (Exception e){
+            logger.error("", e);
+        }
+    }
+}
-package com.bsth.data.schedule.signal;
-
-import com.bsth.data.schedule.DayOfSchedule;
-import com.bsth.data.schedule.signal.entity.SchSiginCompate;
-import com.bsth.entity.realcontrol.ScheduleRealInfo;
-import com.bsth.util.db.DBUtils_MS;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.BatchPreparedStatementSetter;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.datasource.DataSourceTransactionManager;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.TransactionDefinition;
-import org.springframework.transaction.TransactionStatus;
-import org.springframework.transaction.support.DefaultTransactionDefinition;
-
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.List;
-
-/**
- * 班次信号补全（写入数据库，网关以补发的形式提交运管处）
- * Created by panzhao on 2017/8/13.
- */
-@Component
-public class SignalComplateHandler {
-
-    @Autowired
-    DayOfSchedule dayOfSchedule;
-
-    Logger log = LoggerFactory.getLogger(this.getClass());
-
-    public void handler(){
-        Collection<ScheduleRealInfo> all = dayOfSchedule.findAll();
-        List<SchSiginCompate> list = new ArrayList<>();
-
-        SchSiginCompate siginCompate;
-        Date d = new Date();
-        long et = System.currentTimeMillis() - (1000 * 60 * 60 * 2),
-            st = et - (1000 * 60 * 60 * 2);
-        for(ScheduleRealInfo sch : all){
-            if(sch.getDfsjT() > et || sch.getDfsjT() < st)
-                continue;
-
-            //能自动完成的
-            if(sch.getSiginCompate() >= 2)
-                continue;
-
-            //烂班
-            if(sch.isDestroy())
-                continue;
-
-            //空驶任务
-            if(dayOfSchedule.emptyService(sch))
-                continue;
-
-            siginCompate = new SchSiginCompate(sch);
-            if(siginCompate == null || StringUtils.isEmpty(siginCompate.getDeciveId()))
-                continue;
-
-            //标记已经补发
-            sch.setSiginCompate(3);
-            //标记入库
-            dayOfSchedule.save(sch);
-            siginCompate.setCreateDate(d);
-            list.add(siginCompate);
-        }
-
-        put(list);
-    }
-
-    public void put(final List<SchSiginCompate> list){
-        if(null == list || list.size() == 0)
-            return;
-
-        JdbcTemplate jdbcTemp = new JdbcTemplate(DBUtils_MS.getDataSource());
-        //编程式事务
-        DataSourceTransactionManager tran = new DataSourceTransactionManager(jdbcTemp.getDataSource());
-        DefaultTransactionDefinition def = new DefaultTransactionDefinition();
-        def.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRED);
-        TransactionStatus status = tran.getTransaction(def);
-
-        try{
-            jdbcTemp.batchUpdate("insert into bsth_t_sigin_complate(id, rq, line_code, decive_id, up_down, s_code, e_code, st, et, create_date, status) VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", new BatchPreparedStatementSetter() {
-                @Override
-                public void setValues(PreparedStatement ps, int i) throws SQLException {
-                    SchSiginCompate sc = list.get(i);
-                    ps.setLong(1, sc.getId());
-                    ps.setString(2, sc.getRq());
-                    ps.setString(3, sc.getLineCode());
-                    ps.setString(4, sc.getDeciveId());
-                    ps.setInt(5, sc.getUpDown());
-                    ps.setString(6, sc.getsCode());
-                    ps.setString(7, sc.geteCode());
-                    ps.setLong(8, sc.getSt());
-                    ps.setLong(9, sc.getEt());
-                    ps.setDate(10, new java.sql.Date(sc.getCreateDate().getTime()));
-                    ps.setInt(11, sc.getStatus());
-                }
-
-                @Override
-                public int getBatchSize() {
-                    return list.size();
-                }
-            });
-
-            tran.commit(status);
-            log.info("补信号班次入库，" + list.size());
-        }catch (Exception e){
-            log.error("", e);
-            tran.rollback(status);
-        }
-    }
-
-
-}
+package com.bsth.data.schedule.signal;
+
+import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.data.schedule.signal.entity.SchSiginCompate;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.util.db.DBUtils_MS;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.BatchPreparedStatementSetter;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.datasource.DataSourceTransactionManager;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.TransactionDefinition;
+import org.springframework.transaction.TransactionStatus;
+import org.springframework.transaction.support.DefaultTransactionDefinition;
+
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 班次信号补全（写入数据库，网关以补发的形式提交运管处）
+ * Created by panzhao on 2017/8/13.
+ */
+@Component
+public class SignalComplateHandler {
+
+    @Autowired
+    DayOfSchedule dayOfSchedule;
+
+    Logger log = LoggerFactory.getLogger(this.getClass());
+
+    public void handler(){
+        Collection<ScheduleRealInfo> all = dayOfSchedule.findAll();
+        List<SchSiginCompate> list = new ArrayList<>();
+
+        SchSiginCompate siginCompate;
+        Date d = new Date();
+        long et = System.currentTimeMillis() - (1000 * 60 * 60 * 2),
+            st = et - (1000 * 60 * 60 * 2);
+        for(ScheduleRealInfo sch : all){
+            if(sch.getDfsjT() > et || sch.getDfsjT() < st)
+                continue;
+
+            //能自动完成的
+            if(sch.getSiginCompate() >= 2)
+                continue;
+
+            //烂班
+            if(sch.isDestroy())
+                continue;
+
+            //空驶任务
+            if(dayOfSchedule.emptyService(sch))
+                continue;
+
+            siginCompate = new SchSiginCompate(sch);
+            if(siginCompate == null || StringUtils.isEmpty(siginCompate.getDeciveId()))
+                continue;
+
+            //标记已经补发
+            sch.setSiginCompate(3);
+            //标记入库
+            dayOfSchedule.save(sch);
+            siginCompate.setCreateDate(d);
+            list.add(siginCompate);
+        }
+
+        put(list);
+    }
+
+    public void put(final List<SchSiginCompate> list){
+        if(null == list || list.size() == 0)
+            return;
+
+        JdbcTemplate jdbcTemp = new JdbcTemplate(DBUtils_MS.getDataSource());
+        //编程式事务
+        DataSourceTransactionManager tran = new DataSourceTransactionManager(jdbcTemp.getDataSource());
+        DefaultTransactionDefinition def = new DefaultTransactionDefinition();
+        def.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRED);
+        TransactionStatus status = tran.getTransaction(def);
+
+        try{
+            jdbcTemp.batchUpdate("insert into bsth_t_sigin_complate(id, rq, line_code, device_id, up_down, s_code, e_code, st, et, create_date, status) VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", new BatchPreparedStatementSetter() {
+                @Override
+                public void setValues(PreparedStatement ps, int i) throws SQLException {
+                    SchSiginCompate sc = list.get(i);
+                    ps.setLong(1, sc.getId());
+                    ps.setString(2, sc.getRq());
+                    ps.setString(3, sc.getLineCode());
+                    ps.setString(4, sc.getDeciveId());
+                    ps.setInt(5, sc.getUpDown());
+                    ps.setString(6, sc.getsCode());
+                    ps.setString(7, sc.geteCode());
+                    ps.setLong(8, sc.getSt());
+                    ps.setLong(9, sc.getEt());
+                    ps.setDate(10, new java.sql.Date(sc.getCreateDate().getTime()));
+                    ps.setInt(11, sc.getStatus());
+                }
+
+                @Override
+                public int getBatchSize() {
+                    return list.size();
+                }
+            });
+
+            tran.commit(status);
+            log.info("补信号班次入库，" + list.size());
+        }catch (Exception e){
+            log.error("", e);
+            tran.rollback(status);
+        }
+    }
+
+
+}
-package com.bsth.data.schedule.signal.entity;
-
-import com.bsth.data.BasicData;
-import com.bsth.entity.realcontrol.ScheduleRealInfo;
-
-import java.util.Date;
-
-/**
- * 班次信号补偿
- * Created by panzhao on 2017/8/13.
- */
-public class SchSiginCompate {
-
-    /** 实际班次ID */
-    private long id;
-
-    /** 班次日期 */
-    private String rq;
-
-    /** 线路编码 */
-    private String lineCode;
-
-    /** 设备号 */
-    private String deciveId;
-
-    /** 上下行 */
-    private int upDown;
-
-    /** 起始站编码 */
-    private String sCode;
-
-    /** 终点站编码 */
-    private String eCode;
-
-    /** 开始时间戳 */
-    private long st;
-
-    /** 结束时间戳 */
-    private long et;
-
-    /** 入库时间 */
-    private Date createDate;
-
-    private int status = 0;
-
-    public SchSiginCompate(ScheduleRealInfo sch) {
-        this.id = sch.getId();
-        this.rq = sch.getScheduleDateStr();
-        this.lineCode = sch.getXlBm();
-        this.upDown = Integer.parseInt(sch.getXlDir());
-        this.deciveId = BasicData.deviceId2NbbmMap.inverse().get(sch.getClZbh());
-        this.sCode = sch.getQdzCode();
-        this.eCode = sch.getZdzCode();
-        this.st = sch.getDfsjT();
-        this.et = sch.getZdsjT();
-
-        if(sch.getFcsjActualTime() != null)
-            this.st = sch.getFcsjActualTime();
-        if(sch.getZdsjActualTime() != null)
-            this.et = sch.getZdsjActualTime();
-    }
-
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    public String getRq() {
-        return rq;
-    }
-
-    public void setRq(String rq) {
-        this.rq = rq;
-    }
-
-    public String getLineCode() {
-        return lineCode;
-    }
-
-    public void setLineCode(String lineCode) {
-        this.lineCode = lineCode;
-    }
-
-    public String getDeciveId() {
-        return deciveId;
-    }
-
-    public void setDeciveId(String deciveId) {
-        this.deciveId = deciveId;
-    }
-
-    public int getUpDown() {
-        return upDown;
-    }
-
-    public void setUpDown(int upDown) {
-        this.upDown = upDown;
-    }
-
-    public String getsCode() {
-        return sCode;
-    }
-
-    public void setsCode(String sCode) {
-        this.sCode = sCode;
-    }
-
-    public String geteCode() {
-        return eCode;
-    }
-
-    public void seteCode(String eCode) {
-        this.eCode = eCode;
-    }
-
-    public long getSt() {
-        return st;
-    }
-
-    public void setSt(long st) {
-        this.st = st;
-    }
-
-    public long getEt() {
-        return et;
-    }
-
-    public void setEt(long et) {
-        this.et = et;
-    }
-
-    public Date getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(Date createDate) {
-        this.createDate = createDate;
-    }
-
-    public int getStatus() {
-        return status;
-    }
-
-    public void setStatus(int status) {
-        this.status = status;
-    }
-}
+package com.bsth.data.schedule.signal.entity;
+
+import com.bsth.data.BasicData;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+
+import java.util.Date;
+
+/**
+ * 班次信号补偿
+ * Created by panzhao on 2017/8/13.
+ */
+public class SchSiginCompate {
+
+    /** 实际班次ID */
+    private long id;
+
+    /** 班次日期 */
+    private String rq;
+
+    /** 线路编码 */
+    private String lineCode;
+
+    /** 设备号 */
+    private String deciveId;
+
+    /** 上下行 */
+    private int upDown;
+
+    /** 起始站编码 */
+    private String sCode;
+
+    /** 终点站编码 */
+    private String eCode;
+
+    /** 开始时间戳 */
+    private long st;
+
+    /** 结束时间戳 */
+    private long et;
+
+    /** 入库时间 */
+    private Date createDate;
+
+    private int status = 0;
+
+    public SchSiginCompate(ScheduleRealInfo sch) {
+        this.id = sch.getId();
+        this.rq = sch.getScheduleDateStr();
+        this.lineCode = sch.getXlBm();
+        this.upDown = Integer.parseInt(sch.getXlDir());
+        this.deciveId = BasicData.deviceId2NbbmMap.inverse().get(sch.getClZbh());
+        this.sCode = sch.getQdzCode();
+        this.eCode = sch.getZdzCode();
+        this.st = sch.getDfsjT();
+        this.et = sch.getZdsjT();
+
+        if(sch.getFcsjActualTime() != null)
+            this.st = sch.getFcsjActualTime();
+        if(sch.getZdsjActualTime() != null)
+            this.et = sch.getZdsjActualTime();
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public String getRq() {
+        return rq;
+    }
+
+    public void setRq(String rq) {
+        this.rq = rq;
+    }
+
+    public String getLineCode() {
+        return lineCode;
+    }
+
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
+    }
+
+    public String getDeciveId() {
+        return deciveId;
+    }
+
+    public void setDeciveId(String deciveId) {
+        this.deciveId = deciveId;
+    }
+
+    public int getUpDown() {
+        return upDown;
+    }
+
+    public void setUpDown(int upDown) {
+        this.upDown = upDown;
+    }
+
+    public String getsCode() {
+        return sCode;
+    }
+
+    public void setsCode(String sCode) {
+        this.sCode = sCode;
+    }
+
+    public String geteCode() {
+        return eCode;
+    }
+
+    public void seteCode(String eCode) {
+        this.eCode = eCode;
+    }
+
+    public long getSt() {
+        return st;
+    }
+
+    public void setSt(long st) {
+        this.st = st;
+    }
+
+    public long getEt() {
+        return et;
+    }
+
+    public void setEt(long et) {
+        this.et = et;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+}
@@ -61,11 +61,12 @@ public class ArrivalInfo {
 	private String jzsj;
 	/** -1 则信号有效，但程序标记为不使用 */
 	private int flag = 0;
-	
+	private Date dates;
+	private int route;
 	public ArrivalInfo(){}
 	public ArrivalInfo(String deviceId, long ts, String lineCode, int upDown, String stopNo, int inOut, long createDate,
-			int weeksYear, String stopName) {
+			int weeksYear, String stopName,Date dates,int route) {
 		this.deviceId = deviceId;
 		this.ts = ts;
@@ -75,6 +76,8 @@ public class ArrivalInfo {
 		this.stopName = stopName;
 		this.inOut = inOut;
 		this.createDate = createDate;
+		this.dates=dates;
+		this.route=route;
 	}
 /*	@Override
@@ -253,6 +256,22 @@ public class ArrivalInfo {
 	public void setPzh(String pzh) {
 		this.pzh = pzh;
 	}
+
+	public Date getDates() {
+		return dates;
+	}
+
+	public void setDates(Date dates) {
+		this.dates = dates;
+	}
+
+	public int getRoute() {
+		return route;
+	}
+
+	public void setRoute(int route) {
+		this.route = route;
+	}
+package com.bsth.entity.report;
+
+import java.util.Date;
+
+/**
+ * @ClassName: MileageReport.java
+ * @Description: TODO(营运里程修正报表)
+ * @author: YouRuiFeng
+ * @date: 2017-8-14 上午11:09:19
+ * 
+ */
+public class MileageReport {
+	/** 公司编码 */
+    private String companyId;
+
+    /** 分公司编码 */
+    private String subCompanyId;
+    
+    /** 公司名称 */
+    private String companyName;
+
+    /** 分公司名称 */
+    private String subCompanyName;
+
+    /** 线路编码 */
+    private String lineCode;
+
+    /** 线路名称 */
+    private String lineName;
+    
+    /** 总营运公里  */
+    private double zgl;
+
+    /** 实际运营公里  */
+    private double sjyygl;
+    
+    /** 实际空驶公里  */
+    private double sjksgl;
+
+    /** 手动待发公里  */
+    private double sddfgl;
+    
+    /** 自动代发公里  */
+    private double zddfgl;
+    
+    /** 完全无Gps信号公里  */
+    private double wqwxhgl;
+    
+    /** 部分无Gps公里  */
+    private double bfwxhgl;
+    
+    /** 漂移公里  */
+    private double pygl;
+    
+    /** 临加公里  */
+    private double ljgl;
+    
+    /** 子任务  */
+    private double zrwgl;
+
+    /** 其他*/
+    private String other;
+
+    /** 备注 */
+    private String remarks;
+    
+    /** 日期 （班次日期） */
+    private String rq;
+
+    private Date createDate;
+
+
+	public String getCompanyId() {
+		return companyId;
+	}
+
+	public void setCompanyId(String companyId) {
+		this.companyId = companyId;
+	}
+
+	public String getSubCompanyId() {
+		return subCompanyId;
+	}
+
+	public void setSubCompanyId(String subCompanyId) {
+		this.subCompanyId = subCompanyId;
+	}
+
+	public String getCompanyName() {
+		return companyName;
+	}
+
+	public void setCompanyName(String companyName) {
+		this.companyName = companyName;
+	}
+
+	public String getSubCompanyName() {
+		return subCompanyName;
+	}
+
+	public void setSubCompanyName(String subCompanyName) {
+		this.subCompanyName = subCompanyName;
+	}
+
+	public String getLineCode() {
+		return lineCode;
+	}
+
+	public void setLineCode(String lineCode) {
+		this.lineCode = lineCode;
+	}
+
+	public String getLineName() {
+		return lineName;
+	}
+
+	public void setLineName(String lineName) {
+		this.lineName = lineName;
+	}
+
+	public double getZgl() {
+		return zgl;
+	}
+
+	public void setZgl(double zgl) {
+		this.zgl = zgl;
+	}
+
+	public double getSjyygl() {
+		return sjyygl;
+	}
+
+	public void setSjyygl(double sjyygl) {
+		this.sjyygl = sjyygl;
+	}
+	
+	public double getSjksgl() {
+		return sjksgl;
+	}
+
+	public void setSjksgl(double sjksgl) {
+		this.sjksgl = sjksgl;
+	}
+
+	public double getSddfgl() {
+		return sddfgl;
+	}
+
+	public void setSddfgl(double sddfgl) {
+		this.sddfgl = sddfgl;
+	}
+
+	public double getZddfgl() {
+		return zddfgl;
+	}
+
+	public void setZddfgl(double zddfgl) {
+		this.zddfgl = zddfgl;
+	}
+
+	public double getWqwxhgl() {
+		return wqwxhgl;
+	}
+
+	public void setWqwxhgl(double wqwxhgl) {
+		this.wqwxhgl = wqwxhgl;
+	}
+
+	public double getBfwxhgl() {
+		return bfwxhgl;
+	}
+
+	public void setBfwxhgl(double bfwxhgl) {
+		this.bfwxhgl = bfwxhgl;
+	}
+
+	public double getPygl() {
+		return pygl;
+	}
+
+	public void setPygl(double pygl) {
+		this.pygl = pygl;
+	}
+
+	public double getLjgl() {
+		return ljgl;
+	}
+
+	public void setLjgl(double ljgl) {
+		this.ljgl = ljgl;
+	}
+
+	public double getZrwgl() {
+		return zrwgl;
+	}
+
+	public void setZrwgl(double zrwgl) {
+		this.zrwgl = zrwgl;
+	}
+
+	public String getOther() {
+		return other;
+	}
+
+	public void setOther(String other) {
+		this.other = other;
+	}
+
+	public String getRemarks() {
+		return remarks;
+	}
+
+	public void setRemarks(String remarks) {
+		this.remarks = remarks;
+	}
+
+	public String getRq() {
+		return rq;
+	}
+
+	public void setRq(String rq) {
+		this.rq = rq;
+	}
+
+	public Date getCreateDate() {
+		return createDate;
+	}
+
+	public void setCreateDate(Date createDate) {
+		this.createDate = createDate;
+	}
+    
+    
+}
+package com.bsth.entity.report;
+
+import java.util.Date;
+
+/**
+ * @ClassName: MileageReport.java
+ * @Description: TODO(营运里程修正报表)
+ * @author: YouRuiFeng
+ * @date: 2017-8-14 上午11:09:19
+ * 
+ */
+public class ScheduleCorrectionReport {
+	/** 公司编码 */
+    private String companyId;
+
+    /** 分公司编码 */
+    private String subCompanyId;
+    
+    /** 公司名称 */
+    private String companyName;
+
+    /** 分公司名称 */
+    private String subCompanyName;
+
+    /** 线路编码 */
+    private String lineCode;
+
+    /** 线路名称 */
+    private String lineName;
+    
+    /** 总营运班次  */
+    private int zbc;
+
+    /** 实际运营班次  */
+    private int sjyybc;
+    
+    /** 实际空驶班次  */
+    private int sjksbc;
+
+    /** 手动待发班次  */
+    private int sddfbc;
+    
+    /** 自动代发班次  */
+    private int zddfbc;
+    
+    /** 完全无Gps信号班次  */
+    private int wqwxhbc;
+    
+    /** 部分无Gps班次  */
+    private int bfwxhbc;
+    
+    /** 漂移班次  */
+    private int pybc;
+    
+    /** 临加班次  */
+    private int ljbc;
+    
+    /** 子任务  */
+    private int zrwbc;
+
+    /** 其他*/
+    private String other;
+
+    /** 备注 */
+    private String remarks;
+    
+    /** 日期 （班次日期） */
+    private String rq;
+
+    private Date createDate;
+
+	public String getCompanyId() {
+		return companyId;
+	}
+
+	public void setCompanyId(String companyId) {
+		this.companyId = companyId;
+	}
+
+	public String getSubCompanyId() {
+		return subCompanyId;
+	}
+
+	public void setSubCompanyId(String subCompanyId) {
+		this.subCompanyId = subCompanyId;
+	}
+
+	public String getCompanyName() {
+		return companyName;
+	}
+
+	public void setCompanyName(String companyName) {
+		this.companyName = companyName;
+	}
+
+	public String getSubCompanyName() {
+		return subCompanyName;
+	}
+
+	public void setSubCompanyName(String subCompanyName) {
+		this.subCompanyName = subCompanyName;
+	}
+
+	public String getLineCode() {
+		return lineCode;
+	}
+
+	public void setLineCode(String lineCode) {
+		this.lineCode = lineCode;
+	}
+
+	public String getLineName() {
+		return lineName;
+	}
+
+	public void setLineName(String lineName) {
+		this.lineName = lineName;
+	}
+
+	public int getZbc() {
+		return zbc;
+	}
+
+	public void setZbc(int zbc) {
+		this.zbc = zbc;
+	}
+
+	public int getSjyybc() {
+		return sjyybc;
+	}
+
+	public void setSjyybc(int sjyybc) {
+		this.sjyybc = sjyybc;
+	}
+
+	public int getSjksbc() {
+		return sjksbc;
+	}
+
+	public void setSjksbc(int sjksbc) {
+		this.sjksbc = sjksbc;
+	}
+
+	public int getSddfbc() {
+		return sddfbc;
+	}
+
+	public void setSddfbc(int sddfbc) {
+		this.sddfbc = sddfbc;
+	}
+
+	public int getZddfbc() {
+		return zddfbc;
+	}
+
+	public void setZddfbc(int zddfbc) {
+		this.zddfbc = zddfbc;
+	}
+
+	public int getWqwxhbc() {
+		return wqwxhbc;
+	}
+
+	public void setWqwxhbc(int wqwxhbc) {
+		this.wqwxhbc = wqwxhbc;
+	}
+
+	public int getBfwxhbc() {
+		return bfwxhbc;
+	}
+
+	public void setBfwxhbc(int bfwxhbc) {
+		this.bfwxhbc = bfwxhbc;
+	}
+
+	public int getPybc() {
+		return pybc;
+	}
+
+	public void setPybc(int pybc) {
+		this.pybc = pybc;
+	}
+
+	public int getLjbc() {
+		return ljbc;
+	}
+
+	public void setLjbc(int ljbc) {
+		this.ljbc = ljbc;
+	}
+
+	public int getZrwbc() {
+		return zrwbc;
+	}
+
+	public void setZrwbc(int zrwbc) {
+		this.zrwbc = zrwbc;
+	}
+
+	public String getOther() {
+		return other;
+	}
+
+	public void setOther(String other) {
+		this.other = other;
+	}
+
+	public String getRemarks() {
+		return remarks;
+	}
+
+	public void setRemarks(String remarks) {
+		this.remarks = remarks;
+	}
+
+	public String getRq() {
+		return rq;
+	}
+
+	public void setRq(String rq) {
+		this.rq = rq;
+	}
+
+	public Date getCreateDate() {
+		return createDate;
+	}
+
+	public void setCreateDate(Date createDate) {
+		this.createDate = createDate;
+	}
+	
+}
@@ -53,7 +53,7 @@ public interface DlbRepository extends BaseRepository&lt;Dlb, Integer&gt;{
 			+ " ssgsdm like %?2% "
 			+ " and fgsdm like %?3%"
 			+ " and xlbm like %?4%  and nbbm  like %?5% "
-			+ " group by nbbm,rq,ssgsdm,fgsdm,xlbm",nativeQuery=true)
+			+ " group by nbbm,rq,ssgsdm,fgsdm",nativeQuery=true)
 	List<Object[]> checkNbmmNum(String rq, String gsbm,String fgsbm,String xlbm,String nbbm);
 	@Query(value="select nbbm,sum(cdl*100) as cdl ,sum(zlc*100) as zlc from bsth_c_dlb where to_days(?1)=to_days(rq) and "
@@ -17,25 +17,25 @@ public interface JdlRepository extends BaseRepository&lt;Jdl, Integer&gt;{
 	@Transactional
     @Modifying
     @Query(value="INSERT INTO bsth_c_jdl("+
-    			 "gs_bm, gs_name, fgs_bm, fgs_name, rq, nbbm, jdl, jdz, remarks, creater_date,jsy)" +
+    			 "gs_bm, gs_name, fgs_bm, fgs_name, rq, nbbm, jdl, jdz, remarks, creater_date)" +
     			 " VALUES(" +
-    			 "?1,?2,?3,?4,str_to_date(?5,'%Y-%m-%d'),?6,?7,?8,?9,str_to_date(?10,'%Y-%m-%d %H:%i:%s'),?11)", nativeQuery=true)
-	void insertData(String gsbm, String gsName, String fgsbm, String fgsName, String rq, String nbbm, String jdl, String jdz, String remarks, String createrDate,String jsy);
+    			 "?1,?2,?3,?4,str_to_date(?5,'%Y-%m-%d'),?6,?7,?8,?9,str_to_date(?10,'%Y-%m-%d %H:%i:%s'))", nativeQuery=true)
+	void insertData(String gsbm, String gsName, String fgsbm, String fgsName, String rq, String nbbm, String jdl, String jdz, String remarks, String createrDate);
-	@Query(value="SELECT * FROM bsth_c_jdl where gs_bm = ?1 and fgs_bm = ?2 and rq = ?3 and nbbm like %?4% and jsy like %?5%" ,nativeQuery=true)
-	List<Jdl> query(String gsbm, String fgsbm, String rq, String nbbm,String jsy);
+	@Query(value="SELECT * FROM bsth_c_jdl where gs_bm = ?1 and fgs_bm = ?2 and rq = ?3 and nbbm like %?4% " ,nativeQuery=true)
+	List<Jdl> query(String gsbm, String fgsbm, String rq, String nbbm);
 	@Query(value="SELECT * FROM bsth_c_jdl where rq = ?",nativeQuery=true)
 	List<Jdl> JdlList( String rq);
-	@Query(value="SELECT jdl FROM bsth_c_jdl where gs_bm = ?1 and fgs_bm = ?2 and rq = ?3 and nbbm = ?4 and jsy = ?5 ",nativeQuery=true)
-	List<Double> queryBySame(String gsbm, String fgsbm, String rq, String nbbm, String jsy);
+	@Query(value="SELECT jdl FROM bsth_c_jdl where gs_bm = ?1 and fgs_bm = ?2 and rq = ?3 and nbbm = ?4  ",nativeQuery=true)
+	List<Double> queryBySame(String gsbm, String fgsbm, String rq, String nbbm);
 	@Transactional
     @Modifying
-	@Query(value="UPDATE bsth_c_jdl set jdl = ?1 where gs_bm = ?2 and fgs_bm = ?3 and rq = ?4 and nbbm = ?5 and jsy = ?6",nativeQuery=true)
-	void UpdateJdl(String jdl, String gsbm, String fgsbm, String rq, String nbbm, String jsy);
+	@Query(value="UPDATE bsth_c_jdl set jdl = ?1 where gs_bm = ?2 and fgs_bm = ?3 and rq = ?4 and nbbm = ?5",nativeQuery=true)
+	void UpdateJdl(String jdl, String gsbm, String fgsbm, String rq, String nbbm);
 }
@@ -139,19 +139,19 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	//去掉了 xlBm is not null 
 	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
-	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm like %?1%  and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 order by s.xlDir,s.realExecDate,s.dfsj, (s.lpName+1)")
+	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm like %?1%  and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 order by s.xlDir,s.realExecDate,s.fcsj, lpName")
 	List<ScheduleRealInfo> scheduleByDateAndLine(String line,String date);
 	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
-	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm =?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 order by (s.lpName+1), s.realExecDate,s.dfsj")
+	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm =?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 order by s.lpName, s.realExecDate,s.fcsj")
 	List<ScheduleRealInfo> scheduleByDateAndLineQp(String line,String date);
 	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
-	@Query(value="select DISTINCT s from ScheduleRealInfo s where gsBm like %?1% and fgsBm like %?2%   and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?3 and s.bcType not in ('in','out','ldks') order by s.xlDir,s.realExecDate,s.dfsj, (s.lpName+1)")
+	@Query(value="select DISTINCT s from ScheduleRealInfo s where gsBm like %?1% and fgsBm like %?2%   and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?3 and s.bcType not in ('in','out','ldks') order by s.xlDir,s.realExecDate,s.fcsj, s.lpName")
 	List<ScheduleRealInfo> scheduleByDateAndLineByGs(String gsdm,String fgsdm,String date);
 	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
-	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm = ?1  and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 order by s.xlDir,s.realExecDate,s.dfsj, (s.lpName+1)")
+	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm = ?1  and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 order by s.xlDir,s.realExecDate,s.fcsj, s.lpName")
 	List<ScheduleRealInfo> scheduleByDateAndLineQp2(String line,String date);
 	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
@@ -141,7 +141,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 						long dfsj = Long.valueOf(split0[0]) * 60 + Long.valueOf(split0[1]);
 						if(!schedule.getScheduleDateStr().equals(schedule.getRealExecDate())&&dfsj<23*60)
 							dfsj += 1440l;
-						schedule.setDfsj(dfsj/60 + ":" + dfsj%60);
+						schedule.setDfsj((dfsj/60>9?"":"0")+dfsj/60+ ":" +(dfsj%60>9?"":"0")+dfsj%60);
 						schedule.setDfsjT(dfsj);
 					}
 					if(schedule.getFcsjActual() != null){
@@ -149,7 +149,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 						long fcsjA = Long.valueOf(split2[0]) * 60 + Long.valueOf(split2[1]);
 						if(!schedule.getScheduleDateStr().equals(schedule.getRealExecDate())&&fcsjA<23*60)
 							fcsjA += 1440l;
-						schedule.setFcsjActual(fcsjA/60 + ":" + fcsjA%60);
+						schedule.setFcsjActual((fcsjA/60>9?"":"0")+fcsjA/60+ ":" +(fcsjA%60>9?"":"0")+fcsjA%60);
 						schedule.setFcsjActualTime(fcsjA);
 					}
 					if(schedule.getZdsjActual() != null){
@@ -159,11 +159,11 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 							zdsjA += 1440l;
 						if(schedule.getFcsjActualTime() != null && zdsjA < schedule.getFcsjActualTime())
 							zdsjA += 1440l;
-						schedule.setZdsjActual(zdsjA/60 + ":" + zdsjA%60);
+						schedule.setZdsjActual((zdsjA/60>9?"":"0")+zdsjA/60+ ":" +(zdsjA%60>9?"":"0")+zdsjA%60);
 						schedule.setZdsjActualTime(zdsjA);
 					}
-					schedule.setFcsj((fcsj/60<10?"0"+fcsj/60:fcsj/60) + ":" + (fcsj%60<10?"0"+fcsj%60:fcsj%60));
-					schedule.setZdsj((zdsj/60<10?"0"+zdsj/60:zdsj/60) + ":" + (zdsj%60<10?"0"+zdsj%60:zdsj%60));
+					schedule.setFcsj((fcsj/60<10?"0"+fcsj/60:fcsj/60)+ ":" +(fcsj%60<10?"0"+fcsj%60:fcsj%60));
+					schedule.setZdsj((zdsj/60<10?"0"+zdsj/60:zdsj/60)+ ":" +(zdsj%60<10?"0"+zdsj%60:zdsj%60));
 					schedule.setFcsjT(fcsj);
 					schedule.setZdsjT(zdsj);
 					return schedule;
@@ -673,9 +673,10 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			if(sfqr == 1){
 				where += " and zdsj >= '"+times1+"' and fcsj <= '"+times2+"'";
 			}
-			where += " and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks'";
+//			where += " and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks'";
+			where += " and bc_type != 'ldks'";
-			String sql = "select id, schedule_date_Str, real_exec_date, xl_name, lp_name, bcs, bcsj, jhlc,"
+			String sql = "select id, schedule_date_Str, real_exec_date, xl_name, lp_name, bcs, bcsj, jhlc, bc_type,"
 					+ " fcsj, fcsj_actual, zdsj, zdsj_actual, qdz_name, zdz_name, xl_dir, status, remarks, gs_name, fgs_name, sp_id"
 					+ " from bsth_c_s_sp_info_real where DATE_FORMAT(schedule_date,'%Y-%m-%d') >= '"+startDate+"'"
 					+ " and DATE_FORMAT(schedule_date,'%Y-%m-%d') <= '"+endDate+"'"+where+"";
@@ -699,6 +700,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					schedule.setZdsjActual(rs.getString("zdsj_actual"));
 					schedule.setQdzName(rs.getString("qdz_name"));
 					schedule.setZdzName(rs.getString("zdz_name"));
+					schedule.setBcType(rs.getString("bc_type"));
 					schedule.setXlDir(rs.getString("xl_dir"));
 					schedule.setStatus(rs.getInt("status"));
 					schedule.setRemarks(rs.getString("remarks"));
@@ -832,7 +834,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			if(model.length() != 0){
 				sql = "select sp.id from "
 						+ "(select id, tt_info, xl_bm, lp, fcsj from bsth_c_s_sp_info where schedule_date >= '"+startDate+"' and schedule_date <= '"+endDate+"'"
-						+ " and tt_info = '" + model + "' and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks') sp"
+						+ " and tt_info = '" + model + "' and bc_type != 'ldks') sp"
 						+ " left join bsth_c_s_ttinfo_detail tt on sp.tt_info = tt.ttinfo and sp.xl_bm = tt.xl and sp.lp = tt.lp and sp.fcsj = tt.fcsj";
 				ttList = jdbcTemplate.query(sql,
@@ -915,6 +917,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 		for(String key : keyMap.keySet()){
 			Map<String, Object> tempMap = new HashMap<String, Object>();
 			Map<Long, ScheduleRealInfo> sortMap = new HashMap<Long, ScheduleRealInfo>();
+			Map<Long, Map<String, Object>> sortMap1 = new HashMap<Long, Map<String, Object>>();
 			List<Map<String, Object>> mapList = new ArrayList<Map<String, Object>>();
 			List<Long> keyList = new ArrayList<Long>();
 			List<Long> keyList2 = new ArrayList<Long>();
@@ -946,30 +949,25 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			for(int i = 1; i < keyList.size(); i++){
 				ScheduleRealInfo schedule1 = sortMap.get(keyList.get(i - 1));
 				ScheduleRealInfo schedule2 = sortMap.get(keyList.get(i));
-				if(!tsSet.contains(schedule1.getId())){
-					if(sfqr == 1 && time1 > schedule1.getFcsjT()){
-						jhyysj += schedule2.getFcsjT() - time1;
-					}else if(sfqr == 1 && time2 < schedule2.getFcsjT()){
-						jhyysj += time2 - schedule1.getFcsjT();
+				if(!tsSet.contains(schedule1.getId()) && !schedule1.getBcType().toString().equals("in") && !schedule1.getBcType().toString().equals("out")){
+					long fcsj1 = schedule1.getFcsjT();
+					long fcsj2 = schedule2.getFcsjT();
+					if(tsSet.contains(schedule2.getId()) || schedule2.getBcType().toString().equals("in") || schedule2.getBcType().toString().equals("out")){
+						fcsj2 = schedule1.getZdsjT();
+					}
+					if(sfqr == 1 && time1 > fcsj1){
+						jhyysj += fcsj2 - time1;
+					}else if(sfqr == 1 && time2 < fcsj2){
+						jhyysj += time2 - fcsj1;
 					}else{
-						jhyysj += schedule2.getFcsjT() - schedule1.getFcsjT();
+						jhyysj += fcsj2 - fcsj1;
 					}
-					jhyysj1 += schedule2.getFcsjT() - schedule1.getFcsjT();
-				}
-				long zdsj2 = schedule2.getZdsjT();
-				long fcsj2 = schedule2.getFcsjT();
-				if(fcsj2 > zdsj2)
-					zdsj2 += 1440l;
-				if(sfqr == 1 && time1 > fcsj2){
-					jhyssj += zdsj2 - time1;
-				}else if(sfqr == 1 && time2 < zdsj2){
-					jhyssj += time2 - fcsj2;
-				}else{
-					jhyssj += zdsj2 - fcsj2;
+					if(jhyysj < 0){
+						System.out.println(fcsj2 + " - " + fcsj1);
+					}
+					jhyysj1 += fcsj2 - fcsj1;
 				}
-				jhyssj1 += zdsj2 - fcsj2;
-				jhlc += schedule2.getJhlc()==null?0:schedule2.getJhlc();
-				if(i == 1){
+				if(i == 1 && schedule1.getBcType().toString().equals("normal")){
 					long zdsj1 = schedule1.getZdsjT();
 					long fcsj1 = schedule1.getFcsjT();
 					if(fcsj1 > zdsj1)
@@ -984,12 +982,27 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					jhyssj1 += zdsj1 - fcsj1;
 					jhlc += schedule1.getJhlc()==null?0:schedule1.getJhlc();
 				}
+				if(schedule2.getBcType().toString().equals("normal")){
+					long zdsj2 = schedule2.getZdsjT();
+					long fcsj2 = schedule2.getFcsjT();
+					if(fcsj2 > zdsj2)
+						zdsj2 += 1440l;
+					if(sfqr == 1 && time1 > fcsj2){
+						jhyssj += zdsj2 - time1;
+					}else if(sfqr == 1 && time2 < zdsj2){
+						jhyssj += time2 - fcsj2;
+					}else{
+						jhyssj += zdsj2 - fcsj2;
+					}
+					jhyssj1 += zdsj2 - fcsj2;
+					jhlc += schedule2.getJhlc()==null?0:schedule2.getJhlc();
+				}
 			}
 			for(int i = 0; i < keyList.size(); i++){
 				Map<String, Object> m = new HashMap<String, Object>();
 				ScheduleRealInfo schedule = sortMap.get(keyList.get(i));
-				
+
 				if(cMap.containsKey(schedule.getId())){
 					List<ChildTaskPlan> cTasks = cMap.get(schedule.getId());
 					for(ChildTaskPlan childTaskPlan : cTasks){
@@ -1012,6 +1025,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 								temp.put("fcsj", null);
 							}
 						}
+						temp.put("bcType", schedule.getBcType());
 						mapList.add(temp);
 					}
 				}else{
@@ -1029,6 +1043,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 						m.put("zdsj", null);
 						m.put("fcsj", null);
 					}
+					m.put("bcType", schedule.getBcType());
 					mapList.add(m);
 				}
 			}
@@ -1036,6 +1051,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			for(Map<String, Object> m : mapList){
 				if(m.get("fcsj") != null && m.get("fcsj").toString().trim().length()!=0){
 					keyList2.add(Long.valueOf(m.get("fcsj").toString()));
+					sortMap1.put(Long.valueOf(m.get("fcsj").toString()), m);
 				}
 			}
 			Collections.sort(keyList2);
@@ -1043,36 +1059,31 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			for(int i = 1; i < keyList2.size(); i++){
 				long fcsj1 = keyList2.get(i - 1);
 				long fcsj2 = keyList2.get(i);
-				if(fcsj2 - fcsj1 < 90){
-					if(sfqr == 1 && time1 > fcsj1){
-						sjyysj += fcsj2 - time1;
-					}else if(sfqr == 1 && time2 < fcsj2){
-						sjyysj += time2 - fcsj1;
-					}else{
-						sjyysj += fcsj2 - fcsj1;
-					}
-					sjyysj1 += fcsj2 - fcsj1;
+				Map<String, Object> m1 = sortMap1.get(fcsj1);
+				Map<String, Object> m2 = sortMap1.get(fcsj2);
+				if(m1.get("bcType").toString().equals("in") || m1.get("bcType").toString().equals("out"))
+					continue;
+				if(m2.get("bcType").toString().equals("in") || m2.get("bcType").toString().equals("out")){
+					fcsj2 = Long.valueOf(m1.get("zdsj").toString());
+				} else if(i == keyList.size() - 1){
+					fcsj2 = Long.valueOf(m2.get("zdsj").toString());
+				}
+				if(sfqr == 1 && time1 > fcsj1){
+					sjyysj += fcsj2 - time1;
+				}else if(sfqr == 1 && time2 < fcsj2){
+					sjyysj += time2 - fcsj1;
+				}else{
+					sjyysj += fcsj2 - fcsj1;
 				}
+				sjyysj1 += fcsj2 - fcsj1;
 			}
-			for(int i = 1; i < mapList.size(); i++){
-				Map<String, Object> m1 = mapList.get(i - 1);
-				Map<String, Object> m2 = mapList.get(i);
-//				if(m1.get("fcsj") != null && m2.get("fcsj") != null){
-//					long fcsj2 = Long.valueOf(m2.get("fcsj").toString());
-//					long fcsj1 = Long.valueOf(m1.get("fcsj").toString());
-//					if(sfqr == 1 && time1 > fcsj1){
-//						sjyysj += fcsj2 - time1;
-//					}else if(sfqr == 1 && time2 < fcsj2){
-//						sjyysj += time2 - fcsj1;
-//					}else{
-//						sjyysj += fcsj2 - fcsj1;
-//					}
-//					sjyysj1 += fcsj2 - fcsj1;
-//				}
-				if(m2.get("fcsj") != null && m2.get("zdsj") != null){
-					long zdsj = Long.valueOf(m2.get("zdsj").toString());
-					long fcsj = Long.valueOf(m2.get("fcsj").toString());
+			for(int i = 0; i < mapList.size(); i++){
+				Map<String, Object> m = mapList.get(i);
+				if(m.get("fcsj") != null && m.get("zdsj") != null &&
+						!m.get("bcType").toString().equals("in") && !m.get("bcType").toString().equals("out")){
+					long zdsj = Long.valueOf(m.get("zdsj").toString());
+					long fcsj = Long.valueOf(m.get("fcsj").toString());
 					if(fcsj > zdsj)
 						zdsj += 1440l;
 					if(sfqr == 1 && time1 > fcsj){
@@ -1083,22 +1094,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 						sjyssj += zdsj - fcsj;
 					}
 					sjyssj1 += zdsj - fcsj;
-					sjlc += Double.valueOf(m2.get("lc").toString());
-				}
-				if(i == 1 && m1.get("fcsj") != null && m1.get("zdsj") != null){
-					long zdsj = Long.valueOf(m1.get("zdsj").toString());
-					long fcsj = Long.valueOf(m1.get("fcsj").toString());
-					if(fcsj > zdsj)
-						zdsj += 1440l;
-					if(sfqr == 1 && time1 > fcsj){
-						sjyssj += zdsj - time1;
-					}else if(sfqr == 1 && time2 < zdsj){
-						sjyssj += time2 - fcsj;
-					}else{
-						sjyssj += zdsj - fcsj;
-					}
-					sjyssj1 += zdsj - fcsj;
-					sjlc += Double.valueOf(m1.get("lc").toString());
+					sjlc += Double.valueOf(m.get("lc").toString());
 				}
 			}
 			tempMap.put("company", companyName);
@@ -1383,249 +1379,214 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			times = "05:00-23:00";
 		}
-		list = getSchedule(company, subCompany, line, startDate, endDate, model, times, true);
+		list = getSchedule(company, subCompany, line, startDate, endDate, model, times, false);
 		String[] date1 = startDate.split("-");
 		String[] date2 = endDate.split("-");
 		startDate = date1[0] + "年" + date1[1] + "月" + date1[2] + "日";
 		endDate = date2[0] + "年" + date2[1] + "月" + date2[2] + "日";
+		String date = startDate + "-" + endDate;
+		if(startDate.equals(endDate)){
+			date = startDate;
+		}
 		String[] split = times.split("-");
 		int startTime = Integer.valueOf(split[0].split(":")[0])*60 + Integer.valueOf(split[0].split(":")[1]);
 		int endTime = Integer.valueOf(split[1].split(":")[0])*60 + Integer.valueOf(split[1].split(":")[1]);
-		for(ScheduleRealInfo schedule : list){
-			if(qdzName.length() != 0 && !qdzName.equals(schedule.getQdzName())){
-				continue;
-			}
-			Long fcsj = schedule.getFcsjT();
-			if(!(endTime!=0?fcsj>=startTime&&fcsj<endTime:fcsj>=startTime)){
-				continue;
-			}
-			String key = schedule.getScheduleDateStr() + "/" + schedule.getXlName() + "/" + schedule.getLpName() + "/" + schedule.getFcsj() + "/" + schedule.getQdzName();
+		for(ScheduleRealInfo s : list){
+			String key = s.getScheduleDateStr() + "/" + s.getLpName();
 			if(!keyMap.containsKey(key))
 				keyMap.put(key, new ArrayList<ScheduleRealInfo>());
-			keyMap.get(key).add(schedule);
+			keyMap.get(key).add(s);
 		}
+		
 		for(String key : keyMap.keySet()){
-			Map<String, Object> tempMap = new HashMap<String, Object>();
-			int jhbc = 0, sjbc = 0, wdfz = 0;
-			long jhdf = 0l, sjdf = 0l, wddf1 = 0l, wddf2 = 0l;
-			long jhfc = 0l, sjfc = 0l, wdfc1 = 0l, wdfc2 = 0l;
-			long jhys = 0l, sjys = 0l, yssjMax = 0l, yssjMin = 0l;
-			long jhtz = 0l, sjtz = 0l, tzsjMax = 0l, tzsjMin = 0l;
-			String companyName = "", subCompanyName = "";
-			for(ScheduleRealInfo schedule : keyMap.get(key)){
-				if(schedule.getGsName() != null && companyName.length() == 0)
-					companyName = schedule.getGsName();
-				if(schedule.getFgsName() != null && subCompanyName.length() == 0)
-					subCompanyName = schedule.getFgsName();
-				long tzsj = 0l;
-				long yssj = 0l;
-				jhbc++;
-				if(schedule.getDfsj() != null){
-					jhtz += schedule.getFcsjT() - schedule.getDfsjT();
+			List<ScheduleRealInfo> list1 = keyMap.get(key);
+			Map<String, List<ScheduleRealInfo>> keyMap_ = new HashMap<String, List<ScheduleRealInfo>>();
+			for(ScheduleRealInfo s : list1){
+				String dateStr = s.getScheduleDateStr();
+				if(!keyMap_.containsKey(dateStr))
+					keyMap_.put(dateStr, new ArrayList<ScheduleRealInfo>());
+				keyMap_.get(dateStr).add(s);
+			}
+			
+			Set<String> keySet1 = keyMap_.keySet();
+			Map<Long, String> Map = new HashMap<Long, String>();
+			for(String key1 : keySet1){
+				Map.put(Long.valueOf(key1.replaceAll("-", "")), key1);
+			}
+			Set<Long> keySet2 = Map.keySet();
+			
+			for(Long l : keySet2){
+				List<ScheduleRealInfo> list2 = keyMap_.get(Map.get(l));
+				List<ScheduleRealInfo> list3 = new ArrayList<ScheduleRealInfo>();
+				List<Long> fcsjs = new ArrayList<Long>();
+				List<Long> zdsjs = new ArrayList<Long>();
+				List<Long> fcsjAs = new ArrayList<Long>();
+				List<Long> zdsjAs = new ArrayList<Long>();
+				Map<Long, ScheduleRealInfo> fcsjMap = new HashMap<Long, ScheduleRealInfo>();
+				Map<Long, ScheduleRealInfo> zdsjMap = new HashMap<Long, ScheduleRealInfo>();
+				Map<Long, ScheduleRealInfo> fcsjAMap = new HashMap<Long, ScheduleRealInfo>();
+				Map<Long, ScheduleRealInfo> zdsjAMap = new HashMap<Long, ScheduleRealInfo>();
+				for(ScheduleRealInfo schedule : list2){
+					if(schedule.getStatus() != -1){
+						if(schedule.getFcsj()!=null&&schedule.getFcsjActual()!=null&&
+								schedule.getZdsj()!=null&&schedule.getZdsjActual()!=null){
+							Long fcsj = schedule.getFcsjT();
+							Long zdsj = schedule.getZdsjT();
+							Long fcsjA = schedule.getFcsjActualTime();
+							Long zdsjA = schedule.getZdsjActualTime();
+							fcsjs.add(fcsj);
+							zdsjs.add(zdsj);
+							fcsjAs.add(fcsjA);
+							zdsjAs.add(zdsjA);
+							fcsjMap.put(fcsj, schedule);
+							zdsjMap.put(zdsj, schedule);
+							fcsjAMap.put(fcsjA, schedule);
+							zdsjAMap.put(zdsjA, schedule);
+						}
+					}
+				}
+				Collections.sort(fcsjs);
+				Collections.sort(zdsjs);
+				Collections.sort(fcsjAs);
+				Collections.sort(zdsjAs);
+				for(int i = 0; i < fcsjs.size(); i++){
+					Long fcsj = fcsjs.get(i);
+					Long zdsj = zdsjs.get(i);
+					Long fcsjA = fcsjAs.get(i);
+					Long zdsjA = zdsjAs.get(i);
+					ScheduleRealInfo s = fcsjMap.get(fcsj);
+					s.setFcsjActual(fcsjAMap.get(fcsjA).getFcsjActual());
+					s.setFcsjActualTime(fcsjAMap.get(fcsjA).getFcsjActualTime());
+					s.setZdsjActual(zdsjAMap.get(zdsjA).getZdsjActual());
+					s.setZdsjActualTime(zdsjAMap.get(zdsjA).getZdsjActualTime());
+					list3.add(s);
 				}
-				jhys += schedule.getZdsjT() - schedule.getFcsjT();
-				if(schedule.getFcsjActual() != null && schedule.getZdsjActual() != null){
-					sjbc++;
-					sjfc += schedule.getFcsjActualTime();
-					yssj += schedule.getZdsjActualTime() - schedule.getFcsjActualTime();
-					if(schedule.getFcsjActualTime() - schedule.getFcsjT() < 0){
-						wdfc1 += schedule.getFcsjT() - schedule.getFcsjActualTime();
-//						kbc++;
-					} else if(schedule.getFcsjActualTime() - schedule.getFcsjT() > 0){
-						wdfc2 += schedule.getFcsjActualTime() - schedule.getFcsjT();
-//						mbc++;
-					}
-					
-					if(schedule.getDfsj() != null){
-						sjdf += schedule.getDfsjT();
-						tzsj += schedule.getFcsjActualTime() - schedule.getDfsjT();
-						if(schedule.getDfsjT() - schedule.getFcsjT() < 0)
-							wddf1 += schedule.getFcsjT() - schedule.getDfsjT();
-						else
-							wddf2 += schedule.getDfsjT() - schedule.getFcsjT();
-					} else {
-						sjdf += schedule.getFcsjT();
-						tzsj += schedule.getFcsjActualTime() - schedule.getFcsjT();
+				for(int i = 0; i < list3.size(); i++){
+					ScheduleRealInfo s = list3.get(i);
+					long fcwd = s.getFcsjActualTime() - s.getFcsjT();
+					long jhys = s.getBcsj();
+					long sjys = s.getZdsjActualTime() - s.getFcsjActualTime();
+					if(i > 0){
+						ScheduleRealInfo s1 = list3.get(i - 1);
+						long ddwd = s1.getZdsjActualTime() - s1.getZdsjT();
+						long jhtz = s.getFcsjT() - s1.getZdsjT();
+						long sjtz = s.getFcsjActualTime() - s1.getZdsjActualTime();
+		
+						if(s.getBcType().equals("normal")){
+							Map<String, Object> tempMap = new HashMap<String, Object>();
+							tempMap.put("dates", date);
+							tempMap.put("line", s.getXlName());
+							tempMap.put("lp", s.getLpName());
+							tempMap.put("station", s.getQdzName());
+							tempMap.put("date", s.getScheduleDateStr());
+							tempMap.put("jhdd", s1.getZdsj());
+							tempMap.put("sjdd", s1.getZdsjActual());
+							tempMap.put("ddwd", ddwd);
+							tempMap.put("jhfc", s.getFcsj());
+							tempMap.put("sjfc", s.getFcsjActual());
+							tempMap.put("fcwd", fcwd);
+							tempMap.put("jhys", jhys);
+							tempMap.put("sjys", sjys);
+							tempMap.put("jhtz", jhtz);
+							tempMap.put("sjtz", sjtz);
+							
+							String key0 = s.getLpName() + "/" + s.getQdzName();
+							if(!keyMap0.containsKey(key0))
+								keyMap0.put(key0, new ArrayList<Map<String, Object>>());
+							keyMap0.get(key0).add(tempMap);
+						}
 					}
 				}
-				
-				sjys += yssj;
-				if(yssj > yssjMax || yssjMax == 0l)
-					yssjMax = yssj;
-				if(yssj < yssjMin || yssjMin == 0l)
-					yssjMin = yssj;
-				
-				sjtz += tzsj;
-				if(tzsj > tzsjMax || tzsjMax == 0l)
-					tzsjMax = tzsj;
-				if(tzsj < tzsjMin || tzsjMin == 0l)
-					tzsjMin = tzsj;
 			}
-			String[] keys = key.split("/");
-			tempMap.put("date", keys[0]);
-			tempMap.put("line", keys[1]);
-			tempMap.put("lp", keys[2]);
-			tempMap.put("jhdf", keys[3]);
-			tempMap.put("jhfc", keys[3]);
-			tempMap.put("station", keys[4]);
-			tempMap.put("times", times);
-			tempMap.put("company", companyName);
-			tempMap.put("subCompany", subCompanyName);
-			if(startDate.equals(endDate))
-				tempMap.put("dates", startDate);
-			else
-				tempMap.put("dates", startDate + "--" + endDate);
-			tempMap.put("jhbc", jhbc);
-			tempMap.put("sjbc", sjbc);
-			if(sjbc != 0){
-				tempMap.put("sjdf", ((sjdf/sjbc)/60<10?"0"+(sjdf/sjbc)/60:(sjdf/sjbc)/60) + ":" + ((sjdf/sjbc)%60<10?"0"+(sjdf/sjbc)%60:(sjdf/sjbc)%60));
-				tempMap.put("wddf1", wddf1 / sjbc + "分");
-				tempMap.put("wddf2", wddf2 / sjbc + "分");
-				tempMap.put("sjfc", ((sjfc/sjbc)/60<10?"0"+(sjfc/sjbc)/60:(sjfc/sjbc)/60) + ":" + ((sjfc/sjbc)%60<10?"0"+(sjfc/sjbc)%60:(sjfc/sjbc)%60));
-				tempMap.put("wdfc1", wdfc1 / sjbc + "分");
-				tempMap.put("wdfc2", wdfc2 / sjbc + "分");
-//				tempMap.put("kbc", df.format((((double) kbc)/sjbc)*100)+"%");
-//				tempMap.put("mbc", df.format((((double) mbc)/sjbc)*100)+"%");
-				tempMap.put("pjys", sjys / sjbc + "分");
-				tempMap.put("pjtz", sjtz / sjbc + "分");
-			} else {
-				tempMap.put("sjdf", "/");
-				tempMap.put("wddf1", "0分");
-				tempMap.put("wddf2", "0分");
-				tempMap.put("sjfc", "/");
-				tempMap.put("wdfc1", "0分");
-				tempMap.put("wdfc2", "0分");
-//				tempMap.put("kbc", "0%");
-//				tempMap.put("mbc", "0%");
-				tempMap.put("pjys", "0分");
-				tempMap.put("pjtz", "0分");
-			}
-//			tempMap.put("kbc", kbc);
-//			tempMap.put("mbc", mbc);
-			if(!tempMap.get("jhfc").toString().equals("/") && !tempMap.get("sjfc").toString().equals("/")){
-				String[] temp1 = tempMap.get("jhfc").toString().split(":");
-				String[] temp2 = tempMap.get("sjfc").toString().split(":");
-				tempMap.put("wdfz", (Integer.valueOf(temp2[0])*60 + Integer.valueOf(temp2[1]))
-						- (Integer.valueOf(temp1[0])*60 + Integer.valueOf(temp1[1])));
-			}else{
-				tempMap.put("wdfz", "/");
-			}
-			tempMap.put("jhys", jhys);
-			tempMap.put("sjys", sjys);
-			tempMap.put("yssjMin", yssjMin);
-			tempMap.put("yssjMax", yssjMax);
-			tempMap.put("jhtz", jhtz);
-			tempMap.put("sjtz", sjtz);
-			tempMap.put("tzsjMax", tzsjMax);
-			tempMap.put("tzsjMin", tzsjMin);
-			list0.add(tempMap);
 		}
-		Collections.sort(list0, new Comparator<Map<String, Object>>() {
-			 
-			public int compare(Map<String, Object> o1, Map<String, Object> o2) {
-				
-				String[] split1 = o1.get("date").toString().split("-");
-				String[] split2 = o2.get("date").toString().split("-");
-				Long a = Long.valueOf(split1[0])*10000 + Long.valueOf(split1[1])*100 + Long.valueOf(split1[2]);
-				Long b = Long.valueOf(split2[0])*10000 + Long.valueOf(split2[1])*100 + Long.valueOf(split2[2]);
-
-				// 升序
-				return a.compareTo(b);
-			}
-		});
-		for(Map<String, Object> m : list0){
-			String key = m.get("line").toString() + "/" + m.get("lp").toString() + "/" + m.get("station").toString();
-			if(!keyMap0.containsKey(key))
-				keyMap0.put(key, new ArrayList<Map<String, Object>>());
-			keyMap0.get(key).add(m);
-		}
-		for(String key : keyMap0.keySet()){
-			Map<String, Object> tempMap = new HashMap<String, Object>();
-			int jhbc = 0;
-			int sjbc = 0;
-			int wddf1 = 0;
-			int wddf2 = 0;
-			int wdfc1 = 0;
-			int wdfc2 = 0;
-			int ys = 0;
-			int tz = 0;
-			String companyName = "", subCompanyName = "";
-			for(Map<String, Object> m : keyMap0.get(key)){
-				if(m.containsKey("company") && companyName.length() == 0)
-					companyName = m.get("company").toString();
-				if(m.containsKey("subCompany") && subCompanyName.length() == 0)
-					subCompanyName = m.get("subCompany").toString();
-				jhbc += Integer.valueOf(m.get("jhbc").toString());
-				sjbc += Integer.valueOf(m.get("sjbc").toString());
-				wddf1 += Integer.valueOf(m.get("wddf1").toString().substring(0, m.get("wddf1").toString().length() - 1));
-				wddf2 += Integer.valueOf(m.get("wddf2").toString().substring(0, m.get("wddf2").toString().length() - 1));
-				wdfc1 += Integer.valueOf(m.get("wdfc1").toString().substring(0, m.get("wdfc1").toString().length() - 1));
-				wdfc2 += Integer.valueOf(m.get("wdfc2").toString().substring(0, m.get("wdfc2").toString().length() - 1));
-				ys += Integer.valueOf(m.get("pjys").toString().substring(0, m.get("pjys").toString().length() - 1));
-				tz += Integer.valueOf(m.get("pjtz").toString().substring(0, m.get("pjtz").toString().length() - 1));
-			}
-			if(startDate.equals(endDate))
-				tempMap.put("dates", startDate);
-			else
-				tempMap.put("dates", startDate + "--" + endDate);
-			tempMap.put("company", companyName);
-			tempMap.put("subCompany", subCompanyName);
-			String[] keys = key.split("/");
-			tempMap.put("line", keys[0]);
-			tempMap.put("lp", keys[1]);
-			tempMap.put("station", keys[2]);
-			tempMap.put("times", times);
-			tempMap.put("jhbc", jhbc);
-			tempMap.put("sjbc", sjbc);
-			tempMap.put("wddf1", wddf1/keyMap0.get(key).size()+"分");
-			tempMap.put("wddf2", wddf2/keyMap0.get(key).size()+"分");
-			tempMap.put("wdfc1", wdfc1/keyMap0.get(key).size()+"分");
-			tempMap.put("wdfc2", wdfc2/keyMap0.get(key).size()+"分");
-			tempMap.put("pjys", ys/keyMap0.get(key).size()+"分");
-			tempMap.put("pjtz", tz/keyMap0.get(key).size()+"分");
-			tempMap.put("workList", keyMap0.get(key));
-			
-			String key1 = tempMap.get("line").toString();
-			if(!keyMap1.containsKey(key1))
-				keyMap1.put(key1, new ArrayList<Map<String, Object>>());
-			keyMap1.get(key1).add(tempMap);
-		}
-		for(String key : keyMap1.keySet()){
-			Collections.sort(keyMap1.get(key), new Comparator<Map<String, Object>>() {
+		if(keyMap0.keySet().size() > 0){
+			Set<String> keySet = keyMap0.keySet();
+			List<String> keyList = new ArrayList<String>();
+			keyList.addAll(keySet);
+			Collections.sort(keyList, new Comparator<String>() {
-				public int compare(Map<String, Object> o1, Map<String, Object> o2) {
+				public int compare(String o1, String o2) {
 					Long a;
 					Long b;
-					String lp1 = o1.get("lp").toString();
-					String lp2 = o2.get("lp").toString();
+					o1 = o1.split("/")[0];
+					o2 = o2.split("/")[0];
 					String str1 = "";
 					String str2 = "";
-					for(int i = 0; i < lp1.length(); i++){
-						str1 += (int)lp1.charAt(i);
+					for(int i = 0; i < o1.length(); i++){
+						str1 += (int)o1.charAt(i);
 					}
-					for(int i = 0; i < lp2.length(); i++){
-						str2 += (int)lp2.charAt(i);
+					for(int i = 0; i < o2.length(); i++){
+						str2 += (int)o2.charAt(i);
 					}
 					a = Long.valueOf(str1);
 					b = Long.valueOf(str2);
-
+	
 					// 升序
 					return a.compareTo(b);
 				}
 			});
-			resList.addAll(keyMap1.get(key));
+			for(String key : keyList){
+				List<Map<String, Object>> mapList = keyMap0.get(key);
+				Map<String, Object> tempMap = new HashMap<String, Object>();
+				int ddtq_ = 0, ddtqs = 0, ddyw_ = 0, ddyws = 0;
+				int fctq_ = 0, fctqs = 0, fcyw_ = 0, fcyws = 0;
+				int yssj_ = 0, yssjs = 0, tzsj_ = 0, tzsjs = 0;
+				for(Map<String, Object> m : mapList){
+					int ddwd = Integer.valueOf(m.get("ddwd").toString());
+					if(ddwd < 0){
+						ddtq_ += 0 - ddwd;
+						++ddtqs;
+					} else if(ddwd > 0){
+						ddyw_ += ddwd;
+						++ddyws;
+					}
+					int fcwd = Integer.valueOf(m.get("fcwd").toString());
+					if(fcwd < 0){
+						fctq_ += 0 - fcwd;
+						++fctqs;
+					} else if(fcwd > 0){
+						fcyw_ += fcwd;
+						++fcyws;
+					}
+					int sjys = Integer.valueOf(m.get("sjys").toString());
+					yssj_ += sjys;
+					++yssjs;
+					int sjtz = Integer.valueOf(m.get("sjtz").toString());
+					tzsj_ += sjtz;
+					++tzsjs;
+				}
+				tempMap.put("ddwd1", (ddtqs!=0?ddtq_/ddtqs:0) + "分");
+				tempMap.put("ddwd2", (ddyws!=0?ddyw_/ddyws:0) + "分");
+				tempMap.put("wdfc1", (fctqs!=0?fctq_/fctqs:0) + "分");
+				tempMap.put("wdfc2", (fcyws!=0?fcyw_/fcyws:0) + "分");
+				tempMap.put("pjys", (yssjs!=0?yssj_/yssjs:0) + "分");
+				tempMap.put("pjtz", (tzsjs!=0?tzsj_/tzsjs:0) + "分");
+				
+				Map<String, Object> m = mapList.get(0);
+				tempMap.put("dates", date);
+				tempMap.put("times", times);
+				tempMap.put("line", m.get("line"));
+				tempMap.put("lp", m.get("lp"));
+				tempMap.put("station", m.get("station"));
+				tempMap.put("bcs", mapList.size());
+				tempMap.put("workList", mapList);
+				if(qdzName != null && qdzName.trim().length() != 0){
+					if(!tempMap.get("station").equals(qdzName)){
+						continue;
+					}
+				}
+				resList.add(tempMap);
+			}
 		}
-		
-		
 		return resList;
 	}
@@ -9,6 +9,8 @@ import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -428,13 +430,22 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 //					repository.obtainYl(rq,gsbm,fgsbm,line,nbbm,"nbbm");
 			// 当天YLXXB信息
 			List<Ylxxb> ylxxList = ylxxbRepository.obtainYlxx(rq, 0,gsbm);
-			// 前一天所有车辆最后进场班次信息
-//			List<Ylb> ylListBe = repository.obtainYlbefore(rq, gsbm, fgsbm, line, nbbm);
-//			List<Dlb> ylListBe =repository.listMaxRqJcsx(rq, gsbm, fgsbm, line, nbbm);
-//			List<Cyl> clyList = cylRepository.obtainCyl(nbbm,gsbm);
 			// 从排班表中计算出行驶的总里程
 			List<Map<String, Object>> listpb =new ArrayList<Map<String, Object>>();
 			List<Map<String, Object>> listpbs=scheduleRealInfoService.yesterdayDataList(line, rq, gsbm, fgsbm, "", nbbm);
+		    Map<String, Double> lcMap=new HashMap<String,Double>();
+			for (int i = 0; i < listpbs.size(); i++) {
+				String cl=listpbs.get(i).get("clZbh").toString();
+				Double lc= listpbs.get(i).get("totalKilometers") == null ? 0.0
+						: Double.parseDouble(listpbs.get(i).get("totalKilometers").toString());
+				if(lcMap.get(cl)==null){
+					lcMap.put(cl, lc);
+				}else{
+					Double lc_=lcMap.get(cl);
+					lcMap.remove(cl);
+					lcMap.put(cl, Arith.add(lc, lc_));
+				}
+			}
 			List<Jdl> jdlList=jdlRepository.JdlList(rq);
 			String sxtj=map2.get("sxtj").toString();
 			if(sxtj.equals("0")){
@@ -470,126 +481,134 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 					}
 				}
 			}
-			
+			Map<String, Object> newMap_=new HashMap<String,Object>();
 			List<Dlb> addList = new ArrayList<Dlb>();
 			List<Dlb> updateList = new ArrayList<Dlb>();
 			String ins="";
 			Map<String, Object> ylMap=new HashMap<String, Object>();
-			for (int x = 0; x < listpb.size(); x++) {
+			List<Map<String, Object>> listpb_=listpb;
+			Collections.sort(listpb,new NbbmJcsxMap());
+			for (int x = 0; x < listpb_.size(); x++) {
 				String type = "add";
 				boolean sfdc = false;
-				Map<String, Object> map = listpb.get(x);
-				if (carsMap.get(map.get("clZbh").toString()) != null) {
-					sfdc = carsMap.get(map.get("clZbh").toString());
+				Map<String, Object> map_ = listpb_.get(x);
+				if (carsMap.get(map_.get("clZbh").toString()) != null) {
+					sfdc = carsMap.get(map_.get("clZbh").toString());
 				} else {
 					sfdc = false;
 				}
 				if (sfdc) {
-					// 判断驾驶员驾驶的该车辆是否已经存入了（查出的结果集中日期是相同的，根据驾驶员、内部编号、线路编码判断）
-					Dlb t = new Dlb();
-					for (int k = 0; k < dlList.size(); k++) {
-						Dlb t1 = dlList.get(k);
-						if (t1.getNbbm().equals(map.get("clZbh").toString())
-								&& t1.getJsy().equals(map.get("jGh").toString())
-								&& t1.getXlbm().equals(map.get("xlBm").toString())) {
-							t = t1;
-							type = "update";
+					if(newMap_.get(map_.get("clZbh").toString())==null){
+						newMap_.put(map_.get("clZbh").toString(), map_.get("clZbh").toString());
+						//车辆总里程
+						double zlc =lcMap.get(map_.get("clZbh").toString());
+						//车辆总加电量
+						Double zjzl = 0.0;
+						for (int j = 0; j < ylxxList.size(); j++) {
+							Ylxxb ylxxb = ylxxList.get(j);
+							if (map_.get("clZbh").toString().equals(ylxxb.getNbbm())
+									&& map_.get("company").toString().equals(ylxxb.getGsdm())) {
+								zjzl = Arith.add(zjzl, ylxxb.getJzl());
+							}
 						}
-					}
-
-					// 当日的第一个班次，出场油量等于前一天的最后一个班次的进场油量
-				/*	if (map.get("seqNumber").toString().equals("1")) {
-						boolean fage = true;
-						for (int i = 0; i < ylListBe.size(); i++) {
-							Ylb ylb = ylListBe.get(i);
-							if (map.get("clZbh").toString().equals(ylb.getNbbm())) {
-								if(ylb.getJzyl()>0){
-									t.setCzyl(ylb.getJzyl());
-									fage = false;
-									break;
-								}
-								
+						for (int i = 0; i < jdlList.size(); i++) {
+							Jdl jdl=jdlList.get(i);
+							if(map_.get("clZbh").toString().equals(jdl.getNbbm()) 
+									&&map_.get("company").toString().equals(jdl.getGsBm())
+									&&map_.get("bCompany").toString().equals(jdl.getFgsBm())){
+								zjzl = Arith.add(zjzl,jdl.getJdl());
 							}
 						}
-						if (fage) {
-							for (int y = 0; y < clyList.size(); y++) {
-								Cyl cyl = clyList.get(y);
-								if (map.get("clZbh").toString().equals(cyl.getNbbm())) {
-									if(cyl!=null){
-										if(cyl.getCyl()>=0){
-											t.setCzyl(cyl.getCyl());
-											fage = false;
-											break;
-										}else {
-											if(cyl.getCxrl()!=null){
-												if(cyl.getCxrl()>0){
-													t.setCzyl(cyl.getCxrl());
-													fage = false;
-													break;
-												}
+						
+						Double nextJzyl = 0.0;
+						for (int i = 0; i < listpb.size(); i++) {
+							Map<String, Object> map = listpb.get(i);
+							if(map_.get("clZbh").toString().equals(map.get("clZbh").toString())){
+								// 判断驾驶员驾驶的该车辆是否已经存入了（查出的结果集中日期是相同的，根据驾驶员、内部编号、线路编码判断）
+								Dlb t = new Dlb();
+								for (int k = 0; k < dlList.size(); k++) {
+									Dlb t1 = dlList.get(k);
+									if (t1.getNbbm().equals(map.get("clZbh").toString())
+											&& t1.getJsy().equals(map.get("jGh").toString())
+											&& t1.getXlbm().equals(map.get("xlBm").toString())) {
+										t = t1;
+										type = "update";
+									}
+								}
+								Double lc= Double.parseDouble(map.get("totalKilometers").toString());
+								if(map.get("seqNumber").toString().equals("1")){
+									// 当日的第一个班次，出场油量等于前一天的最后一个班次的进场油量
+									Double dh=0.0;
+									if(zlc>0){
+										dh = Double.parseDouble(df.format(zjzl * (lc / zlc)));
+									}
+									nextJzyl =Arith.sub(zjzl,dh);
+									if(zlc>0){
+										long l=Math.round(nextJzyl);
+										double ylxs=l*100/100;
+										dh=Arith.add(dh, Arith.sub(nextJzyl,ylxs));
+										t.setHd(dh);
+										t.setCdl(dh);
+										nextJzyl=ylxs;
+									}else{
+										t.setHd(0.0);
+										t.setCdl(0.0);
+									}
+								}else{
+									Double dh=0.0;
+									if(zlc>0){
+										dh = Double.parseDouble(df.format(zjzl * (lc / zlc)));
+									}
+									nextJzyl =Arith.sub( nextJzyl,dh);
+									if(zlc>0){
+										long l=0l;
+										double ylxs=0.0;
+										if(i==listpb.size()-1){
+//											ylxs=czyl;
+										}else{
+											if(listpb.get(i+1).get("clZbh").toString().equals(map.get("clZbh").toString())){
+												l=Math.round(nextJzyl);
+												ylxs=l*100/100;
 											}
+											
 										}
+										dh=Arith.add(dh, Arith.sub(nextJzyl,ylxs));
+										t.setHd(dh);
+										t.setCdl(dh);
+										nextJzyl=ylxs;
+									}else{
+										t.setHd(0.0);
+										t.setCdl(0.0);
 									}
 								}
+								t.setCzcd(100.0);
+								t.setJzcd(100.0);
+								t.setNbbm(map.get("clZbh").toString());
+								t.setJsy(map.get("jGh") == null ? "" : map.get("jGh").toString());
+								t.setZlc(map.get("totalKilometers") == null ? 0.0
+										: Double.parseDouble(map.get("totalKilometers").toString()));
+								t.setXlbm(map.get("xlBm") == null ? "" : map.get("xlBm").toString());
+								t.setJcsx(Integer.parseInt(map.get("seqNumber").toString()));
+								t.setSsgsdm(map.get("company") == null ? "" : map.get("company").toString());
+								t.setFgsdm(map.get("bCompany") == null ? "" : map.get("bCompany").toString());
+								t.setJhsj(map.get("fcsj")==null?"":map.get("fcsj").toString());
+								t.setRq(sdf.parse(rq));
+								
+								 if(!(t.getSsgsdm().equals("") || t.getFgsdm().equals(""))){
+									 if(type.equals("add")){
+										 t.setCreatetime(date);
+										 addList.add(t); 
+									 }else{
+										 t.setUpdatetime(date);
+									     updateList.add(t); 
+									     ins += t.getId().toString()+",";
+									  }
+								 }
+//								repository.save(t);
+								newMap.put("status", ResponseCode.SUCCESS);
 							}
 						}
-						if (fage) {
-							t.setCzyl(0.0);
-						}
-					}
-					*/
-					Double jzl = 0.0;
-					//一人一车加注量只匹配一次
-					if(ylMap.get(map.get("clZbh").toString()+"_"+ map.get("jGh").toString())!=null){
-						
-					}else{
-						// 把当天的YLXXB的加注量设置为当天YLB的加注量（根据车号，驾驶员判断）
-						for (int j = 0; j < ylxxList.size(); j++) {
-							Ylxxb ylxxb = ylxxList.get(j);
-							if (map.get("clZbh").toString().equals(ylxxb.getNbbm())
-									&& map.get("jGh").toString().equals(ylxxb.getJsy())) {
-								jzl +=Arith.add(jzl, ylxxb.getJzl());
-							}
-						}
-						ylMap.put(map.get("clZbh").toString()+"_"+ map.get("jGh").toString(),map.get("xlBm") == null ? "" : map.get("xlBm").toString());
 					}
-					for (int i = 0; i < jdlList.size(); i++) {
-						Jdl jdl=jdlList.get(i);
-						if(map.get("clZbh").toString().equals(jdl.getNbbm()) 
-								&&map.get("jGh").toString().equals(jdl.getJsy())
-								&&map.get("bCompany").toString().equals(jdl.getFgsBm())){
-							jzl+=jdl.getJdl();
-						}
-					}
-				
-					t.setCdl(jzl);
-					t.setCzcd(100.0);
-					t.setJzcd(100.0);
-					t.setHd(jzl);
-					t.setNbbm(map.get("clZbh").toString());
-					t.setJsy(map.get("jGh") == null ? "" : map.get("jGh").toString());
-					t.setZlc(map.get("totalKilometers") == null ? 0.0
-							: Double.parseDouble(map.get("totalKilometers").toString()));
-					t.setXlbm(map.get("xlBm") == null ? "" : map.get("xlBm").toString());
-					t.setJcsx(Integer.parseInt(map.get("seqNumber").toString()));
-					t.setSsgsdm(map.get("company") == null ? "" : map.get("company").toString());
-					t.setFgsdm(map.get("bCompany") == null ? "" : map.get("bCompany").toString());
-					t.setJhsj(map.get("fcsj")==null?"":map.get("fcsj").toString());
-					t.setRq(sdf.parse(rq));
-					
-					 if(!(t.getSsgsdm().equals("") || t.getFgsdm().equals(""))){
-						 if(type.equals("add")){
-							 t.setCreatetime(date);
-							 addList.add(t); 
-						 }else{
-							 t.setUpdatetime(date);
-						     updateList.add(t); 
-						     ins += t.getId().toString()+",";
-						  }
-					 }
-//					repository.save(t);
-					newMap.put("status", ResponseCode.SUCCESS);
-
 				}
 			}
 			if(addList.size()>0){ 
@@ -1014,3 +1033,11 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 		return lists;
 	}
 }
+
+class NbbmJcsxMap implements Comparator<Map<String, Object>>{
+	 @Override
+		public int compare(Map<String, Object> o1, Map<String, Object> o2) {
+			// TODO Auto-generated method stub
+			return  (o1.get("clZbh").toString()+o1.get("seqNumber").toString()).compareTo((o2.get("clZbh").toString()+o1.get("seqNumber").toString()));
+		}
+}
@@ -63,7 +63,7 @@ public class JdlServiceImpl extends BaseServiceImpl&lt;Jdl, Integer&gt; implements Jdl
 				}
 				String[] split = (text+";").split(",");
 				String str = "";
-				for(int j = 0; j < split.length && j < 6; j++){
+				for(int j = 0; j < split.length && j < 5; j++){
 					str += split[j];
 				}
 				if(str.trim().length() == 0)
@@ -75,22 +75,22 @@ public class JdlServiceImpl extends BaseServiceImpl&lt;Jdl, Integer&gt; implements Jdl
 				String[] split = text.split(",");
 				String rq = split[0].trim();
 				String nbbm = split[1].trim();
-				String jsy= split[2].trim();
-				double jdl = Double.valueOf(split[3].trim().length()!=0?split[3]:"0");
-				String jdz = split[4].trim();
-				String remarks = split[5].trim();
+//				String jsy= split[2].trim();
+				double jdl = Double.valueOf(split[2].trim().length()!=0?split[2]:"0");
+				String jdz = split[3].trim();
+				String remarks = split[4].trim();
 				if(rq.trim().length() == 0){
 					rq = sdf.format(new Date());
 				}
-				List<Double> jdl_ = repository.queryBySame(gsbm, fgsbm, rq, nbbm, jsy);
+				List<Double> jdl_ = repository.queryBySame(gsbm, fgsbm, rq, nbbm);
 				if(jdl_.size() == 0){
 					repository.insertData(gsbm, gsName, fgsbm, fgsName, rq, nbbm,
-							df.format(jdl), jdz, remarks, sd.format(new Date()),jsy);
+							df.format(jdl), jdz, remarks, sd.format(new Date()));
 				}else{
 //					jdl += jdl_.get(0);
-					repository.UpdateJdl(df.format(jdl), gsbm, fgsbm, rq, nbbm, jsy);
+					repository.UpdateJdl(df.format(jdl), gsbm, fgsbm, rq, nbbm);
 				}
 			}
 			wb.close();
@@ -112,9 +112,9 @@ public class JdlServiceImpl extends BaseServiceImpl&lt;Jdl, Integer&gt; implements Jdl
 		String fgsbm = map.get("fgsbm").toString();
 		String rq = map.get("rq").toString();
 		String nbbm = map.get("nbbm").toString();
-		String jsy =map.get("jsy").toString();
+//		String jsy =map.get("jsy").toString();
 		Integer page = Integer.valueOf(map.containsKey("page")?map.get("page").toString():"0");
-		List<Jdl> query = repository.query(gsbm, fgsbm, rq, nbbm,jsy);
+		List<Jdl> query = repository.query(gsbm, fgsbm, rq, nbbm);
 		if(!map.containsKey("type")){
@@ -133,7 +133,6 @@ public class JdlServiceImpl extends BaseServiceImpl&lt;Jdl, Integer&gt; implements Jdl
 				m.put("nbbm", jdl.getNbbm());
 				m.put("jdl", jdl.getJdl());
 				m.put("jdz", jdl.getJdz());
-				m.put("jsy", jdl.getJsy());
 				m.put("remarks", jdl.getRemarks());
 				list.add(m);
 			}
@@ -45,23 +45,25 @@ public class YlxxbServiceImpl extends BaseServiceImpl&lt;Ylxxb,Integer&gt; implements 
 	JdbcTemplate jdbcTemplate;
 	@Override
 	public PageObject<Ylxxb> Pagequery(Map<String, Object> map) {
-		
+
 		String rq=map.get("yyrq").toString();
 		String gsdm=map.get("gsdm_like").toString();
 		String fgsdm=map.get("fgsdm_like").toString();
-		
-	String sql="	select * from ("
-			+ "select *,CONCAT(nbbm,jsy)  as nj "
-			+ " from bsth_c_ylxxb where yyrq='"+rq+"' "
-			+ " and gsdm ='"+gsdm+"') x where x.nj not in ("
-			+ " select CONCAT(nbbm,jsy)  from bsth_c_ylb "
-			+ " where  DATE_FORMAT(rq,'%Y-%m-%d')='"+rq+"'"
-			+ " and ssgsdm='"+gsdm+"' and fgsdm ='"+fgsdm+"')"
-			+ " and x.nbbm in (select nbbm  from bsth_c_ylb "
-			+ " where  DATE_FORMAT(rq,'%Y-%m-%d')='"+rq+"'"
-			+ " and ssgsdm='"+gsdm+"' and fgsdm ='"+fgsdm+"')";
-		
-		
+
+		String sql="	select * from ("
+				+ "select *,CONCAT(nbbm,jsy)  as nj "
+				+ " from bsth_c_ylxxb where yyrq='"+rq+"' "
+				+ " and gsdm ='"+gsdm+"' and jylx ='0') x where x.nj not in ("
+				+ " select CONCAT(nbbm,jsy)  from bsth_c_ylb "
+				+ " where rq='"+rq+"'"
+				+ " and ssgsdm='"+gsdm+"' and fgsdm ='"+fgsdm+"')"
+				+ " and x.nbbm in (select nbbm  from bsth_c_ylb "
+				+ " where rq='"+rq+"'"
+				+ " and ssgsdm='"+gsdm+"' and fgsdm ='"+fgsdm+"') "
+				+ " and x.nbbm not in (select nbbm from bsth_c_ylxxb"
+				+ " where yyrq='"+rq+"' and gsdm ='"+gsdm+"' AND jylx ='1')";
+
+
 		/*String sql= "select v.*,u.jsy as ldgh  from "
 				+ " ( select *  from   bsth_c_ylxxb x  where  "
 				+ " DATE_FORMAT(x.yyrq,'%Y-%m-%d')='"+rq+"'  and x.gsdm='"+gsdm+"'"
@@ -76,43 +78,43 @@ public class YlxxbServiceImpl extends BaseServiceImpl&lt;Ylxxb,Integer&gt; implements 
 				+ " where DATE_FORMAT(rq,'%Y-%m-%d')='"+rq+"'"
 				+ " and ssgsdm='"+gsdm+"'  and fgsdm='"+fgsdm+"' )  u "
 				+ " on  v.nbbm=u.nbbm ";*/
-		
+
 		//根具条件查询指定日期Ylxxb的数据
 //		List<Ylxxb> iterator=repository.checkYlxx(rq,gsdm);
 		/*if(map.get("gsdm_in")!=null){
 			map.put("ssgsdm_in", map.get("gsdm_in"));
 			map.remove("gsdm_in");
-			
+
 		}else{
 			map.put("ssgsdm_like", map.get("gsdm_like"));
 			map.remove("gsdm_like");
 		}*/
-		
+
 		//根具条件查询指定日期Ylb的数据
 //		List<Ylb> ylbIterator=ylbRepository.checkYl(rq,gsdm,fgsdm);
-		List<Ylxxb> list=jdbcTemplate.query(sql,  
-		        new RowMapper<Ylxxb>(){  
-            @Override  
-            public Ylxxb  mapRow(ResultSet rs, int rowNum) throws SQLException {  
-            	Ylxxb s  = new Ylxxb(); 
-            	s.setId(rs.getInt("id"));
-            	s.setYyrq(rs.getDate("yyrq"));
-            	s.setNbbm(rs.getString("nbbm"));
-            	s.setGsdm(rs.getString("gsdm"));
-            	s.setFgsdm(rs.getString("fgsdm"));
-            	s.setJsy(rs.getString("jsy"));
-            	s.setJzl(rs.getDouble("jzl"));
-            	s.setStationid(rs.getString("stationid"));
-            	s.setNylx(rs.getInt("nylx"));
-            	s.setJyggh(rs.getString("jyggh"));
-            	s.setYj(rs.getDouble("yj"));
+		List<Ylxxb> list=jdbcTemplate.query(sql,
+				new RowMapper<Ylxxb>(){
+					@Override
+					public Ylxxb  mapRow(ResultSet rs, int rowNum) throws SQLException {
+						Ylxxb s  = new Ylxxb();
+						s.setId(rs.getInt("id"));
+						s.setYyrq(rs.getDate("yyrq"));
+						s.setNbbm(rs.getString("nbbm"));
+						s.setGsdm(rs.getString("gsdm"));
+						s.setFgsdm(rs.getString("fgsdm"));
+						s.setJsy(rs.getString("jsy"));
+						s.setJzl(rs.getDouble("jzl"));
+						s.setStationid(rs.getString("stationid"));
+						s.setNylx(rs.getInt("nylx"));
+						s.setJyggh(rs.getString("jyggh"));
+						s.setYj(rs.getDouble("yj"));
 //            	s.setLdgh(rs.getString("ldgh"));
-            	s.setBz(rs.getString("bz"));
-                return s;  
-            }  
-		});  
-		
-		
+						s.setBz(rs.getString("bz"));
+						return s;
+					}
+				});
+
+
 		List<Ylb> listylb=ylbRepository.obtainYl(rq, gsdm, fgsdm, "", "", "nbbm");
 		for (int i = 0; i < list.size(); i++) {
 			String ldgh="";
@@ -122,11 +124,11 @@ public class YlxxbServiceImpl extends BaseServiceImpl&lt;Ylxxb,Integer&gt; implements 
 					if(ldgh.equals(""))
 						ldgh +=ylb.getJsy();
 					else
-					    ldgh += ","+ylb.getJsy();
+						ldgh += ","+ylb.getJsy();
 				}
 			}
 			list.get(i).setLdgh(ldgh);
-			
+
 		}
 		//正式使用用下面代码
 //		for (int i = 0; i < iterator.size(); i++) {
@@ -147,16 +149,16 @@ public class YlxxbServiceImpl extends BaseServiceImpl&lt;Ylxxb,Integer&gt; implements 
 //				list.add(y1);
 //			}
 //		}
-		
-		
-		
+
+
+
 		PageHelper pageHelper = new PageHelper(list.size(), map);
 		pageHelper.getMap();
 		PageObject<Ylxxb> pageObject = pageHelper.getPageObject();
 		pageObject.setDataList(list);
 		return pageObject;
 	}
-	@Transactional  
+	@Transactional
 	@Override
 	public Map<String, Object> checkJsy(Map<String, Object> map) throws Exception{
 		Map<String, Object> newMap=new HashMap<String,Object>();
@@ -175,11 +177,13 @@ public class YlxxbServiceImpl extends BaseServiceImpl&lt;Ylxxb,Integer&gt; implements 
 				Integer id =jsonObject.getInteger("id");
 				String jsy =jsonObject.getString("jsy");
 				Ylxxb ylxxb=repository.findOne(id);
-				ylxxb.setJsy(jsy);
-				ylxxb.setJylx(1);
-				repository.save(ylxxb);
+				if(!ylxxb.getJsy().equals(jsy)){
+					ylxxb.setJsy(jsy);
+					ylxxb.setJylx(1);
+					repository.save(ylxxb);
+				}
 			}
-		newMap.put("status", ResponseCode.SUCCESS);
+			newMap.put("status", ResponseCode.SUCCESS);
 		}catch(Exception e){
 			newMap.put("status", ResponseCode.ERROR);
 			logger.error("save erro.", e);
@@ -188,4 +192,4 @@ public class YlxxbServiceImpl extends BaseServiceImpl&lt;Ylxxb,Integer&gt; implements 
 		return newMap;
 	}
-}
+}
 \ No newline at end of file
@@ -180,4 +180,10 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
     List<Map<String,Object>> statisticsDaily_mh_2(String line, String date, String xlName, String type);
 	List<ScheduleRealInfo> realScheduleList_mh_2(String line, String date);
+
+	List<Map<String, Object>> mileageReport(String gsdm, String fgsdm,
+			String line, String date, String date2);
+	
+	List<Map<String, Object>> scheduleCorrectionReport(String gsdm, String fgsdm,
+			String line, String date, String date2);
 }
@@ -31,6 +31,8 @@ import com.bsth.entity.realcontrol.ChildTaskPlan;
 import com.bsth.entity.realcontrol.LineConfig;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.entity.realcontrol.SvgAttribute;
+import com.bsth.entity.report.MileageReport;
+import com.bsth.entity.report.ScheduleCorrectionReport;
 import com.bsth.entity.schedule.CarConfigInfo;
 import com.bsth.entity.schedule.EmployeeConfigInfo;
 import com.bsth.entity.schedule.GuideboardInfo;
@@ -1837,7 +1839,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             	 map = new HashMap<String, Object>();
                  map.put("num", i++);
                  map.put("xlName", xlName);
-                 map.put("clZbh", BasicData.deviceId2NbbmMap.get(obj[2]));
+                 map.put("clZbh", BasicData.deviceId2NbbmMap.get(obj[2])==null?"":BasicData.deviceId2NbbmMap.get(obj[2]));
                  map.put("company",fgs);
                  map.put("requestType", "0x" + Integer.toHexString(Integer.parseInt(obj[0] + "")).toUpperCase());
                  map.put("requestTime", obj[1]);
@@ -2324,10 +2326,11 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         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<String, Object> m=culateService.culateDjg(list_s, line);
+        map.put("djg", m.get("djgcsq"));
+        map.put("djg_m", m.get("djgcsz"));
+        map.put("djg_a", m.get("djgcsw"));
+        map.put("djg_time", m.get("djgsj"));
         map.put("jls", Arith.sub(Arith.add(jhlc, ljgl), lbgl));
         lMap.add(map);
         return lMap;
@@ -4637,6 +4640,195 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         }
         return rs;
     }
+    
+
+	@Override
+	public List<Map<String, Object>> mileageReport(String gsdm,
+			String fgsdm, String line, String date, String date2) {
+		
+		String sql = "select * from calc_mileage where 1=1 " ;
+		if (!line.equals(" ")) {
+			sql = sql+" and line_code='"+ line+"' ";
+		}
+		sql = sql+" and DATE_FORMAT(rq,'%Y-%m-%d') between '"+ date+"'  and '"+ date2+"'";
+		if (!gsdm.equals(" ")) {
+			sql = sql+" and company_id="+gsdm;
+		}
+		if (!gsdm.equals(" ")) {
+			sql = sql+" and sub_company_id="+fgsdm;
+		}
+		sql = sql+" order by line_code";
+		List<MileageReport> list = jdbcTemplate.query(sql,
+                new RowMapper<MileageReport>() {
+                    @Override
+                    public MileageReport mapRow(ResultSet rs, int rowNum) throws SQLException {
+                    	MileageReport mr = new MileageReport();
+                        mr.setCompanyName(rs.getString("company_name"));
+                        mr.setSubCompanyName(rs.getString("sub_company_name"));
+                        mr.setLineName(rs.getString("line_name"));
+                        mr.setSjyygl(rs.getDouble("sjyygl"));
+                        mr.setSjksgl(rs.getDouble("sjksgl"));
+                        mr.setZgl(rs.getDouble("zyygl"));
+                        mr.setZddfgl(rs.getDouble("zddfgl"));
+                        mr.setSddfgl(rs.getDouble("sddfgl"));
+                        mr.setWqwxhgl(rs.getDouble("wqwxhgl"));
+                        mr.setBfwxhgl(rs.getDouble("bfwxhgl"));
+                        mr.setPygl(rs.getDouble("pygl"));
+                        mr.setLjgl(rs.getDouble("ljgl"));
+                        mr.setZrwgl(rs.getDouble("zrwgl"));
+                        mr.setOther(rs.getString("other"));
+                        return mr;
+                    }
+                });
+		List<Map<String, Object>> lMap = new ArrayList<Map<String, Object>>();
+		double sjyygl = 0.0;
+		double sjksgl = 0.0;
+		double zgl = 0.0;
+		double sddfgl = 0.0;
+		double zddfgl = 0.0;
+		double wqwxhgl = 0.0;
+		double bfwxhgl = 0.0;
+		double pygl = 0.0;
+		double ljgl = 0.0;
+		double zrwgl = 0.0;
+		for(MileageReport mr:list) {
+			Map<String, Object> resMap = new HashMap<String, Object>();
+			resMap.put("gsName", mr.getCompanyName());
+			resMap.put("fgsName", mr.getSubCompanyName());
+			resMap.put("xlName", mr.getLineName());
+			resMap.put("sjyygl", mr.getSjyygl());
+			resMap.put("sjksgl", mr.getSjksgl());
+			resMap.put("zgl", mr.getZgl());
+			resMap.put("sddfgl", mr.getSddfgl());
+			resMap.put("zddfgl", mr.getZddfgl());
+			resMap.put("wqwxhgl", mr.getWqwxhgl());
+			resMap.put("bfwxhgl", mr.getBfwxhgl());
+			resMap.put("pygl", mr.getPygl());
+			resMap.put("ljgl", mr.getLjgl());
+			resMap.put("zrwgl", mr.getZrwgl());
+			resMap.put("other", mr.getOther());
+			lMap.add(resMap);
+			sjyygl = Arith.add(sjyygl,mr.getSjyygl());
+			sjksgl = Arith.add(sjksgl,mr.getSjksgl());
+			zgl = Arith.add(zgl,mr.getZgl());
+			sddfgl = Arith.add(sddfgl,mr.getSddfgl());
+			zddfgl = Arith.add(zddfgl,mr.getZddfgl());
+			wqwxhgl = Arith.add(wqwxhgl,mr.getWqwxhgl());
+			bfwxhgl = Arith.add(bfwxhgl,mr.getBfwxhgl());
+			pygl = Arith.add(pygl,mr.getPygl());
+			ljgl = Arith.add(ljgl,mr.getLjgl());
+			zrwgl = Arith.add(zrwgl,mr.getZrwgl());
+		}
+		Map<String, Object> resMap = new HashMap<String, Object>();
+		resMap.put("xlName", "合计");
+		resMap.put("sjyygl", sjyygl);
+		resMap.put("sjksgl", sjksgl);
+		resMap.put("zgl", zgl);
+		resMap.put("sddfgl", sddfgl);
+		resMap.put("zddfgl", zddfgl);
+		resMap.put("wqwxhgl", wqwxhgl);
+		resMap.put("bfwxhgl", bfwxhgl);
+		resMap.put("pygl", pygl);
+		resMap.put("ljgl", ljgl);
+		resMap.put("zrwgl", zrwgl);
+		resMap.put("other", null);
+		lMap.add(resMap);
+		return lMap;
+	}
+	
+	@Override
+	public List<Map<String, Object>> scheduleCorrectionReport(String gsdm,
+			String fgsdm, String line, String date, String date2) {
+		
+		String sql = "select * from calc_schedule where 1=1 " ;
+		if (!line.equals(" ")) {
+			sql = sql+" and line_code='"+ line+"' ";
+		}
+		sql = sql+" and DATE_FORMAT(rq,'%Y-%m-%d') between '"+ date+"'  and '"+ date2+"'";
+		if (!gsdm.equals(" ")) {
+			sql = sql+" and company_id="+gsdm;
+		}
+		if (!gsdm.equals(" ")) {
+			sql = sql+" and sub_company_id="+fgsdm;
+		}
+		sql = sql+" order by line_code";
+		List<ScheduleCorrectionReport> list = jdbcTemplate.query(sql,
+				new RowMapper<ScheduleCorrectionReport>() {
+			@Override
+			public ScheduleCorrectionReport mapRow(ResultSet rs, int rowNum) throws SQLException {
+				ScheduleCorrectionReport sReport = new ScheduleCorrectionReport();
+				sReport.setCompanyName(rs.getString("company_name"));
+				sReport.setSubCompanyName(rs.getString("sub_company_name"));
+				sReport.setLineName(rs.getString("line_name"));
+				sReport.setSjyybc(rs.getInt("sjyybc"));
+				sReport.setSjksbc(rs.getInt("sjksbc"));
+				sReport.setZbc(rs.getInt("zyybc"));
+				sReport.setZddfbc(rs.getInt("zddfbc"));
+				sReport.setSddfbc(rs.getInt("sddfbc"));
+				sReport.setWqwxhbc(rs.getInt("wqwxhbc"));
+				sReport.setBfwxhbc(rs.getInt("bfwxhbc"));
+				sReport.setPybc(rs.getInt("pybc"));
+				sReport.setLjbc(rs.getInt("ljbc"));
+				sReport.setZrwbc(rs.getInt("zrwbc"));
+				sReport.setOther(rs.getString("other"));
+				return sReport;
+			}
+		});
+		List<Map<String, Object>> lMap = new ArrayList<Map<String, Object>>();
+		int sjyybc = 0;
+		int sjksbc = 0;
+		int zbc = 0;
+		int sddfbc = 0;
+		int zddfbc = 0;
+		int wqwxhbc = 0;
+		int bfwxhbc = 0;
+		int pybc = 0;
+		int ljbc = 0;
+		int zrwbc = 0;
+		for(ScheduleCorrectionReport sReport:list) {
+			Map<String, Object> resMap = new HashMap<String, Object>();
+			resMap.put("gsName", sReport.getCompanyName());
+			resMap.put("fgsName", sReport.getSubCompanyName());
+			resMap.put("xlName", sReport.getLineName());
+			resMap.put("sjyybc", sReport.getSjyybc());
+			resMap.put("sjksbc", sReport.getSjksbc());
+			resMap.put("zbc", sReport.getZbc());
+			resMap.put("sddfbc", sReport.getSddfbc());
+			resMap.put("zddfbc", sReport.getZddfbc());
+			resMap.put("wqwxhbc", sReport.getWqwxhbc());
+			resMap.put("bfwxhbc", sReport.getBfwxhbc());
+			resMap.put("pybc", sReport.getPybc());
+			resMap.put("ljbc", sReport.getLjbc());
+			resMap.put("zrwbc", sReport.getZrwbc());
+			resMap.put("other", sReport.getOther());
+			lMap.add(resMap);
+			sjyybc = sjyybc + sReport.getSjyybc();
+			sjksbc = sjksbc + sReport.getSjksbc();
+			zbc = zbc + sReport.getZbc();
+			sddfbc = sddfbc + sReport.getSddfbc();
+			zddfbc = zddfbc + sReport.getZddfbc();
+			wqwxhbc = wqwxhbc + sReport.getWqwxhbc();
+			bfwxhbc = bfwxhbc + sReport.getBfwxhbc();
+			pybc = pybc + sReport.getPybc();
+			ljbc = ljbc + sReport.getLjbc();
+			zrwbc = zrwbc + sReport.getZrwbc();
+		}
+		Map<String, Object> resMap = new HashMap<String, Object>();
+		resMap.put("xlName", "合计");
+		resMap.put("sjyybc", sjyybc);
+		resMap.put("sjksbc", sjksbc);
+		resMap.put("zbc", zbc);
+		resMap.put("sddfbc", sddfbc);
+		resMap.put("zddfbc", zddfbc);
+		resMap.put("wqwxhbc", wqwxhbc);
+		resMap.put("bfwxhbc", bfwxhbc);
+		resMap.put("pybc", pybc);
+		resMap.put("ljbc", ljbc);
+		resMap.put("zrwbc", zrwbc);
+		resMap.put("other", null);
+		lMap.add(resMap);
+		return lMap;
+	}
 }
 class AccountMap implements Comparator<Map<String, Object>>{
@@ -30,6 +30,8 @@ public interface CulateMileageService {
 	 int culateFzbc(List<ScheduleRealInfo> lists,String item);
+	 Map<String, Object> culateDjg(List<ScheduleRealInfo> lists,String line);
+	 
 	 //以下计算方法供新报表使用
@@ -17,6 +17,8 @@ public interface ReportService {
 	List<ArrivalInfo> queryListClzd(String line,String zd,String zdlx,String fcsj,String ddsj);
 	List<StationRoute> queryStrinon(String line,int zd);
 	List<Map<String, Object>> queryInOutStrtion(String line,String date,int zd,String lzsj);
+	
+	List<Map<String, Object>> queryInOutStrtions(String line,String date,int zd,String lzsj);
 	List<Map<String, String>>  sreachZd(String line,int zdlx);
 	List<Object[]> historyMessageCount(String line, String date, String code);
 package com.bsth.service.report.impl;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.text.DecimalFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -9,18 +14,26 @@ import java.util.Map;
 import java.util.Set;
 import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.RowMapper;
 import org.springframework.stereotype.Service;
+import com.bsth.data.BasicData;
 import com.bsth.entity.realcontrol.ChildTaskPlan;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.entity.sys.Interval;
 import com.bsth.service.report.CulateMileageService;
 import com.bsth.util.Arith;
+import com.bsth.util.ComparableChild;
 import com.bsth.util.ComparableJob;
+import com.bsth.util.ReportUtils;
 import com.google.common.util.concurrent.AbstractScheduledService.Scheduler;
 @Service
 public class CulateMileageServiceImpl  implements CulateMileageService{
-
+	@Autowired
+	JdbcTemplate jdbcTemplate;
 	private static long zgf1 = 6 * 60 + 31,
 			zgf2 = 8 * 60 + 30,
 			wgf1 = 16 * 60 + 1, 
@@ -943,6 +956,214 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 		}
 		return kfks;
 	}
+
+	@Override
+	public Map<String, Object> culateDjg(List<ScheduleRealInfo> lists, String line) {
+		// TODO Auto-generated method stub
+		
+
+		// TODO Auto-generated method stub
+		List<ScheduleRealInfo> list=lists;
+		Map<String, Object> m=new HashMap<String,Object>();
+		SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm");
+//			 Collections.sort(listInfo,new ComparableAcuals());
+			 //查询所有线路
+			 String xlSql="select line_code,spac_grade from bsth_c_line"
+			 		+ "  where line_code ='"+line+"'";
+			 
+			List<Map<String, Object>> xlList=jdbcTemplate.query(xlSql, new RowMapper<Map<String, Object>>() {
+			@Override
+			public Map<String, Object> mapRow(ResultSet arg0, int arg1) throws SQLException {
+				Map<String, Object> map=new HashMap<String,Object>();
+				map.put("line",arg0.getString("line_code"));
+				map.put("grade", arg0.getString("spac_grade"));
+				return map;
+			}
+		});
+			//查询大间隔时间
+			String djgSql="select * from bsth_c_interval";
+			List<Interval> djgList=jdbcTemplate.query(djgSql, new RowMapper<Interval>() {
+			@Override
+			public Interval mapRow(ResultSet arg0, int arg1) throws SQLException {
+				Interval m=new Interval();
+				m.setLevel(arg0.getString("level"));
+				m.setPeak(arg0.getInt("peak"));
+				m.setTrough(arg0.getInt("trough"));
+				return m;
+			}
+		});
+			
+			 for (int i = 0; i < xlList.size(); i++) {
+				 String lineCode=xlList.get(i).get("line").toString();
+				 String grade =xlList.get(i).get("grade")==null?"1":xlList.get(i).get("grade").toString();
+				 int peak=0;
+				 int trough=0;
+				 for (int j = 0; j < djgList.size(); j++) {
+					Interval il=djgList.get(j);
+					if(il.getLevel().equals(grade)){
+						peak=il.getPeak();
+						trough=il.getTrough();
+						continue;
+					}
+			 }
+				List<ScheduleRealInfo> listInfo=new ArrayList<ScheduleRealInfo>();
+				 for (int j = 0; j < list.size(); j++) {
+					ScheduleRealInfo sinfo=list.get(j);
+					try {
+					if(sinfo.getXlBm().equals(lineCode)){
+						ScheduleRealInfo s=checkBc(sinfo);
+						String fcsj=s.getFcsjActual()==null?"":s.getFcsjActual();
+						if(!fcsj.equals("")){
+							Long fcsjAcual = sdf.parse(s.getRealExecDate() + " " + s.getFcsjActual()).getTime();
+							s.setFcsjActualTime(fcsjAcual);
+							s.setFcsjActual(fcsj);
+							listInfo.add(s);
+						}
+						
+					}
+					} catch (ParseException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+			 }
+				 
+			 if(listInfo.size()>0){
+				  m=listDjg(peak,trough,listInfo,grade);
+			 }else{
+				 m.put("djgcsz", "0");
+				 m.put("djgcsw", "0");
+				 m.put("djgcsq", "0");
+				 m.put("djgsj", "0");
+			 }
+		}
+		return m;
+	
+	}
+	
+	public ScheduleRealInfo checkBc(ScheduleRealInfo s){
+		//如果班次有子任务 且 子任务中有属于营运的。把该子任务的发车时间设置成班次的发车时间
+		String fcsj=s.getFcsjActual()==null?"":s.getFcsjActual();
+		if(fcsj.equals("")){
+			Set<ChildTaskPlan> childTaskPlans = s.getcTasks();
+			if(!childTaskPlans.isEmpty()){
+					List<ChildTaskPlan> listit=new ArrayList<ChildTaskPlan>(childTaskPlans);
+		       	    Collections.sort(listit, new ComparableChild());
+		       	    for (int i = 0; i < listit.size(); i++) {
+		       	    	ChildTaskPlan c=listit.get(i);
+		       	    	if(!c.isDestroy()){
+		       	    		if(c.getMileageType().equals("service")){
+		       	    			s.setFcsjActual(c.getStartDate());
+								break;
+							}
+							
+		       	    	}
+					}
+			}
+		}
+		return s;
+	}
+	public Map<String, Object> listDjg(int peak,int trough,List<ScheduleRealInfo> listInfo,String grade){
+		DecimalFormat  df   = new DecimalFormat("#0.00"); 
+		Collections.sort(listInfo,new ComparableAcuals());
+		List<ScheduleRealInfo> listInfo0=new ArrayList<ScheduleRealInfo>();
+		List<ScheduleRealInfo> listInfo1=new ArrayList<ScheduleRealInfo>();
+		for (int i = 0; i < listInfo.size(); i++) {
+			ScheduleRealInfo s=listInfo.get(i);
+			if(s.getXlDir().equals("0")){
+				listInfo0.add(s);
+			}else{
+				listInfo0.add(s);
+			}
+			
+		}
+		Map<String, Object> map=new HashMap<String,Object>();
+		int djgcsz=0;
+		int djgcsw=0;
+		int djgcsq=0;
+		long djcsj=0l;
+		for (int i = 0; i < listInfo0.size(); i++) {
+			ScheduleRealInfo s=listInfo.get(i);
+			Long fcsjTime=s.getFcsjActualTime();
+			String time=s.getFcsjActual();
+			String[] fcsjStr = time.split(":");
+			long fcsj= Long.parseLong(fcsjStr[0])*60+Long.parseLong(fcsjStr[1]);
+			if(i<listInfo.size()-1){
+				Long djg=0l;
+				Long fscjNext=listInfo.get(i+1).getFcsjActualTime();
+				if((fcsj>=zgf1&&fcsj<=zgf2)){
+					djg = (long) (peak*60*1000);
+					if(fscjNext-fcsjTime>djg){
+						djgcsz ++;
+						djgcsq ++;
+						if(fscjNext-fcsjTime>djcsj){
+							djcsj=(fscjNext-fcsjTime)/1000;
+						}
+					}
+				}else if((fcsj>=wgf1&&fcsj<=wgf2)){
+					djg = (long) (peak*60*1000);
+					if(fscjNext-fcsjTime>djg){
+						djgcsw ++;
+						djgcsq ++;
+						if(fscjNext-fcsjTime>djcsj){
+							djcsj=(fscjNext-fcsjTime)/1000;
+						}
+					}
+				}else{
+					djg = (long) (trough*60*1000);
+					if(fscjNext-fcsjTime>djg){
+						djgcsq ++;
+						if(fscjNext-fcsjTime>djcsj){
+							djcsj=(fscjNext-fcsjTime)/1000;
+						}
+					}
+				}
+			}
+		}
+		for (int i = 0; i < listInfo1.size(); i++) {
+			ScheduleRealInfo s=listInfo.get(i);
+			Long fcsjTime=s.getFcsjActualTime();
+			String time=s.getFcsjActual();
+			String[] fcsjStr = time.split(":");
+			long fcsj= Long.parseLong(fcsjStr[0])*60+Long.parseLong(fcsjStr[1]);
+			if(i<listInfo.size()-1){
+				Long djg=0l;
+				Long fscjNext=listInfo.get(i+1).getFcsjActualTime();
+				if(fcsj>=zgf1&&fcsj<=zgf2){
+					djg = (long) (peak*60*1000);
+					if(fscjNext-fcsjTime>djg){
+						djgcsz ++;
+						djgcsq ++;
+						if(fscjNext-fcsjTime>djcsj){
+							djcsj=(fscjNext-fcsjTime)/1000;
+						}
+					}
+				}else if(fcsj>=wgf1&&fcsj<=wgf2){
+					djg = (long) (peak*60*1000);
+					if(fscjNext-fcsjTime>djg){
+						djgcsw ++;
+						djgcsq ++;
+						if(fscjNext-fcsjTime>djcsj){
+							djcsj=(fscjNext-fcsjTime)/1000;
+						}
+					}
+				}else{
+					djg = (long) (trough*60*1000);
+					if(fscjNext-fcsjTime>djg){
+						djgcsq ++;
+						if(fscjNext-fcsjTime>djcsj){
+							djcsj=(fscjNext-fcsjTime)/1000;
+						}
+					}
+				}
+			}
+		}
+		
+		map.put("djgcsz", djgcsz);
+		map.put("djgcsw", djgcsw);
+		map.put("djgcsq", djgcsq);
+		map.put("djgsj", djcsj);
+		return map;
+	}
 }