From c3d3acc1f7f02caee2cc7dfe47ef8217ffcb7965 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 07 Mar 2023 14:13:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/main'
---
src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java | 37 +++++++++++++++++++++++++++++++++++++
1 files changed, 37 insertions(+), 0 deletions(-)
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 e6a468e..0139bbb 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
@@ -9,6 +9,9 @@
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyItem;
import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem;
+import com.genersoft.iot.vmp.policeBodyCamera.entity.DeviceChannelPoliceCamera;
+import com.genersoft.iot.vmp.policeBodyCamera.mapper.DeviceChannelPoliceCameraMapper;
+import com.genersoft.iot.vmp.policeBodyCamera.service.DeviceChannelPoliceCameraService;
import com.genersoft.iot.vmp.service.IGbStreamService;
import com.genersoft.iot.vmp.service.bean.GPSMsgInfo;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
@@ -102,6 +105,12 @@
@Autowired
private MediaServerMapper mediaServerMapper;
+ @Autowired
+ private DeviceChannelPoliceCameraService deviceChannelPoliceCameraService;
+
+ @Autowired
+ private DeviceChannelPoliceCameraMapper deviceChannelPoliceCameraMapper;
+
private SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -159,6 +168,7 @@
public synchronized void updateChannel(String deviceId, DeviceChannel channel) {
String channelId = channel.getChannelId();
channel.setDeviceId(deviceId);
+ //更新通道数据
StreamInfo streamInfo = redisCatchStorage.queryPlayByDevice(deviceId, channelId);
if (streamInfo != null) {
channel.setStreamId(streamInfo.getStream());
@@ -173,6 +183,12 @@
deviceChannelMapper.update(channel);
}
deviceChannelMapper.updateChannelSubCount(deviceId,channel.getParentId());
+ System.out.println("设备名称 = " + channel.getName());
+ //如果是是执法记录仪
+// if (null!=channel.getName() && channel.getName().contains("执法记录仪")){
+ //更新执法记录仪信息
+ deviceChannelPoliceCameraService.updateChannelPoliceCamera(channel);
+// }
}
@Override
@@ -223,9 +239,15 @@
toIndex = addChannels.size();
}
deviceChannelMapper.batchAdd(addChannels.subList(i, toIndex));
+ //执法记录仪数据新增
+ System.out.println("执法记录仪批量新增 ================= ");
+ deviceChannelPoliceCameraMapper.batchAdd(addChannels.subList(i, toIndex));
}
}else {
deviceChannelMapper.batchAdd(addChannels);
+ //执法记录仪数据新增
+ System.out.println("执法记录仪批量新增 ================= ");
+ deviceChannelPoliceCameraMapper.batchAdd(addChannels);
}
}
if (updateChannels.size() > 0) {
@@ -236,9 +258,15 @@
toIndex = updateChannels.size();
}
deviceChannelMapper.batchUpdate(updateChannels.subList(i, toIndex));
+ //执法记录仪数据修改
+ System.out.println("执法记录仪批量修改 ================= ");
+ deviceChannelPoliceCameraMapper.batchUpdate(updateChannels.subList(i, toIndex));
}
}else {
deviceChannelMapper.batchUpdate(updateChannels);
+ //执法记录仪数据修改
+ System.out.println("执法记录仪批量修改 ================= ");
+ deviceChannelPoliceCameraMapper.batchUpdate(updateChannels);
}
}
}
@@ -392,6 +420,12 @@
@Override
public int delChannel(String deviceId, String channelId) {
+ //查询设备信息
+ DeviceChannel deviceChannel = deviceChannelMapper.queryChannel(deviceId, channelId);
+ if (deviceChannel.getName().contains("执法记录仪")){
+ //同时删除执法记录仪信息
+ deviceChannelPoliceCameraService.del(deviceId, channelId);
+ }
return deviceChannelMapper.del(deviceId, channelId);
}
@@ -510,6 +544,9 @@
*/
@Override
public synchronized boolean insertMobilePosition(MobilePosition mobilePosition) {
+ if (mobilePosition.getDeviceName().contains("执法记录仪")){
+ deviceChannelPoliceCameraService.insertNewPositionPoliceCamera(mobilePosition);
+ }
return deviceMobilePositionMapper.insertNewPosition(mobilePosition) > 0;
}
--
Gitblit v1.9.3