站点新增不引用

YRF
1 parent 791171c6
Showing 11 changed files with 122 additions and 138 deletions
src/main/java/com/bsth/controller/LineVersionsController.java
src/main/java/com/bsth/repository/LineVersionsRepository.java
src/main/java/com/bsth/service/LineVersionsService.java
src/main/java/com/bsth/service/impl/LineVersionsServiceImpl.java
src/main/java/com/bsth/service/impl/StationServiceImpl.java
src/main/resources/static/pages/base/line/css/bmap_base.css
src/main/resources/static/pages/base/line/map.html
src/main/resources/static/pages/base/section/js/add-form-events.js
src/main/resources/static/pages/base/station/js/add-form-events.js
src/main/resources/static/pages/base/stationroute/add.html
src/main/resources/static/pages/base/stationroute/js/stationroute-list-map.js
 package com.bsth.controller;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -12,7 +9,6 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
-import com.bsth.entity.Line;
 import com.bsth.entity.LineVersions;
 import com.bsth.repository.LineRepository;
 import com.bsth.service.LineVersionsService;
@@ -80,4 +76,13 @@ public class LineVersionsController extends BaseController&lt;LineVersions, Integer
 		return service.add(map);
 	}
+	/**
+	 * 根据线路id获取当前版本号
+	 * 
+	 */
+	@RequestMapping(value = "findCurrentVersion", method = RequestMethod.GET)
+	public Integer findCurrentVersion(@RequestParam(defaultValue = "lineId") int lineId) {
+		return service.findCurrentVersion(lineId);
+	}
+	
 }
@@ -73,4 +73,10 @@ public interface LineVersionsRepository extends BaseRepository&lt;LineVersions, Int
 	@Query(value = "  SELECT lv FROM LineVersions lv where lv.line.id = ?1 and lv.versions = (?2 - "+1+")")
 	public LineVersions findBylineIdAndVersions(Integer id, Integer versions);
+	
+	/**
+	 * 获取线路版本的上一个版本
+	 */
+	@Query(value = "  SELECT lv.versions FROM LineVersions lv where lv.line.id = ?1 and lv.status=1")
+	public Integer findCurrentVersion(Integer id);
 }
@@ -33,6 +33,9 @@ public interface LineVersionsService extends BaseService&lt;LineVersions, Integer&gt; 
 	List<LineVersions> lineUpdate();
 	LineVersions findLineVersionsMax(int lineId);
+	
+	// 返回当前线路版本
+	Integer findCurrentVersion(int lineId);
 	Map<String, Object> add(Map<String, Object> map);
@@ -250,5 +250,13 @@ public class LineVersionsServiceImpl extends BaseServiceImpl&lt;LineVersions, Integ
 		}
 		return resultMap;
 	}
+
+	/**
+	 * 获取当前线路版本号
+	 */
+	@Override
+	public Integer findCurrentVersion(int lineId) {
+		return repository.findCurrentVersion(lineId);
+	}
 }
@@ -18,6 +18,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.bsth.common.ResponseCode;
 import com.bsth.entity.Line;
 import com.bsth.entity.LineInformation;
+import com.bsth.entity.LineVersions;
 import com.bsth.entity.Section;
 import com.bsth.entity.SectionRoute;
 import com.bsth.entity.SectionRouteCache;
@@ -26,12 +27,14 @@ import com.bsth.entity.StationRoute;
 import com.bsth.entity.StationRouteCache;
 import com.bsth.repository.LineInformationRepository;
 import com.bsth.repository.LineRepository;
+import com.bsth.repository.LineVersionsRepository;
 import com.bsth.repository.SectionRepository;
 import com.bsth.repository.SectionRouteCacheRepository;
 import com.bsth.repository.SectionRouteRepository;
 import com.bsth.repository.StationRepository;
 import com.bsth.repository.StationRouteCacheRepository;
 import com.bsth.repository.StationRouteRepository;
+import com.bsth.service.LineVersionsService;
 import com.bsth.service.StationService;
 import com.bsth.util.GetUIDAndCode;
 import com.bsth.util.TransGPS;
@@ -83,6 +86,9 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 	@Autowired
 	private SectionRouteCacheRepository sectionRouteCacheRepository;
+	@Autowired
+	LineVersionsRepository lineVersionsRepository;
+	
 	private GeoUtils geoUtils;
 	Logger logger = LoggerFactory.getLogger(this.getClass());
