Merge branch '2024-2-22' into 'master_dev'

feat：新增视频配置GBT28181新增全部设备选项

See merge request yunteng/thingskit!345

 package org.thingsboard.server.controller.yunteng;
 package org.thingsboard.server.controller.yunteng;
 
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import io.swagger.annotations.ApiParam;
 import lombok.RequiredArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -22,6 +23,7 @@ import org.thingsboard.server.dao.yunteng.service.TkDeviceService;
 import org.thingsboard.server.dao.yunteng.service.media.TkVideoChannelService;
 import org.thingsboard.server.dao.yunteng.service.media.TkVideoChannelService;
 
 
 import java.util.HashMap;
 import java.util.HashMap;
+import java.util.List;
 
 
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.ORDER_TYPE;
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.ORDER_TYPE;
@@ -76,4 +78,14 @@ public class TkVideoChannelController extends BaseController {
       }
       }
       return tkVideoChannelService.page(tenantId, queryMap);
       return tkVideoChannelService.page(tenantId, queryMap);
   }
   }
+
+    @GetMapping("/list")
+    @ApiOperation("选项列表")
+    @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
+    public List<VideoChanelDTO> listDeviceProfile(
+            @ApiParam(value = "设备Id") @RequestParam(value = "deviceId", required = false) String deviceId)
+            throws ThingsboardException {
+        String tenantId = getCurrentUser().getCurrentTenantId();
+        return tkVideoChannelService.getListByDeviceId(deviceId,tenantId);
+    }
 }
 }

@@ -11,7 +11,7 @@ import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.yunteng.common.DeleteGroup;
 import org.thingsboard.server.common.data.yunteng.common.DeleteGroup;
 import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
 import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
 import org.thingsboard.server.common.data.yunteng.dto.TkVideoDTO;
 import org.thingsboard.server.common.data.yunteng.dto.TkVideoDTO;
-import org.thingsboard.server.common.data.yunteng.dto.TkVideoGptDTO;
+import org.thingsboard.server.common.data.yunteng.dto.TkVideoGbtDTO;
 import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
 import org.thingsboard.server.common.data.yunteng.utils.tools.ProtocolType;
 import org.thingsboard.server.common.data.yunteng.utils.tools.ProtocolType;
 import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
 import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
