Merge branch 'master_dev_gbt0321' into 'master_dev'

Master dev gbt0321

See merge request yunteng/thingskit!373

@@ -65,6 +65,9 @@ public class TkVideoControlServiceImpl implements TkVideoControlService {
     String tenantId = currentUser.getCurrentTenantId();
     // 判断设备、通道是否存在
     DeviceDTO deviceDTO = tkDeviceService.checkDeviceByTenantIdAndId(tenantId, deviceId, true);
+    if (null == deviceDTO || !DeviceState.ONLINE.equals(deviceDTO.getDeviceState())) {
+      throw new TkDataValidationException(ErrorMessage.DEVICE_NOT_ONLINE.getMessage());
+    }
     SipDeviceDTO sipDeviceDTO =
         JacksonUtil.convertValue(
             deviceDTO.getDeviceInfo().get(FastIotConstants.DeviceAdditional.SIP),
@@ -76,7 +79,7 @@ public class TkVideoControlServiceImpl implements TkVideoControlService {
     VideoChanelDTO videoChanelDTO =
         tkVideoChannelService.findVideoChannelById(
             sipDeviceDTO.getCameraCode(), channelId, tenantId);
-    if (null == videoChanelDTO) {
+    if (null == videoChanelDTO || DeviceState.OFFLINE.equals(deviceDTO.getDeviceState())) {
       throw new TkDataValidationException(ErrorMessage.VIDEO_CHANNEL_NOT_FOUND.getMessage());
     }
     // 找到可以使用的流媒体

@@ -121,7 +121,7 @@ public enum ErrorMessage {
   EZVIZ_GET_URL_ERROR(400096,"荧石API调用获取URL失败！！"),
   IMPORT_TCP_ERROR(400097,"TCP产品不能导入INT,DOUBLE,BOOL,TEXT以外的数据类型属性！！"),
   SSRC_INFO_NOT_FOUND(400098,"缓存事务信息未找到,设备【%s】 通道【%s】"),
-  VIDEO_CHANNEL_NOT_FOUND(400099,"视频通道不存在"),
+  VIDEO_CHANNEL_NOT_FOUND(400099,"视频通道已离线或不存在"),
   ONLINE_MEDIA_SERVER_NOT_FOUND(400100,"没有可用的流媒体节点"),
   FOUND_VIDEO_DEVICE_FAILED(400101,"视频设备SIP信息丢失"),
   NOT_FOUND_MEDIA_SERVER_FOR_PLAY(400102,"未找到可用于播放的流媒体"),