@@ -293,20 +299,9 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 					Integer stationId = Integer.parseInt(isHaveMap.get("id").toString());
 					arg0 = repository.findOne(stationId);
-					if ((i==0 || i==stationsArray.size()-1) && resultLine.getLinePlayType() != 1) {// (起终点站)
-						List<Station> list = new ArrayList<>();
-						list.add(arg0);
-						List<Station> stationlist =  JSONArray.parseArray(JSON.toJSONString(list), Station.class);
-						Station station = stationlist.get(0);	
-						// 站点编码
-						long stationCode = GetUIDAndCode.getStationId();
-						station.setStationCod(String.valueOf(stationCode));
-						station.setId((int)stationCode);
-						station.setCreateDate(null);
-						station.setUpdateDate(null);
-						repository.save(station);
-						arg0 = station;
-					} else if (i==0  && resultLine.getLinePlayType() == 1) {// 环线终点和起点引用同一个站
+					if (i==stationsArray.size()-1  && resultLine.getLinePlayType() == 1) {// 环线终点和起点引用同一个站
+						arg0 = loopStartStation;
+					} else {
 						List<Station> list = new ArrayList<>();
 						list.add(arg0);
 						List<Station> stationlist =  JSONArray.parseArray(JSON.toJSONString(list), Station.class);
@@ -318,12 +313,11 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 						station.setCreateDate(null);
 						station.setUpdateDate(null);
 						repository.save(station);
-						arg0 = station;
-						loopStartStation = arg0;
-						repository.save(arg0);
-					} else if (i==stationsArray.size()-1  && resultLine.getLinePlayType() == 1) {// 环线终点和起点引用同一个站
-						arg0 = loopStartStation;
-					} 
+						arg0 = station; 
+						if (i==0  && resultLine.getLinePlayType() == 1) {// 环线终点和起点引用同一个站
+							loopStartStation = arg0;
+						}
+					}
 				}else {
 					// 站点编码
 					long stationCode = GetUIDAndCode.getStationId();
@@ -417,8 +411,9 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 					// 中途站
 					route.setStationMark("Z");
 				}
-				// 版本号
-				route.setVersions(versions);
+				// 版本号(获取线路当前版本)
+				Integer version =  lineVersionsRepository.findCurrentVersion(resultLine.getId());
+				route.setVersions(version);
 				// 站点ID
 				route.setStation(arg0);
 				// 方向
@@ -782,68 +777,65 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 			Integer versions = map.get("versions").equals("") ? null : Integer.parseInt(map.get("versions").toString());
 			// 说明
 			String descriptions = map.get("descriptions").equals("") ? "" : map.get("descriptions").toString();
