Merge remote-tracking branch 'origin/master' into wvp-28181-2.0

# Conflicts: # README.md # src/main/java/com/genersoft/iot/vmp/gb28181/event/EventPublisher.java # src/main/java/com/genersoft/iot/vmp/gb28181/event/alarm/AlarmEvent.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/SIPProcessorFactory.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderProvider.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java # src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java # src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java # src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java # src/main/java/com/genersoft/iot/vmp/vmanager/SseController/SseController.java # src/main/java/com/genersoft/iot/vmp/vmanager/service/IPlayService.java # src/main/java/com/genersoft/iot/vmp/vmanager/service/impl/PlayServiceImpl.java # src/main/resources/wvp.sqlite # web_src/.postcssrc.js # web_src/src/components/UiHeader.vue # web_src/src/main.js # web_src/src/router/index.js
2021-02-25 18:10:02 +08:00
parent c1b3f2beb4 e864becace
commit 0f58218bad
68 changed files with 3578 additions and 494 deletions
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/BaiduPoint.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/BaiduPoint.java
@@ -0,0 +1,24 @@
+package com.genersoft.iot.vmp.gb28181.bean;
+
+public class BaiduPoint {
+
+    String bdLng;
+
+    String bdLat;
+
+    public String getBdLng() {
+        return bdLng;
+    }
+
+    public void setBdLng(String bdLng) {
+        this.bdLng = bdLng;
+    }
+
+    public String getBdLat() {
+        return bdLat;
+    }
+
+    public void setBdLat(String bdLat) {
+        this.bdLat = bdLat;
+    }
+}
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/MobilePosition.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/MobilePosition.java
@@ -0,0 +1,166 @@
+package com.genersoft.iot.vmp.gb28181.bean;
+
+/**
+ * @Description: 移动位置bean
+ * @author: lawrencehj
+ * @date: 2021年1月23日
+ */
+
+public class MobilePosition {
+    /**
+     * 设备Id
+     */
+    private String deviceId;
+
+    /**
+     * 设备名称
+     */
+    private String deviceName;
+
+    /**
+     * 通知时间
+     */
+    private String time;
+
+    /**
+     * 经度
+     */
+    private double longitude;
+
+    /**
+     * 纬度
+     */
+    private double latitude;
+
+    /**
+     * 海拔高度
+     */
+    private double altitude;
+
+    /**
+     * 速度
+     */
+    private double speed;
+
+    /**
+     * 方向
+     */
+    private double direction;
+
+    /**
+     * 位置信息上报来源（Mobile Position、GPS Alarm）
+     */
+    private String reportSource;
+
+    /**
+     * 国内地理坐标系（GCJ-02 / BD-09）
+     */
+    private String GeodeticSystem;
+
+    /**
+     * 国内坐标系：经度坐标
+     */
+    private String cnLng;
+
+    /**
+     * 国内坐标系：纬度坐标
+     */
+    private String cnLat;
+
+
+    public String getDeviceId() {
+        return deviceId;
+    }
+
+    public void setDeviceId(String deviceId) {
+        this.deviceId = deviceId;
+    }
+
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
+    public String getTime() {
+        return time;
+    }
+
+    public void setTime(String time) {
+        this.time = time;
+    }
+
+    public double getLongitude() {
+        return longitude;
+    }
+
+    public void setLongitude(double longitude) {
+        this.longitude = longitude;
+    }
+    
+    public double getLatitude() {
+        return latitude;
+    }
+
+    public void setLatitude(double latitude) {
+        this.latitude = latitude;
+    }
+
+    public double getAltitude() {
+        return altitude;
+    }
+
+    public void setAltitude(double altitude) {
+        this.altitude = altitude;
+    }
+
+    public double getSpeed() {
+        return speed;
+    }
+
+    public void setSpeed(double speed) {
+        this.speed = speed;
+    }
+
+    public double getDirection() {
+        return direction;
+    }
+
+    public void setDirection(double direction) {
+        this.direction = direction;
+    }
+
+    public String getReportSource() {
+        return reportSource;
+    }
+
+    public void setReportSource(String reportSource) {
+        this.reportSource = reportSource;
+    }
+
+    public String getGeodeticSystem() {
+        return GeodeticSystem;
+    }
+
+    public void setGeodeticSystem(String geodeticSystem) {
+        GeodeticSystem = geodeticSystem;
+    }
+
+    public String getCnLng() {
+        return cnLng;
+    }
+
+    public void setCnLng(String cnLng) {
+        this.cnLng = cnLng;
+    }
+
+    public String getCnLat() {
+        return cnLat;
+    }
+
+    public void setCnLat(String cnLat) {
+        this.cnLat = cnLat;
+    }
+}
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/RecordInfo.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/RecordInfo.java
@@ -1,7 +1,7 @@
 package com.genersoft.iot.vmp.gb28181.bean;


