From 7e48d847402d2ea4da85af582529de676f30dc38 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 08 五月 2023 17:56:56 +0800
Subject: [PATCH] Merge pull request #844 from xiaoQQya/wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java | 745 ++++++++++++++++++++++++---------------------------------
1 files changed, 315 insertions(+), 430 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java b/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java
index 667a619..cee613d 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java
@@ -1,21 +1,20 @@
package com.genersoft.iot.vmp.storager.impl;
-import com.genersoft.iot.vmp.common.StreamInfo;
import com.genersoft.iot.vmp.conf.SipConfig;
+import com.genersoft.iot.vmp.conf.UserSetting;
import com.genersoft.iot.vmp.gb28181.bean.*;
import com.genersoft.iot.vmp.gb28181.event.EventPublisher;
import com.genersoft.iot.vmp.gb28181.event.subscribe.catalog.CatalogEvent;
import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyItem;
-import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem;
import com.genersoft.iot.vmp.service.IGbStreamService;
import com.genersoft.iot.vmp.service.bean.GPSMsgInfo;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
import com.genersoft.iot.vmp.storager.dao.*;
import com.genersoft.iot.vmp.storager.dao.dto.ChannelSourceInfo;
-import com.genersoft.iot.vmp.utils.node.ForestNodeMerger;
-import com.genersoft.iot.vmp.vmanager.bean.DeviceChannelTree;
+import com.genersoft.iot.vmp.utils.DateUtil;
import com.genersoft.iot.vmp.vmanager.gb28181.platform.bean.ChannelReduce;
+import com.genersoft.iot.vmp.web.gb28181.dto.DeviceChannelExtend;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import org.slf4j.Logger;
@@ -26,12 +25,13 @@
import org.springframework.transaction.TransactionDefinition;
import org.springframework.transaction.TransactionStatus;
import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.StringUtils;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.ObjectUtils;
-import java.text.SimpleDateFormat;
import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
-/**
+/**
* 瑙嗛璁惧鏁版嵁瀛樺偍-jdbc瀹炵幇
* swwheihei
* 2020骞�5鏈�6鏃� 涓嬪崍2:31:42
@@ -48,11 +48,12 @@
@Autowired
SipConfig sipConfig;
- @Autowired
- DataSourceTransactionManager dataSourceTransactionManager;
@Autowired
TransactionDefinition transactionDefinition;
+
+ @Autowired
+ DataSourceTransactionManager dataSourceTransactionManager;
@Autowired
private DeviceMapper deviceMapper;
@@ -82,6 +83,9 @@
private GbStreamMapper gbStreamMapper;
@Autowired
+ private UserSetting userSetting;
+
+ @Autowired
private PlatformCatalogMapper catalogMapper;
@Autowired
@@ -92,9 +96,6 @@
@Autowired
private ParentPlatformMapper parentPlatformMapper;
-
- private final SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-
/**
* 鏍规嵁璁惧ID鍒ゆ柇璁惧鏄惁瀛樺湪
@@ -107,150 +108,44 @@
return deviceMapper.getDeviceByDeviceId(deviceId) != null;
}
- /**
- * 瑙嗛璁惧鍒涘缓
- *
- * @param device 璁惧瀵硅薄
- * @return true锛氬垱寤烘垚鍔� false锛氬垱寤哄け璐�
- */
- @Override
- public synchronized boolean create(Device device) {
- redisCatchStorage.updateDevice(device);
- return deviceMapper.add(device) > 0;
- }
-
-
-
- /**
- * 瑙嗛璁惧鏇存柊
- *
- * @param device 璁惧瀵硅薄
- * @return true锛氭洿鏂版垚鍔� false锛氭洿鏂板け璐�
- */
- @Override
- public synchronized boolean updateDevice(Device device) {
- String now = this.format.format(System.currentTimeMillis());
- device.setUpdateTime(now);
- Device deviceByDeviceId = deviceMapper.getDeviceByDeviceId(device.getDeviceId());
- device.setCharset(device.getCharset().toUpperCase());
- if (deviceByDeviceId == null) {
- device.setCreateTime(now);
- redisCatchStorage.updateDevice(device);
- return deviceMapper.add(device) > 0;
- }else {
- redisCatchStorage.updateDevice(device);
-
- return deviceMapper.update(device) > 0;
- }
-
-
- }
-
- @Override
- 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());
- }
- String now = this.format.format(System.currentTimeMillis());
- channel.setUpdateTime(now);
- DeviceChannel deviceChannel = deviceChannelMapper.queryChannel(deviceId, channelId);
- if (deviceChannel == null) {
- channel.setCreateTime(now);
- deviceChannelMapper.add(channel);
- }else {
- deviceChannelMapper.update(channel);
- }
- deviceChannelMapper.updateChannelSubCount(deviceId,channel.getParentId());
- }
-
- @Override
- public int updateChannels(String deviceId, List<DeviceChannel> channels) {
- List<DeviceChannel> addChannels = new ArrayList<>();
- List<DeviceChannel> updateChannels = new ArrayList<>();
- HashMap<String, DeviceChannel> channelsInStore = new HashMap<>();
- if (channels != null && channels.size() > 0) {
- List<DeviceChannel> channelList = deviceChannelMapper.queryChannels(deviceId, null, null, null, null);
- if (channelList.size() == 0) {
- for (DeviceChannel channel : channels) {
- channel.setDeviceId(deviceId);
- StreamInfo streamInfo = redisCatchStorage.queryPlayByDevice(deviceId, channel.getChannelId());
- if (streamInfo != null) {
- channel.setStreamId(streamInfo.getStream());
- }
- String now = this.format.format(System.currentTimeMillis());
- channel.setUpdateTime(now);
- channel.setCreateTime(now);
- addChannels.add(channel);
- }
- }else {
- for (DeviceChannel deviceChannel : channelList) {
- channelsInStore.put(deviceChannel.getChannelId(), deviceChannel);
- }
- for (DeviceChannel channel : channels) {
- channel.setDeviceId(deviceId);
- StreamInfo streamInfo = redisCatchStorage.queryPlayByDevice(deviceId, channel.getChannelId());
- if (streamInfo != null) {
- channel.setStreamId(streamInfo.getStream());
- }
- String now = this.format.format(System.currentTimeMillis());
- channel.setUpdateTime(now);
- if (channelsInStore.get(channel.getChannelId()) != null) {
- updateChannels.add(channel);
- }else {
- addChannels.add(channel);
- channel.setCreateTime(now);
- }
- }
- }
- int limitCount = 300;
- if (addChannels.size() > 0) {
- if (addChannels.size() > limitCount) {
- for (int i = 0; i < addChannels.size(); i += limitCount) {
- int toIndex = i + limitCount;
- if (i + limitCount > addChannels.size()) {
- toIndex = addChannels.size();
- }
- deviceChannelMapper.batchAdd(addChannels.subList(i, toIndex));
- }
- }else {
- deviceChannelMapper.batchAdd(addChannels);
- }
- }
- if (updateChannels.size() > 0) {
- if (updateChannels.size() > limitCount) {
- for (int i = 0; i < updateChannels.size(); i += limitCount) {
- int toIndex = i + limitCount;
- if (i + limitCount > updateChannels.size()) {
- toIndex = updateChannels.size();
- }
- deviceChannelMapper.batchUpdate(updateChannels.subList(i, toIndex));
- }
- }else {
- deviceChannelMapper.batchUpdate(updateChannels);
- }
- }
- }
- return addChannels.size() + updateChannels.size();
- }
-
@Override
public boolean resetChannels(String deviceId, List<DeviceChannel> deviceChannelList) {
+ if (CollectionUtils.isEmpty(deviceChannelList)) {
+ return false;
+ }
+ List<DeviceChannel> allChannels = deviceChannelMapper.queryAllChannels(deviceId);
+ Map<String,DeviceChannel> allChannelMap = new ConcurrentHashMap<>();
+ if (allChannels.size() > 0) {
+ for (DeviceChannel deviceChannel : allChannels) {
+ allChannelMap.put(deviceChannel.getChannelId(), deviceChannel);
+ }
+ }
TransactionStatus transactionStatus = dataSourceTransactionManager.getTransaction(transactionDefinition);
// 鏁版嵁鍘婚噸
List<DeviceChannel> channels = new ArrayList<>();
StringBuilder stringBuilder = new StringBuilder();
Map<String, Integer> subContMap = new HashMap<>();
- if (deviceChannelList.size() > 1) {
+ if (deviceChannelList.size() > 0) {
// 鏁版嵁鍘婚噸
Set<String> gbIdSet = new HashSet<>();
for (DeviceChannel deviceChannel : deviceChannelList) {
if (!gbIdSet.contains(deviceChannel.getChannelId())) {
gbIdSet.add(deviceChannel.getChannelId());
+ if (allChannelMap.containsKey(deviceChannel.getChannelId())) {
+ deviceChannel.setStreamId(allChannelMap.get(deviceChannel.getChannelId()).getStreamId());
+ deviceChannel.setHasAudio(allChannelMap.get(deviceChannel.getChannelId()).isHasAudio());
+ if (allChannelMap.get(deviceChannel.getChannelId()).getStatus() !=deviceChannel.getStatus()){
+ List<String> strings = platformChannelMapper.queryParentPlatformByChannelId(deviceChannel.getChannelId());
+ if (!CollectionUtils.isEmpty(strings)){
+ strings.forEach(platformId->{
+ eventPublisher.catalogEventPublish(platformId, deviceChannel, deviceChannel.getStatus()==1?CatalogEvent.ON:CatalogEvent.OFF);
+ });
+ }
+
+ }
+ }
channels.add(deviceChannel);
- if (!StringUtils.isEmpty(deviceChannel.getParentId())) {
+ if (!ObjectUtils.isEmpty(deviceChannel.getParentId())) {
if (subContMap.get(deviceChannel.getParentId()) == null) {
subContMap.put(deviceChannel.getParentId(), 1);
}else {
@@ -270,11 +165,13 @@
}
}
- }else {
- channels = deviceChannelList;
}
if (stringBuilder.length() > 0) {
logger.info("[鐩綍鏌ヨ]鏀跺埌鐨勬暟鎹瓨鍦ㄩ噸澶嶏細 {}" , stringBuilder);
+ }
+ if(CollectionUtils.isEmpty(channels)){
+ logger.info("閫氶亾閲嶈锛屾暟鎹负绌�={}" , deviceChannelList);
+ return false;
}
try {
int cleanChannelsResult = deviceChannelMapper.cleanChannelsNotInList(deviceId, channels);
@@ -287,10 +184,10 @@
if (i + limitCount > channels.size()) {
toIndex = channels.size();
}
- result = result || deviceChannelMapper.batchAdd(channels.subList(i, toIndex)) < 0;
+ result = result || deviceChannelMapper.batchAddOrUpdate(channels.subList(i, toIndex)) < 0;
}
}else {
- result = result || deviceChannelMapper.batchAdd(channels) < 0;
+ result = result || deviceChannelMapper.batchAddOrUpdate(channels) < 0;
}
}
if (result) {
@@ -300,10 +197,126 @@
dataSourceTransactionManager.commit(transactionStatus); //鎵嬪姩鎻愪氦
return true;
}catch (Exception e) {
+ logger.error("鏈鐞嗙殑寮傚父 ", e);
dataSourceTransactionManager.rollback(transactionStatus);
return false;
}
+ }
+
+
+ @Override
+ public boolean updateChannels(String deviceId, List<DeviceChannel> deviceChannelList) {
+ if (CollectionUtils.isEmpty(deviceChannelList)) {
+ return false;
+ }
+ List<DeviceChannel> allChannels = deviceChannelMapper.queryAllChannels(deviceId);
+ Map<String,DeviceChannel> allChannelMap = new ConcurrentHashMap<>();
+ if (allChannels.size() > 0) {
+ for (DeviceChannel deviceChannel : allChannels) {
+ allChannelMap.put(deviceChannel.getChannelId(), deviceChannel);
+ }
+ }
+ List<DeviceChannel> addChannels = new ArrayList<>();
+ List<DeviceChannel> updateChannels = new ArrayList<>();
+
+
+ TransactionStatus transactionStatus = dataSourceTransactionManager.getTransaction(transactionDefinition);
+ // 鏁版嵁鍘婚噸
+ StringBuilder stringBuilder = new StringBuilder();
+ Map<String, Integer> subContMap = new HashMap<>();
+ if (deviceChannelList.size() > 0) {
+ // 鏁版嵁鍘婚噸
+ Set<String> gbIdSet = new HashSet<>();
+ for (DeviceChannel deviceChannel : deviceChannelList) {
+ if (!gbIdSet.contains(deviceChannel.getChannelId())) {
+ gbIdSet.add(deviceChannel.getChannelId());
+ if (allChannelMap.containsKey(deviceChannel.getChannelId())) {
+ deviceChannel.setStreamId(allChannelMap.get(deviceChannel.getChannelId()).getStreamId());
+ deviceChannel.setHasAudio(allChannelMap.get(deviceChannel.getChannelId()).isHasAudio());
+ deviceChannel.setUpdateTime(DateUtil.getNow());
+ updateChannels.add(deviceChannel);
+ }else {
+ deviceChannel.setCreateTime(DateUtil.getNow());
+ addChannels.add(deviceChannel);
+ }
+ if (!ObjectUtils.isEmpty(deviceChannel.getParentId())) {
+ if (subContMap.get(deviceChannel.getParentId()) == null) {
+ subContMap.put(deviceChannel.getParentId(), 1);
+ }else {
+ Integer count = subContMap.get(deviceChannel.getParentId());
+ subContMap.put(deviceChannel.getParentId(), count++);
+ }
+ }
+ }else {
+ stringBuilder.append(deviceChannel.getChannelId()).append(",");
+ }
+ }
+ if (addChannels.size() > 0) {
+ for (DeviceChannel channel : addChannels) {
+ if (subContMap.get(channel.getChannelId()) != null){
+ channel.setSubCount(subContMap.get(channel.getChannelId()));
+ }
+ }
+ }
+ if (updateChannels.size() > 0) {
+ for (DeviceChannel channel : updateChannels) {
+ if (subContMap.get(channel.getChannelId()) != null){
+ channel.setSubCount(subContMap.get(channel.getChannelId()));
+ }
+ }
+ }
+
+ }
+ if (stringBuilder.length() > 0) {
+ logger.info("[鐩綍鏌ヨ]鏀跺埌鐨勬暟鎹瓨鍦ㄩ噸澶嶏細 {}" , stringBuilder);
+ }
+ if(CollectionUtils.isEmpty(updateChannels) && CollectionUtils.isEmpty(addChannels) ){
+ logger.info("閫氶亾鏇存柊锛屾暟鎹负绌�={}" , deviceChannelList);
+ return false;
+ }
+ try {
+ int limitCount = 300;
+ boolean result = false;
+ if (addChannels.size() > 0) {
+ if (addChannels.size() > limitCount) {
+ for (int i = 0; i < addChannels.size(); i += limitCount) {
+ int toIndex = i + limitCount;
+ if (i + limitCount > addChannels.size()) {
+ toIndex = addChannels.size();
+ }
+ result = result || deviceChannelMapper.batchAddOrUpdate(addChannels.subList(i, toIndex)) < 0;
+ }
+ }else {
+ result = result || deviceChannelMapper.batchAddOrUpdate(addChannels) < 0;
+ }
+ }
+ if (updateChannels.size() > 0) {
+ if (updateChannels.size() > limitCount) {
+ for (int i = 0; i < updateChannels.size(); i += limitCount) {
+ int toIndex = i + limitCount;
+ if (i + limitCount > updateChannels.size()) {
+ toIndex = updateChannels.size();
+ }
+ result = result || deviceChannelMapper.batchUpdate(updateChannels.subList(i, toIndex)) < 0;
+ }
+ }else {
+ result = result || deviceChannelMapper.batchUpdate(updateChannels) < 0;
+ }
+ }
+ if (result) {
+ //浜嬪姟鍥炴粴
+ dataSourceTransactionManager.rollback(transactionStatus);
+ }else {
+ //鎵嬪姩鎻愪氦
+ dataSourceTransactionManager.commit(transactionStatus);
+ }
+ return true;
+ }catch (Exception e) {
+ logger.error("鏈鐞嗙殑寮傚父 ", e);
+ dataSourceTransactionManager.rollback(transactionStatus);
+ return false;
+ }
}
@Override
@@ -338,32 +351,41 @@
}
@Override
- public PageInfo queryChannelsByDeviceId(String deviceId, String query, Boolean hasSubChannel, Boolean online, int page, int count) {
+ public PageInfo queryChannelsByDeviceId(String deviceId, String query, Boolean hasSubChannel, Boolean online, Boolean catalogUnderDevice, int page, int count) {
// 鑾峰彇鍒版墍鏈夋鍦ㄦ挱鏀剧殑娴�
PageHelper.startPage(page, count);
- List<DeviceChannel> all = deviceChannelMapper.queryChannels(deviceId, null, query, hasSubChannel, online);
+ List<DeviceChannel> all;
+ if (catalogUnderDevice != null && catalogUnderDevice) {
+ all = deviceChannelMapper.queryChannels(deviceId, deviceId, query, hasSubChannel, online,null);
+ // 娴峰悍璁惧鐨刾arentId鏄疭IP id
+ List<DeviceChannel> deviceChannels = deviceChannelMapper.queryChannels(deviceId, sipConfig.getId(), query, hasSubChannel, online,null);
+ all.addAll(deviceChannels);
+ }else {
+ all = deviceChannelMapper.queryChannels(deviceId, null, query, hasSubChannel, online,null);
+ }
return new PageInfo<>(all);
}
@Override
- public List<DeviceChannel> queryChannelsByDeviceIdWithStartAndLimit(String deviceId, String query, Boolean hasSubChannel, Boolean online, int start, int limit) {
- return deviceChannelMapper.queryChannelsByDeviceIdWithStartAndLimit(deviceId, null, query, hasSubChannel, online, start, limit);
+ public List<DeviceChannelExtend> queryChannelsByDeviceIdWithStartAndLimit(String deviceId, List<String> channelIds, String query, Boolean hasSubChannel, Boolean online, int start, int limit) {
+ return deviceChannelMapper.queryChannelsByDeviceIdWithStartAndLimit(deviceId, channelIds, null, query, hasSubChannel, online, start, limit);
+ }
+
+
+ @Override
+ public List<DeviceChannel> queryChannelsByDeviceId(String deviceId,Boolean online,List<String> channelIds) {
+ return deviceChannelMapper.queryChannels(deviceId, null,null, null, online,channelIds);
}
@Override
- public List<DeviceChannelTree> tree(String deviceId) {
- return ForestNodeMerger.merge(deviceChannelMapper.tree(deviceId));
+ public List<DeviceChannelExtend> queryChannelsByDeviceId(String deviceId, List<String> channelIds, Boolean online) {
+ return deviceChannelMapper.queryChannelsWithDeviceInfo(deviceId, null,null, null, online,channelIds);
}
@Override
- public List<DeviceChannel> queryChannelsByDeviceId(String deviceId) {
- return deviceChannelMapper.queryChannels(deviceId, null,null, null, null);
- }
-
- @Override
- public PageInfo<DeviceChannel> querySubChannels(String deviceId, String parentChannelId, String query, Boolean hasSubChannel, String online, int page, int count) {
+ public PageInfo<DeviceChannel> querySubChannels(String deviceId, String parentChannelId, String query, Boolean hasSubChannel, Boolean online, int page, int count) {
PageHelper.startPage(page, count);
- List<DeviceChannel> all = deviceChannelMapper.queryChannels(deviceId, parentChannelId, null, null, null);
+ List<DeviceChannel> all = deviceChannelMapper.queryChannels(deviceId, parentChannelId, query, hasSubChannel, online,null);
return new PageInfo<>(all);
}
@@ -386,9 +408,9 @@
* @return PageInfo<Device> 鍒嗛〉璁惧瀵硅薄鏁扮粍
*/
@Override
- public PageInfo<Device> queryVideoDeviceList(int page, int count) {
+ public PageInfo<Device> queryVideoDeviceList(int page, int count,Boolean online) {
PageHelper.startPage(page, count);
- List<Device> all = deviceMapper.getDevices();
+ List<Device> all = deviceMapper.getDevices(online);
return new PageInfo<>(all);
}
@@ -398,84 +420,10 @@
* @return List<Device> 璁惧瀵硅薄鏁扮粍
*/
@Override
- public List<Device> queryVideoDeviceList() {
+ public List<Device> queryVideoDeviceList(Boolean online) {
- List<Device> deviceList = deviceMapper.getDevices();
+ List<Device> deviceList = deviceMapper.getDevices(online);
return deviceList;
- }
-
- /**
- * 鍒犻櫎璁惧
- *
- * @param deviceId 璁惧ID
- * @return true锛氬垹闄ゆ垚鍔� false锛氬垹闄ゅけ璐�
- */
- @Override
- public boolean delete(String deviceId) {
- TransactionStatus transactionStatus = dataSourceTransactionManager.getTransaction(transactionDefinition);
- boolean result = false;
- try {
- if (platformChannelMapper.delChannelForDeviceId(deviceId) <0 // 鍒犻櫎涓庡浗鏍囧钩鍙扮殑鍏宠仈
- || deviceChannelMapper.cleanChannelsByDeviceId(deviceId) < 0 // 鍒犻櫎浠栫殑閫氶亾
- || deviceMapper.del(deviceId) < 0 // 绉婚櫎璁惧淇℃伅
- ) {
- //浜嬪姟鍥炴粴
- dataSourceTransactionManager.rollback(transactionStatus);
- }
- result = true;
- dataSourceTransactionManager.commit(transactionStatus); //鎵嬪姩鎻愪氦
- }catch (Exception e) {
- dataSourceTransactionManager.rollback(transactionStatus);
- }
- return result;
- }
-
- /**
- * 鏇存柊璁惧鍦ㄧ嚎
- *
- * @param deviceId 璁惧ID
- * @return true锛氭洿鏂版垚鍔� false锛氭洿鏂板け璐�
- */
- @Override
- public synchronized boolean online(String deviceId) {
- Device device = deviceMapper.getDeviceByDeviceId(deviceId);
- if (device == null) {
- return false;
- }
- device.setOnline(1);
- logger.info("鏇存柊璁惧鍦ㄧ嚎: " + deviceId);
- redisCatchStorage.updateDevice(device);
- List<DeviceChannel> deviceChannelList = deviceChannelMapper.queryOnlineChannelsByDeviceId(deviceId);
- eventPublisher.catalogEventPublish(null, deviceChannelList, CatalogEvent.ON);
- return deviceMapper.update(device) > 0;
- }
-
- /**
- * 鏇存柊璁惧绂荤嚎
- *
- * @param deviceId 璁惧ID
- * @return true锛氭洿鏂版垚鍔� false锛氭洿鏂板け璐�
- */
- @Override
- public synchronized boolean outline(String deviceId) {
- logger.info("鏇存柊璁惧绂荤嚎: " + deviceId);
- Device device = deviceMapper.getDeviceByDeviceId(deviceId);
- if (device == null) return false;
- device.setOnline(0);
- redisCatchStorage.updateDevice(device);
- return deviceMapper.update(device) > 0;
- }
-
- /**
- * 鏇存柊鎵�鏈夎澶囩绾�
- *
- * @return true锛氭洿鏂版垚鍔� false锛氭洿鏂板け璐�
- */
- @Override
- public synchronized boolean outlineForAll() {
- logger.info("鏇存柊鎵�鏈夎澶囩绾�");
- int result = deviceMapper.outlineForAll();
- return result > 0;
}
/**
@@ -503,8 +451,8 @@
* @param endTime
*/
@Override
- public synchronized List<MobilePosition> queryMobilePositions(String deviceId, String startTime, String endTime) {
- return deviceMobilePositionMapper.queryPositionByDeviceIdAndTime(deviceId, startTime, endTime);
+ public synchronized List<MobilePosition> queryMobilePositions(String deviceId, String channelId, String startTime, String endTime) {
+ return deviceMobilePositionMapper.queryPositionByDeviceIdAndTime(deviceId, channelId, startTime, endTime);
}
@Override
@@ -519,6 +467,12 @@
@Override
public boolean updateParentPlatform(ParentPlatform parentPlatform) {
int result = 0;
+ if (parentPlatform.getCatalogGroup() == 0) {
+ parentPlatform.setCatalogGroup(1);
+ }
+ if (parentPlatform.getAdministrativeDivision() == null) {
+ parentPlatform.setAdministrativeDivision(parentPlatform.getAdministrativeDivision());
+ }
ParentPlatformCatch parentPlatformCatch = redisCatchStorage.queryPlatformCatchInfo(parentPlatform.getServerGBId()); // .getDeviceGBId());
if (parentPlatform.getId() == null ) {
if (parentPlatform.getCatalogId() == null) {
@@ -538,25 +492,12 @@
parentPlatformCatch.setId(parentPlatform.getServerGBId());
redisCatchStorage.delPlatformCatchInfo(parentPlatById.getServerGBId());
}
+
result = platformMapper.updateParentPlatform(parentPlatform);
}
// 鏇存柊缂撳瓨
parentPlatformCatch.setParentPlatform(parentPlatform);
redisCatchStorage.updatePlatformCatchInfo(parentPlatformCatch);
- if (parentPlatform.isEnable()) {
- // 鍏变韩鎵�鏈夎棰戞祦锛岄渶瑕佸皢鐜版湁瑙嗛娴佹坊鍔犲埌姝ゅ钩鍙�
- List<GbStream> gbStreams = gbStreamMapper.queryStreamNotInPlatform();
- if (gbStreams.size() > 0) {
- for (GbStream gbStream : gbStreams) {
- gbStream.setCatalogId(parentPlatform.getCatalogId());
- }
- if (parentPlatform.isShareAllLiveStream()) {
- gbStreamService.addPlatformInfo(gbStreams, parentPlatform.getServerGBId(), parentPlatform.getCatalogId());
- }else {
- gbStreamService.delPlatformInfo(parentPlatform.getServerGBId(), gbStreams);
- }
- }
- }
return result > 0;
}
@@ -571,13 +512,6 @@
}
@Override
- public PageInfo<ParentPlatform> queryParentPlatformList(int page, int count) {
- PageHelper.startPage(page, count);
- List<ParentPlatform> all = platformMapper.getParentPlatformList();
- return new PageInfo<>(all);
- }
-
- @Override
public ParentPlatform queryParentPlatByServerGBId(String platformGbId) {
return platformMapper.getParentPlatByServerGBId(platformGbId);
}
@@ -585,6 +519,16 @@
@Override
public List<ParentPlatform> queryEnableParentPlatformList(boolean enable) {
return platformMapper.getEnableParentPlatformList(enable);
+ }
+
+ @Override
+ public List<ParentPlatform> queryEnablePlatformListWithAsMessageChannel() {
+ return platformMapper.queryEnablePlatformListWithAsMessageChannel();
+ }
+
+ @Override
+ public List<Device> queryDeviceWithAsMessageChannel() {
+ return deviceMapper.queryDeviceWithAsMessageChannel();
}
@Override
@@ -605,36 +549,6 @@
public List<DeviceChannelInPlatform> queryChannelListInParentPlatform(String platformId) {
return deviceChannelMapper.queryChannelByPlatformId(platformId);
- }
-
- @Override
- public int updateChannelForGB(String platformId, List<ChannelReduce> channelReduces, String catalogId) {
-
- Map<Integer, ChannelReduce> deviceAndChannels = new HashMap<>();
- for (ChannelReduce channelReduce : channelReduces) {
- channelReduce.setCatalogId(catalogId);
- deviceAndChannels.put(channelReduce.getId(), channelReduce);
- }
- List<Integer> deviceAndChannelList = new ArrayList<>(deviceAndChannels.keySet());
- // 鏌ヨ褰撳墠宸茬粡瀛樺湪鐨�
- List<Integer> channelIds = platformChannelMapper.findChannelRelatedPlatform(platformId, channelReduces);
- if (deviceAndChannelList != null) {
- deviceAndChannelList.removeAll(channelIds);
- }
- for (Integer channelId : channelIds) {
- deviceAndChannels.remove(channelId);
- }
- List<ChannelReduce> channelReducesToAdd = new ArrayList<>(deviceAndChannels.values());
- // 瀵瑰墿涓嬬殑鏁版嵁杩涜瀛樺偍
- int result = 0;
- if (channelReducesToAdd.size() > 0) {
- result = platformChannelMapper.addChannels(platformId, channelReducesToAdd);
- // TODO 鍚庣画缁欏钩鍙板鍔犳帶鍒跺紑鍏充互鎺у埗鏄惁鍝嶅簲鐩綍璁㈤槄
- List<DeviceChannel> deviceChannelList = getDeviceChannelListByChannelReduceList(channelReducesToAdd, catalogId);
- eventPublisher.catalogEventPublish(platformId, deviceChannelList, CatalogEvent.ADD);
- }
-
- return result;
}
@@ -694,6 +608,20 @@
}
+ @Override
+ public Device queryDeviceInfoByPlatformIdAndChannelId(String platformId, String channelId) {
+ List<Device> devices = platformChannelMapper.queryDeviceInfoByPlatformIdAndChannelId(platformId, channelId);
+ if (devices.size() > 1) {
+ // 鍑虹幇闀垮害澶т簬0鐨勬椂鍊欒偗瀹氭槸鍥芥爣閫氶亾鐨処D閲嶅浜�
+ logger.warn("鍥芥爣ID瀛樺湪閲嶅锛歿}", channelId);
+ }
+ if (devices.size() == 0) {
+ return null;
+ }else {
+ return devices.get(0);
+ }
+ }
+
/**
* 鏌ヨ鏈�鏂扮Щ鍔ㄤ綅缃�
* @param deviceId
@@ -707,82 +635,11 @@
* 鍒犻櫎鎸囧畾璁惧鐨勬墍鏈夌Щ鍔ㄤ綅缃�
* @param deviceId
*/
+ @Override
public int clearMobilePositionsByDeviceId(String deviceId) {
return deviceMobilePositionMapper.clearMobilePositionsByDeviceId(deviceId);
}
- /**
- * 鏂板浠ｇ悊娴�
- * @param streamProxyItem
- * @return
- */
- @Override
- public boolean addStreamProxy(StreamProxyItem streamProxyItem) {
- TransactionStatus transactionStatus = dataSourceTransactionManager.getTransaction(transactionDefinition);
- boolean result = false;
- streamProxyItem.setStreamType("proxy");
- streamProxyItem.setStatus(true);
- String now = this.format.format(System.currentTimeMillis());
- streamProxyItem.setCreateTime(now);
- streamProxyItem.setCreateStamp(System.currentTimeMillis());
- try {
- if (streamProxyMapper.add(streamProxyItem) > 0) {
- if (!StringUtils.isEmpty(streamProxyItem.getGbId())) {
- if (gbStreamMapper.add(streamProxyItem) < 0) {
- //浜嬪姟鍥炴粴
- dataSourceTransactionManager.rollback(transactionStatus);
- return false;
- }
- }
- }else {
- //浜嬪姟鍥炴粴
- dataSourceTransactionManager.rollback(transactionStatus);
- return false;
- }
- result = true;
- dataSourceTransactionManager.commit(transactionStatus); //鎵嬪姩鎻愪氦
- }catch (Exception e) {
- logger.error("鍚戞暟鎹簱娣诲姞娴佷唬鐞嗗け璐ワ細", e);
- dataSourceTransactionManager.rollback(transactionStatus);
- }
-
-
- return result;
- }
-
- /**
- * 鏇存柊浠ｇ悊娴�
- * @param streamProxyItem
- * @return
- */
- @Override
- public boolean updateStreamProxy(StreamProxyItem streamProxyItem) {
- TransactionStatus transactionStatus = dataSourceTransactionManager.getTransaction(transactionDefinition);
- boolean result = false;
- streamProxyItem.setStreamType("proxy");
- try {
- if (streamProxyMapper.update(streamProxyItem) > 0) {
- if (!StringUtils.isEmpty(streamProxyItem.getGbId())) {
- if (gbStreamMapper.updateByAppAndStream(streamProxyItem) == 0) {
- //浜嬪姟鍥炴粴
- dataSourceTransactionManager.rollback(transactionStatus);
- return false;
- }
- }
- } else {
- //浜嬪姟鍥炴粴
- dataSourceTransactionManager.rollback(transactionStatus);
- return false;
- }
-
- dataSourceTransactionManager.commit(transactionStatus); //鎵嬪姩鎻愪氦
- result = true;
- }catch (Exception e) {
- e.printStackTrace();
- dataSourceTransactionManager.rollback(transactionStatus);
- }
- return result;
- }
/**
* 绉婚櫎浠ｇ悊娴�
@@ -835,8 +692,8 @@
* @return
*/
@Override
- public List<GbStream> queryGbStreamListInPlatform(String platformId) {
- return gbStreamMapper.queryGbStreamListInPlatform(platformId);
+ public List<DeviceChannel> queryGbStreamListInPlatform(String platformId) {
+ return gbStreamMapper.queryGbStreamListInPlatform(platformId, userSetting.isUsePushingAsStatus());
}
/**
@@ -851,58 +708,32 @@
}
@Override
- public void updateMediaList(List<StreamPushItem> streamPushItems) {
- if (streamPushItems == null || streamPushItems.size() == 0) return;
- logger.info("updateMediaList: " + streamPushItems.size());
- streamPushMapper.addAll(streamPushItems);
- // TODO 寰呬紭鍖�
- for (int i = 0; i < streamPushItems.size(); i++) {
- int onlineResult = gbStreamMapper.setStatus(streamPushItems.get(i).getApp(), streamPushItems.get(i).getStream(), true);
- if (onlineResult > 0) {
- // 鍙戦�佷笂绾块�氱煡
- eventPublisher.catalogEventPublishForStream(null, streamPushItems.get(i), CatalogEvent.ON);
- }
- }
- }
-
- @Override
- public void updateMedia(StreamPushItem streamPushItem) {
- streamPushMapper.del(streamPushItem.getApp(), streamPushItem.getStream());
- streamPushMapper.add(streamPushItem);
- gbStreamMapper.setStatus(streamPushItem.getApp(), streamPushItem.getStream(), true);
-
- if(!StringUtils.isEmpty(streamPushItem.getGbId() )){
- // 鏌ユ壘寮�鍚簡鍏ㄩ儴鐩存挱娴佸叡浜殑涓婄骇骞冲彴
- List<ParentPlatform> parentPlatforms = parentPlatformMapper.selectAllAhareAllLiveStream();
- if (parentPlatforms.size() > 0) {
- for (ParentPlatform parentPlatform : parentPlatforms) {
- StreamProxyItem streamProxyItem = platformGbStreamMapper.selectOne(streamPushItem.getApp(), streamPushItem.getStream(),
- parentPlatform.getServerGBId());
- if (streamProxyItem == null) {
- streamPushItem.setCatalogId(parentPlatform.getCatalogId());
- streamPushItem.setPlatformId(parentPlatform.getServerGBId());
- platformGbStreamMapper.add(streamPushItem);
- eventPublisher.catalogEventPublishForStream(parentPlatform.getServerGBId(), streamPushItem, CatalogEvent.ADD);
- }
- }
- }
- }
-
- }
-
- @Override
public int removeMedia(String app, String stream) {
return streamPushMapper.del(app, stream);
}
@Override
- public void clearMediaList() {
- streamPushMapper.clear();
+ public int mediaOffline(String app, String stream) {
+ GbStream gbStream = gbStreamMapper.selectOne(app, stream);
+ int result;
+ if ("proxy".equals(gbStream.getStreamType())) {
+ result = streamProxyMapper.updateStatus(app, stream, false);
+ }else {
+ result = streamPushMapper.updatePushStatus(app, stream, false);
+ }
+ return result;
}
@Override
- public int mediaOutline(String app, String streamId) {
- return gbStreamMapper.setStatus(app, streamId, false);
+ public int mediaOnline(String app, String stream) {
+ GbStream gbStream = gbStreamMapper.selectOne(app, stream);
+ int result;
+ if ("proxy".equals(gbStream.getStreamType())) {
+ result = streamProxyMapper.updateStatus(app, stream, true);
+ }else {
+ result = streamPushMapper.updatePushStatus(app, stream, true);
+ }
+ return result;
}
@Override
@@ -938,12 +769,44 @@
@Override
public int addCatalog(PlatformCatalog platformCatalog) {
+ ParentPlatform platform = platformMapper.getParentPlatByServerGBId(platformCatalog.getPlatformId());
+ if (platform == null) {
+ return 0;
+ }
+ if (platform.getTreeType().equals(TreeType.BUSINESS_GROUP)) {
+ if (platform.getDeviceGBId().equals(platformCatalog.getParentId())) {
+ // 绗竴灞傝妭鐐�
+ platformCatalog.setBusinessGroupId(platformCatalog.getId());
+ platformCatalog.setParentId(platform.getDeviceGBId());
+ }else {
+ // 鑾峰彇椤跺眰鐨�
+ PlatformCatalog topCatalog = getTopCatalog(platformCatalog.getParentId(), platform.getDeviceGBId());
+ platformCatalog.setBusinessGroupId(topCatalog.getId());
+ }
+ }
+ if (platform.getTreeType().equals(TreeType.CIVIL_CODE)) {
+ platformCatalog.setCivilCode(platformCatalog.getId());
+ if (platformCatalog.getPlatformId().equals(platformCatalog.getParentId())) {
+ // 绗竴灞傝妭鐐�
+ platformCatalog.setParentId(platform.getDeviceGBId());
+ }
+ }
+
int result = catalogMapper.add(platformCatalog);
if (result > 0) {
DeviceChannel deviceChannel = getDeviceChannelByCatalog(platformCatalog);
eventPublisher.catalogEventPublish(platformCatalog.getPlatformId(), deviceChannel, CatalogEvent.ADD);
}
return result;
+ }
+
+ private PlatformCatalog getTopCatalog(String id, String platformId) {
+ PlatformCatalog catalog = catalogMapper.selectParentCatalog(id);
+ if (catalog.getParentId().equals(platformId)) {
+ return catalog;
+ }else {
+ return getTopCatalog(catalog.getParentId(), platformId);
+ }
}
@Override
@@ -1012,12 +875,12 @@
@Override
public int setDefaultCatalog(String platformId, String catalogId) {
- return platformMapper.setDefaultCatalog(platformId, catalogId);
+ return platformMapper.setDefaultCatalog(platformId, catalogId, DateUtil.getNow());
}
@Override
- public List<PlatformCatalog> queryCatalogInPlatform(String platformId) {
- return catalogMapper.selectByPlatForm(platformId);
+ public List<DeviceChannel> queryCatalogInPlatform(String platformId) {
+ return catalogMapper.queryCatalogInPlatform(platformId);
}
@Override
@@ -1046,34 +909,26 @@
return gbStreamMapper.updateStreamGPS(gpsMsgInfos);
}
- private List<DeviceChannel> getDeviceChannelListByChannelReduceList(List<ChannelReduce> channelReduces, String catalogId) {
- List<DeviceChannel> deviceChannelList = new ArrayList<>();
- if (channelReduces.size() > 0){
- for (ChannelReduce channelReduce : channelReduces) {
- DeviceChannel deviceChannel = queryChannel(channelReduce.getDeviceId(), channelReduce.getChannelId());
- deviceChannel.setParental(1);
- deviceChannel.setParentId(catalogId);
- deviceChannelList.add(deviceChannel);
- }
- }
- return deviceChannelList;
- }
private DeviceChannel getDeviceChannelByCatalog(PlatformCatalog catalog) {
- ParentPlatform parentPlatByServerGBId = platformMapper.getParentPlatByServerGBId(catalog.getPlatformId());
+ ParentPlatform platform = platformMapper.getParentPlatByServerGBId(catalog.getPlatformId());
DeviceChannel deviceChannel = new DeviceChannel();
deviceChannel.setChannelId(catalog.getId());
deviceChannel.setName(catalog.getName());
deviceChannel.setLongitude(0.0);
deviceChannel.setLatitude(0.0);
- deviceChannel.setDeviceId(parentPlatByServerGBId.getDeviceGBId());
+ deviceChannel.setDeviceId(platform.getDeviceGBId());
deviceChannel.setManufacture("wvp-pro");
deviceChannel.setStatus(1);
deviceChannel.setParental(1);
- deviceChannel.setParentId(catalog.getParentId());
+
deviceChannel.setRegisterWay(1);
// 琛屾斂鍖哄垝搴旇鏄疍omain鐨勫墠鍏綅
- deviceChannel.setCivilCode(parentPlatByServerGBId.getDeviceGBId().substring(0,6));
+ if (platform.getTreeType().equals(TreeType.BUSINESS_GROUP)) {
+ deviceChannel.setParentId(catalog.getParentId());
+ deviceChannel.setBusinessGroupId(catalog.getBusinessGroupId());
+ }
+
deviceChannel.setModel("live");
deviceChannel.setOwner("wvp-pro");
deviceChannel.setSecrecy("0");
@@ -1125,7 +980,37 @@
}
@Override
- public void updateChannelPotion(String deviceId, String channelId, double longitude, double latitude) {
- deviceChannelMapper.updatePotion(deviceId, channelId, longitude, latitude);
+ public void updateChannelPosition(DeviceChannel deviceChannel) {
+ if (deviceChannel.getChannelId().equals(deviceChannel.getDeviceId())) {
+ deviceChannel.setChannelId(null);
+ }
+ if (deviceChannel.getGpsTime() == null) {
+ deviceChannel.setGpsTime(DateUtil.getNow());
+ }
+
+ deviceChannelMapper.updatePosition(deviceChannel);
+ }
+
+ @Override
+ public void cleanContentForPlatform(String serverGBId) {
+// List<PlatformCatalog> catalogList = catalogMapper.selectByPlatForm(serverGBId);
+// if (catalogList.size() > 0) {
+// int result = catalogMapper.delByPlatformId(serverGBId);
+// if (result > 0) {
+// List<DeviceChannel> deviceChannels = new ArrayList<>();
+// for (PlatformCatalog catalog : catalogList) {
+// deviceChannels.add(getDeviceChannelByCatalog(catalog));
+// }
+// eventPublisher.catalogEventPublish(serverGBId, deviceChannels, CatalogEvent.DEL);
+// }
+// }
+ catalogMapper.delByPlatformId(serverGBId);
+ platformChannelMapper.delByPlatformId(serverGBId);
+ platformGbStreamMapper.delByPlatformId(serverGBId);
+ }
+
+ @Override
+ public List<DeviceChannel> queryChannelWithCatalog(String serverGBId) {
+ return deviceChannelMapper.queryChannelWithCatalog(serverGBId);
}
}
--
Gitblit v1.8.0