Merge branch '2.6.9' into wvp-28181-2.0

648540858
2 parents 5a3b1c04 d68aebd4
Showing 15 changed files with 32 additions and 2 deletions
src/main/java/com/genersoft/iot/vmp/service/impl/DeviceAlarmServiceImpl.java
src/main/java/com/genersoft/iot/vmp/service/impl/DeviceChannelServiceImpl.java
src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java
src/main/java/com/genersoft/iot/vmp/service/impl/GbStreamServiceImpl.java
src/main/java/com/genersoft/iot/vmp/service/impl/InviteStreamServiceImpl.java
src/main/java/com/genersoft/iot/vmp/service/impl/LogServiceImpl.java
src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
src/main/java/com/genersoft/iot/vmp/service/impl/PlatformChannelServiceImpl.java
src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java
src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
src/main/java/com/genersoft/iot/vmp/service/impl/RoleServerImpl.java
src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
src/main/java/com/genersoft/iot/vmp/service/impl/StreamPushServiceImpl.java
src/main/java/com/genersoft/iot/vmp/service/impl/UserServiceImpl.java
src/main/java/com/genersoft/iot/vmp/vmanager/cloudRecord/CloudRecordController.java
 package com.genersoft.iot.vmp.service.impl;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.genersoft.iot.vmp.gb28181.bean.DeviceAlarm;
 import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyItem;
 import com.genersoft.iot.vmp.service.IDeviceAlarmService;
@@ -12,6 +13,7 @@ import org.springframework.stereotype.Service;
 import java.util.List;
 @Service
