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

徐烜
2 parents e8536aa7 d5deb0cd
Showing 10 changed files with 112 additions and 32 deletions
src/main/java/com/bsth/repository/SectionRouteRepository.java
src/main/java/com/bsth/service/impl/StationServiceImpl.java
src/main/resources/static/pages/base/line/add.html
src/main/resources/static/pages/base/line/edit.html
src/main/resources/static/pages/base/line/list.html
src/main/resources/static/pages/base/section/js/add-form-wizard.js
src/main/resources/static/pages/base/station/js/add-form-wizard.js
src/main/resources/static/pages/base/stationroute/addstationstemplate.html
src/main/resources/static/pages/base/stationroute/js/stationroute-ajax-getdata.js
src/main/resources/static/pages/base/stationroute/js/stationroute-list-map.js
@@ -52,7 +52,7 @@ public interface SectionRouteRepository extends BaseRepository&lt;SectionRoute, Int
 	        " b.section_type AS sectionType," +
 			" b.csection_vector AS sectionCsectionVector," +
 			" AsText(b.bsection_vector) AS sectionBsectionVector," +
-			" AsText(b.gsection_vector) sectionGsectionVector," +
+			" AsText(b.gsection_vector) AS sectionGsectionVector," +
 			" b.road_coding AS sectionRoadCoding," +
 			" b.section_distance AS sectionDistance," +
             " b.section_time AS sectionTime," +
@@ -335,12 +335,30 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 					arg0.setDbType(dbType);
+					String gLonxStr = JSONObject.parseObject(stationsArray.getJSONObject(i).get("wgs").toString()).get("x").equals("") ? null : JSONObject.parseObject(stationsArray.getJSONObject(i).get("wgs").toString()).get("x").toString();
+					
+					String gLatyStr = JSONObject.parseObject(stationsArray.getJSONObject(i).get("wgs").toString()).get("y").equals("") ? null : JSONObject.parseObject(stationsArray.getJSONObject(i).get("wgs").toString()).get("y").toString();
+					
+					float gLonx = 0.0f;
+					
+					float gLaty = 0.0f;
+					
 					/** to WGS坐标 */
 					Location resultPoint = FromBDPointToWGSPoint(bLonx,bLatx);
-					arg0.setgLonx((float)resultPoint.getLng());
+					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((float)resultPoint.getLat());
+					arg0.setgLaty(gLaty);
  					// 站点地理位置WGS坐标经度
 					// String gLonx = JSONObject.parseObject(stationsArray.getJSONObject(i).get("WGSpotion").toString()).get("Lng").toString();
@@ -220,8 +220,8 @@
                      	<input type="text" class="form-control" name="endPhone" id="startPhoneInput" placeholder="终点站调度电话">
                     </div>
                  </div>
-                 <!-- 
-                 起始站名称
+              
+                 <!-- 起始站名称 -->
                  <div class="form-group">
                  	<label class="control-label col-md-3"> 起始站名称： </label>
                     <div class="col-md-4">
@@ -229,6 +229,14 @@
                     </div>
                  </div>
+                 <!--    终点站名称 -->
+                 <div class="form-group">
+                 	<label class="control-label col-md-3"> 终点站名称： </label>
+                    <div class="col-md-4">
+                     	<input type="text" class="form-control" name="endStationName" id="endStationNameInput" placeholder="终点站名称">
+                    </div>
+                 </div>
+         <!--        
                   起始站首班车时间
                  <div class="form-group">
                  	<label class="control-label col-md-3">  起始站首班车时间： </label>
@@ -246,14 +254,6 @@
                  </div>
-                 终点站名称
-                 <div class="form-group">
-                 	<label class="control-label col-md-3"> 终点站名称： </label>
-                    <div class="col-md-4">
-                     	<input type="text" class="form-control" name="endStationName" id="endStationNameInput" placeholder="终点站名称">
-                    </div>
-                 </div>
-                 
                    终点站首班时间
                  <div class="form-group">
                  	<label class="control-label col-md-3">  终点站首班车时间： </label>
@@ -219,7 +219,23 @@
                     </div>
                  </div>
-                  <!-- 车辆总数 -->
+                  <!-- 起始站名称 -->
+                 <div class="form-group">
+                 	<label class="control-label col-md-3"> 起始站名称： </label>
+                    <div class="col-md-4">
+                     	<input type="text" class="form-control" name="startStationName" id="startStationNameInput" placeholder="起始站名称">
+                    </div>
+                 </div>
+                 
+                 <!--    终点站名称 -->
+                 <div class="form-group">
+                 	<label class="control-label col-md-3"> 终点站名称： </label>
+                    <div class="col-md-4">
+                     	<input type="text" class="form-control" name="endStationName" id="endStationNameInput" placeholder="终点站名称">
+                    </div>
+                 </div>
+                 
+                 <!-- 车辆总数 -->
                  <div class="form-group">
                  	<label class="control-label col-md-3"> 车辆总数： </label>
                     <div class="col-md-4">
@@ -50,14 +50,14 @@
 							<tr role="row" class="heading">
 								<th width="2%">#</th>
 								<th width="4%">序号</th>
-								<th width="7%">线路编码</th>
+								<th width="5%">线路编码</th>
 								<th width="8%">线路名称</th>
 								<th width="7%">所属公司</th>
 								<!-- 闵行没有下属公司，这里暂时注释掉 -->
 								<!-- <th width="8%">所属分公司</th> -->
 								<th width="6%">线路性质</th>
 								<th width="6%">线路等级</th>
