1.加入电子前置围栏能力(应对终点多次进入的情况)

王通
1 parent 24f7efab
Showing 8 changed files with 318 additions and 28 deletions
src/main/java/com/bsth/controller/GeoPremiseController.java
src/main/java/com/bsth/entity/GeoPremise.java
src/main/java/com/bsth/repository/GeoPremiseRepository.java
src/main/java/com/bsth/service/GeoPremiseService.java
src/main/java/com/bsth/service/impl/GeoPremiseServiceImpl.java
src/main/java/com/bsth/service/impl/LsStationRouteServiceImpl.java
src/main/resources/static/pages/base/stationroute/js/routes-operation.js
src/main/resources/static/pages/base/stationroute/js/routes-service.js
+package com.bsth.controller;
+
+import com.bsth.common.ResponseCode;
+import com.bsth.entity.GeoPremise;
+import com.bsth.service.GeoPremiseService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author Hill
+ */
+@RestController
+@RequestMapping("/api/geopremise")
+public class GeoPremiseController extends BaseController<GeoPremise, Integer> {
+
+    @Autowired
+    private GeoPremiseService geoPremiseService;
+
+    @Override
+    @RequestMapping(method = RequestMethod.POST)
+    public Map<String, Object> save(GeoPremise geoPremise) {
+        Map<String, Object> result = new HashMap<>();
+        try {
+            result.putAll(geoPremiseService.save(geoPremise));
+            result.put("status", ResponseCode.SUCCESS);
+        } catch (Exception e) {
+            result.put("status", ResponseCode.ERROR);
+        }
+
+        return result;
+    }
+}
+package com.bsth.entity;
+
+import javax.persistence.*;
+
+/**
+ * @author Hill
+ */
+@Entity
+@Table(name = "bsth_f_geo_premise")
+public class GeoPremise {
+
+	@Id
+	private Integer id;
+	
+	private String name;
+
+	/**
+	 * 线路代码
+	 */
+	private String lineCode;
+
+	/**
+	 * 上下行
+	 * 0上行 1下行
+	 */
+	private int upDown;
+
+	/**
+	 * 站点编码
+	 */
+	private String stationCode;
+
+	/**
+	 * 坐标
+	 */
+	private String coords;
+
+	public Integer getId() {
+		return id;
+	}
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getLineCode() {
+		return lineCode;
+	}
+
+	public void setLineCode(String lineCode) {
+		this.lineCode = lineCode;
+	}
+
+	public int getUpDown() {
+		return upDown;
+	}
+
+	public void setUpDown(int upDown) {
+		this.upDown = upDown;
+	}
+
+	public String getStationCode() {
+		return stationCode;
+	}
+
+	public void setStationCode(String stationCode) {
+		this.stationCode = stationCode;
+	}
+
+	public String getCoords() {
+		return coords;
+	}
+
+	public void setCoords(String coords) {
+		this.coords = coords;
+	}
+}
+package com.bsth.repository;
+
+import com.bsth.entity.GeoPremise;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @author Hill
+ */
+@Repository
+public interface GeoPremiseRepository extends BaseRepository<GeoPremise, Integer> {
+
+}
+package com.bsth.service;
+
+import com.bsth.entity.GeoPremise;
+
+/**
+ * @author Hill
+ */
+public interface GeoPremiseService extends BaseService<GeoPremise, Integer> {
+
+}
+package com.bsth.service.impl;
+
+import com.bsth.entity.GeoPremise;
+import com.bsth.entity.LsStationRoute;
+import com.bsth.repository.GeoPremiseRepository;
+import com.bsth.repository.LsStationRouteRepository;
+import com.bsth.service.GeoPremiseService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+
+/**
+ * @author Hill
+ */
+@Service
+public class GeoPremiseServiceImpl extends BaseServiceImpl<GeoPremise, Integer> implements GeoPremiseService {
+
+    @Autowired
+    private GeoPremiseRepository geoPremiseRepository;
+
+    @Autowired
+    private LsStationRouteRepository lsStationRouteRepository;
+
+    @Override
+    public GeoPremise findById(Integer id) {
+        Optional<GeoPremise> optional = geoPremiseRepository.findById(id);
+        return optional.isPresent() ? optional.get() : new GeoPremise();
+    }
+
+    @Override
+    public Map<String, Object> save(GeoPremise geoPremise) {
+        Map<String, Object> result = new HashMap<>();
+        LsStationRoute stationRoute = lsStationRouteRepository.findById(geoPremise.getId()).get();
+        geoPremise.setLineCode(stationRoute.getLineCode());
+        geoPremise.setUpDown(stationRoute.getDirections());
+        geoPremise.setStationCode(stationRoute.getStationCode());
+        geoPremise.setName(String.format("%s-%s", stationRoute.getStationName(), stationRoute.getDirections() == 0 ? "上行" : "下行"));
+        geoPremiseRepository.save(geoPremise);
+
+        return result;
+    }
+}
@@ -25,10 +25,7 @@ import org.springframework.util.StringUtils;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 /**
  * @author Hill
@@ -357,7 +354,7 @@ public class LsStationRouteServiceImpl extends BaseServiceImpl&lt;LsStationRoute, I
                 Position start = lineString.getPositionN(i), end = lineString.getPositionN(i + 1);
                 Point point1 = new Point(start.getCoordinate(0), start.getCoordinate(1));
                 Point point2 = new Point(end.getCoordinate(0), end.getCoordinate(1));
-                int size = (int) (GeoUtils.getDistance(point1, point2) / 5) + 1;
+                int size = (int) (GeoUtils.getDistance(point1, point2) / 10) + 1;
                 points.add(point1);
                 if (size > 1) {
                     double offsetLon = (point2.getLon() - point1.getLon()) / size;
@@ -377,7 +374,6 @@ public class LsStationRouteServiceImpl extends BaseServiceImpl&lt;LsStationRoute, I
                                 if (indexes.size() == 0 || !indexes.get(indexes.size() - 1).endsWith(String.format("-%d", j))) {
                                     indexes.add(String.format("%s-%d", stationRoute.getStationCode(), j));
                                 }
-                                break;
                             }
                         } else {
                             Polygon polygon = stationRoute.getBufferPolygonWgs();
@@ -390,14 +386,13 @@ public class LsStationRouteServiceImpl extends BaseServiceImpl&lt;LsStationRoute, I
                                 if (indexes.size() == 0 || !indexes.get(indexes.size() - 1).endsWith(String.format("-%d", j))) {
                                     indexes.add(String.format("%s-%d", stationRoute.getStationCode(), j));
                                 }
-                                break;
                             }
                         }
                     }
                 }
             }
         }
-        List<String> specialStations = new ArrayList<>();
+        Set<String> specialStations = new LinkedHashSet<>();
         result.put("data", specialStations);
         for (int i = 0;i < stationRoutes.size();) {
             if (indexes.size() == 0) {
@@ -411,7 +406,9 @@ public class LsStationRouteServiceImpl extends BaseServiceImpl&lt;LsStationRoute, I
                     lastMatch = index;
                     i++;
                 } else {
-                    specialStations.add(String.format("%s, %s", index, lastMatch));
+                    if (!index.equals(lastMatch)) {
+                        specialStations.add(String.format("%s, %s", index, lastMatch));
+                    }
                 }
             }
             if (j == indexes.size()) {
@@ -17,6 +17,8 @@ var RoutesOperation = (function () {
     var road_win_show_p;
     // 被编辑的路段
     var editPolyline;
+    // 前置站点
+    var premise;
     var styleOptions = {
         strokeColor : "blue",
         fillColor : "blue",
@@ -30,6 +32,16 @@ var RoutesOperation = (function () {
         strokeWeight: 2,
         strokeOpacity: 0.7
     }
+    var polygonDmOptions = {
+        isOpen : false,
+        enableDrawingTool : false,
+        drawingToolOptions : {
+            anchor : BMAP_ANCHOR_TOP_RIGHT,
+            offset : new BMap.Size(5, 5),
+            scale : 0.8
+        },
+        polygonOptions : styleOptions
+    }
     var operation = {
         getAddStationRoute: function () {
             return addStationRoute;
@@ -406,12 +418,20 @@ var RoutesOperation = (function () {
                 if(status > 0){
                     htm += '<div>' +
                         '<button class="info_win_btn" id="editStation" onclick="RoutesOperation.editStation(' + stationRoute.id+','+stationRoute.directions + ')">修改</button>' +
-                        '<button class="info_win_btn" onclick="RoutesOperation.destroyStation('+ stationRoute.id + ','+stationRoute.line.id+','+stationRoute.directions+')">撤销</button>' +
-                        '<button class="info_win_btn" id="addBetweenStationRoad" onclick="RoutesOperation.addBetweenStationRoad(' + stationRoute.id + ')">添加站点间路段</button>' +
-                        '</div>';
+                        '<button class="info_win_btn" onclick="RoutesOperation.destroyStation('+ stationRoute.id + ','+stationRoute.line.id+','+stationRoute.directions+')">撤销</button>';
+                        if (stationRoute.stationMark == 'E') {
+                            htm += '<button class="info_win_btn" onclick="RoutesOperation.geoPremise(' + stationRoute.id + ')">前置电子围栏</button></div>';
+                        } else {
+                            htm += '<button class="info_win_btn" id="addBetweenStationRoad" onclick="RoutesOperation.addBetweenStationRoad(' + stationRoute.id + ')">添加站点间路段</button></div>';
+                        }
                 }
                 // 创建信息窗口
                 var infoWindow = new BMap.InfoWindow(htm, opts);
+                infoWindow.addEventListener('close', function() {
+                    if (premise) {
+                        baiduMap.removeOverlay(premise);
+                    }
+                })
                 setTimeout(function () {
                     //开启信息窗口
                     baiduMap.openInfoWindow(infoWindow, point);
@@ -993,6 +1013,83 @@ var RoutesOperation = (function () {
         },
         /**
+         * 前置电子围栏
+         * @param stationRouteId
+         */
+        geoPremise: function (stationRouteId) {
+            if (premise) {
+                baiduMap.removeOverlay(premise);
+            }
+            RoutesService.findGeoPremise(stationRouteId, function (res) {
+                if (res.id) {
+                    var coords = res.coords.split(', '), points = [];
+                    for (var i = 0;i < coords.length;i++) {
+                        var coordinates = coords[i].split(' ');
+                        points.push(new BMap.Point(coordinates[0], coordinates[1]));
+                    }
+                    premise = new BMap.Polygon(points);
+                    premise.cdata = res;
+                    premise.enableEditing(true);
+                    premise.addEventListener('dblclick', operation.premiseDblclickHandler);
+                    baiduMap.addOverlay(premise);
+                } else {
+                    layer.confirm('没有电子围栏，是否添加!', {
+                        btn : [ '确认', '取消' ]
+                    },function () {
+                        layer.closeAll();
+                        var drawingManager = new BMapLib.DrawingManager(baiduMap, polygonDmOptions);
+                        drawingManager.setDrawingMode(BMAP_DRAWING_POLYGON);
+                        drawingManager.open();
+                        drawingManager.addEventListener('polygoncomplete', function(polygon) {
+                            drawingManager.close();
+                            baiduMap.removeOverlay(polygon);
+                            var points = polygon.getPath();
+                            if (points.length < 3) {
+                                layer.msg('坐标点不能小于三个，请点击"退出编辑"后重新修改');
+                                baiduMap.removeOverlay(polygon);
+
+                                return false;
+                            } else {
+                                var bufferPolygonWkt = new Array();
+                                for(var i = 0;i < points.length;i++) {
+                                    bufferPolygonWkt.push(points[i].lng + ' ' + points[i].lat)
+                                }
+                                bufferPolygonWkt.push(points[0].lng + ' ' + points[0].lat)
+                                RoutesService.saveGeoPremise({id: stationRouteId, coords: bufferPolygonWkt.join(', ')}, function(res) {
+                                    if (res.status == 'SUCCESS') {
+                                        layer.msg('前置电子围栏保存成功!');
+                                    } else {
+                                        layer.msg('前置电子围栏保存失败!');
+                                    }
+                                })
+                            }
+                        });
+
+                    });
+                }
+            })
+        },
+
+        /**
+         * 前置围栏双击保存
+         */
+        premiseDblclickHandler: function (event) {
+            var points = event.target.getPath(), cdata = event.target.cdata;
+            var bufferPolygonWkt = new Array();
+            for(var i = 0;i < points.length;i++) {
+                bufferPolygonWkt.push(points[i].lng + ' ' + points[i].lat)
+            }
+            bufferPolygonWkt.push(points[0].lng + ' ' + points[0].lat)
+            RoutesService.saveGeoPremise({id: cdata.id, coords: bufferPolygonWkt.join(', ')}, function(res) {
+                if (res.status == 'SUCCESS') {
+                    layer.msg('前置电子围栏保存成功!');
+                } else {
+                    layer.msg('前置电子围栏保存失败!');
+                }
+            })
+        },
+
+        /**
          * 关闭modal时的清理
          * @param station
          */
