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

into minhang

Merge branch 'minhang' of git@192.168.168.201:panzhaov5/bsth_control.git
into minhang
zb
2 parents c2dd7da4 e87ba568
Showing 59 changed files with 2288 additions and 943 deletions
src/main/java/com/bsth/controller/gps/GpsController.java
src/main/java/com/bsth/controller/realcontrol/BasicDataController.java
src/main/java/com/bsth/controller/schedule/TrafficManageController.java
src/main/java/com/bsth/data/BasicData.java
src/main/java/com/bsth/data/Station2ParkBuffer.java
src/main/java/com/bsth/data/gpsdata/recovery/GpsDataRecovery.java
src/main/java/com/bsth/data/pilot80/PilotReport.java
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/java/com/bsth/data/schedule/edit_logs/ScheduleModifyLogger.java
src/main/java/com/bsth/data/schedule/edit_logs/entity/EditType.java
src/main/java/com/bsth/data/schedule/edit_logs/loggers/AfterwardsLogger.java
src/main/java/com/bsth/data/schedule/edit_logs/service/SchEditInfoServiceImpl.java
src/main/java/com/bsth/data/utils/CustomStringUtils.java
src/main/java/com/bsth/entity/directive/D80.java
src/main/java/com/bsth/entity/realcontrol/ChildTaskPlan.java
src/main/java/com/bsth/entity/realcontrol/StationToPark.java
src/main/java/com/bsth/repository/LineRepository.java
src/main/java/com/bsth/repository/StationRepository.java
src/main/java/com/bsth/repository/StationRouteRepository.java
src/main/java/com/bsth/repository/realcontrol/ScheduleRealInfoRepository.java
@@ -3,8 +3,10 @@ package com.bsth.controller.gps;
 import com.bsth.data.BasicData;
 import com.bsth.data.gpsdata.GpsEntity;
 import com.bsth.data.gpsdata.GpsRealData;
+import com.bsth.entity.excep.Speeding;
 import com.bsth.service.gps.GpsService;
 import com.bsth.service.gps.entity.GpsSpeed;