@@ -73,10 +73,10 @@ public class TkVideoController extends BaseController {
   @ApiOperation("新增国标视频")
   @ApiOperation("新增国标视频")
   @PreAuthorize(
   @PreAuthorize(
           "@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{'api:yt:video:post','api:yt:video:update'})")
           "@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{'api:yt:video:post','api:yt:video:update'})")
-  public TkVideoGptDTO saveOrUpdateAlarmProfile(@Validated @RequestBody TkVideoGptDTO dto)
+  public TkVideoGbtDTO saveOrUpdateAlarmProfile(@Validated @RequestBody TkVideoGbtDTO dto)
           throws ThingsboardException {
           throws ThingsboardException {
     dto.setTenantId(getCurrentUser().getCurrentTenantId());
     dto.setTenantId(getCurrentUser().getCurrentTenantId());
-    return videoService.saveGpt(dto);
+    return videoService.saveGbt(dto);
   }
   }
 
 
 
 

 package org.thingsboard.server.common.data.yunteng.dto;
 package org.thingsboard.server.common.data.yunteng.dto;
 
 
-import com.fasterxml.jackson.databind.JsonNode;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.EqualsAndHashCode;
@@ -10,7 +9,7 @@ import java.util.List;
 
 
 @Data
 @Data
 @EqualsAndHashCode(callSuper = true)
 @EqualsAndHashCode(callSuper = true)
-public class TkVideoGptDTO extends TenantDTO {
+public class TkVideoGbtDTO extends TenantDTO {
 
 
   @ApiModelProperty(value = "组织ID", required = true)
   @ApiModelProperty(value = "组织ID", required = true)
   @NotEmpty(message = "组织ID不能为空或空字符串")
   @NotEmpty(message = "组织ID不能为空或空字符串")
@@ -20,6 +19,9 @@ public class TkVideoGptDTO extends TenantDTO {
   private Integer accessMode;
   private Integer accessMode;
 
 
   @ApiModelProperty(value = "多个设备id与通道号")
   @ApiModelProperty(value = "多个设备id与通道号")
-  private List<TkVideoGptDeviceDTO> gptDeviceDTOS;
+  private List<TkVideoGbtDeviceDTO> gbtDeviceDTOS;
+
+  @ApiModelProperty(value = "是否全部设备 0否 1是")
+  private Integer allDevice;
 
 
 }
 }

 package org.thingsboard.server.common.data.yunteng.dto;
 package org.thingsboard.server.common.data.yunteng.dto;
 
 
-import com.fasterxml.jackson.databind.JsonNode;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
 
 
@@ -8,7 +7,7 @@ import javax.validation.constraints.NotEmpty;
 import java.util.List;
 import java.util.List;
 
 
 @Data
 @Data
-public class TkVideoGptDeviceDTO {
+public class TkVideoGbtDeviceDTO {
 
 
     @ApiModelProperty(value = "设备id", required = true)
     @ApiModelProperty(value = "设备id", required = true)
     @NotEmpty(message = "设备id不能为空")
     @NotEmpty(message = "设备id不能为空")

@@ -11,15 +11,11 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
 import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.server.common.data.StringUtils;
-import org.thingsboard.server.common.data.alarm.Alarm;
-import org.thingsboard.server.common.data.audit.ActionType;
-import org.thingsboard.server.common.data.exception.ThingsboardException;
-import org.thingsboard.server.common.data.id.AlarmId;
-import org.thingsboard.server.common.data.id.EdgeId;
 import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
 import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
 import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
 import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.dto.*;
 import org.thingsboard.server.common.data.yunteng.dto.*;
+import org.thingsboard.server.common.data.yunteng.dto.sip.VideoChanelDTO;
 import org.thingsboard.server.common.data.yunteng.utils.JacksonUtil;
 import org.thingsboard.server.common.data.yunteng.utils.JacksonUtil;
 import org.thingsboard.server.common.data.yunteng.utils.tools.*;
 import org.thingsboard.server.common.data.yunteng.utils.tools.*;
 import org.thingsboard.server.dao.yunteng.entities.TkVideoEntity;
 import org.thingsboard.server.dao.yunteng.entities.TkVideoEntity;
@@ -27,6 +23,7 @@ import org.thingsboard.server.dao.yunteng.entities.TkVideoPlatformEntity;
 import org.thingsboard.server.dao.yunteng.mapper.TkVideoMapper;
 import org.thingsboard.server.dao.yunteng.mapper.TkVideoMapper;
 import org.thingsboard.server.dao.yunteng.mapper.TkVideoPlatformMapper;
 import org.thingsboard.server.dao.yunteng.mapper.TkVideoPlatformMapper;
 import org.thingsboard.server.dao.yunteng.service.*;
 import org.thingsboard.server.dao.yunteng.service.*;
+import org.thingsboard.server.dao.yunteng.service.media.TkVideoChannelService;
 
 
 import java.io.IOException;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.ArrayList;
@@ -43,6 +40,9 @@ public class TkVideoServiceImpl extends AbstractBaseService<TkVideoMapper, TkVid
     private final UserOrganizationMappingService userOrganizationMappingService;
     private final UserOrganizationMappingService userOrganizationMappingService;
     private final TkOrganizationService organizationService;
     private final TkOrganizationService organizationService;
     private final TkVideoPlatformMapper tkVideoPlatformMapper;
     private final TkVideoPlatformMapper tkVideoPlatformMapper;
+    private final TkDeviceService tkdeviceService;
+    private final TkVideoChannelService tkVideoChannelService;
+
     @Override
     @Override
     public TkPageData<TkVideoDTO> pageDatas(IPage<TkVideoEntity> pageInfrom,
     public TkPageData<TkVideoDTO> pageDatas(IPage<TkVideoEntity> pageInfrom,
                                             boolean isPtTenantAdmin, String tenantId, String currentUserId,
                                             boolean isPtTenantAdmin, String tenantId, String currentUserId,
@@ -92,25 +92,35 @@ public class TkVideoServiceImpl extends AbstractBaseService<TkVideoMapper, TkVid
     }
     }
 
 
     @Override
     @Override
-    public TkVideoGptDTO saveGpt(TkVideoGptDTO dto) {
-        List<TkVideoGptDeviceDTO> deviceList =  dto.getGptDeviceDTOS();
-        deviceList.forEach(device -> {
-            String deviceId = device.getDeviceID();
-            String deviceName = device.getDeviceName();
-            List<String> channelNos = device.getChannelNos();
-            channelNos.forEach(channelNo -> {
-                TkVideoDTO videoDto = new TkVideoDTO();
-                videoDto.setOrganizationId(dto.getOrganizationId());
-                videoDto.setName(deviceName+channelNo);
-                videoDto.setAccessMode(dto.getAccessMode());
-                videoDto.setSn(channelNo);
-                String json = "{\"channelNo\":\""+channelNo+"\",\"deviceId\":\""+deviceId+"\",\"deviceName\":\""+deviceName+"\"}";
-                JsonNode params = JacksonUtil.toJsonNode(json);
-                videoDto.setParams(params);
-                videoDto.setTenantId(dto.getTenantId());
-                baseMapper.insert(videoDto.getEntity(TkVideoEntity.class));
-            });
-        });
+    public TkVideoGbtDTO saveGbt(TkVideoGbtDTO dto) {
+        if(dto.getAllDevice()==FastIotConstants.MagicNumber.ONE){
+            //插入组织下全部设备时后端处理dto对象 查询全部所需要插入的摄像头信息
+            String organizationId  = dto.getOrganizationId();
+            List<TkVideoGbtDeviceDTO> deviceList = new ArrayList<>();
+            List<DeviceDTO> deviceDTOS =  tkdeviceService.findDevicesByDeviceTypeAndOrganizationId(
+                    null,dto.getTenantId(),organizationId,null,null,null);
+            for(DeviceDTO device:deviceDTOS){
+                List<VideoChanelDTO> chanelDTOS =   tkVideoChannelService.getListByDeviceId(device.getTbDeviceId(),dto.getTenantId());
+                if(chanelDTOS.isEmpty()){
+                    continue;
+                }
+                //该设备拥有通道号时才插入
+                TkVideoGbtDeviceDTO gbt = new TkVideoGbtDeviceDTO();
+                gbt.setDeviceID(device.getTbDeviceId());
+                gbt.setDeviceName(device.getAlias()==null?device.getName():device.getAlias());
+                List<String> channelNos = new ArrayList<>();
+                for (VideoChanelDTO chanel :chanelDTOS){
+                    channelNos.add(chanel.getChannelId());
+                }
+                gbt.setChannelNos(channelNos);
+                deviceList.add(gbt);
+            }
+            dto.setGbtDeviceDTOS(deviceList);
+            saveGbtS(dto);
+        }
+        else{
+            saveGbtS(dto);
+        }
         return dto;
         return dto;
     }
     }
 
 
@@ -218,4 +228,34 @@ public class TkVideoServiceImpl extends AbstractBaseService<TkVideoMapper, TkVid
         return videoDTOList.get(0);
         return videoDTOList.get(0);
     }
     }
 
 
+
+    void  saveGbtS(TkVideoGbtDTO dto){
+        List<TkVideoGbtDeviceDTO> deviceList =  dto.getGbtDeviceDTOS();
+        deviceList.forEach(device -> {
+            String deviceId = device.getDeviceID();
+            String deviceName = device.getDeviceName();
+            List<String> channelNos = device.getChannelNos();
+            channelNos.forEach(channelNo -> {
+                TkVideoDTO videoDto = new TkVideoDTO();
+                videoDto.setOrganizationId(dto.getOrganizationId());
+                videoDto.setName(deviceName+channelNo);
+                videoDto.setAccessMode(dto.getAccessMode());
+                videoDto.setSn(channelNo);
+                String json = "{\"channelNo\":\""+channelNo+"\",\"deviceId\":\""+deviceId+"\",\"deviceName\":\""+deviceName+"\"}";
+                JsonNode params = JacksonUtil.toJsonNode(json);
+                videoDto.setParams(params);
+                videoDto.setTenantId(dto.getTenantId());
+                TkVideoEntity oldVideo = baseMapper.selectOne(new QueryWrapper<TkVideoEntity>().lambda()
+                        .eq(TkVideoEntity::getSn, channelNo)
+                        .like(TkVideoEntity::getParams, deviceId));
+                if(oldVideo!=null){
+                    videoDto.setId(oldVideo.getId());
+                    baseMapper.updateById(videoDto.getEntity(TkVideoEntity.class));
+                }else{
+                    baseMapper.insert(videoDto.getEntity(TkVideoEntity.class));
+                }
+            });
+        });
+    }
+
 }
 }

