Merge branch 'pudong' of http://222.66.0.204:8090/panzhaov5/bsth_control

into pudong

Merge branch 'pudong' of http://222.66.0.204:8090/panzhaov5/bsth_control
into pudong
廖磊
2 parents 8cbd28e9 f7e6c71a
Showing 23 changed files with 481 additions and 494 deletions
src/main/java/com/bsth/XDApplication.java
src/main/java/com/bsth/data/schedule/late_adjust/LateAdjustHandle.java
src/main/java/com/bsth/repository/LsStationRouteRepository.java
src/main/java/com/bsth/service/gps/GpsServiceImpl.java
src/main/java/com/bsth/service/impl/StationRouteServiceImpl.java
src/main/java/com/bsth/service/impl/TrafficManageServiceImpl.java
src/main/resources/static/index.html
src/main/resources/static/pages/base/geo_data_edit/js/search.js
src/main/resources/static/pages/base/line/edit.html
src/main/resources/static/pages/base/line/js/line-edit-form.js
src/main/resources/static/pages/base/line/js/line-list-table.js
src/main/resources/static/pages/base/stationroute/edit.html
src/main/resources/static/pages/base/stationroute/edit_select.html
src/main/resources/static/pages/base/stationroute/editsection.html
src/main/resources/static/pages/base/stationroute/js/stationroute-list-map.js
src/main/resources/static/pages/base/stationroute/list.html
src/main/resources/static/pages/base/timesmodel/js/v2/AdjustTripStrategy.js
src/main/resources/static/pages/permission/authorize_all/user_auth.html
src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/edit.html
src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/module.js
@@ -160,7 +160,7 @@ public class XDApplication implements CommandLineRunner {
  
         /** 线调业务 */
         sexec.scheduleWithFixedDelay(scheduleRefreshThread, 10, 120, TimeUnit.SECONDS);//班次更新线程
-        sexec.scheduleWithFixedDelay(scheduleLateThread, 140, 30, TimeUnit.SECONDS);//检查班次误点
+        sexec.scheduleWithFixedDelay(scheduleLateThread, 140, 20, TimeUnit.SECONDS);//检查班次误点
         sexec.scheduleWithFixedDelay(gpsDataLoader, 100, 2, TimeUnit.SECONDS);//抓取GPS数据
         sexec.scheduleWithFixedDelay(fixedCheckStationCodeThread, 60, 60 * 5, TimeUnit.SECONDS);//检查班次站点编码
  
@@ -15,8 +15,8 @@ import org.springframework.context.ApplicationContextAware;
 import org.springframework.stereotype.Component;
  
 import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
  
 /**
  * 误点自动调整待发 处理程序
@@ -35,7 +35,7 @@ public class LateAdjustHandle implements ApplicationContextAware {
     /**
      * 应发未到的班次 key : id
      */
-    private static Map<Long, ScheduleRealInfo> lateSchMap = new HashMap<>();
+    private static ConcurrentMap<Long, ScheduleRealInfo> lateSchMap = new ConcurrentHashMap<>();
  
  
     /**
@@ -60,8 +60,10 @@ public class LateAdjustHandle implements ApplicationContextAware {
                 //班次压入
                 if (!lateSchMap.containsKey(sch.getId())) {
                     logger.info("29【应发未到 班次 " + sch.getClZbh() + " -" + sch.getDfsj() + " -id: " + sch.getId() + " -加入误点调整！");
-                    //通知客户端
+
                     sch.setLate2(true);
+                    lateSchMap.put(sch.getId(), sch);
+                    //通知客户端
                     sendUtils.sendAutoWdtz(sch, null);
                 }
             }
@@ -107,8 +109,18 @@ public class LateAdjustHandle implements ApplicationContextAware {
             if (gps.getInstation() <= 0 || null == sch)
                 return;
  
-            if (!lateSchMap.containsKey(sch.getId()))
-                return;
+            if (!lateSchMap.containsKey(sch.getId())) {
+                //班次是否误点（可能处于误点线程扫描的空隙，所以再判定一次）
+                if (sch.getDfsjT() <= gps.getTimestamp()) {
+                    putLate(sch);
+
+                    if (!lateSchMap.containsKey(sch.getId()))
+                        return;
+
+                    logger.info("线程空隙漏掉的误点，id: " + sch.getId());
+                } else
+                    return;
+            }
  
  
             //可能是延迟信号，gps时间没有误点
 package com.bsth.repository;
  
 import java.util.List;
+import java.util.Map;
  
 import org.springframework.data.jpa.repository.EntityGraph;
 import org.springframework.data.jpa.repository.Modifying;
@@ -52,4 +53,21 @@ public interface LsStationRouteRepository extends BaseRepository&lt;LsStationRoute,
     @Modifying
     @Query(value="UPDATE bsth_c_ls_stationroute set destroy = 1 where line = ?1  and directions = ?2 and versions = ?3", nativeQuery=true)
     public void batchDestroy(Integer sectionRouteLine, Integer directions, Integer versions);
+
+    /**
+     * 按线路编码查询各站点的顺序号
+     * @param lineCode 线路编码
+     * @param lineVersion 版本号
+     * @return
+     */
+    @Query("SELECT new map(" +
+            "lineCode as lineCode,directions as directions,stationName as stationName,stationCode as stationCode," +
+            "line.linePlayType as linePlayType,s.stationMark as stationMark) " +
+            "FROM " +
+            "LsStationRoute s " +
+            "WHERE " +
+            "s.destroy = 0 AND s.lineCode = ?1 AND s.versions = ?2 " +
+            "ORDER BY " +
+            "lineCode,directions,stationRouteCode")
+    List<Map<String, String>> findLineWithLineCode4Ygc(String lineCode,Integer lineVersion);
 }
