1.一阶段

王通
1 parent bd209a0e
Showing 11 changed files with 120 additions and 105 deletions
src/main/java/com/bsth/controller/LsStationRouteController.java
src/main/java/com/bsth/service/LsStationRouteService.java
src/main/java/com/bsth/service/impl/LsStationRouteServiceImpl.java
src/main/resources/static/pages/base/stationroute/add_stationroute_step2.html
src/main/resources/static/pages/base/stationroute/edit_select.html → src/main/resources/static/pages/base/stationroute/edit_stationroute_step1.html
src/main/resources/static/pages/base/stationroute/edit.html → src/main/resources/static/pages/base/stationroute/edit_stationroute_step2.html
src/main/resources/static/pages/base/stationroute/js/drawingManager.js
src/main/resources/static/pages/base/stationroute/js/stationroute-ajax-getdata.js
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/base/stationroute/js/stationroute-list-treedata.js
@@ -75,12 +75,26 @@ public class LsStationRouteController extends BaseController&lt;LsStationRoute, Int
         return result;
     }
-    @RequestMapping(method = RequestMethod.POST)
-    @Override
-    public Map<String, Object> save(LsStationRoute stationRoute) {
+    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    public Map<String, Object> add(LsStationRoute stationRoute) {
         Map<String, Object> result = new HashMap<>();
         try {
-            lsStationRouteService.save(stationRoute);
+            lsStationRouteService.add(stationRoute);
+            result.put("status", ResponseCode.SUCCESS);
+        } catch (Exception e) {
+            result.put("status", ResponseCode.ERROR);
+            result.put("msg", e.getMessage());
+            log.error("", e);
+        }
+
+        return result;
+    }
+
+    @RequestMapping(value = "/modify", method = RequestMethod.POST)
+    public Map<String, Object> modify(LsStationRoute stationRoute) {
+        Map<String, Object> result = new HashMap<>();
+        try {
+            lsStationRouteService.modify(stationRoute);
             result.put("status", ResponseCode.SUCCESS);
         } catch (Exception e) {
             result.put("status", ResponseCode.ERROR);
@@ -22,4 +22,16 @@ public interface LsStationRouteService extends BaseService&lt;LsStationRoute, Integ
 	 * @param ids
 	 */
 	void batchDestroy(List<Integer> ids);
+
+	/**
+	 * 添加站点路由
+	 * @param stationRoute
+	 */
+	Map<String, Object> add(LsStationRoute stationRoute);
+
+	/**
+	 * 修改站点路由
+	 * @param stationRoute
+	 */
+	Map<String, Object> modify(LsStationRoute stationRoute);
 }
@@ -76,7 +76,7 @@ public class LsStationRouteServiceImpl extends BaseServiceImpl&lt;LsStationRoute, I
     @Transactional
     @Override
-    public Map<String, Object> save(LsStationRoute stationRoute) {
+    public Map<String, Object> add(LsStationRoute stationRoute) {
         Station station = stationRoute.getStation();
         Line line = lineRepository.findById(stationRoute.getLine().getId()).get();
         Integer versions = lineVersionsRepository.findCurrentVersion(line.getId());
@@ -119,6 +119,32 @@ public class LsStationRouteServiceImpl extends BaseServiceImpl&lt;LsStationRoute, I
         return new HashMap<>();
     }
+    @Transactional
+    @Override
+    public Map<String, Object> modify(LsStationRoute stationRoute) {
+        LsStationRoute stationRoute1 = lsStationRouteRepository.findById(stationRoute.getId()).get();
+        Integer versions = lineVersionsRepository.findCurrentVersion(stationRoute1.getLine().getId());
+
+        // 多边形缓冲区
+        if ("d".equals(stationRoute.getShapedType())) {
+            String wkt = stationRoute.getBufferPolygonWkt();
+
+            stationRoute.setBufferPolygon((Polygon) Wkt.fromWkt(wkt));
+            stationRoute.setBufferPolygonWgs(GeoConverter.polygonBd2wgs(wkt));
+        }
+
+        lsStationRouteRepository.updateStatiouRouteCode(stationRoute);
+        CustomBeanUtils.copyPropertiesIgnoredNull(stationRoute, stationRoute1);
+        lsStationRouteRepository.save(stationRoute1);
+        remark(stationRoute1);
+        if (stationRoute.getVersions().equals(versions)) {
+            stationRouteRepository.deleteByLineAndVersion(stationRoute1.getLine().getId(), versions);
+            stationRouteRepository.updateFromHistory(stationRoute1.getLine().getId(), versions);
+        }
+
+        return new HashMap<>();
+    }
+
     public void remark(LsStationRoute stationRoute) {
         lsStationRouteRepository.updateStartZ(stationRoute);
         lsStationRouteRepository.updateStartB(stationRoute);
@@ -230,6 +230,7 @@ $(&#39;#add_stationroute_step2_modal&#39;).on(&#39;modal.show&#39;, function(e, _WorldsBMap,_Get
 	$('#add_stationroute_step2_modal').on('show.bs.modal', function () {
 		// 获取站点编码元素，添加站点编码值
 		_GetAjaxData.getStationCode(function(stationCode) {
+			debugger
 			var stationId = Station.id ? Station.id : stationCode, stationCode = Station.stationCode ? Station.stationCode : stationCode;
 			var stationName = Station.stationName ? Station.stationName : Station.stationNamebootbox;
 			var station = {id: stationId, stationCode: stationCode, stationName: stationName, centerPointWkt: Station.bJwpoints, shapedType: Station.shapesType};
 <!-- 选择编辑站点方式 -->
-<div class="modal fade" id="edit_select_mobal" tabindex="-1" role="basic" aria-hidden="true">
+<div class="modal fade" id="edit_stationroute_step1_modal" tabindex="-1" role="basic" aria-hidden="true">
 	<div class="modal-dialog">
 		<div class="modal-content" style="width: 700px;">
 			<div class="modal-header">
@@ -47,9 +47,9 @@
 </div>
 <script type="text/javascript">
-$('#edit_select_mobal').on('editSelectMobal_show', function(e, _WorldsBMap,_DrawingManagerObj,_GetAjaxData,_EditStationObj,_LineObj,_PublicFunctions,Station){
+$('#edit_stationroute_step1_modal').on('modal.show', function(e, _WorldsBMap,_DrawingManagerObj,_GetAjaxData,_EditStationObj,_LineObj,_PublicFunctions,Station){
 	// 显示选择修改方式弹出层
-	$('#edit_select_mobal').modal({show : true,backdrop: 'static',keyboard: false});
+	$('#edit_stationroute_step1_modal').modal({show: true,backdrop: 'static',keyboard: false});
 	setTimeout(function(){
 		var offsetY =  $('.modal-dialog').offset().top-3 ,
 			offsetX =  $('.modal-dialog').offset().left-10 ;
@@ -105,36 +105,30 @@ $(&#39;#edit_select_mobal&#39;).on(&#39;editSelectMobal_show&#39;, function(e, _WorldsBMap,_Draw
 		},
 		submitHandler : function(f) {
 			// 隐藏弹出层
-			$('#edit_select_mobal').modal('hide');
+			$('#edit_stationroute_step1_modal').modal('hide');
 			// 表单序列
 			var params = form.serializeJSON();
 			// 站点名称
 			var editStationName = params.stationNamebootbox;
             // TODO(点击查询位置后绘画效果失败，待修改)
-			if(params.editselect==0){
+			if (params.editselect == 0) {
+				debugger
 				_EditStationObj.setEitdStation(Station);
 				_EditStationObj.setEitdStationName(editStationName);
-				// _WorldsBMap.clearMarkAndOverlays();
+				_WorldsBMap.getmapBValue().closeInfoWindow();
 				// 打开绘制工具
 				_DrawingManagerObj.openDrawingManager();
-				_WorldsBMap.localtionPoint(editStationName+"公交站点");
-				// _PublicFunctions.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);
-					_WorldsBMap.editShapes(_EditStationObj);
-                });
+			} else if (params.editselect == 1) {
+				Station.stationShapesType = 'r';
+				Station.stationGPloyonGrid = null;
+				Station.stationRadius = 80;
+				_EditStationObj.setEitdStation(Station);
+				_EditStationObj.setEitdStationName(editStationName);
+				_WorldsBMap.editShapes(_EditStationObj);
 				// _PublicFunctions.editMapStatus();
-			}else if(params.editselect==2){
+			} else if (params.editselect == 2){
 				_EditStationObj.setEitdStation(Station);
 				_EditStationObj.setEitdStationName(editStationName);
                 _WorldsBMap.clearMark();
 <!-- 编辑站点 -->
-<div class="modal fade" id="edit_station_mobal"  role="basic" aria-hidden="true">
+<div class="modal fade" id="edit_stationroute_step2_modal"  role="basic" aria-hidden="true">
 	<div class="modal-dialog">
 		<div class="modal-content">
 			<div class="modal-header">
@@ -21,18 +21,26 @@
 					<input type="hidden" name="descriptions" id="descriptionsTextarea" />
 					<input type="hidden" name="directions" id="stationdirSelect" />
 					<input type="hidden" name="station.id" id="stationIdInput" />
-					<input type="hidden" name="station.stationName" id="zdmcInput" />
-					<input type="hidden" name="station.destroy" />
 					<!-- 站点名称 -->
-					<!-- 站点名称 -->
 					<div class="form-body">
 						<div class="form-group">
 							<label class="control-label col-md-3">
           						<span class="required"> * </span> 站点名称&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
                     		</label>
 							<div class="col-md-6">
-								<input type="text" class="form-control" name="stationName" id="stationNameInput" placeholder="站点名称" readonly="readonly">
+								<input type="text" class="form-control" name="station.stationName" id="zdmcInput" placeholder="站点名称" readonly="readonly">
+							</div>
+						</div>
+					</div>
+					<!-- 站点路由名称 -->
+					<div class="form-body">
+						<div class="form-group">
+							<label class="control-label col-md-3">
+								<span class="required"> * </span> 站点路由名称:
+							</label>
+							<div class="col-md-6">
+								<input type="text" class="form-control" name="stationName" id="stationNameInput" placeholder="站点路由名称">
 							</div>
 						</div>
 					</div>
@@ -97,15 +105,6 @@
 							</div>
 						</div>
 					</div>
-					<!-- 经纬度坐标点 -->
-					<div class="form-body">
-						<div class="form-group">
-							<label class="col-md-3 control-label"> <span class="required"> * </span>经纬度坐标点:</label>
-							<div class="col-md-6">
-								<input type="text" class="form-control" name="station.centerPointWkt" id="bJwpointsInput" placeholder="经纬度坐标点">
-							</div>
-						</div>
-					</div>
 					<!-- 几何图形类型 -->
 					<div class="form-body">
 						<div class="form-group">
@@ -185,20 +184,20 @@
 	</div>
 </div>
 <script type="text/javascript">
-$('#edit_station_mobal').on('editSelectMobal_show', function(e, _WorldsBMap,_GetAjaxData,_EditStationObj,_LineObj,_PublicFunctions){
+$('#edit_stationroute_step2_modal').on('modal.show', function(e, _WorldsBMap,_GetAjaxData,_EditStationObj,_LineObj,_PublicFunctions){
 	layer.closeAll();
  	var station = _EditStationObj.getEitdStation();
-	var addLine = _LineObj.getLineObj();
+	var line = _LineObj.getLineObj();
 	_PublicFunctions.setFormValue(station);
 	var initzdlyP = {'lineCode_eq': station.stationRouteLine, 'destroy_eq': 0, 'directions_eq': station.stationRoutedirections, 'versions_eq': station.stationRouteVersions};
 	initSelect(initzdlyP);
 	// 显示mobal
-	$('#edit_station_mobal').modal({show : true,backdrop: 'static',keyboard: false});
+	$('#edit_stationroute_step2_modal').modal({show: true, backdrop: 'static', keyboard: false});
 	// 当调用 hide 实例方法时触发
-	$('#edit_station_mobal').on('hide.bs.modal', function () {
+	$('#edit_stationroute_step2_modal').on('hide.bs.modal', function () {
 		closeMobleSetClean();
 	});
-	$('#statusInput').val(addLine.status);
+	$('#statusInput').val(line.status);
 	function closeMobleSetClean() {
 		// 清除地图覆盖物
 		_WorldsBMap.clearMarkAndOverlays();
@@ -207,14 +206,9 @@ $(&#39;#edit_station_mobal&#39;).on(&#39;editSelectMobal_show&#39;, function(e, _WorldsBMap,_Get
 		_EditStationObj.setEitdStation({});
 		var add_direction_v = $('#stationdirSelect').val();
-		_PublicFunctions.resjtreeDate(addLine.id,add_direction_v,version);
+		_PublicFunctions.resjtreeDate(line.id,add_direction_v,version);
 		_PublicFunctions.editAChangeCssRemoveDisabled();
-		
-		console.log(_WorldsBMap.getStationArray());
-		
-		//_GetAjaxData.getSectionRouteInfo(addLine.id,add_direction_v,version,function(data) {
-		//	_PublicFunctions.linePanlThree(addLine.id,data,add_direction_v,version);
-		//});
+		//console.log(_WorldsBMap.getStationArray());
         _PublicFunctions.editMapStatusRemove();
         setTimeout(function () {
         	var stationArray = _WorldsBMap.getStationArray();
@@ -237,13 +231,11 @@ $(&#39;#edit_station_mobal&#39;).on(&#39;editSelectMobal_show&#39;, function(e, _WorldsBMap,_Get
 		errorClass : 'help-block help-block-error', 
 		focusInvalid : false, 
 		rules : {
-			'zdmc' : { required : true,maxlength : 50},// 站点名称 必填项
+			'station.stationName' : { required : true,maxlength : 50},// 站点名称 必填项
 			'stationName' : { required : true,maxlength : 50},// 站点名称 必填项
-			'stationCod': {required : true},// 站点编码 必填项
 			'directions' : {required : true,dirIs : true},// 站点方向 必填项 必填项
 			'stationRouteCode' : {isStart : true},// 站点序号
 			'stationMark' : {required : true},// 站点类型 必填项
-			'bJwpoints' : {required : true},// 经纬度坐标点 必填项
 			'shapesType' : {required : true},// 几何图形类型 必填项
 			'radius' : {required : true,number : true},// 圆形半径  必填项
 			'destroy' : {required : true},// 是否撤销 必填项
@@ -279,23 +271,19 @@ $(&#39;#edit_station_mobal&#39;).on(&#39;editSelectMobal_show&#39;, function(e, _WorldsBMap,_Get
 			if (params.bufferPolygonWkt) {
 				params.bufferPolygonWkt = "POLYGON((" + params.bufferPolygonWkt + "))";
 			}
-			_GetAjaxData.stationUpdate(params,function(resuntDate) {
-				if(resuntDate.status=='SUCCESS') {
-					// 弹出添加成功提示消息
+			// 保存
+			_GetAjaxData.stationUpdate(params, function(data) {
+				if (data.status == 'SUCCESS') {
 					layer.msg('修改成功...');
-					/** 通知更新缓存区 */
-					// $.post('http://192.168.168.171:8800/transport_server/basic/refresh',function(rs){console.log(rs)})
-				}else {
-					// 弹出添加失败提示消息
+				} else {
 					layer.msg('修改失败...');
 				}
-				$('#edit_station_mobal').modal('hide');
-				var id = addLine.id;
+				$('#edit_stationroute_step2_modal').modal('hide');
+				var id = line.id;
 				var dir = params.directions
-				
 				// 刷行左边树
-				_PublicFunctions.resjtreeDate(id,dir,$("#versions").val());
-				closeMobleSetClean();
+				_PublicFunctions.resjtreeDate(id, dir, $("#versions").val());
+				//closeMobleSetClean();
 			});
 		}
 	});
@@ -87,10 +87,7 @@ var DrawingManagerObj = function () {
 						 bPloygonGrid  = bPloygonGrid + ',' + pointE.getPath()[0].lng + ' ' + pointE.getPath()[0].lat;
-						 var add =  AddStationObj.getAddStation();
-						 
-						 var edit = EditStationObj.getEitdStation();
-						 
+						 var add =  AddStationObj.getAddStation(), edit = EditStationObj.getEitdStation();
 						 if(!$.isEmptyObject(add)){
 							 /**  设置新增站点集合对象范围图形类型属性值 @param：<shapesType：范围图形类型） */
 							 AddStationObj.setAddStationShapesType('d');
@@ -102,36 +99,27 @@ var DrawingManagerObj = function () {
 							 AddStationObj.setBPolygonGrid(bPloygonGrid);
 							 $.get('add_stationroute_step2.html', function(m){
-								 
 								 $(pjaxContainer).append(m);
-								 
 								 $('#add_stationroute_step2_modal').trigger('modal.show', [WorldsBMap,GetAjaxData,AddStationObj,LineObj,PublicFunctions]);
-							 
 							 });
 						 }
 						 if(!$.isEmptyObject(edit)){
 							 /**  设置修改站点集合对象范围图形类型属性值 @param：<shapesType：范围图形类型） */
 							 EditStationObj.setEitdStationShapesType('d');
-								
 							 /**  设置修改站点集合对象圆形半径属性值 @param：<radius：圆形半径） */
 							 EditStationObj.setEitdStationRadius('');
-								
 							 /**  设置修改站点集合对象图形百度坐标集合属性值 @param：<bPolygonGrid：图形百度坐标集合） */
 							 EditStationObj.setEitdBPolygonGrid(bPloygonGrid);
 							// 加载编辑页面
-							$.get('edit.html', function(m){
-								
+							$.get('edit_stationroute_step2.html', function(m){
 								$(pjaxContainer).append(m);
-								
-								$('#edit_station_mobal').trigger('editSelectMobal_show', [WorldsBMap,GetAjaxData,EditStationObj,LineObj,PublicFunctions]);
+								$('#edit_stationroute_step2_modal').trigger('modal.show', [WorldsBMap,GetAjaxData,EditStationObj,LineObj,PublicFunctions]);
 							}); 
 						 }
-					 
 					 }
-					 
 				});
 				return drawingManager;
@@ -107,15 +107,15 @@ var GetAjaxData = function(){
 				callback && callback(result);
 			});
 		 },
-		// 新增站点保存
-		stationSave : function(station,callback) {
-			$post('/api/lsstationroute',station,function(data) {
+		// 新增站点路由
+		stationSave : function(stationRoute, callback) {
+			$post('/api/lsstationroute/add', stationRoute, function(data) {
 				callback && callback(data);
 			});
 		},
-		// 站点更新
-		stationUpdate : function(station,callback) {
-			$post('/station/stationUpdate',station,function(data) {
+		// 站点路由更新
+		stationUpdate : function(stationRoute, callback) {
+			$post('/api/lsstationroute/modify', stationRoute, function(data) {
 				callback && callback(data);
 			});
 		},
@@ -427,7 +427,6 @@ var PublicFunctions = function () {
 			$('#lineCodeInput').val(editStationParmas.stationRouteLIneCode);
             // 行业标准
 			$('#industryCodeInput').val(editStationParmas.industryCode);
-			
 			$('#stationMarkSelect').val(editStationParmas.stationRouteStationMark);
 			// 百度坐标点图形集合
 			$('#bPolygonGridInput').val(editStationParmas.stationBPolygonGrid);
@@ -330,8 +330,8 @@ window.WorldsBMap = function () {
             setDragMarker(stationMarkers[station.stationRouteId]);
             // 获取中心坐标点字符串分割
-            var BJwpoints = station.stationJwpoints;
-            BJwpoints = BJwpoints.substring(6, BJwpoints.length - 1);
+            var BJwpoints = station.stationJwpoints, idx = BJwpoints.indexOf('POINT(');
+            BJwpoints = idx > -1 ? BJwpoints.substring(6, BJwpoints.length - 1) : BJwpoints;
             BJwpoints = BJwpoints.split(' ');
             // 中心坐标点
             var centerPoint = new BMap.Point(BJwpoints[0], BJwpoints[1]);
@@ -370,9 +370,9 @@ window.WorldsBMap = function () {
                     // 清除正在编辑的站点
                     editCircle = null;
                     // 加载编辑页面
-                    $.get('edit.html', function (m) {
+                    $.get('edit_stationroute_step2.html', function (m) {
                         $(pjaxContainer).append(m);
-                        $('#edit_station_mobal').trigger('editSelectMobal_show', [WorldsBMap, GetAjaxData, EditStationObj, LineObj, PublicFunctions]);
+                        $('#edit_stationroute_step2_modal').trigger('modal.show', [WorldsBMap, GetAjaxData, EditStationObj, LineObj, PublicFunctions]);
                     });
                 });
                 // 编辑多边行
@@ -431,9 +431,9 @@ window.WorldsBMap = function () {
                     EditStationObj.setEitdBPolygonGrid(edit_bPloygonGrid);
                     // 清除正在编辑的站点
                     editPolygon = null;
-                    $.get('edit.html', function (m) {
+                    $.get('edit_stationroute_step2.html', function (m) {
                         $(pjaxContainer).append(m);
-                        $('#edit_station_mobal').trigger('editSelectMobal_show', [WorldsBMap, GetAjaxData, EditStationObj, LineObj, PublicFunctions]);
+                        $('#edit_stationroute_step2_modal').trigger('modal.show', [WorldsBMap, GetAjaxData, EditStationObj, LineObj, PublicFunctions]);
                     });
                 });
             }
@@ -733,12 +733,10 @@ window.WorldsBMap = function () {
         },
         // 修改站点
         editStation: function (stationRouteId) {
-            // $.get("/stationroute/findStationRouteInfo",{"id":stationRouteId},function (route) {
-            $.get('edit_select.html', function (m) {
+            $.get('edit_stationroute_step1.html', function (m) {
                 $(pjaxContainer).append(m);
-                $('#edit_select_mobal').trigger('editSelectMobal_show', [WorldsBMap, DrawingManagerObj, GetAjaxData, EditStationObj, LineObj, PublicFunctions, stationArray[stationRouteId]]);
+                $('#edit_stationroute_step1_modal').trigger('modal.show', [WorldsBMap, DrawingManagerObj, GetAjaxData, EditStationObj, LineObj, PublicFunctions, stationArray[stationRouteId]]);
             });
-            // });
         },
         addBetweenStationRoad: function (stationRouteId) {
         	var version = $("#versions").val();
@@ -24,16 +24,11 @@ var StationTreeData = function(){
 	}
 	function TreeOnclickEvent(treeOjb) {
-		if(treeOjb==null)
-			return;
-		// 节点个数
-		var len = treeOjb.length;
-		if(len<0) {
+		if(treeOjb == null || treeOjb.length < 1) {
 			return;
 		}
 		// 获取数据
-		debugger
 		var stationData = treeOjb[0].original;
         // 选中的节点类型
         var chaildredType_ = stationData.chaildredType;