Commit 01cc9e074b42025e0e545a932d42572122ea9898
Merge branch 'minhang' of 192.168.168.201:panzhaov5/bsth_control into
minhang
Showing
2 changed files
with
34 additions
and
17 deletions
src/main/java/com/bsth/data/arrival/ArrivalData_GPS.java
| 1 | package com.bsth.data.arrival; | 1 | package com.bsth.data.arrival; |
| 2 | 2 | ||
| 3 | -import java.util.ArrayList; | ||
| 4 | -import java.util.Collection; | ||
| 5 | -import java.util.HashMap; | ||
| 6 | -import java.util.List; | ||
| 7 | -import java.util.Map; | ||
| 8 | -import java.util.Set; | ||
| 9 | -import java.util.TreeSet; | ||
| 10 | -import java.util.concurrent.TimeUnit; | ||
| 11 | - | 3 | +import com.bsth.data.match.Arrival2Schedule; |
| 4 | +import com.bsth.data.schedule.DayOfSchedule; | ||
| 5 | +import com.google.common.collect.ArrayListMultimap; | ||
| 6 | +import com.google.common.collect.ListMultimap; | ||
| 12 | import org.slf4j.Logger; | 7 | import org.slf4j.Logger; |
| 13 | import org.slf4j.LoggerFactory; | 8 | import org.slf4j.LoggerFactory; |
| 14 | import org.springframework.beans.factory.annotation.Autowired; | 9 | import org.springframework.beans.factory.annotation.Autowired; |
| 15 | import org.springframework.boot.CommandLineRunner; | 10 | import org.springframework.boot.CommandLineRunner; |
| 16 | import org.springframework.stereotype.Component; | 11 | import org.springframework.stereotype.Component; |
| 17 | 12 | ||
| 18 | -import com.bsth.Application; | ||
| 19 | -import com.bsth.data.match.Arrival2Schedule; | ||
| 20 | -import com.bsth.data.schedule.DayOfSchedule; | ||
| 21 | -import com.google.common.collect.ArrayListMultimap; | ||
| 22 | -import com.google.common.collect.ListMultimap; | 13 | +import java.util.*; |
| 23 | 14 | ||
| 24 | /** | 15 | /** |
| 25 | * | 16 | * |
| @@ -32,7 +23,7 @@ import com.google.common.collect.ListMultimap; | @@ -32,7 +23,7 @@ import com.google.common.collect.ListMultimap; | ||
| 32 | @Component | 23 | @Component |
| 33 | public class ArrivalData_GPS implements CommandLineRunner{ | 24 | public class ArrivalData_GPS implements CommandLineRunner{ |
| 34 | 25 | ||
| 35 | - // 起终点站进出数据 K：车辆编码 | 26 | + // 起终点站进出数据 K：车辆编码 |
| 36 | private static ListMultimap<String, ArrivalEntity> startAndEndMaps; | 27 | private static ListMultimap<String, ArrivalEntity> startAndEndMaps; |
| 37 | 28 | ||
| 38 | private static Map<String, Integer> carIndexMap; | 29 | private static Map<String, Integer> carIndexMap; |
| @@ -69,6 +60,7 @@ public class ArrivalData_GPS implements CommandLineRunner{ | @@ -69,6 +60,7 @@ public class ArrivalData_GPS implements CommandLineRunner{ | ||
| 69 | @Override | 60 | @Override |
| 70 | public void run() { | 61 | public void run() { |
| 71 | try{ | 62 | try{ |
| 63 | + logger.info("开始加载到离站数据, " + System.currentTimeMillis()); | ||
| 72 | List<ArrivalEntity> arrSets = dataLoader.load(); | 64 | List<ArrivalEntity> arrSets = dataLoader.load(); |
| 73 | if(null == arrSets || arrSets.size() == 0) | 65 | if(null == arrSets || arrSets.size() == 0) |
| 74 | return; | 66 | return; |
src/main/resources/static/real_control_v2/mapmonitor/js/config.js
| @@ -3,10 +3,35 @@ | @@ -3,10 +3,35 @@ | ||
| 3 | var gb_map_config=(function () { | 3 | var gb_map_config=(function () { |
| 4 | 4 | ||
| 5 | var defaultConfig={ | 5 | var defaultConfig={ |
| 6 | + | ||
| 6 | //地图类型 | 7 | //地图类型 |
| 7 | map_type: 'baidu', | 8 | map_type: 'baidu', |
| 8 | //实时路况 | 9 | //实时路况 |
| 9 | - traffic: false | ||
| 10 | - | 10 | + traffic: false, |
| 11 | + spatialData: { | ||
| 12 | + station: false, | ||
| 13 | + electronicFence: false, | ||
| 14 | + carPark: false | ||
| 15 | + }, | ||
| 16 | + abnormalPrint: { | ||
| 17 | + speeding: true, | ||
| 18 | + outBounds: true, | ||
| 19 | + largeMargin: false | ||
| 20 | + }, | ||
| 21 | + carIcon: { | ||
| 22 | + angle: false, | ||
| 23 | + converge: false, | ||
| 24 | + color: { | ||
| 25 | + up: 'blue', | ||
| 26 | + down: 'red', | ||
| 27 | + nonOperation: 'grey' | ||
| 28 | + } | ||
| 29 | + }, | ||
| 30 | + section:{ | ||
| 31 | + color: { | ||
| 32 | + up: 'blue', | ||
| 33 | + down: 'red' | ||
| 34 | + } | ||
| 35 | + } | ||
| 11 | }; | 36 | }; |
| 12 | })(); | 37 | })(); |
| 13 | \ No newline at end of file | 38 | \ No newline at end of file |