Merge branch 'master_dev_gbt0326' into 'master_dev'

fix: 摄像头修改凭证残留脏数据问题修复

See merge request yunteng/thingskit!376

@@ -885,8 +885,8 @@ public class DefaultTransportApiService implements TransportApiService {
         allChannel.ifPresent(
         allChannel.ifPresent(
             d -> {
             d -> {
               String cameraCode = d.get(0).getCameraCode();
               String cameraCode = d.get(0).getCameraCode();
-              Map<String, String> playingChannels = channelService.findPlayingChannel(cameraCode);
-              channelService.clearDeviceChannel(cameraCode);
+              Map<String, String> playingChannels = channelService.findPlayingChannel(tbDeviceId);
+              channelService.clearDeviceChannel(tbDeviceId);
               List<TkVideoChannelEntity> chanel =
               List<TkVideoChannelEntity> chanel =
                   d.stream()
                   d.stream()
                       .map(item -> {
                       .map(item -> {

@@ -166,7 +166,6 @@ public class TkVideoControlServiceImpl implements TkVideoControlService {
                 .getResponse()
                 .getResponse()
                 .ifPresent(
                 .ifPresent(
                     jsonStr -> {
                     jsonStr -> {
-                      JsonNode responseJson = JacksonUtil.toJsonNode(jsonStr);
                       if (fromDeviceRpcResponse.getError().isEmpty()) {
                       if (fromDeviceRpcResponse.getError().isEmpty()) {
                         result.set(jsonStr);
                         result.set(jsonStr);
                       } else {
                       } else {

@@ -127,7 +127,7 @@ public enum ErrorMessage {
   NOT_FOUND_MEDIA_SERVER_FOR_PLAY(400102,"未找到可用于播放的流媒体"),
   NOT_FOUND_MEDIA_SERVER_FOR_PLAY(400102,"未找到可用于播放的流媒体"),
   RECEIVE_STREAM_FAILED(400103,"开启收流失败"),
   RECEIVE_STREAM_FAILED(400103,"开启收流失败"),
   GET_PLAY_PORT_FAILED(400104,"从流媒体【%s】获取点播端口异常"),
   GET_PLAY_PORT_FAILED(400104,"从流媒体【%s】获取点播端口异常"),
-  STREAM_INFO_NOT_FOUND_FOR_PLAY(400105,"点播信息未找到"),
+  STREAM_INFO_NOT_FOUND_FOR_PLAY(400105,"点播资源已释放！不需要重复操作！"),
   SIP_COMMAND_SEND_FAILED(400106,"sip命令下发失败"),
   SIP_COMMAND_SEND_FAILED(400106,"sip命令下发失败"),
   NOT_BELONG_CURRENT_CUSTOMER(400107,"该数据不属于当前客户"),
   NOT_BELONG_CURRENT_CUSTOMER(400107,"该数据不属于当前客户"),
   IMPORT_ERROR(400108,"请使用模板excel重新导入"),
   IMPORT_ERROR(400108,"请使用模板excel重新导入"),

@@ -71,18 +71,18 @@ public class TkVideoChannelServiceImpl
   }
   }
 
 
   @Override
   @Override
-  public int clearDeviceChannel(String cameraCode) {
+  public int clearDeviceChannel(String tbDeviceId) {
     return baseMapper.delete(new LambdaQueryWrapper<TkVideoChannelEntity>()
     return baseMapper.delete(new LambdaQueryWrapper<TkVideoChannelEntity>()
-            .eq(TkVideoChannelEntity::getCameraCode, cameraCode));
+            .eq(TkVideoChannelEntity::getDeviceId, tbDeviceId));
   }
   }
 
 
   @Override
   @Override
-  public Map<String, String> findPlayingChannel(String cameraCode) {
+  public Map<String, String> findPlayingChannel(String tbDeviceId) {
     List<TkVideoChannelEntity> channelList =
     List<TkVideoChannelEntity> channelList =
             baseMapper.selectList(
             baseMapper.selectList(
                     new LambdaQueryWrapper<TkVideoChannelEntity>()
                     new LambdaQueryWrapper<TkVideoChannelEntity>()
                             .isNotNull(TkVideoChannelEntity::getStreamId)
                             .isNotNull(TkVideoChannelEntity::getStreamId)
-                            .eq(TkVideoChannelEntity::getCameraCode, cameraCode));
+                            .eq(TkVideoChannelEntity::getDeviceId, tbDeviceId));
     Map<String, String> result = new HashMap<>();
     Map<String, String> result = new HashMap<>();
     if(channelList == null){
     if(channelList == null){
       return result;
       return result;

@@ -25,15 +25,15 @@ public interface TkVideoChannelService extends BaseService<TkVideoChannelEntity>
 
 
   /**
   /**
    * 清除摄像头的视频通道
    * 清除摄像头的视频通道
-   * @param cameraCode
+   * @param tbDeviceId
    * @return
    * @return
    */
    */
-  int clearDeviceChannel(String cameraCode);  /**
+  int clearDeviceChannel(String tbDeviceId);  /**
    * 查询点播中的摄像头通道
    * 查询点播中的摄像头通道
-   * @param cameraCode
+   * @param tbDeviceId
    * @return
    * @return
    */
    */
-  Map<String,String> findPlayingChannel(String cameraCode);
+  Map<String,String> findPlayingChannel(String tbDeviceId);
 
 
   /**
   /**
    * 更新视频通道信息。
    * 更新视频通道信息。