线路整条录入的两个功能，起终点站新增

YRF
1 parent df2151cf
Showing 8 changed files with 118 additions and 54 deletions
src/main/java/com/bsth/controller/StationController.java
src/main/java/com/bsth/entity/Station.java
src/main/java/com/bsth/repository/SectionRouteCacheRepository.java
src/main/java/com/bsth/repository/StationRouteCacheRepository.java
src/main/java/com/bsth/service/impl/SectionServiceImpl.java
src/main/java/com/bsth/service/impl/StationServiceImpl.java
src/main/resources/static/pages/base/line/map.html
src/main/resources/static/pages/base/station/edit_select.html
@@ -8,8 +8,6 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
-import antlr.collections.List;
-
 import com.bsth.entity.Station;
 import com.bsth.service.StationService;
 import com.bsth.util.GetUIDAndCode;
@@ -6,6 +6,8 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.Table;
+
+import java.util.Arrays;
 import java.util.Date;
@@ -323,4 +325,17 @@ public class Station {
 	public void setUpdateDate(Date updateDate) {
 		this.updateDate = updateDate;
 	}
+
+	@Override
+	public String toString() {
+		return "Station [id=" + id + ", stationCod=" + stationCod + ", stationName=" + stationName + ", roadCoding="
+				+ roadCoding + ", addr=" + addr + ", dbType=" + dbType + ", bJwpoints=" + bJwpoints + ", gLonx=" + gLonx
+				+ ", gLaty=" + gLaty + ", x=" + x + ", y=" + y + ", shapesType=" + shapesType + ", radius=" + radius
+				+ ", gPolygonGrid=" + Arrays.toString(gPolygonGrid) + ", bPolygonGrid=" + Arrays.toString(bPolygonGrid)
+				+ ", destroy=" + destroy + ", versions=" + versions + ", isHaveLed=" + isHaveLed + ", isHaveShelter="
+				+ isHaveShelter + ", isHarbourStation=" + isHarbourStation + ", descriptions=" + descriptions
+				+ ", createBy=" + createBy + ", updateBy=" + updateBy + ", createDate=" + createDate + ", updateDate="
+				+ updateDate + "]";
+	}
+	
 }
@@ -5,9 +5,7 @@ import java.util.List;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
-import org.springframework.transaction.annotation.Transactional;
-import com.bsth.entity.SectionRoute;
 import com.bsth.entity.SectionRouteCache;
 /**
@@ -139,6 +137,6 @@ public interface SectionRouteCacheRepository extends BaseRepository&lt;SectionRoute
      * @param dir
      */
     @Modifying
-    @Query(value="delete from bsth_c_sectionroute_cache where line = ?1  and directions = ?2", nativeQuery=true)
-    public void sectionRouteCacheDel(Integer line,Integer dir);
+    @Query(value="delete from bsth_c_sectionroute_cache where line_code = ?1  and directions = ?2", nativeQuery=true)
+    public void sectionRouteCacheDel(String lineCode,Integer dir);
 }
 package com.bsth.repository;
 import java.util.List;
-import java.util.Map;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Sort;
-import org.springframework.data.jpa.domain.Specification;
-import org.springframework.data.jpa.repository.EntityGraph;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
-import org.springframework.transaction.annotation.Transactional;
-import com.bsth.entity.Line;
-import com.bsth.entity.StationRoute;
 import com.bsth.entity.StationRouteCache;
 /**
@@ -64,7 +55,7 @@ public interface StationRouteCacheRepository extends BaseRepository&lt;StationRoute
      * @param dir
      */
     @Modifying
-    @Query(value="delete from bsth_c_stationroute_cache where line = ?1 and directions = ?2 ", nativeQuery=true)
-    public void stationRouteCacheDel(Integer line,Integer dir);
+    @Query(value="delete from bsth_c_stationroute_cache where line_code = ?1 and directions = ?2 ", nativeQuery=true)
+    public void stationRouteCacheDel(String lineCode,Integer dir);
 }
@@ -190,7 +190,7 @@ public class SectionServiceImpl extends BaseServiceImpl&lt;Section, Integer&gt; implem
 				routeRepository.save(route);
 			}
 			// 删除缓存路段
-			routeCacheRepository.sectionRouteCacheDel(sectionRouteLine,directions);
+			routeCacheRepository.sectionRouteCacheDel(lineCode,directions);
 			// 撤销原有站点路由
 			stationRouteRepository.stationRouteUpdDestroy(sectionRouteLine,directions);
 			// 站点保存
