潘钊 / bsth_control · Commits

Commit 58baba1f32f09de6139ef536101e40eba0f34085

Authored by 王通
1 parent b86ffef8
build: skipped

1.

Inline Side-by-side
Showing 2 changed files with 12 additions and 8 deletions
src/main/java/com/bsth/message/handler/RabbitMessageHandler.java
  View file @58baba1
... ... @@ -5,7 +5,6 @@ import com.bsth.data.alarm.AlarmCenter;
5 5 import com.bsth.data.gpsdata_v2.GpsRealData;
6 6 import com.bsth.data.gpsdata_v2.entity.GpsEntity;
7 7 import com.bsth.message.entity.*;
8   -import com.bsth.websocket.handler.SendUtils;
9 8 import com.fasterxml.jackson.databind.ObjectMapper;
10 9 import org.slf4j.Logger;
11 10 import org.slf4j.LoggerFactory;
... ... @@ -28,9 +27,6 @@ public class RabbitMessageHandler {
28 27 private final static Logger log = LoggerFactory.getLogger(RabbitMessageHandler.class);
29 28  
30 29 @Autowired
31   - private SendUtils sendUtils;
32   -
33   - @Autowired
34 30 private ObjectMapper mapper;
35 31  
36 32 @Autowired
... ... @@ -48,9 +44,13 @@ public class RabbitMessageHandler {
48 44 alarmVo = mapper.readValue(message, AlarmADASVo.class);
49 45 }
50 46 if (alarmVo != null) {
  47 + if (alarmVo.getVehicleCode() == null) {
  48 + log.warn("报警未匹配到车辆,alarmVo: {}", alarmVo);
  49 + return;
  50 + }
51 51 GpsEntity gps = gpsRealData.getByNbbm(alarmVo.getVehicleCode());
52 52 if (gps == null || gps.getLineId() == null) {
53   - alarmVo.setLineCode("249231");
  53 + log.warn("报警未匹配到线路,alarmVo: {}", alarmVo);
54 54 } else {
55 55 alarmVo.setLineCode(gps.getLineId());
56 56 }
... ...
src/main/resources/static/real_control_v2/fragments/north/nav/dvr.html
  View file @58baba1
... ... @@ -70,9 +70,13 @@
70 70 $.post('/dvr/jt1078', {sim: info.sim, channel: channel}, function(res) {
71 71 requesting = false;
72 72 if (res.status == 'SUCCESS') {
73   - player.src([{src: res.data['hls']}]);
74   - player.load();
75   - player.play();
  73 + if (player) {
  74 + player.src([{src: res.data['hls']}]);
  75 + player.load();
  76 + player.play();
  77 + } else {
  78 + player = videojs('dvr', {sources: [{src: res.data['hls']}], autoplay: true});
  79 + }
76 80 } else {
77 81 layer.msg(res.msg)
78 82 }
... ...