+import com.bsth.util.PageObject;
 import com.google.common.base.Splitter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -95,11 +97,12 @@ public class GpsController {
     /**
      * gps补全
+     * type 0 : 实时GPS 1：走补传
      * @return
      */
     @RequestMapping(value = "/gpsCompletion", method = RequestMethod.POST)
-    public Map<String, Object> gpsCompletion(@RequestParam long schId) {
-        return gpsService.gpsCompletion(schId);
+    public Map<String, Object> gpsCompletion(@RequestParam long schId, @RequestParam int type) {
+        return gpsService.gpsCompletion(schId, type);
     }
     /**
@@ -191,4 +194,13 @@ public class GpsController {
     	return listGpsSpeed;
     }
+	@RequestMapping(value = "/pagequery",method = RequestMethod.GET)
+	public PageObject<GpsSpeed> pagequery(@RequestParam Map<String, Object> map){
+		PageObject<GpsSpeed> pageObject = null;
+		map.put("curPage", map.get("page").toString());
+		map.put("pageData","10");
+		pageObject=gpsService.Pagequery(map);
+		return pageObject;
+	}
+    
 }
@@ -4,7 +4,9 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.serializer.PropertyFilter;
 import com.bsth.common.ResponseCode;
 import com.bsth.data.BasicData;
+import com.bsth.data.Station2ParkBuffer;
 import com.bsth.entity.Line;
+import com.bsth.entity.realcontrol.StationToPark;
 import com.google.common.base.Splitter;
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.BiMap;
@@ -29,6 +31,9 @@ public class BasicDataController {
 	BasicData basicData;
 	Logger logger = LoggerFactory.getLogger(this.getClass());
+
+	@Autowired
+	Station2ParkBuffer station2ParkBuffer;
 	@RequestMapping("/cars")
 	public Iterable<String> findAllNbbm(Map<String, Object> map){
@@ -180,4 +185,25 @@ public class BasicDataController {
 		return rs;
 	}
+
+	/**
+	 * 获取站点和停车场对照表
+	 * @param idx
+	 * @return
+	 */
+	@RequestMapping("/station2ParkData")
+	public Map<String, Collection<StationToPark>> findStation2ParkData(@RequestParam String idx){
+		List<String> lines = Splitter.on(",").splitToList(idx);
+		ArrayListMultimap<String, StationToPark> rs = ArrayListMultimap.create();
+
+		for(String lineCode : lines){
+			rs.putAll(lineCode, Station2ParkBuffer.get(lineCode));
+		}
+		return rs.asMap();
+	}
+
+	@RequestMapping(value = "/deleteStation2Park", method = RequestMethod.POST)
+	public Map<String, Object> deleteStation2Park(@RequestParam String lineCode,@RequestParam Integer id){
+		return station2ParkBuffer.delete(lineCode, id);
+	}
 }
@@ -8,8 +8,6 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
-import java.util.Map;
-
 /**
  *
  * @author BSTH
@@ -24,9 +22,9 @@ public class TrafficManageController {
     @RequestMapping(value = "/setXL", method = RequestMethod.GET)
-    public String setXL(@RequestParam Map<String, Object> param) throws Exception {
+    public String setXL(@RequestParam("ids") String ids) throws Exception {
         try {
-            return trManageService.setXL(param);
+            return trManageService.setXL(ids);
         } catch (Exception exp) {
             throw new Exception(exp.getCause());
         }
@@ -134,6 +134,9 @@ public class BasicData implements CommandLineRunner {
         @Autowired
         GeoCacheData geoCacheData;
+        @Autowired
+        Station2ParkBuffer station2ParkBuffer;
+
         @Override
         public void run() {
@@ -160,6 +163,7 @@ public class BasicData implements CommandLineRunner {
                 loadBusinessInfo();
                 geoCacheData.loadData();
+                station2ParkBuffer.saveAll();
                 logger.info("加载基础数据成功！，");
             } catch (Exception e) {
                 logger.error("加载基础数据时出现异常，", e);
+package com.bsth.data;
+
+import com.bsth.common.ResponseCode;
+import com.bsth.entity.realcontrol.ChildTaskPlan;
+import com.bsth.entity.realcontrol.StationToPark;
+import com.bsth.repository.realcontrol.StationToParkRepository;
+import com.bsth.util.Arith;
+import com.google.common.collect.ArrayListMultimap;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.stereotype.Component;
+
+import java.util.*;
+
+/**
+ * 站到场 历时、公里 数据缓存
+ * Created by panzhao on 2017/7/10.
+ */
+@Component
+public class Station2ParkBuffer implements CommandLineRunner {
+
+    @Autowired
+    StationToParkRepository stationToParkRepository;
+
+    private static ArrayListMultimap listMultimap;
+
+    private static Set<StationToPark> pstBuff;
+
+    static Logger log = LoggerFactory.getLogger(Station2ParkBuffer.class);
+
+    @Override
+    public void run(String... strings) throws Exception {
+        listMultimap = ArrayListMultimap.create();
+        pstBuff = new HashSet<>();
+        Iterator<StationToPark> iterator = stationToParkRepository.findAll().iterator();
+        StationToPark stp;
+        while (iterator.hasNext()) {
+            stp = iterator.next();
+            listMultimap.put(stp.getLineCode(), stp);
+        }
+    }
+
+    public static List<StationToPark> get(String lineCode) {
+        return listMultimap.get(lineCode);
+    }
+
+    public static StationToPark get(String lineCode, String sName, String eName) {
+        List<StationToPark> list = get(lineCode);
+        StationToPark stp = null;
+        for (StationToPark s : list) {
+            if (s.getStationName().equals(sName) && s.getParkName().equals(eName)) {
+                stp = s;
+                break;
+            }
+        }
+        return stp;
+    }
+
+    private static DateTimeFormatter fmtHHmm = DateTimeFormat.forPattern("HH:mm");
+
+    public static void put(ChildTaskPlan ctask) {
+        try{
+            String type2 = ctask.getType2();
+            String lineCode = ctask.getSchedule().getXlBm(), sName, eName;
+
+            if (type2.equals("2")) {
+                sName = ctask.getStartStationName();
+                eName = ctask.getEndStationName();
+            } else if (type2.equals("3")) {
+                eName = ctask.getStartStationName();
+                sName = ctask.getEndStationName();
+            } else
+                return;
+
+            Float time = calcMinute(ctask);
+            Float mileage = ctask.getMileage();
+
+            StationToPark stp = get(lineCode, sName, eName);
+            if (stp == null) {
+                stp = new StationToPark();
+                stp.setLineCode(lineCode);
+                stp.setStationName(sName);
+                stp.setParkName(eName);
+                listMultimap.put(lineCode, stp);
+            }
+
+            if (type2.equals("2")) {
+                stp.setTime1(time);
+                stp.setMileage1(mileage);
+            } else {
+                stp.setTime2(time);
+                stp.setMileage2(mileage);
+            }
+
+            pstBuff.add(stp);
+        }catch (Exception e){
+            log.error("", e);
+        }
+    }
+
+    public static Float calcMinute(ChildTaskPlan ctask) {
+        long t = 0;
+
+        try {
+            long st = fmtHHmm.parseMillis(ctask.getStartDate());
+            long et = fmtHHmm.parseMillis(ctask.getEndDate());
+
+            t = et - st;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return Float.parseFloat(String.valueOf(Arith.div(Arith.div(t, 1000), 60)));
+    }
+
+    public void saveAll(){
+        if(pstBuff.size()==0)
+            return;
+        Set<StationToPark> pstBuffCopy =  pstBuff;
+        pstBuff = new HashSet<>();
+        //持久化到数据库
+        stationToParkRepository.save(pstBuffCopy);
+    }
+
+    public Map<String, Object> delete(String lineCode, Integer id) {
+        Map<String, Object> rs = new HashMap<>();
+        try {
+            List<StationToPark> list = listMultimap.get(lineCode);
+
+            StationToPark stp = null;
+            for(StationToPark temp : list){
+                if(temp.getId().equals(id)){
+                    stp=temp;
+                    break;
+                }
+            }
+
+            if(stp != null){
+                listMultimap.remove(lineCode, stp);
+                stationToParkRepository.delete(id);
+                rs.put("status", ResponseCode.SUCCESS);
+            }
+            else{
+                rs.put("status", ResponseCode.SUCCESS);
+                rs.put("msg", "操作失败，可能数据已经被删除！");
+            }
+
+        }catch (Exception e){
+            rs.put("status", ResponseCode.ERROR);
+            rs.put("msg", e.getMessage());
+            log.error("", e);
+        }
+        return rs;
+    }
+}
@@ -84,7 +84,7 @@ public class GpsDataRecovery implements ApplicationContextAware {
         Calendar calendar = Calendar.getInstance();
         int dayOfYear = calendar.get(Calendar.DAY_OF_YEAR);
-        String sql = "select DEVICE_ID,LAT,LON,TS,SPEED_GPS,LINE_ID,SERVICE_STATE from bsth_c_gps_info where days_year=173";// + dayOfYear;
+        String sql = "select DEVICE_ID,LAT,LON,TS,SPEED_GPS,LINE_ID,SERVICE_STATE from bsth_c_gps_info where days_year=" + dayOfYear;
         JdbcTemplate jdbcTemplate = new JdbcTemplate(DBUtils_MS.getDataSource());
         List<GpsEntity> list =
@@ -2,7 +2,6 @@ package com.bsth.data.pilot80;
 import com.bsth.data.BasicData;
 import com.bsth.data.LineConfigData;
-import com.bsth.data.gpsdata.GpsEntity;
 import com.bsth.data.gpsdata.GpsRealData;
 import com.bsth.data.msg_queue.DirectivePushQueue;
 import com.bsth.data.schedule.DayOfSchedule;
@@ -16,7 +15,6 @@ import com.bsth.repository.directive.D80Repository;
 import com.bsth.repository.directive.DC0A4Repository;
 import com.bsth.service.directive.DirectiveService;
 import com.bsth.websocket.handler.SendUtils;
-import com.google.common.collect.ArrayListMultimap;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -26,289 +24,278 @@ import org.springframework.stereotype.Component;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import java.util.concurrent.ConcurrentHashMap;
 /**
- * 
- * @ClassName: PilotReport 
- * @Description: TODO(设备80协议上报处理)
  * @author PanZhao
- * @date 2016年8月14日 下午11:37:51 
- *
+ * @ClassName: PilotReport
+ * @Description: TODO(设备80协议上报处理)
+ * @date 2016年8月14日 下午11:37:51
  */
 @Component
 public class PilotReport {
-	
-	@Autowired
-	D80Repository d80Repository;
-	@Autowired
-	DayOfSchedule dayOfSchedule;
-	@Autowired
-	LineConfigData lineConfigData;
-	@Autowired
-	DirectiveService directiveService;
-	@Autowired
-	GpsRealData gpsRealData;
-	@Autowired
-	SendUtils sendUtils;
-
-	@Autowired
-	DC0A4Repository dc0A4Repository;
-
-	private static ArrayListMultimap<String, D80> d80MultiMap;
-	
-	Logger logger = LoggerFactory.getLogger(PilotReport.class);
-	
-	static{
-		d80MultiMap = ArrayListMultimap.create();
-	}
-	
-	public void report(D80 d80){
-		//入库
-		d80Repository.save(d80);
-		//入缓存
-		d80MultiMap.put(d80.getData().getLineId().toString(), d80);
-		
-		String nbbm = BasicData.deviceId2NbbmMap.get(d80.getDeviceId());
-		//处理
-		switch (d80.getData().getRequestCode()) {
-		case 0xA3:
-			//出场请求
-			ScheduleRealInfo outSch = dayOfSchedule.searchNearByBcType(nbbm, "out");
-			//如果有对应出场班次
-			if(outSch != null){
-				//没有计划里程的出场班次，出场既是首发站，发送下一班次的营运指令
-				if(outSch.getJhlc() == null)
-					outSch = dayOfSchedule.next(outSch);
-				
-				//下发调度指令
-				DirectivePushQueue.put6002(outSch, dayOfSchedule.doneSum(nbbm), "请出@系统");
-				//directiveService.send60Dispatch(outSch, dayOfSchedule.doneSum(nbbm), "请出@系统");
-				//下发线路切换指令
-				DirectivePushQueue.put64(outSch.getClZbh(), outSch.getXlBm(), "请出@系统");
-				//directiveService.lineChange(outSch.getClZbh(), outSch.getXlBm(), "请出@系统");
-			}else
-				d80.setRemarks("没有出场计划");
-			
-			break;
-		
-		case 0xA5:
-			//进场请求
-			//ScheduleRealInfo inSch = dayOfSchedule.nextByBcType(nbbm, "in");
-			//如果有对应出场班次
-			//if(inSch != null){
-				/*d80.setRemarks("计划进场时间：" + inSch.getDfsj());
-				//当前GPS位置
-				GpsEntity gps = gpsRealData.get(d80.getDeviceId());
-				if(null != gps)
-					d80.addRemarks("<br> 位置：" + coordHtmlStr(gps));*/
-			//}/*else
-			//	d80.setRemarks("没有进场计划");*/
-			break;
-		}
-		
-		//推送到页面
-		sendUtils.send80ToPage(d80);
-	}
-
-	public void report(DC0_A4 c0a4){
-		String deviceId = c0a4.getData().getDeviceId();
-		if(StringUtils.isNotEmpty(deviceId))
-			c0a4.setId(deviceId);
-
-		//入库
-		dc0A4Repository.save(c0a4);
-	}
-	
-	/**
-	 * 
-	 * @Title: reply 
-	 * @Description: TODO(调度员回复) 
-	 */
-	public void reply(D80 d80){
-		String nbbm = BasicData.deviceId2NbbmMap.get(d80.getDeviceId());
-		Short reqCode = d80.getData().getRequestCode();
-		//默认短语回复
-		//defaultReply(nbbm, reqCode, d80.getConfirmRs() == 0?true:false);
-		
-		switch (reqCode) {
-		case 0xA3:
-			//出场请求回复
-			applyOutReply(d80);
-			break;
-		case 0xA5:
-			//进场请求回复
-			applyInReply(d80);
-			break;
-		}
-	}
-	
-	/**
-	 * 
-	 * @Title: applyOutReply 
-	 * @Description: TODO(出场请求回复) 
-	 */
-	public void applyOutReply(D80 d80){
-		//同意
-		if(d80.getConfirmRs() == 0){
-			String nbbm = BasicData.deviceId2NbbmMap.get(d80.getDeviceId());
-
-			ScheduleRealInfo sch = dayOfSchedule.nextByBcType(nbbm, "out");
-			if(null == sch)
-				return;
-			
-			LineConfig conf = lineConfigData.get(sch.getXlBm());
-			if(conf.getOutConfig() == 1){
-				//为相关班次写入请求出场时间
-				sch.setFcsjActualAll(d80.getTimestamp());
-				
-				dayOfSchedule.save(sch);
-				//通知页面
-				sendUtils.refreshSch(sch);
-			}
-		}
-	}
-	
-	/**
-	 * 
-	 * @Title: applyInReply 
-	 * @Description: TODO(进场请求回复) 
-	 */
-	public void applyInReply(D80 d80){
-		//同意
-		if(d80.getConfirmRs() == 0){
-			String nbbm = BasicData.deviceId2NbbmMap.get(d80.getDeviceId());
-			
-			ScheduleRealInfo sch = dayOfSchedule.nextByBcType(nbbm, "in");
-			if(null == sch)
-				return;
-			
-			LineConfig conf = lineConfigData.get(sch.getXlBm());
-			if(conf.getOutConfig() == 1){
-				//为相关班次写入进场时间
-				sch.setZdsjActualAll(d80.getTimestamp());
-				
-				//没有里程的进场班次
-				if(isEmpty(sch.getBcsj()) && isEmpty(sch.getJhlc()))
-					sch.setFcsjActualAll(d80.getTimestamp());
-					
-				dayOfSchedule.save(sch);
-				//通知页面
-				sendUtils.refreshSch(sch);
-			}
-		}
-	}
-
-	public boolean isEmpty(Integer v){
-		return v == null || v.equals(0);
-	}
-
-	public boolean isEmpty(Double v){
-		return v == null || v.equals(0);
-	}
-	
-	public void defaultReply(String nbbm, short requestCode, boolean agree){
-		Line line = BasicData.nbbm2LineMap.get(nbbm);
-		String lineCode = null;
-		
-		if(line != null)
-			lineCode = line.getLineCode();
-		else{
-			try{
-				lineCode = gpsRealData.get(BasicData.deviceId2NbbmMap.inverse().get(nbbm)).getLineId().toString();
-			}catch(Exception e){
-				logger.error("", e);
-			}
-		}
-		
-		if(null == lineCode)
-			return;
-		
-		LineConfig conf = lineConfigData.get(lineCode);
-		D80ReplyTemp temp = conf.findByCode(requestCode);
-		
-		if(null == temp)
-			return;
-		
-		String text;
-		if(agree)
-			text = temp.getAgreeText();
-		else
-			text = temp.getRejectText();
-		
-		directiveService.send60Phrase(nbbm, text, "系统");
-	}
-	
-	/**
-	 * 
-	 * @Title: resumeOperation 
-	 * @Description: TODO(恢复营运) 
-	 */
-	public void resumeOperation(D80 d80){
-		
-	}
-	
-	/**
-	 * 
-	 * @Title: applyTiaodang 
-	 * @Description: TODO(申请调档) 
-	 */
-	public void applyTiaodang(D80 d80){
-		
-	}
-	
-	/**
-	 * 
-	 * @Title: unconfirmed80 
-	 * @Description: TODO(根据lineCode 获取未处理的80数据) 
-	 */
-	public List<D80> unconfirmed80(Integer lineCode){
-		List<D80> lineAll = d80MultiMap.get(lineCode.toString())
-				,rs = new ArrayList<>();
-		
-		for(D80 d80 : lineAll)
-			if(!d80.isConfirm())
-				rs.add(d80);
-		
-		return rs;
-	}
-	
-	public D80 findById(int id){
-		Collection<D80> all = d80MultiMap.values();
-		
-		for(D80 d80 : all){
-			if(d80.getId() == id)
-				return d80;
-		}
-		
-		return null;
-	}
-	
-	public String coordHtmlStr(GpsEntity gps){
-		
-		return "<span class=\"nt-coord\" data-lon=\""+gps.getLon()+"\" data-lat=\""+gps.getLat()+"\"></span>";
-	}
-	
-	public Collection<D80> findAll(){
-		return d80MultiMap.values();
-	}
-	
-	public void clear(String lineCode){
-		logger.info("清除 80数据 before: " + d80MultiMap.size());
-		d80MultiMap.removeAll(lineCode);
-		logger.info("清除 80数据 after: " + d80MultiMap.size());
-	}
-
-	public Collection<? extends D80> findByCar(String nbbm) {
-		List<D80> rs = new ArrayList<>();
-		String deviceId = BasicData.deviceId2NbbmMap.inverse().get(nbbm);
-		if(null == deviceId)
-			return rs;
-		
-		Collection<D80> all = findAll();
-		for(D80 d80 : all){
-			if(d80.getDeviceId().equals(deviceId))
-				rs.add(d80);
-		}
-		return rs;
-	}
+
+    @Autowired
+    D80Repository d80Repository;
+    @Autowired
+    DayOfSchedule dayOfSchedule;
+    @Autowired
+    LineConfigData lineConfigData;
+    @Autowired
+    DirectiveService directiveService;
+    @Autowired
+    GpsRealData gpsRealData;
+    @Autowired
+    SendUtils sendUtils;
+
+    @Autowired
+    DC0A4Repository dc0A4Repository;
+
+    //private static ArrayListMultimap<String, D80> d80MultiMap;
+
+    private static ConcurrentHashMap<Integer, D80> d80Maps;
+
+    Logger logger = LoggerFactory.getLogger(PilotReport.class);
+
+    static {
+        //d80MultiMap = ArrayListMultimap.create();
+        d80Maps = new ConcurrentHashMap<>();
+    }
+
+    public void report(D80 d80) {
+        if (d80 == null)
+            return;
+        try {
+            //入库
+            d80Repository.save(d80);
+            //入缓存
+            d80Maps.put(d80.getId(), d80);
+            //d80MultiMap.put(d80.getData().getLineId().toString(), d80);
+
+            String nbbm = BasicData.deviceId2NbbmMap.get(d80.getDeviceId());
+            //处理
+            switch (d80.getData().getRequestCode()) {
+                //出场请求
+                case 0xA3:
+                    ScheduleRealInfo outSch = dayOfSchedule.searchNearByBcType(nbbm, "out");
+                    //如果有对应出场班次
+                    if (outSch != null) {
+                        //没有计划里程的出场班次，出场既是首发站，发送下一班次的营运指令
+                        if (outSch.getJhlc() == null)
+                            outSch = dayOfSchedule.next(outSch);
+
+                        //下发调度指令
+                        DirectivePushQueue.put6002(outSch, dayOfSchedule.doneSum(nbbm), "请出@系统");
+                        //下发线路切换指令
+                        DirectivePushQueue.put64(outSch.getClZbh(), outSch.getXlBm(), "请出@系统");
+                    }
+                    break;
+            }
+
+            //推送到页面
+            sendUtils.send80ToPage(d80);
+        } catch (Exception e) {
+            logger.error("", e);
+        }
+    }
+
+    public void report(DC0_A4 c0a4) {
+        String deviceId = c0a4.getData().getDeviceId();
+        if (StringUtils.isNotEmpty(deviceId))
+            c0a4.setId(deviceId);
+
+        //入库
+        dc0A4Repository.save(c0a4);
+    }
+
+    /**
+     * @Title: reply
+     * @Description: TODO(调度员回复)
+     */
+    public void reply(D80 d80) {
+        String nbbm = BasicData.deviceId2NbbmMap.get(d80.getDeviceId());
+        Short reqCode = d80.getData().getRequestCode();
+        //默认短语回复
+        //defaultReply(nbbm, reqCode, d80.getConfirmRs() == 0?true:false);
+
+        switch (reqCode) {
+            case 0xA3:
+                //出场请求回复
+                applyOutReply(d80);
+                break;
+            case 0xA5:
+                //进场请求回复
+                applyInReply(d80);
+                break;
+        }
+    }
+
+    /**
+     * @Title: applyOutReply
+     * @Description: TODO(出场请求回复)
+     */
+    public void applyOutReply(D80 d80) {
+        //同意
+        if (d80.getConfirmRs() == 0) {
+            String nbbm = BasicData.deviceId2NbbmMap.get(d80.getDeviceId());
+
+            ScheduleRealInfo sch = dayOfSchedule.nextByBcType(nbbm, "out");
+            if (null == sch)
+                return;
+
+            LineConfig conf = lineConfigData.get(sch.getXlBm());
+            if (conf.getOutConfig() == 1) {
+                //为相关班次写入请求出场时间
+                sch.setFcsjActualAll(d80.getTimestamp());
+
+                dayOfSchedule.save(sch);
+                //通知页面
+                sendUtils.refreshSch(sch);
+            }
+        }
+    }
+
+    /**
+     * @Title: applyInReply
+     * @Description: TODO(进场请求回复)
+     */
+    public void applyInReply(D80 d80) {
+        //同意
+        if (d80.getConfirmRs() == 0) {
+            String nbbm = BasicData.deviceId2NbbmMap.get(d80.getDeviceId());
+
+            ScheduleRealInfo sch = dayOfSchedule.nextByBcType(nbbm, "in");
+            if (null == sch)
+                return;
+
+            LineConfig conf = lineConfigData.get(sch.getXlBm());
+            if (conf.getOutConfig() == 1) {
+                //为相关班次写入进场时间
+                sch.setZdsjActualAll(d80.getTimestamp());
+
+                //没有里程的进场班次
+                if (isEmpty(sch.getBcsj()) && isEmpty(sch.getJhlc()))
+                    sch.setFcsjActualAll(d80.getTimestamp());
+
+                dayOfSchedule.save(sch);
+                //通知页面
+                sendUtils.refreshSch(sch);
+            }
+        }
+    }
+
+    public boolean isEmpty(Integer v) {
+        return v == null || v.equals(0);
+    }
+
+    public boolean isEmpty(Double v) {
+        return v == null || v.equals(0);
+    }
+
+    public void defaultReply(String nbbm, short requestCode, boolean agree) {
+        Line line = BasicData.nbbm2LineMap.get(nbbm);
+        String lineCode = null;
+
+        if (line != null)
+            lineCode = line.getLineCode();
+        else {
+            try {
+                lineCode = gpsRealData.get(BasicData.deviceId2NbbmMap.inverse().get(nbbm)).getLineId().toString();
+            } catch (Exception e) {
+                logger.error("", e);
+            }
+        }
+
+        if (null == lineCode)
+            return;
+
+        LineConfig conf = lineConfigData.get(lineCode);
+        D80ReplyTemp temp = conf.findByCode(requestCode);
+
+        if (null == temp)
+            return;
+
+        String text;
+        if (agree)
+            text = temp.getAgreeText();
+        else
+            text = temp.getRejectText();
+
+        directiveService.send60Phrase(nbbm, text, "系统");
+    }
+
+    /**
+     * @Title: resumeOperation
+     * @Description: TODO(恢复营运)
+     */
+    public void resumeOperation(D80 d80) {
+
+    }
+
+    /**
+     * @Title: applyTiaodang
+     * @Description: TODO(申请调档)
+     */
+    public void applyTiaodang(D80 d80) {
+
+    }
+
+    /**
+     * @Title: unconfirmed80
+     * @Description: TODO(根据lineCode 获取未处理的80数据)
+     */
+    public List<D80> unconfirmed80(String lineCode) {
+        List<D80> lineAll = findByLine(lineCode), rs = new ArrayList<>();
+
+        for (D80 d80 : lineAll)
+            if (!d80.isConfirm())
+                rs.add(d80);
+
+        return rs;
+    }
+
+    public List<D80> findByLine(String lineCode) {
+        List<D80> rs = new ArrayList<>();
+        for (D80 d80 : d80Maps.values()) {
+            if (d80 != null && d80.getData().getLineId().equals(lineCode))
+                rs.add(d80);
+        }
+        return rs;
+    }
+
+    public D80 findById(int id) {
+        return d80Maps.get(id);
+    }
+
+/*    public String coordHtmlStr(GpsEntity gps) {
+
+        return "<span class=\"nt-coord\" data-lon=\"" + gps.getLon() + "\" data-lat=\"" + gps.getLat() + "\"></span>";
+    }*/
+
+    public Collection<D80> findAll() {
+        return d80Maps.values();
+    }
+
+    public void clear(String lineCode) {
+        logger.info("清除 80数据 before: " + d80Maps.size());
+        List<D80> rems = findByLine(lineCode);
+        for (D80 d80 : rems) {
+            d80Maps.remove(d80.getId());
+        }
+        logger.info("清除 80数据 after: " + d80Maps.size());
+    }
+
+    public Collection<? extends D80> findByCar(String nbbm) {
+        List<D80> rs = new ArrayList<>();
+        String deviceId = BasicData.deviceId2NbbmMap.inverse().get(nbbm);
+        if (null == deviceId)
+            return rs;
+
+        Collection<D80> all = findAll();
+        for (D80 d80 : all) {
+            if (d80.getDeviceId().equals(deviceId))
+                rs.add(d80);
+        }
+        return rs;
+    }
 }
@@ -944,6 +944,8 @@ public class DayOfSchedule {
         ScheduleRealInfo sch = schAttrCalculator.calcCurrentExecSch(list);
         carExecutePlanMap.put(nbbm, sch);
+        if(sch==null)
+            return;
         try {
             GpsEntity gps = gpsRealData.get(BasicData.deviceId2NbbmMap.inverse().get(nbbm));
             if(gps != null && gps.isOnline()){
@@ -231,4 +231,20 @@ public class ScheduleModifyLogger {
     public static void put(SchEditInfo sei) {
         list.add(sei);
     }
+
+    public static void afterEdit(ScheduleRealInfo sch, String remarks, JSONArray jsonArray) {
+        try {
+            if (jsonArray == null || jsonArray.size() == 0)
+                return;
+
+            SchEditInfo sei = SchEditInfo.getInstance(sch);
+            sei.setRemarks(remarks);
+            sei.setJsonArray(jsonArray.toJSONString());
+            sei.setType(EditType.LSBCTZ);
+
+            put(sei);
+        } catch (Exception e) {
+            log.error("", e);
+        }
+    }
 }
@@ -5,5 +5,5 @@ package com.bsth.data.schedule.edit_logs.entity;
  */
 public enum EditType {
-    DFTZ,SFTZ,FCXXWT,TZRC,LPDD,ZRW,JHLB,CXLB, CXSF, CXZX
+    DFTZ,SFTZ,FCXXWT,TZRC,LPDD,ZRW,JHLB,CXLB, CXSF, LSBCTZ, CXZX
 }
 \ No newline at end of file
+package com.bsth.data.schedule.edit_logs.loggers;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.bsth.data.schedule.edit_logs.ScheduleModifyLogger;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * 事后历史班次编辑
+ * Created by panzhao on 2017/5/19.
+ */
+public class AfterwardsLogger {
+
+    static Logger log = LoggerFactory.getLogger(AfterwardsLogger.class);
+
+    private JSONArray jsonArray = new JSONArray();
+    private String remarks;
+    private ScheduleRealInfo sch;
+
+    public void log(String title, Object old, Object now){
+        try {
+
+            JSONObject jsonObject = new JSONObject();
+            jsonObject.put("title", title);
+            jsonObject.put("old", old);
+            jsonObject.put("now", now);
+
+            jsonArray.add(jsonObject);
+        }catch (Exception e){
+            log.error("", e);
+        }
+    }
+
+    public void log(String text){
+        try {
+            JSONObject jsonObject = new JSONObject();
+            jsonObject.put("title", text);
+
+            jsonArray.add(jsonObject);
+        }catch (Exception e){
+            log.error("", e);
+        }
+    }
+
+    public static AfterwardsLogger start(ScheduleRealInfo sch, String remarks){
+        AfterwardsLogger fLog = new AfterwardsLogger();
+        fLog.setSch(sch);
+        fLog.setRemarks(remarks);
+        return fLog;
+    }
+
+    public void end(){
+        ScheduleModifyLogger.afterEdit(sch, this.remarks, jsonArray);
+    }
+
+    public String getRemarks() {
+        return remarks;
+    }
+
+    public void setRemarks(String remarks) {
+        this.remarks = remarks;
+    }
+
+    public ScheduleRealInfo getSch() {
+        return sch;
+    }
+
+    public void setSch(ScheduleRealInfo sch) {
+        this.sch = sch;
+    }
+}
@@ -41,7 +41,7 @@ public class SchEditInfoServiceImpl extends BaseServiceImpl&lt;SchEditInfo, Long&gt; i
             for(String k : ks){
                 v =map.get(k);
                 if(StringUtils.isNotEmpty(v))
-                    cont += " and t2." + BatchSaveUtils.propertyToField(k) + "='" + v + "'";
+                    cont += " and " + BatchSaveUtils.propertyToField(k) + "='" + v + "'";
             }
             String sql = "select t1.*, t2.fcsj,t2.lp_name,t2.cl_zbh,t2.j_gh,t2.j_name,t2.xl_dir,t2.real_exec_date from (select * from logger_sch_modify where rq=? and line_code=? ) t1 INNER JOIN bsth_c_s_sp_info_real t2 on t1.sch_id=t2.id where 1=1 " + cont;
+package com.bsth.data.utils;
+
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * Created by panzhao on 2017/7/10.
+ */
+public class CustomStringUtils {
+
+    public static boolean equals(String s1, String s2){
+        if(s1 == null){
+            if(StringUtils.isNotEmpty(s2))
+                return false;
+            else
+                return true;
+        }
+        return s1.equals(s2);
+    }
+}
 package com.bsth.entity.directive;
-import java.util.Date;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Embeddable;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.NamedAttributeNode;
-import javax.persistence.NamedEntityGraph;
-import javax.persistence.NamedEntityGraphs;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-import javax.persistence.Transient;
-
 import com.bsth.entity.directive.DC0.DC0Data;
+import javax.persistence.*;
+import java.util.Date;
+
 /**
  * 
  * @ClassName: D80
@@ -92,7 +80,7 @@ public class D80 {
 		/**
 		 * 线路编码
 		 */
-		private Integer lineId;
+		private String lineId;
 		/**
 		 * 车辆内部编码
@@ -116,13 +104,6 @@ public class D80 {
 			this.requestCode = requestCode;
 		}
-		public Integer getLineId() {
-			return lineId;
-		}
-
-		public void setLineId(Integer lineId) {
-			this.lineId = lineId;
-		}
 		public String getNbbm() {
 			return nbbm;
@@ -131,6 +112,14 @@ public class D80 {
 		public void setNbbm(String nbbm) {
 			this.nbbm = nbbm;
 		}
+
+		public String getLineId() {
+			return lineId;
+		}
+
+		public void setLineId(String lineId) {
+			this.lineId = lineId;
+		}
 	}
 	@Transient
@@ -84,10 +84,25 @@ public class ChildTaskPlan {
 	private boolean destroy;
 	/**
-	 * 烂班原因
+	 * 烂班原因  -烂班时，该字段仍有值并 =reason
 	 */
 	private String destroyReason;
+	/**
+	 * 包括 烂班原因、进出场原因、换车原因 等
+	 */
+	private String reason;
+
+	/**
+	 * 车辆 如果为空，继承主任务
+	 */
+	private String nbbm;
+
+	/**
+	 * 为true 则无售票员， 否则继承主任务
+	 */
+	private boolean noClerk;
+
 	/** 创建日期 */
 	@Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
 	private Date createDate;
@@ -238,4 +253,28 @@ public class ChildTaskPlan {
 	public void setCreateDate(Date createDate) {
 		this.createDate = createDate;
 	}
+
+	public String getReason() {
+		return reason;
+	}
+
+	public void setReason(String reason) {
+		this.reason = reason;
+	}
+
+	public String getNbbm() {
+		return nbbm;
+	}
+
+	public void setNbbm(String nbbm) {
+		this.nbbm = nbbm;
+	}
+
+	public boolean isNoClerk() {
+		return noClerk;
+	}
+
+	public void setNoClerk(boolean noClerk) {
+		this.noClerk = noClerk;
+	}
 }
+package com.bsth.entity.realcontrol;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+/**
+ * 站 到 场
+ * Created by panzhao on 2017/7/10.
+ */
+@Entity
+@Table(name = "bsth_c_station_to_park")
+public class StationToPark {
+
+    @Id
+    @GeneratedValue
+    private Integer id;
+
+    /** 线路编码 */
+    private String lineCode;
+
+    /** 站点名称 */
+    private String stationName;
+
+    /** 停车场编码 */
+    private String parkName;
+
+    /** 站到场时间（分钟） */
+    private Float time1;
+
+    /** 站到场公里 */
+    private Float mileage1;
+
+    /** 场到站时间（分钟） */
+    private Float time2;
+
+    /** 场到站公里 */
+    private Float mileage2;
+
+    /** 排序字段 */
+    private int orderNo;
+
+    public String getLineCode() {
+        return lineCode;
+    }
+
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
+    }
+
+    public String getStationName() {
+        return stationName;
+    }
+
+    public void setStationName(String stationName) {
+        this.stationName = stationName;
+    }
+
+
+    public Float getTime1() {
+        return time1;
+    }
+
+    public void setTime1(Float time1) {
+        this.time1 = time1;
+    }
+
+    public Float getMileage1() {
+        return mileage1;
+    }
+
+    public void setMileage1(Float mileage1) {
+        this.mileage1 = mileage1;
+    }
+
+    public Float getTime2() {
+        return time2;
+    }
+
+    public void setTime2(Float time2) {
+        this.time2 = time2;
+    }
+
+    public Float getMileage2() {
+        return mileage2;
+    }
+
+    public void setMileage2(Float mileage2) {
+        this.mileage2 = mileage2;
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public int getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(int orderNo) {
+        this.orderNo = orderNo;
+    }
+
+    public String getParkName() {
+        return parkName;
+    }
+
+    public void setParkName(String parkName) {
+        this.parkName = parkName;
+    }
+
+    @Override
+    public int hashCode() {
+        return ("stp_" + this.toString()).hashCode();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        return this.toString().equals(((StationToPark)obj).toString());
+    }
+
+    @Override
+    public String toString() {
+        return this.lineCode + "_" + this.getStationName() + "_" + this.getParkName();
+    }
+}
@@ -39,6 +39,6 @@ public interface LineRepository extends BaseRepository&lt;Line, Integer&gt; {
 	public Line findByLineCode(String string);
-	@Query(value = "  SELECT l FROM Line l where l.company like ?1 and l.brancheCompany like ?2 and l.lineCode like ?3")
+	@Query(value = "  SELECT l FROM Line l where l.company like %?1% and l.brancheCompany like %?2% and l.lineCode like ?3")
 	public List<Line> findLineBygsBm(String gsBm, String fgsBm, String line);
 }
@@ -40,10 +40,17 @@ public interface StationRepository extends BaseRepository&lt;Station, Integer&gt; {
 	/*@Query(value = "SELECT s.b_jwpoints,s.id FROM bsth_c_station s where s.station_name like  ?1"
 			, nativeQuery=true)
 	List<Object[]> findStationName(String stationName);*/
-	@Query(value = " SELECT t.b_jwpoints,t.id FROM (" +
+	/*@Query(value = " SELECT t.b_jwpoints,t.id FROM (" +
 			" SELECT b.id,b.b_jwpoints,b.station_name,a.directions FROM (" +
 			" SELECT s.station,s.station_name,s.directions FROM bsth_c_stationroute s where s.destroy = 0 and s.directions = ?1) a " +
 			" LEFT JOIN bsth_c_station b on a.station = b. id) t where t.station_name LIKE ?2"
+			, nativeQuery=true)*/
+	@Query(value = " SELECT t.b_jwpoints,t.id FROM (" +
+			" SELECT b.id,b.b_jwpoints,b.station_name,a.directions FROM (" +
+			" SELECT s.station,s.station_name,s.directions FROM bsth_c_stationroute s where s.destroy = 0 and s.directions = ?1) a " +
+			" LEFT JOIN " + 
+				" (SELECT r.id,r.b_jwpoints,r.station_name from bsth_c_station r where r.destroy = 0  and r.station_name LIKE ?2 )  " + 
+			" b on a.station = b. id) t where t.station_name LIKE ?2 "
 			, nativeQuery=true)
 	List<Object[]> findStationName(Integer dir , String stationName);
@@ -101,18 +108,24 @@ public interface StationRepository extends BaseRepository&lt;Station, Integer&gt; {
     		"y = ?9  , " +
     		"b_polygon_grid = ST_GeomFromText(?10)  , " +
     		"g_polygon_grid = ST_GeomFromText(?11)  , " +
-    		"destroy = ?12  , " +
-    		"radius = ?13  , " +
-    		"shapes_type = ?14  , " +
-    		"versions = ?15  , " +
-    		"descriptions = ?16  " +
-    		" WHERE id = ?17   ", nativeQuery=true)
+    		/*"destroy = ?12  , " +*/
+    		"radius = ?12  , " +
+    		"shapes_type = ?13  , " +
+    		"versions = ?14  , " +
+    		"descriptions = ?15  " +
+    		" WHERE id = ?16   ", nativeQuery=true)
 	public void stationUpdate(String stationCod,String stationName,String roadCoding,String dbType,String bJwpoints,
+			
+			  Float gLonx,Float gLaty,Float x,Float y, String bPolygonGrid,String gPolygonGrid,
+			  
+			  Integer radius,String shapesType, Integer versions,String descriptions,Integer stationId);
+
+	/*public void stationUpdate(String stationCod,String stationName,String roadCoding,String dbType,String bJwpoints,
 							  Float gLonx,Float gLaty,Float x,Float y, String bPolygonGrid,String gPolygonGrid,
 							  Integer  destroy, Integer radius,String shapesType, Integer versions,String descriptions,Integer stationId);
-    
+    */
 	@Query(value = "select st_astext(g_polygon_grid) as g_polygon_grid, shapes_type,concat(g_lonx, ' ', g_laty) as g_center_point ,radius, station_cod,station_name from bsth_c_station where station_cod=?1", nativeQuery = true)
 	public Object[][] bufferAera(String stationCode);
@@ -266,7 +266,6 @@ public interface StationRouteRepository extends BaseRepository&lt;StationRoute, Int
 			"StationRoute s " +
 			"WHERE " +
 			"s.destroy = 0 " +
-			"and s.lineCode in(select lineCode from Line where inUse = 1) " +
 			"ORDER BY " +
 			"lineCode,directions,stationRouteCode")
 	List<Map<String, String>> findAllLineWithYgc();
@@ -81,7 +81,7 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	@Query(value="select count(jName) from ScheduleRealInfo s where s.jName = ?1 and s.clZbh = ?2 and s.lpName = ?3 and sflj != 0")
 	int findLjbc(String jName,String clZbh,String lpName);
-	@Query(value="SELECT c.company,r.request_code,FROM_UNIXTIME(r.timestamp/1000,'%Y-%m-%d %T'),c.inside_code FROM bsth_v_report_80 r LEFT JOIN bsth_c_cars c ON c.equipment_code = r.device_id where FROM_UNIXTIME(r.timestamp/1000,'%Y-%m-%d') = ?2 and r.line_id = ?1 and c.inside_code like %?3%",nativeQuery=true)
+	@Query(value="SELECT request_code,FROM_UNIXTIME(TIMESTAMP / 1000,'%Y-%m-%d %T') as TIMESTAMP ,device_id  FROM bsth_v_report_80 WHERE FROM_UNIXTIME( TIMESTAMP / 1000,'%Y-%m-%d') = ?2 AND line_id = ?1 and device_id like %?3%",nativeQuery=true)
 	List<Object[]> account(String line,String date,String code);
 	@Query(value="select s from ScheduleRealInfo s where s.xlBm = ?1 and s.scheduleDate >= str_to_date(?2,'%Y-%m-%d') "
+package com.bsth.repository.realcontrol;
+
+import com.bsth.entity.realcontrol.StationToPark;
+import com.bsth.repository.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * Created by panzhao on 2017/7/10.
+ */
+@Repository
+public interface StationToParkRepository extends BaseRepository<StationToPark, Integer>{
+}
@@ -24,7 +24,7 @@ public interface TrafficManageService {
 	 *
 	 * @return 调用接口返回信息
 	 */
-	String setXL(Map<String, Object> param);
+	String setXL(String ids);
 	/**
 	 * 上传车辆信息
@@ -114,10 +114,8 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
                     + sch.getQdzName() + "发往" + sch.getZdzName();
             //下发0x01指令  调度指令(闹钟有效)
-            long t = System.currentTimeMillis(), alarmTime;
-            alarmTime = sch.getDfsjT();
-            if (sch.getDfsjT() < t)
-                alarmTime = t + 1000 * 30;
+            long t = System.currentTimeMillis() + 1000 * 30,
+                    alarmTime = sch.getDfsjT() < t?t:sch.getDfsjT();
             d60 = new DirectiveCreator().createD60_01(sch.getClZbh(), text, Integer.parseInt(sch.getXlDir())
                     , 0, new Date(alarmTime));
@@ -304,7 +302,7 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
         Map<String, List<D80>> rs = new HashMap<>();
         for (String code : lineList)
-            rs.put(code, pilotReport.unconfirmed80(Integer.parseInt(code)));
+            rs.put(code, pilotReport.unconfirmed80(code));
         return rs;
     }
@@ -333,17 +331,18 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
                     rs.put("msg", "发送C0响应指令到车载设备失败，但该操作已经被系统记录！");
                 pilotReport.reply(d80);
+
+                // 通知页面
+                Map<String, Object> sockMap = new HashMap<>();
+                sockMap.put("fn", "d80Confirm");
+                sockMap.put("id", d80.getId());
+                sockMap.put("lineId", d80.getData().getLineId());
+                socketHandler.sendMessageToLine(d80.getData().getLineId().toString(), JSON.toJSONString(sockMap));
             }
         } catch (Exception e) {
             logger.error("80响应出现异常...", e);
             rs.put("status", ResponseCode.SUCCESS);
         }
-        // 通知页面
-        Map<String, Object> sockMap = new HashMap<>();
-        sockMap.put("fn", "d80Confirm");
-        sockMap.put("id", d80.getId());
-        sockMap.put("lineId", d80.getData().getLineId());
-        socketHandler.sendMessageToLine(d80.getData().getLineId().toString(), JSON.toJSONString(sockMap));
         return rs;
     }
@@ -14,13 +14,11 @@ import java.util.List;
 import java.util.Map;
 import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.RowMapper;
 import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
 import com.bsth.data.BasicData;
 import com.bsth.entity.excep.Speeding;
-import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.service.excep.SpeedingService;
 import com.bsth.util.EchartConver;
 import com.bsth.util.PageHelper;
@@ -42,7 +40,7 @@ public class SpeedingServiceImpl implements SpeedingService {
 		ResultSet rs = null;
 		int page=Integer.parseInt(map.get("page").toString());
 		List<Speeding> list=new ArrayList<Speeding>();
-		String sql="select * from bsth_c_speeding where speed > 60 ";
+		String sql="select * from bsth_c_speeding where 1=1 ";
 		Object line=map.get("line");
 		Object nbbm=map.get("nbbm");
 		Object updown=map.get("updown");
@@ -204,22 +202,40 @@ public class SpeedingServiceImpl implements SpeedingService {
 		int totalPage;//总页数
 		int totalData = 0;
 		if(list.size()>1){
-			Speeding speedingNow;//下标为i的车
-			Speeding speedingLast;//下标为i-1的车
+			Speeding speedingNow;//下标为i的车辆行驶记录
+			Speeding speedingLast;//下标为i-1的车辆行驶记录
+			Speeding spped = null;//整合后的车辆行驶记录
 			String strNow;
 			String strLast;
+			boolean Flag = false;//判断是否有连续超速记录,默认没有
 			for(int i = 1;i<list.size();i++){
 				speedingNow = list.get(i);
 				speedingLast = list.get(i-1);
-				strNow = speedingNow.getVehicle()+speedingNow.getLine()+speedingNow.getUpDown();//同一车辆同一线路同一方向
+				strNow = speedingNow.getVehicle()+speedingNow.getLine()+speedingNow.getUpDown();
 				strLast = speedingLast.getVehicle()+speedingLast.getLine()+speedingLast.getUpDown();
-				//同一车辆同一线路同一方向并且该记录的超速的开始时间减去上一条超速记录的结束时间小于等于10s，证明该车超速。//PS:祛除数据库中的重复发送数据
-				if(strNow.equals(strLast) && Math.abs(speedingNow.getTimestamp()-speedingLast.getTimestamp())<=10*1000 && (speedingNow.getTimestamp()-speedingLast.getTimestamp()!=0)){
-					speedingLast.setEndtimestamp(speedingNow.getTimestamp());//设置结束时间时间戳
-					speedingLast.setEndtimestampDate(sdf.format(new Date(speedingNow.getTimestamp())));//设置结束时间
-					speedingLast.setEndlon(speedingNow.getLon());//设置结束时的经度
-					speedingLast.setEndlat(speedingNow.getLat());//设置结束时的纬度
-					listResult.add(speedingLast);
+				if(speedingNow.getSpeed()>60 && speedingLast.getSpeed()>60 && strNow.equals(strLast)){//如果两条连续的记录都是超速且属于同一辆车。
+					if(Flag==false){//
+						spped = new Speeding();
+						spped.setId(speedingLast.getId());//设置连续超速记录Id
+						spped.setLine(speedingLast.getLine());//设置连续超速记录线路
+						spped.setLineName(speedingLast.getLineName());//设置连续超速记录线路名称
+						spped.setVehicle(speedingLast.getVehicle());//设置连续超速记录的车辆编号
+						spped.setUpDown(speedingLast.getUpDown());//设置上下行
+						spped.setLon(speedingLast.getLon());//设置开始时经度
+						spped.setLat(speedingLast.getLat());//设置开始时纬度
+						spped.setTimestamp(speedingLast.getTimestamp());//设置连续超速记录的开始时间
+						spped.setTimestampDate(speedingLast.getTimestampDate());//设置连续超速记录的开始时间戳
+					}
+					spped.setEndtimestamp(speedingNow.getTimestamp());//设置结束时间戳
+					spped.setEndtimestampDate(sdf.format(new Date(speedingNow.getTimestamp())));//设置结束时间
+					spped.setEndlon(speedingNow.getLon());//设置结束时的经度
+					spped.setEndlat(speedingNow.getLat());//设置结束时的纬度
+					Flag = true;
+				}else{
+					if(Flag){//如果上一条记录超速。
+						listResult.add(spped);
+						Flag = false;
+					}
 				}
 			}
 			Iterator<Speeding> speedIt = listResult.iterator(); 
@@ -4,6 +4,7 @@ import com.bsth.data.gpsdata.GpsEntity;
 import com.bsth.service.gps.entity.GpsOutbound_DTO;
 import com.bsth.service.gps.entity.GpsSpeed;
 import com.bsth.service.gps.entity.GpsSpeed_DTO;
+import com.bsth.util.PageObject;
 import javax.servlet.http.HttpServletResponse;
@@ -25,7 +26,7 @@ public interface GpsService {
     Map<String,Object> findRoadSpeed(String lineCode);
-    Map<String,Object> gpsCompletion(long schId);
+    Map<String,Object> gpsCompletion(long schId, int type);
 	Map<String,Object> history_v2(String nbbm, long st, long et);
@@ -45,4 +46,6 @@ public interface GpsService {
 	List<GpsSpeed> findPosition(String deviceid, String startdate,
 			String enddate) throws ParseException;
+
+	PageObject<GpsSpeed> Pagequery(Map<String, Object> map);
 }
@@ -16,6 +16,8 @@ import com.bsth.repository.StationRepository;
 import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
 import com.bsth.service.gps.entity.*;
 import com.bsth.util.DateUtils;
+import com.bsth.util.PageHelper;
+import com.bsth.util.PageObject;
 import com.bsth.util.TransGPS;
 import com.bsth.util.TransGPS.Location;
 import com.bsth.util.db.DBUtils_MS;
@@ -44,6 +46,7 @@ import java.net.URLEncoder;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
+import java.sql.SQLException;
 import java.text.DecimalFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -447,7 +450,7 @@ public class GpsServiceImpl implements GpsService {
      * @return
      */
     @Override
-    public Map<String, Object> gpsCompletion(long schId) {
+    public Map<String, Object> gpsCompletion(long schId, int type) {
         Map<String, Object> rs = new HashMap<>();
         try {
@@ -481,12 +484,18 @@ public class GpsServiceImpl implements GpsService {
             });
             Map<String, Object> fs = list.get(0);
             //替换设备号和时间
-            int diff = (int) (sch.getDfsjT() - Long.parseLong(fs.get("ts").toString()) - 1000 * 70);
+            long diff = ((sch.getDfsjT() - Long.parseLong(fs.get("ts").toString())) - 1000 * 70);
             String deviceId = BasicData.deviceId2NbbmMap.inverse().get(sch.getClZbh());
+            int serviceState;
             for (Map<String, Object> map : list) {
                 map.put("device_id", deviceId);
                 map.put("ts", Long.parseLong(map.get("ts").toString()) + diff);
+                if(type==1){
+                    //走补传协议
+                    serviceState = Integer.parseInt(map.get("service_state").toString());
+                    map.put("service_state", serviceState |= 0x00100000);
+                }
             }
             String sqlBefore = "insert into bsth_c_template(", sqlValues = " values(";
@@ -800,7 +809,7 @@ public class GpsServiceImpl implements GpsService {
     @Override
     public List<GpsSpeed_DTO> speeds(String nbbm, long st, long et) {
         String deviceId = BasicData.deviceId2NbbmMap.inverse().get(nbbm);
-        String sql = "select vehicle, line, up_down, lon, lat, speed,timestamp from bsth_c_speeding where vehicle=? and timestamp>? and timestamp<?";
+        String sql = "select vehicle, line, up_down, lon, lat, speed,timestamp from bsth_c_GpsSpeed where vehicle=? and timestamp>? and timestamp<?";
         return GpsSpeed_DTO.create(new JdbcTemplate(DBUtils_MS.getDataSource()).queryForList(sql, deviceId, st * 1000, et * 1000));
     }
@@ -1030,4 +1039,182 @@ public class GpsServiceImpl implements GpsService {
         return listResult;
 	}
+
+	@Override
+	public PageObject<GpsSpeed> Pagequery(Map<String, Object> map) {
+		
+		SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		List<GpsSpeed> list=findAll(map);
+		List<GpsSpeed> listResult = new ArrayList<GpsSpeed>();
+		int curPage;//页码  
+		int pageData;//每页的记录条数
+		int start;//起始数据下标
+		int totalPage;//总页数
+		int totalData = 0;
+		if(list.size()>1){
+			GpsSpeed GpsSpeedNow;//下标为i的车辆行驶记录
+			GpsSpeed GpsSpeedLast;//下标为i-1的车辆行驶记录
+			GpsSpeed spped = null;//整合后的车辆行驶记录
+			String strNow;
+			String strLast;
+			boolean Flag = false;//判断是否有连续超速记录,默认没有
+			for(int i = 1;i<list.size();i++){
+				GpsSpeedNow = list.get(i);
+				GpsSpeedLast = list.get(i-1);
+				strNow = GpsSpeedNow.getVehicle()+GpsSpeedNow.getLine()+GpsSpeedNow.getUp_down();
+				strLast = GpsSpeedLast.getVehicle()+GpsSpeedLast.getLine()+GpsSpeedLast.getUp_down();
+				if(GpsSpeedNow.getSpeed()>60 && GpsSpeedLast.getSpeed()>60 && strNow.equals(strLast)){//如果两条连续的记录都是超速且属于同一辆车。
+					if(Flag==false){//
+						spped = new GpsSpeed();
+						spped.setLine(GpsSpeedLast.getLine());//设置连续超速记录线路
+						spped.setLineName(GpsSpeedLast.getLineName());//设置连续超速记录线路名称
+						spped.setVehicle(GpsSpeedLast.getVehicle());//设置连续超速记录的车辆编号
+						spped.setUp_down(GpsSpeedLast.getUp_down());//设置上下行
+						spped.setLon(GpsSpeedLast.getLon());//设置开始时经度
+						spped.setLat(GpsSpeedLast.getLat());//设置开始时纬度
+						spped.setTimestamp(GpsSpeedLast.getTimestamp());//设置连续超速记录的开始时间
+						spped.setTimestampDate(GpsSpeedLast.getTimestampDate());//设置连续超速记录的开始时间戳
+					}
+					spped.setEndtimestamp(GpsSpeedNow.getTimestamp());//设置结束时间戳
+					spped.setEndtimestampDate(sdf.format(new Date(GpsSpeedNow.getTimestamp())));//设置结束时间
+					spped.setEndlon(GpsSpeedNow.getLon());//设置结束时的经度
+					spped.setEndlat(GpsSpeedNow.getLat());//设置结束时的纬度
+					Flag = true;
+				}else{
+					if(Flag){//如果上一条记录超速。
+						listResult.add(spped);
+						Flag = false;
+					}
+				}
+			}
+			Iterator<GpsSpeed> speedIt = listResult.iterator(); 
+			while(speedIt.hasNext()){
+				GpsSpeed GpsSpeed = speedIt.next(); 
+			    if(GpsSpeed.getEndtimestamp()-GpsSpeed.getTimestamp()<=1000){  
+			    	speedIt.remove();  
+			    }  
+			}
+			
+			totalData = listResult.size();//总记录条数。
+			if(map.get("curPage") == null || map.get("curPage").equals("0")){
+				curPage = 0;
+			}else{
+				curPage = Integer.parseInt((String) map.get("curPage"));
+			}
+			pageData = Integer.parseInt((String) map.get("pageData"));//每页的记录条数
+			start = (curPage - 0) * pageData; //起始记录下标。
+			totalPage = totalData % pageData == 0 ? totalData / pageData : totalData / pageData +1;//总页数
+			if(curPage == totalPage-1){//如果当前页等于总页数。
+				listResult = listResult.subList(start, totalData);
+			}else{
+				listResult = listResult.subList(start, start+pageData);
+			}
+		}else{
+			curPage = 1;
+			pageData = Integer.parseInt((String) map.get("pageData"));//每页的记录条数
+			totalPage =1;
+		}
+		Map<String,Object> paramMap = new HashMap<String,Object>();
+		paramMap.put("totalPage", totalPage);
+		paramMap.put("curPage", curPage);
+		paramMap.put("pageData", pageData);
+		PageHelper pageHelper = new PageHelper(totalData, paramMap);
+		pageHelper.getMap();
+		PageObject<GpsSpeed> pageObject = pageHelper.getPageObject();
+		pageObject.setDataList(listResult);
+		return pageObject;
+	}
+	
+	static List<GpsSpeed> findAll(Map<String, Object> map) {
+		Connection conn = null;
+		PreparedStatement ps = null;
+		ResultSet rs = null;
+		int page=Integer.parseInt(map.get("page").toString());
+		List<GpsSpeed> list=new ArrayList<GpsSpeed>();
+		String sql="select * from bsth_c_gps_info where 1=1 ";
+		Object line=map.get("line");
+		Object nbbm=map.get("nbbm");
+		Object updown=map.get("updown");
+		Object startDate=map.get("startDate");
+		Object endDate=map.get("endDate");
+		
+		SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		if(line!=null){
+			sql +=" and line_id like'%"+line.toString().trim()+"%'";
+		}
+		
+		if(nbbm!=null){
+			 nbbm=BasicData.deviceId2NbbmMap.inverse().get(nbbm);
+			 if(nbbm!=null)
+			sql +=" and vehicle like '%"+nbbm.toString()+"%'";
+		}
+		
+		if(updown!=null){
+			sql +="and industry_code like '%"+updown.toString()+"%'";
+		}
+		if(startDate!=null){
+			if (startDate.toString().length()>0) {
+				try {
+					Long t1=sdf.parse(startDate.toString()+" 00:00:00").getTime();
+					sql += " and ts >="+t1;
+				} catch (ParseException e) {
+					e.printStackTrace();
+				}
+			}
+			
+		}
+		if(endDate!=null){
+			if (endDate.toString().length()>0) {
+				try {
+					Long t2=sdf.parse(endDate.toString()+" 23:59:59").getTime();
+					sql += " and ts <="+t2;
+				} catch (ParseException e) {
+					e.printStackTrace();
+				}
+			}
+			
+		}
+
+		try {
+			conn = DBUtils_MS.getConnection();
+			ps = conn.prepareStatement(sql);
+			rs = ps.executeQuery();
+			list = resultSet2Set(rs);
+		} catch (SQLException e) {
+			e.printStackTrace();
+		}finally {
+			DBUtils_MS.close(rs, ps, conn);
+		}
+		
+		return list;
+	}
+	
+	static List<GpsSpeed> resultSet2Set(ResultSet rs) throws SQLException{
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		List<GpsSpeed> list=new ArrayList<GpsSpeed>();
+		GpsSpeed GpsSpeed;
+		Float lon, lat;
+		Location location;
+		while(rs.next()){
+			lon = rs.getFloat("lon");
+			lat = rs.getFloat("lat");
+            location = TransGPS.LocationMake(lon, lat);
+            location = TransGPS.bd_encrypt(TransGPS.transformFromWGSToGCJ(location));
+			GpsSpeed=new GpsSpeed();
+			GpsSpeed.setLon((float)location.getLng());
+			GpsSpeed.setLat((float)location.getLat());
+			GpsSpeed.setLine(rs.getObject("line_id").toString());
+			//run 时注解
+			GpsSpeed.setLineName(BasicData.lineCode2NameMap.get(GpsSpeed.getLine().toString()));
+			GpsSpeed.setSpeed(Float.valueOf(rs.getObject("speed_gps").toString()));
+			GpsSpeed.setTimestamp((Long.valueOf(rs.getObject("ts").toString())));
+			GpsSpeed.setTimestampDate(sdf.format(new Date(GpsSpeed.getTimestamp())));
+			GpsSpeed.setUp_down(((Integer.valueOf(rs.getObject("service_state").toString())) & 0x10000000)==0?0:1);
+			GpsSpeed.setVehicle(BasicData.deviceId2NbbmMap.get(rs.getObject("device_id").toString()));
+			list.add(GpsSpeed);
+		}
+		return list;
+	}
+	
 }
+
 package com.bsth.service.gps.entity;
+import javax.persistence.Transient;
+
 /**
  * 超速异常 -ms数据库格式
  * Created by panzhao on 2017/4/7.
@@ -15,11 +17,59 @@ public class GpsSpeed {
     private float lon;
     private float lat;
+    
+    private String lineName;
+    
+	/**
+	 * 超速结束时的纬度
+	 */
+    @Transient
+	private Float endlat;
+	
+	/**
+	 * 超速结束时的经度
+	 */
+	@Transient
+	private Float endlon;
     private float speed;
-
+    
     private long timestamp;
-
+    
+    @Transient
+    private String timestampDate;
+    
+  public String getTimestampDate() {
+		return timestampDate;
+	}
+
+	public void setTimestampDate(String timestampDate) {
+		this.timestampDate = timestampDate;
+	}
+
+	public Long getEndtimestamp() {
+		return endtimestamp;
+	}
+
+	public void setEndtimestamp(Long endtimestamp) {
+		this.endtimestamp = endtimestamp;
+	}
+
+	public String getEndtimestampDate() {
+		return endtimestampDate;
+	}
+
+	public void setEndtimestampDate(String endtimestampDate) {
+		this.endtimestampDate = endtimestampDate;
+	}
+
+	//结束时间，单位：秒/s
+  	@Transient
+  	private Long endtimestamp;
+  	
+  	@Transient
+  	private String endtimestampDate;
+    
     public String getVehicle() {
         return vehicle;
     }
@@ -75,4 +125,28 @@ public class GpsSpeed {
     public void setTimestamp(long timestamp) {
         this.timestamp = timestamp;
     }
+
+	public Float getEndlon() {
+		return endlon;
+	}
+
+	public void setEndlon(Float endlon) {
+		this.endlon = endlon;
+	}
+
+	public Float getEndlat() {
+		return endlat;
+	}
+
+	public void setEndlat(Float endlat) {
+		this.endlat = endlat;
+	}
+
+	public String getLineName() {
+		return lineName;
+	}
+
+	public void setLineName(String lineName) {
+		this.lineName = lineName;
+	}
 }
@@ -17,17 +17,24 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import org.apache.commons.lang3.StringEscapeUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.BeanPropertyRowMapper;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.stereotype.Service;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.bsth.data.BasicData;
+import com.bsth.data.schedule.edit_logs.service.dto.SchEditInfoDto;
 import com.bsth.entity.realcontrol.ChildTaskPlan;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
 import com.bsth.service.BusIntervalService;
 import com.bsth.service.schedule.PeopleCarPlanService;
 import com.bsth.util.ReportUtils;
+import com.google.gson.Gson;
 @Service
@@ -1838,7 +1845,8 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 		}
 		try {
-			String sql = "select * 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+"' and fcsj_actual is not null";
+			String sql = "select * 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+"'";
 			if(line.length() != 0){
 				sql += " and xl_bm = '"+line+"'";
 			}
@@ -1865,6 +1873,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 				public ScheduleRealInfo mapRow(ResultSet rs, int rowNum) throws SQLException {
 					ScheduleRealInfo schedule = new ScheduleRealInfo();
 					schedule.setScheduleDateStr(rs.getString("schedule_date_Str"));
+					schedule.setXlBm(rs.getString("xl_bm"));
 					schedule.setXlName(rs.getString("xl_name"));
 					schedule.setLpName(rs.getString("lp_name"));
 					schedule.setBcType(rs.getString("bc_type"));
@@ -1918,7 +1927,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 		for(ScheduleRealInfo schedule : list){
 			if(schedule.getXlName() == null || schedule.getXlName().trim().length() == 0)
 				continue;
-			String key = schedule.getGsName() + "/" + schedule.getFgsName() + "/" + schedule.getXlName();
+			String key = schedule.getGsName() + "/" + schedule.getFgsName() + "/" + schedule.getXlBm();
 			if(!keyMap.containsKey(key))
 				keyMap.put(key, new ArrayList<ScheduleRealInfo>());
 			keyMap.get(key).add(schedule);
@@ -1929,8 +1938,8 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			int sjbc = 0, sddf = 0, zddf = 0,
 					dxtz = 0, lbtz = 0;
 			for(ScheduleRealInfo schedule : keyMap.get(key)){
+				boolean flag = false;
 				if(schedule.getFcsjActual() != null && schedule.getStatus() != -1){
-					boolean flag = false;
 					sjbc++;
 					if(schedule.getDfsj() != null && !schedule.getDfsj().equals(schedule.getFcsj())){
 						flag = true;
@@ -1939,17 +1948,16 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 							zddf++;
 						else
 							sddf++;
-					}else if(!schedule.isOnline()){
-						flag = true;
-						schedule.setRemarks("掉线调整");
-						dxtz++;
-					}else if(schedule.getStatus() == 2){
-						flag = true;
-						lbtz++;
 					}
-					if(flag)
-						tempList.add(schedule);
+					
+						
+				}
+				if(schedule.getStatus() == -1){
+					flag = true;
+					lbtz++;
 				}
+				if(flag)
+				tempList.add(schedule);
 			}
 			tempMap.put("date", date);
 			String[] keys = key.split("/");
@@ -1960,22 +1968,23 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			tempMap.put("sddf", sddf);
 			tempMap.put("zddf", zddf);
 			tempMap.put("dfhj", sddf + zddf);
-			tempMap.put("dxtz", dxtz);
+//			tempMap.put("dxtz", dxtz);
 			tempMap.put("lbtz", lbtz);
-			tempMap.put("correct", sddf + zddf + dxtz + lbtz);
+			tempMap.put("correct", sddf + zddf + lbtz);
 			tempMap.put("dfbl", df.format((double)(sddf + zddf)/sjbc*100) + "%");
-			tempMap.put("dxbl", df.format((double)(dxtz)/sjbc*100) + "%");
+//			tempMap.put("dxbl", df.format((double)(dxtz)/sjbc*100) + "%");
 			tempMap.put("lbbl", df.format((double)(lbtz)/sjbc*100) + "%");
-			tempMap.put("correctbl", df.format((double)(sddf + zddf + dxtz + lbtz)/sjbc*100) + "%");
-			tempMap.put("workList", tempList);
+//			tempMap.put("correctbl", df.format((double)(sddf + zddf + dxtz + lbtz)/sjbc*100) + "%");
+//			tempMap.put("workList", tempList);
 			String key0 = keys[0] + "/" + keys[1];
-			if(!keyMap0.containsKey(key0))
-				keyMap0.put(key0, new ArrayList<Map<String, Object>>());
-			keyMap0.get(key0).add(tempMap);
+			/*if(!keyMap0.containsKey(key0))
+				keyMap0.put(key0, new ArrayList<Map<String, Object>>());*/
+//			keyMap0.get(key0).add(tempMap);
+			resList.add(tempMap);
 		}
-		for(String key : keyMap0.keySet()){
+		/*for(String key : keyMap0.keySet()){
 			Map<String, Object> tempMap = new HashMap<String, Object>();
 			int sjbc = 0, sddf = 0, zddf = 0,
 					dxtz = 0, lbtz = 0;
@@ -1983,7 +1992,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 				sjbc += (int)m.get("sjbc");
 				sddf += (int)m.get("sddf");
 				zddf += (int)m.get("zddf");
-				dxtz += (int)m.get("dxtz");
+//				dxtz += (int)m.get("dxtz");
 				lbtz += (int)m.get("lbtz");
 			}
 			tempMap.put("date", date);
@@ -1995,22 +2004,22 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			tempMap.put("sddf", sddf);
 			tempMap.put("zddf", zddf);
 			tempMap.put("dfhj", sddf + zddf);
-			tempMap.put("dxtz", dxtz);
+//			tempMap.put("dxtz", dxtz);
 			tempMap.put("lbtz", lbtz);
 			tempMap.put("correct", sddf + zddf + dxtz + lbtz);
 			tempMap.put("dfbl", df.format((double)(sddf + zddf)/sjbc*100) + "%");
 			tempMap.put("dxbl", df.format((double)(dxtz)/sjbc*100) + "%");
 			tempMap.put("lbbl", df.format((double)(lbtz)/sjbc*100) + "%");
 			tempMap.put("correctbl", df.format((double)(sddf + zddf + dxtz + lbtz)/sjbc*100) + "%");
-			tempMap.put("workList", keyMap0.get(key));
+//			tempMap.put("workList", keyMap0.get(key));
 			String key1 = keys[0];
 			if(!keyMap1.containsKey(key1))
 				keyMap1.put(key1, new ArrayList<Map<String, Object>>());
 			keyMap1.get(key1).add(tempMap);
-		}
+		}*/
-		for(String key : keyMap1.keySet()){
+		/*for(String key : keyMap1.keySet()){
 			Map<String, Object> tempMap = new HashMap<String, Object>();
 			int sjbc = 0, sddf = 0, zddf = 0,
 					dxtz = 0, lbtz = 0, lines = 0;
@@ -2018,7 +2027,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 				sjbc += (int)m.get("sjbc");
 				sddf += (int)m.get("sddf");
 				zddf += (int)m.get("zddf");
-				dxtz += (int)m.get("dxtz");
+//				dxtz += (int)m.get("dxtz");
 				lbtz += (int)m.get("lbtz");
 				lines += (int)m.get("lines");
 			}
@@ -2029,17 +2038,17 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			tempMap.put("sddf", sddf);
 			tempMap.put("zddf", zddf);
 			tempMap.put("dfhj", sddf + zddf);
-			tempMap.put("dxtz", dxtz);
+//			tempMap.put("dxtz", dxtz);
 			tempMap.put("lbtz", lbtz);
 			tempMap.put("correct", sddf + zddf + dxtz + lbtz);
 			tempMap.put("dfbl", df.format((double)(sddf + zddf)/sjbc*100) + "%");
 			tempMap.put("dxbl", df.format((double)(dxtz)/sjbc*100) + "%");
 			tempMap.put("lbbl", df.format((double)(lbtz)/sjbc*100) + "%");
 			tempMap.put("correctbl", df.format((double)(sddf + zddf + dxtz + lbtz)/sjbc*100) + "%");
-			tempMap.put("workList", keyMap1.get(key));
+//			tempMap.put("workList", keyMap1.get(key));
 			resList.add(tempMap);
-		}
+		}*/
 		if(resList.size() != 0){
 			Map<String, Object> tempMap = new HashMap<String, Object>();
@@ -2049,10 +2058,10 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 				sjbc += (int)m.get("sjbc");
 				sddf += (int)m.get("sddf");
 				zddf += (int)m.get("zddf");
-				dxtz += (int)m.get("dxtz");
+//				dxtz += (int)m.get("dxtz");
 				lbtz += (int)m.get("lbtz");
-				lines += (int)m.get("lines");
-				for(Map<String, Object> m0 : (List<Map<String, Object>>)m.get("workList")){
+//				lines += (int)m.get("lines");
+				/*for(Map<String, Object> m0 : (List<Map<String, Object>>)m.get("workList")){
 					Map<String, Object> temp = new HashMap<String, Object>();
 					temp.put("date", "合计");
 					temp.put("lines", m0.get("lines"));
@@ -2060,15 +2069,15 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					temp.put("sddf", m0.get("sddf"));
 					temp.put("zddf", m0.get("zddf"));
 					temp.put("dfhj", m0.get("dfhj"));
-					temp.put("dxtz", m0.get("dxtz"));
+//					temp.put("dxtz", m0.get("dxtz"));
 					temp.put("lbtz", m0.get("lbtz"));
 					temp.put("correct", m0.get("correct"));
 					temp.put("dfbl", m0.get("dfbl"));
 					temp.put("dxbl", m0.get("dxbl"));
 					temp.put("lbbl", m0.get("lbbl"));
 					temp.put("correctbl", m0.get("correctbl"));
-					((List<Map<String, Object>>)m0.get("workList")).add(temp);
-				}
+//					((List<Map<String, Object>>)m0.get("workList")).add(temp);
+				}*/
 				Map<String, Object> temp = new HashMap<String, Object>();
 				temp.put("date", "合计");
 				temp.put("lines", m.get("lines"));
@@ -2076,14 +2085,14 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 				temp.put("sddf", m.get("sddf"));
 				temp.put("zddf", m.get("zddf"));
 				temp.put("dfhj", m.get("dfhj"));
-				temp.put("dxtz", m.get("dxtz"));
+//				temp.put("dxtz", m.get("dxtz"));
 				temp.put("lbtz", m.get("lbtz"));
 				temp.put("correct", m.get("correct"));
 				temp.put("dfbl", m.get("dfbl"));
 				temp.put("dxbl", m.get("dxbl"));
 				temp.put("lbbl", m.get("lbbl"));
-				temp.put("correctbl", m.get("correctbl"));
-				((List<Map<String, Object>>)m.get("workList")).add(temp);
+//				temp.put("correctbl", m.get("correctbl"));
+//				((List<Map<String, Object>>)m.get("workList")).add(temp);
 			}
 			tempMap.put("date", "合计");
 			tempMap.put("lines", lines);
@@ -2091,16 +2100,99 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			tempMap.put("sddf", sddf);
 			tempMap.put("zddf", zddf);
 			tempMap.put("dfhj", sddf + zddf);
-			tempMap.put("dxtz", dxtz);
+//			tempMap.put("dxtz", dxtz);
 			tempMap.put("lbtz", lbtz);
-			tempMap.put("correct", sddf + zddf + dxtz + lbtz);
+			tempMap.put("correct", sddf + zddf  + lbtz);
 			tempMap.put("dfbl", df.format((double)(sddf + zddf)/sjbc*100) + "%");
-			tempMap.put("dxbl", df.format((double)(dxtz)/sjbc*100) + "%");
+			
 			tempMap.put("lbbl", df.format((double)(lbtz)/sjbc*100) + "%");
-			tempMap.put("correctbl", df.format((double)(sddf + zddf + dxtz + lbtz)/sjbc*100) + "%");
+//			tempMap.put("correctbl", df.format((double)(sddf + zddf + dxtz + lbtz)/sjbc*100) + "%");
 			resList.add(tempMap);
 		}
-		
+		//计算掉线调整
+		String sqldot = "select * from "
+        		+ "logger_sch_modify where gsbm =? and fgsbm=? and rq BETWEEN ? and  ?  order by line_code,sch_id";
+        		
+		;
+        List<SchEditInfoDto> listDot = jdbcTemplate.query(sqldot, 
+       		 new BeanPropertyRowMapper(SchEditInfoDto.class),company,subCompany,map.get("startDate").toString(),map.get("endDate").toString());
+        int dxtzz=0;
+        Map<String, Object> mapSchId=new HashMap<String,Object>();
+        for (int i = 0; i < resList.size(); i++) {
+        	Map<String, Object> resMap=resList.get(i);
+        	String date_1=resMap.get("date").toString();
+        	int sjbc=Integer.parseInt(resMap.get("sjbc").toString());
+        	int correct=Integer.parseInt(resMap.get("correct").toString());
+        	
+        	if(date_1.equals("合计")){
+        		resMap.put("dxtz", dxtzz);
+        		resMap.put("correct",correct+dxtzz);
+        		if(sjbc<=0){
+        			resMap.put("dxbl", "0");
+        			resMap.put("correctbl", "0");
+        		}else{
+        			resMap.put("dxbl", df.format((double)(dxtzz)/sjbc*100) + "%");
+        			resMap.put("correctbl", df.format((double)(correct+dxtzz)/sjbc*100) + "%");
+        		}
+        		
+        		
+        	}else{
+        		String xlbm=resMap.get("line").toString();
+        		int dxtzf=0;
+        		for (int j = 0; j < listDot.size(); j++) {
+        			SchEditInfoDto seid=listDot.get(j);
+        			if(seid.getLineCode().equals(xlbm)){
+        				String jstype=seid.getType();
+        				String json="";
+    					if(seid.getJsonArray()!=null){
+    						json =seid.getJsonArray().toString();
+    					}
+        				if(!json.equals("")){
+        					if(jstype.equals("FCXXWT")){
+	        					JSONArray jsonArray = JSONArray.parseArray(json);  
+	        					for (int x = 0; x < jsonArray.size(); x++) {
+	        						Map<String, Object> jsonObject=jsonArray.getJSONObject(x);
+	        						String title=jsonObject.get("title")==null?"":jsonObject.get("title").toString();
+	        						if(mapSchId.get(String.valueOf(seid.getSchId()))==null){
+		        						if(title.equals("调整实发时间") || title.equals("调整实达时间")){
+		        							if(jsonObject.get("old")==null){
+		        								dxtzf++;
+		        								dxtzz++;
+		        								mapSchId.put(String.valueOf(seid.getSchId()), seid.getSchId());
+		        							}
+		        						}
+	        						}
+	        						
+	        					}
+        					}
+        					if(jstype.equals("SFTZ")){
+        						Gson gson = new Gson();
+        						Map<String, Object> map_js = new HashMap<String, Object>();
+        						map_js = gson.fromJson(json, map.getClass());
+	        					if(mapSchId.get(String.valueOf(seid.getSchId()))==null){
+	        							if(map_js.get("old")==null){
+	        								dxtzf++;
+	        								dxtzz++;
+	        								mapSchId.put(String.valueOf(seid.getSchId()), seid.getSchId());
+	        							}
+	    						}
+        					}
+        				}
+        			}
+				}
+        		resMap.put("dxtz", dxtzf);
+        		resMap.put("correct",correct+dxtzf);
+        		if(sjbc<=0){
+        			resMap.put("dxbl", "0");
+        			resMap.put("correctbl", "0");
+        		}else{
+        			resMap.put("dxbl", df.format((double)(dxtzf)/sjbc*100) + "%");
+        			resMap.put("correctbl", df.format((double)(correct+dxtzf)/sjbc*100) + "%");
+        		}
+        		resMap.put("xlname",BasicData.lineCode2NameMap.get(xlbm));
+        	}
+		}
+      
 		return resList;
 	}
@@ -668,25 +668,23 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 	 * @return String
 	 */ 
 	public String  newTextFileToFTP(List<Object[]> objects,Integer lineId) {
-		
 		// 返回值String
 		String stationRStr = "";
-		
 		// windows下的文本文件换行符
 		//String enterStr = "\r\n";
-		
 		// linux/unix下的文本文件换行符
 		String enterStr = "\r";
-		
+		int defaultZdxh = 0;
 		if(objects.size()>0) {
-			
 			for(int i = 0; i<objects.size();i++) {
-				
+				defaultZdxh ++ ;
 				// 经度
-				String lng = objects.get(i)[0].equals("") ? "" : objects.get(i)[0].toString();
+				String lng = objects.get(i)[0].equals("") ? "0" : objects.get(i)[0].toString();
 				// 纬度
-				String lat = objects.get(i)[1].equals("") ? "" : objects.get(i)[1].toString();
+				String lat = objects.get(i)[1].equals("") ? "0" : objects.get(i)[1].toString();
+				
+				Point point = new Point(Double.valueOf(lng), Double.valueOf(lat));
 				lat = "\t" +  lat;
@@ -696,23 +694,32 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 				String stationMake = "";
 				if(stationMakeStr.equals("E")) {
-					
 					stationMake = "\t2";
-					
 				}else {
-					
 					stationMake ="\t1";
-					
 				}
 				// 站点序号 
-				String stationNo =  objects.get(i)[4].equals("") ? "" : objects.get(i)[4].toString();
+				// String stationNo =  objects.get(i)[4].equals("") ? "" : objects.get(i)[4].toString();
+				String stationNo =  String.valueOf(defaultZdxh);
 				stationNo = "\t" + stationNo;
 				// 站点编码
 				String stationCode = objects.get(i)[5].equals("") ? "" : objects.get(i)[5].toString();
+				int len = stationCode.length();
+				if(len<8) {
+					int dx = 8 - len;
+					String addStr = "";
+					for(int p =0;p<dx;p++) {
+						addStr  = addStr + "0";
+					}
+					stationCode = addStr + stationCode;
+				}else if(len>8){
+					stationCode = stationCode.substring(8);
+				}
+				
 				stationCode =  "\t" +stationCode;
 				double dis = objects.get(i)[6]==null  ? 0.0 : Double.parseDouble(objects.get(i)[6].toString())*1000;
@@ -732,41 +739,33 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 				// 限速
 				String sleepStr = "";
-				
 				// 方向
 				int directions = objects.get(i)[8]==null ? null : Integer.valueOf(objects.get(i)[8].toString());
-				
 				/** 获取路段路由信息 @pararm：<lineId：线路ID；directions：方向> */
 				List<Object[]> sobje = routeRepository.sectionRouteVector(lineId,directions);
-				
 				if(sobje.size()==1) {
-					
-					double dsleepStr = sobje.get(0)[2] == null ? 60d : Double.valueOf(sobje.get(0)[2].toString());
-					
-					sleepStr =  "\t" +  new DecimalFormat("0").format(dsleepStr);
-					
+					int dsleepStr = sobje.get(0)[2] == null || sobje.get(0)[2].equals("") ? 60 : Integer.valueOf(sobje.get(0)[2].toString());
+					sleepStr =  "\t" +  String.valueOf(dsleepStr);
 				}else if(sobje.size()>1){
-					
-					/** 这里暂时只根据站点名称去匹配所在路段的限速值 ，如果路段名称"至"之前的地名与站点名称等同，就认为站点在路段上。 */
 					for(int j =0;j<sobje.size();j++) {
-						
-						String sectionName = sobje.get(j)[3].toString();
-						
-						String sectionNameA[] = sectionName.split("至");
-						
-						if(stationName.equals(sectionNameA[0])){
-							
-							/*sleepStr = sobje.get(j)[2].toString();*/
-							
-							double dsleepStrt = sobje.get(0)[2] == null ? 60d : Double.valueOf(sobje.get(j)[2].toString());
-							
-							sleepStr =  "\t" +  new DecimalFormat("0").format(dsleepStrt);
-							
+						double dsleepStrt = sobje.get(j)[2] == null || sobje.get(j)[2].equals("") ? 60d : Double.valueOf(sobje.get(j)[2].toString());
+						String pointsStr = sobje.get(j)[1]==null || sobje.get(j)[1].equals("") ? null : sobje.get(j)[1].toString();
+						pointsStr = pointsStr.substring(11, pointsStr.length()-1);
+						List<Point> ps = new ArrayList<>();
+						String[] pArray = pointsStr.split(",");
+						for(int a = 0; a <pArray.length; a++) {
+							String[] tmepA = pArray[a].split(" ");
+							Point temp = new Point(Double.valueOf(tmepA[0]), Double.valueOf(tmepA[1]));
+							ps.add(temp);
+						}
+						if(GeoUtils.isInSection(ps, point)) {
+							sleepStr = "\t" + String.valueOf((int)dsleepStrt);
+							break;
 						}
-						
 					}
 				}
-				
+				if(sleepStr.equals("")) 
+					sleepStr  =  "\t" + "60";
 				stationRStr = stationRStr + lng + lat + stationMake + stationNo + stationCode + staitondistance + sleepStr + stationName + enterStr;
 			}
@@ -785,9 +784,12 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 			for(int i = 0; i<objects.size();i++) {
 				if(Integer.valueOf(objects.get(i)[8].toString())==0) {
 					// 经度
-					String lng = objects.get(i)[0].equals("") ? "" : objects.get(i)[0].toString();
+					String lng = objects.get(i)[0].equals("") ? "0" : objects.get(i)[0].toString();
+					
 					// 纬度
-					String lat = objects.get(i)[1].equals("") ? "" : objects.get(i)[1].toString();
+					String lat = objects.get(i)[1].equals("") ? "0" : objects.get(i)[1].toString();
+					
+					Point point = new Point(Double.valueOf(lng), Double.valueOf(lat));
 					lat = "\t" +  lat;
 					// 站点类型
 					String stationMakeStr =  objects.get(i)[3].equals("") ? "" : objects.get(i)[3].toString();
@@ -802,6 +804,17 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 					String stationNo = "\t" + xh;
 					// 站点编码
 					String stationCode = objects.get(i)[5].equals("") ? "" : objects.get(i)[5].toString();
+					int len = stationCode.length();
+					if(len<8) {
+						int dx = 8 - len;
+						String addStr = "";
+						for(int p =0;p<dx;p++) {
+							addStr  = addStr + "0";
+						}
+						stationCode = addStr + stationCode;
+					}else if(len>8){
+						stationCode = stationCode.substring(8);
+					}
 					stationCode =  "\t" +stationCode;
 					double dis = objects.get(i)[6]==null  ? 0.0 : Double.parseDouble(objects.get(i)[6].toString())*1000;
 					String tempDistc = String.valueOf((int) dis);
@@ -817,20 +830,28 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 					/** 获取路段路由信息 @pararm：<lineId：线路ID；directions：方向> */
 					List<Object[]> sobje = routeRepository.sectionRouteVector(lineId,directions);
 					if(sobje.size()==1) {
-						double dsleepStr = sobje.get(0)[2] == null ? 60d : Double.valueOf(sobje.get(0)[2].toString());
-						sleepStr =  "\t" +  new DecimalFormat("0").format(dsleepStr);
+						int dsleepStr = sobje.get(0)[2] == null || sobje.get(0)[2].equals("") ? 60 : Integer.valueOf(sobje.get(0)[2].toString());
+						sleepStr =  "\t" +  String.valueOf(dsleepStr);
 					}else if(sobje.size()>1){
-						/** 这里暂时只根据站点名称去匹配所在路段的限速值 ，如果路段名称"至"之前的地名与站点名称等同，就认为站点在路段上。 */
 						for(int j =0;j<sobje.size();j++) {
-							String sectionName = sobje.get(j)[3].toString();
-							String sectionNameA[] = sectionName.split("至");
-							if(stationName.equals(sectionNameA[0])){
-								/*sleepStr = sobje.get(j)[2].toString();*/
-								double dsleepStrt = sobje.get(0)[2] == null ? 60d : Double.valueOf(sobje.get(j)[2].toString());
-								sleepStr =  "\t" +  new DecimalFormat("0").format(dsleepStrt);
+							double dsleepStrt = sobje.get(j)[2] == null || sobje.get(j)[2].equals("") ? 60d : Double.valueOf(sobje.get(j)[2].toString());
+							String pointsStr = sobje.get(j)[1]==null || sobje.get(j)[1].equals("") ? null : sobje.get(j)[1].toString();
+							pointsStr = pointsStr.substring(11, pointsStr.length()-1);
+							List<Point> ps = new ArrayList<>();
+							String[] pArray = pointsStr.split(",");
+							for(int a = 0; a <pArray.length; a++) {
+								String[] tmepA = pArray[a].split(" ");
+								Point temp = new Point(Double.valueOf(tmepA[0]), Double.valueOf(tmepA[1]));
+								ps.add(temp);
+							}
+							if(GeoUtils.isInSection(ps, point)) {
+								sleepStr = "\t" + String.valueOf((int)dsleepStrt);
+								break;
 							}
 						}
 					}
+					if(sleepStr.equals("")) 
+						sleepStr  =  "\t" + "60";
 					xh++;
 					restStr = restStr + lng + lat + stationMake + stationNo + stationCode + staitondistance + sleepStr + stationName + enterStr;
 				}
@@ -930,7 +930,8 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 			Float x = map.get("x").equals("") ? null  : Float.parseFloat(map.get("x").toString());
 			Float y = map.get("y").equals("") ?  null  : Float.parseFloat(map.get("y").toString());
 			// 更新
-			repository.stationUpdate(stationCod, zdmc, roadCoding, dbType, bJwpoints, gLonx, gLaty, x, y, bPloygonGrid, gPloygonGrid, destroy, radius, shapesType, versions, descriptions, stationId);
+			/*repository.stationUpdate(stationCod, zdmc, roadCoding, dbType, bJwpoints, gLonx, gLaty, x, y, bPloygonGrid, gPloygonGrid, destroy, radius, shapesType, versions, descriptions, stationId);*/
+			repository.stationUpdate(stationCod, zdmc, roadCoding, dbType, bJwpoints, gLonx, gLaty, x, y, bPloygonGrid, gPloygonGrid, radius, shapesType, versions, descriptions, stationId);
 			// 站点路由Id
 			Integer stationRouteId = map.get("stationRouteId").equals("") ? null : Integer.parseInt(map.get("stationRouteId").toString());
 			StationRoute resultS = routeRepository.findOne(stationRouteId); 
@@ -16,6 +16,7 @@ import com.bsth.repository.schedule.*;
 import com.bsth.repository.traffic.SKBUploadLoggerRepository;
 import com.bsth.security.util.SecurityUtils;
 import com.bsth.service.TrafficManageService;
+import com.bsth.service.traffic.YgcBasicDataService;
 import com.bsth.util.TimeUtils;
 import com.bsth.util.db.DBUtils_MS;
 import com.bsth.webService.trafficManage.geotool.services.InternalPortType;
@@ -23,6 +24,7 @@ import com.bsth.webService.trafficManage.geotool.services.Internal;
 import com.bsth.webService.trafficManage.org.tempuri.Results;
 import com.bsth.webService.trafficManage.org.tempuri.WebServiceLocator;
 import com.bsth.webService.trafficManage.org.tempuri.WebServiceSoap;
+import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.time.DateUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -99,7 +101,7 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 	// 线路站点repository
 	@Autowired
-	private StationRepository stationRepository;
+	private YgcBasicDataService ygcBasicDataService;
 	// 运管处接口
@@ -122,11 +124,6 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 	DecimalFormat format = new DecimalFormat("0.00");
 	// 用户名
-	private final String userNameXl = "pudong";
-	// 密码
-	private final String passwordXl = "pudong123";
-
-	// 用户名
 	private final String userNameOther = "user";
 	// 密码
 	private final String passwordOther = "user";
@@ -134,34 +131,25 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 	 * 上传线路信息
 	 */
 	@Override
-	public String setXL(Map<String, Object> param) {
+	public String setXL(String ids) {
 		String result = "failure";
 		StringBuffer sBuffer = new StringBuffer();
+		String[] idArray = ids.split(",");
 		try {
-			Map<String,Object> map = new HashMap<String,Object>();
-			map.put("lineCode_eq", param.get("xl.lineCode_like")+"");
-			Iterator<Line> lineIterator;
-			Line line = null;
-			if(param.get("xl.lineCode_like").equals("")){
-				lineIterator = lineRepository.findAll().iterator();
-			}else {
+			for (String id : idArray) {
+				Map<String,Object> map = new HashMap<>();
+				map.put("lineCode_eq", id);
+				Line line ;
 				line = lineRepository.findOne(new CustomerSpecs<Line>(map));
-			}
-			List<StationRoute> upStationsList = null;// 上行站点路由集
-			List<StationRoute> downStationsList = null;// 下行站点路由集
-			List<LineInformation> lineInformationsList = null;
-			LineInformation lineInformation = null;
-			sBuffer.append("<Data>");
-			sBuffer.append("<RequestOrg>上海巴士拓华科技发展有限公司</RequestOrg>");
-			sBuffer.append("<DataList>");
-//			while(lineIterator.hasNext()){
-//				line = lineIterator.next();
-//				if(BasicData.lineId2ShangHaiCodeMap.get(line.getId()) == null
-//						|| line.getInUse() == 0){
-//					continue;
-//				}
-			if(BasicData.lineId2ShangHaiCodeMap.get(line.getId()) == null
-						|| line.getInUse() == 0){
+				if(line == null){
+					continue;
+				}
+				List<StationRoute> upStationsList ;// 上行站点路由集
+				List<StationRoute> downStationsList = null;// 下行站点路由集
+				sBuffer.append("<Data>");
+				sBuffer.append("<RequestOrg>上海巴士拓华科技发展有限公司</RequestOrg>");
+				sBuffer.append("<DataList>");
+				if(BasicData.lineId2ShangHaiCodeMap.get(line.getId()) == null){
 					return result;
 				}
 				sBuffer.append("<LINE_ID>").append(line.getId()).append("</LINE_ID>");
@@ -190,32 +178,24 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 					packagStationPointXml(downStationsList, sBuffer, startId);
 				}
 				sBuffer.append("</LinePointList>");
-//			}
-			sBuffer.append("</DataList>");
-			sBuffer.append("</Data>");
-			System.out.println(sBuffer.toString());
-			if(sBuffer.indexOf("<XL>") != -1){
-				portType = new Internal().getInternalHttpSoap11Endpoint();
-				String portResult = portType.setXL(userNameXl, passwordXl, sBuffer.toString());
-				String portArray[] = portResult.split("\n");
-				if(portArray.length >= 4){
-					// 返回数据的编码
-					String returnCode = portArray[1].substring(portArray[1].indexOf(">")+1,portArray[1].indexOf("</"));
-					// 返回的信息
-					String returnDescription = portArray[2].substring(portArray[2].indexOf(">")+1,portArray[2].indexOf("</"));
-					if(returnCode.equals("1")){
-						result = "success";
-					}else{
-						result = returnDescription;
-					}
+				sBuffer.append("</DataList>");
+				sBuffer.append("</Data>");
+				// 调用上传方法
+				result = ygcBasicDataService.invokeMethod("UpdateBusLineStation",sBuffer.toString());
+				String str = "ReturnCode";
+				// 解析返回值
+				result = result.substring(result.indexOf(str)+str.length()+1,result.lastIndexOf(str)-2);
+				if(result.equals("1")){
+					result = "success";
+				}else{
+					result = "failure";
 				}
+				logger.info("setXL:"+sBuffer.toString());
+				logger.info("setXL:"+result);
 			}
 		} catch (Exception e) {
 			logger.error("setXL:",e);
 			e.printStackTrace();
-		}finally{
-			logger.info("setXL:"+sBuffer.toString());
-			logger.info("setXL:"+result);
 		}
 		return result;
 	}
@@ -1146,11 +1126,14 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 			}else{
 				flag = 0;
 			}
-			result += flag;
-			if(i !=ruleDayArray.length -1){
-				result +=",";
+			if(flag > 0){
+				result += flag + ",";
 			}
 		}
+		// 去掉最后一个字符
+		if(StringUtils.endsWith(result,",")){
+			result = StringUtils.removeEnd(result,",");
+		}
 		return result;
 	}
 	/**
@@ -2,6 +2,7 @@ package com.bsth.service.realcontrol.impl;
 import com.bsth.common.ResponseCode;
 import com.bsth.data.BasicData;
+import com.bsth.data.Station2ParkBuffer;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.entity.realcontrol.ChildTaskPlan;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
@@ -45,14 +46,21 @@ public class ChildTaskPlanServiceImpl extends BaseServiceImpl&lt;ChildTaskPlan, Lon
         try {
             ScheduleRealInfo sch = dayOfSchedule.get(t.getSchedule().getId());
             //保存起终点名称
-            String prefix = sch.getXlBm() + "_" + sch.getXlDir() + "_";
+            //String prefix = sch.getXlBm() + "_" + sch.getXlDir() + "_";
             if(StringUtils.isEmpty(t.getStartStationName()))
-                t.setStartStationName(BasicData.getStationNameByCode(t.getStartStation(), prefix));
+                t.setStartStationName(getStationName(sch.getXlBm(), t.getStartStation()));
+                //t.setStartStationName(BasicData.getStationNameByCode(t.getStartStation(), prefix));
             if(StringUtils.isEmpty(t.getEndStationName()))
-                t.setEndStationName(BasicData.getStationNameByCode(t.getEndStation(), prefix));
+                t.setEndStationName(getStationName(sch.getXlBm(), t.getEndStation()));
+                //t.setEndStationName(BasicData.getStationNameByCode(t.getEndStation(), prefix));
             if(t.getDestroyReason() == null)
                 t.setDestroyReason("");
+
+            //烂班说明，为兼容之前的数据结构
+            if(t.isDestroy() && StringUtils.isEmpty(t.getDestroyReason()))
+                t.setDestroyReason(t.getReason());
+
             //先持久化子任务
             rs = super.save(t);
             //关联主任务
@@ -60,6 +68,9 @@ public class ChildTaskPlanServiceImpl extends BaseServiceImpl&lt;ChildTaskPlan, Lon
             dayOfSchedule.save(sch);
             //直接持久化
             //scheduleRealInfoRepository.save(sch);
+            //站到场对照
+            t.setSchedule(sch);
+            Station2ParkBuffer.put(t);
             rs.put("status", ResponseCode.SUCCESS);
             rs.put("t", sch);
@@ -71,6 +82,17 @@ public class ChildTaskPlanServiceImpl extends BaseServiceImpl&lt;ChildTaskPlan, Lon
         return rs;
     }
+    private String getStationName(String lineCode, String stationCode){
+        String name;
+        String prefix1 = lineCode + "_" + 0 + "_",
+                prefix2 = lineCode + "_" + 1 + "_";
+
+        name = BasicData.getStationNameByCode(stationCode, prefix1);
+        if(StringUtils.isEmpty(name))
+            name = BasicData.getStationNameByCode(stationCode, prefix2);
+        return name;
+    }
+
     @Override
     public Map<String, Object> delete(Long id) {
         Map<String, Object> rs;
@@ -15,9 +15,11 @@ import com.bsth.data.schedule.SchAttrCalculator;
 import com.bsth.data.schedule.ScheduleComparator;
 import com.bsth.data.schedule.edit_logs.FormLogger;
 import com.bsth.data.schedule.edit_logs.ScheduleModifyLogger;
+import com.bsth.data.schedule.edit_logs.loggers.AfterwardsLogger;
 import com.bsth.data.schedule.edit_logs.loggers.FcxxwtLogger;
 import com.bsth.data.schedule.edit_logs.service.dto.SchEditInfoDto;
 import com.bsth.data.schedule.late_adjust.LateAdjustHandle;
+import com.bsth.data.utils.CustomStringUtils;
 import com.bsth.entity.Cars;
 import com.bsth.entity.Line;
 import com.bsth.entity.Personnel;
@@ -1687,45 +1689,66 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
     public List<Map<String, Object>> accountPx(String line, String date,
                                              String code, String xlName, String px) {
 //        List<Object[]> lsitObj = scheduleRealInfoRepository.accountPx(line, date, code,px);
+    	if(!code.trim().equals("")){
+    		code=BasicData.deviceId2NbbmMap.inverse().get(code);
+    	}
+    	String fgs="";
+    	List<Line> lineList= lineRepository.findLineBygsBm("", "", line);
+    	if(lineList.size()>0){
+    		Line l=lineList.get(0);
+    		fgs=BasicData.businessFgsCodeNameMap.get(l.getBrancheCompany()+"_"+l.getCompany());
+    	}
         List<Map<String, Object>> listMap = new ArrayList<Map<String, Object>>();
-       String sql= "SELECT c.company,r.request_code,FROM_UNIXTIME(r.timestamp/1000,'%Y-%m-%d %T') as date,"
-		+ "c.inside_code FROM bsth_v_report_80 r LEFT JOIN bsth_c_cars c "
-		+ "ON c.equipment_code = r.device_id where "
-		+ "FROM_UNIXTIME(r.timestamp/1000,'%Y-%m-%d') = '"+date +"'"
-		+ "and r.line_id = "+line+" and c.inside_code like '%"+code+"%'"
-				+ "  order by c.inside_code "+px;
+       String sql= "SELECT request_code,FROM_UNIXTIME(TIMESTAMP / 1000,'%Y-%m-%d %T') as TIMESTAMP ,"
+       		+ " device_id  FROM bsth_v_report_80 WHERE "
+       		+ " FROM_UNIXTIME( TIMESTAMP / 1000,'%Y-%m-%d') = '"+date+"' AND"
+       		+ " line_id = '"+line+"' and device_id like '%"+code+"%'";
         Map<String, Object> map;
         List<Object[]> lsitObj = jdbcTemplate.query(sql,
                 new RowMapper<Object[]>() {
                     @Override
                     public Object[] mapRow(ResultSet rs, int rowNum) throws SQLException {
-                    	Object[] t = new Object[4];
-                    	t[0]=rs.getString("company");
-                    	t[1]=rs.getString("request_code");
-                    	t[2]=rs.getString("date");
-                    	t[3]=rs.getString("inside_code");
+                    	Object[] t = new Object[3];
+                    	t[0]=rs.getString("request_code");
+                    	t[1]=rs.getString("TIMESTAMP");
+                    	t[2]=rs.getString("device_id");
                         return t;
                     }
                 });
         int i = 1;
         for (Object[] obj : lsitObj) {
             if (obj != null) {
-                map = new HashMap<String, Object>();
-                map.put("num", i++);
-                map.put("xlName", xlName);
-                map.put("clZbh", obj[3]);
-                map.put("company", obj[0]);
-                map.put("requestType", "0x" + Integer.toHexString(Integer.parseInt(obj[1] + "")).toUpperCase());
-                map.put("requestTime", obj[2]);
-                listMap.add(map);
+            	 map = new HashMap<String, Object>();
+                 map.put("num", i++);
+                 map.put("xlName", xlName);
+                 map.put("clZbh", 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]);
+                 listMap.add(map);
             }
         }
-
+        if(listMap.size()>1){
+	        if(px.equals("asc")){
+	        	 Collections.sort(listMap,new AccountMap());
+	        }else{
+	        	 Collections.sort(listMap,new AccountMap2());
+	        }
+        }
         return listMap;
     }
     @Override
     public List<Map<String, Object>> account(String line, String date,
                                              String code, String xlName, String type) {
+    	if(!code.trim().equals("")){
+    		code=BasicData.deviceId2NbbmMap.inverse().get(code);
+    	}
+    	String fgs="";
+    	List<Line> lineList= lineRepository.findLineBygsBm("", "", line);
+    	if(lineList.size()>0){
+    		Line l=lineList.get(0);
+    		fgs=BasicData.businessFgsCodeNameMap.get(l.getBrancheCompany()+"_"+l.getCompany());
+    	}
         List<Object[]> lsitObj = scheduleRealInfoRepository.account(line, date, code);
         List<Map<String, Object>> listMap = new ArrayList<Map<String, Object>>();
         Map<String, Object> map;
@@ -1735,10 +1758,10 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 map = new HashMap<String, Object>();
                 map.put("num", i++);
                 map.put("xlName", xlName);
-                map.put("clZbh", obj[3]);
-                map.put("company", obj[0]);
-                map.put("requestType", "0x" + Integer.toHexString(Integer.parseInt(obj[1] + "")).toUpperCase());
-                map.put("requestTime", obj[2]);
+                map.put("clZbh", 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]);
                 listMap.add(map);
             }
         }
@@ -2554,11 +2577,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             if (a == 2) {
                 x = b + 1;
                 y = x * 2;
-                ;
             } else if (b == 1) {
                 x = b + 1;
                 y = x * 2 - 1;
-                ;
             } else {
                 x = b;
                 y = 2 * x;
@@ -3040,14 +3061,18 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         rs.put("status", ResponseCode.ERROR);
         ScheduleRealInfo oldSch = super.findById(sch.getId());
+        //事后日志记录
+        AfterwardsLogger aflog = AfterwardsLogger.start(oldSch, "事后调整");
         //换车
         if (StringUtils.isNotEmpty(sch.getClZbh()) && !oldSch.getClZbh().equals(sch.getClZbh())) {
             if (!carExist(oldSch.getGsBm(),sch.getClZbh())) {
                 rs.put("msg", "车辆 " + sch.getClZbh() + " 不存在！");
                 return rs;
-            } else
+            } else{
+                aflog.log("换车", oldSch.getClZbh(), sch.getClZbh());
                 oldSch.setClZbh(sch.getClZbh());
+            }
         }
         //换驾驶员
@@ -3057,6 +3082,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 rs.put("msg", oldSch.getXlName() + "所属的公司编码下找不到工号为【" + sch.getjGh() + "】的驾驶员");
                 return rs;
             }
+            aflog.log("换驾驶员", oldSch.getjGh()+"/"+ oldSch.getjName(),  sch.getjGh()+"/"+ sch.getjName());
             persoChange(oldSch, sch.getjGh());
         }
@@ -3067,6 +3093,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 rs.put("msg", sch.getXlName() + "所属的公司编码下找不到工号为【" + sch.getsGh() + "】的售票员");
                 return rs;
             }
+            aflog.log("换售票员", oldSch.getsGh()+"/"+ oldSch.getsName(),  sch.getsGh()+"/"+ sch.getsName());
             persoChangeSPY(oldSch, sch.getsGh());
         }
@@ -3075,12 +3102,14 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         boolean dest2 = sch.getStatus() == -1;
         if (!dest1 && dest2) {
             oldSch.destroy();
+            aflog.log("烂班");
         }
         else if(dest1 && !dest2){
             //撤销烂班
             oldSch.setJhlc(oldSch.getJhlcOrig());
             oldSch.setStatus(0);
             oldSch.calcStatus();
+            aflog.log("撤销烂班");
         }
@@ -3089,6 +3118,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
          */
         if (!oldSch.getJhlc().equals(sch.getJhlc())) {
             double jhlcNum = sch.getJhlc();
+            aflog.log("修改班次里程", oldSch.getJhlc(), jhlcNum);
             //烂班
             if(jhlcNum == 0 && oldSch.getJhlcOrig() != 0)
                 oldSch.destroy();
@@ -3101,15 +3131,30 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         }
         //待发时间
-        oldSch.setDfsj(sch.getDfsj());
+        if(!CustomStringUtils.equals(oldSch.getDfsj(), sch.getDfsj())){
+            aflog.log("修改待发时间", oldSch.getDfsj(), sch.getDfsj());
+            oldSch.setDfsj(sch.getDfsj());
+        }
         //实发时间
-        oldSch.setFcsjActual(sch.getFcsjActual());
+        if(!CustomStringUtils.equals(oldSch.getFcsjActual(), sch.getFcsjActual())){
+            aflog.log("修改实发时间", oldSch.getFcsjActual(), sch.getFcsjActual());
+            oldSch.setFcsjActual(sch.getFcsjActual());
+        }
         //实际终点
-        oldSch.setZdsjActual(sch.getZdsjActual());
+        if(!CustomStringUtils.equals(oldSch.getZdsjActual(), sch.getZdsjActual())){
+            aflog.log("修改实达时间", oldSch.getZdsjActual(), sch.getZdsjActual());
+            oldSch.setZdsjActual(sch.getZdsjActual());
+        }
+
         //备注
-        oldSch.setRemarks(sch.getRemarks());
+        if(!CustomStringUtils.equals(oldSch.getRemarks(), sch.getRemarks())){
+            aflog.log("修改备注", oldSch.getRemarks(), sch.getRemarks());
+            oldSch.setRemarks(sch.getRemarks());
+        }
         scheduleRealInfoRepository.save(oldSch);
+
+        aflog.end();
         rs.put("status", ResponseCode.SUCCESS);
         return rs;
     }
@@ -3714,7 +3759,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         List<ScheduleRealInfo> list3 = this.realScheduleList(line, date);
         Map<String, Object> nMap=new HashMap<String, Object>();
-        nMap.put("date", date);
+        nMap.put("date", xlName+date);
         nMap.put("jls", list1.get(0).get("jls"));
         nMap.put("sjgl", list1.get(0).get("sjgl"));
         for (Map<String, Object> m : list1) {
@@ -4199,4 +4244,20 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         }
         return rs;
     }
-}
 \ No newline at end of file
+}
+
+class AccountMap 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().compareTo(o2.get("clZbh").toString());
+		}
+}
+
+class AccountMap2 implements Comparator<Map<String, Object>>{
+	 @Override
+		public int compare(Map<String, Object> o1, Map<String, Object> o2) {
+			// TODO Auto-generated method stub
+			return  o2.get("clZbh").toString().compareTo(o1.get("clZbh").toString());
+		}
+}
@@ -866,7 +866,9 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 	                    ChildTaskPlan childTaskPlan = it.next();
 	                    if(childTaskPlan.getType2().equals("2")||childTaskPlan.getType2().equals("3")){
 		                    if (childTaskPlan.isDestroy()) {
-		                    	zrwjcclc=Arith.add(zrwjcclc,childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage());
+		                    	if(childTaskPlan.getReason().equals(item)){
+			                    	zrwjcclc=Arith.add(zrwjcclc,childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage());
+		                    	}
 		                    } 
 	                    }
 	                }
 package com.bsth.service.report.impl;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-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.Calendar;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.commons.lang.StringUtils;
-import org.dbunit.dataset.DataSetException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.RowMapper;
-import org.springframework.scheduling.commonj.ScheduledTimerListener;
-import org.springframework.stereotype.Service;
-
 import com.bsth.data.BasicData;
 import com.bsth.entity.Line;
 import com.bsth.entity.Personnel;
 import com.bsth.entity.StationRoute;
 import com.bsth.entity.excep.ArrivalInfo;
-import com.bsth.entity.mcy_forms.Operationservice;
 import com.bsth.entity.oil.Dlb;
 import com.bsth.entity.oil.Ylb;
 import com.bsth.entity.realcontrol.ChildTaskPlan;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
-import com.bsth.entity.schedule.SchedulePlanInfo;
 import com.bsth.repository.LineRepository;
 import com.bsth.repository.StationRouteRepository;
 import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
@@ -44,7 +15,24 @@ import com.bsth.service.report.CulateMileageService;
 import com.bsth.service.report.ReportService;
 import com.bsth.util.Arith;
 import com.bsth.util.ComparableJob;
+import com.bsth.util.ReportUtils;
 import com.bsth.util.db.DBUtils_MS;
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+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 java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.text.DecimalFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
 @Service
 public class ReportServiceImpl implements ReportService{
@@ -582,15 +570,15 @@ public class ReportServiceImpl implements ReportService{
 		 String minfcsj=jdbcTemplate.queryForObject(sqlMinYysj, String.class);
 		//查询全程
-		String sqlqc="select t.*,x.station_name as qdz_name from ( "
-				     + " (SELECT bc_type, fcsj,qdz,2 as xh,xl_dir FROM bsth_c_s_ttinfo_detail "
+		String sqlqc="select t.* from ( "
+				     + " (SELECT bc_type, fcsj,qdz,2 as xh,xl_dir,qdz_name FROM bsth_c_s_ttinfo_detail "
 					 + " where ttinfo ='"+ttinfo+"' and (bc_type='normal' || bc_type='region') "
 					 + " and fcsj <='"+minfcsj+"') "
 					 + " union "
-					 + " (SELECT bc_type, fcsj,qdz,1 as xh,xl_dir FROM bsth_c_s_ttinfo_detail "
+					 + " (SELECT bc_type, fcsj,qdz,1 as xh,xl_dir,qdz_name FROM bsth_c_s_ttinfo_detail "
 					 + " where ttinfo ='"+ttinfo+"' and (bc_type='normal' || bc_type='region') "
 					 + " and fcsj > '"+minfcsj+"') "
-					 + "order by  xl_dir,xh,fcsj ) t left join bsth_c_station x on t.qdz=x.id";
+					 + "order by  xl_dir,xh,fcsj ) t ";
 		List<Map<String, String>> qclist= jdbcTemplate.query(sqlqc,
 				 new RowMapper<Map<String, String>>(){
 			 @Override
@@ -631,12 +619,12 @@ public class ReportServiceImpl implements ReportService{
 					sxbc++;
 					upfcsj.add(m.get("fcsj"));
 					if(sxqdz.length() == 0 && m.containsKey("qdz_name"))
-						sxqdz = m.get("qdz_name");
+						sxqdz = m.get("qdz_name")==null?"":m.get("qdz_name").toString();
 				} else {
 					xxbc++;
 					downfcsj.add(m.get("fcsj"));
 					if(xxqdz.length() == 0 && m.containsKey("qdz_name"))
-						xxqdz = m.get("qdz_name");
+						xxqdz = m.get("qdz_name")==null?"":m.get("qdz_name").toString();
 				}
 			}
 			if(upfcsj.size() != 0)
@@ -1459,7 +1447,6 @@ public class ReportServiceImpl implements ReportService{
 			}
 			//所有班次信息
 			 List<ScheduleRealInfo> list = new ArrayList<ScheduleRealInfo>();
-	        
 	        line =line.trim();
 	        if(line.equals("")){
 	            //查询所有线路
@@ -1469,7 +1456,6 @@ public class ReportServiceImpl implements ReportService{
 	            list = scheduleRealInfoRepository.scheduleByDateAndLineTj2(line, date,date2);
 	        }
-	        
 	        String sql="select r.xl_bm"
 					+ " from bsth_c_s_sp_info_real r where"
 					+ " r.schedule_date_str BETWEEN  '"+date+"' and '"+date2+"'";
@@ -1490,7 +1476,6 @@ public class ReportServiceImpl implements ReportService{
 						return ve;
 					}
 				});
-		       
 		       for (int i = 0; i < listLine.size(); i++) {
 		    	   List<ScheduleRealInfo> lists = new ArrayList<ScheduleRealInfo>();
 		    	   String lineStr=listLine.get(i);
@@ -1511,6 +1496,22 @@ public class ReportServiceImpl implements ReportService{
 		    	   Map<String, Object> newMap=staticTj(list,"f");
 		    	   lMap.add(newMap);
 		       }
+		       if(type.equals("export")){
+		    	    List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+		            Map<String, Object> m = new HashMap<String, Object>();
+		            m.put("date", date);
+		            m.put("date1", date2);
+		            ReportUtils ee = new ReportUtils();
+		            try {
+		                listI.add(lMap.iterator());
+		                String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
+		                ee.excelReplace(listI, new Object[]{m}, path + "mould/countByLine.xls",
+		                        path + "export/线路公里统计表.xls");
+		            } catch (Exception e) {
+		                // TODO: handle exception
+		                e.printStackTrace();
+		            }
+		       }
 			return lMap;
 		}
@@ -1533,6 +1534,8 @@ public class ReportServiceImpl implements ReportService{
 		    	if(list.size()>0){
 		    		if(status.equals("f")){
 		    			map.put("xlName","合计");
+		    			map.put("gs", "");
+				        map.put("fgs", "");
 		    		}else{
 		    			map.put("xlName", list.get(0).getXlName());
 				        map.put("gs", list.get(0).getGsName());
@@ -1588,13 +1591,16 @@ public class ReportServiceImpl implements ReportService{
 			        map.put("ssgl_other", culateService.culateSsMileXx(list, "其他"));
-			        double zrwjcclc=culateService.culateZrwJccLc(list, "");
-			        
+			        double zrwjcclc=culateService.culateZrwJccLc(list, "故障");
+			        double zrwjcclc1=culateService.culateZrwJccLc(list, "肇事");
+			        double zrwjcclc2=culateService.culateZrwJccLc(list, "纠纷");
 			        map.put("zrwjcclc", zrwjcclc);
-			        
+			        map.put("zrwjcclc1", zrwjcclc1);
+			        map.put("zrwjcclc2", zrwjcclc2);
+			        double zrwjcc=Arith.add(Arith.add(zrwjcclc, zrwjcclc1), zrwjcclc2);
 			        double kfks=culateService.culateKfksLc(lists);
 			        map.put("kfks", kfks);
-			        double zlc=Arith.add(Arith.add(Arith.add(zrwjcclc, ljlc), 
+			        double zlc=Arith.add(Arith.add(Arith.add(zrwjcc, ljlc), 
 			        		Arith.add(zjcclc, zyylc)),kfks);
@@ -1659,7 +1665,6 @@ public class ReportServiceImpl implements ReportService{
 					ylbSql += " and xlbm = '"+line+"'";
 				}
 		       List<Ylb> ylbList=ylbList(ylbSql);
-		       
 		       String dlbSql=" select * from bsth_c_dlb where rq BETWEEN '"+date+"' and '"+date2+"'";
 		       if(line.equals("")){
 		    	   dlbSql +="and ssgsdm='"+gsdm+"' "
@@ -1668,7 +1673,6 @@ public class ReportServiceImpl implements ReportService{
 					dlbSql += " and xlbm = '"+line+"'";
 				}
 		       List<Dlb> dlbList=dlbList(dlbSql);
-	        
 	        String sql="select r.xl_bm,r.schedule_date_str,r.cl_zbh,r.j_gh,r.s_gh"
 	        		+ " from bsth_c_s_sp_info_real r where"
 			        + " r.schedule_date_str BETWEEN  '"+date+"' and '"+date2+"'";
@@ -1692,7 +1696,6 @@ public class ReportServiceImpl implements ReportService{
 					return map;
 				}
 			});
-		    
 			 for (int i = 0; i < listGroupBy.size(); i++) {
 				Map<String, Object> m=listGroupBy.get(i);
 				String xl_bm=m.get("line")==null?"":m.get("line").toString();
@@ -1795,7 +1798,6 @@ public class ReportServiceImpl implements ReportService{
 				}
 			}
-			 
 			 if(!zt.equals("zbh")){
 				 String sqls="select r.xl_bm,r.cl_zbh,r.j_gh,r.s_gh"
 			        		+ " from bsth_c_s_sp_info_real r where"
@@ -1822,6 +1824,28 @@ public class ReportServiceImpl implements ReportService{
 					 lMap=lists(listGroupBys, lMaps, gsdm, fgsdm, date, date2);
 			 }
+			 if(type.equals("export")){
+		    	    List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+		            Map<String, Object> m = new HashMap<String, Object>();
+		            m.put("date", date);
+		            m.put("date1", date2);
+		            String xls="";
+		            if(zt.equals("zbh")){
+		            	xls="countByBus1.xls";
+		            }else{
+		            	xls="countByBus2.xls";
+		            }
+		            ReportUtils ee = new ReportUtils();
+		            try {
+		                listI.add(lMap.iterator());
+		                String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
+		                ee.excelReplace(listI, new Object[]{m}, path + "mould/"+xls,
+		                        path + "export/路单数据统计表.xls");
+		            } catch (Exception e) {
+		                // TODO: handle exception
+		                e.printStackTrace();
+		            }
+		       }
 			return lMap;
 		}
@@ -1831,6 +1855,7 @@ public class ReportServiceImpl implements ReportService{
 					@Override
 					public Ylb mapRow(ResultSet arg0, int arg1) throws SQLException {
 						Ylb y = new Ylb();
+						y.setRq(arg0.getDate("rq"));
 						y.setXlbm(arg0.getString("xlbm"));
 						y.setNbbm(arg0.getString("nbbm"));
 						y.setJzl(arg0.getDouble("jzl"));
@@ -1847,6 +1872,7 @@ public class ReportServiceImpl implements ReportService{
 					@Override
 					public Dlb mapRow(ResultSet arg0, int arg1) throws SQLException {
 						Dlb y = new Dlb();
+						y.setRq(arg0.getDate("rq"));
 						y.setXlbm(arg0.getString("xlbm"));
 						y.setNbbm(arg0.getString("nbbm"));
 						y.setCdl(arg0.getDouble("cdl"));
@@ -9,5 +9,13 @@ public interface YgcBasicDataService {
      * 更新运管处基础数据
      */
     void updateYgcBasicData();
+
+    /**
+     * 调用方法
+     * @param methodName 方法名
+     * @param param 参数
+     * @return
+     */
+    String invokeMethod(String methodName,String param);
 }
@@ -7,6 +7,7 @@ import org.apache.axiom.om.*;
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.axis2.client.Options;
 import org.apache.axis2.client.ServiceClient;
+import org.apache.axis2.rpc.client.RPCServiceClient;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -18,6 +19,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NodeList;
 import javax.activation.DataHandler;
+import javax.xml.namespace.QName;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import java.io.*;
@@ -42,14 +44,17 @@ public class YgcBasicDataServiceImpl implements YgcBasicDataService{
     JdbcTemplate jdbcTemplate;
     private static String IP = "218.242.195.76:9091";
-    private static String targetEndpoint = "http://" + IP +"/ygc.TransManager.Basicdown?wsdl";
+    private static String downTargetEndpoint = "http://" + IP +"/ygc.TransManager.Basicdown?wsdl";
+    private static String upTargetEndpoint = "http://" + IP +"/ygc.TransManager.BasicUpload?wsdl";
     private static String namespace = "http://service.shygc.com";
     private static String userName = "admin";
     private static String passWord = "000000";
-    private static EndpointReference targetEPR;
+    private static EndpointReference downTargetEPR;
+    private static EndpointReference upTargetEPR;
     {
         try {
-            targetEPR = new EndpointReference(targetEndpoint);
+            downTargetEPR = new EndpointReference(downTargetEndpoint);
+            upTargetEPR = new EndpointReference(upTargetEndpoint);
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -102,7 +107,7 @@ public class YgcBasicDataServiceImpl implements YgcBasicDataService{
             ServiceClient sender = new ServiceClient();
             Options options = sender.getOptions();
             options.setProperty("SO_TIMEOUT", Integer.valueOf(1800000));
-            options.setTo(targetEPR);
+            options.setTo(downTargetEPR);
             sender.setOptions(options);
             System.out.println("The data in method download: " + data);
             data.build();
@@ -280,4 +285,37 @@ public class YgcBasicDataServiceImpl implements YgcBasicDataService{
         flag = true;
         return flag;
     }
+
+    /**
+     * 调用方法
+     * @param methodName 方法名
+     * @param param 参数
+     * @return
+     */
+    public String invokeMethod(String methodName,String param){
+        String result = null;
+        try {
+            // 获得客户端
+            RPCServiceClient serviceClient = new RPCServiceClient();
+            // 可以在该对象中设置服务端的验证信息
+            Options options = serviceClient.getOptions();
+            options.setTo(upTargetEPR);
+            // 在创建QName对象时，QName类的构造方法的第一个参数表示WSDL文件的命名空间名，也就是<wsdl:definitions>元素的targetNamespace属性值
+            QName opAddEntry = new QName(namespace,methodName);
+            // 参数，如果有多个，继续往后面增加即可，不用指定参数的名称
+            Object[] opAddEntryArgs = new Object[] {param };
+            // 返回参数类型，这个和axis1有点区别
+            // invokeBlocking方法有三个参数，其中第一个参数的类型是QName对象，表示要调用的方法名；
+            // 第二个参数表示要调用的WebService方法的参数值，参数类型为Object[]；
+            // 第三个参数表示WebService方法的返回值类型的Class对象，参数类型为Class[]。
+            // 当方法没有参数时，invokeBlocking方法的第二个参数值不能是null，而要使用new Object[]{}
+            // 如果被调用的WebService方法没有返回值，应使用RPCServiceClient类的invokeRobust方法，
+            // 该方法只有两个参数，它们的含义与invokeBlocking方法的前两个参数的含义相同
+            Class[] classes = new Class[] { String.class };
+            result = serviceClient.invokeBlocking(opAddEntry,opAddEntryArgs, classes)[0].toString();
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        return result;
+    }
 }
@@ -228,7 +228,14 @@
 						 </div>
 	                </div>
 	                <!-- 是否营运 END -->
-	                
+	                 <!-- 权证车辆数 START -->
+					<div class="col-md-6">
+						<label class="control-label col-md-5"> 权证车辆数&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
+                    	<div class="col-md-4">
+                     		<input type="text" class="form-control" name="warrantCar" id="warrantCarInput" placeholder="权证车辆数">
+                    	</div>
+	                </div>
+	                <!-- 权证车辆数 END -->
                  </div>
                  <!-- 表单分组组件 form-group END -->
@@ -220,7 +220,14 @@
 						 </div>
 	                </div>
 	                <!-- 是否营运 END -->
-	                
+	                <!-- 权证车辆数 START -->
+					<div class="col-md-6">
+						<label class="control-label col-md-5"> 权证车辆数&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
+                    	<div class="col-md-4">
+                     		<input type="text" class="form-control" name="warrantCar" id="warrantCarInput" placeholder="权证车辆数">
+                    	</div>
+	                </div>
+	                <!-- 权证车辆数 END -->
                  </div>
                  <!-- 表单分组组件 form-group END -->
@@ -43,7 +43,7 @@
 			<!-- 表单内容 START -->
 			<div class="form-body">
 				<input type="hidden" name="id" id="lineId">
-				
+				<input type="hidden" name="inUse" id="inUse">
 				<!-- 表单分组组件 form-group START -->
 				<div class="form-group">
 					<!-- 线路编码 (* 必填项) START -->
@@ -229,7 +229,14 @@
 	                </div>
 	                <!-- 是否营运 END -->
-	               
+	               <!-- 权证车辆数 START -->
+					<div class="col-md-6">
+						<label class="control-label col-md-5"> 权证车辆数&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
+                    	<div class="col-md-4">
+                     		<input type="text" class="form-control" name="warrantCar" id="warrantCarInput" placeholder="权证车辆数">
+                    	</div>
+	                </div>
+	                <!-- 权证车辆数 END -->
                  </div>
                  <!-- 表单分组组件 form-group END -->
                  <!-- 表单分组组件 form-group START -->
@@ -116,6 +116,7 @@ $(function(){
 			'carSumNumber' : {number : true,digits : true,maxlength: 8},// 车辆总数 必须输入合法的数字（负数，小数）。必须输入整数。最大长度.
 			'hvacCarNumber' : {number : true,digits : true,maxlength: 8},// 空调车辆数 必须输入合法的数字（负数，小数）。 必须输入整数。 最大长度.
 			'ordCarNumber' : {number : true,digits : true,maxlength: 8},// 普通车辆数 必须输入合法的数字（负数，小数）。 必须输入整数。最大长度.
+			'warrantCar' : {number : true,digits : true,maxlength: 8},
 			'history' : {maxlength: 200},// 线路沿革 输入长度最多是 200 的字符串（汉字算一个字符）。
 			'descriptions' : {maxlength: 200}// 描述/说明 输入长度最多是 200 的字符串（汉字算一个字符）。
 		},
@@ -171,6 +171,7 @@
 			'carSumNumber' : {number : true,digits : true,maxlength: 8},// 车辆总数 必须输入合法的数字（负数，小数）。必须输入整数。最大长度.
 			'hvacCarNumber' : {number : true,digits : true,maxlength: 8},// 空调车辆数 必须输入合法的数字（负数，小数）。 必须输入整数。 最大长度.
 			'ordCarNumber' : {number : true,digits : true,maxlength: 8},// 普通车辆数 必须输入合法的数字（负数，小数）。 必须输入整数。最大长度.
+			'warrantCar' : {number : true,digits : true,maxlength: 8},
 			'history' : {maxlength: 200},// 线路沿革 输入长度最多是 200 的字符串（汉字算一个字符）。
 			'descriptions' : {maxlength: 200}// 描述/说明 输入长度最多是 200 的字符串（汉字算一个字符）。
 		},
@@ -382,13 +382,14 @@ var BaseFun = function() {
 			 * 								 
 			 * 
 			 **/ 
-			abstractBcByWorkTime : function(bxlpbc , map , dataMap , saa  , cara , bxrcObj , dgminpcs ,deletebcNum) {
+			abstractBcByWorkTime : function(bxlpbc , map , dataMap , saa  , cara , bxrcObj , dgminpcs ,deletebcNum ,zwxeLpNum) {
 				var rsultA = new Array() , dgzjsj = baseF.getDateTime('13:00');
 				// 定义13:00 ~ 晚高峰开始以前剔除规则. 如果剔除的班次数不够，则去晚高峰之后剔除剩下的班次.
 				var xwmaxtcbcNum = parseInt(( dataMap.wgfsjd[0].st - dgzjsj) / (60000 *　saa[0].zzsj.dgzzsj));
 				// 定义早高峰结束 ~ 13:00 剔除规则.如果剔除的班次数不够，则去晚高峰之后剔除剩下的班次.
 				var swmaxtcbcNum = parseInt(( dgzjsj - dataMap.zgfsjd[0].ed) / (60000 *　saa[0].zzsj.dgzzsj));
 				var sumGs = 0;
+				dgminpcs = zwxeLpNum==0 ? bxlpbc.length : dgminpcs;
 				for(var a = 0 ; a < bxlpbc.length ; a++) {
 					// 定义该版型下对应的路牌的班次数组、班次数组长度、该路牌上是否有首末班车。
 					var lpbc = bxlpbc[a].lpbc, lpbclen_ = lpbc.length;
@@ -396,6 +397,7 @@ var BaseFun = function() {
 						continue;
 					var isFlag = baseF.lpDownIsHaveFirstAndLastBc(lpbc , dataMap.smbcsjArr) , tcbcgzA = new Array();
 					if(bxrcObj.type == '五工二休') {
+						// continue;
 						// 定义晚高峰后能剔除多少班次数.
 						var wgfhtcbcNum = parseInt((  dataMap.wgfzhsjd[0].ed - dataMap.wgfsjd[0].ed ) / (60000 *　saa[0].zzsj.dgzzsj));
 						if(isFlag) {
@@ -409,11 +411,12 @@ var BaseFun = function() {
 						// 剔除不在高峰时间段内的班次.
 						baseF.spliceBc02(lpbc , tcbcgzA , dataMap , 'desc' , false);
 					}else {
+						//continue;
 						// 单档 一个路牌一档劳动力
 						if(bxlpbc[a].keepOff==1) {
 							// 如果低谷至少配车数大于零,则该班型下的路牌 存在一些 分班路牌,这里的分班 指的是 这个路牌先满足的前提条件就是 是单档。
-							// 为了满足工时的要求，在低谷断开一段时间.
-							if(dgminpcs > 0) {
+							// 为了满足工时的要求，在低谷断开一段时间.a <= dgminpcs
+							if(a <= dgminpcs) {
 								if( a % 2 == 0) {
 									if(deletebcNum < swmaxtcbcNum || isFlag) {
 										tcbcgzA.push({'minsj': dataMap.zgfsjd[0].ed , 'maxsj' : dgzjsj , 'order' : 'asc' , 'deletebcNum' : deletebcNum});
@@ -433,10 +436,10 @@ var BaseFun = function() {
 								baseF.spliceBc02(lpbc , tcbcgzA , dataMap , true);
 								baseF.affimBzGs(lpbc , bxlpbc[a].bzgs, dataMap, saa , true , a);
 							// 该班型下的路牌 不存在分班路牌.
-							}else if(dgminpcs == 0){
+							}else {
 								// 按规则剔除班次.不分班.路牌班次不会断开.
 								baseF.isdk02(lpbc , dataMap , saa , deletebcNum , false);
-								//baseF.affimBzGs(lpbc , bxlpbc[a].bzgs, dataMap, saa , false , a);
+								baseF.affimBzGs(lpbc , bxlpbc[a].bzgs, dataMap, saa , false , a);
 							}
 						// 双档 一个路牌两档劳动力
 						}else if(bxlpbc[a].keepOff==2) {
@@ -459,8 +462,8 @@ var BaseFun = function() {
 				var markAfterGs = baseF.getSumWorkTime(tList , dataMap, saa);
 				var gsDx = parseFloat((markAfterGs - bzgs).toFixed(2));
 				lpbc.sort(function(m,n){return m.fcno-n.fcno});
-				if(isOff) {
-					if(gsDx > 1.5) {
+				if(gsDx > 1.5) {
+					if(isOff) {
 						var hoursDx = parseFloat((gsDx - 1.5).toFixed(2));
 						// console.log(gsDx , hoursDx ,Math.ceil(hoursDx*60));
 						var minueDx = Math.ceil(hoursDx*60);
@@ -471,14 +474,15 @@ var BaseFun = function() {
 									lpbc.splice( (s+1) , bs*2);
 								}else {
 									lpbc.splice( s , bs*2);
+									lpbc[s-bs*2 +1].isfb = 1;
+									lpbc[s-bs*2 +1].STOPTIME = 0;
 								}
 								break;
 							}
 						}
+					}else {
 					}
-				}else {
-					
 				}
 			},
@@ -606,8 +610,10 @@ var BaseFun = function() {
 						// 判断是否在高峰时间范围.【true--表示在，false--表示不在】.
 						if(!baseF.isPeakTimeScope(fcsj,dataMap) && fcsj > tcbcgzA[t].minsj && fcsj < tcbcgzA[t].maxsj) {
 							if(order == 'asc') {
-								arr[a-1].isfb =  isfb ? 1 : 0;
-								arr[a-1].STOPTIME = 0;
+								if(a>0) {
+									arr[a-1].isfb =  isfb ? 1 : 0;
+									arr[a-1].STOPTIME = 0;
+								}
 							}else if(order == 'desc') {
 								var index_ = a + tcbcgzA[t].deletebcNum * 2;
 								arr[index_].STOPTIME = 0;
@@ -636,6 +642,7 @@ var BaseFun = function() {
 					dgmaxtzsj = parseInt(map.dgmaxtzsj);
 				// 计算低谷最少配车数 (低谷上行行驶时间 + 低谷下行行驶时间 +  低谷最大停站时间*2) / 低谷最大发车间隙.
 				var dgminpcs = Math.round((dataMap.dgxxsjArr[0] + dataMap.dgxxsjArr[1] + dataMap.dgtzsj[0] +  dataMap.dgtzsj[1]) / dgmaxfcjx);
+				var zwxeLpNum = baseF.cuontZwxeLpNum(bxrclist);
 				// var dgminpcs = 4;
 				// 定义返回数组.
 				var rs = new Array();
@@ -710,12 +717,23 @@ var BaseFun = function() {
 						avgMakerCarNum = parseInt(avgMakerCarNum / bxlpbc.length);
 						// console.log(bxlpbc);
 						// 调整某班型下的各个路牌对应的班次以及工时、停站时间、是否分班.
-						rs = rs.concat(baseF.abstractBcByWorkTime(bxlpbc , map , dataMap , saa  , cara , bxrclist[x] , dgminpcs , avgMakerCarNum));
+						rs = rs.concat(baseF.abstractBcByWorkTime(bxlpbc , map , dataMap , saa  , cara , bxrclist[x] , dgminpcs , avgMakerCarNum ,zwxeLpNum));
 					}
 				}
 				return rs;
 			},
+			cuontZwxeLpNum : function(list) {
+				var count = 0;
+				for(var c = 0 ; c<list.length;c++) {
+					if(list[c].type == '五工二休') {
+						count = list[c].fpcls;
+						break;
+					}
+				}
+				return count;
+			},
+			
 			/**
 			 * @description (TODO) 更新路牌数组的路牌名称.
 			 * @param cara 路牌数组
@@ -762,7 +780,11 @@ var BaseFun = function() {
 			 * 							相同班型下的日平均工时满足 参数的日平均工时 范围在 [10分钟]内浮动.
 			 * 
 			 * 				
-			 * 				第七步 确定吃饭时间.
+			 * 				第七步 确定吃饭时间(吃时间初步定位20分钟). 一般情况下
+			 * 					
+			 * 								早餐 :10:15以后到12:30之间用餐的12:30是指用餐结束时间哦.
+			 * 
+			 * 								午餐 :一般在18:00以后在19:00以前.
 			 * 
 			 * 				第八步 确定进出场、早晚例保时间.
 			 * 
@@ -771,19 +793,17 @@ var BaseFun = function() {
 			BXPplaceClassesTime02 : function(saa , cara , map , seMap , dataMap) {
 				// 第一步 根据表单中的参数得到所有路牌下的班次数[从各路牌下的第一个班次发车时间 到 营运结束时间点并且是连续的班次数].
-				var jsonArray = baseF.GetByArgusInitAllLpDownedBcCollections(saa , cara , map , seMap , dataMap);
-				 
+				var allLMapBc = baseF.GetByArgusInitAllLpDownedBcCollections(saa , cara , map , seMap , dataMap);
+				
 				// 第二步 纵向调整 
-				baseF.evenStartDepartSpace(jsonArray , dataMap);
+				baseF.evenStartDepartSpace(allLMapBc , dataMap);
 				// 第三步 剔除首末班车以外的班次，并确认首末班车.
-				var markArray = baseF.markFirstAndLastBusAlsoDietNotInRangeBc(jsonArray , dataMap);
-				
+				var markArray = baseF.markFirstAndLastBusAlsoDietNotInRangeBc(allLMapBc , dataMap);
+				// return {'json':markArray,'bxrcgs':null};
 				// 第四步 横向调整 
 				baseF.resizeByPitStopTime(cara , markArray , dataMap);
-				
 				// return {'json':markArray,'bxrcgs':null};
-				
 				/**
 				 * 第五步 把班型合理的分配到各个路牌上.
 				 * 
@@ -797,7 +817,132 @@ var BaseFun = function() {
 				baseF.bxAlloTotLp(list,cara);
 				// 第六步 抽车来满足工时.
 				var tempA = baseF.abstractCar(list , markArray , cara , saa , dataMap , map);
-				return {'json':baseF.addjcclcbc01(cara,tempA,dataMap,saa,map),'bxrcgs':null};
+				// return {'json':tempA,'bxrcgs':null};
+				// 第七步 确定吃饭时间. 
+				baseF.markeEatTime(list , tempA , cara , saa , dataMap ,map);
+				baseF.resizeByPitStopTime(cara , tempA , dataMap);
+				baseF.updfcno01(tempA,0);
+				// return {'json':tempA,'bxrcgs':null};
+				// 确定进出场、早晚例保时间.并返回班次数组集合
+				return {'json':baseF.addInOutFieldBc(cara,tempA,dataMap,saa,map),'bxrcgs':null};
+			},
+			
+			markeEatTime : function(list , markArray , cara , saa , dataMap ,map) {
+				var cfddDm = parseInt(map.cfdd);
+				var mLen = markArray.length,cLen=cara.length,sLen =list.length ;
+				if(mLen<=0 || cLen<=0 || sLen<=0)
+					return false;
+				for(var c = 0 ; c<cLen ; c++) {
+					var lpNo=cara[c].lpNo,lpType;
+					for(var s = 0 ; s<sLen;s++ ) {
+						if(list[s].sslp[0].lpNo==lpNo) {
+							lpType = list[s].type;
+							break;
+						}
+					}
+					if(lpType=='五工二休')
+						continue;
+					var lpbcArray = new Array();
+					for(var m = 0 ; m < mLen; m++) {
+						if(markArray[m].lpNo==lpNo)
+							lpbcArray.push(markArray[m]);
+					}
+					lpbcArray.sort(function(a,b){return a.fcint - b.fcint});
+					baseF.isHaveBc(baseF.getDateTime('10:15') , baseF.getDateTime('12:15'),lpbcArray,cfddDm ,dataMap , cara[c] ,map, markArray, 0);
+					baseF.isHaveBc(baseF.getDateTime('18:00') , baseF.getDateTime('19:00'),lpbcArray,cfddDm ,dataMap , cara[c] ,map, markArray, 1);
+				}
+			},
+			
+			isHaveBc : function(kssj , jssj , bcArray,cfddDm , dataMap , lpObj , map, markArray , cfIndex) {
+				var canCf = new Array(), countTzsj = 0, isLast = new Array();
+				for(var b = 0 ; b<bcArray.length;b++) {
+					var bcddsj = baseF.getDateTime(bcArray[b].ARRIVALTIME);
+					if(bcddsj<=jssj) {
+						countTzsj += bcArray[b].STOPTIME;
+						canCf.push(bcArray[b]);
+					}
+					/*if(bcddsj>= kssj && bcddsj<=jssj) {
+						countTzsj += bcArray[b].STOPTIME;
+						canCf.push(bcArray[b]);
+					}
+					if(bcddsj < kssj)
+						isLast.push(bcArray[b]);*/
+				}
+				if(canCf.length>0) {
+					console.log('countTzsj:' + countTzsj + 'length:' + canCf.length);
+					var fxDm = baseF.dirDmToIndex(canCf[canCf.length-1].xlDir);
+					// console.log(countTzsj , canCf[canCf.length-1].fcsj);
+					if(cfddDm == fxDm && canCf.length>2) {
+						var tzdx = canCf[canCf.length-2].STOPTIME - dataMap.zwcArr[cfIndex];
+						canCf[canCf.length-2].STOPTIME = tzdx >= 0 ? tzdx : 0;
+						var obj = baseF.getbcObj(
+								baseF.getDateTime(canCf[canCf.length-2].ARRIVALTIME),dataMap.zwcArr[cfIndex],lpObj,dataMap.bcTypeArr.cf,
+								dataMap.dira[cfddDm], canCf[canCf.length-1].fcno+1 , 0 , map , 0 , null , null , null , 0 , 0);
+						markArray.push(obj);
+						if(tzdx<0) {
+							// canCf[canCf.length-1].STOPTIME = 0;
+							var fcsj = baseF.getDateTime(canCf[canCf.length-2].ARRIVALTIME);
+							fcsj.setMinutes(fcsj.getMinutes() + canCf[canCf.length-2].STOPTIME + dataMap.zwcArr[cfIndex]);
+							canCf[canCf.length-1].fcsj = baseF.getTimeStr(fcsj); 
+							fcsj.setMinutes(fcsj.getMinutes() + canCf[canCf.length-1].bcsj);
+							canCf[canCf.length-1].ARRIVALTIME = baseF.getTimeStr(fcsj);
+						}
+					}else {
+						var obj = baseF.getbcObj(
+								baseF.getDateTime(canCf[canCf.length-1].ARRIVALTIME),dataMap.zwcArr[cfIndex],lpObj,dataMap.bcTypeArr.cf,
+								dataMap.dira[cfddDm], canCf[canCf.length-1].fcno+1 , 0 , map , 0 , null , null , null , 0 , 0);
+						markArray.push(obj);
+						
+					}
+				}
+				/*if(canCf.length>0) {
+					var fxDm = baseF.dirDmToIndex(canCf[canCf.length-1].xlDir);
+					// console.log(countTzsj , canCf[canCf.length-1].fcsj);
+					if(cfddDm == fxDm && canCf.length>2) {
+						var tzdx = canCf[canCf.length-2].STOPTIME - dataMap.zwcArr[cfIndex];
+						canCf[canCf.length-2].STOPTIME = tzdx >= 0 ? tzdx : 0;
+						var obj = baseF.getbcObj(
+								baseF.getDateTime(canCf[canCf.length-2].ARRIVALTIME),dataMap.zwcArr[cfIndex],lpObj,dataMap.bcTypeArr.cf,
+								dataMap.dira[cfddDm], canCf[canCf.length-1].fcno+1 , 0 , map , 0 , null , null , null , 0 , 0);
+						markArray.push(obj);
+						if(tzdx<0) {
+							// canCf[canCf.length-1].STOPTIME = 0;
+							var fcsj = baseF.getDateTime(canCf[canCf.length-2].ARRIVALTIME);
+							fcsj.setMinutes(fcsj.getMinutes() + canCf[canCf.length-2].STOPTIME + dataMap.zwcArr[cfIndex]);
+							canCf[canCf.length-1].fcsj = baseF.getTimeStr(fcsj); 
+							fcsj.setMinutes(fcsj.getMinutes() + canCf[canCf.length-1].bcsj);
+							canCf[canCf.length-1].ARRIVALTIME = baseF.getTimeStr(fcsj);
+						}
+					}else {
+						var obj = baseF.getbcObj(
+								baseF.getDateTime(canCf[canCf.length-1].ARRIVALTIME),dataMap.zwcArr[cfIndex],lpObj,dataMap.bcTypeArr.cf,
+								dataMap.dira[cfddDm], canCf[canCf.length-1].fcno+1 , 0 , map , 0 , null , null , null , 0 , 0);
+						markArray.push(obj);
+						
+					}
+				}else if(isLast.length>0) {
+					var fxDm = baseF.dirDmToIndex(isLast[isLast.length-1].xlDir);
+					if(cfddDm ==fxDm &&　canCf.length>2) {
+						var tzdx = canCf[canCf.length-2].STOPTIME - dataMap.zwcArr[cfIndex];
+						canCf[canCf.length-2].STOPTIME = tzdx >= 0 ? tzdx : 0;
+						var obj = baseF.getbcObj(
+								baseF.getDateTime(isLast[isLast.length-2].ARRIVALTIME),dataMap.zwcArr[cfIndex],lpObj,dataMap.bcTypeArr.cf,
+								dataMap.dira[cfddDm], isLast[isLast.length-1].fcno+1 , 0 , map , 0 , null , null , null , 0 , 0);
+						markArray.push(obj);
+						if(tzdx<0) {
+							var fcsj = baseF.getDateTime(isLast[isLast.length-2].ARRIVALTIME);
+							fcsj.setMinutes(fcsj.getMinutes() + isLast[isLast.length-2].STOPTIME + dataMap.zwcArr[cfIndex]);
+							isLast[isLast.length-1].fcsj = baseF.getTimeStr(fcsj); 
+							fcsj.setMinutes(fcsj.getMinutes() +isLast[isLast.length-1].bcsj);
+							isLast[isLast.length-1].ARRIVALTIME = baseF.getTimeStr(fcsj);
+						}
+					}else {
+						var obj = baseF.getbcObj(
+								baseF.getDateTime(isLast[isLast.length-1].ARRIVALTIME),dataMap.zwcArr[cfIndex],lpObj,dataMap.bcTypeArr.cf,
+								dataMap.dira[cfddDm], isLast[isLast.length-1].fcno+1 , 0 , map , 0 , null , null , null , 0 , 0);
+						markArray.push(obj);
+					}
+				}*/
 			},
 			/**
@@ -930,12 +1075,13 @@ var BaseFun = function() {
 				var lLen = list.length , cLen = clzs.length;
 				if(lLen<= 0 || cLen<=0 )
 					return false;
-				// 最多车次与总车次的比例.
-				var blnum = Math.round(cLen/list[0].fpcls);
+				list.sort(function(a,b){return a.fpcls-b.fpcls});
 				// 定义已经分配出去的路牌.
 				var rs = new Array();
 				// 遍历
 				for(var r = 0 ; r < lLen ; r++) {
+					// 车次与总车次的比例.
+					var blnum = Math.round(cLen/list[r].fpcls);
 					// 得到没有分配出去的路牌.
 					var dxa = baseF.chaji_array(clzs,rs);
 					// 定义当前车次数.
@@ -943,29 +1089,32 @@ var BaseFun = function() {
 					// 定义记录当前分割路牌的次数下标.分配到班型车次下的路牌数组.
 					var index = 0 , sslp = new Array();
 					// 当前车次所有占比例.
-					var tempint = parseInt(rsnum/blnum);
+					//var tempint = parseInt(rsnum/blnum);
 					// 判断如果比例小1 则为当前车次数.
-					blnum = tempint <= 1 ? rsnum : blnum;
+					//blnum = tempint <= 1 ? rsnum : blnum;
 					// 判断当前班型车次数组下标值.如果为倒数第二个或者之前.
 					if(r < lLen-1) {
 						// 遍历
-						for(var c = 0 ; c < tempint ; c++) {
+						for(var c = 0 ; c < rsnum ; c++) {
 							// 创建新的没有分配出去的路牌数组.
 							var temp = dxa.concat();
 							// 创建切割路牌数组.
 							var tagA = new Array(); 
 							// 判断切割的下标值是否小于等于路牌数组的倒数第二个或者之前.
 							if(index <= (dxa.length-blnum) ) {
-								tagA = temp.splice(index,blnum);
+								/*tagA = temp.splice(index,blnum);*/
+								tagA = temp.splice(index,1);
 							}else {
-								tagA = temp.splice((dxa.length-blnum),blnum);
+								/*tagA = temp.splice((dxa.length-blnum),blnum);*/
+								tagA = temp.splice((dxa.length-blnum),1);
 							}
 							// 组合切割路牌数组.赋值给已分配出去的路牌.
 							rs = rs.concat(tagA);
 							// 赋值给分配到班型车次下的路牌数组.
 							sslp = sslp.concat(tagA);
 							// 记录切割下标.
-							index = index + 1 + blnum;
+							index = index + blnum;
+							// index = index  + blnum;
 						}
 						// 分配到班型车次下的路牌数组.
 						list[r].sslp = sslp;
@@ -1084,6 +1233,7 @@ var BaseFun = function() {
 							if(len_>0 && bcCount > 0) {
 								// 定义该时间区间内的发车间隙.
 								var _fcjx = parseInt(Math.ceil(zzsj/bcCount));
+								console.log(_fcjx);
 								if(tagboolean) {
 									if(_fcjx>gfmaxfcjx)
 										_fcjx = 20;
@@ -1091,7 +1241,6 @@ var BaseFun = function() {
 									if(_fcjx>dgmaxfcjx)
 										_fcjx = dgmaxfcjx;
 								}
-								// console.log(_fcjx);
 								// 定义修改班次的起始时间点.
 								var fcnosj = new Date(kssj);
 								for(var l = 0 ; l< len_ ; l++) {
@@ -1154,8 +1303,10 @@ var BaseFun = function() {
 					var sslpbcA = new Array();
 					for(var j =0 ; j < tLen ; j++) {
 						// 判断当期遍历的班次是否属于当前的路牌.如果是则添加到当前的路牌班次数组集合.
-						if(tempa[j].lpNo == cara[t].lpNo)
+						if(tempa[j].lpNo == cara[t].lpNo) {
+							tempa[j].fcint = baseF.getDateTime(tempa[j].fcsj).getTime();
 							sslpbcA.push(tempa[j]);
+						}
 					}
 					if(sslpbcA.length > 0) {
 						// 按发车时间顺序排序.
@@ -1166,10 +1317,10 @@ var BaseFun = function() {
 							var sgbcfcsj = baseF.getDateTime(sslpbcA[r+1].fcsj),
 								dqbcddsj = baseF.getDateTime(sslpbcA[r].ARRIVALTIME),
 								dqbcfcsj = baseF.getDateTime(sslpbcA[r].fcsj);
+							// 定义当前班次方向下标代码[0代表上行;1代表下行].
+							var cctag = baseF.dirDmToIndex(sslpbcA[r].xlDir); //  dataMap.smbcsjArr
 							// 定义每每相邻两个班次之间的时间差分钟数(也就是停站时间.)
 							var dxmin = parseInt( (sgbcfcsj - dqbcddsj)/60000);
-							// 定义当前班次方向下标代码[0代表上行;1代表下行].
-							var cctag = baseF.dirDmToIndex(sslpbcA[r].xlDir);
 							// 定义是否高峰
 							var flag = baseF.isPeakTimeScope(dqbcfcsj , dataMap); 
 							// 获取行驶时间.
@@ -1178,40 +1329,75 @@ var BaseFun = function() {
 													 	baseF.dirDmToIndex(sslpbcA[r].xlDir));
 							normmintzsj = xxsj*0.1;
 							normmaxtzsj = xxsj*0.15;
+							var flag = false;
 							// 如果小于零
-							if(dxmin <= 0 && sslpbcA[r].isfb ==0 ) {
+							if(dxmin < 0 && sslpbcA[r].isfb ==0) {
 								// 根据不同时段的停站时间.重新赋值停站时间.
-								dxmin = flag ?  dataMap.gftzsj[cctag] : dataMap.dgtzsj[cctag]; 
+								if(sslpbcA[r].bcType=='normal' && sslpbcA[r+1].bcType =='normal') 
+									dxmin = flag ?  dataMap.gftzsj[cctag] : dataMap.dgtzsj[cctag]; 
+								else
+									dxmin = 0;
+								flag = true;
+							}else if(dxmin==0){
+								dxmin = 0;
+								flag = true;
 							}else {
 								// 如果 大于等于低谷最大停站时间 并且 小于等于三小时.则把低谷最大停站时间 作为 停站时间.
-								if(dxmin >= dgmaxtzsj && dxmin < 180) {
+								if(dxmin >= dgmaxtzsj && dxmin < 180 && sslpbcA[r].isfb==0) {
 									dxmin = dgmaxtzsj;
+									flag = true;
 								// 如果大于零 并且 小于等于行业标准的最小停站时间
 								}else if(dxmin > 0 && dxmin <= normmintzsj ) {
 									// dxmin = dxmin;
+									flag = true;
 								// 如果大于行业标准的最小停站时间  并且  小于等于行业标准的最大停站时间
 								}else if(dxmin > normmintzsj && dxmin <= normmaxtzsj ) {
 									// dxmin = dxmin;
+									flag = true;
 								// 如果大于行业标准的最大停站时间  并且 小于低谷最大停站时间
 								}else if(dxmin > normmaxtzsj && dxmin < dgmaxtzsj ) {
 									// dxmin = dxmin;
+									flag = true;
+								}else if (dxmin >= 180){
+									dxmin = 0;
+								}
+							}
+							if(flag) {
+								if(!baseF.isDirSmbc(baseF.dirDmToIndex(sslpbcA[r+1].xlDir) , sslpbcA[r+1].fcsj , dataMap)) {
+									// 修改当前班次的停站时间.
+									sslpbcA[r].STOPTIME =  parseInt(dxmin) ;
+									// 当前班次的到达时间 + 停站时间 作为下一个班次的发车时间.
+									dqbcddsj.setMinutes(dqbcddsj.getMinutes() + dxmin);
+									// 修改下一个班次的发车时间.
+									sslpbcA[r+1].fcsj = baseF.getTimeStr(dqbcddsj);
+									// 下一个班次的发车时间 + 行驶时间 作为下一个班次的到达时间.
+									dqbcddsj.setMinutes(dqbcddsj.getMinutes() + sslpbcA[r+1].bcsj);
+									// 修改下一个班次的到达时间.
+									sslpbcA[r+1].ARRIVALTIME = baseF.getTimeStr(dqbcddsj);
+								}else {
+									if(r>0) {
+										// 修改当前班次的停站时间.
+										sslpbcA[r].STOPTIME =  parseInt(dxmin) ;
+										sgbcfcsj.setMinutes(sgbcfcsj.getMinutes() - sslpbcA[r].STOPTIME);
+										sslpbcA[r].ARRIVALTIME = baseF.getTimeStr(sgbcfcsj);
+										sgbcfcsj.setMinutes(sgbcfcsj.getMinutes() - sslpbcA[r].bcsj);
+										sslpbcA[r].fcsj = baseF.getTimeStr(sgbcfcsj);
+										sslpbcA[r-1].STOPTIME = parseInt( ( sgbcfcsj -  baseF.getDateTime(sslpbcA[r-1].ARRIVALTIME))/60000);
+									} 
 								}
 							}
-							// 修改当前班次的停站时间.
-							sslpbcA[r].STOPTIME =  parseInt(dxmin) ;
-							// 当前班次的到达时间 + 停站时间 作为下一个班次的发车时间.
-							dqbcddsj.setMinutes(dqbcddsj.getMinutes() + dxmin);
-							// 修改下一个班次的发车时间.
-							sslpbcA[r+1].fcsj = baseF.getTimeStr(dqbcddsj);
-							// 下一个班次的发车时间 + 行驶时间 作为下一个班次的到达时间.
-							dqbcddsj.setMinutes(dqbcddsj.getMinutes() + sslpbcA[r+1].bcsj);
-							// 修改下一个班次的到达时间.
-							sslpbcA[r+1].ARRIVALTIME = baseF.getTimeStr(dqbcddsj);
 						}
 					}
 				}
 			},
+			isDirSmbc : function(dirDm , fcsj ,  dataMap) {
+				var falg = false;
+				if(fcsj == dataMap.smbcsjArr[dirDm].kssj || fcsj == dataMap.smbcsjArr[dirDm].jssj)
+					falg = true;
+				return falg;
+			},
+			
 			BXPplaceClassesTime01 : function(saa,cara,map,seMap,dataMap,lpNoA) {
 				var jsonArray = baseF.plgfbc(saa,cara,map,seMap,dataMap);
 				var list = baseF.splitBxRc(map.bxrc);
@@ -1297,10 +1483,19 @@ var BaseFun = function() {
 									dataMap.smbcsjArr,dataMap.ccsjArr,dataMap.cclcArr,dataMap.qdzArr,saa[0].lbsj,dataMap);*/
 				var rsjar = baseF.tzsztest(cara,jar3,dataMap);
 				// return {'json':rsjar,'bxrcgs':bxrcgs};
-				return {'json':baseF.addjcclcbc01(cara,rsjar,dataMap,saa,map),'bxrcgs':bxrcgs};
+				return {'json':baseF.addInOutFieldBc(cara,rsjar,dataMap,saa,map),'bxrcgs':bxrcgs};
 			},
-			addjcclcbc01 : function(cara,rsjar,dataMap,saa,map) {
+			/**
+			 * @description (TODO) 添加进出场班次.
+			 * @param cara 路牌
+			 * @param rsjar 班次集合数组
+			 * @param dataMap dataMap 封装的 以上、下行方向成对存在的 一些参数数组 [下标0 -- 代表上行 ; 下标1 -- 代表下行].
+			 * @param saa 封装的一些 停站时间、周转时间、行驶时间、行驶里程等.
+			 * @param map  表单参数对象.
+			 * 
+			 */
+			addInOutFieldBc : function(cara,rsjar,dataMap,saa,map) {
 				var resultJA = new Array(),bcs = 0;
 				for(var m = 0 ; m < cara.length; m++) {
 					// 获取路牌编号.
@@ -1319,7 +1514,7 @@ var BaseFun = function() {
 					lpbc_.sort(function(a,b){return a.fcno-b.fcno});
 					baseF.addcfbc01(lpbc_,dataMap,map);
 					// 按照发车序号顺序排序.
-					// lpbc_.sort(function(a,b){return a.fcno-b.fcno});
+					lpbc_.sort(function(a,b){return a.fcno-b.fcno});
 					var tt = baseF.addjclbbc01(lpbc_,dataMap,saa[0].lbsj,map);
 					bcs = baseF.updfcno01(tt,bcs);
 					resultJA = resultJA.concat(tt);
@@ -1344,8 +1539,8 @@ var BaseFun = function() {
 			addcfbc01 : function(lpbcar,dataMap,map) {
 				var gs = 0 ,sicftag = true;
 				for(var g = 0 ; g <lpbcar.length-1;g++ ) {
-					if( parseInt((baseF.getDateTime(lpbcar[g+1].fcsj)  - baseF.getDateTime(lpbcar[g].ARRIVALTIME))/60000) > 80 
-							&& lpbcar[g].STOPTIME==0  ) {
+					if( parseInt((baseF.getDateTime(lpbcar[g+1].fcsj)  - baseF.getDateTime(lpbcar[g].ARRIVALTIME))/60000) > 180 
+							&& lpbcar[g].STOPTIME==0 && lpbcar[g].bcType =='normal' ) {
 						lpbcar[g].isfb = 1;
 					}
 					/*gs = gs + lpbcar[g].bcsj + lpbcar[g].STOPTIME;
@@ -1767,25 +1962,7 @@ var BaseFun = function() {
 								dqbcfcsj,dataMap.ccsjArr[fxdm],car,dataMap.bcTypeArr.out,
 								dataMap.dira[fxdm],2,dataMap.cclcArr[fxdm],gatps,0,dataMap.qdzArr[fxdm],null,null,0,0));// 出场班次
 						fcno ++;
-					}/*else if(b > 0 && b < bc.length-1){
-						var jcbckssj =  baseF.getDateTime(bc[b].ARRIVALTIME)
-						var ccbckssj = baseF.getDateTime(bc[b+1].fcsj)
-						var dx = parseInt((ccbckssj - jcbckssj)/60000);
-						if(bc[b].STOPTIME==0) {
-							 // bc[b].STOPTIME = 0;
-							//console.log(bc[b].fcno);
-							var fcno_ =  bc[b].fcno + 2;
-							stas = true;
-							// console.log(bc[b],bc[b+1],b);
-							result.push(baseF.getbcObj(
-									jcbckssj,dataMap.jcsjArr[fxdm],car,dataMap.bcTypeArr.in_,
-									dataMap.dira[fxdm],fcno_++,dataMap.jclcArr[fxdm],gatps,0,dataMap.qdzArr[fxdm],null,null,0,0));// 进场班次
-							var ccfx = baseF.dirDmToIndex(bc[b+1].xlDir);
-							result.push(baseF.getbcObj(
-									ccbckssj,dataMap.ccsjArr[ccfx],car,dataMap.bcTypeArr.out,
-									dataMap.dira[ccfx],fcno_++,dataMap.cclcArr[ccfx],gatps,0,dataMap.qdzArr[ccfx],null,null,0,0));// 出场班次
-						}
-					}*/else if(b==bc.length-1){
+					}else if(b==bc.length-1){
 						var fcno_ =  dxfno + 2;
 						var qdbcddsj = baseF.getDateTime(bc[b].ARRIVALTIME);
 						result.push(baseF.getbcObj(
@@ -968,7 +968,7 @@ var RelationshipGraph = function () {
     			for(var z = 0 ;z < tza.length;z++) {
     				if(tza[z].lpNo == lpNo && tza[z].bcsj >0 ) {
     					timeNum = timeNum + tza[z].bcsj + tza[z].STOPTIME;
-    					if( tza[z].bcType !='bd' && tza[z].bcType !='lc' ) {
+    					if( tza[z].bcType !='bd' && tza[z].bcType !='lc' && tza[z].bcType !='cf') {
     						tempNum ++;
     					}
     				}
@@ -983,32 +983,6 @@ var RelationshipGraph = function () {
     			$(textNodes[1]).text("总班次:"+(tempNum));
     			// $_this.pptjbx($("."+className).children("rect")[2],zgs*1,lpNo,$_this);
     		}
-    		/*for(var a=0;a<array.length;a++) {
-    			debugger;
-    			var tempNum = 0,timeNum = 0,lpNo = '';
-    			for(var g = 0 ; g <gdata.length;g++) {
-    				var temp_i =  parseInt(d3.select(gdata[g]).attr('y'))-this.configuration.offsetY;
-    				if(temp_i<array[a] && temp_i>minValue) {
-    					var parentNodeCName =  d3.select(gdata[g]).attr('id'),
-    						// nodes = d3.selectAll('text[parent-node='+ parentNodeCName +']')[0]
-    						$_d =  d3.select(gdata[g]).data()[0];
-    					lpNo = $_d.lpNo;
-    					timeNum = timeNum  + parseInt($_d.STOPTIME) + parseInt($_d.bcsj);
-    					if($_d.bcType!='bd' && $_d.bcType!='lc' && $_d.bcType!='cf' && $_d.bcsj>0)
-    						tempNum++;
-    				}
-    			}
-    			minValue = array[a];
-    			var className = 'statis_container_' + array[a];
-    			var textNodes = $("."+className).children("text");
-    			var hours = parseInt(timeNum/60);
-    			var mimus = timeNum%60,zgs =  hours +  (mimus==0? "": "." + mimus);
-    			var zgs = parseFloat((timeNum/60).toFixed(2));
-    			var zgs = timeNum;
-    			$(textNodes[0]).text("总工时:" + zgs);
-    			$(textNodes[1]).text("总班次:"+(tempNum));
-    			$_this.pptjbx($("."+className).children("rect")[2],zgs*1,lpNo,$_this);
-    		}*/
     	}
     }, {
@@ -3027,7 +3001,9 @@ var RelationshipGraph = function () {
 			nowDate.setMinutes(parseInt(tm.min)+d.bcsj);// 10.3.1、设置分钟.
 			// 9.1.4、修改当前班次的到达时间.
 			d.ARRIVALTIME  =  BaseFun.getTimeStr(nowDate);
-			d.STOPTIME = d.isfb ==1 ? 0 : parseInt((BaseFun.getDateTime(nodeContext.nextData.fcsj) -  BaseFun.getDateTime(d.ARRIVALTIME))/ 60000);
+			d.STOPTIME = d.isfb == 1 ? 0 : parseInt((BaseFun.getDateTime(nodeContext.nextData.fcsj) -  BaseFun.getDateTime(d.ARRIVALTIME))/ 60000);
+			// parseInt((BaseFun.getDateTime(nodeContext.nextData.fcsj) -  BaseFun.getDateTime(d.ARRIVALTIME))/ 60000)
+			
     		/**
     		 * 9.2、修改元素沿X轴方向的X坐标属性值. 
     		 * 
@@ -3144,6 +3120,38 @@ var RelationshipGraph = function () {
 					}
 	    		}
 			}else {
+				var dataMap = $_GlobalGraph.configuration.dataMap;
+    			// 定义是否高峰
+    			var flag = BaseFun.isPeakTimeScope(BaseFun.getDateTime(nodeContext.lastData.fcsj) , dataMap); 
+    			// 定义当前班次方向下标代码[0代表上行;1代表下行].
+    			var cctag = BaseFun.dirDmToIndex(nodeContext.lastData.xlDir);
+    			// 获取行驶时间.
+    			var xxsj = BaseFun.getByDirTravelTime(dataMap.zgfsjd , dataMap.wgfsjd , nowDate, dataMap.pcxssjArr , dataMap.gfxxsjArr ,  cctag);
+    			var normmintzsj = xxsj*0.1,normmaxtzsj = xxsj*0.15;
+    			// 如果小于零
+    			if(dxMinues <= 0 && nodeContext.lastData.isfb ==0 ) {
+    				// 根据不同时段的停站时间.重新赋值停站时间.
+    				dxmin = flag ?  dataMap.gftzsj[cctag] : dataMap.dgtzsj[cctag]; 
+    			}else {
+    				// 如果 大于等于低谷最大停站时间 并且 小于等于三小时.则把低谷最大停站时间 作为 停站时间.
+    				if(dxMinues >= dataMap.dgmaxtzsj && dxMinues < 180) {
+    					dxMinues = dataMap.dgmaxtzsj;
+    				// 如果大于零 并且 小于等于行业标准的最小停站时间
+    				}else if(dxMinues > 0 && dxMinues <= normmintzsj ) {
+    					// dxmin = dxmin;
+    				// 如果大于行业标准的最小停站时间  并且  小于等于行业标准的最大停站时间
+    				}else if(dxMinues > normmintzsj && dxMinues <= normmaxtzsj ) {
+    					// dxmin = dxmin;
+    				// 如果大于行业标准的最大停站时间  并且 小于低谷最大停站时间
+    				}else if(dxMinues > normmaxtzsj && dxMinues < dataMap.dgmaxtzsj ) {
+    					// dxmin = dxmin;
+    				}else if (dxMinues >= 180){
+    					dxMinues = 0;
+    				}
+    			}
+    			// 修改当前班次的停站时间.
+    			// nodeContext.lastData.STOPTIME = dxMinues;
+    			// d.STOPTIME =  parseInt(dxmin) ;
 				/**
 				 * 11.2.1、如果是正常班次
 				 * 
@@ -3370,11 +3378,41 @@ var RelationshipGraph = function () {
         					}
         	    		}
     				}else {
+    					var dxMinues =  parseInt((BaseFun.getDateTime(d.fcsj) - BaseFun.getDateTime(_obj.lastData.ARRIVALTIME)) / 60000);
     					/**
         				 * 1.5.6、修改上个元素班次与当前班次的停站时间和text元素的文本属性值.
         				 * 
         				 **/
-            			 _obj.lastData.STOPTIME = parseInt((BaseFun.getDateTime(d.fcsj) - BaseFun.getDateTime(_obj.lastData.ARRIVALTIME)) / 60000);
+    					var dataMap = $_GlobalGraph.configuration.dataMap;
+    	    			// 定义是否高峰
+    	    			var flag = BaseFun.isPeakTimeScope(BaseFun.getDateTime(nodeContext.lastData.fcsj) , dataMap); 
+    	    			// 定义当前班次方向下标代码[0代表上行;1代表下行].
+    	    			var cctag = BaseFun.dirDmToIndex(nodeContext.lastData.xlDir);
+    	    			// 获取行驶时间.
+    	    			var xxsj = BaseFun.getByDirTravelTime(dataMap.zgfsjd , dataMap.wgfsjd , nowDate, dataMap.pcxssjArr , dataMap.gfxxsjArr ,  cctag);
+    	    			var normmintzsj = xxsj*0.1,normmaxtzsj = xxsj*0.15;
+    	    			// 如果小于零
+    	    			if(dxMinues <= 0 && nodeContext.lastData.isfb ==0 ) {
+    	    				// 根据不同时段的停站时间.重新赋值停站时间.
+    	    				dxmin = flag ?  dataMap.gftzsj[cctag] : dataMap.dgtzsj[cctag]; 
+    	    			}else {
+    	    				// 如果 大于等于低谷最大停站时间 并且 小于等于三小时.则把低谷最大停站时间 作为 停站时间.
+    	    				if(dxMinues >= dataMap.dgmaxtzsj && dxMinues < 180) {
+    	    					dxMinues = dataMap.dgmaxtzsj;
+    	    				// 如果大于零 并且 小于等于行业标准的最小停站时间
+    	    				}else if(dxMinues > 0 && dxMinues <= normmintzsj ) {
+    	    					// dxmin = dxmin;
+    	    				// 如果大于行业标准的最小停站时间  并且  小于等于行业标准的最大停站时间
+    	    				}else if(dxMinues > normmintzsj && dxMinues <= normmaxtzsj ) {
+    	    					// dxmin = dxmin;
+    	    				// 如果大于行业标准的最大停站时间  并且 小于低谷最大停站时间
+    	    				}else if(dxMinues > normmaxtzsj && dxMinues < dataMap.dgmaxtzsj ) {
+    	    					// dxmin = dxmin;
+    	    				}else if (dxMinues >= 180){
+    	    					dxMinues = 0;
+    	    				}
+    	    			}
+            			 _obj.lastData.STOPTIME = dxMinues;
             			for(var t = 0 ; t < _obj.lastTextNodes.length ;t++) {
             				var nowTextNode =  d3.select(_obj.lastTextNodes[t]);
         					if(nowTextNode.attr('text-type')=='gap')
@@ -420,7 +420,8 @@
 	 * @return 返回甘特图的参数配置信息.
 	 * */
 	function getGraphArgus(p) {
-		var MULTIPLE = Math.round(105/parseInt(p.stopAraay[0].sxsj)) >=4 ? Math.round(90/parseInt(p.stopAraay[0].sxsj)) :  Math.round(90/parseInt(p.stopAraay[0].sxsj)) *2;
+		var bs =  p.stopAraay[0].sxsj > 40 ? 4 : 2;
+		var MULTIPLE = Math.round(105/parseInt(p.stopAraay[0].sxsj)) >3 ? Math.round(90/parseInt(p.stopAraay[0].sxsj)) :  Math.round(90/parseInt(p.stopAraay[0].sxsj)) *bs;
 		var VALUEKEYNAME = 'Worldwide Gross' ,
 		 	DXHOURS = 24,MINUTE = 60,WIDTH = DXHOURS*MINUTE,MARGINLEFT = 380,HEIGHT = p.yAxisCarArray.length*60 + 240,
 		    MARGINBOTTOM = 240,OFFSETX = 90,OFFSETY = 180,OFFSETUPY = 120,OFFSETDOWNY = 60,
@@ -128,9 +128,9 @@
 		{{obj.vehicle}}
 	</td>
 	<td>
-		{{if obj.upDown==0}}
+		{{if obj.up_down==0}}
 			上行
-		{{else if obj.upDown==1}}
+		{{else if obj.up_down==1}}
 			下行 
 		{{else}}
 			无效
@@ -249,7 +249,7 @@ $(function(){
 		params['order'] = 'lastLoginDate';
 		params['page'] = page;
 		var i = layer.load(2);
-		$get('/speeding/pagequery' ,params, function(data){
+		$get('/gps/pagequery' ,params, function(data){
 			var bodyHtm = template('speeding_list_temp', {list: data.dataList});
 			$('#datatable_speeding tbody').html(bodyHtm)
 					.find('.icheck').iCheck(icheckOptions)
@@ -19,7 +19,6 @@
 	overflow: hidden;
 }
 </style>
-<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=IGGrr4UjwIYzatoCRFKEL8sT"></script>
 <script type="text/javascript" src="/pages/excep/js/speeding-map.js"></script>
 <script type="text/javascript">
 $(function(){
@@ -31,55 +30,71 @@ $(function(){
 		var lat = dataArr[4];//起点纬度
 		var endLon = dataArr[5];//终点经度
 		var endLat = dataArr[6];//终点纬度
-		var Points = [];
+		var pointObj;//坐标和速度组成的对象
+		var Points = [];//坐标和速度对象的集合
+		var coordinateArr = [];//坐标点数组
   		$.ajax({
         	type: "GET",
         	async:false,
             url: '/gps/findPosition',
             data: {vehicle:vehicle,startdate:startdate,enddate:enddate},
             success: function(data){
-            	console.log("123"+data);
              	$.each(data,function(i,item){
-            		console.log(item);
              		if(item.lon>1 && item.lat>1){
-			 			var point = new BMap.Point(item.lon,item.lat);
-			 			Points.push(point);
+             			pointObj = new Object();
+             			pointObj.coordinate = new BMap.Point(item.lon,item.lat);
+			 			pointObj.speed = item.speed;
+			 			Points.push(pointObj);
             		} 
  				});
             }
-        });
+        });      
  setTimeout(function(){
 		var map = SpeedingMap.init();//创建地图
 		var myP1 = new BMap.Point(lon,lat);    //起点
 		var myP2 = new BMap.Point(endLon,endLat);    //终点
- 		map.centerAndZoom(myP1,18);//地图中心点坐标
- 		console.log(Points); 
- 		var polyline = new BMap.Polyline(Points, {strokeColor:"blue", strokeWeight:5, strokeOpacity:0.5});   //创建折线	
+		var centerLon = (parseFloat(lon)+parseFloat(endLon))/2;
+		var centerLat = (parseFloat(lat)+parseFloat(endLat))/2;
+ 		map.centerAndZoom(new BMap.Point(centerLon,centerLat),18);//地图中心点坐标
+ 		
+ 		for(i in Points){
+ 			coordinateArr.push(Points[i].coordinate);
+ 		}
+ 		var polyline = new BMap.Polyline(coordinateArr, {strokeColor:"blue", strokeWeight:5, strokeOpacity:0.5});//创建折线
 		var myIcon = new BMap.Icon("/pages/excep/img/bus.png", new BMap.Size(32, 70), {//小车图片
 			imageOffset: new BMap.Size(5,20) //图片的偏移量。为了是图片底部中心对准坐标点。
 		}); 
+		
 		$(document).on('click', '#run', function() {
  			map.clearOverlays();//清空上一次的轨迹
 			map.addOverlay(polyline);//增加折线
-			var paths = Points.length;//获得有几个点
-			var carMk = new BMap.Marker(Points[0],{icon:myIcon});
+			var paths = coordinateArr.length;//获得有几个点
+			var carMk = new BMap.Marker(coordinateArr[0],{icon:myIcon});
 			map.addOverlay(carMk);
+			var sContent ="车辆即时速度:"+Points[0].speed;
+			var infoWindow = new BMap.InfoWindow(sContent);// 创建信息窗口对象
+			map.openInfoWindow(infoWindow,coordinateArr[0]); //开启信息窗口
 			i=0;
-				function resetMkPoint(i){
-					carMk.setPosition(Points[i]);
-					if(i < paths){
-						setTimeout(function(){
-							i++;
-							resetMkPoint(i);
-						},100);
-					}
+			
+			setTimeout(function(){
+				resetMkPoint(0);
+			},500);
+			
+			function resetMkPoint(i){
+				carMk.setPosition(coordinateArr[i]);
+				sContent ="车辆即时速度是:"+Points[i].speed;
+				infoWindow = new BMap.InfoWindow(sContent);// 创建信息窗口对象
+				map.openInfoWindow(infoWindow,coordinateArr[i]); //开启信息窗口
+				if(i < paths-1){
+					setTimeout(function(){
+						i++;
+						resetMkPoint(i);
+					},500);
 				}
-				setTimeout(function(){
-					resetMkPoint(0);
-				},100)
-			});	 
+			};	 
 		});
-}, 100);
+}, 500);
+ });
 </script>
@@ -86,7 +86,7 @@
 			locale : 'zh-cn'
 		});
-		$.get('/basic/lineCode2Name',function(result){
+		/* $.get('/basic/lineCode2Name',function(result){
 			var data=[];
 			for(var code in result){
@@ -94,7 +94,29 @@
 			}
 			initPinYinSelect2('#line',data,'');
-		})
+		}) */
+		
+		$.get('/report/lineList',function(xlList){
+			var data = [];
+// 			data.push({id: " ", text: "全部线路"});
+			$.get('/user/companyData', function(result){
+				for(var i = 0; i < result.length; i++){
+					var companyCode = result[i].companyCode;
+					var children = result[i].children;
+					for(var j = 0; j < children.length; j++){
+						var code = children[j].code;
+						for(var k=0;k < xlList.length;k++ ){
+							if(xlList[k]["fgsbm"]==code && xlList[k]["gsbm"]==companyCode){
+								data.push({id: xlList[k]["xlbm"], text: xlList[k]["xlname"]});
+// 								tempData[xlList[k]["xlbm"]] = companyCode+":"+code;
+							}
+						}
+					}
+				}
+				initPinYinSelect2('#line',data,'');
+				
+			});
+		});
 		//重置
         $('#czcl').on('click', function () {
             $('#code').val('').change();
@@ -217,42 +217,51 @@
 				}
 			}
 			$('#subCompany').html(options);
-			initXl();
 		}
-		$("#subCompany").on("change",initXl);
-		function initXl(){
-			var data=[];
-			data.push({id:" ", text:"全部线路"});
-			if(fage){
-				$("#line").select2("destroy").html('');
-			}
-			var fgs=$('#subCompany').val();
-			var gs=$('#company').val();
-			for(var i=0;i<xlList.length;i++){
-				if(gs!=""){
-					if(fgs!=""){
-						if(xlList[i]["fgsbm"]==fgs && xlList[i]["gsbm"]==gs){
-							data.push({id: xlList[i]["xlbm"], text: xlList[i]["xlname"]});
-						}
-					}else{
-						if(xlList[i]["gsbm"]==gs){
-							data.push({id: xlList[i]["xlbm"], text: xlList[i]["xlname"]});
+
+		var tempData = {};
+		$.get('/report/lineList',function(xlList){
+			var data = [];
+			data.push({id: " ", text: "全部线路"});
+			$.get('/user/companyData', function(result){
+				for(var i = 0; i < result.length; i++){
+					var companyCode = result[i].companyCode;
+					var children = result[i].children;
+					for(var j = 0; j < children.length; j++){
+						var code = children[j].code;
+						for(var k=0;k < xlList.length;k++ ){
+							if(xlList[k]["fgsbm"]==code && xlList[k]["gsbm"]==companyCode){
+								data.push({id: xlList[k]["xlbm"], text: xlList[k]["xlname"]});
+								tempData[xlList[k]["xlbm"]] = companyCode+":"+code;
+							}
 						}
 					}
 				}
-			}
-			initPinYinSelect2('#line',data,'');
-			fage=true;
-			
-			$("#endDate").attr("disabled", true);
-			$("#endDate").val($("#startDate").val());
-			line = data[0].id;
-			statu = 0;
-			
-			updateModel();
-		}
+				initPinYinSelect2('#line',data,'');
+				$("#endDate").attr("disabled", true);
+				$("#endDate").val($("#startDate").val());
+				line = data[0].id;
+				statu = 0;
+				
+				updateModel();
+				
+			});
+		});
+		$("#line").on("change", function(){
+			if($("#line").val() == " "){
+				$("#company").attr("disabled", false);
+				$("#subCompany").attr("disabled", false);
+			} else {
+				var temp = tempData[$("#line").val()].split(":");
+				$("#company").val(temp[0]);
+				updateCompany();
+				$("#subCompany").val(temp[1]);
+				$("#company").attr("disabled", true);
+				$("#subCompany").attr("disabled", true);
+			}
+		});
 		$("#query").on("click",jsDoQuery);
@@ -178,33 +178,44 @@
 				}
 			}
 			$('#subCompany').html(options);
-			initXl();
 		}
-		$("#subCompany").on("change",initXl);
-		function initXl(){
-			var data=[];
-			if(fage){
-				$("#line").select2("destroy").html('');
-			}
-			var fgs=$('#subCompany').val();
-			var gs=$('#company').val();
-			for(var i=0;i<xlList.length;i++){
-				if(gs!=""){
-					if(fgs!=""){
-						if(xlList[i]["fgsbm"]==fgs && xlList[i]["gsbm"]==gs){
-							data.push({id: xlList[i]["xlbm"], text: xlList[i]["xlname"]});
-						}
-					}else{
-						if(xlList[i]["gsbm"]==gs){
-							data.push({id: xlList[i]["xlbm"], text: xlList[i]["xlname"]});
+		var tempData = {};
+		$.get('/report/lineList',function(xlList){
+			var data = [];
+			$.get('/user/companyData', function(result){
+				for(var i = 0; i < result.length; i++){
+					var companyCode = result[i].companyCode;
+					var children = result[i].children;
+					for(var j = 0; j < children.length; j++){
+						var code = children[j].code;
+						for(var k=0;k < xlList.length;k++ ){
+							if(xlList[k]["fgsbm"]==code && xlList[k]["gsbm"]==companyCode){
+								data.push({id: xlList[k]["xlbm"], text: xlList[k]["xlname"]});
+								tempData[xlList[k]["xlbm"]] = companyCode+":"+code;
+							}
 						}
 					}
 				}
+				initPinYinSelect2('#line',data,'');
+				
+			});
+		});
+		
+		$("#line").on("change", function(){
+			if($("#line").val() == " "){
+				$("#company").attr("disabled", false);
+				$("#subCompany").attr("disabled", false);
+			} else {
+				var temp = tempData[$("#line").val()].split(":");
+				$("#company").val(temp[0]);
+				updateCompany();
+				$("#subCompany").val(temp[1]);
+				$("#company").attr("disabled", true);
+				$("#subCompany").attr("disabled", true);
 			}
-			initPinYinSelect2('#line',data,'');
-			fage=true;
-		}
+		});
+		
 		$('#code').select2({
 			ajax: {
@@ -112,16 +112,29 @@
 		$("#date").val(year + "-" + month + "-" + day);
 		$("#endDate").val(year + "-" + month + "-" + day);
-		$.get('/basic/lineCode2Name',function(result){
-			var data=[];
-			
-			for(var code in result){
-				data.push({id: code, text: result[code]});
-			}
-			initPinYinSelect2('#line',data,'');
-			
-		})
-		 $('#czcl').on('click', function () {
+		$.get('/report/lineList',function(xlList){
+			var data = [];
+// 			data.push({id: " ", text: "全部线路"});
+			$.get('/user/companyData', function(result){
+				for(var i = 0; i < result.length; i++){
+					var companyCode = result[i].companyCode;
+					var children = result[i].children;
+					for(var j = 0; j < children.length; j++){
+						var code = children[j].code;
+						for(var k=0;k < xlList.length;k++ ){
+							if(xlList[k]["fgsbm"]==code && xlList[k]["gsbm"]==companyCode){
+								data.push({id: xlList[k]["xlbm"], text: xlList[k]["xlname"]});
+// 								tempData[xlList[k]["xlbm"]] = companyCode+":"+code;
+							}
+						}
+					}
+				}
+				initPinYinSelect2('#line',data,'');
+				
+			});
+		});
+		
+		$('#czcl').on('click', function () {
             $('#code').val('').change();
         });
@@ -203,7 +216,7 @@
         });
 	    var line = $("#line").val();
-	    var date = $("#date").val();endDate
+	    var date = $("#date").val();
 	    var lpName = $("#lpName").val();
 	    var endDate = $("#endDate").val();
 	    var code = $("#code").val();
@@ -145,49 +145,8 @@
 		$("#times1").attr("disabled", true);
 		$("#times2").attr("disabled", true);
-// 		$.get('/basic/lineCode2Name', function(result){
-// 			var data=[];
-			
-// 			data.push({id: " ", text: "全部线路"});
-// 			for(var code in result){
-// 				data.push({id: code, text: result[code]});
-// 			}
-// 			console.log(data);
-// 			initPinYinSelect2('#line',data,'');
-// 			line = "";
-// // 			updateModel();
-// 		});
-		
-// 		var obj = [];
-// 		$.get('/user/companyData', function(result){
-// 			obj = result;
-// 			var options = '';
-// 			for(var i = 0; i < obj.length; i++){
-// 				options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
-// 			}
-// 			if(obj.length == 1){
-// 				$('#company1').hide();
-// 				if(obj[0].children.length == 1)
-// 					$('#subCompany1').hide();
-// 			}
-// 			$('#company').html(options);
-// 			updateCompany();
-// 		});
-// 		$("#company").on("change",updateCompany);
-// 		function updateCompany(){
-// 			var company = $('#company').val();
-// 			var options = '';
-// 			for(var i = 0; i < obj.length; i++){
-// 				if(obj[i].companyCode == company){
-// 					var children = obj[i].children;
-// 					for(var j = 0; j < children.length; j++){
-// 						options += '<option value="'+children[j].code+'">'+children[j].name+'</option>';
-// 					}
-// 				}
-// 			}
-// 			$('#subCompany').html(options);
-// 		}
+
 		var fage=false;
 		var xlList;
 		var obj = [];
@@ -225,36 +184,44 @@
 				}
 			}
 			$('#subCompany').html(options);
-			initXl();
 		}
-		$("#subCompany").on("change",initXl);
-		function initXl(){
-			var data=[];
-			data.push({id:" ", text:"全部线路"});
-			if(fage){
-				$("#line").select2("destroy").html('');
-			}
-			var fgs=$('#subCompany').val();
-			var gs=$('#company').val();
-			for(var i=0;i<xlList.length;i++){
-				if(gs!=""){
-					if(fgs!=""){
-						if(xlList[i]["fgsbm"]==fgs && xlList[i]["gsbm"]==gs){
-							data.push({id: xlList[i]["xlbm"], text: xlList[i]["xlname"]});
-						}
-					}else{
-						if(xlList[i]["gsbm"]==gs){
-							data.push({id: xlList[i]["xlbm"], text: xlList[i]["xlname"]});
+		var tempData = {};
+		$.get('/report/lineList',function(xlList){
+			var data = [];
+			data.push({id: " ", text: "全部线路"});
+			$.get('/user/companyData', function(result){
+				for(var i = 0; i < result.length; i++){
+					var companyCode = result[i].companyCode;
+					var children = result[i].children;
+					for(var j = 0; j < children.length; j++){
+						var code = children[j].code;
+						for(var k=0;k < xlList.length;k++ ){
+							if(xlList[k]["fgsbm"]==code && xlList[k]["gsbm"]==companyCode){
+								data.push({id: xlList[k]["xlbm"], text: xlList[k]["xlname"]});
+								tempData[xlList[k]["xlbm"]] = companyCode+":"+code;
+							}
 						}
 					}
 				}
+				initPinYinSelect2('#line',data,'');
+				
+			});
+		});
+		
+		$("#line").on("change", function(){
+			if($("#line").val() == " "){
+				$("#company").attr("disabled", false);
+				$("#subCompany").attr("disabled", false);
+			} else {
+				var temp = tempData[$("#line").val()].split(":");
+				$("#company").val(temp[0]);
+				updateCompany();
+				$("#subCompany").val(temp[1]);
+				$("#company").attr("disabled", true);
+				$("#subCompany").attr("disabled", true);
 			}
-			initPinYinSelect2('#line',data,'');
-			fage=true;
-			
-			line = "";
-		}
+		});
 		$("#query").on("click",jsDoQuery);
@@ -294,13 +261,12 @@
 // 			$(".hidden").removeClass("hidden");
 			$get('/busInterval/correctStatis', params, function(result){
 				// 把数据填充到模版中
-// 				var tbodyHtml = template('list_company',{list:result, type:1});
-				var tbodyHtml = ""; 
-				if(result.length != 0){
+				var tbodyHtml = template('list_company',{list:result});; 
+				/* if(result.length != 0){
 					tbodyHtml = template('list_company',{list:result[0].workList[0].workList, type:3});
 				}else{
 					tbodyHtml = template('list_company',{list:result, type:3});
-				}
+				} */
 				// 把渲染好的模版html文本追加到表格中
 // 				$('#forms').html(tbodyHtml);
@@ -314,7 +280,7 @@
 			});
 		}
-		$("#forms").on("click","tbody tr",function(){
+		/* $("#forms").on("click","tbody tr",function(){
 			if($(this).children().size() < 2){
 				return;
 			}
@@ -332,9 +298,9 @@
 					subCompany = g.workList;
 				}
 			});
-		});
+		}); */
-		$("#subinfo").on("click","tbody tr",function(){
+		/* $("#subinfo").on("click","tbody tr",function(){
 			if($(this).children().size() < 2){
 				return;
 			}
@@ -351,9 +317,9 @@
 					lines = g.workList;
 				}
 			});
-		});
+		}); */
-		$("#lineinfo").on("click","tbody tr",function(){
+		/* $("#lineinfo").on("click","tbody tr",function(){
 			if($(this).children().size() < 2){
 				return;
 			}
@@ -361,13 +327,13 @@
 			$(this).children().each(function(index){
 				params[index] = $(this).text();
 			});
-			$.each(lines, function(i, g){
+			 $.each(lines, function(i, g){
 				if(g.company == params[1] && g.subCompany == params[2] && g.line == params[3]){
 					var tbodyHtml = template('list_workList',{list:g.workList});
 					$("#lines").html(tbodyHtml);
 				}
-			});
-		});
+			}); 
+		}); */
 // 		$("#export").on("click", function(){
 // 			$get('/pcpc/workDaily',{line:line,date:date,type:'export'},function(result){
@@ -414,9 +380,8 @@
 		<th class="hidden"></th>
 		<th rowspan="2" width="120px">日期</th>
 		<th rowspan="2">公司</th>
-		{{if type>1}}<th rowspan="2">分公司</th>{{/if}}
-		{{if type<3}}<th rowspan="2">线路条数</th>{{/if}}
-		{{if type==3}}<th rowspan="2">线路</th>{{/if}}
+		<th rowspan="2">分公司</th>
+		<th rowspan="2">线路</th>
 		<th rowspan="2">实际营运班次</th>
 		<th colspan="3" align="center">待发调整数</th>
 		<th rowspan="2">掉线调整数</th>
@@ -438,18 +403,15 @@
 	{{each list as obj i}}
 		<tr>
 			{{if obj.date=='合计'}}
-				{{if type==1}}<td colspan="2">{{obj.date}}</td>{{/if}}
-				{{if type==2}}<td colspan="3">{{obj.date}}</td>{{/if}}
-				{{if type==3}}<td colspan="4">{{obj.date}}</td>{{/if}}
+				
+				<td colspan="4">{{obj.date}}</td>
 			{{/if}}
 			{{if obj.date!='合计'}}
 				<td>{{obj.date}}</td>
-				
-			{{/if}}
-			{{if obj.date!='合计'}}<td>{{obj.company}}</td>{{/if}}
-			{{if type>1 && obj.date!='合计'}}<td>{{obj.subCompany}}</td>{{/if}}
-			{{if type<3}}<td>{{obj.lines}}</td>{{/if}}
-			{{if type==3 && obj.date!='合计'}}<td>{{obj.line}}</td>{{/if}}
+			<td>{{obj.company}}</td>
+			<td>{{obj.subCompany}}</td>
+			<td>{{obj.xlname}}</td>
+            {{/if}}
 			<td>{{obj.sjbc}}</td>
 			<td>{{obj.sddf}}</td>
 			<td>{{obj.zddf}}</td>
@@ -465,7 +427,7 @@
 	{{/each}}
 	{{if list.length == 0}}
 		<tr>
-			<td colspan="15"><h6 class="muted">没有找到相关数据</h6></td>
+			<td colspan="14"><h6 class="muted">没有找到相关数据</h6></td>
 		</tr>
 	{{/if}}
 </tbody>
@@ -139,7 +139,7 @@
 				}
 			}
 			$('#fgsdmDaily').html(options);
-			initXl();
+// 			initXl();
 		}
 		/* $.get('/basic/lineCode2Name',function(result){
@@ -152,7 +152,7 @@
 		}) */
-		$("#fgsdmDaily").on("change",initXl);
+		/* $("#fgsdmDaily").on("change",initXl);
 		function initXl(){
 			var data=[];
 			if(fage){
@@ -175,7 +175,44 @@
 			}
 			initPinYinSelect2('#line',data,'');
 			fage=true;
-		}
+		} */
+		var tempData = {};
+		$.get('/report/lineList',function(xlList){
+			var data = [];
+// 			data.push({id: " ", text: "全部线路"});
+			$.get('/user/companyData', function(result){
+				for(var i = 0; i < result.length; i++){
+					var companyCode = result[i].companyCode;
+					var children = result[i].children;
+					for(var j = 0; j < children.length; j++){
+						var code = children[j].code;
+						for(var k=0;k < xlList.length;k++ ){
+							if(xlList[k]["fgsbm"]==code && xlList[k]["gsbm"]==companyCode){
+								data.push({id: xlList[k]["xlbm"], text: xlList[k]["xlname"]});
+								tempData[xlList[k]["xlbm"]] = companyCode+":"+code;
+							}
+						}
+					}
+				}
+				initPinYinSelect2('#line',data,'');
+				
+			});
+		});
+		
+		$("#line").on("change", function(){
+			if($("#line").val() == " "){
+				$("#gsdmDaily").attr("disabled", false);
+				$("#fgsdmDaily").attr("disabled", false);
+			} else {
+				var temp = tempData[$("#line").val()].split(":");
+				$("#gsdmDaily").val(temp[0]);
+				updateCompany();
+				$("#fgsdmDaily").val(temp[1]);
+				$("#gsdmDaily").attr("disabled", true);
+				$("#fgsdmDaily").attr("disabled", true);
+			}
+		});
+		
 	var line;
 	var date;
@@ -176,34 +176,44 @@
 				}
 			}
 			$('#subCompany').html(options);
-			initXl();
 		}
-		
-		$("#subCompany").on("change",initXl);
-		function initXl(){
-			var data=[];
-			if(fage){
-				$("#line").select2("destroy").html('');
-			}
-			var fgs=$('#subCompany').val();
-			var gs=$('#company').val();
+
+		var tempData = {};
+		$.get('/report/lineList',function(xlList){
+			var data = [];
 			data.push({id: " ", text: "全部线路"});
-			for(var i=0;i<xlList.length;i++){
-				if(gs!=""){
-					if(fgs!=""){
-						if(xlList[i]["fgsbm"]==fgs && xlList[i]["gsbm"]==gs){
-							data.push({id: xlList[i]["xlbm"], text: xlList[i]["xlname"]});
-						}
-					}else{
-						if(xlList[i]["gsbm"]==gs){
-							data.push({id: xlList[i]["xlbm"], text: xlList[i]["xlname"]});
+			$.get('/user/companyData', function(result){
+				for(var i = 0; i < result.length; i++){
+					var companyCode = result[i].companyCode;
+					var children = result[i].children;
+					for(var j = 0; j < children.length; j++){
+						var code = children[j].code;
+						for(var k=0;k < xlList.length;k++ ){
+							if(xlList[k]["fgsbm"]==code && xlList[k]["gsbm"]==companyCode){
+								data.push({id: xlList[k]["xlbm"], text: xlList[k]["xlname"]});
+								tempData[xlList[k]["xlbm"]] = companyCode+":"+code;
+							}
 						}
 					}
 				}
+				initPinYinSelect2('#line',data,'');
+				
+			});
+		});
+		
+		$("#line").on("change", function(){
+			if($("#line").val() == " "){
+				$("#company").attr("disabled", false);
+				$("#subCompany").attr("disabled", false);
+			} else {
+				var temp = tempData[$("#line").val()].split(":");
+				$("#company").val(temp[0]);
+				updateCompany();
+				$("#subCompany").val(temp[1]);
+				$("#company").attr("disabled", true);
+				$("#subCompany").attr("disabled", true);
 			}
-			initPinYinSelect2('#line',data,'');
-			fage=true;
-		}
+		});
 		var list;
 		$("#forms tbody").on("click","a",function(){
@@ -81,16 +81,29 @@
 			locale : 'zh-cn'
 		});
-		$.get('/basic/lineCode2Name',function(result){
-			var data=[];
-			
-			for(var code in result){
-				data.push({id: code, text: result[code]});
-			}
-			console.log(data);
-			initPinYinSelect2('#line',data,'');
-			
-		})
+		$.get('/report/lineList',function(xlList){
+			var data = [];
+// 			data.push({id: " ", text: "全部线路"});
+			$.get('/user/companyData', function(result){
+				for(var i = 0; i < result.length; i++){
+					var companyCode = result[i].companyCode;
+					var children = result[i].children;
+					for(var j = 0; j < children.length; j++){
+						var code = children[j].code;
+						for(var k=0;k < xlList.length;k++ ){
+							if(xlList[k]["fgsbm"]==code && xlList[k]["gsbm"]==companyCode){
+								data.push({id: xlList[k]["xlbm"], text: xlList[k]["xlname"]});
+// 								tempData[xlList[k]["xlbm"]] = companyCode+":"+code;
+							}
+						}
+					}
+				}
+				initPinYinSelect2('#line',data,'');
+				
+			});
+		});
+		
+		
 		$('#code').select2({
 			ajax: {
 				url: '/realSchedule/sreachVehic',
@@ -240,43 +240,46 @@
 				}
 			}
 			$('#fgsdmJob').html(options);
-			initXl();
+// 			initXl();
 		}
-		$("#fgsdmJob").on("change",initXl);
-		function initXl(){
-			var data=[];
-			if(fage){
-				$("#line").select2("destroy").html('');
-			}
-			var fgs=$('#fgsdmJob').val();
-			var gs=$('#gsdmJob').val();
-			for(var i=0;i<xlList.length;i++){
-				if(gs!=""){
-					if(fgs!=""){
-						if(xlList[i]["fgsbm"]==fgs && xlList[i]["gsbm"]==gs){
-							data.push({id: xlList[i]["xlbm"], text: xlList[i]["xlname"]});
-						}
-					}else{
-						if(xlList[i]["gsbm"]==gs){
-							data.push({id: xlList[i]["xlbm"], text: xlList[i]["xlname"]});
+		var tempData = {};
+		$.get('/report/lineList',function(xlList){
+			var data = [];
+// 			data.push({id: " ", text: "全部线路"});
+			$.get('/user/companyData', function(result){
+				for(var i = 0; i < result.length; i++){
+					var companyCode = result[i].companyCode;
+					var children = result[i].children;
+					for(var j = 0; j < children.length; j++){
+						var code = children[j].code;
+						for(var k=0;k < xlList.length;k++ ){
+							if(xlList[k]["fgsbm"]==code && xlList[k]["gsbm"]==companyCode){
+								data.push({id: xlList[k]["xlbm"], text: xlList[k]["xlname"]});
+								tempData[xlList[k]["xlbm"]] = companyCode+":"+code;
+							}
 						}
 					}
 				}
-			}
-			initPinYinSelect2('#line',data,'');
-			fage=true;
-		}
+				initPinYinSelect2('#line',data,'');
+				
+			});
+		});
-		/* $.get('/basic/lineCode2Name',function(result){
-			var data=[];
-			
-			for(var code in result){
-				data.push({id: code, text: result[code]});
+		$("#line").on("change", function(){
+			if($("#line").val() == " "){
+				$("#gsdmJob").attr("disabled", false);
+				$("#fgsdmJob").attr("disabled", false);
+			} else {
+				var temp = tempData[$("#line").val()].split(":");
+				$("#gsdmJob").val(temp[0]);
+				updateCompany();
+				$("#fgsdmJob").val(temp[1]);
+				$("#gsdmJob").attr("disabled", true);
+				$("#fgsdmJob").attr("disabled", true);
 			}
-			initPinYinSelect2('#line',data,'');
-			
-		}) */
+		});
+		
 		jQuery.fn.rowspan = function(colIdx) { //封装的一个JQuery小插件
 		      return this.each(function(){