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/storager/IVideoManagerStorager.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java
@@ -8,6 +8,7 @@ import com.genersoft.iot.vmp.gb28181.bean.Device;
 import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
 import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
 import com.genersoft.iot.vmp.vmanager.platform.bean.ChannelReduce;
+import com.genersoft.iot.vmp.gb28181.bean.MobilePosition;
 import com.github.pagehelper.PageInfo;
 import gov.nist.javax.sip.stack.NioTcpMessageProcessor;

@@ -236,4 +237,32 @@ public interface IVideoManagerStorager {
    DeviceChannel queryChannelInParentPlatform(String platformId, String channelId);

    Device queryVideoDeviceByPlatformIdAndChannelId(String platformId, String channelId);
+
+
+	/**
+	 * 添加Mobile Position设备移动位置
+	 * @param MobilePosition
+	 * @return
+	 */
+	public boolean insertMobilePosition(MobilePosition mobilePosition);
+
+	/**
+	 * 查询移动位置轨迹
+	 * @param deviceId
+	 * @param startTime
+	 * @param endTime
+	 */
+	public List<MobilePosition> queryMobilePositions(String deviceId, String startTime, String endTime);
+
+	/**
+	 * 查询最新移动位置
+	 * @param deviceId
+	 */
+	public MobilePosition queryLatestPosition(String deviceId);
+
+	/**
+	 * 删除指定设备的所有移动位置
+	 * @param deviceId
+	 */
+	public int clearMobilePositionsByDeviceId(String deviceId);
 }
--- a/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMobilePositionMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMobilePositionMapper.java
@@ -0,0 +1,33 @@
+package com.genersoft.iot.vmp.storager.dao;
+
+import java.util.List;
+
+import com.genersoft.iot.vmp.gb28181.bean.MobilePosition;
+import org.apache.ibatis.annotations.*;
+//import org.springframework.stereotype.Repository;
+
+@Mapper
+//@Repository
+public interface DeviceMobilePositionMapper {
+
+    @Insert("INSERT INTO device_mobile_position (deviceId, deviceName, time, longitude, latitude, altitude, speed, direction, reportSource, geodeticSystem, cnLng, cnLat) " +
+            "VALUES ('${deviceId}', '${deviceName}', '${time}', ${longitude}, ${latitude}, ${altitude}, ${speed}, ${direction}, '${reportSource}', '${geodeticSystem}', '${cnLng}', '${cnLat}')")
+    int insertNewPosition(MobilePosition mobilePosition);
+
+    @Select(value = {" <script>" +
+    "SELECT * FROM device_mobile_position" +
+    " WHERE deviceId = #{deviceId} " +
+    "<if test=\"startTime != null\"> AND time&gt;=#{startTime}</if>" +
+    "<if test=\"endTime != null\"> AND time&lt;=#{endTime}</if>" +
+    " ORDER BY time ASC" +
+    " </script>"})
+    List<MobilePosition> queryPositionByDeviceIdAndTime(String deviceId, String startTime, String endTime);
+
+    @Select("SELECT * FROM device_mobile_position WHERE deviceId = #{deviceId}" +
+            " ORDER BY time DESC LIMIT 1")
+    MobilePosition queryLatestPositionByDevice(String deviceId);
+
+    @Delete("DELETE FROM device_mobile_position WHERE deviceId = #{deviceId}")
+    int clearMobilePositionsByDeviceId(String deviceId);
+
+}
--- a/src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java
@@ -14,7 +14,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;

 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;

