1.线调加入视频监控、ADAS、DSM内容

王通
1 parent 80a9a8f4
Showing 42 changed files with 2601 additions and 1308 deletions
pom.xml
src/main/java/com/bsth/Application.java
src/main/java/com/bsth/XDApplication.java
src/main/java/com/bsth/common/SystemParamKeys.java
src/main/java/com/bsth/config/MinioConfig.java
src/main/java/com/bsth/config/RabbitConfig.java
src/main/java/com/bsth/controller/DvrController.java
src/main/java/com/bsth/controller/alaram/AlarmAdasController.java
src/main/java/com/bsth/controller/alaram/AlarmDsmController.java
src/main/java/com/bsth/controller/realcontrol/ServiceDataInterface.java
src/main/java/com/bsth/data/BasicData.java
src/main/java/com/bsth/data/SystemParamCache.java
src/main/java/com/bsth/data/alarm/AlarmCenter.java
src/main/java/com/bsth/data/gpsdata_v2/entity/GpsEntity.java
src/main/java/com/bsth/data/gpsdata_v2/handlers/GpsStateProcess.java
src/main/java/com/bsth/data/gpsdata_v2/handlers/StationInsideProcess.java
src/main/java/com/bsth/data/gpsdata_v2/load/GatewayHttpLoader.java
src/main/java/com/bsth/data/safe_driv/SafeDrivCenter.java
src/main/java/com/bsth/data/schedule/thread/CalcOilThread.java
src/main/java/com/bsth/entity/Cars.java
@@ -61,6 +61,10 @@
 			<artifactId>spring-kafka</artifactId>
 		</dependency>
 		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-amqp</artifactId>
+		</dependency>
+		<dependency>
 			<groupId>mysql</groupId>
 			<artifactId>mysql-connector-java</artifactId>
 			<version>5.1.38</version>
@@ -412,6 +416,23 @@
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-spatial</artifactId>
 		</dependency>
+
+		<dependency>
+			<groupId>io.minio</groupId>
+			<artifactId>minio</artifactId>
+			<version>8.5.14</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.jetbrains.kotlin</groupId>
+					<artifactId>kotlin-stdlib</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.jetbrains.kotlin</groupId>
+			<artifactId>kotlin-stdlib</artifactId>
+			<version>1.3.72</version>
+		</dependency>
     </dependencies>
 	<dependencyManagement>
 package com.bsth;
