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

潘钊
2 parents 47fed13e a7bc09a8
Showing 13 changed files with 311 additions and 165 deletions
src/main/java/com/bsth/controller/schedule/TTInfoController.java
src/main/java/com/bsth/entity/schedule/TTInfo.java
src/main/java/com/bsth/service/impl/StationServiceImpl.java
src/main/java/com/bsth/service/schedule/TTInfoServiceImpl.java
src/main/java/com/bsth/service/schedule/rules/strategy/IStrategyImpl.java
src/main/resources/rules/shiftloop.drl
src/main/resources/static/pages/base/stationroute/addstationstemplate.html
src/main/resources/static/pages/base/stationroute/js/stationroute-list-function.js
src/main/resources/static/pages/base/stationroute/js/stationroute-list-map.js
src/main/resources/static/pages/scheduleApp/module/common/prj-common-globalservice.js
src/main/resources/static/pages/scheduleApp/module/core/timeTableManage/list.html
src/main/resources/static/pages/scheduleApp/module/core/timeTableManage/timeTableManage.js
src/test/java/com/bsth/service/schedule/rules/DroolsRulesTest.java
@@ -7,6 +7,7 @@ import com.bsth.repository.schedule.TTInfoRepository;
 import com.bsth.service.schedule.utils.DataToolsProperties;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.data.domain.Page;
 import org.springframework.web.bind.annotation.*;
 import java.util.Map;
@@ -59,4 +60,13 @@ public class TTInfoController extends BaseController&lt;TTInfo, Long&gt; {
         // 一般比较自编号是否重复
         return baseService.validateEquale(map);
     }
+
+    @Override
+    public Page<TTInfo> list(@RequestParam Map<String, Object> map, @RequestParam(defaultValue = "0") int page, @RequestParam(defaultValue = "10") int size, @RequestParam(defaultValue = "id") String order, @RequestParam(defaultValue = "DESC") String direction) {
+        // 如果有isCancel键值，将其值变成boolean
+        if (map.get("isCancel_eq") != null)
+            map.put("isCancel_eq", new Boolean(map.get("isCancel_eq").toString()));
+
+        return super.list(map, page, size, order, direction);
+    }
 }
@@ -41,6 +41,9 @@ public class TTInfo {
     /** 是否启用调度模版 */
     @Column(nullable = false)
     private Boolean isEnableDisTemplate;
+    /** 是否删除（标记） */
+    @Column(nullable = false)
+    private Boolean isCancel = false;
     /** 模版类型（TODO：时刻表，间隔式，这个以后用枚举还是字典再议，现在先用文字） */
     private String templateType;
@@ -193,4 +196,11 @@ public class TTInfo {
         this.updateDate = updateDate;
     }
+    public Boolean getIsCancel() {
+        return isCancel;
+    }
+
+    public void setIsCancel(Boolean isCancel) {
+        this.isCancel = isCancel;
+    }
 }
@@ -131,10 +131,12 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 			Map<String, Object> resultSaveMapm = new HashMap<String,Object>();
+			String baseRes = map.get("baseRes").equals("") ? "" : map.get("baseRes").toString();
+			
 			if(!stationJSON.equals("")) {
 				// 保存站点与站点路由信息
-				resultSaveMapm = savaStationAndStationRouteInfo( stationJSON, sectionDistance, sectionDuration, dbType,radius, shapesType, destroy, versions, sumUpOrDownMileage, directions, resultLine);
+				resultSaveMapm = savaStationAndStationRouteInfo( stationJSON, sectionDistance, sectionDuration, dbType,radius, shapesType, destroy, versions, sumUpOrDownMileage, directions, resultLine,baseRes);
 			}
