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

潘钊
2 parents 96338789 0c21b422
Showing 5 changed files with 60 additions and 31 deletions
src/main/java/com/bsth/repository/schedule/SchedulePlanInfoRepository.java
src/main/java/com/bsth/service/schedule/SchedulePlanServiceImpl.java
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
@@ -21,4 +21,6 @@ public interface SchedulePlanInfoRepository extends BaseRepository&lt;SchedulePlanI
 	@Query(value = "select s from SchedulePlanInfo s where scheduleDate=?1")
 	List<SchedulePlanInfo> findByDate(Date date);
+    Long deleteByXlAndScheduleDateGreaterThanEqualAndScheduleDateLessThanEqual(Integer xlid, Date startDate, Date endDate);
+
 }
@@ -3,6 +3,7 @@ package com.bsth.service.schedule;
 import com.bsth.entity.Line;
 import com.bsth.entity.schedule.*;
 import com.bsth.entity.schedule.rule.ScheduleRule1Flat;
+import com.bsth.repository.schedule.SchedulePlanInfoRepository;
 import com.bsth.repository.schedule.SchedulePlanRepository;
 import com.bsth.service.LineService;
 import com.bsth.service.impl.BaseServiceImpl;
@@ -37,6 +38,8 @@ public class SchedulePlanServiceImpl extends BaseServiceImpl&lt;SchedulePlan, Long&gt;
     private IStrategy strategy;
     @Autowired
     private SchedulePlanRepository schedulePlanRepository;
+    @Autowired
+    private SchedulePlanInfoRepository schedulePlanInfoRepository;
     @Transactional(propagation = Propagation.REQUIRED, isolation = Isolation.READ_COMMITTED)
     @Override
@@ -79,6 +82,11 @@ public class SchedulePlanServiceImpl extends BaseServiceImpl&lt;SchedulePlan, Long&gt;
         System.out.println(scheduleResults_output.showGuideboardDesc1());
+        // 2-3、如果排班的数据之前已经有了，删除之前的数据
+        schedulePlanInfoRepository.deleteByXlAndScheduleDateGreaterThanEqualAndScheduleDateLessThanEqual(
+                xl.getId(), schedulePlan.getScheduleFromTime(), schedulePlan.getScheduleToTime()
+        );
+
         // 3、根据规则返回，组合最后的输出数据
         // 3-1、根据注入的策略服务，获取原始数据
         Multimap<Long, TTInfoDetail> gbdTTinfoMaps = strategy.getGuideboardXlTTInfoDetailMaps(xl.getId()); // 路牌对应时刻明细
@@ -241,42 +241,45 @@ $(&#39;#add_station_template_mobal&#39;).on(&#39;AddStationTempMobal.show&#39;, function(e,map,a
 						// 如果线路信息不为空
 						if(BusLine){
-							if(BusLine.zB.length == 0){
-								
-								// 根据坐标点获取两点之间的折线路段
-								map.getSectionListPlonly(stationdataList,function(sectiondata) {
-									
-									// 定义路段信息字符串
-									var sectionJSON = JSON.stringify(sectiondata);
-									
-									// 路段信息JSON字符串
-									params.sectionJSON = sectionJSON;
-									
-									addSave(params,addLine.id,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);
+							/* if(BusLine.zB.length == 0){
 							}else {
-								// 获取公交线几何对象, 仅当结果自动添加到地图上时有效
-								var Polygon = BusLine.getPolyline();
-								
-								// 返回多边型的点数组（自1.2新增）
-								var polyGonArray = Polygon.getPath();
-								
-								var jsonArray = [{sectionName:lineNameV+dirStr,points:polyGonArray}];
+							} */
+						}else {
+							
+							
+							// 根据坐标点获取两点之间的折线路段
+							map.getSectionListPlonly(stationdataList,function(sectiondata) {
 								// 定义路段信息字符串
-								var sectionJSON = JSON.stringify(jsonArray);
+								var sectionJSON = JSON.stringify(sectiondata);
 								// 路段信息JSON字符串
 								params.sectionJSON = sectionJSON;
 								addSave(params,addLine.id,directionData);
-							}
+							});
+							
+							
 						} 
 					});
@@ -319,6 +322,7 @@ $(&#39;#add_station_template_mobal&#39;).on(&#39;AddStationTempMobal.show&#39;, function(e,map,a
 	function addSave(params,lineid,directionData) {
+		
 		// 保存
 		ajaxd.manualSave(params,function(rd) {
@@ -251,7 +251,7 @@ var PublicFunctions = function () {
 						console.log(BusLine);
-						if(BusLine.zB.length == 0){
+						/*if(BusLine.zB.length == 0){
 							layer.confirm('系统生成该线路【'+lineNameV+'】时获取站点与路段异常！请联系管理员或者检查网络连接是否异常！', {
 								btn : [ '确认' ]
@@ -277,7 +277,7 @@ var PublicFunctions = function () {
 								return ;
 							});
-						}
+						}*/
 						// 获取公交线几何对象, 仅当结果自动添加到地图上时有效
 						var Polygon = BusLine.getPolyline();
@@ -175,11 +175,26 @@ var WorldsBMap = function () {
 			            		  if(r.message=='ok') {
-			            			  // 获取距离(单位：米)
-			            			  points[index+1].distance = r.result.taxi.distance;
+			            			  console.log(r);
+			            			  
+			            			  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;
+			            				  
+			            			  }
-			            			  // 获取时间(单位：秒)
-			            			  points[index+1].duration = r.result.taxi.duration;
 			            		  }
@@ -928,7 +943,7 @@ var WorldsBMap = function () {
 							//获取第一个公交列表显示到map上
 							var fstLine = BusListResult.getBusListItem(i);
-							if(fstLine==undefined){
+							/*if(fstLine==undefined){
 								layer.confirm('系统无法生成该线路【'+lineNameValue+'】的站点与路段！请点击返回选择其它方式规划', {btn : [ '返回' ],icon: 3, title:'提示' }, function(index){
@@ -947,7 +962,7 @@ var WorldsBMap = function () {
 									return;
 								});
-							}
+							}*/
 							busline.getBusLine(fstLine);