@@ -221,7 +221,7 @@ public class SectionServiceImpl extends BaseServiceImpl&lt;Section, Integer&gt; implem
 				stationRouteRepository.save(stationRoute);
 			}
 			// 删除缓存站点
-			stationRouteCacheRepository.stationRouteCacheDel(sectionRouteLine,directions);
+			stationRouteCacheRepository.stationRouteCacheDel(lineCode,directions);
 			resultMap.put("status", ResponseCode.SUCCESS);			
 		} catch (Exception e) {
@@ -324,7 +324,7 @@ public class SectionServiceImpl extends BaseServiceImpl&lt;Section, Integer&gt; implem
 				lsRouteRepository.save(route);
 			}
 			// 删除缓存路段
-			routeCacheRepository.sectionRouteCacheDel(sectionRouteLine,directions);
+			routeCacheRepository.sectionRouteCacheDel(lineCode,directions);
 			// 删除原有历史表站点路由
 			lsStationRouteRepository.batchDelete(sectionRouteLine,directions,versions);
 			// 站点保存
@@ -355,7 +355,7 @@ public class SectionServiceImpl extends BaseServiceImpl&lt;Section, Integer&gt; implem
 				lsStationRouteRepository.save(stationRoute);
 			}
 			// 删除缓存站点
-			stationRouteCacheRepository.stationRouteCacheDel(sectionRouteLine,directions);
+			stationRouteCacheRepository.stationRouteCacheDel(lineCode,directions);
 			resultMap.put("status", ResponseCode.SUCCESS);			
 		} catch (Exception e) {
 			resultMap.put("status", ResponseCode.ERROR);
 package com.bsth.service.impl;
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -12,8 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-
-
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.bsth.common.ResponseCode;
@@ -261,6 +260,7 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 		Map<String, Object> paramsMeleageAndDistncDura = new HashMap<String,Object>();
 		JSONArray stationsArray = JSONArray.parseArray(stationJSON);
 		if(stationsArray.size()>0) {
+			Station loopStartStation = new Station();
 			for(int i = 0;i <stationsArray.size();i++) {
 				// 站点名称
 				String stationName = stationsArray.getJSONObject(i).equals("") ? "" : stationsArray.getJSONObject(i).get("name").toString();
@@ -292,6 +292,38 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 					/*Integer stationId = Integer.parseInt(stationNameList.get(0)[1].toString());*/
 					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) {// 环线终点和起点引用同一个站
+						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;
+						loopStartStation = arg0;
+						repository.save(arg0);
+					} else if (i==stationsArray.size()-1  && resultLine.getLinePlayType() == 1) {// 环线终点和起点引用同一个站
+						arg0 = loopStartStation;
+					} 
 				}else {
 					// 站点编码
 					long stationCode = GetUIDAndCode.getStationId();
@@ -353,7 +385,14 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 					arg0.setVersions(versions);
 					arg0.setbJwpoints(bJwpoints);
 					// 插入站点信息
-					repository.save(arg0);
+					if (i==0  && resultLine.getLinePlayType() == 1) {// 环线终点和起点引用同一个站
+						loopStartStation = arg0;
+						repository.save(arg0);
+					} else if (i==stationsArray.size()-1  && resultLine.getLinePlayType() == 1) {// 环线终点和起点引用同一个站
+						arg0 = loopStartStation;
+					} else {
+						repository.save(arg0);
+					}
 				}
 				// 站点路由对象
@@ -1297,8 +1336,10 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 		Map<String, Object> paramsMeleageAndDistncDura = new HashMap<String,Object>();
 		JSONArray stationsArray = JSONArray.parseArray(stationJSON);
 		if(stationsArray.size()>0) {
+			// 环线起点站
+			Station loopStartStation =  new Station();
 			// 更新路线前删除线路缓存站点
-			routeCacheRepository.stationRouteCacheDel(Integer.parseInt(resultLine.getLineCode()),directions);
+			routeCacheRepository.stationRouteCacheDel(resultLine.getLineCode(),directions);
 			for(int i = 0;i <stationsArray.size();i++) {
 				// 站点名称
 				String stationName = stationsArray.getJSONObject(i).equals("") ? "" : stationsArray.getJSONObject(i).get("name").toString();
@@ -1322,14 +1363,46 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 				// 百度坐标纬度
 				String bLatx = JSONObject.parseObject(stationsArray.getJSONObject(i).get("potion").toString()).get("lat").toString();
 				bLatx = bLatx==null || bLatx.equals("") ? "0" : bLatx;
-				List<Object[]> stationNameList = repository.findStationName(directions,stationName);
+//				List<Object[]> stationNameList = repository.findStationName(directions,stationName);
 				//Map<String, Object> isHaveMap = isHaveStationname(bLonx,bLatx,stationNameList);
 				// 初始化站点对象
 				Station arg0 =  new Station();
-				// 存在的点就不添加到数据库
+				// 存在的点就不添加到数据库(起终点站重新添加站点)
 				if(Boolean.parseBoolean(stationsArray.getJSONObject(i).get("isHave").toString())) {
 					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) {// 环线终点和起点引用同一个站
+						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;
+						loopStartStation = arg0;
+						repository.save(arg0);
+					} else if (i==stationsArray.size()-1  && resultLine.getLinePlayType() == 1) {// 环线终点和起点引用同一个站
+						arg0 = loopStartStation;
+					} 
 				}else {
 					// 站点编码
 					long stationCode = GetUIDAndCode.getStationId();
@@ -1391,13 +1464,23 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 					arg0.setVersions(versions);
 					arg0.setbJwpoints(bJwpoints);
 					// 插入站点信息
-					repository.save(arg0);
+					if (i==0  && resultLine.getLinePlayType() == 1) {// 环线终点和起点引用同一个站
+						loopStartStation = arg0;
+						repository.save(arg0);
+					} else if (i==stationsArray.size()-1  && resultLine.getLinePlayType() == 1) {// 环线终点和起点引用同一个站
+						arg0 = loopStartStation;
+					} else {
+						repository.save(arg0);
+					}
 				}
 				// 站点路由对象
 				StationRouteCache route = new StationRouteCache();
 				// 站点名称
-				route.setStationName(stationName);
+				if(i==stationsArray.size()-1 && resultLine.getLinePlayType() == 1)
+					route.setStationName(loopStartStation.getStationName());
+				else
+					route.setStationName(stationName);
 				route.setDistances(distance);
 				sumUpOrDownMileage =  sumUpOrDownMileage + distance;
 				route.setToTime(duration);
@@ -1448,7 +1531,7 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 		// 转换成JSON数组
 		JSONArray sectionsArray = JSONArray.parseArray(sectionJSON);
 		// 更新路线前删除线路缓存路段
-		sectionRouteCacheRepository.sectionRouteCacheDel(Integer.parseInt(resultLine.getLineCode()),directions);
+		sectionRouteCacheRepository.sectionRouteCacheDel(resultLine.getLineCode(),directions);
 		// 遍历
 		for(int s = 0 ;s<sectionsArray.size();s++) {
 			// 站点名称
@@ -1530,4 +1613,4 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 		}
 	}
-}
+}
 \ No newline at end of file