@@ -258,7 +260,7 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 	 */
 	public Map<String, Object> savaStationAndStationRouteInfo(String stationJSON,double sectionDistance,double sectionDuration,String dbType,
-			int radius,String shapesType,int destroy,int versions,double sumUpOrDownMileage,int directions,Line resultLine) throws Exception{
+			int radius,String shapesType,int destroy,int versions,double sumUpOrDownMileage,int directions,Line resultLine,String baseRes) throws Exception{
 		Map<String, Object> paramsMeleageAndDistncDura = new HashMap<String,Object>();
@@ -302,9 +304,6 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 				// 百度坐标纬度
 				String bLatx = JSONObject.parseObject(stationsArray.getJSONObject(i).get("potion").toString()).get("lat").toString();
-				// 百度经纬度
-				bJwpoints = bLonx + " " + bLatx;
-				
 				List<Object[]> stationNameList = repository.findStationName(stationName);
 				boolean isHave = isHaveStationname(bJwpoints,stationNameList);
@@ -343,10 +342,84 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 					float gLaty = 0.0f;
-					/** to WGS坐标 */
-					Location resultPoint = FromBDPointToWGSPoint(bLonx,bLatx);
+					Location resultPoint = null;
+					
+					if(baseRes.equals("No")){
+						
+						/** BD to WGS坐标 */
+						resultPoint = FromBDPointToWGSPoint(bLonx,bLatx);
+						
+						if(gLonxStr==null) 
+							gLonx = (float)resultPoint.getLng();
+						else 
+							gLonx =  Float.valueOf(gLonxStr);
+						
+						if(gLatyStr==null)
+							gLaty = (float)resultPoint.getLat();
+						else 
+							gLaty =  Float.valueOf(gLatyStr);
+						
+						arg0.setgLonx(gLonx);
+						
+						arg0.setgLaty(gLaty);
+						
+						// 百度经纬度
+						bJwpoints = bLonx + " " + bLatx;
+						
+						arg0.setbJwpoints(bJwpoints);
+						
+					}else if(baseRes.equals("GCJ02")){
+						
+						Location bdLoc = TransGPS.LocationMake(Double.valueOf(gLonxStr), Double.valueOf(gLatyStr));
+						
+						Location location = TransGPS.bd_encrypt(bdLoc);
+						
+						String GCJLng = String.valueOf(location.getLng());
+						
+						String GCJLat = String.valueOf(location.getLat());
+						
+						resultPoint = FromBDPointToWGSPoint(GCJLng,GCJLat);
+						
+						bJwpoints = GCJLng + " "  +GCJLat;
+						
+						arg0.setgLonx((float)location.getLng());
+						
+						arg0.setgLaty((float)location.getLat());
+						
+						arg0.setbJwpoints(bJwpoints);
+						
+						
+					}else if(baseRes.equals("BD09")){
+						
+						resultPoint = FromBDPointToWGSPoint(gLonxStr, gLatyStr);
+						
+						bJwpoints = gLonxStr+ " " + gLatyStr;
+						
+						arg0.setgLonx((float)resultPoint.getLng());
+						
+						arg0.setgLaty((float)resultPoint.getLat());
+						
+					}else if(baseRes.equals("WGS84")){
+						
+						Location bdLoc = TransGPS.LocationMake(Double.valueOf(gLonxStr), Double.valueOf(gLatyStr));
+						
+						Location gcjLoc = TransGPS.transformFromWGSToGCJ(bdLoc);
+						
+						Location bdEn = TransGPS.bd_encrypt(gcjLoc);
+						
+						bJwpoints = String.valueOf(bdEn.getLng()) + " " + String.valueOf(bdEn.getLat()); 
+						
+						arg0.setbJwpoints(bJwpoints);
+						
+						arg0.setgLonx(Float.valueOf(gLonxStr));
+						
+						arg0.setgLaty(Float.valueOf(gLatyStr));
+						
+					}
+					
+					
-					if(gLonxStr==null) 
+				/*	if(gLonxStr==null) 
 						gLonx = (float)resultPoint.getLng();
 					else 
 						gLonx =  Float.valueOf(gLonxStr);
@@ -358,7 +431,7 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 					arg0.setgLonx(gLonx);
-					arg0.setgLaty(gLaty);
+					arg0.setgLaty(gLaty);*/
  					// 站点地理位置WGS坐标经度
 					// String gLonx = JSONObject.parseObject(stationsArray.getJSONObject(i).get("WGSpotion").toString()).get("Lng").toString();
@@ -379,7 +452,7 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 					// 版本号
 					arg0.setVersions(versions);
-					arg0.setbJwpoints(bJwpoints);
+					/*arg0.setbJwpoints(bJwpoints);*/
 					// 插入站点信息
 					repository.save(arg0);
@@ -1280,6 +1353,7 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 	}
+	
 	@Override
 	public Map<String, Object> manualSave(Map<String, Object> map) {
@@ -1331,10 +1405,12 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 			Map<String, Object> resultSaveMapm = new HashMap<String,Object>();
+			String baseRes = map.get("baseRes").equals("") ? "" : map.get("baseRes").toString();
+			
 			if(!stationJSON.equals("")) {
 				// 保存站点与站点路由信息
-				// resultSaveMapm = savaStationAndStationRouteInfo( stationJSON, sectionDistance, sectionDuration, dbType,radius, shapesType, destroy, versions, sumUpOrDownMileage, directions, resultLine);
+				resultSaveMapm = savaStationAndStationRouteInfo( stationJSON, sectionDistance, sectionDuration, dbType,radius, shapesType, destroy, versions, sumUpOrDownMileage, directions, resultLine,baseRes);
 			}
@@ -1347,7 +1423,7 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 			// 如果路段信息JSON字符串不为空
 			if(!sectionJSON.equals("")) {
-				// manualSaveSectionAndSectionRoute(sectionJSON, speedLimitStr, sectionDistance, sectionDuration, dbType, versions, resultLine, destroy, directions);
+				manualSaveSectionAndSectionRoute(sectionJSON, speedLimitStr, sectionDistance, sectionDuration, dbType, versions, resultLine, destroy, directions);
 			}
 package com.bsth.service.schedule;
+import com.bsth.common.ResponseCode;
 import com.bsth.entity.schedule.TTInfo;
-import com.bsth.repository.schedule.TTInfoDetailRepository;
+import com.bsth.repository.schedule.TTInfoRepository;
 import com.bsth.service.impl.BaseServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.stereotype.Service;
 import javax.transaction.Transactional;
+import java.util.HashMap;
 import java.util.Map;
 /**
@@ -16,11 +19,21 @@ import java.util.Map;
 @Transactional
 public class TTInfoServiceImpl extends BaseServiceImpl<TTInfo, Long> implements TTInfoService {
     @Autowired
-    private TTInfoDetailRepository ttInfoDetailRepository;
+    private TTInfoRepository ttInfoRepository;
     @Override
     public Map<String, Object> delete(Long aLong) {
-        ttInfoDetailRepository.deleteByTtinfoId(aLong);
-        return super.delete(aLong);
+        TTInfo ttInfo = ttInfoRepository.findOne(aLong);
+        ttInfo.setIsCancel(true);
+
+        Map<String, Object> map = new HashMap<>();
+        try{
+            ttInfoRepository.save(ttInfo);
+            map.put("status", ResponseCode.SUCCESS);
+        }catch(DataIntegrityViolationException de){
+            map.put("status", ResponseCode.ERROR);
+            map.put("msg", "“完整性约束”校验失败，请检查要删除的对象是否存在外键约束");
+        }
+        return map;
     }
 }
@@ -37,6 +37,7 @@ public class IStrategyImpl implements IStrategy {
         // 查询参数
         Map<String, Object> param = new HashMap<>();
         param.put("xl.id_eq", xlId); // 线路id
+        param.put("isCancel_eq", false); // 没有作废
         param.put("isEnableDisTemplate_eq", true); // 是否启用
         Iterable<TTInfo> ttInfoIterable = ttInfoService.list(param);
         Iterator<TTInfo> ttInfoIterator = ttInfoIterable.iterator();
@@ -361,12 +361,12 @@ end
 rule "calcu_guideboard_range_loop_1_1"
     when
-        Calcu_guideboard_range_loop_param($ruleId : ruleId, $sdays : sdays, sdays <= temp)
+        Calcu_guideboard_range_loop_param($ruleId : ruleId, $sdays : sdays, (sdays - 1) <= temp)
         Calcu_guideboard_index_result(ruleId == $ruleId, $index : calcu_index)
     then
         Calcu_guideboard_range_loop_result cgrlr = new Calcu_guideboard_range_loop_result();
         cgrlr.setRuleId($ruleId);
-        cgrlr.setFirstLoopSize($index + $sdays);
+        cgrlr.setFirstLoopSize($index + $sdays - 1);
         cgrlr.setMiddelLoopCount(0);
         cgrlr.setRangeSize(0);
         cgrlr.setLastLoopSize(0);
@@ -382,7 +382,7 @@ end
 rule "calcu_guideboard_range_loop_1_2"
     when
-        Calcu_guideboard_range_loop_param($ruleId : ruleId, $sdays : sdays, $temp : temp, sdays > temp)
+        Calcu_guideboard_range_loop_param($ruleId : ruleId, $sdays : sdays, $temp : temp, (sdays - 1) > temp)
         Calcu_guideboard_index_result(ruleId == $ruleId, $index : calcu_index)
         ScheduleRule_input(ruleId == $ruleId, $rangesize : guideboardIds.size())
     then
@@ -390,7 +390,7 @@ rule &quot;calcu_guideboard_range_loop_1_2&quot;
         cgrlr.setRuleId($ruleId);
         cgrlr.setFirstLoopSize($index + $temp);
-        int gbd_days_temp_minus = $sdays - $temp;
+        int gbd_days_temp_minus = $sdays - 1 - $temp;
         int gbd_days_temp_minus_svalue = (int) (gbd_days_temp_minus / new Integer($rangesize));
         int gbd_days_temp_minus_yvalue = gbd_days_temp_minus % new Integer($rangesize);
@@ -438,12 +438,12 @@ end
 rule "calcu_employee_range_loop_1_1"
     when
-        Calcu_employee_range_loop_param($ruleId : ruleId, $sdays : sdays, sdays <= temp)
+        Calcu_employee_range_loop_param($ruleId : ruleId, $sdays : sdays, sdays - 1 <= temp)
         Calcu_employee_index_result(ruleId == $ruleId, $index : calcu_index)
     then
         Calcu_employee_range_loop_result cgrlr = new Calcu_employee_range_loop_result();
         cgrlr.setRuleId($ruleId);
-        cgrlr.setFirstLoopSize($index + $sdays);
+        cgrlr.setFirstLoopSize($index + $sdays - 1);
         cgrlr.setMiddelLoopCount(0);
         cgrlr.setRangeSize(0);
         cgrlr.setLastLoopSize(0);
@@ -459,7 +459,7 @@ end
 rule "calcu_employee_range_loop_1_2"
     when
-        Calcu_employee_range_loop_param($ruleId : ruleId, $sdays : sdays, $temp : temp, sdays > temp)
+        Calcu_employee_range_loop_param($ruleId : ruleId, $sdays : sdays, $temp : temp, sdays - 1 > temp)
         Calcu_employee_index_result(ruleId == $ruleId, $index : calcu_index)
         ScheduleRule_input(ruleId == $ruleId, $rangesize : employeeConfigIds.size())
     then
@@ -467,7 +467,7 @@ rule &quot;calcu_employee_range_loop_1_2&quot;
         cgrlr.setRuleId($ruleId);
         cgrlr.setFirstLoopSize($index + $temp);
-        int gbd_days_temp_minus = $sdays - $temp;
+        int gbd_days_temp_minus = $sdays - 1 - $temp;
         int gbd_days_temp_minus_svalue = (int) (gbd_days_temp_minus / new Integer($rangesize));
         int gbd_days_temp_minus_yvalue = gbd_days_temp_minus % new Integer($rangesize);
@@ -546,6 +546,8 @@ rule &quot;calcu_loop_guideboard&quot;
         clgr.setRuleId($ruleId);
         clgr.setGo_list(scheduleResult_outputs);
+        System.out.println(scheduleResult_outputs.size());
+
         insert(clgr);
 end
@@ -608,6 +610,8 @@ rule &quot;calcu_loop_employee&quot;
         clgr.setRuleId($ruleId);
         clgr.setEo_list(scheduleResult_outputs);
+        System.out.println(scheduleResult_outputs.size());
+
         insert(clgr);
 end
@@ -40,10 +40,10 @@
 										<input type="radio" class="icheck" name="baseRes" value='No'> 暂无坐标系
 								</label>
 								<label>
-										<input type="radio" class="icheck" name="baseRes" value='GCJ-02' > 火星坐标系
+										<input type="radio" class="icheck" name="baseRes" value='GCJ02' > 火星坐标系
 								</label>
 								<label >
-									<input type="radio" class="icheck" name="baseRes" value='BD-09'> 百度坐标系
+									<input type="radio" class="icheck" name="baseRes" value='BD09'> 百度坐标系
 								</label>
 								<label >
 									<input type="radio" class="icheck" name="baseRes" value='WGS84' checked> WGS84坐标系
@@ -59,7 +59,6 @@
                             	<span class="help-block" style="color:#1bbc9b;">
                             		&nbsp;请在文本域中按站点顺序依次输入站点名称（如果已有站点GPS坐标，请将坐标跟在站点名称后面用【Tab】键隔开）,每输入完一个站名时请按回车键【Enter】换行.
                             		例如：<br><br>
-                            		<!-- <HR style="FILTER: alpha(opacity=0,finishopacity=100,style=1)" width="80%" color=#987cb9 SIZE=3> -->
                             		浦东大道金桥路	121.496612	31.238960<br>
                             		浦东大道居家桥路	121.496618	31.238957<br>
                             		浦东大道德平路	121.496622	31.238948<br>
@@ -80,6 +79,8 @@
 $('#add_station_template_mobal').on('AddStationTempMobal.show', function(e,map,ajaxd,dir,line,fun){
+	
+	
 	// 延迟加载显示mobal
 	setTimeout(function(){$('#add_station_template_mobal').modal({show : true,backdrop: 'static', keyboard: false});},200);
@@ -149,15 +150,24 @@ $(&#39;#add_station_template_mobal&#39;).on(&#39;AddStationTempMobal.show&#39;, function(e,map,a
 			var directionData = dir;
+			// 定义线路名称
+			var lineNameV = $('.portlet-title .caption').text();
+			
+			var dirStr = '';
+			
 			// 上行
 			if(directionData==0){
+				dirStr = '上行路段';
+				
 				// 隐藏上行规划
 				$('#upToolsMobal').hide();
 			// 下行
 			}else if(directionData==1){
+				dirStr = '下行路段';
+				
 				// 隐藏上行规划
 				$('#downToolsMobal').hide();
@@ -167,163 +177,181 @@ $(&#39;#add_station_template_mobal&#39;).on(&#39;AddStationTempMobal.show&#39;, function(e,map,a
 			var i = layer.load(0,{offset:['200px', '280px']});
 			// 表单序列化
-			var params = form.serializeJSON();
+			var paramsForm = form.serializeJSON();
-			var baseResValue = params.baseRes;
+			var baseResValue = paramsForm.baseRes;
 			// 站点名称字符串切割
-			var paramsStationsArray = params.stations.split('\r\n');
+			var array = paramsForm.stations.split('\r\n');
-			var len = paramsStationsArray.length;
+			var arrayFormat = inputStationValueFormat(array);
-			if(baseResValue=='No'){
-				
-				debugger;
-				
-				var stationList = [];
-				
-				for(var k =0;k<len;k++)
-					stationList.push({name:paramsStationsArray[k]+'公交车站'});
-				
-				
-				console.log(stationList);
-				
-				return;
+			 
+			// 根据站点名称获取百度坐标
+			map.stationsNameToPoints(arrayFormat,function(resultJson) {
-				// 根据站点名称获取百度坐标
-				map.stationsNameToPoints(stationList,function(resultJson) {
+				// 根据坐标点获取两点之间的时间与距离
+				map.getDistanceAndDuration(resultJson,function(stationdataList) {
+					
+					// 设置第一个站的距离
+					stationdataList[0].distance = '';
+        			
+					// 设置第一个站的时间
+					stationdataList[0].duration = '';
+					
+					// 定义站点信息JSON字符串
+					var stationJSON = JSON.stringify(stationdataList);
+					
+					var addLine = line.getLineObj();
+					
+					// 参数集合
+					var params = {};
+					
+					params.baseRes =  baseResValue;
+					
+					// 站点信息JSON字符串
+					params.stationJSON = stationJSON;
+					
+					// 线路ID
+					params.lineId = addLine.id;
+					
+					// 方向
+					params.directions = directionData;
+					
+					// 原始坐标类型
+					params.dbType = 'b';
+					
+					// 圆形半径
+					params.radius = '100';
+					
+					// 限速
+					params.speedLimit = '60';
-					// 根据坐标点获取两点之间的时间与距离
-					map.getDistanceAndDuration(resultJson,function(stationdataList) {
+					// 图形类型（r：圆形；p：多边形）
+					params.shapesType = 'r';
+					
+					// destroy：是否撤销
+					params.destroy = '0';
+					
+					// versions：版本号
+					params.versions = '1';
+					
+					map.lineInfoPanl(lineNameV,directionData,function(BusLine){
-						// 根据坐标点获取两点之间的折线路段
-						map.getSectionListPlonly(stationdataList,function(sectiondata) {
-							
-							var addLine = LineObj.getLineObj();
-							
-							// 设置第一个站的距离
-							stationdataList[0].distance = '';
-	            			
-							// 设置第一个站的时间
-							stationdataList[0].duration = '';
-							
-							// 定义站点信息JSON字符串
-							var stationJSON = JSON.stringify(stationdataList);
-							
-							// 定义路段信息字符串
-							var sectionJSON = JSON.stringify(sectiondata);
-							
-							// 参数集合
-							var params = {};
-							
-							// 站点信息JSON字符串
-							params.stationJSON = stationJSON;
-							
-							// 线路ID
-							params.lineId = addLine.id;
-							
-							// 方向
-							params.directions = directionData;
+						// 如果线路信息不为空
+						if(BusLine){
-							// 原始坐标类型
-							params.dbType = 'b';
-							
-							// 圆形半径
-							params.radius = '100';
-							
-							// 限速
-							params.speedLimit = '60';
-							
-							// 图形类型（r：圆形；p：多边形）
-							params.shapesType = 'r';
-							
-							// destroy：是否撤销
-							params.destroy = '0';
-							
-							// versions：版本号
-							params.versions = '1';
-							
-							// 路段信息JSON字符串
-							params.sectionJSON = sectionJSON;
-							
-							// 保存
-							ajaxd.manualSave(params,function(rd) {
-
-								if(rd.status='SUCCESS') {
+							if(BusLine.zB.length == 0){
+								
+								// 根据坐标点获取两点之间的折线路段
+								map.getSectionListPlonly(stationdataList,function(sectiondata) {
-									layer.msg('保存成功！');
+									// 定义路段信息字符串
+									var sectionJSON = JSON.stringify(sectiondata);
-								}else {
+									// 路段信息JSON字符串
+									params.sectionJSON = sectionJSON;
-									layer.msg('保存失败！');
+									addSave(params,addLine.id,directionData);
-								}
+								});
-								// 关闭弹出层
-								layer.closeAll();
-								// 清除地图覆盖物
-								map.clearMarkAndOverlays();
-								// 刷新树
-								fun.resjtreeDate(addLine.id,directionData);
+							}else {
-								// 查询上行路段信息
-								ajaxd.getSectionRouteInfo(addLine.id,directionData,function(data) {
-									
-								// 在地图上画出线路走向
-								fun.linePanlThree(data,directionData);
-									
-								});
+								// 获取公交线几何对象, 仅当结果自动添加到地图上时有效
+								var Polygon = BusLine.getPolyline();
-							});
-							 
-						});
-						
-	 				});
+								// 返回多边型的点数组（自1.2新增）
+								var polyGonArray = Polygon.getPath();
+								
+								var jsonArray = [{sectionName:lineNameV+dirStr,points:polyGonArray}];
+								
+								// 定义路段信息字符串
+								var sectionJSON = JSON.stringify(jsonArray);
+								
+								// 路段信息JSON字符串
+								params.sectionJSON = sectionJSON;
+								
+								addSave(params,addLine.id,directionData);
+								
+							}
+						} 
+					});
 				});
-			}else {
-				
+			});
+			
+		}
+		
+	});
+	
+	function inputStationValueFormat(paramsStationsArray) {
+		
+		var stationList = [];
+		
+		var len = paramsStationsArray.length;
+		
+		for(var k =0;k<len;k++) {
+			
+			if(paramsStationsArray[k]=="")
+				continue;
+			
+			var tempStr = paramsStationsArray[k].split('\t');
+		 
+			if(tempStr.length<2){
+				stationList.push({name:paramsStationsArray[k]+"公交车站",wgs:{x:'',y:''}});
+			 
+			}else {
+				stationList.push({name:tempStr[0]+"公交车站",wgs:{x:tempStr[1], y:tempStr[2]}});
 			}
-			
-			
-			/* if(len>0) {
-				
-				for(var k =0;k<len;k++) {
-					
-					if(paramsStationsArray[k]=="")
-						continue;
-					
-					var tempStr = paramsStationsArray[k].split('\t');
-					if(tempStr.length<2){
-						
-						stationList.push({name:paramsStationsArray[k]+"公交车站",wgs:{x:'',y:''}});
-					 
-					}else {
-						
-						stationList.push({name:tempStr[0]+"公交车站",wgs:{x:tempStr[1], y:tempStr[2]}});
-						
-					}
-						 
-				}
+		}
+		
+		return stationList;
+		
+	}
+	
+	function addSave(params,lineid,directionData) {
+		
+		// 保存
+		ajaxd.manualSave(params,function(rd) {
+
+			if(rd.status='SUCCESS') {
+				
+				layer.msg('保存成功！');
 			}else {
-				layer.msg('请按说明规则输入站点!');
+				layer.msg('保存失败！');
-				return;
+			}
+			
+			// 关闭弹出层
+			layer.closeAll();
+			
+			// 清除地图覆盖物
+			map.clearMarkAndOverlays();
+			
+			// 刷新树
+			fun.resjtreeDate(lineid,directionData);
+			
+			// 查询上行路段信息
+			ajaxd.getSectionRouteInfo(lineid,directionData,function(data) {
+				
+			// 在地图上画出线路走向
+			fun.linePanlThree(lineid,data,directionData);
-			} */
+			});
-		}
+		});
-	});
+	}
 });
 </script>
 \ No newline at end of file
