潘钊 / bsth_control · Commits

Commit ccbf85df530d4eaefa2a773fa6a2037cf79adcc0

Authored by 王通
1 parent e0f56e12
build: skipped

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

2.更新百度地图ak
Inline Side-by-side
Showing 16 changed files with 40 additions and 15 deletions
... ... @@ -446,10 +446,23 @@
446 446 <version>1.5.3</version>
447 447 </dependency>
448 448  
  449 + <!-- 核心依赖 -->
449 450 <dependency>
450 451 <groupId>org.bytedeco</groupId>
451   - <artifactId>javacv-platform</artifactId>
452   - <version>1.5.11</version>
  452 + <artifactId>javacv</artifactId>
  453 + <version>1.5.5</version>
  454 + </dependency>
  455 + <dependency>
  456 + <groupId>org.bytedeco</groupId>
  457 + <artifactId>javacpp</artifactId>
  458 + <version>1.5.5</version>
  459 + </dependency>
  460 + <!-- Linux x86_64平台特定的FFmpeg依赖 -->
  461 + <dependency>
  462 + <groupId>org.bytedeco</groupId>
  463 + <artifactId>ffmpeg</artifactId>
  464 + <version>4.3.2-1.5.5</version>
  465 + <classifier>${javacpp.platform}</classifier>
453 466 </dependency>
454 467 </dependencies>
455 468  
... ... @@ -523,5 +536,7 @@
523 536  
524 537 <properties>
525 538 <start-class>com.bsth.Application</start-class>
  539 + <!-- 平台配置，只打包Linux x86_64平台的jar包 -->
  540 + <javacpp.platform>linux-x86_64</javacpp.platform>
526 541 </properties>
527 542 </project>
... ...
src/main/java/com/bsth/service/impl/LsSectionRouteServiceImpl.java
  View file @ccbf85d
