Merge branch '2-27' into 'master_dev'

feat:1.单独新增GBT视频时校验是否存在2.视频通道分页接口增加状态筛选条件

See merge request yunteng/thingskit!351

@@ -16,6 +16,7 @@ import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.dto.DeviceDTO;
 import org.thingsboard.server.common.data.yunteng.dto.sip.VideoChanelDTO;
 import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
+import org.thingsboard.server.common.data.yunteng.enums.StatusEnum;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.mapper.DeviceMapper;
@@ -49,6 +50,8 @@ public class TkVideoChannelController extends BaseController {
       @RequestParam(value = "tbDeviceId") String tbDeviceId,
       @ApiParam(value = "视频通道名称")
       @RequestParam(value = "name", required = false) String name,
+      @ApiParam(value = "设备状态")
+      @RequestParam(value = "status", required = false) StatusEnum status,
       @ApiParam(value = "国标编号")
       @RequestParam(value = "cameraCode", required = false) String cameraCode) throws ThingsboardException {
       HashMap<String, Object> queryMap = new HashMap<>();
@@ -58,6 +61,9 @@ public class TkVideoChannelController extends BaseController {
       if(StringUtils.isNotEmpty(cameraCode)){
           queryMap.put("cameraCode",cameraCode);
       }
+      if(status!=null){
+          queryMap.put("status",status);
+      }
       String tenantId = getCurrentUser().getCurrentTenantId();
       if(StringUtils.isEmpty(tbDeviceId)){
           throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());

@@ -288,6 +288,7 @@ public interface FastIotConstants {
   class MagicNumber {
     public static final int ZERO = 0;
     public static final int ONE = 1;
+    public static final int TWO = 2;
     public static final int TEN = 10;
   }
 

@@ -135,6 +135,7 @@ public enum ErrorMessage {
   OUTER_NET_ERROR(400110,"外网ip+端口不能重复，请重新输入"),
 
   DEVICE_NOT_ONLINE(400111,"设备不在线，无法执行相关操作！"),
+  GBT_VIDEO_REPETITION(400112,"该设备通道号视频已存在！"),
   HAVE_NO_PERMISSION(500002,"没有修改权限"),
   NOT_ALLOED_ISOLATED_IN_MONOLITH(500003,"【monolith】模式下，不能选择【isolated】类型的租户配置");
 

@@ -70,6 +70,17 @@ public class TkVideoServiceImpl extends AbstractBaseService<TkVideoMapper, TkVid
     @Override
     @Transactional(rollbackFor = Exception.class)
     public TkVideoDTO saveOrUpdate(TkVideoDTO videoDTO) {
+        if(videoDTO.getAccessMode()==FastIotConstants.MagicNumber.TWO){
+            TkVideoEntity oldVideo = baseMapper.selectOne(new QueryWrapper<TkVideoEntity>().lambda()
+                    .eq(TkVideoEntity::getSn, videoDTO.getSn())
+                    .eq(TkVideoEntity::getTenantId,videoDTO.getTenantId())
+                    .like(TkVideoEntity::getParams, videoDTO.getParams()));
+            if(null!=oldVideo
+                &&((StringUtils.isNotBlank(videoDTO.getId())&&!oldVideo.getId().equals(videoDTO.getId()))
+                ||(StringUtils.isEmpty(videoDTO.getId())))){
+                throw new TkDataValidationException(ErrorMessage.GBT_VIDEO_REPETITION.getMessage());
+            }
+        }
         if (StringUtils.isNotEmpty(videoDTO.getId())) {
             TkVideoEntity oldVideo = baseMapper.selectOne(new QueryWrapper<TkVideoEntity>().lambda()
                     .eq(TkVideoEntity::getTenantId, videoDTO.getTenantId())
@@ -242,6 +253,7 @@ public class TkVideoServiceImpl extends AbstractBaseService<TkVideoMapper, TkVid
                 videoDto.setTenantId(dto.getTenantId());
                 TkVideoEntity oldVideo = baseMapper.selectOne(new QueryWrapper<TkVideoEntity>().lambda()
                         .eq(TkVideoEntity::getSn, channelNo)
+                        .eq(TkVideoEntity::getTenantId,dto.getTenantId())
                         .like(TkVideoEntity::getParams, deviceId));
                 if(oldVideo!=null){
                     videoDto.setId(oldVideo.getId());

@@ -13,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.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.dto.sip.VideoChanelDTO;
+import org.thingsboard.server.common.data.yunteng.enums.StatusEnum;
 import org.thingsboard.server.common.data.yunteng.utils.ReflectUtils;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.dao.yunteng.entities.TkVideoChannelEntity;
@@ -30,12 +31,14 @@ public class TkVideoChannelServiceImpl
     String name = (String) queryMap.get("name");
     String cameraCode = (String) queryMap.get("cameraCode");
     String tbDeviceId = (String) queryMap.get("tbDeviceId");
+    StatusEnum status= (StatusEnum) queryMap.get("status");
     IPage<TkVideoChannelEntity> iPage =
         baseMapper.selectPage(
             getPage(queryMap, "create_time", false),
             new LambdaQueryWrapper<TkVideoChannelEntity>()
                 .eq(TkVideoChannelEntity::getTenantId, tenantId)
                 .eq(TkVideoChannelEntity::getDeviceId, tbDeviceId)
+                 .eq(status!=null,TkVideoChannelEntity::getStatus, status)
                 .like(StringUtils.isNotEmpty(name), TkVideoChannelEntity::getName, name)
                 .like(
                     StringUtils.isNotEmpty(cameraCode),