@@ -249,7 +249,9 @@ var PublicFunctions = function () {
 					// 如果线路信息不为空
 					if(BusLine) {
-						if(BusLine.yB.length == 0){
+						console.log(BusLine);
+						
+						if(BusLine.zB.length == 0){
 							layer.confirm('系统生成该线路【'+lineNameV+'】时获取站点与路段异常！请联系管理员或者检查网络连接是否异常！', {
 								btn : [ '确认' ]
@@ -307,8 +309,7 @@ var PublicFunctions = function () {
 							stationInfo.push(tempM);
 						}
-						console.log(stationInfo);
-						debugger;
+						 
 						// 获取站点之间的距离与时间
 						WorldsBMap.getDistanceAndDuration(stationInfo,function(json) {
@@ -359,6 +360,8 @@ var PublicFunctions = function () {
 							// 限速
 							params.speedLimit = '60';
+							params.baseRes = 'No';
+							
 							// 保存
 							GetAjaxData.collectionSave(params,function(rd) {
@@ -711,8 +711,8 @@ var WorldsBMap = function () {
 					 if (index >= len) {
 						 callback && callback(stationList);
-			        	  
-			              return;
+						 
+			        	 return ; 
 			          }
 					 var f = arguments.callee;
@@ -730,12 +730,12 @@ var WorldsBMap = function () {
 							 if(poi) {
 								/* stationList.push({name:arra[index],potion:{lng:poi.point.lng,lat:poi.point.lat}});*/
-								 stationList.push({name:arra[index].name.replace('公交站',''),wgs:arra[index].wgs,potion:{lng:poi.point.lng,lat:poi.point.lat}});
-								 
-								 f();
+								 stationList.push({name:arra[index].name.replace('公交车站',''),wgs:arra[index].wgs,potion:{lng:poi.point.lng,lat:poi.point.lat}});
 							 }
+							 f();
+							 
 						 });
 					 }else {
@@ -201,7 +201,8 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;TimeTableManageService_g&#39;, [&#39;$resource&#39;, 
                 list: {
                     method: 'GET',
                     params: {
-                        page: 0
+                        page: 0,
+                        isCancel_eq: 'false'
                     }
                 },
                 get: {
@@ -70,14 +70,14 @@
                        class="btn default blue-stripe btn-sm"> 编辑 </a>
                     <a ng-click="ctrl.importData($index)" class="btn default blue-stripe btn-sm"> 导入 </a>
                     <a href="javascript:" class="btn default blue-stripe btn-sm"> 导出 </a>
-                    <a href="javascript:" class="btn default blue-stripe btn-sm"> 模版 </a>
+                    <a href="javascript:" class="btn default blue-stripe btn-sm"> 清空 </a>
                 </td>
                 <td>
                     <!--<a href="details.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 详细 </a>-->
                     <!--<a href="edit.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 修改 </a>-->
                     <a ui-sref="timeTableManage_detail({id: info.id})" class="btn default blue-stripe btn-sm"> 详细 </a>
                     <a ui-sref="timeTableManage_edit({id: info.id})" class="btn default blue-stripe btn-sm"> 修改 </a>
-                    <a ng-click="ctrl.deleteTTinfo(info.id)" class="btn default blue-stripe btn-sm"> 删除 </a>
+                    <a ng-click="ctrl.deleteTTinfo(info.id)" class="btn default blue-stripe btn-sm"> 作废 </a>
                 </td>
             </tr>
             </tbody>
@@ -195,14 +195,14 @@ angular.module(&#39;ScheduleApp&#39;).controller(&#39;TimeTableManageListCtrl&#39;, [&#39;TimeTableM
         // TODO:
         timeTableManageService.deleteDetail(id).then(
             function(result) {
-                alert("删除成功！");
+                alert("作废成功！");
                 timeTableManageService.getPage().then(
                     function(result) {
                         self.pageInfo.totalItems = result.totalElements;
                         self.pageInfo.currentPage = result.number + 1;
                         self.pageInfo.infos = result.content;
-                        schedulePlanManageService.setCurrentPageNo(result.number + 1);
+                        timeTableManageService.setCurrentPageNo(result.number + 1);
                     },
                     function(result) {
                         alert("出错啦！");
@@ -65,7 +65,7 @@ public class DroolsRulesTest {
         ScheduleCalcuParam_input scheduleCalcuParam_input = new ScheduleCalcuParam_input();
         scheduleCalcuParam_input.setFromDate(new DateTime(2016, 8, 1, 0, 0));
-        scheduleCalcuParam_input.setToDate(new DateTime(2016, 8, 2, 0, 0));
+        scheduleCalcuParam_input.setToDate(new DateTime(2016, 8, 10, 0, 0));
         scheduleCalcuParam_input.setTtinfoId(1L);
         ScheduleRule_input scheduleRule_input1 = new ScheduleRule_input();