1.

王通
1 parent b86ffef8
Showing 2 changed files with 12 additions and 8 deletions
src/main/java/com/bsth/message/handler/RabbitMessageHandler.java
src/main/resources/static/real_control_v2/fragments/north/nav/dvr.html
@@ -5,7 +5,6 @@ import com.bsth.data.alarm.AlarmCenter;
 import com.bsth.data.gpsdata_v2.GpsRealData;
 import com.bsth.data.gpsdata_v2.entity.GpsEntity;
 import com.bsth.message.entity.*;
-import com.bsth.websocket.handler.SendUtils;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -28,9 +27,6 @@ public class RabbitMessageHandler {
     private final static Logger log = LoggerFactory.getLogger(RabbitMessageHandler.class);
     @Autowired
-    private SendUtils sendUtils;
-
-    @Autowired
     private ObjectMapper mapper;
     @Autowired
@@ -48,9 +44,13 @@ public class RabbitMessageHandler {
                 alarmVo = mapper.readValue(message, AlarmADASVo.class);
             }
             if (alarmVo != null) {
+                if (alarmVo.getVehicleCode() == null) {
+                    log.warn("报警未匹配到车辆,alarmVo: {}", alarmVo);
+                    return;
+                }
                 GpsEntity gps = gpsRealData.getByNbbm(alarmVo.getVehicleCode());
                 if (gps == null || gps.getLineId() == null) {
-                    alarmVo.setLineCode("249231");
+                    log.warn("报警未匹配到线路,alarmVo: {}", alarmVo);
                 } else {
                     alarmVo.setLineCode(gps.getLineId());
                 }
@@ -70,9 +70,13 @@
                 $.post('/dvr/jt1078', {sim: info.sim, channel: channel}, function(res) {
                     requesting = false;
                     if (res.status == 'SUCCESS') {
-                        player.src([{src: res.data['hls']}]);
-                        player.load();
-                        player.play();
+                        if (player) {
+                            player.src([{src: res.data['hls']}]);
+                            player.load();
+                            player.play();
+                        } else {
+                            player = videojs('dvr', {sources: [{src: res.data['hls']}], autoplay: true});
+                        }
                     } else {
                         layer.msg(res.msg)
                     }