线路编辑代码修改

游瑞烽
1 parent fd0524ed
Showing 11 changed files with 97 additions and 47 deletions
src/main/java/com/bsth/entity/LsStationRoute.java
src/main/java/com/bsth/service/geo_data/impl/GeoDataServiceImpl.java
src/main/resources/static/pages/base/geo_data_edit/css/mian.css
src/main/resources/static/pages/base/geo_data_edit/fragments/f_road_route.html
src/main/resources/static/pages/base/geo_data_edit/js/map.js
src/main/resources/static/pages/base/geo_data_edit/js/road_route.js
src/main/resources/static/pages/base/geo_data_edit/js/station_route.js
src/main/resources/static/pages/base/geo_data_edit/js/submit.js
src/main/resources/static/pages/base/geo_data_edit/js/version_manage.js
src/main/resources/static/pages/base/geo_data_edit/main.html
src/main/resources/static/pages/base/line/list.html
@@ -24,83 +24,100 @@ import java.util.Date;
     })
 })
 public class LsStationRoute {
-	
+
 	//站点路由ID
 	@Id
 	@GeneratedValue(strategy = GenerationType.IDENTITY)
 	private Integer id;
-	
+
 	// 站点路由序号
 	private Integer stationRouteCode;
-	
+
 	// 站点编码
 	private String stationCode;
-	
+
 	// 站点名称
 	private String stationName;
-	
+
 	// 线路编码
 	private String lineCode;
-	
+
 	/**
-	 * 站点类型
-	 * 
+	 * 图形类型
+	 *
+	 * ------ r：圆形
+	 *
+	 * ------ p：多边形
+	 */
+	private String shapesType;
+
+	// 圆形半径
+	private Integer radius;
+
+	// 多边形空间WGS坐标点集合
+	private byte[] gPolygonGrid;
+
+	// 多边形空间原坐标坐标点集合
+	private byte[] bPolygonGrid;
+
+	/*** 站点类型
+	 *
 	 * ------ B：起点站
-	 * 
+	 *
 	 * ------ Z：中途站
-	 * 
+	 *
 	 * ------ E：终点站
-	 * 
+	 *
 	 * ------ T：停车场
-	 * 
+	 *
 	 */
 	private String stationMark;
-	
+
 	// 站点路由出站序号
 	private Integer outStationNmber;
-	
+
 	// 站点路由到站距离
 	private Double distances;
-	
+
 	// 站点路由到站时间
 	private Double toTime;
-	
+
 	// 首班时间
 	private String firstTime;
-	
+
 	// 末班时间
 	private String endTime;
-	
+
 	// 站点路由方向
 	private Integer directions;
-	
+
 	// 版本号
 	private Integer versions;
-	
+
 	// 是否撤销
 	private Integer destroy;
-	
+
 	// 描述
 	private String descriptions;
-	
+
 	// 创建人
 	private Integer createBy;
-		
+
 	// 修改人
 	private Integer updateBy;
-	
+
 	// 创建日期
 	@Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
 	private Date createDate;
-	
+
 	// 修改日期
 	@Column(name = "update_date", columnDefinition = "timestamp  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
 	private Date updateDate;
-	
+
 	// 站点信息
 	@ManyToOne(fetch = FetchType.LAZY)
 	private Station station;
-	
+
 	// 线路信息
 	@ManyToOne
 	private Line line;
@@ -145,6 +162,38 @@ public class LsStationRoute {
 		this.lineCode = lineCode;
 	}
  
+	public String getShapesType() {
+		return shapesType;
+	}
+
+	public void setShapesType(String shapesType) {
+		this.shapesType = shapesType;
+	}
+
+	public Integer getRadius() {
+		return radius;
+	}
+
+	public void setRadius(Integer radius) {
+		this.radius = radius;
+	}
+
+	public byte[] getgPolygonGrid() {
+		return gPolygonGrid;
+	}
+
+	public void setgPolygonGrid(byte[] gPolygonGrid) {
+		this.gPolygonGrid = gPolygonGrid;
+	}
+
+	public byte[] getbPolygonGrid() {
+		return bPolygonGrid;
+	}
+
+	public void setbPolygonGrid(byte[] bPolygonGrid) {
+		this.bPolygonGrid = bPolygonGrid;
+	}
+
 	public String getStationMark() {
 		return stationMark;
 	}
@@ -200,7 +249,7 @@ public class LsStationRoute {
 	public void setDirections(Integer directions) {
 		this.directions = directions;
 	}
-	
+
 	public Integer getVersions() {
 		return versions;
 	}
@@ -208,7 +257,7 @@ public class LsStationRoute {
 	public void setVersions(Integer versions) {
 		this.versions = versions;
 	}
-	
+
 	public Integer getDestroy() {
 		return destroy;
 	}
@@ -635,7 +635,7 @@ public class GeoDataServiceImpl implements GeoDataService {
      */
     private void batchInsertStation(final List<CascadeSaveStation> cssList, final int version) {
         //站点
-        jdbcTemplate.batchUpdate("insert into bsth_c_station(id, code, db_type, b_jwpoints, g_lonx, g_laty) " +
+        jdbcTemplate.batchUpdate("insert into bsth_c_station(id, station_code, db_type, b_jwpoints, g_lonx, g_laty) " +
                 " values(?,?,?,?,?,?,?,?,?,?,?,ST_GeomFromText(?))", new BatchPreparedStatementSetter() {
             @Override
             public void setValues(PreparedStatement ps, int i) throws SQLException {
@@ -719,7 +719,7 @@ public class GeoDataServiceImpl implements GeoDataService {
  
             //insert 站点
             long sCode = GetUIDAndCode.getStationId();
-            jdbcTemplate.update("insert into bsth_c_station(id, code, db_type, b_jwpoints, g_lonx, g_laty) " +
+            jdbcTemplate.update("insert into bsth_c_station(id, station_code, db_type, b_jwpoints, g_lonx, g_laty) " +
                     " values(?,?,?,?,?,?)", sCode, sCode, "b", lng + " " + lat, wgsLoc.getLng(), wgsLoc.getLat());
  
  
@@ -175,9 +175,9 @@ a.clock_enable_version:focus{
     padding: 5px 8px;
 }
 .station_route>ul{
-    padding: 0 0 20px 30px;
+    padding: 0 0 20px 25px;
     font-size: 14px;
-    width: calc(100% - 38px);
+    width: calc(100% - 35px);
 }
  
 .up_down_route_list ul.uk-list>li:nth-child(n+2), .uk-list>li>ul {
@@ -543,7 +543,7 @@ ul.context-menu-list.station-route-ct-menu.context-menu-root {
 }
  
 .road_li_transient .ul_li_input input:first-child{
-    width: 110px;
+    width: 190px;
     margin-left: 2px;
 }
  
@@ -83,7 +83,7 @@
             <div class="ul_li_input">
                 <form>
                     <input class="uk-input" value="{{sectionName}}" autocomplete="off"  placeholder="路段名称" name="sectionName">
-                    <input class="uk-input" value="{{crosesRoad}}" autocomplete="off"  placeholder="交叉路" name="crosesRoad">
+                    <!--<input class="uk-input" value="{{crosesRoad}}" autocomplete="off"  placeholder="交叉路" name="crosesRoad">-->
                     <span uk-icon="icon: location;ratio:.8" title="绘制路段" uk-tooltip class="search_point_icon_btn"></span>
                     <span uk-icon="icon: close;" title="取消" uk-tooltip class="cancel_icon_btn"></span>
                 </form>
@@ -197,7 +197,7 @@ var gb_ct_map = function () {
         return marker;
     }
  
-    var openStationInfoWin = function (m) {debugger;
+    var openStationInfoWin = function (m) {
         //ct_data
         var win = new BMap.InfoWindow(gb_station_route.getTemps()['geo_d_e_station_info_win-temp'](m.ct_data), {offset: new BMap.Size(0, -13)});
         //close event
@@ -348,7 +348,6 @@ var gb_ct_map = function () {
      * @param station
      */
     var editStationBuffer = function (s) {
-        debugger;
         map_status = 1;
         map.closeInfoWindow();//关闭infoWindow
         gb_station_route.clearFocus();
@@ -12,12 +12,16 @@ var gb_road_route = function () {
             temps = temp;
  
             //渲染
+            if(!road_maps[0])
+                road_maps[0] = [];
             if(road_maps[0]){
                 var ups = _group(road_maps[0]);
                 var upHtmlStr = temps['geo_d_e_road_route-temp']({list: ups, updown: 0});
                 $('.up_down_route_list>li:first>.road_route').html(upHtmlStr);
             }
  
+            if(!road_maps[1])
+                road_maps[1] = [];
             if(road_maps[1]){
                 var downs = _group(road_maps[1]);
                 var downHtmlStr = temps['geo_d_e_road_route-temp']({list: downs, updown: 1});
@@ -83,7 +83,6 @@ var gb_station_route = function () {
         // var elem = $('.up_down_route_list>li>.station_route .s_r_item[data-code='+s.stationCode+']');
         var elem = $('.up_down_route_list>li>.station_route .s_r_item[data-id='+s.id+']');
         elem.addClass('ct_active');
-debugger;
         if (!isShow(elem)) {
             //定位滚动条
             var cont = $('.up_down_route_list'),
@@ -469,7 +468,6 @@ debugger;
      */
     var addEnd = function (list, _newRCode) {
         updateStationRouteData(list);
-debugger;
         var upDown = list[0].directions;
         var wrap = $('.up_down_route_list>li:eq('+upDown+')>.station_route');
         //新增的站点路由
@@ -14,7 +14,6 @@ var gb_data_submit = function () {
         var f = $(this).parents('form');
         var data = f.serializeJSON();
         UIkit.modal.confirm('确定保存【'+data.stationName+'】的缓冲区信息？').then(function() {
-            debugger;
             if(data.shapesType=='d'){
                 var polygon = gb_ct_map.getDrawPolygon();
                 if(null == polygon){
@@ -170,13 +169,14 @@ var gb_data_submit = function () {
     $(document).on('click', '#add_line_versions_modal ._submit', function (e) {
         var f = $('form', '#add_line_versions_modal');
         var data = f.serializeJSON();
+        debugger;
         data.lineCode = g_line_code;
-        if(!data.startdate || !data.name){
+        if(!data.startDate || !data.name){
             document.getElementsByClassName('reminder_span')[0].style.visibility = 'visible';
             return;
         }
  
-        $('[name=startDate]', modal).on('input',document.getElementsByClassName('reminder_span')[0].style.visibility = 'hidden');
+        $('[name=startDate]', f).on('input',document.getElementsByClassName('reminder_span')[0].style.visibility = 'hidden');
  
         UIkit.modal.confirm('确定线路版本【'+data.name+'】？').then(function() {
             $loadPanel.show();
@@ -229,8 +229,8 @@ var gb_version_manage = function () {
         var showMin = "";
         var showHour = "";
         var showYear = Math.floor(tdoa/ 1000 / 60 / 60 / 24 / 365);
-        var showMonth = Math.floor(tdoa/ 1000 / 60 / 60 / 24 / 30);
-        var showDay = Math.floor(tdoa/ 1000 / 60 / 60 / 24);
+        var showMonth = Math.floor(tdoa/ 1000 / 60 / 60 / 24 / 30 % 12);
+        var showDay = Math.floor(tdoa/ 1000 / 60 / 60 / 24 % 30);
         var dateStr = new StringBuffer();
  
         if(showYear >= 1) {
@@ -75,8 +75,8 @@
                         <li><a href="javascript:;" id="batch_destroy_station" ><i class="fa fa-trash-o"></i>  撤销站点</a></li>
                         <li><a href="javascript:;" id="batch_destroy_section" ><i class="fa fa-trash-o"></i>  撤销路段</a></li>
                         <li><a href="javascript:;" id="wrench_down_dis"><i class="fa fa-wrench"></i>  设置站距</a></li>
-                        <li><a href="javascript:;" id="retweet"><i class="fa fa-retweet"></i> 切换上下行走向</a></li>
-                        <li><a href="javascript:;" id="quote_reverse_section"><i class="fa fa-long-arrow-down"></i>  引用反方向路段</a></li>
+                        <!--<li><a href="javascript:;" id="retweet"><i class="fa fa-retweet"></i> 切换上下行走向</a></li>-->
+                        <!--<li><a href="javascript:;" id="quote_reverse_section"><i class="fa fa-long-arrow-down"></i>  引用反方向路段</a></li>-->
                     </ul>
                 </div>
             </div>
@@ -235,7 +235,7 @@
 				<a href="/pages/base/lineinformation/list.html?no={{obj.id}}" class="btn default blue-stripe btn-sm" data-pjax> 查看 </a>
 			</td>
 			<td>
-				<a href="/pages/base/stationroute/list.html?no={{obj.id}}" class="btn default blue-stripe btn-sm" data-pjax> 查看</a>
+				<!--<a href="/pages/base/stationroute/list.html?no={{obj.id}}" class="btn default blue-stripe btn-sm" data-pjax> 查看</a>-->
 				<a href="javascript:window.localStorage.setItem('geo_data_edit_line_code' , '{{obj.lineCode}}');window.localStorage.removeItem('geo_data_edit_line_version');window.location.href='/pages/base/geo_data_edit/uk3_wrap.html';" class="btn default blue-stripe btn-sm" data-pjax> 查看 </a>
 			</td>
 			<td>