From 6c05d0bde1a620e355d8543e909d99e6487e333c Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Sat, 04 Mar 2023 11:19:28 +0800
Subject: [PATCH] 执法记录仪移动位置插入新增

---
 src/main/java/com/genersoft/iot/vmp/policeBodyCamera/service/impl/DeviceChannelPoliceCameraServiceImpl.java |   10 ++++++++++
 src/main/java/com/genersoft/iot/vmp/policeBodyCamera/service/DeviceChannelPoliceCameraService.java          |    7 +++++++
 src/main/java/com/genersoft/iot/vmp/policeBodyCamera/mapper/DeviceChannelPoliceCameraMapper.java            |   10 ++++++++++
 src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java                             |    5 ++++-
 4 files changed, 31 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/policeBodyCamera/mapper/DeviceChannelPoliceCameraMapper.java b/src/main/java/com/genersoft/iot/vmp/policeBodyCamera/mapper/DeviceChannelPoliceCameraMapper.java
index 9bc4528..d5323c9 100644
--- a/src/main/java/com/genersoft/iot/vmp/policeBodyCamera/mapper/DeviceChannelPoliceCameraMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/policeBodyCamera/mapper/DeviceChannelPoliceCameraMapper.java
@@ -1,6 +1,7 @@
 package com.genersoft.iot.vmp.policeBodyCamera.mapper;
 
 import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
+import com.genersoft.iot.vmp.gb28181.bean.MobilePosition;
 import com.genersoft.iot.vmp.policeBodyCamera.entity.DeviceChannelPoliceCamera;
 import com.genersoft.iot.vmp.vmanager.bean.DeviceChannelTree;
 import com.genersoft.iot.vmp.vmanager.gb28181.platform.bean.ChannelReduce;
@@ -347,4 +348,13 @@
             " where deviceId = #{deviceId} " +
             " and channelId = #{channelId}")
     int updateChannelSubCount(String deviceId, String channelId);
+
+    /**
+     * 添加执法记录仪移动位置信息
+     * @param mobilePosition
+     * @return
+     */
+    @Insert("INSERT INTO device_mobile_position_police_camera (deviceId,channelId, deviceName, time, longitude, latitude, altitude, speed, direction, reportSource, geodeticSystem, cnLng, cnLat) " +
+            "VALUES ('${deviceId}','${channelId}', '${deviceName}', '${time}', ${longitude}, ${latitude}, ${altitude}, ${speed}, ${direction}, '${reportSource}', '${geodeticSystem}', '${cnLng}', '${cnLat}')")
+    int insertNewPositionPoliceCamera(MobilePosition mobilePosition);
 }
diff --git a/src/main/java/com/genersoft/iot/vmp/policeBodyCamera/service/DeviceChannelPoliceCameraService.java b/src/main/java/com/genersoft/iot/vmp/policeBodyCamera/service/DeviceChannelPoliceCameraService.java
index fe30458..767a2f8 100644
--- a/src/main/java/com/genersoft/iot/vmp/policeBodyCamera/service/DeviceChannelPoliceCameraService.java
+++ b/src/main/java/com/genersoft/iot/vmp/policeBodyCamera/service/DeviceChannelPoliceCameraService.java
@@ -1,6 +1,7 @@
 package com.genersoft.iot.vmp.policeBodyCamera.service;
 
 import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
+import com.genersoft.iot.vmp.gb28181.bean.MobilePosition;
 
 public interface DeviceChannelPoliceCameraService {
 
@@ -16,4 +17,10 @@
      * @param channelId
      */
     void del(String deviceId, String channelId);
+
+    /**
+     * 添加执法记录仪移动位置信息
+     * @param mobilePosition
+     */
+    void insertNewPositionPoliceCamera(MobilePosition mobilePosition);
 }
diff --git a/src/main/java/com/genersoft/iot/vmp/policeBodyCamera/service/impl/DeviceChannelPoliceCameraServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/policeBodyCamera/service/impl/DeviceChannelPoliceCameraServiceImpl.java
index 8343324..3e6c9b6 100644
--- a/src/main/java/com/genersoft/iot/vmp/policeBodyCamera/service/impl/DeviceChannelPoliceCameraServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/policeBodyCamera/service/impl/DeviceChannelPoliceCameraServiceImpl.java
@@ -2,6 +2,7 @@
 
 import com.genersoft.iot.vmp.common.StreamInfo;
 import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
+import com.genersoft.iot.vmp.gb28181.bean.MobilePosition;
 import com.genersoft.iot.vmp.policeBodyCamera.entity.DeviceChannelPoliceCamera;
 import com.genersoft.iot.vmp.policeBodyCamera.mapper.DeviceChannelPoliceCameraMapper;
 import com.genersoft.iot.vmp.policeBodyCamera.service.DeviceChannelPoliceCameraService;
@@ -62,4 +63,13 @@
     public void del(String deviceId, String channelId) {
         deviceChannelPoliceCameraMapper.del(deviceId,channelId);
     }
+
+    /**
+     * 添加执法记录仪移动位置信息
+     * @param mobilePosition
+     */
+    @Override
+    public void insertNewPositionPoliceCamera(MobilePosition mobilePosition) {
+        deviceChannelPoliceCameraMapper.insertNewPositionPoliceCamera(mobilePosition);
+    }
 }
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java b/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java
index bbcc055..0c5bb60 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java
@@ -405,7 +405,7 @@
 	public int delChannel(String deviceId, String channelId) {
 		//查询设备信息
 		DeviceChannel deviceChannel = deviceChannelMapper.queryChannel(deviceId, channelId);
-		if (deviceChannel.getName().equals("执法记录仪")){
+		if (deviceChannel.getName().contains("执法记录仪")){
 			//同时删除执法记录仪信息
 			deviceChannelPoliceCameraService.del(deviceId, channelId);
 		}
@@ -527,6 +527,9 @@
 	 */
 	@Override
 	public synchronized boolean insertMobilePosition(MobilePosition mobilePosition) {
+		if (mobilePosition.getDeviceName().contains("执法记录仪")){
+			deviceChannelPoliceCameraService.insertNewPositionPoliceCamera(mobilePosition);
+		}
 		return deviceMobilePositionMapper.insertNewPosition(mobilePosition) > 0;
 	}
 

--
Gitblit v1.9.3