+@DS("master")
 public class DeviceAlarmServiceImpl implements IDeviceAlarmService {
     @Autowired
 package com.genersoft.iot.vmp.service.impl;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.genersoft.iot.vmp.common.InviteInfo;
 import com.genersoft.iot.vmp.common.InviteSessionType;
 import com.genersoft.iot.vmp.gb28181.bean.Device;
@@ -27,6 +28,7 @@ import java.util.concurrent.CopyOnWriteArrayList;
  * @author lin
  */
 @Service
+@DS("master")
 public class DeviceChannelServiceImpl implements IDeviceChannelService {
     private final static Logger logger = LoggerFactory.getLogger(DeviceChannelServiceImpl.class);
 package com.genersoft.iot.vmp.service.impl;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.genersoft.iot.vmp.common.VideoManagerConstants;
 import com.genersoft.iot.vmp.conf.DynamicTask;
 import com.genersoft.iot.vmp.conf.UserSetting;
@@ -45,6 +46,7 @@ import java.util.concurrent.TimeUnit;
  * 设备业务（目录订阅）
  */
 @Service
+@DS("master")
 public class DeviceServiceImpl implements IDeviceService {
     private final static Logger logger = LoggerFactory.getLogger(DeviceServiceImpl.class);
 package com.genersoft.iot.vmp.service.impl;
+import com.baomidou.dynamic.datasource.annotation.DS;
 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;
@@ -25,6 +26,7 @@ import java.util.ArrayList;
 import java.util.List;
 @Service
+@DS("master")
 public class GbStreamServiceImpl implements IGbStreamService {
     private final static Logger logger = LoggerFactory.getLogger(GbStreamServiceImpl.class);
 package com.genersoft.iot.vmp.service.impl;
 import com.alibaba.fastjson2.JSON;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.genersoft.iot.vmp.common.InviteInfo;
 import com.genersoft.iot.vmp.common.InviteSessionStatus;
 import com.genersoft.iot.vmp.common.InviteSessionType;
@@ -20,6 +21,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CopyOnWriteArrayList;
 @Service
+@DS("master")
 public class InviteStreamServiceImpl implements IInviteStreamService {
     private final Logger logger = LoggerFactory.getLogger(InviteStreamServiceImpl.class);
 package com.genersoft.iot.vmp.service.impl;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.genersoft.iot.vmp.gb28181.bean.DeviceAlarm;
 import com.genersoft.iot.vmp.service.ILogService;
 import com.genersoft.iot.vmp.storager.dao.LogMapper;
@@ -12,6 +13,7 @@ import org.springframework.stereotype.Service;
 import java.util.List;
 @Service
+@DS("master")
 public class LogServiceImpl implements ILogService {
     @Autowired
@@ -3,6 +3,7 @@ package com.genersoft.iot.vmp.service.impl;
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.genersoft.iot.vmp.common.CommonCallback;
 import com.genersoft.iot.vmp.common.VideoManagerConstants;
 import com.genersoft.iot.vmp.conf.DynamicTask;
@@ -53,6 +54,7 @@ import java.util.concurrent.ExecutionException;
  * 媒体服务器节点管理
  */
 @Service
+@DS("master")
 public class MediaServerServiceImpl implements IMediaServerService {
     private final static Logger logger = LoggerFactory.getLogger(MediaServerServiceImpl.class);
@@ -306,7 +308,6 @@ public class MediaServerServiceImpl implements IMediaServerService {
     @Override
     public MediaServerItem getDefaultMediaServer() {
-
         return mediaServerMapper.queryDefault();
     }
 package com.genersoft.iot.vmp.service.impl;
+import com.baomidou.dynamic.datasource.annotation.DS;
 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;
@@ -27,6 +28,7 @@ import java.util.Map;
  * @author lin
  */
 @Service
+@DS("master")
 public class PlatformChannelServiceImpl implements IPlatformChannelService {
     private final static Logger logger = LoggerFactory.getLogger(PlatformChannelServiceImpl.class);
 package com.genersoft.iot.vmp.service.impl;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.genersoft.iot.vmp.conf.DynamicTask;
 import com.genersoft.iot.vmp.conf.UserSetting;
 import com.genersoft.iot.vmp.gb28181.bean.*;
@@ -38,6 +39,7 @@ import java.util.*;
  * @author lin
  */
 @Service
+@DS("master")
 public class PlatformServiceImpl implements IPlatformService {
     private final static String REGISTER_KEY_PREFIX = "platform_register_";
@@ -2,6 +2,7 @@ package com.genersoft.iot.vmp.service.impl;
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.genersoft.iot.vmp.common.InviteInfo;
 import com.genersoft.iot.vmp.common.InviteSessionStatus;
 import com.genersoft.iot.vmp.common.InviteSessionType;
@@ -53,6 +54,7 @@ import java.util.Vector;
 @SuppressWarnings(value = {"rawtypes", "unchecked"})
 @Service
+@DS("master")
 public class PlayServiceImpl implements IPlayService {
     private final static Logger logger = LoggerFactory.getLogger(PlayServiceImpl.class);
 package com.genersoft.iot.vmp.service.impl;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.genersoft.iot.vmp.service.IRoleService;
 import com.genersoft.iot.vmp.storager.dao.RoleMapper;
 import com.genersoft.iot.vmp.storager.dao.dto.Role;
@@ -9,6 +10,7 @@ import org.springframework.stereotype.Service;
 import java.util.List;
 @Service
+@DS("master")
 public class RoleServerImpl implements IRoleService {
     @Autowired
@@ -2,6 +2,7 @@ package com.genersoft.iot.vmp.service.impl;
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.genersoft.iot.vmp.common.GeneralCallback;
 import com.genersoft.iot.vmp.common.StreamInfo;
 import com.genersoft.iot.vmp.conf.DynamicTask;
@@ -53,6 +54,7 @@ import java.util.stream.Collectors;
  * 视频代理业务
  */
 @Service
+@DS("master")
 public class StreamProxyServiceImpl implements IStreamProxyService {
     private final static Logger logger = LoggerFactory.getLogger(StreamProxyServiceImpl.class);
@@ -4,6 +4,7 @@ import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
 import com.alibaba.fastjson2.TypeReference;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.genersoft.iot.vmp.conf.MediaConfig;
 import com.genersoft.iot.vmp.conf.UserSetting;
 import com.genersoft.iot.vmp.gb28181.bean.*;
@@ -36,6 +37,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 @Service
+@DS("master")
 public class StreamPushServiceImpl implements IStreamPushService {
     private final static Logger logger = LoggerFactory.getLogger(StreamPushServiceImpl.class);
 package com.genersoft.iot.vmp.service.impl;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.genersoft.iot.vmp.service.IUserService;
 import com.genersoft.iot.vmp.storager.dao.UserMapper;
 import com.genersoft.iot.vmp.storager.dao.dto.User;
@@ -12,6 +13,7 @@ import org.springframework.util.DigestUtils;
 import java.util.List;
 @Service
+@DS("master")
 public class UserServiceImpl implements IUserService {
     @Autowired
@@ -197,7 +197,10 @@ public class CloudRecordController {
             @RequestParam(required = false) String mediaServerId,
             @RequestParam(required = false) Boolean isEnd
     ){
-        return cloudRecordService.queryTask(app, stream, callId, taskId, mediaServerId, isEnd);
+       if (ObjectUtils.isEmpty(mediaServerId)) {
+           mediaServerId = null;
+       }
+       return cloudRecordService.queryTask(app, stream, callId, taskId, mediaServerId, isEnd);
     }
     @ResponseBody