@@ -3,6 +3,7 @@ package org.thingsboard.server.dao.yunteng.impl.media;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
+import java.util.List;
 import java.util.Map;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Optional;
 import lombok.RequiredArgsConstructor;
 import lombok.RequiredArgsConstructor;
@@ -12,6 +13,7 @@ import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
 import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.dto.sip.VideoChanelDTO;
 import org.thingsboard.server.common.data.yunteng.dto.sip.VideoChanelDTO;
+import org.thingsboard.server.common.data.yunteng.utils.ReflectUtils;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.dao.yunteng.entities.TkVideoChannelEntity;
 import org.thingsboard.server.dao.yunteng.entities.TkVideoChannelEntity;
 import org.thingsboard.server.dao.yunteng.mapper.TkVideoChannelMapper;
 import org.thingsboard.server.dao.yunteng.mapper.TkVideoChannelMapper;
@@ -113,4 +115,15 @@ public class TkVideoChannelServiceImpl
             })
             })
         .orElse(false);
         .orElse(false);
   }
   }
+
+
+  @Override
+  public List<VideoChanelDTO> getListByDeviceId(String deviceId,String tenantId) {
+    return  ReflectUtils.sourceToTarget(
+            baseMapper.selectList(
+                    new LambdaQueryWrapper<TkVideoChannelEntity>()
+                            .eq(TkVideoChannelEntity::getDeviceId, deviceId)
+                            .eq(TkVideoChannelEntity::getTenantId, tenantId)
+            ),VideoChanelDTO.class);
+  }
 }
 }