... ... @@ -126,11 +126,18 @@ public class LsSectionRouteServiceImpl extends BaseServiceImpl&lt;LsSectionRoute, I
126 126 @Override
127 127 public void modify(LsSectionRoute sectionRoute) {
128 128 LsSectionRoute sectionRoute1 = lsSectionRouteRepository.findById(sectionRoute.getId()).get();
  129 + Section section = sectionRoute.getSection();
129 130 Integer version = lineVersionsRepository.findCurrentVersion(sectionRoute1.getLine().getId());
130 131 if (sectionRoute1.getVersions() < version) {
131 132 throw new IllegalArgumentException("历史版本不可变更");
132 133 }
133 134  
  135 + // 路段走向在线路路由中编辑更方便
  136 + SectionServiceImpl.centerLine(section);
  137 + Section section1 = sectionRepository.findById(section.getId()).get();
  138 + CustomBeanUtils.copyPropertiesIgnoredNull(section, section1);
  139 + sectionRepository.save(section1);
  140 +
134 141 lsSectionRouteRepository.updateSectiouRouteCode(sectionRoute);
135 142 CustomBeanUtils.copyPropertiesIgnoredNull(sectionRoute, sectionRoute1);
136 143 lsSectionRouteRepository.save(sectionRoute1);
... ...
src/main/resources/logback.xml
  View file @ccbf85d
... ... @@ -354,7 +354,7 @@
354 354  
355 355 <!-- 日志输出级别 -->
356 356 <root level="info">
357   -<!-- <appender-ref ref="STDOUT" />-->
  357 + <appender-ref ref="STDOUT" />
358 358 <appender-ref ref="FILE" />
359 359 </root>
360 360 </configuration>
... ...
src/main/resources/static/gpsTest/test.html
  View file @ccbf85d
... ... @@ -84,7 +84,7 @@ form .item select {
84 84 <script src="/metronic_v4.5.4/plugins/jquery.min.js"></script>
85 85 <script src="/assets/plugins/jquery.serializejson.js"></script>
86 86 <script
87   - src="//api.map.baidu.com/api?v=2.0&ak=IGGrr4UjwIYzatoCRFKEL8sT"></script>
  87 + src="//api.map.baidu.com/api?v=2.0&ak=1TgEKvYqohJyeGXnN6yHSSTb4psOarQw"></script>
88 88 <script type="text/javascript"
89 89 src="//api.map.baidu.com/library/DistanceTool/1.2/src/DistanceTool_min.js"></script>
90 90 <!-- moment.js 日期处理类库 -->
... ...
src/main/resources/static/index.html
  View file @ccbf85d
... ... @@ -637,7 +637,7 @@
637 637 <!-- 地图相关 -->
638 638 <!-- 百度 -->
639 639 <script
640   - src="//api.map.baidu.com/api?v=3.0&ak=IGGrr4UjwIYzatoCRFKEL8sT"
  640 + src="//api.map.baidu.com/api?v=3.0&ak=1TgEKvYqohJyeGXnN6yHSSTb4psOarQw"
641 641 data-exclude=1></script>
642 642 <script
643 643 src="//api.map.baidu.com/library/TrafficControl/1.4/src/TrafficControl_min.js"
... ...
src/main/resources/static/pages/base/carpark/js/add-vmap-world.js
  View file @ccbf85d
... ... @@ -5,7 +5,7 @@ var addCarParkVmapWorlds = function() {
5 5 // 设置中心点,
6 6 var CENTER_POINT = {lng: 103.52514, lat: 30.589808};
7 7 // 百度API Key
8   - var bdKey = 'IGGrr4UjwIYzatoCRFKEL8sT';
  8 + var bdKey = '1TgEKvYqohJyeGXnN6yHSSTb4psOarQw';
9 9 // 初始化百度地图
10 10 mapB = new BMap.Map("addCarParkbmap_basic");
11 11 //中心点和缩放级别
... ...
src/main/resources/static/pages/base/carpark/js/carpark-positions-map.js
  View file @ccbf85d
... ... @@ -12,7 +12,7 @@ var CarParkPWorldsBMap = function () {
12 12 // 设置中心点,
13 13 var CENTER_POINT = {lng: 103.52514, lat: 30.589808};
14 14 // 百度API Key
15   - var bdKey = 'IGGrr4UjwIYzatoCRFKEL8sT';
  15 + var bdKey = '1TgEKvYqohJyeGXnN6yHSSTb4psOarQw';
16 16 // 初始化百度地图
17 17 mapValue = new BMap.Map("carParkbmap_basic");
18 18 //中心点和缩放级别
... ...
src/main/resources/static/pages/base/section/js/add-vmap-world.js
  View file @ccbf85d
... ... @@ -3,7 +3,7 @@ var SectionVmapWorlds = function() {
3 3 var Bmap = {
4 4 init : function() {
5 5 var CENTER_POINT = {lng: 103.52514, lat: 30.589808};// 设置中心点.
6   - var bdKey = 'IGGrr4UjwIYzatoCRFKEL8sT';// 百度API Key
  6 + var bdKey = '1TgEKvYqohJyeGXnN6yHSSTb4psOarQw';// 百度API Key
7 7 mapB = new BMap.Map("sectionBmap_basic");// 初始化百度地图
8 8 mapB.centerAndZoom(new BMap.Point(CENTER_POINT.lng,CENTER_POINT.lat), 15);//中心点和缩放级别
9 9 mapB.enableDragging(); //启用地图拖拽事件，默认启用(可不写)
... ...
src/main/resources/static/pages/base/stationroute/edit_sectionroute.html
  View file @ccbf85d
... ... @@ -56,6 +56,7 @@
56 56 <script type="text/javascript">
57 57  
58 58 $('#edit_sectionroute_modal').on('modal.show', function(e, polyline){
  59 + console.log(polyline);
59 60 var properties = RoutesOperation.getProperties();
60 61 var sectionRoute = polyline.data;
61 62 RoutesOperation.setSectionFormValue(sectionRoute);
... ... @@ -136,6 +137,8 @@ $(&#39;#edit_sectionroute_modal&#39;).on(&#39;modal.show&#39;, function(e, polyline){
136 137 params.destroy=0;
137 138 params.sectionDistance=0;
138 139 params.sectionTime = 0;
  140 + params['section.bsectionVectorWkt'] = RoutesOperation.polyline2Wkt(polyline);
  141 + debugger
139 142  
140 143 if(params.sectionrouteCode == '请选择...') {
141 144 params.sectionrouteCode = 100;
... ...
src/main/resources/static/pages/excep/js/map.js
  View file @ccbf85d
... ... @@ -24,7 +24,7 @@ var BasicMap = function () {
24 24 var CENTER_POINT = {lng : 121.528733,lat : 31.237425};
25 25  
26 26 // 百度API Key
27   - var bdKey = 'IGGrr4UjwIYzatoCRFKEL8sT';
  27 + var bdKey = '1TgEKvYqohJyeGXnN6yHSSTb4psOarQw';
28 28  
29 29 // 初始化百度地图
30 30 mapBValue = new BMap.Map("BasicMap");
... ...
src/main/resources/static/pages/excep/js/outbound-map.js
  View file @ccbf85d
... ... @@ -35,7 +35,7 @@ var WorldsBMap = function () {
35 35 var CENTER_POINT = {lng : 121.528733,lat : 31.237425};
36 36  
37 37 // 百度API Key
38   - var bdKey = 'IGGrr4UjwIYzatoCRFKEL8sT';
  38 + var bdKey = '1TgEKvYqohJyeGXnN6yHSSTb4psOarQw';
39 39  
40 40 // 初始化百度地图
41 41 mapBValue = new BMap.Map("bmap_basic");
... ...
src/main/resources/static/pages/excep/js/speeding-map.js
  View file @ccbf85d
... ... @@ -24,7 +24,7 @@ var SpeedingMap = function () {
24 24 var CENTER_POINT = {lng : 121.528733,lat : 31.237425};
25 25  
26 26 // 百度API Key
27   - var bdKey = 'IGGrr4UjwIYzatoCRFKEL8sT';
  27 + var bdKey = '1TgEKvYqohJyeGXnN6yHSSTb4psOarQw';
28 28  
29 29 // 初始化百度地图
30 30 mapBValue = new BMap.Map("speedingMap");
... ...
src/main/resources/static/pages/mapmonitor/real/js/map_platform_old.js
  View file @ccbf85d
... ... @@ -37,7 +37,7 @@ var realMap = (function() {
37 37 var city = "上海";
38 38  
39 39 //百度API Key
40   - var bdKey = 'IGGrr4UjwIYzatoCRFKEL8sT';
  40 + var bdKey = '1TgEKvYqohJyeGXnN6yHSSTb4psOarQw';
41 41  
42 42 var bd_gps_info_win_opts = {
43 43 width : 190,
... ...
src/main/resources/static/real_control_v2/alone_page/home/home_wrap.html
  View file @ccbf85d
... ... @@ -72,7 +72,7 @@
72 72  
73 73  
74 74 <!-- 地图相关 -->
75   -<script src="//api.map.baidu.com/api?v=2.0&ak=IGGrr4UjwIYzatoCRFKEL8sT"></script>
  75 +<script src="//api.map.baidu.com/api?v=2.0&ak=1TgEKvYqohJyeGXnN6yHSSTb4psOarQw"></script>
76 76 <script src="//api.map.baidu.com/library/TrafficControl/1.4/src/TrafficControl_min.js"></script>
77 77 <script src="/assets/js/baidu//MarkerClusterer.js" merge="plugins"></script>
78 78 <script src="/assets/js/CoordinateConverter.js" merge="plugins"></script>
... ...
src/main/resources/static/real_control_v2/alone_page/map/alone_wrap.html
  View file @ccbf85d
... ... @@ -60,7 +60,7 @@
60 60 <span style="position: absolute;left: calc(50% - 35px);top: calc(45% - 35px);">加载中...</span>
61 61 </div>
62 62 <!-- 地图相关 -->
63   -<script src="//api.map.baidu.com/api?v=2.0&ak=IGGrr4UjwIYzatoCRFKEL8sT"></script>
  63 +<script src="//api.map.baidu.com/api?v=2.0&ak=1TgEKvYqohJyeGXnN6yHSSTb4psOarQw"></script>
64 64 <script src="//api.map.baidu.com/library/TrafficControl/1.4/src/TrafficControl_min.js"></script>
65 65 <script src="/assets/js/baidu//MarkerClusterer.js" merge="plugins"></script>
66 66 <script src="/assets/js/CoordinateConverter.js" merge="plugins"></script>
... ...
src/main/resources/static/real_control_v2/main.html
  View file @ccbf85d
... ... @@ -113,7 +113,7 @@
113 113 </script>
114 114  
115 115 <!-- 地图相关 -->
116   -<script src="//api.map.baidu.com/api?v=2.0&ak=IGGrr4UjwIYzatoCRFKEL8sT"></script>
  116 +<script src="//api.map.baidu.com/api?v=2.0&ak=1TgEKvYqohJyeGXnN6yHSSTb4psOarQw"></script>
117 117 <script src="//api.map.baidu.com/library/TrafficControl/1.4/src/TrafficControl_min.js"></script>
118 118 <script src="/assets/js/baidu//MarkerClusterer.js" merge="plugins"></script>
119 119 <script src="/assets/js/CoordinateConverter.js" merge="plugins"></script>
... ...