@@ -2319,22 +2416,7 @@ var RoutesOperation = (function () {
         /***************************************************drawingmanager*******************************************************/
         initStationDrawingManager: function() {
-            stationDrawingManager = new BMapLib.DrawingManager(baiduMap, {
-                //是否开启绘制模式
-                isOpen : false,
-                //是否显示工具栏
-                enableDrawingTool : false,
-                drawingToolOptions : {
-                    //位置
-                    anchor : BMAP_ANCHOR_TOP_RIGHT,
-                    //偏离值
-                    offset : new BMap.Size(5, 5),
-                    //工具栏缩放比例
-                    scale : 0.8
-                },
-                //线的样式
-                polygonOptions : styleOptions
-            });
+            stationDrawingManager = new BMapLib.DrawingManager(baiduMap, polygonDmOptions);
             // 添加绘画完成事件
             stationDrawingManager.addEventListener('polygoncomplete', function(polygon) {
@@ -335,6 +335,28 @@ var RoutesService = (function(){
 			$post('/api/lsstationroute/circularRouteHandle', {lineId: lineId, version: version}, function() {
 				callback && callback();
 			});
+		},
+
+		/**
+		 * 获取前置电子围栏信息
+		 * @param id
+		 * @param callback
+		 */
+		findGeoPremise: function(id, callback) {
+			$get('/api/geopremise/' + id, {}, function(res) {
+				callback && callback(res);
+			})
+		},
+
+		/**
+		 * 保存前置电子围栏信息
+		 * @param params
+		 * @param callback
+		 */
+		saveGeoPremise: function (params, callback) {
+			$post('/api/geopremise/', params, function(res) {
+				callback && callback(res);
+			})
 		}
 	};