@@ -3,7 +3,7 @@ package org.thingsboard.server.dao.yunteng.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
 import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
 import org.thingsboard.server.common.data.yunteng.dto.TkVideoDTO;
 import org.thingsboard.server.common.data.yunteng.dto.TkVideoDTO;
-import org.thingsboard.server.common.data.yunteng.dto.TkVideoGptDTO;
+import org.thingsboard.server.common.data.yunteng.dto.TkVideoGbtDTO;
 import org.thingsboard.server.common.data.yunteng.utils.tools.ProtocolType;
 import org.thingsboard.server.common.data.yunteng.utils.tools.ProtocolType;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.dao.yunteng.entities.TkVideoEntity;
 import org.thingsboard.server.dao.yunteng.entities.TkVideoEntity;
@@ -49,7 +49,7 @@ public interface TkVideoService extends BaseService<TkVideoEntity> {
    * @param dto
    * @param dto
    * @return
    * @return
    */
    */
-  TkVideoGptDTO saveGpt(TkVideoGptDTO dto);
+  TkVideoGbtDTO saveGbt(TkVideoGbtDTO dto);
 
 
   /**
   /**
    * @param deleteDTO
    * @param deleteDTO

 package org.thingsboard.server.dao.yunteng.service.media;
 package org.thingsboard.server.dao.yunteng.service.media;
 
 
+import java.util.List;
 import java.util.Map;
 import java.util.Map;
 import org.thingsboard.server.common.data.yunteng.dto.sip.VideoChanelDTO;
 import org.thingsboard.server.common.data.yunteng.dto.sip.VideoChanelDTO;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
@@ -55,4 +56,13 @@ public interface TkVideoChannelService extends BaseService<TkVideoChannelEntity>
    */
    */
   boolean updateVideoChannelStreamId(
   boolean updateVideoChannelStreamId(
       String streamId, String deviceCode, String channelId);
       String streamId, String deviceCode, String channelId);
+
+  /**
+   * 根据设备id获取通道号集合
+   *
+   * @param deviceId 流ID
+   * @return VideoChanelDTOs 摄像头通道信息集合
+   */
+  List<VideoChanelDTO> getListByDeviceId(String deviceId,String tenantId);
+
 }
 }