@@ -125,27 +125,6 @@ $(function(){
 				$(pjaxContainer).append(m);
 				$('#submit_select_mobal').trigger('submitSelectMobal.show',[section,EditRoute]);
 			});
-			/* layer.confirm('提交会把原有的站点和路段覆盖，您确定要提交吗？', {
-				btn: ['提交','取消'] //按钮
-			}, function(){
-				var sectionList = WorldsBMapLine.getSectionList();
-				var data = {};
-				var section = EditSectionObj.getEitdSection();
-				var josnSectionList = JSON.stringify(sectionList);
-				section.cutSectionList = josnSectionList;
-				$.post('/section/sectionCut', section, function(resuntDate){
-					if(resuntDate.status=='SUCCESS') {
-						// 弹出添加成功提示消息
-						layer.msg('提交成功，跳转到线路详情页面！');
-						window.location.href = "/pages/base/stationroute/list.html?no="+id+","+EditRoute.getLineObj().dir;
-						WorldsBMapLine.initCutSectionPoint();
-						WorldsBMapLine.setPointIndex(0);					
-					}else {
-						// 弹出添加失败提示消息
-						layer.msg('提交失败...');
-					}
-				});
-			}); */	
 		} else {
 			layer.msg("请先截取路段！！！");
 		}
@@ -22,7 +22,7 @@
 					<div class="form-group" id="formRequ">
 						<label class="col-md-3 control-label"><span class="required"> * </span>站点名称:</label>
 						<div class="col-md-9" id="errorInfo">
-							<input type="text" class="form-control input-medium" id="stationNamebootboxInput" name="stationNamebootbox">
+							<input type="text" class="form-control input-medium" id="stationNamebootboxInput" name="stationNamebootbox" readonly="readonly">
 						</div>
 					</div>
 					<!-- 修改方式容器 -->