@@ -147,9 +146,9 @@ public class RedisCatchStorageImpl implements IRedisCatchStorage {

    @Override
    public StreamInfo queryPlaybackByDevice(String deviceId, String code) {
-        String format = String.format("%S_*_%s_%s", VideoManagerConstants.PLAY_BLACK_PREFIX,
-                deviceId,
-                code);
+        // String format = String.format("%S_*_%s_%s", VideoManagerConstants.PLAY_BLACK_PREFIX,
+        //         deviceId,
+        //         code);
        List<Object> playLeys = redis.scan(String.format("%S_*_%s_%s", VideoManagerConstants.PLAY_BLACK_PREFIX,
                deviceId,
                code));
--- a/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java
@@ -6,11 +6,13 @@ import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
 import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
 import com.genersoft.iot.vmp.gb28181.bean.ParentPlatformCatch;
 import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
+import com.genersoft.iot.vmp.gb28181.bean.MobilePosition;
 import com.genersoft.iot.vmp.storager.dao.DeviceChannelMapper;
 import com.genersoft.iot.vmp.storager.dao.DeviceMapper;
 import com.genersoft.iot.vmp.storager.dao.ParentPlatformMapper;
 import com.genersoft.iot.vmp.storager.dao.PatformChannelMapper;
 import com.genersoft.iot.vmp.vmanager.platform.bean.ChannelReduce;
+import com.genersoft.iot.vmp.storager.dao.DeviceMobilePositionMapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,7 +34,10 @@ public class VideoManagerStoragerImpl implements IVideoManagerStorager {
    private DeviceMapper deviceMapper;

 	@Autowired
-    private DeviceChannelMapper deviceChannelMapper;
+	private DeviceChannelMapper deviceChannelMapper;
+
+	@Autowired
+	private DeviceMobilePositionMapper deviceMobilePositionMapper;

 	@Autowired
    private ParentPlatformMapper platformMapper;
@@ -194,11 +199,11 @@ public class VideoManagerStoragerImpl implements IVideoManagerStorager {
 	@Override
 	public synchronized boolean online(String deviceId) {
 		Device device = deviceMapper.getDeviceByDeviceId(deviceId);
-		device.setOnline(1);
-		System.out.println("更新设备在线");
 		if (device == null) {
 			return false;
 		}
+		device.setOnline(1);
+		System.out.println("更新设备在线");
 		return deviceMapper.update(device) > 0;
 	}

@@ -216,10 +221,33 @@ public class VideoManagerStoragerImpl implements IVideoManagerStorager {
 		return deviceMapper.update(device) > 0;
 	}

-
+	/**
+	 * 清空通道
+	 * @param deviceId
+	 */
 	@Override
 	public void cleanChannelsForDevice(String deviceId) {
-		int result = deviceChannelMapper.cleanChannelsByDeviceId(deviceId);
+		deviceChannelMapper.cleanChannelsByDeviceId(deviceId);
+	}
+
+	/**
+	 * 添加Mobile Position设备移动位置
+	 * @param MobilePosition
+	 */
+	@Override
+	public synchronized boolean insertMobilePosition(MobilePosition mobilePosition) {
+		return deviceMobilePositionMapper.insertNewPosition(mobilePosition) > 0;
+	}
+
+	/**
+	 * 查询移动位置轨迹
+	 * @param deviceId
+	 * @param startTime
+	 * @param endTime
+	 */
+	@Override
+	public synchronized List<MobilePosition> queryMobilePositions(String deviceId, String startTime, String endTime) {
+		return deviceMobilePositionMapper.queryPositionByDeviceIdAndTime(deviceId, startTime, endTime);
 	}

 	@Override
@@ -283,7 +311,7 @@ public class VideoManagerStoragerImpl implements IVideoManagerStorager {

 	@Override
 	public PageInfo<ChannelReduce> queryAllChannelList(int page, int count, String query, Boolean online,
-														 Boolean channelType, String platformId, Boolean inPlatform) {
+													   Boolean channelType, String platformId, Boolean inPlatform) {
 		PageHelper.startPage(page, count);
 		List<ChannelReduce> all = deviceChannelMapper.queryChannelListInAll(query, online, channelType, platformId, inPlatform);
 		return new PageInfo<>(all);
@@ -341,4 +369,22 @@ public class VideoManagerStoragerImpl implements IVideoManagerStorager {
 		Device device = patformChannelMapper.queryVideoDeviceByPlatformIdAndChannelId(platformId, channelId);
 		return device;
 	}
+
+	/**
+	 * 查询最新移动位置
+	 * @param deviceId
+	 */
+	@Override
+	public MobilePosition queryLatestPosition(String deviceId) {
+		return deviceMobilePositionMapper.queryLatestPositionByDevice(deviceId);
+	}
+
+	/**
+	 * 删除指定设备的所有移动位置
+	 * @param deviceId
+	 */
+	public int clearMobilePositionsByDeviceId(String deviceId) {
+		return deviceMobilePositionMapper.clearMobilePositionsByDeviceId(deviceId);
+	}
+
 }