-								<th width="7%">上海市线路编码</th>
+								<th width="8%">上海市线路编码</th>
 								<th width="7%">是否撤销</th>
 								<th width="6%">线路标准</th>
 								<th width="6%">站点详情</th>
@@ -304,9 +304,9 @@ var FormWizard = function() {
                 	var paramsStationsArray = [];
-                	paramsStationsArray[0] = stationStartValue;
+                	paramsStationsArray[0] = stationStartValue+'公交车站';
-                	paramsStationsArray[1]= stationEndValue;
+                	paramsStationsArray[1]= stationEndValue+'公交车站';
                 	$('#sectionNameInput').val(stationStartValue + '至' + stationEndValue );
@@ -329,9 +329,9 @@ var FormWizard = function() {
                 	}else if(baseResValue ==1) {
-                		SectionVmapWorlds.localSearchFromAdreesToPoint(stationStartValue);
+                		SectionVmapWorlds.localSearchFromAdreesToPoint(stationStartValue+'公交车站');
-                    	SectionVmapWorlds.localSearchFromAdreesToPoint(stationEndValue);
+                    	SectionVmapWorlds.localSearchFromAdreesToPoint(stationEndValue+'公交车站');
                 		SectionVmapWorlds.drawingManagerOpen();
@@ -322,7 +322,7 @@ var FormWizard = function() {
                 	if(baseResValue == 0) {
-                		StationPVmapWorlds.localSearchFromAdreesToPoint(stationNameV,function(p) {
+                		StationPVmapWorlds.localSearchFromAdreesToPoint(stationNameV+'公交车站',function(p) {
     		  				if(p) {
@@ -337,7 +337,7 @@ var FormWizard = function() {
                 	}else if(baseResValue ==1) {
-                		StationPVmapWorlds.localSearchFromAdreesToPoint(stationNameV,function(p) {});
+                		StationPVmapWorlds.localSearchFromAdreesToPoint(stationNameV+'公交车站',function(p) {});
                 		$('.leftUtils').show();
@@ -25,8 +25,8 @@
 							<label class="control-label col-md-3">
           						<span class="required"> * </span> 站点名称：
                     		</label>
-							<div class="col-md-6">
-								<textarea class="form-control" rows="10" name="stations" id="stationsInput" placeholder="站点名称"></textarea> 
+							<div class="col-md-9">
+								<textarea class="form-control" rows="12" name="stations" id="stationsInput" placeholder="站点名称"></textarea> 
 							</div>
 						</div>
@@ -35,7 +35,16 @@
 					 <div class="form-group">
 					 	<div class="alert alert-info font-blue-chambray" style="background-color: #2C3E50">
                             <h5 class="block"><span class="help-block" style="color:#1bbc9b;"> *　手动添加站点规划说明： </span></h5>
-                            <p><span class="help-block" style="color:#1bbc9b;">&nbsp;请在文本域中按站点顺序依次输入站点名称,每输入完一个站名时请按回车键（Enter）换行.</span> </p>
+                            <p>
+                            	<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>
+                            	</span> 
+                            </p>
                         </div>
 					 </div>
 				</form>
@@ -143,9 +152,45 @@ $(&#39;#add_station_template_mobal&#39;).on(&#39;AddStationTempMobal.show&#39;, function(e,map,a
 			// 站点名称字符串切割
 			var paramsStationsArray = params.stations.split('\r\n');
-			// 根据站点名称获取百度坐标
-			map.stationsNameToPoints(paramsStationsArray,function(resultJson) {
+			var stationList = [];
+			
+			var len = paramsStationsArray.length;
+			
+			if(len>0) {
+				
+				for(var k =0;k<len;k++) {
+					
+					debugger;
+					
+					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]}});
+						
+					}
+						 
+				}
+				
+			}else {
+				layer.msg('请按说明规则输入站点!');
+				
+				return;
+				
+			}
+			console.log(stationList);
+			// 根据站点名称获取百度坐标
+			map.stationsNameToPoints(stationList,function(resultJson) {
+				console.log(resultJson);
+				debugger;
 				// 根据坐标点获取两点之间的时间与距离
 				map.getDistanceAndDuration(resultJson,function(stationdataList) {
@@ -216,7 +261,7 @@ $(&#39;#add_station_template_mobal&#39;).on(&#39;AddStationTempMobal.show&#39;, function(e,map,a
 							layer.closeAll();
 							// 清除地图覆盖物
-							map.clearOverlays();
+							map.clearMarkAndOverlays();
 							// 刷新树
 							fun.resjtreeDate(addLine.id,directionData);
@@ -184,7 +184,7 @@ var GetAjaxData = function(){
 				// 保存
 				$post('/station/manualSave',params,function(rd) {
-					 return callback && callback(rd);
+					  callback && callback(rd);
 				});
@@ -717,11 +717,11 @@ var WorldsBMap = function () {
 					 var f = arguments.callee;
-					 if(arra[index]!=''){
+					 if(arra[index].name!=''){
 						 var localSearch = new BMap.LocalSearch(mapBValue);
-						 localSearch.search(arra[index]);
+						 localSearch.search(arra[index].name);
 						 localSearch.setSearchCompleteCallback(function (searchResult) {
@@ -729,7 +729,8 @@ var WorldsBMap = function () {
 							 if(poi) {
-								 stationList.push({name:arra[index],potion:{lng:poi.point.lng,lat:poi.point.lat}});
+								/* 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();