1.线路路由中也可编辑路段(使用体验)

2.更新百度地图ak

1.线路路由中也可编辑路段(使用体验)
2.更新百度地图ak
王通
1 parent e0f56e12
Showing 16 changed files with 40 additions and 15 deletions
pom.xml
src/main/java/com/bsth/service/impl/LsSectionRouteServiceImpl.java
src/main/resources/logback.xml
src/main/resources/static/gpsTest/test.html
src/main/resources/static/index.html
src/main/resources/static/pages/base/carpark/js/add-vmap-world.js
src/main/resources/static/pages/base/carpark/js/carpark-positions-map.js
src/main/resources/static/pages/base/section/js/add-vmap-world.js
src/main/resources/static/pages/base/stationroute/edit_sectionroute.html
src/main/resources/static/pages/excep/js/map.js
src/main/resources/static/pages/excep/js/outbound-map.js
src/main/resources/static/pages/excep/js/speeding-map.js
src/main/resources/static/pages/mapmonitor/real/js/map_platform_old.js
src/main/resources/static/real_control_v2/alone_page/home/home_wrap.html
src/main/resources/static/real_control_v2/alone_page/map/alone_wrap.html
src/main/resources/static/real_control_v2/main.html
@@ -446,10 +446,23 @@
 			<version>1.5.3</version>
 		</dependency>
+		<!-- 核心依赖 -->
 		<dependency>
 			<groupId>org.bytedeco</groupId>
-			<artifactId>javacv-platform</artifactId>
-			<version>1.5.11</version>
+			<artifactId>javacv</artifactId>
+			<version>1.5.5</version>
+		</dependency>
+		<dependency>
+			<groupId>org.bytedeco</groupId>
+			<artifactId>javacpp</artifactId>
+			<version>1.5.5</version>
+		</dependency>
+		<!-- Linux x86_64平台特定的FFmpeg依赖 -->
+		<dependency>
+			<groupId>org.bytedeco</groupId>
+			<artifactId>ffmpeg</artifactId>
+			<version>4.3.2-1.5.5</version>
+			<classifier>${javacpp.platform}</classifier>
 		</dependency>
 	</dependencies>
@@ -523,5 +536,7 @@
 	<properties>
 		<start-class>com.bsth.Application</start-class>
+		<!-- 平台配置，只打包Linux x86_64平台的jar包 -->
+		<javacpp.platform>linux-x86_64</javacpp.platform>
 	</properties>
 </project>
