Merge branch '20220511' into 'master'

fix(DEFECT-388): 设备是否使用匹配问题

See merge request huang/thingsboard3.3.2!96

@@ -18,8 +18,7 @@ public class YtVideoDTO extends TenantDTO {
     @NotEmpty(message = "视频流地址不能为空")
     @NotEmpty(message = "视频流地址不能为空")
     private String videoUrl;
     private String videoUrl;
 
 
-    @ApiModelProperty(value = "摄像头厂家", required = true)
-    @NotEmpty(message = "摄像头生产商不能为空")
+    @ApiModelProperty(value = "摄像头厂家", required = false)
     private String brand;
     private String brand;
 
 
     @ApiModelProperty(value = "摄像头型号", required = false)
     @ApiModelProperty(value = "摄像头型号", required = false)

@@ -388,7 +388,7 @@ public class YtDeviceServiceImpl extends AbstractBaseService<DeviceMapper, YtDev
                 new QueryWrapper<Trigger>()
                 new QueryWrapper<Trigger>()
                         .lambda()
                         .lambda()
                         .in(sceneIds.size()>0,Trigger::getSceneLinkageId, sceneIds)
                         .in(sceneIds.size()>0,Trigger::getSceneLinkageId, sceneIds)
-                        .eq(Trigger::getEntityId, tbDeviceId);
+                        .like(Trigger::getEntityId, tbDeviceId);
         Optional<List<Trigger>> triggers = Optional.ofNullable(triggerMapper.selectList(triggerFilter));
         Optional<List<Trigger>> triggers = Optional.ofNullable(triggerMapper.selectList(triggerFilter));
         if(triggers.isPresent() && triggers.get().size()>0){
         if(triggers.isPresent() && triggers.get().size()>0){
             return true;
             return true;