-import gov.nist.javax.sip.header.SIPDate;
+//import gov.nist.javax.sip.header.SIPDate;

 import java.util.List;

--- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/WvpSipDate.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/WvpSipDate.java
@@ -1,14 +1,100 @@
 package com.genersoft.iot.vmp.gb28181.bean;

+import gov.nist.core.InternalErrorHandler;
 import gov.nist.javax.sip.header.SIPDate;

+import java.util.*;
+
 /**
 * 重写jain sip的SIPDate解决与国标时间格式不一致的问题
 */
 public class WvpSipDate extends SIPDate {

+    /**
+     *
+     */
+    private static final long serialVersionUID = 1L;
+    
+    private Calendar javaCal;
+
    public WvpSipDate(long timeMillis) {
-        super(timeMillis);
+        this.javaCal = new GregorianCalendar(TimeZone.getDefault(), Locale.getDefault());
+        Date date = new Date(timeMillis);
+        this.javaCal.setTime(date);
+        this.wkday = this.javaCal.get(7);
+        switch(this.wkday) {
+            case 1:
+                this.sipWkDay = "Sun";
+                break;
+            case 2:
+                this.sipWkDay = "Mon";
+                break;
+            case 3:
+                this.sipWkDay = "Tue";
+                break;
+            case 4:
+                this.sipWkDay = "Wed";
+                break;
+            case 5:
+                this.sipWkDay = "Thu";
+                break;
+            case 6:
+                this.sipWkDay = "Fri";
+                break;
+            case 7:
+                this.sipWkDay = "Sat";
+                break;
+            default:
+                InternalErrorHandler.handleException("No date map for wkday " + this.wkday);
+        }
+
+        this.day = this.javaCal.get(5);
+        this.month = this.javaCal.get(2);
+        switch(this.month) {
+            case 0:
+                this.sipMonth = "Jan";
+                break;
+            case 1:
+                this.sipMonth = "Feb";
+                break;
+            case 2:
+                this.sipMonth = "Mar";
+                break;
+            case 3:
+                this.sipMonth = "Apr";
+                break;
+            case 4:
+                this.sipMonth = "May";
+                break;
+            case 5:
+                this.sipMonth = "Jun";
+                break;
+            case 6:
+                this.sipMonth = "Jul";
+                break;
+            case 7:
+                this.sipMonth = "Aug";
+                break;
+            case 8:
+                this.sipMonth = "Sep";
+                break;
+            case 9:
+                this.sipMonth = "Oct";
+                break;
+            case 10:
+                this.sipMonth = "Nov";
+                break;
+            case 11:
+                this.sipMonth = "Dec";
+                break;
+            default:
+                InternalErrorHandler.handleException("No date map for month " + this.month);
+        }
+
+        this.year = this.javaCal.get(1);
+        this.hour = this.javaCal.get(11);
+        this.minute = this.javaCal.get(12);
+        this.second = this.javaCal.get(13);
    }

    @Override
@@ -48,7 +134,7 @@ public class WvpSipDate extends SIPDate {
            var6 = "" + this.second;
        }

-        int var8 = this.getJavaCal().get(14);
+        int var8 = this.javaCal.get(14);
        String var7;
        if (var8 < 10) {
            var7 = "00" + var8;