Commit 3e37af8ae671b3801409c02c583934e466a8b798

Authored by 潘钊
1 parent c5e7606a

update

src/main/java/com/bsth/StartCommand.java
@@ -56,18 +56,18 @@ public class StartCommand implements CommandLineRunner{ @@ -56,18 +56,18 @@ public class StartCommand implements CommandLineRunner{
56 invocationSecurityMetadataSourceService.loadResourceDefine(); 56 invocationSecurityMetadataSourceService.loadResourceDefine();
57 57
58 //GPS实时数据更新线程,每次执行完成4秒后开始下一次 58 //GPS实时数据更新线程,每次执行完成4秒后开始下一次
59 - //scheduler.scheduleWithFixedDelay(gpsRefreshThread, 0, 4, TimeUnit.SECONDS); 59 + scheduler.scheduleWithFixedDelay(gpsRefreshThread, 0, 4, TimeUnit.SECONDS);
60 60
61 //定时0点从计划排班表抓取当天实际排班 61 //定时0点从计划排班表抓取当天实际排班
62 - /*scheduler.scheduleAtFixedRate(getSchedulePlanThread 62 + scheduler.scheduleAtFixedRate(getSchedulePlanThread
63 , 0//DateUtils.getTimesnight() + 5 - System.currentTimeMillis() / 1000 63 , 0//DateUtils.getTimesnight() + 5 - System.currentTimeMillis() / 1000
64 - , 60 * 60 * 24, TimeUnit.SECONDS);*/ 64 + , 60 * 60 * 24, TimeUnit.SECONDS);
65 65
66 //两分钟调度指令入库一次 66 //两分钟调度指令入库一次
67 - //scheduler.scheduleWithFixedDelay(directivePersistenceThread, 20, 60 * 2, TimeUnit.SECONDS); 67 + scheduler.scheduleWithFixedDelay(directivePersistenceThread, 20, 60 * 1, TimeUnit.SECONDS);
68 68
69 //两小时刷新一次对照数据 69 //两小时刷新一次对照数据
70 - //scheduler.scheduleWithFixedDelay(commonRefreshThread, 0, 60 * 60 * 2, TimeUnit.SECONDS); 70 + scheduler.scheduleWithFixedDelay(commonRefreshThread, 0, 60 * 60 * 2, TimeUnit.SECONDS);
71 71
72 //一分钟持久化一次实际排班 72 //一分钟持久化一次实际排班
73 scheduler.scheduleWithFixedDelay(SchedulePersistenceThread, 60 * 1, 60 * 1, TimeUnit.SECONDS); 73 scheduler.scheduleWithFixedDelay(SchedulePersistenceThread, 60 * 1, 60 * 1, TimeUnit.SECONDS);
src/main/java/com/bsth/util/BatchSaveUtils.java
@@ -111,12 +111,6 @@ public class BatchSaveUtils<T> { @@ -111,12 +111,6 @@ public class BatchSaveUtils<T> {
111 return sqlBefore + " " + sqlValues; 111 return sqlBefore + " " + sqlValues;
112 } 112 }
113 113
114 - public static void main(String[] args) {  
115 - List<ScheduleRealInfo> list = new ArrayList<>();  
116 -  
117 - new BatchSaveUtils<ScheduleRealInfo>().saveList(list, ScheduleRealInfo.class);  
118 - }  
119 -  
120 /** 114 /**
121 * 115 *
122 * @Title: propertyToField 116 * @Title: propertyToField
src/main/resources/static/index.html
@@ -280,7 +280,7 @@ tr.row-active td { @@ -280,7 +280,7 @@ tr.row-active td {
280 <!-- 百度 --> 280 <!-- 百度 -->
281 <script src="http://api.map.baidu.com/api?v=2.0&ak=IGGrr4UjwIYzatoCRFKEL8sT" data-exclude=1></script> 281 <script src="http://api.map.baidu.com/api?v=2.0&ak=IGGrr4UjwIYzatoCRFKEL8sT" data-exclude=1></script>
282 <script src="http://api.map.baidu.com/library/TrafficControl/1.4/src/TrafficControl_min.js" data-exclude=1></script> 282 <script src="http://api.map.baidu.com/library/TrafficControl/1.4/src/TrafficControl_min.js" data-exclude=1></script>
283 -<script type="text/javascript" src="http://api.map.baidu.com/library/DrawingManager/1.4/src/DrawingManager_min.js"></script> 283 +<script type="text/javascript" src="http://api.map.baidu.com/library/DrawingManager/1.4/src/DrawingManager_min.js" data-exclude=1></script>
284 <!-- 高德 --> 284 <!-- 高德 -->
285 <script src="http://webapi.amap.com/maps?v=1.3&key=16cb1c5043847e09ef9edafdd77befda" data-exclude=1></script> 285 <script src="http://webapi.amap.com/maps?v=1.3&key=16cb1c5043847e09ef9edafdd77befda" data-exclude=1></script>
286 286
src/main/resources/static/pages/base/stationroute/js/stationroute-ajax-getdata.js
@@ -61,7 +61,7 @@ var GetAjaxData = function(){ @@ -61,7 +61,7 @@ var GetAjaxData = function(){
61 61
62 }, 62 },
63 63
64 - getFormPointEToWGS(points,callback) { 64 + getFormPointEToWGS: function(points,callback) {
65 65
66 // 获取长度 66 // 获取长度
67 var len = points.length; 67 var len = points.length;
src/main/resources/static/pages/base/stationroute/js/stationroute-list-map.js
@@ -537,7 +537,7 @@ var WorldsBMap = function () { @@ -537,7 +537,7 @@ var WorldsBMap = function () {
537 } 537 }
538 538
539 }, 539 },
540 - localSearchFromAdreesToPoint(Address,map,callback) { 540 + localSearchFromAdreesToPoint: function(Address,map,callback) {
541 541
542 var localSearch = new BMap.LocalSearch(map); 542 var localSearch = new BMap.LocalSearch(map);
543 543
@@ -567,9 +567,8 @@ var WorldsBMap = function () { @@ -567,9 +567,8 @@ var WorldsBMap = function () {
567 callback && callback(false); 567 callback && callback(false);
568 } 568 }
569 569
570 -  });  
571 -  
572 -  localSearch.search(Address); 570 + });
  571 + localSearch.search(Address);
573 572
574 }, 573 },
575 574