@@ -743,11 +743,12 @@ public class GpsServiceImpl implements GpsService {
         row.setHeight((short) (1.5 * 256));
         row.createCell(0).setCellValue("序号");
         row.createCell(1).setCellValue("车辆");
-        row.createCell(2).setCellValue("所在道路");
-        row.createCell(3).setCellValue("经度");
-        row.createCell(4).setCellValue("纬度");
-        row.createCell(5).setCellValue("时间");
-        row.createCell(6).setCellValue("速度");
+        row.createCell(2).setCellValue("牌照号");
+        row.createCell(3).setCellValue("所在道路");
+        row.createCell(4).setCellValue("经度");
+        row.createCell(5).setCellValue("纬度");
+        row.createCell(6).setCellValue("时间");
+        row.createCell(7).setCellValue("速度");
         //数据
         DateTimeFormatter fmtHHmmss = DateTimeFormat.forPattern("HH:mm.ss"),
                 fmt = DateTimeFormat.forPattern("yyyyMMddHHmm");
@@ -756,12 +757,13 @@ public class GpsServiceImpl implements GpsService {
             gps = list.get(i);
             row = sheet.createRow(i + 1);
             row.createCell(0).setCellValue(i + 1);
-            row.createCell(1).setCellValue(gps.getNbbm());
-            row.createCell(2).setCellValue(gps.getSection_name());
-            row.createCell(3).setCellValue(gps.getLon());
-            row.createCell(4).setCellValue(gps.getLat());
-            row.createCell(5).setCellValue(fmtHHmmss.print(gps.getTimestamp()));
-            row.createCell(6).setCellValue(gps.getSpeed());
+            row.createCell(1).setCellValue(nbbm);
+            row.createCell(2).setCellValue(BasicData.nbbmCompanyPlateMap.get(nbbm));
+            row.createCell(3).setCellValue(gps.getSection_name());
+            row.createCell(4).setCellValue(gps.getLon());
+            row.createCell(5).setCellValue(gps.getLat());
+            row.createCell(6).setCellValue(fmtHHmmss.print(gps.getTimestamp()));
+            row.createCell(7).setCellValue(gps.getSpeed());
         }
  
         st = st * 1000;
@@ -743,6 +743,7 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 		try {
 			// 获取线路ID
 			Integer lineId = map.get("lineId").equals("") ? 0 : Integer.parseInt(map.get("lineId").toString());
+			Integer fileVersions = map.get("fileVersions").equals("") ? 2 : Integer.parseInt(map.get("fileVersions").toString());// 没有输入就默认2
 			/** 查询线路信息 @param：<lineId：线路ID> */
 			Line line = lineRepository.findOne(lineId);
 			/** 查询线路信息下的站点路由信息 @param：<lineId：线路ID> */
@@ -778,7 +779,7 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 					textStr = newTextFileToFTP(objects,lineId);/** 双向行单文件内容 @param：<objects：站点路由；lineId：线路ID>*/
 				else
 					resultMap.put("status","NOLinePlayType");// 线路无线路规划类型
-				textStr = line.getName() + " " + "2" + "\r" + textStr;
+				textStr = line.getName() + " " + fileVersions + "\r" + textStr;
 				InputStream input = new ByteArrayInputStream(textStr.getBytes("gbk"));
 				/** 生成txt文件，上传ftp */
 				clientUtils.uploadFile(url, port, username, password, remotePath, textFileName, input);
@@ -77,6 +77,10 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 	@Autowired
 	private StationRouteRepository stationRouteRepository;
  
+	// 历史站点路由repository
+	@Autowired
+	private LsStationRouteRepository lsStationRouteRepository;
+
 	@Autowired
 	private SectionRepository sectionRepository;
  
@@ -944,6 +948,8 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 		String result = "failure";
 		StringBuffer sBuffer = new StringBuffer();
 		DecimalFormat df = new DecimalFormat("######0.000");
+		Map<String,String> lsStationCode2NameMap;
+		Map<String, Integer> lsStationName2YgcNumber;
 		try {
 			String[] idArray = ids.split(",");
 			StringBuffer sBufferA ,sBufferB ,sBufferC ;
@@ -960,10 +966,17 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 			HashMap<String,String> paramMap;
 			HashMap<String,String> otherMap = new HashMap<>();
 			for (int i = 0; i < idArray.length; i++) {
-				ttInfo = ttInfoRepository.findOne(Long.valueOf(idArray[i]));
+				long ttinfoId = Long.valueOf(idArray[i]);
+				ttInfo = ttInfoRepository.findOne(ttinfoId);
 				if(ttInfo == null)
 					continue;
 				ttinfoList.add(ttInfo); // 保存时刻表
+				// 得到时刻表版本号
+				int lineVersion = ttInfo.getLineVersion();
+				// 查询历史站点路由
+				lsStationCode2NameMap = getLsStationCode(ttInfo.getXl().getLineCode(),lineVersion);
+				// 查询历史站点路由
+				lsStationName2YgcNumber = getLsStationRoute(ttInfo.getXl().getLineCode(),lineVersion);
 				zlc = 0.0f;
 				yylc = 0.0f;
 				// 获得时刻表
@@ -1007,19 +1020,19 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 						sBufferC.append("<BC>");
 						sBufferC.append("<LPBH>").append(ttInfoDetail.getLp().getLpNo()).append("</LPBH>");
 						sBufferC.append("<SXX>").append(sxx).append("</SXX>");
-						sBufferC.append("<FCZDMC>").append(BasicData.stationCode2NameMap.get(ttInfoDetail.getXl().getLineCode()+"_"+ttInfoDetail.getXlDir()
+						sBufferC.append("<FCZDMC>").append(lsStationCode2NameMap.get(ttInfoDetail.getXl().getLineCode()+"_"+ttInfoDetail.getXlDir()
 								+"_"+ttInfoDetail.getQdzCode())).append("</FCZDMC>");
 						// 起点站的参数
 						otherMap.put("stationMark","B");
 						paramMap = packageYgcStationNumParam(ttInfoDetail,otherMap);
-						sBufferC.append("<ZDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(paramMap,null)).append("</ZDXH>");
+						sBufferC.append("<ZDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(paramMap,lsStationName2YgcNumber)).append("</ZDXH>");
 						sBufferC.append("<JHFCSJ>").append(changeTimeFormat(ttInfoDetail)).append("</JHFCSJ>");
-						sBufferC.append("<DDZDMC>").append(BasicData.stationCode2NameMap.get(ttInfoDetail.getXl().getLineCode()+"_"+ttInfoDetail.getXlDir()
+						sBufferC.append("<DDZDMC>").append(lsStationCode2NameMap.get(ttInfoDetail.getXl().getLineCode()+"_"+ttInfoDetail.getXlDir()
 								+"_"+ttInfoDetail.getZdzCode())).append("</DDZDMC>");
 						// 起点站的参数
 						otherMap.put("stationMark","E");
 						paramMap = packageYgcStationNumParam(ttInfoDetail,otherMap);
-						sBufferC.append("<DDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(paramMap,null)).append("</DDXH>");
+						sBufferC.append("<DDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(paramMap,lsStationName2YgcNumber)).append("</DDXH>");
 						sBufferC.append("<JHDDSJ>").append(calcDdsj(ttInfoDetail.getFcsj(),ttInfoDetail.getBcsj())).append("</JHDDSJ>");
 						sBufferC.append("</BC>");
 						// 0：上行；1：下行
@@ -1520,4 +1533,51 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 		map.put("stationMark",stationMark); // 站点类型
 		return map;
 	}
+
+	/**
+	 * 取得历史站点编码和站点名称的对应关系
+	 * @return
+	 */
+	private Map<String, String> getLsStationCode(String lineCode,int lineVersion){
+		Map<String,Object> map = new HashMap<>();
+		map.put("lineCode_eq", lineCode);
+		map.put("versions_eq",lineVersion);
+		LsStationRoute lsroute;
+		Iterator<LsStationRoute> iterator = lsStationRouteRepository.findAll(new CustomerSpecs<LsStationRoute>(map)).iterator();
+		Map<String, String> stationCode2Name = new HashMap<>();
+		while (iterator.hasNext()) {
+			lsroute = iterator.next();
+			stationCode2Name.put(lsroute.getLineCode() + "_" + lsroute.getDirections() + "_" + lsroute.getStationCode(), lsroute.getStationName());
+		}
+		return stationCode2Name;
+	}
+
+	private Map<String, Integer> getLsStationRoute(String xlbm,int lineVersion){
+		Map<String, Integer> tempStationName2YgcNumber = new HashMap<String, Integer>();
+		/**
+		 * 加载运管处的站点及序号
+		 * 上行从1开始，下行顺序续编
+		 */
+		List<Map<String, String>> ygcLines = lsStationRouteRepository.findLineWithLineCode4Ygc(xlbm,lineVersion);
+		if(ygcLines != null && ygcLines.size() > 0){
+			int size = ygcLines.size();
+			Map<String, String> tempMap ;
+			int num = 1;
+			String key;
+			String lineCode = "";
+			for (int i = 0; i < size; i ++){
+				tempMap = ygcLines.get(i);
+				if(lineCode.equals("")){
+					lineCode = tempMap.get("lineCode");
+				}else if(!lineCode.equals(tempMap.get("lineCode"))){
+					num = 1;
+					lineCode = tempMap.get("lineCode");
+				}
+				key = tempMap.get("lineCode") + "_"+String.valueOf(tempMap.get("directions"))
+						+ "_"+tempMap.get("stationCode")+ "_"+tempMap.get("stationMark");
+				tempStationName2YgcNumber.put(key,num++);
+			}
+		}
+		return tempStationName2YgcNumber;
+	}
 }
@@ -630,7 +630,8 @@
 <script
 		src="http://webapi.amap.com/maps?v=1.3&key=16cb1c5043847e09ef9edafdd77befda"
 		data-exclude=1></script>
-
+<!-- echarts -->
+<script src="/metronic_v4.5.4/plugins/echarts4/echarts.min.js"></script>
 <script src="/real_control_v2/assets/plugins/perfect-scrollbar/perfect-scrollbar.jquery.js"  merge="plugins"></script>
  
 </body>
@@ -27,8 +27,8 @@ var gb_ct_search = function () {
     });
  
     var searchComplete = function (e) {
-        //console.log('e.wr', e);
-        var htmlStr = template('geo_d_e_search_result-temp', {list: e.yr});
+        console.log('e.wr', e);
+        var htmlStr = template('geo_d_e_search_result-temp', {list: e.Br});
         $('.ct_search_result').html(htmlStr);
  
     };
@@ -59,7 +59,7 @@
 						</label>
 						<div class="col-md-4">
 							<input type="text" class="form-control" name="lineCode" id="lineCodeInput"
-								   placeholder="线路编码">
+								   placeholder="线路编码" readonly="readonly">
 						</div>
 					</div>
 					<!-- 线路编码 (* 必填项) END -->
@@ -236,7 +236,7 @@
 			// 表单序列化
 			var params = form.serializeJSON();
 			// 查询线路编码的顺延号
-			$get('/line/all', {lineCode_prefixLike: params.lineCode},function(lineCode){
+			$get('/line/all', {lineCode_eq: params.lineCode},function(lineCode){
 				// 定义返回值的长度
 				var len = lineCode.length;
 				// 如果大于零，则已存在录入的线路编码；否则不存在
@@ -338,30 +338,54 @@
 			layer.msg('请选中一条线路！');
 			return ;
     	}else {
-    		id = arrChk.data('id');
-    		lineName = arrChk.val();
-    		// 请求参数
-    		var params = {lineId:id};
-    		// 弹出正在加载层
-    		var index = layer.load(0);
-    		/** 生成线路行单 @pararm：<params：请求参数> */
-			$post('/stationroute/usingSingle',params,function(data) {
-				 // 关闭弹出框
-				 layer.close(index);
-				if(data.status=='SUCCESS') {
-    				// 弹出添加成功提示消息
-    				layer.msg('生成线路【'+ lineName +'】路单文件成功!');
-    			}else if(data.status=='ERROR'){
-    				// 弹出添加成功提示消息
-    				layer.msg('生成线路【'+ lineName +'】路单文件失败!');
-    			}else if(data.status=='NOTDATA') {
-    				// 弹出添加成功提示消息
-    				layer.msg('系统无线路【'+ lineName +'】的站点与路段信息!');
-    			}else if(data.status=='NOLinePlayType') {
-    				// 弹出添加成功提示消息
-    				layer.msg('无法识别【'+ lineName +'】的线路规划类型，请设置为双向/环线!');
-    			}
-			});
+            layer.open({
+                id:1,
+                type: 1,
+                title: "线路文件版本号",
+                // skin:'layui-layer-rim',
+                area:['450px', 'auto'],
+
+                content: '<div class="col-sm-12">'
+                +'<div class="input-group">'
+                +'<span class="input-group-addon"> 线路文件版本号 :</span>'
+                +'<input id="fileVersionsInput" type="text" class="form-control" placeholder="没有填写默认为2">'
+                +'</div>'
+                +'</div>',
+                btn:['确定','取消'],
+                btn1: function (index,layero) {
+                    var fileVersions = $('#fileVersionsInput').val();
+                    id = arrChk.data('id');
+                    lineName = arrChk.val();
+                    // 请求参数
+                    var params = {lineId:id, fileVersions:fileVersions};
+                    // 弹出正在加载层
+                    var index = layer.load(0);
+                    /** 生成线路行单 @pararm：<params：请求参数> */
+                    $post('/stationroute/usingSingle',params,function(data) {
+                        // 关闭弹出框
+                        layer.close(index);
+                        if(data.status=='SUCCESS') {
+                            // 弹出添加成功提示消息
+                            layer.msg('生成线路【'+ lineName +'】路单文件成功!');
+                        }else if(data.status=='ERROR'){
+                            // 弹出添加成功提示消息
+                            layer.msg('生成线路【'+ lineName +'】路单文件失败!');
+                        }else if(data.status=='NOTDATA') {
+                            // 弹出添加成功提示消息
+                            layer.msg('系统无线路【'+ lineName +'】的站点与路段信息!');
+                        }else if(data.status=='NOLinePlayType') {
+                            // 弹出添加成功提示消息
+                            layer.msg('无法识别【'+ lineName +'】的线路规划类型，请设置为双向/环线!');
+                        }
+                    });
+                },
+                btn2:function (index,layero) {
+                    layer.close(index);
+                }
+
+            });
+
+
     	}
 	});	
 	/** 生成路线（路段和站点） */
@@ -190,7 +190,11 @@ $(&#39;#edit_station_mobal&#39;).on(&#39;editSelectMobal_show&#39;, function(e, map_,ajaxd,stati
 			fun.linePanlThree(addLine.id,data,add_direction_v);
 		});
         fun.editMapStatusRemove();
-	}
+        setTimeout(function () {
+        	var stationArray = map_.getStationArray();
+            map_.openStationInfoWin(stationArray[editStationParmasObj.stationRouteId]);
+        },1000);
+    }
 	// 编辑表单元素
 	var form = $('#edit_station_form');
 	// 获取错误提示元素
@@ -206,9 +210,9 @@ $(&#39;#edit_station_mobal&#39;).on(&#39;editSelectMobal_show&#39;, function(e, map_,ajaxd,stati
 		errorClass : 'help-block help-block-error', 
 		focusInvalid : false, 
 		rules : {
-			'zdmc' : { required : true,maxlength : 50,},// 站点名称 必填项
-			'stationName' : { required : true,maxlength : 50,},// 站点名称 必填项
-			'stationCod': {required : true,},// 站点编码 必填项
+			'zdmc' : { required : true,maxlength : 50},// 站点名称 必填项
+			'stationName' : { required : true,maxlength : 50},// 站点名称 必填项
+			'stationCod': {required : true},// 站点编码 必填项
 			'directions' : {required : true,dirIs : true},// 站点方向 必填项 必填项
 			'stationRouteCode' : {isStart : true},// 站点序号
 			'stationMark' : {required : true},// 站点类型 必填项
@@ -14,10 +14,6 @@
 						<button class="close" data-close="alert"></button>
 							站点名称为必填项
 					</div>
-					<div class="alert alert-danger display-hide" id="serchrname">
-						<button class="close" data-close="alert"></button>
-						系统无法生成，请选择其他方式新增
-					</div>
 					<div class="form-group" id="formRequ">
 						<label class="col-md-3 control-label"><span class="required"> * </span>站点名称：</label>
 						<div class="col-md-9" id="errorInfo">
@@ -29,10 +25,13 @@
 						<div class="col-md-9">
 							<div class="icheck-list">
 								<label>
-										<input type="radio" class="icheck" name="editselect" value=0> 重新绘制位置
+										<input type="radio" class="icheck" name="editselect" value=0> 重新绘制为多边形
 								</label>
 								<label>
-										<input type="radio" class="icheck" name="editselect" value=1 checked> 编辑原始位置
+									<input type="radio" class="icheck" name="editselect" value=1> 重新绘制为圆形
+								</label>
+								<label>
+										<input type="radio" class="icheck" name="editselect" value=2 checked> 编辑原始位置
 								</label>
 							</div>
 						</div>
@@ -124,6 +123,19 @@ $(&#39;#edit_select_mobal&#39;).on(&#39;editSelectMobal_show&#39;, function(e, map_,drw,ajaxd,ed
 				map_.localtionPoint(editStationName+"公交站点");
 				fun.editMapStatus();
 			}else if(params.editselect==1){
+                WorldsBMap.localSearchFromAdreesToPoint(editStationName+"公交站点", function (Points) {
+                    if (Points) {
+                        Station.stationJwpoints = Points;
+                    }
+					Station.stationShapesType = 'r';
+					Station.stationGPloyonGrid = null;
+					Station.stationRadius = 100;
+					editStationObj.setEitdStation(Station);
+					editStationObj.setEitdStationName(editStationName);
+					map_.editShapes(editStationObj);
+                });
+				fun.editMapStatus();
+			}else if(params.editselect==2){
 				editStationObj.setEitdStation(Station);
 				editStationObj.setEitdStationName(editStationName);
                 map_.clearMark();
@@ -110,6 +110,9 @@ $(&#39;#edit_section_mobal&#39;).on(&#39;editSectionMobal_show&#39;, function(e, map_,ajaxd,p,fu
 		ajaxd.getSectionRouteInfo(lineId,dir,function(data) {
 			fun.linePanlThree(lineId,data,dir);
 		});
+		setTimeout(function () {
+            map_.openSectionInfoWin(p);
+        },1000);
 	}
 	// 编辑表单元素
 	var form = $('#edit_section__form');
@@ -24,9 +24,19 @@
  
 window.WorldsBMap = function () {
  
-    /** WorldsBMap 全局变量定义 mapBValue：地图对象；polygon：多边形；polyUpline：走向折线；circle：圆; road_win_show_p:信息窗口打开状态的路段,map_status:地图编辑状态,drawingManager:绘画工具*/
-    var mapBValue = '',polygon = '', polyUpline = '', circle = '', iseditStatus = false, road_win_show_p = '', editPolyline = '', sectionArray = [], stationArray = new Map(),map_status = 0,
-        drawingManager;
+    /** WorldsBMap 全局变量定义 mapBValue：地图对象; road_win_show_p:信息窗口打开状态的路段,
+     * sectionArray: 路段集合,stationArray: 站点集合
+     * map_status:地图编辑状态,drawingManager:绘画工具, topOverlay:置顶视图*/
+    var mapBValue = '', iseditStatus = false, road_win_show_p = '', editPolyline = '',
+        sectionArray = [], stationArray = new Map(),
+        map_status = 0,drawingManager,topOverlay;
+
+    /**
+     * 编辑缓冲区
+     * stationMarkers: 站点图标集合
+     */
+    var editCircle, editPolygon, dragMarker, stationMarkers = new Map(),centerPoint;
+
     var styleOptions = {
         strokeColor:"blue",    //边线颜色。
         fillColor:"blue",      //填充颜色。当参数为空时，圆形将没有填充效果。
@@ -34,7 +44,39 @@ window.WorldsBMap = function () {
         strokeOpacity: 0.7,	   //边线透明度，取值范围0 - 1。
         fillOpacity: 0.6,      //填充的透明度，取值范围0 - 1。
         strokeStyle: 'solid' //边线的样式，solid或dashed。
-    }
+    };
+
+    // 覆盖物置顶
+    var setTop = function(overlay) {
+        if (topOverlay)
+            topOverlay.setTop(false);
+        overlay.setTop(true);
+        topOverlay = overlay;
+    };
+
+    var setDragMarker = function (marker) {
+        marker.enableDragging();
+        dragMarker = marker;
+        dragMarker._old_point = dragMarker._position;
+        //监听拖拽事件 dragging
+        dragMarker.addEventListener('dragging', dragMarkerDragEvent);
+    };
+
+    var dragMarkerDragEvent = function (e) {
+        if (editPolygon) {
+            if (!BMapLib.GeoUtils.isPointInPolygon(e.target._position, editPolygon))
+                dragMarker.setPosition(dragMarker._old_point);//还原位置
+
+            centerPoint = e.target._position;
+        }
+        else if (editCircle) {
+            editCircle.disableEditing();
+            //缓冲区跟随点位运动
+            editCircle.setCenter(e.target._position);
+            editCircle.enableEditing();
+            centerPoint = e.target._position;
+        }
+    };
  
     var Bmap = {
  
@@ -44,7 +86,7 @@ window.WorldsBMap = function () {
             // 百度API Key
             var bdKey = 'IGGrr4UjwIYzatoCRFKEL8sT';
             // 初始化百度地图
-            mapBValue = new BMap.Map("bmap_basic");
+            mapBValue = new BMap.Map("bmap_basic" , {enableMapClick: false});
             //中心点和缩放级别
             mapBValue.centerAndZoom(new BMap.Point(CENTER_POINT.lng, CENTER_POINT.lat), 15);
             //启用地图拖拽事件，默认启用(可不写)
@@ -62,24 +104,21 @@ window.WorldsBMap = function () {
         getmapBValue: function () {
             return mapBValue;
         },
-        getPolygon: function () {
-            return polygon;
-        },
-        getPolyUpline: function () {
-            return polyUpline;
-        },
-        getCircle: function () {
-            return circle;
+        setMap_status : function (i) {
+            map_status = i;
         },
         getIsEditStatus: function () {
             return iseditStatus;
         },
-        setMap_status : function (i) {
-            map_status = i;
-        },
         setIsEditStatus: function (v) {
             iseditStatus = v;
         },
+        getStationArray: function () {
+            return stationArray;
+        },
+        setStationArray : function (s) {
+            stationArray = s;
+        },
         /*initDrawingManager: function (map, styleOptions) {
         },*/
         getDrawingManagerObj: function () {
@@ -100,59 +139,35 @@ window.WorldsBMap = function () {
  
         /** 获取距离与时间 @param <points：坐标点集合> */
         getDistanceAndDuration: function (points, callback) {
-
             // 获取长度
             var len = points.length;
-
             (function () {
-
                 if (!arguments.callee.count) {
-
                     arguments.callee.count = 0;
-
                 }
-
                 arguments.callee.count++;
-
                 var index = parseInt(arguments.callee.count) - 1;
-
                 if (index >= len - 1) {
-
                     callback && callback(points);
-
                     return;
                 }
-
                 // 当函数被调用时，它的arguments.callee对象就会指向自身，也就是一个对自己的引用。(当前正在执行的函数。)
                 var f = arguments.callee;
-
                 // 起点坐标 <坐标格式：40.056878,116.30815>
                 var origin = points[index].potion.lat + ',' + points[index].potion.lng;
-
                 // 终点坐标 <坐标格式：40.056878,116.30815>
                 var destination = points[index + 1].potion.lat + ',' + points[index + 1].potion.lng;
-
                 var region = '上海';
-
                 var origin_region = '上海';
-
                 var destination_region = '上海';
-
                 var output = 'json';
-
                 var ak_My = 'wjlITmXeCek5MxyU3ZUBkTeU8B0o0npk';
-
                 /**
                  *  origin：起点名称或经纬度；
-                 *
                  *  destination：终点名称或经纬度；
-                 *
                  *  origin_region：起始点所在城市，驾车导航时必填。
-                 *
                  *  destination_region：终点所在城市，驾车导航时必填。
-                 *
                  *  output :表示输出类型，可设置为xml或json，默认为xml。
-                 *
                  **/
                 var paramsB = {
                     origin: origin,
@@ -166,60 +181,40 @@ window.WorldsBMap = function () {
  
                 /** @description :未认证开发者默认配额为：2000次/天。 */
                 $.ajax({
-
                     // 百度地图根据坐标获取两点之间的时间与距离
                     url: 'http://api.map.baidu.com/direction/v1?mode=transit',
-
                     data: paramsB,
-
                     dataType: 'jsonp',
-
                     success: function (r) {
-
                         if (r) {
-
                             if (r.message == 'ok') {
-
                                 if (r.result.taxi == null) {
-
                                     // 获取距离(单位：米)
                                     points[index + 1].distance = 0;
-
                                     // 获取时间(单位：秒)
                                     points[index + 1].duration = 0;
-
                                 } else {
-
                                     // 获取距离(单位：米)
                                     points[index + 1].distance = r.result.taxi.distance;
-
                                     // 获取时间(单位：秒)
                                     points[index + 1].duration = r.result.taxi.duration;
-
                                 }
-
-
                             }
-
                         }
-
                         f();
                     }
                 });
-
             })();
-
         },
+
         // 打开站点信息窗口
         openStationInfoWin : function (objStation) {
             // 将视图切换到指定的缩放等级，中心点坐标不变。注意：当有信息窗口在地图上打开时，地图缩放将保证信息窗口所在的坐标位置不动。（自1.2新增）
-            mapBValue.setZoom(25);
             if (objStation) {
                 // 站点形状
                 var shapes = objStation.stationShapesType;
                 // 获取中心坐标点字符串分割
                 var BJwpoints = objStation.stationJwpoints.split(' ');
-
                 // 中心坐标点
                 var point = new BMap.Point(BJwpoints[0], BJwpoints[1]);
                 var width = WorldsBMap.strGetLength(objStation.stationRouteName) * 11;
@@ -270,102 +265,59 @@ window.WorldsBMap = function () {
                     //开启信息窗口
                     mapBValue.openInfoWindow(infoWindow_target, point);
                 }, 100);
-                // 是否在平移过程中禁止动画。（自1.2新增）
-                var PanOptions_ = {noAnimation: true};
                 // 将地图的中心点更改为给定的点。
-                mapBValue.panTo(point, PanOptions_);
-                // mapBValue.panBy(10, -150, PanOptions_);
+                mapBValue.panTo(point);
             }
         },
  
-        editPolyUpline: function () {
-            // 禁止覆盖物在map.clearOverlays方法中被清除。(自 1.1 新增)
-            polyUpline.disableMassClear();
-            WorldsBMap.clearMarkAndOverlays();
-            // 允许覆盖物在map.clearOverlays方法中被清除。(自 1.1 新增)
-            polyUpline.enableMassClear();
-            //  开启线路编辑
-            polyUpline.enableEditing();
-            // 添加双击折线保存事件
-            polyUpline.addEventListener('dblclick', function (e) {
-                // 关闭
-                layer.closeAll();
-                polyUpline.disableEditing();
-                // 获取折线坐标集合
-                var editPloyLineArray = polyUpline.getPath();
-                EditSectionObj.setEitdBsectionVector(JSON.stringify(editPloyLineArray));
-                polyUpline = '';
-                // 加载修改路段弹出层mobal页面
-                $.get('editsection.html', function (m) {
-                    $(pjaxContainer).append(m);
-                    $('#edit_section_mobal').trigger('editSectionMobal_show', [WorldsBMap, GetAjaxData, EditSectionObj, PublicFunctions]);
-                });
-            });
-        },
-
         // 根据地理名称获取百度经纬度坐标
         localSearchFromAdreesToPoint: function (Address, callback) {
-
             // 创建一个搜索类实例
             var localSearch = new BMap.LocalSearch(mapBValue);
-
             // 检索完成后的回调函数。
             localSearch.setSearchCompleteCallback(function (searchResult) {
-
                 var resultPoints = '';
-
                 if (searchResult) {
-
                     // 返回索引指定的结果。索引0表示第1条结果
                     var poi = searchResult.getPoi(0);
-
                     if (poi) {
-
                         //获取经度和纬度
                         resultPoints = poi.point.lng + ' ' + poi.point.lat;
-
                         callback && callback(resultPoints);
-
                     } else {
-
                         callback && callback(false);
-
                     }
-
                 } else {
-
                     callback && callback(false);
                 }
-
             });
-
             // 根据检索词发起检索。
             localSearch.search(Address);
-
         },
  
-        // 编辑图形
+        // 编辑站点
         editShapes: function (obj) {
             // 关闭信息窗口
             mapBValue.closeInfoWindow();
-
             // 清除marker
             // mapBValue.removeOverlay(marker);
             var station = obj.getEitdStation();
             var stationShapesTypeV = station.stationShapesType;
+            setDragMarker(stationMarkers[station.stationRouteId]);
             // 编辑圆
             if (stationShapesTypeV == 'r') {
-
                 // 获取中心坐标点字符串分割
                 var BJwpoints = station.stationJwpoints.split(' ');
                 // 中心坐标点
                 var point = new BMap.Point(BJwpoints[0], BJwpoints[1]);
                 //创建圆
-                circle = new BMap.Circle(point, station.stationRadius, {
+                var circle = new BMap.Circle(point, station.stationRadius, {
                     strokeColor: "blue",
                     strokeWeight: 2,
                     strokeOpacity: 0.7
                 });
+                mapBValue.centerAndZoom(point, 18);
+                editCircle = circle;
                 // 允许覆盖物在map.clearOverlays方法中被清除
                 circle.enableMassClear();
                 // 百度地图添加覆盖物圆
@@ -378,7 +330,7 @@ window.WorldsBMap = function () {
                     var newRadius = circle.getRadius();
                     // 返回圆形的中心点坐标。
                     var newCenter = circle.getCenter().lng + ' ' + circle.getCenter().lat;
-                    var centre_New = [{potion: {lng: circle.getCenter().lng, lat: circle.getCenter().lat}}];
+                    // var centre_points = [{potion: {lng: circle.getCenter().lng, lat: circle.getCenter().lat}}];
                     /**  设置修改站点集合对象站点中心点百度坐标属性值 @param：<bJwpoints：中心点百度坐标） */
                     EditStationObj.setEitdStationJwpoints(newCenter);
                     /**  设置修改站点集合对象范围图形类型属性值 @param：<shapesType：范围图形类型） */
@@ -387,13 +339,14 @@ window.WorldsBMap = function () {
                     EditStationObj.setEitdStationRadius(Math.round(newRadius));
                     /**  设置修改站点集合对象图形百度坐标集合属性值 @param：<bPolygonGrid：图形百度坐标集合） */
                     EditStationObj.setEitdBPolygonGrid('');
+                    // 清除正在编辑的站点
+                    editCircle = null;
                     // 加载编辑页面
                     $.get('edit.html', function (m) {
                         $(pjaxContainer).append(m);
                         $('#edit_station_mobal').trigger('editSelectMobal_show', [WorldsBMap, GetAjaxData, EditStationObj, LineObj, PublicFunctions]);
                     });
                 });
-
                 // 编辑多变行
             } else if (stationShapesTypeV == 'd') {
                 // 获取中心点坐标字符串
@@ -413,9 +366,8 @@ window.WorldsBMap = function () {
                 for (var v = 0; v < pointPolygonArray.length; v++) {
                     polygonP.push(new BMap.Point(pointPolygonArray[v].split(" ")[0], pointPolygonArray[v].split(" ")[1]));
                 }
-
                 // 画多边形
-                polygon = new BMap.Polygon(polygonP, {
+                var polygon = new BMap.Polygon(polygonP, {
                     // 线条显色
                     strokeColor: "blue",
                     // 边线的宽度，以像素为单位。
@@ -423,92 +375,46 @@ window.WorldsBMap = function () {
                     // 边线透明度，取值范围0 - 1。
                     strokeOpacity: 0.7
                 });
-
+                mapBValue.centerAndZoom(pointPolygon, 18);
+                editPolygon = polygon;
                 // 增加地图覆盖物多边形
                 mapBValue.addOverlay(polygon);
-
                 // 开启编辑功能(自 1.1 新增)
                 polygon.enableEditing();
-
                 // 添加多变行编辑事件
                 polygon.addEventListener('dblclick', function (e) {
-
                     // 获取编辑的多边形对象
                     var edit_pointE = polygon;
-
                     var edit_bPloygonGrid = "";
-
                     var editPolyGonLen_ = edit_pointE.getPath().length;
-
                     for (var k = 0; k < editPolyGonLen_; k++) {
-
                         if (k == 0) {
-
                             edit_bPloygonGrid = edit_pointE.getPath()[k].lng + ' ' + edit_pointE.getPath()[k].lat;
-
                         } else {
-
                             edit_bPloygonGrid = edit_bPloygonGrid + ',' + edit_pointE.getPath()[k].lng + ' ' + edit_pointE.getPath()[k].lat;
-
                         }
-
                     }
-
                     edit_bPloygonGrid = edit_bPloygonGrid + ',' + edit_pointE.getPath()[0].lng + ' ' + edit_pointE.getPath()[0].lat;
-
                     // 多边形中心点
-                    var centre_points = edit_pointE.getBounds().getCenter().lng + ' ' + edit_pointE.getBounds().getCenter().lat;
-
-                    /**  设置修改站点集合对象站点中心点百度坐标属性值 @param：<bJwpoints：中心点百度坐标） */
-                    EditStationObj.setEitdStationJwpoints(centre_points);
-
+                    // var centre = edit_pointE.getBounds().getCenter().lng + ' ' + edit_pointE.getBounds().getCenter().lat;
+                    /**  设置修改站点集合对象站点中心点百度坐标属性值 @param：<bJwpoints：中心点百度坐标） centerPoint可拖动点 */
+                    EditStationObj.setEitdStationJwpoints(centerPoint.lng+' '+centerPoint.lat);
                     /**  设置修改站点集合对象范围图形类型属性值 @param：<shapesType：范围图形类型） */
                     EditStationObj.setEitdStationShapesType('d');
-
                     /**  设置修改站点集合对象圆形半径属性值 @param：<radius：圆形半径） */
                     EditStationObj.setEitdStationRadius('');
-
                     /**  设置修改站点集合对象图形百度坐标集合属性值 @param：<bPolygonGrid：图形百度坐标集合） */
                     EditStationObj.setEitdBPolygonGrid(edit_bPloygonGrid);
-
+                    // 清除正在编辑的站点
+                    editPolygon = null;
                     $.get('edit.html', function (m) {
-
                         $(pjaxContainer).append(m);
-
                         $('#edit_station_mobal').trigger('editSelectMobal_show', [WorldsBMap, GetAjaxData, EditStationObj, LineObj, PublicFunctions]);
-
                     });
-
                 });
-
             }
-
         },
  
-        // 在地图上画出上行线路走向
-        /*drawingUpline: function (polylineArray, polyline_center, data) {
-            /!*WorldsBMap.clearMarkAndOverlays();*!/
-            polyUpline = '';
-            // 创建线路走向
-            polyUpline = new BMap.Polyline(polylineArray, {strokeColor: "red", strokeWeight: 6, strokeOpacity: 0.7});
-            // polyUpline.data = data;
-            // 把折线添加到地图上
-            mapBValue.addOverlay(polyUpline);
-            /!*var ceter_index = Math.round(resultdata.length / 2);
-
-            var ceterPointsStr = resultdata[ceter_index].bJwpoints;
-
-            var ceterPointsArray = ceterPointsStr.split(' ');
-
-            var polyline_center = new BMap.Point(ceterPointsArray[0],ceterPointsArray[1]);*!/
-            var PanOptions_ = {noAnimation: true};
-            mapBValue.reset();
-            mapBValue.panTo(polyline_center, PanOptions_);
-            mapBValue.panBy(500, -510, PanOptions_);
-            mapBValue.setZoom(14);
-        },*/
-
-
         // 画路段走向
         drawingUpline01: function (polyline_center, datas) {
             if (polyline_center && datas) {
@@ -558,8 +464,9 @@ window.WorldsBMap = function () {
                     });
                     sectionArray.push(polyUpline01);
                 }
-                mapBValue.setCenter(polyline_center);
-                mapBValue.setZoom(15);
+                // mapBValue.setCenter(polyline_center);
+                mapBValue.panTo(polyline_center);
+                // mapBValue.setZoom(15);
                 // 禁止覆盖物在map.clearOverlays方法中被清除。(自 1.1 新增)
                 // polyUpline01.disableMassClear();
             }
@@ -595,6 +502,7 @@ window.WorldsBMap = function () {
                     WorldsBMap.openStationInfoWin(station);
             });
             stationArray[station.stationRouteId] = station;
+            stationMarkers[station.stationRouteId] = myRichMarker1;
         },
  
         // 站点名称获取百度坐标（手动规划）
@@ -725,99 +633,44 @@ window.WorldsBMap = function () {
         localtionPoint: function (stationNameV) {
             // 关闭信息窗口
             mapBValue.closeInfoWindow();
-
             WorldsBMap.localSearchFromAdreesToPoint(stationNameV, function (Points) {
-
                 if (Points) {
-
                     var BJwpointsArray = Points.split(' ');
-
                     var stationNameChangePoint = new BMap.Point(BJwpointsArray[0], BJwpointsArray[1]);
-
                     var marker_stargt2 = new BMap.Marker(stationNameChangePoint);
-
-                    var PanOptions = {noAnimation: true};
-
-                    mapBValue.panTo(stationNameChangePoint, PanOptions);
-
-                    mapBValue.panBy(0, -100);
-
+                    mapBValue.panTo(stationNameChangePoint);
                     // 将标注添加到地图中
                     mapBValue.addOverlay(marker_stargt2);
-
                     //跳动的动画
                     marker_stargt2.setAnimation(BMAP_ANIMATION_BOUNCE);
-
                 }
-
             });
-
         },
  
         /** 系统规划抓去数据 @param  lineNameValue:线路名称；i：方向*/
         getBmapStationNames: function (lineNameValue, i, callback) {
-
             var busline = new BMap.BusLineSearch(mapBValue, {
-
                 // 设置公交列表查询后的回调函数。参数：rs: BusListResult类型
                 onGetBusListComplete: function (BusListResult) {
-
                     // 如果不为空
                     if (BusListResult) {
-
                         //获取第一个公交列表显示到map上
                         var fstLine = BusListResult.getBusListItem(i);
-
-                        /*if(fstLine==undefined){
-
-                            layer.confirm('系统无法生成该线路【'+lineNameValue+'】的站点与路段！请点击返回选择其它方式规划', {btn : [ '返回' ],icon: 3, title:'提示' }, function(index){
-
-                                layer.closeAll();
-
-                                if(i==0){
-
-                                    $('#upToolsMobal').show();
-
-                                }else if(i==1){
-
-                                    $('#downToolsMobal').show();
-
-                                }
-
-                                return;
-                            });
-
-                        }*/
-
                         if (fstLine == undefined) {
-
-
                             callback && callback(null);
-
                         }
-
                         busline.getBusLine(fstLine);
-
                     }
-
                 },
-
                 //设置公交线路查询后的回调函数.参数：rs: BusLine类型
                 onGetBusLineComplete: function (BusLine) {
-
                     // 如果不为空
                     if (BusLine) {
-
                         callback && callback(BusLine);
-
                     }
-
                 }
-
             });
-
             busline.getBusList(lineNameValue);
-
         },
         // 修改站点
         editStation: function (stationRouteId) {
@@ -952,6 +805,9 @@ window.WorldsBMap = function () {
                         break;
                     }
                 }
+                // 路段中间点为中心
+                var c = p.ia[Math.floor(p.ia.length/2)];
+                mapBValue.centerAndZoom(new BMap.Point(c.lng, c.lat), 18);
                 p.addEventListener('dblclick', function () {
                     /** 设置修改路段集合对象为空 */
                     editPolyline = '';
@@ -1230,8 +1086,7 @@ window.WorldsBMap = function () {
             });
             //开启信息窗口
             mapBValue.openInfoWindow(infoWindow_target, centerPoint);
-            mapBValue.setZoom(18);
-            mapBValue.setCenter(centerPoint);
+            mapBValue.panTo(centerPoint);
         },
         /**
          * 绘制新增路段
@@ -1310,7 +1165,7 @@ window.WorldsBMap = function () {
         strGetLength: function (str) {
             return str.replace(/[\u0391-\uFFE5]/g, "aa").length;  //先把中文替换成两个字节的英文，在计算长度
         }
-    }
+    };
  
     return Bmap;
  
@@ -255,6 +255,7 @@
 		</div>
 	</div>
 </div>
+<script src="/assets/js/baidu/bd_GeoUtils_min.js"  ></script>
 <!-- 线路类 -->
 <script src="/pages/base/stationroute/js/line.js"></script>
 <!-- 新增站点对象类 -->
+//------------------ 策略模块（以下） -----------------//
+
+var AdjustTripS1 = (function() {
+
+    function _f1(aBc, schedule, paramObj, fre) {
+        if (fre > 0) {
+            aBc.sort(function (o1, o2) {
+                if (o1.getFcTimeObj().isBefore(o2.getFcTimeObj())) {
+                    return -1;
+                } else {
+                    return 1;
+                }
+            });
+
+            var i;
+            var j;
+
+            var iBcCountOfGroup = 3; // 3个班次取一次计算
+            var aBcOfGroup; // 3个班次列表
+            var aBcIntervalOfGroup; // 班次间隔列表，如：3个班次，2个间隔
+            var oBcFcTime; // 班次发车时间
+
+            for (i = 0; i <= aBc.length - iBcCountOfGroup; i++) {
+                aBcOfGroup = [];
+                aBcIntervalOfGroup = [];
+                for (j = i; j < i + iBcCountOfGroup; j++) {
+                    aBcOfGroup.push(aBc[j]);
+                }
+
+                for (j = 0; j < aBcOfGroup.length; j++) {
+                    if (j < aBcOfGroup.length - 1) {
+                        aBcIntervalOfGroup.push(aBcOfGroup[j + 1].getFcTimeObj().diff(
+                            aBcOfGroup[j].getFcTimeObj(), "m"));
+                    }
+                }
+
+                // 判定规则
+                oBcFcTime = aBcOfGroup[1].getFcTimeObj();
+
+                // 第一个班次发车时间不动，根据间隔，调整中间一个班次
+                // 如果3个班次2个间隔时间差1分钟，不调整
+                // 如果第一个间隔大，调整第二个班次往前1分钟
+                // 如果第二个间隔大，调整第二个班次往后1分钟
+
+                if (paramObj.isTroughBc(oBcFcTime) &&
+                    aBcIntervalOfGroup[0] > paramObj.getTroughMaxFcjx()) {
+
+                    // aBcOfGroup[1].addMinuteToFcsj(-1);
+
+                    // 判定是否能调整发车时间
+                    // if (aBcOfGroup[1].getGroup().getLp().isModifyBcFcsj(aBcOfGroup[1], -1, _paramObj)) {
+                    aBcOfGroup[1]._$_fcsjObj.add(-1, "m");
+                    aBcOfGroup[1].setArrTimeObj(paramObj.addMinute(
+                        aBcOfGroup[1].getFcTimeObj(),
+                        paramObj.calcuTravelTime(
+                            aBcOfGroup[1].getFcTimeObj(),
+                            aBcOfGroup[1].isUp())
+                    ));
+
+                    // }
+                }
+
+                //else if (_paramObj.isMPeakBc(oBcFcTime) &&
+                //    aBcIntervalOfGroup[0] < _paramObj.getMPeakMinFcjx()) {
+                //    aBcOfGroup[1].addMinuteToFcsj(1);
+                //} else if (_paramObj.isMPeakBc(oBcFcTime) &&
+                //    aBcIntervalOfGroup[0] > _paramObj.getMPeakMaxFcjx()) {
+                //    aBcOfGroup[1].addMinuteToFcsj(-1);
+                //} else if (_paramObj.isEPeakBc(oBcFcTime) &&
+                //    aBcIntervalOfGroup[0] < _paramObj.getEPeakMinFcjx()) {
+                //    aBcOfGroup[1].addMinuteToFcsj(1);
+                //} else if (_paramObj.isEPeakBc(oBcFcTime) &&
+                //    aBcIntervalOfGroup[0] > _paramObj.getEPeakMaxFcjx()) {
+                //    aBcOfGroup[1].addMinuteToFcsj(-1);
+                //}
+
+
+                else {
+                    if (Math.abs(aBcIntervalOfGroup[0] - aBcIntervalOfGroup[1]) <= 1) {
+                        //continue;
+                    } else if (aBcIntervalOfGroup[0] > aBcIntervalOfGroup[1]) {
+
+
+                        // 判定是否能调整发车时间
+                        // if (aBcOfGroup[1].getGroup().getLp().isModifyBcFcsj(aBcOfGroup[1], -1, _paramObj)) {
+                        aBcOfGroup[1]._$_fcsjObj.add(-1, "m");
+                        aBcOfGroup[1].setArrTimeObj(paramObj.addMinute(
+                            aBcOfGroup[1].getFcTimeObj(),
+                            paramObj.calcuTravelTime(
+                                aBcOfGroup[1].getFcTimeObj(),
+                                aBcOfGroup[1].isUp())
+                        ));
+                        // }
+
+                        // aBcOfGroup[1].addMinuteToFcsj(-1);
+                    } else {
+                        // aBcOfGroup[1].addMinuteToFcsj(1);
+
+                        // 判定是否能调整发车时间
+                        // if (aBcOfGroup[1].getGroup().getLp().isModifyBcFcsj(aBcOfGroup[1], 1, _paramObj)) {
+                        aBcOfGroup[1]._$_fcsjObj.add(1, "m");
+                        aBcOfGroup[1].setArrTimeObj(paramObj.addMinute(
+                            aBcOfGroup[1].getFcTimeObj(),
+                            paramObj.calcuTravelTime(
+                                aBcOfGroup[1].getFcTimeObj(),
+                                aBcOfGroup[1].isUp())
+                        ));
+                        // }
+                    }
+                }
+
+                //if (Math.abs(aBcIntervalOfGroup[0] - aBcIntervalOfGroup[1]) <= 1) {
+                //    //continue;
+                //} else if (aBcIntervalOfGroup[0] > aBcIntervalOfGroup[1]) {
+                //    aBcOfGroup[1].addMinuteToFcsj(-1);
+                //} else {
+                //    aBcOfGroup[1].addMinuteToFcsj(1);
+                //}
+
+
+            }
+
+            _f1(aBc, schedule, paramObj, fre - 1);
+
+        }
+    }
+
+
+    function f1(aUpBc, aDownBc, schedule, paramObj) {
+        // TODO：9、调整纵向班次间隔
+        _f1(aUpBc, schedule, paramObj, 5);
+        _f1(aDownBc, schedule, paramObj, 5);
+
+        schedule.fnAdjustLpBcInterval(1);
+
+        _f1(aUpBc, schedule, paramObj, 5);
+        _f1(aDownBc, schedule, paramObj, 5);
+    }
+
+    return f1;
+}());
+
+//------------------ 策略模块（以上） -----------------//
+
+
+
+
+
+// 调整班次策略类
+var AdjustTripStrategy = (function() {
+
+    /**
+     * 内部策略配置封装类。
+     * @constructor
+     */
+    function InternalStrategy() {
+        // 策略函数对应，每个函数都由一个标识符号对应，类似配置函数
+        this._oSTRATIGIS = {
+            "ADJUST_TRIP": AdjustTripS1
+        };
+    }
+
+    /**
+     * 返回策略函数
+     * @param str 标识
+     * @returns {function}
+     */
+    InternalStrategy.prototype.sFn = function(str) {
+        if (!this._oSTRATIGIS[str]) {
+            throw "指定标识" + str + "策略函数不存在！";
+        }
+        return this._oSTRATIGIS[str];
+    };
+    /**
+     * 替换策略配置
+     * @param str 策略函数标识
+     * @param fn 策略函数
+     */
+    InternalStrategy.prototype.sConfig = function(str, fn) {
+        this._oSTRATIGIS[str] = fn;
+    };
+
+    return new InternalStrategy();
+}());
 \ No newline at end of file
@@ -149,9 +149,9 @@
             var fgs_name_mapp={
                 '55_3': '上南公司（六分公司）', '55_1': '上南公司（二分公司）', '55_2': '上南公司（三分公司）', '55_4': '上南公司（一分公司）', '55_5': '上南公司（培训部）',
                 '22_2': '金高公司（二分公司）', '22_1': '金高公司（四分公司）', '22_3': '金高公司（三分公司）', '22_5': '金高公司（一分公司）',
-                '26_3': '南汇公司（三分公司）', '26_2': '南汇公司（南汇二分）', '26_1': '南汇公司（南汇一分）', '26_4': '南汇公司（南汇维修公司）', '26_5': '南汇公司（南汇公司）', '26_6': '南汇公司（航头枢纽站）',
+                '26_3': '南汇公司（三分公司）', '26_2': '南汇公司（南汇二分）', '26_1': '南汇公司（南汇一分）', '26_4': '南汇公司（南汇维修公司）', '26_5': '南汇公司（南汇公司）', '26_6': '南汇公司（南汇六分）',
                 '05_5': '杨高公司（杨高分公司）', '05_6': '杨高公司（周浦分公司）', '05_3': '杨高公司（芦潮港分公司）', '05_1': '杨高公司（川沙分公司）', '05_2': '杨高公司（金桥分公司）',
-                '77_78': '闵行公司', '99_100': '青浦公交','24_1': '一车队', '24_2': '二车队', '24_3': '三车队'
+                '77_78': '闵行公司','300_301': '金球公交', '99_100': '青浦公交','24_1': '一车队', '24_2': '二车队', '24_3': '三车队'
             };
  
             var defauleConfig;
@@ -178,6 +178,7 @@
                         <input type="text" class="form-control"
                                name="equipmentCode" ng-model="ctrl.busInfoForSave.equipmentCode"
                                required placeholder="请输入设备终端号"
+                               readonly
                                remote-Validation
                                remotevtype="cars_sbbh"
                                remotevparam="{{ {'id_eq': ctrl.busInfoForSave.id, 'equipmentCode_eq': ctrl.busInfoForSave.equipmentCode} | json}}"
@@ -293,6 +293,14 @@ angular.module(&#39;ScheduleApp&#39;).controller(
             // 提交方法
             self.submit = function() {
                 console.log(self.busInfoForSave);
+
+                // 报废的车辆，修改原来的车辆终端号
+                if (self.busInfoForSave.scrapState == true) {
+                    self.busInfoForSave.equipmentCode = "BF-" + self.busInfoForSave.equipmentCode;
+                    self.busInfoForSave.scrapCode = "BF-" + self.busInfoForSave.equipmentCode;
+                }
+
+
                 // 保存或者更新
                 self.busInfoForSave.$save(function() {
                     DataStore.refreshData("cl");
@@ -9,7 +9,7 @@
 		<form class="form-inline" action="">
 			<div style="display: inline-block;" class="param">
 				<span class="item-label" style="width: 80px;">线路名称: </span>
-				<select class="form-control" name="lineCode_like" id="line" style="width: 180px;"></select>
+				<select class="form-control" name="id_eq" id="line" style="width: 180px;"></select>
 			</div>
 			<div class="form-group" style="display: inline-block;margin-left: 15px;">
 				<input class="btn btn-default" type="button" id="search" value="查询"/>
@@ -770,7 +770,7 @@ var gb_schedule_table = (function () {
      */
     var showLateBadge = function (lineCode, id, minute) {
         var dfCell = cancelLateBadge(lineCode, id);
-        $(dfCell).append('<span class="late-badge">?+5</span>');
+        $(dfCell).append('<span class="late-badge">?+'+minute+'</span>');
     };
  
     /**
-var gb_svg_data_convert = (function () {
-
-    /**
-     * 合并上下行路由
-     * type 0 上行 1 下行 2 同名合并  3 异名合并
-     *
-     * enableAttr: 是否启用配置信息
-     */
-    function mergeRoute(routes, enableAttr, lineCode, loopLine) {
-        console.log('routesroutes', routes);
-        //按上下行拆分
-        routes = gb_common.groupBy(routes, 'directions');
-        var up = routes[0],
-            down = routes[1];
-        //排序
-        up.sort(upSort);
-        down.sort(downSort);
-        var data = [];
-
-        //根据配置处理一下数据
-        if (enableAttr) {
-            var svgAttr = gb_data_basic.getSvgAttr(lineCode);
-            if (svgAttr) {
-                up = filterByAttrs(svgAttr, up);
-                down = filterByAttrs(svgAttr, down);
-            }
-        }
-
-        //环线 只画上行
-        if(loopLine){
-            for (var j = 0; j < up.length; j++) {
-                var upS = nvl_get(up, j);
-                op = {
-                    name: [upS.stationName],
-                    id: [get_station_code(upS)],
-                    type: 0,
-                    stationMark: upS.stationMark
-                };
-                data.push(op);
-            }
-
-            //上下行GPS容器
-            $.each(data, function () {
-                this.gpsUps = [];
-                this.gpsDowns = [];
-            });
-
-            return data;
-        }
-
-
-        //同名站点合并
-        for (var j = 0; j < up.length; j++) {
-            var upS = nvl_get(up, j),
-                downS = nvl_get(down, j),
-                op = {
-                    name: [upS.stationName],
-                    id: [get_station_code(upS), get_station_code(downS)],
-                    type: 2,
-                    stationMark: upS.stationMark//站点标记
-                };
-
-            if (upS.stationName != downS.stationName) {
-                //下行站点在上行路由中是否存在
-                var dIndex = station_indexof(down, upS, j);
-                //上行站点在下行路由中是否存在
-                var uIndex = station_indexof(up, downS, j);
-                if (dIndex == -1 || dIndex - j > 4) {
-                    if (uIndex == -1 && dIndex - j < 4) {
-                        op.type = 3;
-                        op.name = [upS.stationName, downS.stationName];
-                    }
-                    else {
-                        op.type = 0;
-                        op.id = [get_station_code(upS), -1];
-                        //占位
-                        down.splice(j, 0, {});
-                    }
-                } else {
-                    for (var t = j; t < dIndex - 1; t++) {
-                        var temp = down[t];
-                        data.push({
-                            name: [temp.stationName],
-                            type: 1,
-                            id: [get_station_code(temp)]
-                        });
-                    }
-                    //delete
-                    down.splice(j, dIndex - 1 - j);
-                    j--;
-                    continue;
-                }
-            }
-            data.push(op);
-        }
-
-        //将上下行挨着的异名站点合并
-        var len = data.length - 1,
-            first, sec;
-        for (var s = 0; s < len; s++) {
-            first = data[s];
-            sec = data[s + 1];
-
-            if (first.type == 0 &&
-                sec.type == 1) {
-                data.splice(s, 2, {
-                    name: [first['name'][0], sec['name'][0]],
-                    type: 3,
-                    id: [first['id'][0], sec['id'][0]]
-                });
-                len--;
-            } else if (first.type == 1 && sec.type == 0) {
-                data.splice(s, 2, {
-                    name: [first['name'][0], sec['name'][0]],
-                    type: 3,
-                    id: [first['id'][0], sec['id'][0]]
-                });
-                len--;
-            }
-        }
-
-        //上下行GPS容器
-        $.each(data, function () {
-            this.gpsUps = [];
-            this.gpsDowns = [];
-        });
-        return data;
-    };
-
-    var filterByAttrs = function (svgAttr, routes) {
-        var hideStations = svgAttr.hideStations ? svgAttr.hideStations : [];
-        var nicknames = svgAttr.nicknames ? svgAttr.nicknames : {};
-        var stationCode;
-        $.each(routes, function (i) {
-            stationCode = this.stationCode
-            //要隐藏的站点
-            $.each(hideStations, function (j, hide) {
-                if (stationCode == hide)
-                    delete routes[i];
-            });
-
-            //要重命名的站点
-            if (nicknames[this.stationName]) {
-                this.stationName = nicknames[this.stationName];
-            }
-        });
-
-        var newRoutes = [];
-        $.each(routes, function (i, station) {
-            if(station)
-                newRoutes.push(station);
-        });
-
-        return newRoutes;
-    };
-
-    var upSort = function (a, b) {
-        return a.stationRouteCode - b.stationRouteCode;
-    };
-
-    var downSort = function (a, b) {
-        return b.stationRouteCode - a.stationRouteCode;
-    };
-
-    var station_indexof = function (array, station, start) {
-        var res = -1;
-        for (var i = start, obj; obj = array[i++];) {
-            if (obj.stationName == station.stationName) {
-                res = i;
-                break;
-            }
-        }
-        return res;
-    };
-
-    var get_station_code = function (station) {
-        return station.stationCode + '_' + station.directions;
-    };
-
-    var nvl_get = function (list, index) {
-        return list[index] == null ? {} : list[index];
-    };
-
-    var groupByStationAndUpdown = function (data) {
-        //gb_common.groupBy(data, 'stopNo')
-        var rs = {},
-            key;
-        $.each(data, function () {
-            key = this['stopNo'] + '_' + this['upDown'];
-            if (!rs[key])
-                rs[key] = [];
-
-            rs[key].push(this);
-        });
-
-        return rs;
-    };
-    return {mergeRoute: mergeRoute, groupByStationAndUpdown: groupByStationAndUpdown};
-})();