Merge branch 'gbt28181_0226' into 'master_dev'

fix: 摄像头通道刷新逻辑调整

See merge request yunteng/thingskit!348

@@ -95,6 +95,7 @@ import org.thingsboard.server.dao.device.provision.ProvisionResponse;
 import org.thingsboard.server.dao.ota.OtaPackageService;
 import org.thingsboard.server.dao.relation.RelationService;
 import org.thingsboard.server.dao.tenant.TbTenantProfileCache;
+import org.thingsboard.server.dao.yunteng.entities.TkVideoChannelEntity;
 import org.thingsboard.server.dao.yunteng.service.TkDeviceScriptService;
 import org.thingsboard.server.dao.yunteng.service.TkDeviceService;
 import org.thingsboard.server.dao.yunteng.service.media.TkMediaServerNodeService;
@@ -729,9 +730,11 @@ public class DefaultTransportApiService implements TransportApiService {
 
                 break;
             case Catalog:
-                Optional<List<VideoChanelDTO>> chanel = dataDecodingEncodingService.decode(requestMsg.getContext().toByteArray());
-                chanel.ifPresent(d->{
-                    d.forEach(channelService::saveOrUpdate);
+                Optional<List<VideoChanelDTO>> allChannel = dataDecodingEncodingService.decode(requestMsg.getContext().toByteArray());
+                allChannel.ifPresent(d->{
+                    channelService.clearDeviceChannel(d.get(0).getCameraCode());
+                    List<TkVideoChannelEntity> chanel= d.stream().map(item -> item.getEntity(TkVideoChannelEntity.class)).collect(Collectors.toList());
+                    channelService.insertBatch(chanel,chanel.size());
                 });
                 break;
             default:

@@ -44,20 +44,6 @@ public class TkVideoChannelServiceImpl
     return getPageData(iPage, VideoChanelDTO.class);
   }
 
-  @Override
-  @Transactional
-  public VideoChanelDTO saveOrUpdate(VideoChanelDTO videoChanel) {
-    VideoChanelDTO oldChanel =
-        findVideoChannelById(
-            videoChanel.getCameraCode(), videoChanel.getChannelId(), videoChanel.getTenantId());
-    if (oldChanel == null) {
-      return saveChannelInfo(videoChanel);
-    } else {
-      videoChanel.setId(oldChanel.getId());
-      return updateChannelInfo(videoChanel);
-    }
-  }
-
 
   @Override
   public VideoChanelDTO findVideoChannelById(
@@ -79,11 +65,9 @@ public class TkVideoChannelServiceImpl
   }
 
   @Override
-  public VideoChanelDTO saveChannelInfo(VideoChanelDTO videoChanelDTO) {
-    TkVideoChannelEntity entity = videoChanelDTO.getEntity(TkVideoChannelEntity.class);
-    entity.setCreateTime(LocalDateTime.now());
-    baseMapper.insert(entity);
-    return videoChanelDTO;
+  public int clearDeviceChannel(String cameraCode) {
+    return baseMapper.delete(new LambdaQueryWrapper<TkVideoChannelEntity>()
+            .eq(TkVideoChannelEntity::getCameraCode, cameraCode));
   }
 
   @Override

@@ -10,14 +10,6 @@ import org.thingsboard.server.dao.yunteng.service.BaseService;
 public interface TkVideoChannelService extends BaseService<TkVideoChannelEntity> {
   TkPageData<VideoChanelDTO> page(String tenantId, Map<String, Object> queryMap);
 
-  /**
-   * 刷新摄像头通道信息
-   *
-   * @param videoChanelDTO 摄像头通道信息
-   * @return 视频通道信息
-   */
-  VideoChanelDTO saveOrUpdate(VideoChanelDTO videoChanelDTO);
-
 
 
   /**
@@ -31,12 +23,11 @@ public interface TkVideoChannelService extends BaseService<TkVideoChannelEntity>
   VideoChanelDTO findVideoChannelById(String cameraCode, String channelId, String tenantId);
 
   /**
-   * 新增视频通道信息。
-   *
-   * @param videoChanelDTO 摄像头通道信息
+   * 清除摄像头的视频通道
+   * @param cameraCode
    * @return
    */
-  VideoChanelDTO saveChannelInfo(VideoChanelDTO videoChanelDTO);
+  int clearDeviceChannel(String cameraCode);
 
   /**
    * 更新视频通道信息。