-			if(Boolean.parseBoolean(isHaveMap.get("isHave").toString())) {
-				stationId = Integer.parseInt(isHaveMap.get("id").toString());
-			}else {
-				// 站点编码
-				stationCod = map.get("stationCod").equals("") ? "" : map.get("stationCod").toString();
-				// 站点ID
-				stationId = Integer.valueOf(stationCod);
-				// 圆半径
-				Integer radius = map.get("radius").equals("") ? null : Integer.parseInt(map.get("radius").toString());
-				// 图形类型
-				String shapesType = map.get("shapesType").equals("") ? "" : map.get("shapesType").toString();
-				// 创建人
-				Integer createBy = map.get("createBy").equals("") ? null : Integer.parseInt(map.get("createBy").toString());
-				// 修改人
-				Integer updateBy = map.get("updateBy").equals("") ?  null : Integer.parseInt(map.get("updateBy").toString());
-				// 城建坐标经度
-				Float x = map.get("x").equals("") ?  null : Float.parseFloat(map.get("x").toString());
-				// 城建坐标纬度
-				Float y = map.get("y").equals("") ? null : Float.parseFloat(map.get("y").toString());
-				// 道路编码
-				String roadCoding = map.get("roadCoding").equals("") ? "" : map.get("roadCoding").toString();
-				// 原坐标类型
-				String dbType = map.get("dbType").equals("") ? "" : map.get("dbType").toString();
-				// WGS经纬度
-				Float gLonx = null;
-				// WGS纬度
-				Float gLaty = null;
-				if(bJwpointsArray.length>0) {
-					Location resultPoint = FromBDPointToWGSPoint(bJwpointsArray[0],bJwpointsArray[1]);
-					gLonx = (float)resultPoint.getLng();
-					gLaty = (float)resultPoint.getLat();
-				}
-				// 多边形原坐标点集合
-				String bPloygonGrid = map.get("bPolygonGrid").equals("") ? "" : map.get("bPolygonGrid").toString();
-				// 多边形WGS坐标点集合
-				String gPloygonGrid ="";
-				if(!bPloygonGrid.equals("")) {
-					String bPloygonGridArray[] = bPloygonGrid.split(",");
-					int bLen_ = bPloygonGridArray.length;
-					for(int b = 0 ;b<bLen_;b++) {
-						String tempArray[]= bPloygonGridArray[b].split(" ");
-						Location resultPoint = FromBDPointToWGSPoint(tempArray[0],tempArray[1]);
-						 if(b==0) {
-							 gPloygonGrid = String.valueOf(resultPoint.getLng()) + " " + String.valueOf(resultPoint.getLat());
-						 }else {
-							 gPloygonGrid = gPloygonGrid +  ',' + String.valueOf(resultPoint.getLng()) + " " + String.valueOf(resultPoint.getLat());
-						 }
-					}
+			// 站点编码
+			stationCod = map.get("stationCod").equals("") ? "" : map.get("stationCod").toString();
+			// 站点ID
+			stationId = Integer.valueOf(stationCod);
+			// 圆半径
+			Integer radius = map.get("radius").equals("") ? null : Integer.parseInt(map.get("radius").toString());
+			// 图形类型
+			String shapesType = map.get("shapesType").equals("") ? "" : map.get("shapesType").toString();
+			// 创建人
+			Integer createBy = map.get("createBy").equals("") ? null : Integer.parseInt(map.get("createBy").toString());
+			// 修改人
+			Integer updateBy = map.get("updateBy").equals("") ?  null : Integer.parseInt(map.get("updateBy").toString());
+			// 城建坐标经度
+			Float x = map.get("x").equals("") ?  null : Float.parseFloat(map.get("x").toString());
+			// 城建坐标纬度
+			Float y = map.get("y").equals("") ? null : Float.parseFloat(map.get("y").toString());
+			// 道路编码
+			String roadCoding = map.get("roadCoding").equals("") ? "" : map.get("roadCoding").toString();
+			// 原坐标类型
+			String dbType = map.get("dbType").equals("") ? "" : map.get("dbType").toString();
+			// WGS经纬度
+			Float gLonx = null;
+			// WGS纬度
+			Float gLaty = null;
+			if(bJwpointsArray.length>0) {
+				Location resultPoint = FromBDPointToWGSPoint(bJwpointsArray[0],bJwpointsArray[1]);
+				gLonx = (float)resultPoint.getLng();
+				gLaty = (float)resultPoint.getLat();
+			}
+			// 多边形原坐标点集合
+			String bPloygonGrid = map.get("bPolygonGrid").equals("") ? "" : map.get("bPolygonGrid").toString();
+			// 多边形WGS坐标点集合
+			String gPloygonGrid ="";
+			if(!bPloygonGrid.equals("")) {
+				String bPloygonGridArray[] = bPloygonGrid.split(",");
+				int bLen_ = bPloygonGridArray.length;
+				for(int b = 0 ;b<bLen_;b++) {
+					String tempArray[]= bPloygonGridArray[b].split(" ");
+					Location resultPoint = FromBDPointToWGSPoint(tempArray[0],tempArray[1]);
+					 if(b==0) {
+						 gPloygonGrid = String.valueOf(resultPoint.getLng()) + " " + String.valueOf(resultPoint.getLat());
+					 }else {
+						 gPloygonGrid = gPloygonGrid +  ',' + String.valueOf(resultPoint.getLng()) + " " + String.valueOf(resultPoint.getLat());
+					 }
 				}
-				if(bPloygonGrid.equals(""))
-					bPloygonGrid = null;
-				else
-					bPloygonGrid = "POLYGON(("  + bPloygonGrid +"))";
-				if(gPloygonGrid.equals(""))
-					gPloygonGrid = null;
-				else
-					gPloygonGrid = "POLYGON(("  + gPloygonGrid +"))";
-				// 保存站点
-				repository.stationSave(stationCod, zdmc, roadCoding, dbType, bJwpoints, 
-										gLonx, gLaty, x, y, gPloygonGrid,bPloygonGrid, destroy, radius, 
-										shapesType, versions, descriptions, createBy, updateBy,stationId);
 			}
+			if(bPloygonGrid.equals(""))
+				bPloygonGrid = null;
+			else
+				bPloygonGrid = "POLYGON(("  + bPloygonGrid +"))";
+			if(gPloygonGrid.equals(""))
+				gPloygonGrid = null;
+			else
+				gPloygonGrid = "POLYGON(("  + gPloygonGrid +"))";
+			// 保存站点
+			repository.stationSave(stationCod, zdmc, roadCoding, dbType, bJwpoints, 
+									gLonx, gLaty, x, y, gPloygonGrid,bPloygonGrid, destroy, radius, 
+									shapesType, versions, descriptions, createBy, updateBy,stationId);
+			
 			Station station = repository.findOne(stationId);
 			StationRoute arg0 = new StationRoute();
 			// 距离
@@ -1200,8 +1192,9 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 			sectionRoute.setLine(resultLine);
 			// 路段编码
 			sectionRoute.setSectionCode(sectionCode);
-			// 版本
-			sectionRoute.setVersions(versions);
+			// 版本号(获取线路当前版本)
+			Integer version =  lineVersionsRepository.findCurrentVersion(resultLine.getId());
+			sectionRoute.setVersions(version);
 			sectionRoute.setDestroy(destroy);
 			// 方向
 			sectionRoute.setDirections(directions);			
@@ -1229,8 +1222,8 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 			String libraryPointstr =  s.getbJwpoints();
 			String points[] = libraryPointstr.toString().split(" ");
 			Point center = new Point(Double.parseDouble(points[0]), Double.parseDouble(points[1]));
-			// 在100m内认为是同一个站点
-			Circle circle = new Circle(center, 100);
+			// 在40m内认为是同一个站点
+			Circle circle = new Circle(center, 40);
 			// 匹配到了用数据库中的点替换
 			if (geoUtils.isPointInCircle(point, circle)) {
 				map.put("name", s.getStationName().toString());
@@ -1372,20 +1365,9 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 					Integer stationId = Integer.parseInt(stationsArray.getJSONObject(i).get("id").toString());
 					arg0 = repository.findOne(stationId);
-					if ((i==0 || i==stationsArray.size()-1) && resultLine.getLinePlayType() != 1) {// (起终点站)
-						List<Station> list = new ArrayList<>();
-						list.add(arg0);
-						List<Station> stationlist =  JSONArray.parseArray(JSON.toJSONString(list), Station.class);
-						Station station = stationlist.get(0);	
-						// 站点编码
-						long stationCode = GetUIDAndCode.getStationId();
-						station.setStationCod(String.valueOf(stationCode));
-						station.setId((int)stationCode);
-						station.setCreateDate(null);
-						station.setUpdateDate(null);
-						repository.save(station);
-						arg0 = station;
-					} else if (i==0  && resultLine.getLinePlayType() == 1) {// 环线终点和起点引用同一个站
+					if (i==stationsArray.size()-1  && resultLine.getLinePlayType() == 1) {// 环线终点和起点引用同一个站
+						arg0 = loopStartStation;
+					} else {
 						List<Station> list = new ArrayList<>();
 						list.add(arg0);
 						List<Station> stationlist =  JSONArray.parseArray(JSON.toJSONString(list), Station.class);
@@ -1397,12 +1379,11 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 						station.setCreateDate(null);
 						station.setUpdateDate(null);
 						repository.save(station);
-						arg0 = station;
-						loopStartStation = arg0;
-						repository.save(arg0);
-					} else if (i==stationsArray.size()-1  && resultLine.getLinePlayType() == 1) {// 环线终点和起点引用同一个站
-						arg0 = loopStartStation;
-					} 
+						arg0 = station; 
+						if (i==0  && resultLine.getLinePlayType() == 1) {// 环线终点和起点引用同一个站
+							loopStartStation = arg0;
+						}
+					}
 				}else {
 					// 站点编码
 					long stationCode = GetUIDAndCode.getStationId();
@@ -190,12 +190,10 @@ ul li a:hover:not(.active) {
 .radio_label {
 	display:block;
 	color: white;
-	float: left;
 	cursor: pointer;
 	margin-left: 50px;
 	font-size: 20px;
 	margin-top: 5px;
-	text-align: center;
 }
 .radioclass {
 	margin-top: 6px !important;
@@ -207,7 +205,4 @@ ul li a:hover:not(.active) {
 }
 .on {
 	background-position: 0 0;
-} 
-
-
-
+}
 \ No newline at end of file
@@ -196,12 +196,12 @@ $(function(){
 		params.lineId=line.id;
 		params.dir = line.dir;
 		$.get('/stationroute/findCachePoint',params,function(data){
-			var station_radio_html = '<div id="station_radio">';
+			var station_radio_html = '<div id="station_radio" >';
 			var cont = 1;
 			var check = 'checked="checked"';
 			$.each(data,function(){
 				stationRouteMap[this.stationRouteId] = this;
-				station_radio_html += '<div class="radio"><label class="radio_label on"><input name="stationRadio" type="radio" class="radioclass" value="'+this.stationRouteId+'" '+(cont==1?check:"")+' />'+this.stationRouteStationName+"</label></div>";
+				station_radio_html += '<div class="radio" ><label class="radio_label on"><input name="stationRadio" type="radio" class="radioclass" value="'+this.stationRouteId+'" '+(cont==1?check:"")+' />'+this.stationRouteStationName+"</label></div>";
 				cont++;
 			});
 			station_radio_html +=  '</div>';
@@ -22,12 +22,8 @@ $(function(){
 			$('#lineIdInput').val(lineSelectValueArray[0]);// 设值线路编码.
 			$('#lineCodeInput').val(lineSelectValueArray[1]);// 设值线路ID.
 			// 版本号赋值
-			$.get('/lineVersions/findByLineId',{'lineId':lineSelectValueArray[0]},function(lineVersions){
-				$.each(lineVersions,function(){
-					if (this.status == 1) {
-						$('#versionsInput').val(this.versions); 
-					}
-				})
+			$.get('/lineVersions/findCurrentVersion',{'lineId':lineSelectValueArray[0]},function(versions){
+				$('#versionsInput').val(versions); 
 			});
 			// 获取该线路下的路段路由.
 			PublicFunctions.getSectionRouteInfo(lineSelectValueArray[0],function(array) {
@@ -24,12 +24,8 @@ $(function(){
 			$('#lineCodeInput').val(lineSelectValueArray[1]);
 			var params =  {'lineCode_eq':lineSelectValueArray[1],'destroy_eq':0,'directions_eq':dir};
 			// 版本号赋值
-			$.get('/lineVersions/findByLineId',{'lineId':lineSelectValueArray[0]},function(lineVersions){
-				$.each(lineVersions,function(){
-					if (this.status == 1) {
-						$('#versionsInput').val(this.versions); 
-					}
-				})
+			$.get('/lineVersions/findCurrentVersion',{'lineId':lineSelectValueArray[0]},function(versions){
+				$('#versionsInput').val(versions); 
 			});
 			initSelect(params);
 		}
@@ -237,12 +237,8 @@ $(&#39;#add_station_mobal&#39;).on(&#39;AddStationMobal.show&#39;, function(e, addMap,ajaxd,stao
 			// 是否撤销
 			$('#destroySelect').val(0); 
 			// 版本号
-			$.get('/lineVersions/findByLineId',{'lineId':Line.id},function(lineVersions){
-				$.each(lineVersions,function(){
-					if (this.status == 1) {
-						$('#versionsInput').val(this.versions); 
-					}
-				})
+			$.get('/lineVersions/findCurrentVersion',{'lineId':Line.id},function(versions){
+				$('#versionsInput').val(versions);					
 			});
 			var initzdlyP = {'line.id_eq':Line.id,'destroy_eq':0,'directions_eq':Station.dir};
@@ -216,7 +216,6 @@ var WorldsBMap = function () {
 			// 地图画多边形
 			pointsPolygon : function(objStation) {
-				debugger
 				// 将视图切换到指定的缩放等级，中心点坐标不变。注意：当有信息窗口在地图上打开时，地图缩放将保证信息窗口所在的坐标位置不动。（自1.2新增）
 				mapBValue.setZoom(15);
@@ -374,7 +373,6 @@ var WorldsBMap = function () {
 			// 画圆
 			pointsCircle : function(objStation) {
-				debugger
 				// 将视图切换到指定的缩放等级，中心点坐标不变。注意：当有信息窗口在地图上打开时，地图缩放将保证信息窗口所在的坐标位置不动。（自1.2新增）
 				mapBValue.setZoom(16);