@@ -126,11 +126,18 @@ public class LsSectionRouteServiceImpl extends BaseServiceImpl&lt;LsSectionRoute, I
 	@Override
 	public void modify(LsSectionRoute sectionRoute) {
 		LsSectionRoute sectionRoute1 = lsSectionRouteRepository.findById(sectionRoute.getId()).get();
+		Section section = sectionRoute.getSection();
 		Integer version = lineVersionsRepository.findCurrentVersion(sectionRoute1.getLine().getId());
 		if (sectionRoute1.getVersions() < version) {
 			throw new IllegalArgumentException("历史版本不可变更");
 		}
+		// 路段走向在线路路由中编辑更方便
+		SectionServiceImpl.centerLine(section);
+		Section section1 = sectionRepository.findById(section.getId()).get();
+		CustomBeanUtils.copyPropertiesIgnoredNull(section, section1);
+		sectionRepository.save(section1);
+
 		lsSectionRouteRepository.updateSectiouRouteCode(sectionRoute);
 		CustomBeanUtils.copyPropertiesIgnoredNull(sectionRoute, sectionRoute1);
 		lsSectionRouteRepository.save(sectionRoute1);
@@ -354,7 +354,7 @@
 	<!-- 日志输出级别 -->
 	<root level="info">
-<!--		<appender-ref ref="STDOUT" />-->
+		<appender-ref ref="STDOUT" />
 		<appender-ref ref="FILE" />
 	</root>
 </configuration>
@@ -84,7 +84,7 @@ form .item select {
 	<script src="/metronic_v4.5.4/plugins/jquery.min.js"></script>
 	<script src="/assets/plugins/jquery.serializejson.js"></script>
 	<script
-		src="//api.map.baidu.com/api?v=2.0&ak=IGGrr4UjwIYzatoCRFKEL8sT"></script>
+		src="//api.map.baidu.com/api?v=2.0&ak=1TgEKvYqohJyeGXnN6yHSSTb4psOarQw"></script>
 	<script type="text/javascript"
 		src="//api.map.baidu.com/library/DistanceTool/1.2/src/DistanceTool_min.js"></script>
 	<!-- moment.js 日期处理类库 -->
@@ -637,7 +637,7 @@
 <!-- 地图相关 -->
 <!-- 百度 -->
 <script
-		src="//api.map.baidu.com/api?v=3.0&ak=IGGrr4UjwIYzatoCRFKEL8sT"
+		src="//api.map.baidu.com/api?v=3.0&ak=1TgEKvYqohJyeGXnN6yHSSTb4psOarQw"
 		data-exclude=1></script>
 <script
 		src="//api.map.baidu.com/library/TrafficControl/1.4/src/TrafficControl_min.js"
@@ -5,7 +5,7 @@ var addCarParkVmapWorlds = function() {
 				// 设置中心点,
 				var CENTER_POINT = {lng: 103.52514, lat: 30.589808};
 				// 百度API Key
-				var bdKey = 'IGGrr4UjwIYzatoCRFKEL8sT';
+				var bdKey = '1TgEKvYqohJyeGXnN6yHSSTb4psOarQw';
 				// 初始化百度地图
 				mapB = new BMap.Map("addCarParkbmap_basic");
 				//中心点和缩放级别
@@ -12,7 +12,7 @@ var CarParkPWorldsBMap = function () {
 				// 设置中心点,
 				var CENTER_POINT = {lng: 103.52514, lat: 30.589808};
 				// 百度API Key
-				var bdKey = 'IGGrr4UjwIYzatoCRFKEL8sT';
+				var bdKey = '1TgEKvYqohJyeGXnN6yHSSTb4psOarQw';
 				// 初始化百度地图
 				mapValue = new BMap.Map("carParkbmap_basic");
 				//中心点和缩放级别
@@ -3,7 +3,7 @@ var SectionVmapWorlds = function() {
 	var Bmap = {
 		init : function() {
 			var CENTER_POINT = {lng: 103.52514, lat: 30.589808};// 设置中心点.
-			var bdKey = 'IGGrr4UjwIYzatoCRFKEL8sT';// 百度API Key
+			var bdKey = '1TgEKvYqohJyeGXnN6yHSSTb4psOarQw';// 百度API Key
 			mapB = new BMap.Map("sectionBmap_basic");// 初始化百度地图
 			mapB.centerAndZoom(new BMap.Point(CENTER_POINT.lng,CENTER_POINT.lat), 15);//中心点和缩放级别
 			mapB.enableDragging(); //启用地图拖拽事件，默认启用(可不写)
@@ -56,6 +56,7 @@
 <script type="text/javascript">
 $('#edit_sectionroute_modal').on('modal.show', function(e, polyline){
+	console.log(polyline);
 	var properties = RoutesOperation.getProperties();
 	var sectionRoute = polyline.data;
 	RoutesOperation.setSectionFormValue(sectionRoute);
@@ -136,6 +137,8 @@ $(&#39;#edit_sectionroute_modal&#39;).on(&#39;modal.show&#39;, function(e, polyline){
             params.destroy=0;
             params.sectionDistance=0;
             params.sectionTime = 0;
+			params['section.bsectionVectorWkt'] = RoutesOperation.polyline2Wkt(polyline);
+			debugger
 			if(params.sectionrouteCode == '请选择...') {
 				params.sectionrouteCode = 100;
@@ -24,7 +24,7 @@ var BasicMap = function () {
 				var CENTER_POINT = {lng : 121.528733,lat : 31.237425};
 				// 百度API Key
-				var bdKey = 'IGGrr4UjwIYzatoCRFKEL8sT';
+				var bdKey = '1TgEKvYqohJyeGXnN6yHSSTb4psOarQw';
 				// 初始化百度地图
 				mapBValue = new BMap.Map("BasicMap");
@@ -35,7 +35,7 @@ var WorldsBMap = function () {
 				var CENTER_POINT = {lng : 121.528733,lat : 31.237425};
 				// 百度API Key
-				var bdKey = 'IGGrr4UjwIYzatoCRFKEL8sT';
+				var bdKey = '1TgEKvYqohJyeGXnN6yHSSTb4psOarQw';
 				// 初始化百度地图
 				mapBValue = new BMap.Map("bmap_basic");
@@ -24,7 +24,7 @@ var SpeedingMap = function () {
 				var CENTER_POINT = {lng : 121.528733,lat : 31.237425};
 				// 百度API Key
-				var bdKey = 'IGGrr4UjwIYzatoCRFKEL8sT';
+				var bdKey = '1TgEKvYqohJyeGXnN6yHSSTb4psOarQw';
 				// 初始化百度地图
 				mapBValue = new BMap.Map("speedingMap");
@@ -37,7 +37,7 @@ var realMap = (function() {
 	var city = "上海";
 	//百度API Key
-	var bdKey = 'IGGrr4UjwIYzatoCRFKEL8sT';
+	var bdKey = '1TgEKvYqohJyeGXnN6yHSSTb4psOarQw';
 	var bd_gps_info_win_opts = {
 	  		width : 190,
@@ -72,7 +72,7 @@
 <!-- 地图相关 -->
-<script src="//api.map.baidu.com/api?v=2.0&ak=IGGrr4UjwIYzatoCRFKEL8sT"></script>
+<script src="//api.map.baidu.com/api?v=2.0&ak=1TgEKvYqohJyeGXnN6yHSSTb4psOarQw"></script>
 <script src="//api.map.baidu.com/library/TrafficControl/1.4/src/TrafficControl_min.js"></script>
 <script src="/assets/js/baidu//MarkerClusterer.js" merge="plugins"></script>
 <script src="/assets/js/CoordinateConverter.js" merge="plugins"></script>
@@ -60,7 +60,7 @@
     <span style="position: absolute;left: calc(50% - 35px);top: calc(45% - 35px);">加载中...</span>
 </div>
 <!-- 地图相关 -->
-<script src="//api.map.baidu.com/api?v=2.0&ak=IGGrr4UjwIYzatoCRFKEL8sT"></script>
+<script src="//api.map.baidu.com/api?v=2.0&ak=1TgEKvYqohJyeGXnN6yHSSTb4psOarQw"></script>
 <script src="//api.map.baidu.com/library/TrafficControl/1.4/src/TrafficControl_min.js"></script>
 <script src="/assets/js/baidu//MarkerClusterer.js" merge="plugins"></script>
 <script src="/assets/js/CoordinateConverter.js" merge="plugins"></script>
@@ -113,7 +113,7 @@
 </script>
 <!-- 地图相关 -->
-<script src="//api.map.baidu.com/api?v=2.0&ak=IGGrr4UjwIYzatoCRFKEL8sT"></script>
+<script src="//api.map.baidu.com/api?v=2.0&ak=1TgEKvYqohJyeGXnN6yHSSTb4psOarQw"></script>
 <script src="//api.map.baidu.com/library/TrafficControl/1.4/src/TrafficControl_min.js"></script>
 <script src="/assets/js/baidu//MarkerClusterer.js" merge="plugins"></script>
 <script src="/assets/js/CoordinateConverter.js" merge="plugins"></script>