+import com.bsth.data.BasicData;
 import com.bsth.data.SystemParamCache;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -27,6 +28,9 @@ public class Application extends SpringBootServletInitializer {
 	@Autowired
 	private SystemParamCache systemParamCache;
+	@Autowired
+	private BasicData.BasicDataLoader basicDataLoader;
+
 	@Override
 	protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
 		return application.sources(Application.class);
@@ -28,6 +28,7 @@ import com.bsth.util.Tools;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.stereotype.Component;
@@ -43,6 +44,9 @@ public class XDApplication implements CommandLineRunner {
     Logger log = LoggerFactory.getLogger(this.getClass());
+    @Value("${spring.profiles.active}")
+    private String active;
+
     @Autowired
     BasicData.BasicDataLoader basicDataLoader;
     @Autowired
@@ -110,11 +114,7 @@ public class XDApplication implements CommandLineRunner {
     @Override
     public void run(String... strings) throws Exception {
         try {
-            Tools tools = new Tools("application.properties");
-            String environment = tools.getValue("spring.profiles.active");
-            //预先加载基础的对照数据
-            basicDataLoader.loadAllData();
-            switch (environment){
+            switch (active){
                 case "dev":
                     devInit();
                     break;
@@ -48,4 +48,8 @@ public class SystemParamKeys {
     public static final String ENABLED_WHITE_IP = "enabled.white.ip";
     public static final String ENABLED_FILTER_AUTHORITY = "enabled.filter.authority";
+
+    public static final String URL_HTTP_WVP_PLAY = "url.http.wvp.play";
+
+    public static final String TOKEN_HTTP_WVP = "token.http.wvp";
 }
+package com.bsth.config;
+
+import io.minio.MinioClient;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class MinioConfig {
+
+    /**
+     * 访问地址
+     */
+    @Value("${minio.url}")
+    private String endpoint;
+
+    /**
+     * accessKey类似于用户ID，用于唯一标识你的账户
+     */
+    @Value("${minio.accessKey}")
+    private String accessKey;
+
+    /**
+     * secretKey是你账户的密码
+     */
+    @Value("${minio.secretKey}")
+    private String secretKey;
+
+    @Bean
+    public MinioClient minioClient() {
+        MinioClient minioClient = MinioClient.builder()
+                .endpoint(endpoint)
+                .credentials(accessKey, secretKey)
+                .build();
+
+        return minioClient;
+    }
+}
+package com.bsth.config;
+
+import org.springframework.amqp.support.converter.Jackson2JsonMessageConverter;
+import org.springframework.amqp.support.converter.MessageConverter;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @author hill
+ * @date
+ */
+@Configuration
+public class RabbitConfig {
+
+    /**
+     * 报警队列名(调度系统)
+     */
+    public final static String QUEUE_ALARM_SCHEDULE = "schedule";
+
+    @Bean
+    public MessageConverter messageConverter(){
+        return new Jackson2JsonMessageConverter();
+    }
+}
+
+
+package com.bsth.controller;
+
+import com.bsth.common.ResponseCode;
+import com.bsth.data.SystemParamCache;
+import com.bsth.util.HttpClientUtils;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.*;
+
+@RestController
+@RequestMapping("dvr")
+public class DvrController {
+
+    private final static Logger log = LoggerFactory.getLogger(DvrController.class);
+
+    @Autowired
+    private ObjectMapper mapper;
+
+    @RequestMapping(value = "/jt1078")
+    public Map<String, Object> jt1078(@RequestParam("sim") String sim, @RequestParam("channel") int channel) {
+        Map<String, Object> result = new HashMap<>();
+        result.put("status", ResponseCode.ERROR);
+        result.put("msg", "未获取到视频播放地址");
+        try {
+            if (StringUtils.isEmpty(sim)) {
+                result.put("msg", "sim为空");
+                throw new IllegalArgumentException("无效的sim");
+            }
+            if (channel < 1 || channel > 10) {
+                result.put("msg", "无效的通道号");
+                throw new IllegalArgumentException("无效的通道号");
+            }
+            sim = sim.replaceAll("^0*", "");
+            String url = SystemParamCache.getUrlHttpWvpPlay();
+            url = String.format(url, sim, channel);
+            Map<String, Object> header = new HashMap<>();
+            header.put("access-token", SystemParamCache.getTokenHttpWvp());
+            StringBuilder sb = HttpClientUtils.post(url, "{}", header);
+            if (sb != null) {
+                Map<String, Object> response = mapper.readValue(sb.toString(), Map.class);
+                if ((Integer) response.get("code") == 0) {
+                    Map<String, Object> data = mapper.readValue(mapper.writeValueAsString(response.get("data")), Map.class);
+                    result.put("status", ResponseCode.SUCCESS);
+                    result.put("data", data);
+                }
+                result.put("msg", response.get("msg"));
+            }
+        } catch (Exception e) {
+            result.put("status", ResponseCode.ERROR);
+            if (result.get("msg") == null) {
+                result.put("msg", "捕获到异常,检查日志信息");
+            }
+            log.error(e.getMessage(), e);
+        }
+
+        return result;
+    }
+}
+package com.bsth.controller.alaram;
+
+import com.bsth.common.ResponseCode;
+import com.bsth.message.entity.AlarmADASVo;
+import com.bsth.service.alarm.AlarmAdasService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.*;
+
+@RestController
+@RequestMapping("alarm_adas")
+public class AlarmAdasController {
+
+    private final static Logger log = LoggerFactory.getLogger(AlarmAdasController.class);
+
+    @Autowired
+    private AlarmAdasService alarmAdasService;
+
+    @RequestMapping(value = "/list")
+    public Map<String, Object> list(@RequestParam Map<String, String> param,
+                                    @RequestParam(defaultValue = "0") int page,
+                                    @RequestParam(defaultValue = "15") int size,
+                                    @RequestParam(defaultValue = "timestamp") String order,
+                                    @RequestParam(defaultValue = "0") int direction) {
+        Map<String, Object> result = new HashMap<>();
+        try {
+            List<AlarmADASVo> alarmADASVoList = alarmAdasService.list(param, page, size, order, direction);
+            Collections.sort(alarmADASVoList, new Comparator<AlarmADASVo>() {
+                @Override
+                public int compare(AlarmADASVo o1, AlarmADASVo o2) {
+                    return (int) (o2.getAlarmTimeBegin() - o1.getAlarmTimeBegin());
+                }
+            });
+            int total = alarmADASVoList.size(), start = page * size, end = start + size;
+            if (end > total) {
+                end = total;
+            }
+            result.put("list", alarmADASVoList.subList(start, end));
+            result.put("totalPages", total % size == 0 ? total / size - 1 : total / size);
+            result.put("page", page);
+            result.put("status", ResponseCode.SUCCESS);
+        } catch (Exception e) {
+            result.put("status", ResponseCode.ERROR);
+            log.error(e.getMessage(), e);
+        }
+
+        return result;
+    }
+}
+package com.bsth.controller.alaram;
+
+import com.bsth.common.ResponseCode;
+import com.bsth.message.entity.AlarmDSMVo;
+import com.bsth.service.alarm.AlarmDsmService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.*;
+
+@RestController
+@RequestMapping("alarm_dsm")
+public class AlarmDsmController {
+
+    private final static Logger log = LoggerFactory.getLogger(AlarmDsmController.class);
+
+    @Autowired
+    private AlarmDsmService alarmDsmService;
+
+    @RequestMapping(value = "/list")
+    public Map<String, Object> list(@RequestParam Map<String, String> param,
+                                    @RequestParam(defaultValue = "0") int page,
+                                    @RequestParam(defaultValue = "15") int size,
+                                    @RequestParam(defaultValue = "timestamp") String order,
+                                    @RequestParam(defaultValue = "0") int direction) {
+        Map<String, Object> result = new HashMap<>();
+        try {
+            List<AlarmDSMVo> alarmDSMVoList = alarmDsmService.list(param, page, size, order, direction);
+            Collections.sort(alarmDSMVoList, new Comparator<AlarmDSMVo>() {
+                @Override
+                public int compare(AlarmDSMVo o1, AlarmDSMVo o2) {
+                    return (int) (o2.getAlarmTimeBegin() - o1.getAlarmTimeBegin());
+                }
+            });
+            int total = alarmDSMVoList.size(), start = page * size, end = start + size;
+            if (end > total) {
+                end = total;
+            }
+            result.put("list", alarmDSMVoList.subList(start, end));
+            result.put("totalPages", total % size == 0 ? total / size - 1 : total / size);
+            result.put("page", page);
+            result.put("status", ResponseCode.SUCCESS);
+        } catch (Exception e) {
+            result.put("status", ResponseCode.ERROR);
+            log.error(e.getMessage(), e);
+        }
+
+        return result;
+    }
+}
@@ -87,6 +87,7 @@ public class ServiceDataInterface {
             if (null == sch)
                 continue;
             map = new HashMap<>();
+            map.put("id", sch.getId());
             map.put("clZbh", sch.getClZbh());
             map.put("jGh", sch.getjGh());
             map.put("jName", sch.getjName());
@@ -17,6 +17,7 @@ import com.bsth.repository.*;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.BeanPropertyRowMapper;
 import org.springframework.jdbc.core.JdbcTemplate;
@@ -58,6 +59,9 @@ public class BasicData {
     //车辆自编号和牌照号对照 （K: 车辆自编号 ，V：牌照号）
     public static Map<String, String> nbbmCompanyPlateMap;
+    //车辆自编号和sim号对照 （K：车辆自编号 V: sim号）
+    public static Map<String, String> nbbm2SimMap;
+
     //站点编码和名称对照，包括停车场 （K: lineCode_updown_stationCode ，V：站点名称）
     public static Map<String, String> stationCode2NameMap;
@@ -121,7 +125,7 @@ public class BasicData {
     }*/
     @Component
-    public static class BasicDataLoader extends Thread {
+    public static class BasicDataLoader extends Thread implements InitializingBean {
         @Autowired
         CarsRepository carsRepository;
@@ -164,6 +168,11 @@ public class BasicData {
             loadAllData();
         }
+        @Override
+        public void afterPropertiesSet() throws Exception {
+            loadAllData();
+        }
+
         /**
          * @Title: loadAllData
          * @Description: TODO(加载所有数据)
@@ -225,9 +234,10 @@ public class BasicData {
             Map<String, String> nbbm2CompanyCode = new HashMap<>();
             //车辆和分公司代码对照
             Map<String, String> nbbm2FgsCompanyCode = new HashMap<>();
-            
             //车辆自编号和拍照号对照
             Map<String, String> nbbmCompanyPlate = new HashMap<>();
+            // 车辆自编号和sim对照
+            Map<String, String> nbbm2Sim = new HashMap<>();
             Iterator<Cars> carIterator = carsRepository.findAll().iterator();
             Cars car;
@@ -237,12 +247,14 @@ public class BasicData {
                 nbbm2CompanyCode.put(car.getInsideCode(), car.getBusinessCode());
                 nbbm2FgsCompanyCode.put(car.getInsideCode(), car.getBrancheCompanyCode() + "_" + car.getBusinessCode() );
                 nbbmCompanyPlate.put(car.getInsideCode(), car.getCarPlate());
+                nbbm2Sim.put(car.getInsideCode(), car.getSim());
             }
             deviceId2NbbmMap = deviceId2Nbbm;
             nbbm2CompanyCodeMap = nbbm2CompanyCode;
             nbbm2FgsCompanyCodeMap = nbbm2FgsCompanyCode;
-            nbbmCompanyPlateMap =nbbmCompanyPlate;
+            nbbmCompanyPlateMap = nbbmCompanyPlate;
+            nbbm2SimMap = nbbm2Sim;
         }
         /**
@@ -105,6 +105,14 @@ public class SystemParamCache implements InitializingBean {
         return Boolean.parseBoolean(systemParamService1.getValue(SystemParamKeys.ENABLED_FILTER_AUTHORITY));
     }
+    public static String getUrlHttpWvpPlay() {
+        return systemParamService1.getValue(SystemParamKeys.URL_HTTP_WVP_PLAY);
+    }
+
+    public static String getTokenHttpWvp() {
+        return systemParamService1.getValue(SystemParamKeys.TOKEN_HTTP_WVP);
+    }
+
     @Override
     public void afterPropertiesSet() throws Exception {
         systemParamService1 = systemParamService;
+package com.bsth.data.alarm;
+
+import com.bsth.message.entity.AlarmADASVo;
+import com.bsth.message.entity.AlarmDSMVo;
+import com.bsth.message.entity.AlarmVo;
+import com.bsth.websocket.handler.SendUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.stereotype.Component;
+
+import java.util.HashSet;
+import java.util.Set;
+
+@Component
+public class AlarmCenter implements ApplicationContextAware {
+
+    private static Set<AlarmDSMVo> dsmVoSet = new HashSet<>();
+
+    private static Set<AlarmADASVo> adasVoSet = new HashSet<>();
+
+    private static SendUtils sendUtils;
+
+    private static Logger logger = LoggerFactory.getLogger(AlarmCenter.class);
+
+    public static void put(AlarmVo alarmVo){
+        if (alarmVo instanceof AlarmDSMVo) {
+            dsmVoSet.add((AlarmDSMVo) alarmVo);
+            sendUtils.sendAlarm(alarmVo);
+        } else if (alarmVo instanceof AlarmADASVo) {
+            adasVoSet.add((AlarmADASVo) alarmVo);
+            sendUtils.sendAlarm(alarmVo);
+        }
+    }
+
+    public static Set<AlarmDSMVo> findAllDsm(){
+        return new HashSet<>(dsmVoSet);
+    }
+
+    public static Set<AlarmADASVo> findAllAdas(){
+        return new HashSet<>(adasVoSet);
+    }
+
+    public static void clear(){
+        dsmVoSet.clear();
+        adasVoSet.clear();
+        logger.info("清除报警数据...");
+    }
+
+    @Override
+    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+        sendUtils = applicationContext.getBean(SendUtils.class);
+    }
+}
@@ -123,6 +123,11 @@ public class GpsEntity implements Cloneable{
 	 */
 	private int inOrOutStation;
+	/**
+	 * sim号
+	 */
+	private String sim;
+
 	public Object clone() {
 		try {
 			return super.clone();
@@ -431,4 +436,12 @@ public class GpsEntity implements Cloneable{
 	public void setInOrOutStation(int inOrOutStation) {
 		this.inOrOutStation = inOrOutStation;
 	}
+
+	public String getSim() {
+		return sim;
+	}
+
+	public void setSim(String sim) {
+		this.sim = sim;
+	}
 }
-package com.bsth.data.gpsdata_v2.handlers;
-
-import com.bsth.data.gpsdata_v2.entity.GpsEntity;
-import com.bsth.data.gpsdata_v2.status_manager.GpsStatusManager;
-import com.bsth.data.schedule.DayOfSchedule;
-import com.bsth.entity.realcontrol.ScheduleRealInfo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-
-/**
- * GPS 状态处理
- * Created by panzhao on 2017/11/15.
- */
-@Component
-public class GpsStateProcess {
-
-    @Autowired
-    DayOfSchedule dayOfSchedule;
-
-    @Autowired
-    GpsStatusManager gpsStatusManager;
-
-    /**
-     * 设置状态差异连续次数
-     */
-    private static ConcurrentMap<String, Integer> stateDiffMap = new ConcurrentHashMap<>();
-
-    private final static int CHANGE_THRESHOLD = 2;
-
-    public void process(GpsEntity gps) {
-        //在执行的任务
-        ScheduleRealInfo sch = dayOfSchedule.executeCurr(gps.getNbbm());
-
-        if (null == sch)
-            return;
-
-        int upDown = Integer.parseInt(sch.getXlDir());
-        int schState = dayOfSchedule.emptyService(sch)?1:0;
-        String device = gps.getDeviceId();
-        /**
-         * 网关在进终点的时候，会直接将当前点位状态改变
-         * 为避免出现单个点的状态跳动，设置一下切换阈值
-         */
-        if(gps.getState() != schState || gps.getUpDown() != upDown){
-            Integer count = 0;
-            if(stateDiffMap.containsKey(device))
-                count = stateDiffMap.get(device);
-
-            count ++;
-
-            if(count >= CHANGE_THRESHOLD){
-                //下发指令纠正车载的 营运状态 和 走向
-                gpsStatusManager.changeServiceState(gps.getNbbm(), upDown, schState, "同步@系统");
-                count = 0;
-            }
-
-            stateDiffMap.put(device, count);
-
-            //记录原始设备状态
-            gps.setOrigStateStr(gps.getUpDown() + "_" + gps.getState());
-        }
-        else
-            stateDiffMap.put(device, 0);
-
-        if (gps.getUpDown() != upDown) {
-            gps.setUpDown((byte) upDown);//修正走向
-        }
-
-        if(gps.getState() != schState){
-            gps.setState(schState);//修正营运状态
-        }
-
-        if (!sch.getXlBm().equals(gps.getLineId())) {
-            //切换车载的 线路编码
-            gpsStatusManager.changeLine(gps.getNbbm(), sch.getXlBm(), "同步@系统");
-        }
-    }
-}
+package com.bsth.data.gpsdata_v2.handlers;
+
+import com.bsth.data.gpsdata_v2.entity.GpsEntity;
+import com.bsth.data.gpsdata_v2.status_manager.GpsStatusManager;
+import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
+/**
+ * GPS 状态处理
+ * Created by panzhao on 2017/11/15.
+ */
+@Component
+public class GpsStateProcess {
+
+    @Autowired
+    DayOfSchedule dayOfSchedule;
+
+    @Autowired
+    GpsStatusManager gpsStatusManager;
+
+    /**
+     * 设置状态差异连续次数
+     */
+    private static ConcurrentMap<String, Integer> stateDiffMap = new ConcurrentHashMap<>();
+
+    private final static int CHANGE_THRESHOLD = 2;
+
+    public void process(GpsEntity gps) {
+        //在执行的任务
+        ScheduleRealInfo sch = dayOfSchedule.executeCurr(gps.getNbbm());
+
+        if (null == sch)
+            return;
+
+        int upDown = Integer.parseInt(sch.getXlDir());
+        int schState = dayOfSchedule.emptyService(sch)?1:0;
+        String device = gps.getDeviceId();
+        /**
+         * 网关在进终点的时候，会直接将当前点位状态改变
+         * 为避免出现单个点的状态跳动，设置一下切换阈值
+         */
+        if(gps.getState() != schState || gps.getUpDown() != upDown){
+            Integer count = 0;
+            if(stateDiffMap.containsKey(device))
+                count = stateDiffMap.get(device);
+
+            count ++;
+
+            if(count >= CHANGE_THRESHOLD){
+                //下发指令纠正车载的 营运状态 和 走向
+                gpsStatusManager.changeServiceState(gps.getNbbm(), upDown, schState, "同步@系统");
+                count = 0;
+            }
+
+            stateDiffMap.put(device, count);
+
+            //记录原始设备状态
+            gps.setOrigStateStr(gps.getUpDown() + "_" + gps.getState());
+        }
+        else
+            stateDiffMap.put(device, 0);
+
+//        if (gps.getUpDown() != upDown) {
+//            gps.setUpDown((byte) upDown);//修正走向
+//        }
+
+        if(gps.getState() != schState){
+            gps.setState(schState);//修正营运状态
+        }
+
+        if (!sch.getXlBm().equals(gps.getLineId())) {
+            //切换车载的 线路编码
+            gpsStatusManager.changeLine(gps.getNbbm(), sch.getXlBm(), "同步@系统");
+        }
+    }
+}
@@ -5,7 +5,6 @@ import com.bsth.data.gpsdata_v2.cache.GpsCacheData;
 import com.bsth.data.gpsdata_v2.entity.GpsEntity;
 import com.bsth.data.gpsdata_v2.entity.StationRoute;
 import com.bsth.data.gpsdata_v2.utils.GeoUtils;
-import com.bsth.entity.Station;
 import org.springframework.stereotype.Component;
 import java.util.List;
@@ -52,9 +51,9 @@ public class StationInsideProcess {
                 gps.setPremiseCode(prev.getPremiseCode());
             //在场，站外
-            if (gps.getInstation() == 0) {
-                gps.setStopNo(prev.getStopNo());//继承上一个点的站点编码
-            }
+//            if (gps.getInstation() == 0) {
+//                gps.setStopNo(prev.getStopNo());//继承上一个点的站点编码
+//            }
         }
     }
 }
@@ -71,7 +71,7 @@ public class GatewayHttpLoader implements ApplicationContextAware, InitializingB
             list = GpsDataUtils.clearInvalid(list);
             List<GpsEntity> ups = new ArrayList<>();
-            String nbbm;
+            String nbbm, sim;
             for (GpsEntity gps : list) {
                 if (StringUtils.isBlank(gps.getDeviceId()))
                     continue;
@@ -80,6 +80,10 @@ public class GatewayHttpLoader implements ApplicationContextAware, InitializingB
                     continue;
                 nbbm = BasicData.deviceId2NbbmMap.get(gps.getDeviceId());
+                if (!StringUtils.isBlank(nbbm)) {
+                    sim = BasicData.nbbm2SimMap.get(nbbm);
+                    gps.setSim(sim);
+                }
                 gps.setNbbm(nbbm);
                 ups.add(gps);
             }
-package com.bsth.data.safe_driv;
-
-import com.bsth.websocket.handler.SendUtils;
-import org.joda.time.format.DateTimeFormat;
-import org.joda.time.format.DateTimeFormatter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
-import org.springframework.stereotype.Component;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * 安全驾驶
- * Created by panzhao on 2017/4/6.
- */
-@Component
-public class SafeDrivCenter implements ApplicationContextAware {
-
-    private static Set<SafeDriv> data;
-
-    @Autowired
-    SafeDrivDataLoadThread safeDrivDataLoadThread;
-
-    static SendUtils sendUtils;
-
-    /**
-     * 车辆自编号 和 最新一条数据对照
-     */
-    private static Map<String, SafeDriv> safeMap;
-
-    static Logger logger = LoggerFactory.getLogger(SafeDrivCenter.class);
-
-    static {
-        data = new HashSet<>();
-        safeMap = new HashMap<>();
-    }
-
-    private static DateTimeFormatter fmt = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss.SSS");
-    public static void put(SafeDriv sd){
-        sd.setTs(fmt.parseMillis(sd.getStartime()));
-        if(Integer.parseInt(sd.getYczltype()) == 5 && Integer.parseInt(sd.getJctype()) == 4
-                || Integer.parseInt(sd.getYczltype()) == 6 && Integer.parseInt(sd.getJctype()) == 4)
-            sd.setJctype("B" +  sd.getJctype());
-        else if(sd.getYczltype().indexOf("A") == -1)
-            sd.setYczltype("A" + sd.getYczltype());
-
-        //SafeDriv old = safeMap.get(sd.getClzbh());
-        if(!data.contains(sd)){
-            //通知客户端
-            sendUtils.sendSafeDriv(sd);
-            data.add(sd);
-            safeMap.put(sd.getClzbh(), sd);
-        }
-    }
-
-    public static Set<SafeDriv> findAll(){
-        return data;
-    }
-
-    public static void clear(){
-        data = new HashSet<>();
-        safeMap = new HashMap<>();
-        logger.info("清除安全驾驶数据，，，");
-    }
-
-    @Override
-    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
-        sendUtils = applicationContext.getBean(SendUtils.class);
-    }
-}
+package com.bsth.data.safe_driv;
+
+import com.bsth.websocket.handler.SendUtils;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * 安全驾驶
+ * Created by panzhao on 2017/4/6.
+ */
+@Component
+public class SafeDrivCenter implements ApplicationContextAware {
+
+    private static Set<SafeDriv> data;
+
+    @Autowired
+    SafeDrivDataLoadThread safeDrivDataLoadThread;
+
+    static SendUtils sendUtils;
+
+    /**
+     * 车辆自编号 和 最新一条数据对照
+     */
+    private static Map<String, SafeDriv> safeMap;
+
+    static Logger logger = LoggerFactory.getLogger(SafeDrivCenter.class);
+
+    static {
+        data = new HashSet<>();
+        safeMap = new HashMap<>();
+    }
+
+    private static DateTimeFormatter fmt = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss.SSS");
+    public static void put(SafeDriv sd){
+        sd.setTs(fmt.parseMillis(sd.getStartime()));
+        if(Integer.parseInt(sd.getYczltype()) == 5 && Integer.parseInt(sd.getJctype()) == 4
+                || Integer.parseInt(sd.getYczltype()) == 6 && Integer.parseInt(sd.getJctype()) == 4)
+            sd.setJctype("B" +  sd.getJctype());
+        else if(sd.getYczltype().indexOf("A") == -1)
+            sd.setYczltype("A" + sd.getYczltype());
+
+        //SafeDriv old = safeMap.get(sd.getClzbh());
+        if(!data.contains(sd)){
+            //通知客户端
+            sendUtils.sendSafeDriv(sd);
+            data.add(sd);
+            safeMap.put(sd.getClzbh(), sd);
+        }
+    }
+
+    public static Set<SafeDriv> findAll(){
+        return data;
+    }
+
+    public static void clear(){
+        data = new HashSet<>();
+        safeMap = new HashMap<>();
+        logger.info("清除安全驾驶数据...");
+    }
+
+    @Override
+    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+        sendUtils = applicationContext.getBean(SendUtils.class);
+    }
+}
 package com.bsth.data.schedule.thread;
+import com.bsth.data.alarm.AlarmCenter;
 import com.bsth.data.directive.DayOfDirectives;
 import com.bsth.data.gpsdata_v2.handlers.overspeed.OverspeedProcess;
 import com.bsth.data.gpsdata_v2.thread.GpsDataLoaderThread;
@@ -84,6 +85,8 @@ public class CalcOilThread extends Thread{
         dayOfDirectives.clearAll();
         //清除安全驾驶数据
         SafeDrivCenter.clear();
+        //清除报警数据
+        AlarmCenter.clear();
         //清除保养计划数据
         MtPlanCenter.clear();
         //清除超速缓存数据
-package com.bsth.entity;
-
-import com.bsth.entity.schedule.BEntity;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import org.hibernate.annotations.Formula;
-
-import javax.persistence.*;
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 
- * @ClassName : Cars(车实体类)
- * 
- * @Author : bsth@lq
- * 
- * @Description : TODO(车辆基本信息)
- * 
- * @Data : 2016-04-27
- *
- * @Version 公交调度系统BS版 0.1
- * 
- */
-
-@Entity
-@Table(name = "bsth_c_cars")
-@JsonIgnoreProperties(value={"hibernateLazyInitializer","handler","fieldHandler"})
-public class Cars extends BEntity implements Serializable {
-	
-	/** 主键Id */
-	@Id
-	@GeneratedValue(strategy = GenerationType.IDENTITY)
-	private Integer id;
-
-    /** 自编号/内部编号 */
-    @Column(nullable = false, length = 20, unique = true)
-    private String insideCode;
-
-    // 公司、分公司暂时不用关联实体
-    /** 公司代码 */
-    @Column(nullable = false)
-    private String businessCode;
-    /** 公司名称 */
-    @Column(nullable = false)
-    private String company;
-    /** 分公司编码 */
-    private String brancheCompanyCode;
-    /** 分公司 */
-    private String brancheCompany;
-
-    /** 组合公司分公司编码 */
-    @Formula(" concat(business_code, '_', branche_company_code) ")
-    private String cgsbm;
-
-    /** 车辆编码（TODO：在原系统里没有，这里暂时留着） */
-    @Column(nullable = false)
-	private String carCode;
-    /** 车牌号 */
-    @Column(nullable = false)
-	private String carPlate;
-    /** 供应商名称 */
-    @Column(nullable = false)
-    private String supplierName;
-    /** 设备终端号 */
-    @Column(nullable = false)
-    private String equipmentCode;
-    
-    // 以下信息来自总公司的业务系统，可能需要调用相关接口
-	/** 车型类别 */
-	private String carClass ;
-    /** 技术速度 */
-    private Double speed;
-    /** 座位数 */
-	private  Integer carSeatnNumber;
-	/** 载客标准 */
-	private String carStandard;
-    /** 标准油耗(开空调) */
-    private Double kburnStandard;
-    /** 标准油耗(关空调) */
-    private Double gburnStandard;
-    /** 报废号 */
-    private String scrapCode;
-    /** 报废日期 */
-    private Date scrapDate;
-    /** 厂牌型号1 */
-    private String makeCodeOne;
-    /** 厂牌型号2 */
-    private String makeCodeTwo;
-    /** 车辆等级标准 */
-    private String carGride;
-    /** 出厂排放标准 */
-    private String emissionsStandard;
-    /** 发动机号码1 */
-    private String engineCodeOne;
-    /** 发动机号码2 */
-    private String engineCodeTwo;
-    /** 车架号码1 */
-    private String carNumberOne;
-    /** 车架号码2 */
-    private String carNumberTwo;
-    /** 启用日期（2008-10-10）*/
-    private Date openDate;
-    /** 取消日期 */
-    private Date closeDate;
-
-	/** 是否空调车 */
-    @Column(nullable = true)
-    private Boolean hvacCar;
-	/** 有无人售票 */
-    @Column(nullable = true)
-	private Boolean ticketType;
-    /** 是否有LED服务屏 */
-    @Column(nullable = true)
-    private Boolean ledScreen;
-	/** 是否有TV视频 */
-    @Column(nullable = true)
-	private Boolean tvVideoType;
-
-	/** 车辆类型 */
-	private String carType;
-    /** 是否机动车（机动车类型选择）*/
-    private String vehicleStats;
-    /** 营运状态 */
-    private String operatorsState;
-    /** 营运证编码 */
-    private String serviceNo;
-    /** 是否电车（TODO：在原系统里没有，这里暂时留着） */
-    private Boolean sfdc;
-    /** 是否混合动力（TODO：在原系统里没有，这里暂时留着） */
-    private Boolean sfmix;
-    /** 是否氢能源车 */
-    private Boolean hydrogen;
-    /** 备注/描述 */
-    private String descriptions;
-
-	/** 车辆序号（TODO：在原系统里没有，这里暂时留着） */
-	private String carOrdinal;
-	/** 视频编号 */
-	private String videoCode;
-	/** 是否报废 */
-    @Column(nullable = true)
-	private Boolean scrapState;
-	/** 是否切换（TODO：在原系统里没有，这里暂时留着）*/
-	private Integer isSwitch;
-    /** 线路名称（TODO：在原系统里没有，这里暂时留着，并且不做线路关联，只保留个名字） */
-    private String xlmc;
-
-    public Cars() {}
-
-    public Cars(Object id, Object nbbh, Object clbh, Object cph, Object sbbh) {
-        if (id != null) {
-            this.id = Integer.valueOf(id.toString());
-        }
-        if (nbbh != null) {
-            this.insideCode = nbbh.toString();
-        }
-        if (clbh != null) {
-            this.carCode = clbh.toString();
-        }
-        if (cph != null) {
-            this.carPlate = cph.toString();
-        }
-        if (sbbh != null) {
-            this.equipmentCode = sbbh.toString();
-        }
-    }
-	
-    public String getServiceNo() {
-		return serviceNo;
-	}
-
-	public void setServiceNo(String serviceNo) {
-		this.serviceNo = serviceNo;
-	}
-
-	public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getInsideCode() {
-        return insideCode;
-    }
-
-    public void setInsideCode(String insideCode) {
-        this.insideCode = insideCode;
-    }
-
-    public String getBusinessCode() {
-        return businessCode;
-    }
-
-    public void setBusinessCode(String businessCode) {
-        this.businessCode = businessCode;
-    }
-
-    public String getCompany() {
-        return company;
-    }
-
-    public void setCompany(String company) {
-        this.company = company;
-    }
-
-    public String getBrancheCompanyCode() {
-        return brancheCompanyCode;
-    }
-
-    public void setBrancheCompanyCode(String brancheCompanyCode) {
-        this.brancheCompanyCode = brancheCompanyCode;
-    }
-
-    public String getBrancheCompany() {
-        return brancheCompany;
-    }
-
-    public void setBrancheCompany(String brancheCompany) {
-        this.brancheCompany = brancheCompany;
-    }
-
-    public String getCarCode() {
-        return carCode;
-    }
-
-    public void setCarCode(String carCode) {
-        this.carCode = carCode;
-    }
-
-    public String getCarPlate() {
-        return carPlate;
-    }
-
-    public void setCarPlate(String carPlate) {
-        this.carPlate = carPlate;
-    }
-
-    public String getSupplierName() {
-        return supplierName;
-    }
-
-    public void setSupplierName(String supplierName) {
-        this.supplierName = supplierName;
-    }
-
-    public String getEquipmentCode() {
-        return equipmentCode;
-    }
-
-    public void setEquipmentCode(String equipmentCode) {
-        this.equipmentCode = equipmentCode;
-    }
-
-    public String getCarClass() {
-        return carClass;
-    }
-
-    public void setCarClass(String carClass) {
-        this.carClass = carClass;
-    }
-
-    public Double getSpeed() {
-        return speed;
-    }
-
-    public void setSpeed(Double speed) {
-        this.speed = speed;
-    }
-
-    public Integer getCarSeatnNumber() {
-        return carSeatnNumber;
-    }
-
-    public void setCarSeatnNumber(Integer carSeatnNumber) {
-        this.carSeatnNumber = carSeatnNumber;
-    }
-
-    public String getCarStandard() {
-        return carStandard;
-    }
-
-    public void setCarStandard(String carStandard) {
-        this.carStandard = carStandard;
-    }
-
-    public Double getKburnStandard() {
-        return kburnStandard;
-    }
-
-    public void setKburnStandard(Double kburnStandard) {
-        this.kburnStandard = kburnStandard;
-    }
-
-    public Double getGburnStandard() {
-        return gburnStandard;
-    }
-
-    public void setGburnStandard(Double gburnStandard) {
-        this.gburnStandard = gburnStandard;
-    }
-
-    public String getScrapCode() {
-        return scrapCode;
-    }
-
-    public void setScrapCode(String scrapCode) {
-        this.scrapCode = scrapCode;
-    }
-
-    public Date getScrapDate() {
-        return scrapDate;
-    }
-
-    public void setScrapDate(Date scrapDate) {
-        this.scrapDate = scrapDate;
-    }
-
-    public String getMakeCodeOne() {
-        return makeCodeOne;
-    }
-
-    public void setMakeCodeOne(String makeCodeOne) {
-        this.makeCodeOne = makeCodeOne;
-    }
-
-    public String getMakeCodeTwo() {
-        return makeCodeTwo;
-    }
-
-    public void setMakeCodeTwo(String makeCodeTwo) {
-        this.makeCodeTwo = makeCodeTwo;
-    }
-
-    public String getCarGride() {
-        return carGride;
-    }
-
-    public void setCarGride(String carGride) {
-        this.carGride = carGride;
-    }
-
-    public String getEmissionsStandard() {
-        return emissionsStandard;
-    }
-
-    public void setEmissionsStandard(String emissionsStandard) {
-        this.emissionsStandard = emissionsStandard;
-    }
-
-    public String getEngineCodeOne() {
-        return engineCodeOne;
-    }
-
-    public void setEngineCodeOne(String engineCodeOne) {
-        this.engineCodeOne = engineCodeOne;
-    }
-
-    public String getEngineCodeTwo() {
-        return engineCodeTwo;
-    }
-
-    public void setEngineCodeTwo(String engineCodeTwo) {
-        this.engineCodeTwo = engineCodeTwo;
-    }
-
-    public String getCarNumberOne() {
-        return carNumberOne;
-    }
-
-    public void setCarNumberOne(String carNumberOne) {
-        this.carNumberOne = carNumberOne;
-    }
-
-    public String getCarNumberTwo() {
-        return carNumberTwo;
-    }
-
-    public void setCarNumberTwo(String carNumberTwo) {
-        this.carNumberTwo = carNumberTwo;
-    }
-
-    public Date getOpenDate() {
-        return openDate;
-    }
-
-    public void setOpenDate(Date openDate) {
-        this.openDate = openDate;
-    }
-
-    public Date getCloseDate() {
-        return closeDate;
-    }
-
-    public void setCloseDate(Date closeDate) {
-        this.closeDate = closeDate;
-    }
-
-    public Boolean getHvacCar() {
-        return hvacCar;
-    }
-
-    public void setHvacCar(Boolean hvacCar) {
-        this.hvacCar = hvacCar;
-    }
-
-    public Boolean getTicketType() {
-        return ticketType;
-    }
-
-    public void setTicketType(Boolean ticketType) {
-        this.ticketType = ticketType;
-    }
-
-    public Boolean getLedScreen() {
-        return ledScreen;
-    }
-
-    public void setLedScreen(Boolean ledScreen) {
-        this.ledScreen = ledScreen;
-    }
-
-    public Boolean getTvVideoType() {
-        return tvVideoType;
-    }
-
-    public void setTvVideoType(Boolean tvVideoType) {
-        this.tvVideoType = tvVideoType;
-    }
-
-    public String getCarType() {
-        return carType;
-    }
-
-    public void setCarType(String carType) {
-        this.carType = carType;
-    }
-
-    public String getVehicleStats() {
-        return vehicleStats;
-    }
-
-    public void setVehicleStats(String vehicleStats) {
-        this.vehicleStats = vehicleStats;
-    }
-
-    public String getOperatorsState() {
-        return operatorsState;
-    }
-
-    public void setOperatorsState(String operatorsState) {
-        this.operatorsState = operatorsState;
-    }
-
-    public Boolean getSfdc() {
-        return sfdc;
-    }
-
-    public void setSfdc(Boolean sfdc) {
-        this.sfdc = sfdc;
-    }
-
-    public String getDescriptions() {
-        return descriptions;
-    }
-
-    public void setDescriptions(String descriptions) {
-        this.descriptions = descriptions;
-    }
-
-    public String getCarOrdinal() {
-        return carOrdinal;
-    }
-
-    public void setCarOrdinal(String carOrdinal) {
-        this.carOrdinal = carOrdinal;
-    }
-
-    public String getVideoCode() {
-        return videoCode;
-    }
-
-    public void setVideoCode(String videoCode) {
-        this.videoCode = videoCode;
-    }
-
-    public Boolean getScrapState() {
-        return scrapState;
-    }
-
-    public void setScrapState(Boolean scrapState) {
-        this.scrapState = scrapState;
-    }
-
-    public Integer getIsSwitch() {
-        return isSwitch;
-    }
-
-    public void setIsSwitch(Integer isSwitch) {
-        this.isSwitch = isSwitch;
-    }
-
-    public String getXlmc() {
-        return xlmc;
-    }
-
-    public void setXlmc(String xlmc) {
-        this.xlmc = xlmc;
-    }
-
-    public String getCgsbm() {
-        return cgsbm;
-    }
-
-    public void setCgsbm(String cgsbm) {
-        this.cgsbm = cgsbm;
-    }
-
-    public Boolean getSfmix() {
-        return sfmix;
-    }
-
-    public void setSfmix(Boolean sfmix) {
-        this.sfmix = sfmix;
-    }
-
-	public Boolean getHydrogen() {
-		return hydrogen;
-	}
-
-	public void setHydrogen(Boolean hydrogen) {
-		this.hydrogen = hydrogen;
-	}
-}
+package com.bsth.entity;
+
+import com.bsth.entity.schedule.BEntity;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import org.hibernate.annotations.Formula;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 
+ * @ClassName : Cars(车实体类)
+ * 
+ * @Author : bsth@lq
+ * 
+ * @Description : TODO(车辆基本信息)
+ * 
+ * @Data : 2016-04-27
+ *
+ * @Version 公交调度系统BS版 0.1
+ * 
+ */
+
+@Entity
+@Table(name = "bsth_c_cars")
+@JsonIgnoreProperties(value={"hibernateLazyInitializer","handler","fieldHandler"})
+public class Cars extends BEntity implements Serializable {
+	
+	/** 主键Id */
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	private Integer id;
+
+    /** 自编号/内部编号 */
+    @Column(nullable = false, length = 20, unique = true)
+    private String insideCode;
+
+    // 公司、分公司暂时不用关联实体
+    /** 公司代码 */
+    @Column(nullable = false)
+    private String businessCode;
+    /** 公司名称 */
+    @Column(nullable = false)
+    private String company;
+    /** 分公司编码 */
+    private String brancheCompanyCode;
+    /** 分公司 */
+    private String brancheCompany;
+
+    /** 组合公司分公司编码 */
+    @Formula(" concat(business_code, '_', branche_company_code) ")
+    private String cgsbm;
+
+    /** 车辆编码（TODO：在原系统里没有，这里暂时留着） */
+    @Column(nullable = false)
+	private String carCode;
+    /** 车牌号 */
+    @Column(nullable = false)
+	private String carPlate;
+    /** 供应商名称 */
+    @Column(nullable = false)
+    private String supplierName;
+    /** 设备终端号 */
+    @Column(nullable = false)
+    private String equipmentCode;
+    
+    // 以下信息来自总公司的业务系统，可能需要调用相关接口
+	/** 车型类别 */
+	private String carClass ;
+    /** 技术速度 */
+    private Double speed;
+    /** 座位数 */
+	private  Integer carSeatnNumber;
+	/** 载客标准 */
+	private String carStandard;
+    /** 标准油耗(开空调) */
+    private Double kburnStandard;
+    /** 标准油耗(关空调) */
+    private Double gburnStandard;
+    /** 报废号 */
+    private String scrapCode;
+    /** 报废日期 */
+    private Date scrapDate;
+    /** 厂牌型号1 */
+    private String makeCodeOne;
+    /** 厂牌型号2 */
+    private String makeCodeTwo;
+    /** 车辆等级标准 */
+    private String carGride;
+    /** 出厂排放标准 */
+    private String emissionsStandard;
+    /** 发动机号码1 */
+    private String engineCodeOne;
+    /** 发动机号码2 */
+    private String engineCodeTwo;
+    /** 车架号码1 */
+    private String carNumberOne;
+    /** 车架号码2 */
+    private String carNumberTwo;
+    /** 启用日期（2008-10-10）*/
+    private Date openDate;
+    /** 取消日期 */
+    private Date closeDate;
+
+	/** 是否空调车 */
+    @Column(nullable = true)
+    private Boolean hvacCar;
+	/** 有无人售票 */
+    @Column(nullable = true)
+	private Boolean ticketType;
+    /** 是否有LED服务屏 */
+    @Column(nullable = true)
+    private Boolean ledScreen;
+	/** 是否有TV视频 */
+    @Column(nullable = true)
+	private Boolean tvVideoType;
+
+	/** 车辆类型 */
+	private String carType;
+    /** 是否机动车（机动车类型选择）*/
+    private String vehicleStats;
+    /** 营运状态 */
+    private String operatorsState;
+    /** 营运证编码 */
+    private String serviceNo;
+    /** 是否电车（TODO：在原系统里没有，这里暂时留着） */
+    private Boolean sfdc;
+    /** 是否混合动力（TODO：在原系统里没有，这里暂时留着） */
+    private Boolean sfmix;
+    /** 是否氢能源车 */
+    private Boolean hydrogen;
+    /** 备注/描述 */
+    private String descriptions;
+
+	/** 车辆序号（TODO：在原系统里没有，这里暂时留着） */
+	private String carOrdinal;
+	/** 视频编号 */
+	private String videoCode;
+	/** 是否报废 */
+    @Column(nullable = true)
+	private Boolean scrapState;
+	/** 是否切换（TODO：在原系统里没有，这里暂时留着）*/
+	private Integer isSwitch;
+    /** 线路名称（TODO：在原系统里没有，这里暂时留着，并且不做线路关联，只保留个名字） */
+    private String xlmc;
+
+    /**
+     * 终端sim号
+     */
+    private String sim;
+
+    public Cars() {}
+
+    public Cars(Object id, Object nbbh, Object clbh, Object cph, Object sbbh) {
+        if (id != null) {
+            this.id = Integer.valueOf(id.toString());
+        }
+        if (nbbh != null) {
+            this.insideCode = nbbh.toString();
+        }
+        if (clbh != null) {
+            this.carCode = clbh.toString();
+        }
+        if (cph != null) {
+            this.carPlate = cph.toString();
+        }
+        if (sbbh != null) {
+            this.equipmentCode = sbbh.toString();
+        }
+    }
+	
+    public String getServiceNo() {
+		return serviceNo;
+	}
+
+	public void setServiceNo(String serviceNo) {
+		this.serviceNo = serviceNo;
+	}
+
+	public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getInsideCode() {
+        return insideCode;
+    }
+
+    public void setInsideCode(String insideCode) {
+        this.insideCode = insideCode;
+    }
+
+    public String getBusinessCode() {
+        return businessCode;
+    }
+
+    public void setBusinessCode(String businessCode) {
+        this.businessCode = businessCode;
+    }
+
+    public String getCompany() {
+        return company;
+    }
+
+    public void setCompany(String company) {
+        this.company = company;
+    }
+
+    public String getBrancheCompanyCode() {
+        return brancheCompanyCode;
+    }
+
+    public void setBrancheCompanyCode(String brancheCompanyCode) {
+        this.brancheCompanyCode = brancheCompanyCode;
+    }
+
+    public String getBrancheCompany() {
+        return brancheCompany;
+    }
+
+    public void setBrancheCompany(String brancheCompany) {
+        this.brancheCompany = brancheCompany;
+    }
+
+    public String getCarCode() {
+        return carCode;
+    }
+
+    public void setCarCode(String carCode) {
+        this.carCode = carCode;
+    }
+
+    public String getCarPlate() {
+        return carPlate;
+    }
+
+    public void setCarPlate(String carPlate) {
+        this.carPlate = carPlate;
+    }
+
+    public String getSupplierName() {
+        return supplierName;
+    }
+
+    public void setSupplierName(String supplierName) {
+        this.supplierName = supplierName;
+    }
+
+    public String getEquipmentCode() {
+        return equipmentCode;
+    }
+
+    public void setEquipmentCode(String equipmentCode) {
+        this.equipmentCode = equipmentCode;
+    }
+
+    public String getCarClass() {
+        return carClass;
+    }
+
+    public void setCarClass(String carClass) {
+        this.carClass = carClass;
+    }
+
+    public Double getSpeed() {
+        return speed;
+    }
+
+    public void setSpeed(Double speed) {
+        this.speed = speed;
+    }
+
+    public Integer getCarSeatnNumber() {
+        return carSeatnNumber;
+    }
+
+    public void setCarSeatnNumber(Integer carSeatnNumber) {
+        this.carSeatnNumber = carSeatnNumber;
+    }
+
+    public String getCarStandard() {
+        return carStandard;
+    }
+
+    public void setCarStandard(String carStandard) {
+        this.carStandard = carStandard;
+    }
+
+    public Double getKburnStandard() {
+        return kburnStandard;
+    }
+
+    public void setKburnStandard(Double kburnStandard) {
+        this.kburnStandard = kburnStandard;
+    }
+
+    public Double getGburnStandard() {
+        return gburnStandard;
+    }
+
+    public void setGburnStandard(Double gburnStandard) {
+        this.gburnStandard = gburnStandard;
+    }
+
+    public String getScrapCode() {
+        return scrapCode;
+    }
+
+    public void setScrapCode(String scrapCode) {
+        this.scrapCode = scrapCode;
+    }
+
+    public Date getScrapDate() {
+        return scrapDate;
+    }
+
+    public void setScrapDate(Date scrapDate) {
+        this.scrapDate = scrapDate;
+    }
+
+    public String getMakeCodeOne() {
+        return makeCodeOne;
+    }
+
+    public void setMakeCodeOne(String makeCodeOne) {
+        this.makeCodeOne = makeCodeOne;
+    }
+
+    public String getMakeCodeTwo() {
+        return makeCodeTwo;
+    }
+
+    public void setMakeCodeTwo(String makeCodeTwo) {
+        this.makeCodeTwo = makeCodeTwo;
+    }
+
+    public String getCarGride() {
+        return carGride;
+    }
+
+    public void setCarGride(String carGride) {
+        this.carGride = carGride;
+    }
+
+    public String getEmissionsStandard() {
+        return emissionsStandard;
+    }
+
+    public void setEmissionsStandard(String emissionsStandard) {
+        this.emissionsStandard = emissionsStandard;
+    }
+
+    public String getEngineCodeOne() {
+        return engineCodeOne;
+    }
+
+    public void setEngineCodeOne(String engineCodeOne) {
+        this.engineCodeOne = engineCodeOne;
+    }
+
+    public String getEngineCodeTwo() {
+        return engineCodeTwo;
+    }
+
+    public void setEngineCodeTwo(String engineCodeTwo) {
+        this.engineCodeTwo = engineCodeTwo;
+    }
+
+    public String getCarNumberOne() {
+        return carNumberOne;
+    }
+
+    public void setCarNumberOne(String carNumberOne) {
+        this.carNumberOne = carNumberOne;
+    }
+
+    public String getCarNumberTwo() {
+        return carNumberTwo;
+    }
+
+    public void setCarNumberTwo(String carNumberTwo) {
+        this.carNumberTwo = carNumberTwo;
+    }
+
+    public Date getOpenDate() {
+        return openDate;
+    }
+
+    public void setOpenDate(Date openDate) {
+        this.openDate = openDate;
+    }
+
+    public Date getCloseDate() {
+        return closeDate;
+    }
+
+    public void setCloseDate(Date closeDate) {
+        this.closeDate = closeDate;
+    }
+
+    public Boolean getHvacCar() {
+        return hvacCar;
+    }
+
+    public void setHvacCar(Boolean hvacCar) {
+        this.hvacCar = hvacCar;
+    }
+
+    public Boolean getTicketType() {
+        return ticketType;
+    }
+
+    public void setTicketType(Boolean ticketType) {
+        this.ticketType = ticketType;
+    }
+
+    public Boolean getLedScreen() {
+        return ledScreen;
+    }
+
+    public void setLedScreen(Boolean ledScreen) {
+        this.ledScreen = ledScreen;
+    }
+
+    public Boolean getTvVideoType() {
+        return tvVideoType;
+    }
+
+    public void setTvVideoType(Boolean tvVideoType) {
+        this.tvVideoType = tvVideoType;
+    }
+
+    public String getCarType() {
+        return carType;
+    }
+
+    public void setCarType(String carType) {
+        this.carType = carType;
+    }
+
+    public String getVehicleStats() {
+        return vehicleStats;
+    }
+
+    public void setVehicleStats(String vehicleStats) {
+        this.vehicleStats = vehicleStats;
+    }
+
+    public String getOperatorsState() {
+        return operatorsState;
+    }
+
+    public void setOperatorsState(String operatorsState) {
+        this.operatorsState = operatorsState;
+    }
+
+    public Boolean getSfdc() {
+        return sfdc;
+    }
+
+    public void setSfdc(Boolean sfdc) {
+        this.sfdc = sfdc;
+    }
+
+    public String getDescriptions() {
+        return descriptions;
+    }
+
+    public void setDescriptions(String descriptions) {
+        this.descriptions = descriptions;
+    }
+
+    public String getCarOrdinal() {
+        return carOrdinal;
+    }
+
+    public void setCarOrdinal(String carOrdinal) {
+        this.carOrdinal = carOrdinal;
+    }
+
+    public String getVideoCode() {
+        return videoCode;
+    }
+
+    public void setVideoCode(String videoCode) {
+        this.videoCode = videoCode;
+    }
+
+    public Boolean getScrapState() {
+        return scrapState;
+    }
+
+    public void setScrapState(Boolean scrapState) {
+        this.scrapState = scrapState;
+    }
+
+    public Integer getIsSwitch() {
+        return isSwitch;
+    }
+
+    public void setIsSwitch(Integer isSwitch) {
+        this.isSwitch = isSwitch;
+    }
+
+    public String getXlmc() {
+        return xlmc;
+    }
+
+    public void setXlmc(String xlmc) {
+        this.xlmc = xlmc;
+    }
+
+    public String getCgsbm() {
+        return cgsbm;
+    }
+
+    public void setCgsbm(String cgsbm) {
+        this.cgsbm = cgsbm;
+    }
+
+    public Boolean getSfmix() {
+        return sfmix;
+    }
+
+    public void setSfmix(Boolean sfmix) {
+        this.sfmix = sfmix;
+    }
+
+	public Boolean getHydrogen() {
+		return hydrogen;
+	}
+
+	public void setHydrogen(Boolean hydrogen) {
+		this.hydrogen = hydrogen;
+	}
+
+    public String getSim() {
+        return sim;
+    }
+
+    public void setSim(String sim) {
+        this.sim = sim;
+    }
+}
+package com.bsth.message.entity;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class AlarmADASVo implements AlarmVo {
+
+    private String clientId;
+
+    /**
+     * 车辆编码(内部编码)
+     */
+    private String vehicleCode;
+
+    /**
+     * 设备号
+     */
+    private String deviceId;
+
+    /**
+     * 车牌号
+     */
+    private String vehiclePlate;
+
+    /**
+     * 报警ID
+     */
+    private String alarmId;
+
+    /**
+     * 报警/事件类型
+     * 0x01：前向碰撞报警
+     * 0x02：车道偏离报警
+     * 0x03：车距过近报警
+     * 0x04：行人碰撞报警
+     * 0x05：频繁变道报警
+     * 0x06：道路标识超限报警
+     * 0x07：障碍物报警
+     * 0x08~0x0F：用户自定义
+     * 0x10：道路标志识别事件
+     * 0x11：主动抓拍事件
+     * 0x12~0x1F：用户自定义
+     */
+    private int type;
+
+    /**
+     * 报警级别
+     * 0x01 一级报警
+     * 0x02 二级报警
+     */
+    private int level;
+
+    /**
+     * 前车车速(Km/h)范围0~250,仅报警类型为1和2时有效
+     */
+    private int frontSpeed;
+
+    /**
+     * 前车/行人距离(100ms),范围0~100,仅报警类型为1、2和4时有效
+     */
+    private int frontDistance;
+
+    /**
+     * 偏离类型：1.左侧偏离 2.右侧偏离(报警类型为2时有效)
+     */
+    private int deviateType;
+
+    /**
+     * 道路标志识别类型：1.限速标志 2.限高标志 3.限重标志(报警类型为6和10时有效)
+     */
+    private int roadSign;
+
+    /**
+     * 道路标志识别数据
+     */
+    private int roadSignValue;
+
+    /**
+     * 车速
+     */
+    private int speed;
+
+    /**
+     * 高程
+     */
+    private int altitude;
+
+    /**
+     * 纬度
+     */
+    private int latitude;
+
+    /**
+     * 经度
+     */
+    private int longitude;
+
+    /**
+     * 日期时间(ms)
+     */
+    private long alarmTimeBegin;
+
+    /**
+     * 日期时间(ms)
+     */
+    private long alarmTimeEnd;
+
+    /**
+     * 车辆状态
+     */
+    private int statusBit;
+
+    /**
+     * 附件path
+     */
+    private List<String> paths = new ArrayList<>();
+
+    private String lineCode;
+
+    public String getClientId() {
+        return clientId;
+    }
+
+    public void setClientId(String clientId) {
+        this.clientId = clientId;
+    }
+
+    public String getVehicleCode() {
+        return vehicleCode;
+    }
+
+    public void setVehicleCode(String vehicleCode) {
+        this.vehicleCode = vehicleCode;
+    }
+
+    public String getDeviceId() {
+        return deviceId;
+    }
+
+    public void setDeviceId(String deviceId) {
+        this.deviceId = deviceId;
+    }
+
+    public String getVehiclePlate() {
+        return vehiclePlate;
+    }
+
+    public void setVehiclePlate(String vehiclePlate) {
+        this.vehiclePlate = vehiclePlate;
+    }
+
+    public String getAlarmId() {
+        return alarmId;
+    }
+
+    public void setAlarmId(String alarmId) {
+        this.alarmId = alarmId;
+    }
+
+    public int getType() {
+        return type;
+    }
+
+    public void setType(int type) {
+        this.type = type;
+    }
+
+    public int getLevel() {
+        return level;
+    }
+
+    public void setLevel(int level) {
+        this.level = level;
+    }
+
+    public int getFrontSpeed() {
+        return frontSpeed;
+    }
+
+    public void setFrontSpeed(int frontSpeed) {
+        this.frontSpeed = frontSpeed;
+    }
+
+    public int getFrontDistance() {
+        return frontDistance;
+    }
+
+    public void setFrontDistance(int frontDistance) {
+        this.frontDistance = frontDistance;
+    }
+
+    public int getDeviateType() {
+        return deviateType;
+    }
+
+    public void setDeviateType(int deviateType) {
+        this.deviateType = deviateType;
+    }
+
+    public int getRoadSign() {
+        return roadSign;
+    }
+
+    public void setRoadSign(int roadSign) {
+        this.roadSign = roadSign;
+    }
+
+    public int getRoadSignValue() {
+        return roadSignValue;
+    }
+
+    public void setRoadSignValue(int roadSignValue) {
+        this.roadSignValue = roadSignValue;
+    }
+
+    public int getSpeed() {
+        return speed;
+    }
+
+    public void setSpeed(int speed) {
+        this.speed = speed;
+    }
+
+    public int getAltitude() {
+        return altitude;
+    }
+
+    public void setAltitude(int altitude) {
+        this.altitude = altitude;
+    }
+
+    public int getLatitude() {
+        return latitude;
+    }
+
+    public void setLatitude(int latitude) {
+        this.latitude = latitude;
+    }
+
+    public int getLongitude() {
+        return longitude;
+    }
+
+    public void setLongitude(int longitude) {
+        this.longitude = longitude;
+    }
+
+    public long getAlarmTimeBegin() {
+        return alarmTimeBegin;
+    }
+
+    public void setAlarmTimeBegin(long alarmTimeBegin) {
+        this.alarmTimeBegin = alarmTimeBegin;
+    }
+
+    public long getAlarmTimeEnd() {
+        return alarmTimeEnd;
+    }
+
+    public void setAlarmTimeEnd(long alarmTimeEnd) {
+        this.alarmTimeEnd = alarmTimeEnd;
+    }
+
+    public int getStatusBit() {
+        return statusBit;
+    }
+
+    public void setStatusBit(int statusBit) {
+        this.statusBit = statusBit;
+    }
+
+    public List<String> getPaths() {
+        return paths;
+    }
+
+    public void setPaths(List<String> paths) {
+        this.paths = paths;
+    }
+
+    public String getAlarmType() {
+        return "adas";
+    }
+
+    public String getLineCode() {
+        return lineCode;
+    }
+
+    @Override
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
+    }
+
+    @Override
+    public int hashCode() {
+        return String.format("%s_%d_%d", this.clientId, this.alarmTimeBegin, this.type).hashCode();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        AlarmADASVo other = (AlarmADASVo) obj;
+
+        return this.clientId.equals(other.getClientId()) && this.alarmTimeBegin == other.getAlarmTimeBegin() && this.type == other.getType();
+    }
+
+    @Override
+    public String toString() {
+        return "AlarmADASVo{" +
+                "clientId='" + clientId + '\'' +
+                ", vehicleCode='" + vehicleCode + '\'' +
+                ", deviceId='" + deviceId + '\'' +
+                ", vehiclePlate='" + vehiclePlate + '\'' +
+                ", alarmId='" + alarmId + '\'' +
+                ", type=" + type +
+                ", level=" + level +
+                ", frontSpeed=" + frontSpeed +
+                ", frontDistance=" + frontDistance +
+                ", deviateType=" + deviateType +
+                ", roadSign=" + roadSign +
+                ", roadSignValue=" + roadSignValue +
+                ", speed=" + speed +
+                ", altitude=" + altitude +
+                ", latitude=" + latitude +
+                ", longitude=" + longitude +
+                ", alarmTimeBegin=" + alarmTimeBegin +
+                ", alarmTimeEnd=" + alarmTimeEnd +
+                ", statusBit=" + statusBit +
+                ", paths=" + paths +
+                '}';
+    }
+}
 \ No newline at end of file
+package com.bsth.message.entity;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class AlarmDSMVo implements AlarmVo {
+
+    private String clientId;
+
+    /**
+     * 车辆编码(内部编码)
+     */
+    private String vehicleCode;
+
+    /**
+     * 设备号
+     */
+    private String deviceId;
+
+    /**
+     * 车牌号
+     */
+    private String vehiclePlate;
+
+    /**
+     * 报警ID
+     */
+    private String alarmId;
+
+    /**
+     * 报警/事件类型
+     * 0x01:疲劳驾驶报警
+     * 0x02:接打电话报警
+     * 0x03:抽烟报警
+     * 0x04:分神驾驶报警
+     * 0x05:驾驶员异常报警
+     * 0x06~0x0F：用户自定义
+     * 0x10：自动抓拍事件
+     * 0x11：驾驶员变更事件
+     * 0x12~0x1F：用户自定义
+     */
+    private int type;
+
+    /**
+     * 报警级别
+     * 0x01 一级报警
+     * 0x02 二级报警
+     */
+    private int level;
+
+    /**
+     * 疲劳程度
+     */
+    private int fatigueDegree;
+
+    /**
+     * 预留
+     */
+    private int reserves;
+
+    /**
+     * 车速
+     */
+    private int speed;
+
+    /**
+     * 高程
+     */
+    private int altitude;
+
+    /**
+     * 纬度
+     */
+    private int latitude;
+
+    /**
+     * 经度
+     */
+    private int longitude;
+
+    /**
+     * 警报开始时间
+     */
+    private long alarmTimeBegin;
+
+    /**
+     * 警报结束时间
+     */
+    private long alarmTimeEnd;
+
+    /**
+     * 车辆状态
+     */
+    private int statusBit;
+
+    /**
+     * 附件path
+     */
+    private List<String> paths = new ArrayList<>();
+
+    private String lineCode;
+
+    public String getClientId() {
+        return clientId;
+    }
+
+    public void setClientId(String clientId) {
+        this.clientId = clientId;
+    }
+
+    public String getVehicleCode() {
+        return vehicleCode;
+    }
+
+    public void setVehicleCode(String vehicleCode) {
+        this.vehicleCode = vehicleCode;
+    }
+
+    public String getDeviceId() {
+        return deviceId;
+    }
+
+    public void setDeviceId(String deviceId) {
+        this.deviceId = deviceId;
+    }
+
+    public String getVehiclePlate() {
+        return vehiclePlate;
+    }
+
+    public void setVehiclePlate(String vehiclePlate) {
+        this.vehiclePlate = vehiclePlate;
+    }
+
+    public List<String> getPaths() {
+        return paths;
+    }
+
+    public void setPaths(List<String> paths) {
+        this.paths = paths;
+    }
+
+    public String getAlarmId() {
+        return alarmId;
+    }
+
+    public void setAlarmId(String alarmId) {
+        this.alarmId = alarmId;
+    }
+
+    public int getType() {
+        return type;
+    }
+
+    public void setType(int type) {
+        this.type = type;
+    }
+
+    public int getLevel() {
+        return level;
+    }
+
+    public void setLevel(int level) {
+        this.level = level;
+    }
+
+    public int getFatigueDegree() {
+        return fatigueDegree;
+    }
+
+    public void setFatigueDegree(int fatigueDegree) {
+        this.fatigueDegree = fatigueDegree;
+    }
+
+    public int getReserves() {
+        return reserves;
+    }
+
+    public void setReserves(int reserves) {
+        this.reserves = reserves;
+    }
+
+    public int getSpeed() {
+        return speed;
+    }
+
+    public void setSpeed(int speed) {
+        this.speed = speed;
+    }
+
+    public int getAltitude() {
+        return altitude;
+    }
+
+    public void setAltitude(int altitude) {
+        this.altitude = altitude;
+    }
+
+    public int getLatitude() {
+        return latitude;
+    }
+
+    public void setLatitude(int latitude) {
+        this.latitude = latitude;
+    }
+
+    public int getLongitude() {
+        return longitude;
+    }
+
+    public void setLongitude(int longitude) {
+        this.longitude = longitude;
+    }
+
+    public long getAlarmTimeBegin() {
+        return alarmTimeBegin;
+    }
+
+    public void setAlarmTimeBegin(long alarmTimeBegin) {
+        this.alarmTimeBegin = alarmTimeBegin;
+    }
+
+    public long getAlarmTimeEnd() {
+        return alarmTimeEnd;
+    }
+
+    public void setAlarmTimeEnd(long alarmTimeEnd) {
+        this.alarmTimeEnd = alarmTimeEnd;
+    }
+
+    public int getStatusBit() {
+        return statusBit;
+    }
+
+    public void setStatusBit(int statusBit) {
+        this.statusBit = statusBit;
+    }
+
+    public String getAlarmType() {
+        return "dsm";
+    }
+
+    public String getLineCode() {
+        return lineCode;
+    }
+
+    @Override
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
+    }
+
+    @Override
+    public int hashCode() {
+        return String.format("%s_%d_%d", this.clientId, this.alarmTimeBegin, this.type).hashCode();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        AlarmDSMVo other = (AlarmDSMVo) obj;
+
+        return this.clientId.equals(other.getClientId()) && this.alarmTimeBegin == other.getAlarmTimeBegin() && this.type == other.getType();
+    }
+
+    @Override
+    public String toString() {
+        return "AlarmDSMVo{" +
+                "clientId='" + clientId + '\'' +
+                ", vehicleCode='" + vehicleCode + '\'' +
+                ", deviceId='" + deviceId + '\'' +
+                ", vehiclePlate='" + vehiclePlate + '\'' +
+                ", alarmId='" + alarmId + '\'' +
+                ", type=" + type +
+                ", level=" + level +
+                ", fatigueDegree=" + fatigueDegree +
+                ", reserves=" + reserves +
+                ", speed=" + speed +
+                ", altitude=" + altitude +
+                ", latitude=" + latitude +
+                ", longitude=" + longitude +
+                ", alarmTimeBegin=" + alarmTimeBegin +
+                ", alarmTimeEnd=" + alarmTimeEnd +
+                ", statusBit=" + statusBit +
+                ", paths=" + paths +
+                '}';
+    }
+}
 \ No newline at end of file
+package com.bsth.message.entity;
+
+public interface AlarmVo {
+
+    String getVehicleCode();
+
+    String getAlarmType();
+
+    String getAlarmId();
+
+    String getLineCode();
+
+    void setLineCode(String lineCode);
+}
 package com.bsth.message.handler;
+import com.bsth.data.gpsdata_v2.GpsRealData;
 import com.bsth.message.buffer.CarEnergyBuffer;
-import com.bsth.message.entity.CarEnergy;
-import com.bsth.message.entity.CarErrorStop;
-import com.bsth.message.entity.InoutPark;
+import com.bsth.message.entity.*;
 import com.bsth.websocket.handler.SendUtils;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,7 +19,7 @@ import java.util.List;
  */
 @Component
 @ConditionalOnProperty("kafka.use")
-public class MessageHandler {
+public class KafkaMessageHandler {
     @Autowired
     private SendUtils sendUtils;
@@ -28,6 +27,9 @@ public class MessageHandler {
     @Autowired
     private ObjectMapper mapper;
+    @Autowired
+    GpsRealData gpsRealData;
+
     @KafkaListener(topics="schedule-main-carerrorstop")
     public void receivedCarErrorStop(Message<String> message) {
         try {
+package com.bsth.message.handler;
+
+import com.bsth.config.RabbitConfig;
+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;
+import org.springframework.amqp.rabbit.annotation.RabbitHandler;
+import org.springframework.amqp.rabbit.annotation.RabbitListener;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author Hill
+ */
+@Component
+@ConditionalOnProperty("rabbit.use")
+public class RabbitMessageHandler {
+
+    private final static Logger log = LoggerFactory.getLogger(RabbitMessageHandler.class);
+
+    @Autowired
+    private SendUtils sendUtils;
+
+    @Autowired
+    private ObjectMapper mapper;
+
+    @Autowired
+    GpsRealData gpsRealData;
+
+    @RabbitHandler
+    @RabbitListener(queues = RabbitConfig.QUEUE_ALARM_SCHEDULE)
+    public void onAlarmScheduleMessage(String message) {
+        try {
+            AlarmVo alarmVo = null;
+            Map<String, Object> data = mapper.readValue(message, mapper.getTypeFactory().constructMapType(HashMap.class, String.class, Object.class));
+            if ("dsm".equals(data.get("alarmType"))) {
+                alarmVo = mapper.readValue(message, AlarmDSMVo.class);
+            } else if ("adas".equals(data.get("alarmType"))) {
+                alarmVo = mapper.readValue(message, AlarmADASVo.class);
+            }
+            if (alarmVo != null) {
+                GpsEntity gps = gpsRealData.getByNbbm(alarmVo.getVehicleCode());
+                if (gps == null || gps.getLineId() == null) {
+                    alarmVo.setLineCode("249231");
+                } else {
+                    alarmVo.setLineCode(gps.getLineId());
+                }
+                AlarmCenter.put(alarmVo);
+            }
+        } catch (Exception e) {
+            log.error("报警监听异常,message: {}", message, e);
+        }
+    }
+}
+package com.bsth.service.alarm;
+
+import com.bsth.message.entity.AlarmADASVo;
+
+import java.util.List;
+import java.util.Map;
+
+public interface AlarmAdasService {
+
+    List<AlarmADASVo> list(Map<String, String> map, int page, int size, String order, int direction);
+}
+package com.bsth.service.alarm;
+
+import com.bsth.message.entity.AlarmDSMVo;
+
+import java.util.List;
+import java.util.Map;
+
+public interface AlarmDsmService {
+
+    List<AlarmDSMVo> list(Map<String, String> map, int page, int size, String order, int direction);
+}
+package com.bsth.service.alarm.impl;
+
+import com.bsth.data.alarm.AlarmCenter;
+import com.bsth.message.entity.AlarmADASVo;
+import com.bsth.service.alarm.AlarmAdasService;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class AlarmAdasServiceImpl implements AlarmAdasService {
+    @Override
+    public List<AlarmADASVo> list(Map<String, String> map, int page, int size, String order, int direction) {
+        List<AlarmADASVo> alarmAdasVoList = new ArrayList<>();
+        for (AlarmADASVo alarmADASVo : AlarmCenter.findAllAdas()) {
+            try {
+                if (filter(alarmADASVo, map)) {
+                    alarmAdasVoList.add(alarmADASVo);
+                }
+            } catch (NoSuchFieldException e) {
+                throw new RuntimeException(e);
+            } catch (IllegalAccessException e) {
+                throw new RuntimeException(e);
+            }
+        }
+
+        return alarmAdasVoList;
+    }
+
+    private boolean filter(Object obj, Map<String, String> param) throws NoSuchFieldException, IllegalAccessException {
+        boolean result = true;
+        ObjectMapper mapper = new ObjectMapper();
+        if (param.get("lines") != null) {
+            AlarmADASVo alarmADASVo = (AlarmADASVo) obj;
+            if (param.get("lines").toString().indexOf(String.format("%s,", alarmADASVo.getLineCode())) < 0) {
+                return false;
+            }
+
+            AlarmADASVo other = mapper.convertValue(param, AlarmADASVo.class);
+            Field[] fields = obj.getClass().getDeclaredFields();
+            for (Map.Entry<String, String> entry : param.entrySet()) {
+                String key = entry.getKey(), val = entry.getValue();
+                if (StringUtils.isEmpty(val)) {
+                    continue;
+                }
+
+                for (Field field : fields) {
+                    if (field.getName().equals(key)) {
+                        field.setAccessible(true);
+                        Object fv1 = field.get(obj), fv2 = field.get(other);
+                        if (!fv2.equals(fv1)) {
+                            return false;
+                        }
+                    }
+                }
+            }
+        } else {
+            result = false;
+        }
+
+        return result;
+    }
+}
+package com.bsth.service.alarm.impl;
+
+import com.bsth.data.alarm.AlarmCenter;
+import com.bsth.message.entity.AlarmADASVo;
+import com.bsth.message.entity.AlarmDSMVo;
+import com.bsth.service.alarm.AlarmDsmService;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+
+import java.lang.reflect.Field;
+import java.util.*;
+
+@Service
+public class AlarmDsmServiceImpl implements AlarmDsmService {
+    @Override
+    public List<AlarmDSMVo> list(Map<String, String> map, int page, int size, String order, int direction) {
+        List<AlarmDSMVo> alarmDSMVoList = new ArrayList<>();
+        for (AlarmDSMVo alarmDSMVo : AlarmCenter.findAllDsm()) {
+            try {
+                if (filter(alarmDSMVo, map)) {
+                    alarmDSMVoList.add(alarmDSMVo);
+                }
+            } catch (NoSuchFieldException e) {
+                throw new RuntimeException(e);
+            } catch (IllegalAccessException e) {
+                throw new RuntimeException(e);
+            }
+        }
+
+        return alarmDSMVoList;
+    }
+
+    private boolean filter(Object obj, Map<String, String> param) throws NoSuchFieldException, IllegalAccessException {
+        boolean result = true;
+        ObjectMapper mapper = new ObjectMapper();
+        if (param.get("lines") != null) {
+            AlarmDSMVo alarmDSMVo = (AlarmDSMVo) obj;
+            if (param.get("lines").toString().indexOf(String.format("%s,", alarmDSMVo.getLineCode())) < 0) {
+                return false;
+            }
+        }
+
+        AlarmDSMVo other = mapper.convertValue(param, AlarmDSMVo.class);
+        Field[] fields = obj.getClass().getDeclaredFields();
+        for (Map.Entry<String, String> entry : param.entrySet()) {
+            String key = entry.getKey(), val = entry.getValue();
+            if (StringUtils.isEmpty(val)) {
+                continue;
+            }
+
+            for (Field field : fields) {
+                if (field.getName().equals(key)) {
+                    field.setAccessible(true);
+                    Object fv1 = field.get(obj), fv2 = field.get(other);
+                    if (!fv2.equals(fv1)) {
+                        return false;
+                    }
+                }
+            }
+        }
+
+        return result;
+    }
+}
@@ -126,8 +126,8 @@ public class HttpClientUtils {
             }
             //超时时间
             RequestConfig requestConfig = RequestConfig.custom()
-                    .setConnectTimeout(2500).setConnectionRequestTimeout(2000)
-                    .setSocketTimeout(3500).build();
+                    .setConnectTimeout(15000).setConnectionRequestTimeout(15000)
+                    .setSocketTimeout(15000).build();
             post.setConfig(requestConfig);
             if (data != null) {
                 post.setEntity((new StringEntity(data, "UTF-8")));
@@ -6,8 +6,10 @@ import com.bsth.data.LineConfigData;
 import com.bsth.data.gpsdata_v2.entity.GpsEntity;
 import com.bsth.data.maintenance_plan.MaintenancePlan;
 import com.bsth.data.safe_driv.SafeDriv;
+import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.entity.directive.D80;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.message.entity.AlarmVo;
 import com.bsth.message.entity.CarErrorStop;
 import com.bsth.message.entity.InoutPark;
 import com.bsth.websocket.dto.WsScheduleRealInfo;
@@ -34,6 +36,8 @@ public class SendUtils{
 	private static SimpleDateFormat sdf = new SimpleDateFormat("HH:mm");
 	private static Logger logger = LoggerFactory.getLogger(SendUtils.class);
+    @Autowired
+    private DayOfSchedule dayOfSchedule;
 	/**
 	 * @throws JsonProcessingException
@@ -306,4 +310,20 @@ public class SendUtils{
 			logger.error("sendInoutPark", e);
 		}
 	}
+
+	/**
+	 * 推送报警信息至线调页面
+	 */
+	public void sendAlarm(AlarmVo alarmVo) {
+		Map<String, Object> map = new HashMap<>();
+		map.put("fn", "alarm");
+		map.put("data", alarmVo);
+		ObjectMapper mapper = new ObjectMapper();
+
+		try {
+			socketHandler.sendMessageToLine(alarmVo.getLineCode(), mapper.writeValueAsString(map));
+		} catch (JsonProcessingException e) {
+			logger.error("sendAlarm", e);
+		}
+	}
 }
@@ -40,6 +40,18 @@ spring.kafka.producer.acks= all
 spring.kafka.consumer.group-id= schedule-system
 spring.kafka.consumer.auto-offset-reset= latest
+rabbit.use= true
+spring.rabbitmq.host= 10.10.2.21
+spring.rabbitmq.port= 5672
+spring.rabbitmq.username= bsth
+spring.rabbitmq.password= bsth001
+spring.rabbitmq.virtual-host= /dsm
+
+minio.url= http://10.10.2.21:9008
+minio.accessKey= umupRhEzO9EiVhLnJ7b9
+minio.secretKey= VzjQUTN6c8p70HyX8AryRrB6ZjEsF2K28ndctHQh
+minio.bucket= dsm
+
 sso.enabled= false
 sso.systemcode = SYS0023
 sso.http.url.login= https://127.0.0.1/portal/index.html#/login
@@ -45,6 +45,18 @@ spring.kafka.consumer.auto-offset-reset= latest
 spring.kafka.consumer.key-deserializer= org.apache.kafka.common.serialization.StringDeserializer
 spring.kafka.consumer.value-deserializer= org.apache.kafka.common.serialization.StringDeserializer
+rabbit.use= true
+spring.rabbitmq.host= 10.10.2.21
+spring.rabbitmq.port= 5672
+spring.rabbitmq.username= bsth
+spring.rabbitmq.password= bsth001
+spring.rabbitmq.virtual-host= /dsm
+
+minio.url= http://10.10.2.21:9008
+minio.accessKey= umupRhEzO9EiVhLnJ7b9
+minio.secretKey= VzjQUTN6c8p70HyX8AryRrB6ZjEsF2K28ndctHQh
+minio.bucket= dsm
+
 sso.enabled= false
 sso.systemcode = SYS0019
 sso.http.url.login= http://180.169.154.251:28090/portal/index.html#/login
@@ -38,6 +38,18 @@ spring.kafka.consumer.auto-offset-reset= latest
 spring.kafka.consumer.key-deserializer= org.apache.kafka.common.serialization.StringDeserializer
 spring.kafka.consumer.value-deserializer= org.apache.kafka.common.serialization.StringDeserializer
+rabbit.use= true
+spring.rabbitmq.host= 10.10.2.21
+spring.rabbitmq.port= 5672
+spring.rabbitmq.username= bsth
+spring.rabbitmq.password= bsth001
+spring.rabbitmq.virtual-host= /dsm
+
+minio.url= http://10.10.2.21:9008
+minio.accessKey= umupRhEzO9EiVhLnJ7b9
+minio.secretKey= VzjQUTN6c8p70HyX8AryRrB6ZjEsF2K28ndctHQh
+minio.bucket= dsm
+
 sso.enabled= false
 sso.systemcode = SYS0023
 sso.http.url.login= https://112.64.45.51/portal/index.html#/login
@@ -653,5 +653,9 @@
 <!-- RSA加密 -->
 <script src="/assets/plugins/jsencrypt.min.js"></script>
 <script src="/assets/js/eventproxy.js"></script>
+<!-- 线路路由信息操作 -->
+<script src="/pages/base/stationroute/js/routes-operation.js"></script>
+<script src="/pages/base/stationroute/js/routes-service.js"></script>
+<script src="/assets/js/CoordinateConverter.js"></script>
 </body>
 </html>
 \ No newline at end of file
@@ -122,7 +122,7 @@
 						<div class="form-group">
 							<label class="col-md-3 control-label"><span class="required"> * </span>经纬度坐标点:</label>
 							<div class="col-md-6">
-								<input type="text" class="form-control" name="station.centerPointWkt" id="bJwpointsInput" readonly>
+								<input type="text" class="form-control" name="station.centerPointWkt" id="bJwpointsInput">
 							</div>
 						</div>
 					</div>
@@ -136,28 +136,17 @@ $(&#39;#add_station_template_modal&#39;).on(&#39;modal.show&#39;, function(event) {
 			var arrayFormat = inputStationValueFormat(array);
 			// 根据站点名称获取百度坐标
 			RoutesOperation.stationsNameToPoints(arrayFormat, function(resultJson) {
-				// 根据坐标点获取两点之间的时间与距离
-				RoutesOperation.getDistanceAndTotime(resultJson, function(stationdataList) {
-					var params = {};
-					params.lineId = properties.lineId;
-					params.versions = properties.versions;
-					params.directions = properties.directions;
-					params.stationJSON = resultJson;
-					RoutesOperation.lineInfoPanl(lineNameV, directionData, function(BusLine) {
-						if (BusLine && Polygon){
-							var Polygon = BusLine.getPolyline();
-							var polyGonArray = Polygon.getPath();
-							var jsonArray = [{sectionName: lineNameV+dirStr, points: polyGonArray}];
-							params.sectionJSON = jsonArray;
-							addSave(params, properties.lineId, directionData);
-						} else {
-							RoutesOperation.getSectionListPlonly(stationdataList,function(sectiondata) {
-								params.sectionJSON = sectiondata;
-								addSave(params, properties.lineId, directionData);
-							});
-						} 
-					});
-				});
+				resultJson.forEach(function (item) {
+					item.distance = 0;
+					item.duration = 0;
+				})
+				var params = {};
+				params.lineId = properties.lineId;
+				params.versions = properties.versions;
+				params.directions = properties.directions;
+				params.stationJSON = resultJson;
+
+				addSave(params, properties.lineId, directionData);
 			});
 		}
 	});
@@ -205,14 +194,14 @@ $(&#39;#add_station_template_modal&#39;).on(&#39;modal.show&#39;, function(event) {
 		params.stationJSON.forEach(function(item) {
 			stationRoutes.push({stationName: item.name, shapedType: 'r', radius: 80, destroy: 0, distances: 0, toTime: 0, station: {stationName: item.name, centerPointWkt: 'POINT(' + item.potion.lng + ' ' + item.potion.lat + ')'}});
 		})
-		params.sectionJSON.forEach(function(item) {
-			var centerPointWkt = [];
-			item.points.forEach(function(item1) {
-				centerPointWkt.push(item1.lng + ' ' + item1.lat);
-			})
-			sectionRoutes.push({sectionrouteCode: sectionRouteCode, destroy: 0, section: {sectionName: item.sectionName, bsectionVectorWkt: 'LINESTRING(' + centerPointWkt.join(',') + ')'}});
-			sectionRouteCode++;
-		})
+		// params.sectionJSON.forEach(function(item) {
+		// 	var centerPointWkt = [];
+		// 	item.points.forEach(function(item1) {
+		// 		centerPointWkt.push(item1.lng + ' ' + item1.lat);
+		// 	})
+		// 	sectionRoutes.push({sectionrouteCode: sectionRouteCode, destroy: 0, section: {sectionName: item.sectionName, bsectionVectorWkt: 'LINESTRING(' + centerPointWkt.join(',') + ')'}});
+		// 	sectionRouteCode++;
+		// })
 		params.stationRoutes = stationRoutes;
 		params.sectionRoutes = sectionRoutes;
 	}
@@ -716,6 +716,25 @@ var RoutesOperation = (function () {
             // 获取长度
             var len = arra.length;
             var stationList = [];
+            // 是否为 站点\t经度\t纬度
+            var standard = true;
+            for (var i = 0; i < arra.length;i++) {
+                var item = arra[i];
+                if (!item.wgs.x || !item.wgs.y) {
+                    standard = false;
+                    stationList = [];
+                    break;
+                }
+                stationList.push({
+                    name: item.name.replace('公交车站', ''),
+                    wgs: item.wgs,
+                    potion: CoordinateConverter.transformFromWGSToBaidu(CoordinateConverter.locationMake(item.wgs.x, item.wgs.y))
+                });
+            }
+            if (standard) {
+                callback && callback(stationList);
+                return;
+            }
             (function () {
                 if (!arguments.callee.count) {
                     arguments.callee.count = 0;
@@ -2825,5 +2844,3 @@ var RoutesOperation = (function () {
     return operation;
 })()
-
-proxy.emit('routes-operation-loaded');
@@ -414,6 +414,4 @@ var RoutesService = (function(){
 	};
 	return service;
-})();
-
-proxy.emit('routes-service-loaded');
 \ No newline at end of file
+})();
 \ No newline at end of file
@@ -408,9 +408,6 @@
 		</div>
 	</div>
 </div>
-<script src="/pages/base/stationroute/js/routes-operation.js"></script>
-<script src="/pages/base/stationroute/js/routes-service.js"></script>
-
 <script id="add_draw_polyline-temp" type="text/html">
 	<div class="add_road_search_point_wrap ">
@@ -491,7 +488,7 @@
 	{{/if}}
 </script>
 <script type="text/javascript">
-	var proxy = EventProxy.create('routes-operation-loaded', 'routes-service-loaded', function() {
+	$(document).ready(function () {
 		RoutesOperation.initPage();
 		RoutesOperation.initMap();
 		RoutesOperation.initStationDrawingManager();
@@ -66,7 +66,8 @@
                 <li><label><input class="uk-checkbox" type="checkbox" data-event="directive_history"> 指令下发记录</label></li>
                 <li><label><input class="uk-checkbox" type="checkbox" data-event="device_report"> 设备上报记录</label></li>
                 <li><label><input class="uk-checkbox" type="checkbox" data-event="gps_play_back"> 轨迹回放</label></li>
-                <li><label><input class="uk-checkbox" type="checkbox" data-event="safe_driving"> 安全驾驶(图像)</label></li>
+                <li><label><input class="uk-checkbox" type="checkbox" data-event="safe_driving"> DSM</label></li>
+                <li><label><input class="uk-checkbox" type="checkbox" data-event="adas"> ADAS</label></li>
             </ul>
         </div>
-/*! UIkit 2.25.0 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
-(function(addon) {
-
-    var component;
-
-    if (window.UIkit) {
-        component = addon(UIkit);
-    }
-
-    if (typeof define == "function" && define.amd) { // AMD
-        define("uikit-lightbox", ["uikit"], function(){
-            return component || addon(UIkit);
-        });
-    }
-
-})(function(UI){
-
-    "use strict";
-
-    var modal, cache = {};
-
-    UI.component('lightbox', {
-
-        defaults: {
-            "group"      : false,
-            "duration"   : 400,
-            "keyboard"   : true
-        },
-
-        index : 0,
-        items : false,
-
-        boot: function() {
-
-            UI.$html.on('click', '[data-uk-lightbox]', function(e){
-
-                e.preventDefault();
-
-                var link = UI.$(this);
-
-                if (!link.data("lightbox")) {
-
-                    UI.lightbox(link, UI.Utils.options(link.attr("data-uk-lightbox")));
-                }
-
-                link.data("lightbox").show(link);
-            });
-
-            // keyboard navigation
-            UI.$doc.on('keyup', function(e) {
-
-                if (modal && modal.is(':visible') && modal.lightbox.options.keyboard) {
-
-                    e.preventDefault();
-
-                    switch(e.keyCode) {
-                        case 37:
-                            modal.lightbox.previous();
-                            break;
-                        case 39:
-                            modal.lightbox.next();
-                            break;
-                    }
-                }
-            });
-        },
-
-        init: function() {
-
-            var siblings = [];
-
-            this.index    = 0;
-            this.siblings = [];
-
-            if (this.element && this.element.length) {
-
-                var domSiblings  = this.options.group ? UI.$([
-                    '[data-uk-lightbox*="'+this.options.group+'"]',
-                    "[data-uk-lightbox*='"+this.options.group+"']"
-                ].join(',')) : this.element;
-
-                domSiblings.each(function() {
-
-                    var ele = UI.$(this);
-
-                    siblings.push({
-                        'source': ele.attr('href'),
-                        'title' : ele.attr('data-title') || ele.attr('title'),
-                        'type'  : ele.attr("data-lightbox-type") || 'auto',
-                        'link'  : ele
-                    });
-                });
-
-                this.index    = domSiblings.index(this.element);
-                this.siblings = siblings;
-
-            } else if (this.options.group && this.options.group.length) {
-                this.siblings = this.options.group;
-            }
-
-            this.trigger('lightbox-init', [this]);
-        },
-
-        show: function(index) {
-
-            this.modal = getModal(this);
-
-            // stop previous animation
-            this.modal.dialog.stop();
-            this.modal.content.stop();
-
-            var $this = this, promise = UI.$.Deferred(), data, item;
-
-            index = index || 0;
-
-            // index is a jQuery object or DOM element
-            if (typeof(index) == 'object') {
-
-                this.siblings.forEach(function(s, idx){
-
-                    if (index[0] === s.link[0]) {
-                        index = idx;
-                    }
-                });
-            }
-
-            // fix index if needed
-            if ( index < 0 ) {
-                index = this.siblings.length - index;
-            } else if (!this.siblings[index]) {
-                index = 0;
-            }
-
-            item   = this.siblings[index];
-
-            data = {
-                "lightbox" : $this,
-                "source"   : item.source,
-                "type"     : item.type,
-                "index"    : index,
-                "promise"  : promise,
-                "title"    : item.title,
-                "item"     : item,
-                "meta"     : {
-                    "content" : '',
-                    "width"   : null,
-                    "height"  : null
-                }
-            };
-
-            this.index = index;
-
-            this.modal.content.empty();
-
-            if (!this.modal.is(':visible')) {
-                this.modal.content.css({width:'', height:''}).empty();
-                this.modal.modal.show();
-            }
-
-            this.modal.loader.removeClass('uk-hidden');
-
-            promise.promise().done(function() {
-
-                $this.data = data;
-                $this.fitSize(data);
-
-            }).fail(function(){
-
-                data.meta.content = '<div class="uk-position-cover uk-flex uk-flex-middle uk-flex-center"><strong>Loading resource failed!</strong></div>';
-                data.meta.width   = 400;
-                data.meta.height  = 300;
-
-                $this.data = data;
-                $this.fitSize(data);
-            });
-
-            $this.trigger('showitem.uk.lightbox', [data]);
-        },
-
-        fitSize: function() {
-
-            var $this    = this,
-                data     = this.data,
-                pad      = this.modal.dialog.outerWidth() - this.modal.dialog.width(),
-                dpadTop  = parseInt(this.modal.dialog.css('margin-top'), 10),
-                dpadBot  = parseInt(this.modal.dialog.css('margin-bottom'), 10),
-                dpad     = dpadTop + dpadBot,
-                content  = data.meta.content,
-                duration = $this.options.duration;
-
-            if (this.siblings.length > 1) {
-
-                content = [
-                    content,
-                    '<a href="#" class="uk-slidenav uk-slidenav-contrast uk-slidenav-previous uk-hidden-touch" data-lightbox-previous></a>',
-                    '<a href="#" class="uk-slidenav uk-slidenav-contrast uk-slidenav-next uk-hidden-touch" data-lightbox-next></a>'
-                ].join('');
-            }
-
-            // calculate width
-            var tmp = UI.$('<div>&nbsp;</div>').css({
-                'opacity'   : 0,
-                'position'  : 'absolute',
-                'top'       : 0,
-                'left'      : 0,
-                'width'     : '100%',
-                'max-width' : $this.modal.dialog.css('max-width'),
-                'padding'   : $this.modal.dialog.css('padding'),
-                'margin'    : $this.modal.dialog.css('margin')
-            }), maxwidth, maxheight, w = data.meta.width, h = data.meta.height;
-
-            tmp.appendTo('body').width();
-
-            maxwidth  = tmp.width();
-            maxheight = window.innerHeight - dpad;
-
-            tmp.remove();
-
-            this.modal.dialog.find('.uk-modal-caption').remove();
-
-            if (data.title) {
-                this.modal.dialog.append('<div class="uk-modal-caption">'+data.title+'</div>');
-                maxheight -= this.modal.dialog.find('.uk-modal-caption').outerHeight();
-            }
-
-            if (maxwidth < data.meta.width) {
-
-                h = Math.floor( h * (maxwidth / w) );
-                w = maxwidth;
-            }
-
-            if (maxheight < h) {
-
-                h = Math.floor(maxheight);
-                w = Math.ceil(data.meta.width * (maxheight/data.meta.height));
-            }
-
-            this.modal.content.css('opacity', 0).width(w).html(content);
-
-            if (data.type == 'iframe') {
-                this.modal.content.find('iframe:first').height(h);
-            }
-
-            var dh   = h + pad,
-                t    = Math.floor(window.innerHeight/2 - dh/2) - dpad;
-
-            if (t < 0) { t = 0; }
-
-            this.modal.closer.addClass('uk-hidden');
-
-            if ($this.modal.data('mwidth') == w &&  $this.modal.data('mheight') == h) {
-                duration = 0;
-            }
-
-            this.modal.dialog.animate({width: w + pad, height: h + pad, top: t }, duration, 'swing', function() {
-                $this.modal.loader.addClass('uk-hidden');
-                $this.modal.content.css({width:''}).animate({'opacity': 1}, function() {
-                    $this.modal.closer.removeClass('uk-hidden');
-                });
-
-                $this.modal.data({'mwidth': w, 'mheight': h});
-            });
-        },
-
-        next: function() {
-            this.show(this.siblings[(this.index+1)] ? (this.index+1) : 0);
-        },
-
-        previous: function() {
-            this.show(this.siblings[(this.index-1)] ? (this.index-1) : this.siblings.length-1);
-        }
-    });
-
-
-    // Plugins
-
-    UI.plugin('lightbox', 'image', {
-
-        init: function(lightbox) {
-
-            lightbox.on("showitem.uk.lightbox", function(e, data){
-
-                if (data.type == 'image' || data.source && data.source.match(/\.(jpg|jpeg|png|gif|svg)$/i)) {
-
-                    var resolve = function(source, width, height) {
-
-                        data.meta = {
-                            "content" : '<img class="uk-responsive-width" width="'+width+'" height="'+height+'" src ="'+source+'">',
-                            "width"   : width,
-                            "height"  : height
-                        };
-
-                        data.type = 'image';
-
-                        data.promise.resolve();
-                    };
-
-                    if (!cache[data.source]) {
-
-                        var img = new Image();
-
-                        img.onerror = function(){
-                            data.promise.reject('Loading image failed');
-                        };
-
-                        img.onload = function(){
-                            cache[data.source] = {width: img.width, height: img.height};
-                            resolve(data.source, cache[data.source].width, cache[data.source].height);
-                        };
-
-                        img.src = data.source;
-
-                    } else {
-                        resolve(data.source, cache[data.source].width, cache[data.source].height);
-                    }
-                }
-            });
-        }
-    });
-
-    UI.plugin("lightbox", "youtube", {
-
-        init: function(lightbox) {
-
-            var youtubeRegExp = /(\/\/.*?youtube\.[a-z]+)\/watch\?v=([^&]+)&?(.*)/,
-                youtubeRegExpShort = /youtu\.be\/(.*)/;
-
-
-            lightbox.on("showitem.uk.lightbox", function(e, data){
-
-                var id, matches, resolve = function(id, width, height) {
-
-                    data.meta = {
-                        'content': '<iframe src="//www.youtube.com/embed/'+id+'" width="'+width+'" height="'+height+'" style="max-width:100%;"></iframe>',
-                        'width': width,
-                        'height': height
-                    };
-
-                    data.type = 'iframe';
-
-                    data.promise.resolve();
-                };
-
-                if (matches = data.source.match(youtubeRegExp)) {
-                    id = matches[2];
-                }
-
-                if (matches = data.source.match(youtubeRegExpShort)) {
-                    id = matches[1];
-                }
-
-                if (id) {
-
-                    if(!cache[id]) {
-
-                        var img = new Image(), lowres = false;
-
-                        img.onerror = function(){
-                            cache[id] = {width:640, height:320};
-                            resolve(id, cache[id].width, cache[id].height);
-                        };
-
-                        img.onload = function(){
-                            //youtube default 404 thumb, fall back to lowres
-                            if (img.width == 120 && img.height == 90) {
-                                if (!lowres) {
-                                    lowres = true;
-                                    img.src = '//img.youtube.com/vi/' + id + '/0.jpg';
-                                } else {
-                                    cache[id] = {width: 640, height: 320};
-                                    resolve(id, cache[id].width, cache[id].height);
-                                }
-                            } else {
-                                cache[id] = {width: img.width, height: img.height};
-                                resolve(id, img.width, img.height);
-                            }
-                        };
-
-                        img.src = '//img.youtube.com/vi/'+id+'/maxresdefault.jpg';
-
-                    } else {
-                        resolve(id, cache[id].width, cache[id].height);
-                    }
-
-                    e.stopImmediatePropagation();
-                }
-            });
-        }
-    });
-
-
-    UI.plugin("lightbox", "vimeo", {
-
-        init: function(lightbox) {
-
-            var regex = /(\/\/.*?)vimeo\.[a-z]+\/([0-9]+).*?/, matches;
-
-
-            lightbox.on("showitem.uk.lightbox", function(e, data){
-
-                var id, resolve = function(id, width, height) {
-
-                    data.meta = {
-                        'content': '<iframe src="//player.vimeo.com/video/'+id+'" width="'+width+'" height="'+height+'" style="width:100%;box-sizing:border-box;"></iframe>',
-                        'width': width,
-                        'height': height
-                    };
-
-                    data.type = 'iframe';
-
-                    data.promise.resolve();
-                };
-
-                if (matches = data.source.match(regex)) {
-
-                    id = matches[2];
-
-                    if(!cache[id]) {
-
-                        UI.$.ajax({
-                            type     : 'GET',
-                            url      : 'http://vimeo.com/api/oembed.json?url=' + encodeURI(data.source),
-                            jsonp    : 'callback',
-                            dataType : 'jsonp',
-                            success  : function(data) {
-                                cache[id] = {width:data.width, height:data.height};
-                                resolve(id, cache[id].width, cache[id].height);
-                            }
-                        });
-
-                    } else {
-                        resolve(id, cache[id].width, cache[id].height);
-                    }
-
-                    e.stopImmediatePropagation();
-                }
-            });
-        }
-    });
-
-    UI.plugin("lightbox", "video", {
-
-        init: function(lightbox) {
-
-            lightbox.on("showitem.uk.lightbox", function(e, data){
-
-
-                var resolve = function(source, width, height) {
-
-                    data.meta = {
-                        'content': '<video class="uk-responsive-width" src="'+source+'" width="'+width+'" height="'+height+'" controls></video>',
-                        'width': width,
-                        'height': height
-                    };
-
-                    data.type = 'video';
-
-                    data.promise.resolve();
-                };
-
-                if (data.type == 'video' || data.source.match(/\.(mp4|webm|ogv)$/i)) {
-
-                    if (!cache[data.source]) {
-
-                        var vid = UI.$('<video style="position:fixed;visibility:hidden;top:-10000px;"></video>').attr('src', data.source).appendTo('body');
-
-                        var idle = setInterval(function() {
-
-                            if (vid[0].videoWidth) {
-                                clearInterval(idle);
-                                cache[data.source] = {width: vid[0].videoWidth, height: vid[0].videoHeight};
-                                resolve(data.source, cache[data.source].width, cache[data.source].height);
-                                vid.remove();
-                            }
-
-                        }, 20);
-
-                    } else {
-                        resolve(data.source, cache[data.source].width, cache[data.source].height);
-                    }
-                }
-            });
-        }
-    });
-
-
-    function getModal(lightbox) {
-
-        if (modal) {
-            modal.lightbox = lightbox;
-            return modal;
-        }
-
-        // init lightbox container
-        modal = UI.$([
-            '<div class="uk-modal">',
-                '<div class="uk-modal-dialog uk-modal-dialog-lightbox uk-slidenav-position" style="margin-left:auto;margin-right:auto;width:200px;height:200px;top:'+Math.abs(window.innerHeight/2 - 200)+'px;">',
-                    '<a href="#" class="uk-modal-close uk-close uk-close-alt"></a>',
-                    '<div class="uk-lightbox-content"></div>',
-                    '<div class="uk-modal-spinner uk-hidden"></div>',
-                '</div>',
-            '</div>'
-        ].join('')).appendTo('body');
-
-        modal.dialog  = modal.find('.uk-modal-dialog:first');
-        modal.content = modal.find('.uk-lightbox-content:first');
-        modal.loader  = modal.find('.uk-modal-spinner:first');
-        modal.closer  = modal.find('.uk-close.uk-close-alt');
-        modal.modal   = UI.modal(modal, {modal:false, bgclose: false});
-
-        // next / previous
-/*        modal.on("swipeRight swipeLeft", function(e) {
-            modal.lightbox[e.type=='swipeLeft' ? 'next':'previous']();
-        }).on("click", "[data-lightbox-previous], [data-lightbox-next]", function(e){
-            e.preventDefault();
-            modal.lightbox[UI.$(this).is('[data-lightbox-next]') ? 'next':'previous']();
-        });*/
-
-        // destroy content on modal hide
-        modal.on("hide.uk.modal", function(e) {
-            modal.content.html('');
-        });
-
-        UI.$win.on('load resize orientationchange', UI.Utils.debounce(function(e){
-            if (modal.is(':visible') && !UI.Utils.isFullscreen()) modal.lightbox.fitSize();
-        }.bind(this), 100));
-
-        modal.lightbox = lightbox;
-
-        return modal;
-    }
-
-    UI.lightbox.create = function(items, options) {
-
-        if (!items) return;
-
-        var group = [], o;
-
-        items.forEach(function(item) {
-
-            group.push(UI.$.extend({
-                'source' : '',
-                'title'  : '',
-                'type'   : 'auto',
-                'link'   : false
-            }, (typeof(item) == 'string' ? {'source': item} : item)));
-        });
-
-        o = UI.lightbox(UI.$.extend({}, options, {'group':group}));
-
-        return o;
-    };
-
-    return UI.lightbox;
-});
+/*! UIkit 2.25.0 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
+(function(addon) {
+
+    var component;
+
+    if (window.UIkit) {
+        component = addon(UIkit);
+    }
+
+    if (typeof define == "function" && define.amd) { // AMD
+        define("uikit-lightbox", ["uikit"], function(){
+            return component || addon(UIkit);
+        });
+    }
+
+})(function(UI){
+
+    "use strict";
+
+    var modal, cache = {};
+
+    UI.component('lightbox', {
+
+        defaults: {
+            "group"      : false,
+            "duration"   : 400,
+            "keyboard"   : true
+        },
+
+        index : 0,
+        items : false,
+
+        boot: function() {
+
+            UI.$html.on('click', '[data-uk-lightbox]', function(e){
+
+                e.preventDefault();
+
+                var link = UI.$(this);
+
+                if (!link.data("lightbox")) {
+
+                    UI.lightbox(link, UI.Utils.options(link.attr("data-uk-lightbox")));
+                }
+
+                link.data("lightbox").show(link);
+            });
+
+            // keyboard navigation
+            UI.$doc.on('keyup', function(e) {
+
+                if (modal && modal.is(':visible') && modal.lightbox.options.keyboard) {
+
+                    e.preventDefault();
+
+                    switch(e.keyCode) {
+                        case 37:
+                            modal.lightbox.previous();
+                            break;
+                        case 39:
+                            modal.lightbox.next();
+                            break;
+                    }
+                }
+            });
+        },
+
+        init: function() {
+
+            var siblings = [];
+
+            this.index    = 0;
+            this.siblings = [];
+
+            if (this.element && this.element.length) {
+
+                var domSiblings  = this.options.group ? UI.$([
+                    '[data-uk-lightbox*="'+this.options.group+'"]',
+                    "[data-uk-lightbox*='"+this.options.group+"']"
+                ].join(',')) : this.element;
+
+                domSiblings.each(function() {
+
+                    var ele = UI.$(this);
+
+                    siblings.push({
+                        'source': ele.attr('href'),
+                        'title' : ele.attr('data-title') || ele.attr('title'),
+                        'type'  : ele.attr("data-lightbox-type") || 'auto',
+                        'link'  : ele
+                    });
+                });
+
+                this.index    = domSiblings.index(this.element);
+                this.siblings = siblings;
+
+            } else if (this.options.group && this.options.group.length) {
+                this.siblings = this.options.group;
+            }
+
+            this.trigger('lightbox-init', [this]);
+        },
+
+        show: function(index) {
+
+            this.modal = getModal(this);
+
+            // stop previous animation
+            this.modal.dialog.stop();
+            this.modal.content.stop();
+
+            var $this = this, promise = UI.$.Deferred(), data, item;
+
+            index = index || 0;
+
+            // index is a jQuery object or DOM element
+            if (typeof(index) == 'object') {
+
+                this.siblings.forEach(function(s, idx){
+
+                    if (index[0] === s.link[0]) {
+                        index = idx;
+                    }
+                });
+            }
+
+            // fix index if needed
+            if ( index < 0 ) {
+                index = this.siblings.length - index;
+            } else if (!this.siblings[index]) {
+                index = 0;
+            }
+
+            item   = this.siblings[index];
+
+            data = {
+                "lightbox" : $this,
+                "source"   : item.source,
+                "type"     : item.type,
+                "index"    : index,
+                "promise"  : promise,
+                "title"    : item.title,
+                "item"     : item,
+                "meta"     : {
+                    "content" : '',
+                    "width"   : null,
+                    "height"  : null
+                }
+            };
+
+            this.index = index;
+
+            this.modal.content.empty();
+
+            if (!this.modal.is(':visible')) {
+                this.modal.content.css({width:'', height:''}).empty();
+                this.modal.modal.show();
+            }
+
+            this.modal.loader.removeClass('uk-hidden');
+
+            promise.promise().done(function() {
+
+                $this.data = data;
+                $this.fitSize(data);
+
+            }).fail(function(){
+
+                data.meta.content = '<div class="uk-position-cover uk-flex uk-flex-middle uk-flex-center"><strong>Loading resource failed!</strong></div>';
+                data.meta.width   = 400;
+                data.meta.height  = 300;
+
+                $this.data = data;
+                $this.fitSize(data);
+            });
+
+            $this.trigger('showitem.uk.lightbox', [data]);
+        },
+
+        fitSize: function() {
+
+            var $this    = this,
+                data     = this.data,
+                pad      = this.modal.dialog.outerWidth() - this.modal.dialog.width(),
+                dpadTop  = parseInt(this.modal.dialog.css('margin-top'), 10),
+                dpadBot  = parseInt(this.modal.dialog.css('margin-bottom'), 10),
+                dpad     = dpadTop + dpadBot,
+                content  = data.meta.content,
+                duration = $this.options.duration;
+
+            if (this.siblings.length > 1) {
+
+                content = [
+                    content,
+                    '<a href="#" class="uk-slidenav uk-slidenav-contrast uk-slidenav-previous uk-hidden-touch" data-lightbox-previous></a>',
+                    '<a href="#" class="uk-slidenav uk-slidenav-contrast uk-slidenav-next uk-hidden-touch" data-lightbox-next></a>'
+                ].join('');
+            }
+
+            // calculate width
+            var tmp = UI.$('<div>&nbsp;</div>').css({
+                'opacity'   : 0,
+                'position'  : 'absolute',
+                'top'       : 0,
+                'left'      : 0,
+                'width'     : '100%',
+                'max-width' : $this.modal.dialog.css('max-width'),
+                'padding'   : $this.modal.dialog.css('padding'),
+                'margin'    : $this.modal.dialog.css('margin')
+            }), maxwidth, maxheight, w = data.meta.width, h = data.meta.height;
+
+            tmp.appendTo('body').width();
+
+            maxwidth  = tmp.width();
+            maxheight = window.innerHeight - dpad;
+
+            tmp.remove();
+
+            this.modal.dialog.find('.uk-modal-caption').remove();
+
+            if (data.title) {
+                this.modal.dialog.append('<div class="uk-modal-caption">'+data.title+'</div>');
+                maxheight -= this.modal.dialog.find('.uk-modal-caption').outerHeight();
+            }
+
+            if (maxwidth < data.meta.width) {
+
+                h = Math.floor( h * (maxwidth / w) );
+                w = maxwidth;
+            }
+
+            if (maxheight < h) {
+
+                h = Math.floor(maxheight);
+                w = Math.ceil(data.meta.width * (maxheight/data.meta.height));
+            }
+
+            this.modal.content.css('opacity', 0).width(w).html(content);
+
+            if (data.type == 'iframe') {
+                this.modal.content.find('iframe:first').height(h);
+            }
+
+            var dh   = h + pad,
+                t    = Math.floor(window.innerHeight/2 - dh/2) - dpad;
+
+            if (t < 0) { t = 0; }
+
+            this.modal.closer.addClass('uk-hidden');
+
+            if ($this.modal.data('mwidth') == w &&  $this.modal.data('mheight') == h) {
+                duration = 0;
+            }
+
+            this.modal.dialog.animate({width: w + pad, height: h + pad, top: t }, duration, 'swing', function() {
+                $this.modal.loader.addClass('uk-hidden');
+                $this.modal.content.css({width:''}).animate({'opacity': 1}, function() {
+                    $this.modal.closer.removeClass('uk-hidden');
+                });
+
+                $this.modal.data({'mwidth': w, 'mheight': h});
+            });
+        },
+
+        next: function() {
+            this.show(this.siblings[(this.index+1)] ? (this.index+1) : 0);
+        },
+
+        previous: function() {
+            this.show(this.siblings[(this.index-1)] ? (this.index-1) : this.siblings.length-1);
+        }
+    });
+
+
+    // Plugins
+
+    UI.plugin('lightbox', 'image', {
+
+        init: function(lightbox) {
+
+            lightbox.on("showitem.uk.lightbox", function(e, data){
+
+                if (data.type == 'image' || data.source && data.source.match(/\.(jpg|jpeg|png|gif|svg)$/i)) {
+
+                    var resolve = function(source, width, height) {
+
+                        data.meta = {
+                            "content" : '<img class="uk-responsive-width" width="'+width+'" height="'+height+'" src ="'+source+'">',
+                            "width"   : width,
+                            "height"  : height
+                        };
+
+                        data.type = 'image';
+
+                        data.promise.resolve();
+                    };
+
+                    if (!cache[data.source]) {
+
+                        var img = new Image();
+
+                        img.onerror = function(){
+                            data.promise.reject('Loading image failed');
+                        };
+
+                        img.onload = function(){
+                            cache[data.source] = {width: img.width, height: img.height};
+                            resolve(data.source, cache[data.source].width, cache[data.source].height);
+                        };
+
+                        img.src = data.source;
+
+                    } else {
+                        resolve(data.source, cache[data.source].width, cache[data.source].height);
+                    }
+                }
+            });
+        }
+    });
+
+    UI.plugin("lightbox", "youtube", {
+
+        init: function(lightbox) {
+
+            var youtubeRegExp = /(\/\/.*?youtube\.[a-z]+)\/watch\?v=([^&]+)&?(.*)/,
+                youtubeRegExpShort = /youtu\.be\/(.*)/;
+
+
+            lightbox.on("showitem.uk.lightbox", function(e, data){
+
+                var id, matches, resolve = function(id, width, height) {
+
+                    data.meta = {
+                        'content': '<iframe src="//www.youtube.com/embed/'+id+'" width="'+width+'" height="'+height+'" style="max-width:100%;"></iframe>',
+                        'width': width,
+                        'height': height
+                    };
+
+                    data.type = 'iframe';
+
+                    data.promise.resolve();
+                };
+
+                if (matches = data.source.match(youtubeRegExp)) {
+                    id = matches[2];
+                }
+
+                if (matches = data.source.match(youtubeRegExpShort)) {
+                    id = matches[1];
+                }
+
+                if (id) {
+
+                    if(!cache[id]) {
+
+                        var img = new Image(), lowres = false;
+
+                        img.onerror = function(){
+                            cache[id] = {width:640, height:320};
+                            resolve(id, cache[id].width, cache[id].height);
+                        };
+
+                        img.onload = function(){
+                            //youtube default 404 thumb, fall back to lowres
+                            if (img.width == 120 && img.height == 90) {
+                                if (!lowres) {
+                                    lowres = true;
+                                    img.src = '//img.youtube.com/vi/' + id + '/0.jpg';
+                                } else {
+                                    cache[id] = {width: 640, height: 320};
+                                    resolve(id, cache[id].width, cache[id].height);
+                                }
+                            } else {
+                                cache[id] = {width: img.width, height: img.height};
+                                resolve(id, img.width, img.height);
+                            }
+                        };
+
+                        img.src = '//img.youtube.com/vi/'+id+'/maxresdefault.jpg';
+
+                    } else {
+                        resolve(id, cache[id].width, cache[id].height);
+                    }
+
+                    e.stopImmediatePropagation();
+                }
+            });
+        }
+    });
+
+
+    UI.plugin("lightbox", "vimeo", {
+
+        init: function(lightbox) {
+
+            var regex = /(\/\/.*?)vimeo\.[a-z]+\/([0-9]+).*?/, matches;
+
+
+            lightbox.on("showitem.uk.lightbox", function(e, data){
+
+                var id, resolve = function(id, width, height) {
+
+                    data.meta = {
+                        'content': '<iframe src="//player.vimeo.com/video/'+id+'" width="'+width+'" height="'+height+'" style="width:100%;box-sizing:border-box;"></iframe>',
+                        'width': width,
+                        'height': height
+                    };
+
+                    data.type = 'iframe';
+
+                    data.promise.resolve();
+                };
+
+                if (matches = data.source.match(regex)) {
+
+                    id = matches[2];
+
+                    if(!cache[id]) {
+
+                        UI.$.ajax({
+                            type     : 'GET',
+                            url      : 'http://vimeo.com/api/oembed.json?url=' + encodeURI(data.source),
+                            jsonp    : 'callback',
+                            dataType : 'jsonp',
+                            success  : function(data) {
+                                cache[id] = {width:data.width, height:data.height};
+                                resolve(id, cache[id].width, cache[id].height);
+                            }
+                        });
+
+                    } else {
+                        resolve(id, cache[id].width, cache[id].height);
+                    }
+
+                    e.stopImmediatePropagation();
+                }
+            });
+        }
+    });
+
+    UI.plugin("lightbox", "video", {
+
+        init: function(lightbox) {
+
+            lightbox.on("showitem.uk.lightbox", function(e, data){
+
+
+                var resolve = function(source, width, height) {
+
+                    data.meta = {
+                        'content': '<video class="uk-responsive-width" src="'+source+'" width="'+width+'" height="'+height+'" controls></video>',
+                        'width': width,
+                        'height': height
+                    };
+
+                    data.type = 'video';
+
+                    data.promise.resolve();
+                };
+
+                if (data.type == 'video' || data.source.match(/\.(mp4|webm|ogv)$/i)) {
+
+                    if (!cache[data.source]) {
+
+                        var vid = UI.$('<video style="position:fixed;visibility:hidden;top:-10000px;"></video>').attr('src', data.source).appendTo('body');
+
+                        var idle = setInterval(function() {
+
+                            if (vid[0].videoWidth) {
+                                clearInterval(idle);
+                                cache[data.source] = {width: vid[0].videoWidth, height: vid[0].videoHeight};
+                                resolve(data.source, cache[data.source].width, cache[data.source].height);
+                                vid.remove();
+                            }
+
+                        }, 20);
+
+                    } else {
+                        resolve(data.source, cache[data.source].width, cache[data.source].height);
+                    }
+                }
+            });
+        }
+    });
+
+
+    function getModal(lightbox) {
+
+        if (modal) {
+            modal.lightbox = lightbox;
+            return modal;
+        }
+
+        // init lightbox container
+        modal = UI.$([
+            '<div class="uk-modal">',
+                '<div class="uk-modal-dialog uk-modal-dialog-lightbox uk-slidenav-position" style="margin-left:auto;margin-right:auto;width:200px;height:200px;top:'+Math.abs(window.innerHeight/2 - 200)+'px;">',
+                    '<a href="#" class="uk-modal-close uk-close uk-close-alt"></a>',
+                    '<div class="uk-lightbox-content"></div>',
+                    '<div class="uk-modal-spinner uk-hidden"></div>',
+                '</div>',
+            '</div>'
+        ].join('')).appendTo('body');
+
+        modal.dialog  = modal.find('.uk-modal-dialog:first');
+        modal.content = modal.find('.uk-lightbox-content:first');
+        modal.loader  = modal.find('.uk-modal-spinner:first');
+        modal.closer  = modal.find('.uk-close.uk-close-alt');
+        modal.modal   = UI.modal(modal, {modal:false, bgclose: false});
+
+        // next / previous
+        modal.on("swipeRight swipeLeft", function(e) {
+            modal.lightbox[e.type=='swipeLeft' ? 'next':'previous']();
+        }).on("click", "[data-lightbox-previous], [data-lightbox-next]", function(e){
+            e.preventDefault();
+            modal.lightbox[UI.$(this).is('[data-lightbox-next]') ? 'next':'previous']();
+        });
+
+        // destroy content on modal hide
+        modal.on("hide.uk.modal", function(e) {
+            modal.content.html('');
+        });
+
+        UI.$win.on('load resize orientationchange', UI.Utils.debounce(function(e){
+            if (modal.is(':visible') && !UI.Utils.isFullscreen()) modal.lightbox.fitSize();
+        }.bind(this), 100));
+
+        modal.lightbox = lightbox;
+
+        return modal;
+    }
+
+    UI.lightbox.create = function(items, options) {
+
+        if (!items) return;
+
+        var group = [], o;
+
+        items.forEach(function(item) {
+
+            group.push(UI.$.extend({
+                'source' : '',
+                'title'  : '',
+                'type'   : 'auto',
+                'link'   : false
+            }, (typeof(item) == 'string' ? {'source': item} : item)));
+        });
+
+        o = UI.lightbox(UI.$.extend({}, options, {'group':group}));
+
+        return o;
+    };
+
+    return UI.lightbox;
+});