Merge branch '20221203' into 'master'

refactor: 场景联动设备过滤条件添加产品

See merge request huang/thingsboard3.3.2!148

@@ -475,8 +475,10 @@ public class TkDeviceController extends BaseController {
     DeviceProfileId deviceProfileId =
         new DeviceProfileId(UUID.fromString(deviceDTO.getProfileId()));
 
+    CustomerId customerId = StringUtils.isBlank(deviceDTO.getCustomerId())?null:new CustomerId(UUID.fromString(deviceDTO.getCustomerId()));
+
     tbDevice.setAdditionalInfo(additionalInfo);
-    tbDevice.setCustomerId(null);
+    tbDevice.setCustomerId(customerId);
     tbDevice.setDeviceProfileId(deviceProfileId);
     tbDevice.setLabel(deviceDTO.getLabel());
     tbDevice.setName(deviceDTO.getName());

@@ -43,6 +43,7 @@ public class DeviceDTO extends TenantDTO {
     @ApiModelProperty(value = "关联网关设备")
     private String gatewayId;
     private String gatewayName;
+    private String gatewayAlias;
 
     @ApiModelProperty(value = "设备凭证")
     private TkCredentialsDto deviceToken;

 package org.thingsboard.server.common.data.yunteng.dto;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import lombok.Data;
 import org.thingsboard.server.common.data.yunteng.enums.DeviceState;
 
+import java.time.LocalDateTime;
+
 @Data
 public class RelationDeviceDTO {
     private String tbDeviceId;
     private String tbDeviceName;
+    private String alias;
     private String label;
     private DeviceState deviceState;
-    private Long createdTime;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    private LocalDateTime createdTime;
     private Long lastOnlineTime;
 
     public void setDeviceState(boolean deviceState) {

@@ -5,12 +5,17 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.thingsboard.server.common.data.yunteng.dto.DoActionDTO;
+import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum;
+import org.thingsboard.server.common.data.yunteng.enums.ScopeEnum;
+import org.thingsboard.server.dao.yunteng.entities.TkDeviceEntity;
 import org.thingsboard.server.dao.yunteng.entities.TkDoActionEntity;
 import org.thingsboard.server.dao.yunteng.entities.TenantBaseEntity;
+import org.thingsboard.server.dao.yunteng.mapper.DeviceMapper;
 import org.thingsboard.server.dao.yunteng.mapper.DoActionMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
 import org.thingsboard.server.dao.yunteng.service.DoActionService;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -20,13 +25,36 @@ import java.util.stream.Collectors;
 @RequiredArgsConstructor
 public class TkDoActionServiceImpl extends AbstractBaseService<DoActionMapper, TkDoActionEntity>
     implements DoActionService {
+  private final DeviceMapper deviceMapper;
   @Override
-  public List<TkDoActionEntity> getActions(String sceneId) {
+  public List<TkDoActionEntity> getActionsByAll(String sceneId) {
     LambdaQueryWrapper filter =
-        new QueryWrapper<TkDoActionEntity>().lambda().eq(TkDoActionEntity::getSceneLinkageId, sceneId);
+        new LambdaQueryWrapper<TkDoActionEntity>().eq(TkDoActionEntity::getSceneLinkageId, sceneId).eq(TkDoActionEntity::getEntityType, ScopeEnum.ALL);
     return baseMapper.selectList(filter);
   }
 
+
+  @Override
+  public List<TkDoActionEntity> getActionsByPart(String sceneId) {
+    LambdaQueryWrapper filter =
+            new LambdaQueryWrapper<TkDoActionEntity>().eq(TkDoActionEntity::getSceneLinkageId, sceneId).eq(TkDoActionEntity::getEntityType, ScopeEnum.PART);
+    List<TkDoActionEntity> source = baseMapper.selectList(filter);
+    return source.stream().map(t ->{
+      List<TkDeviceEntity> partDevices = deviceMapper.selectList(new LambdaQueryWrapper<TkDeviceEntity>().in(TkDeviceEntity::getTbDeviceId,t.getDeviceId()));
+      List<String> deviceId = new ArrayList<>();
+      for(TkDeviceEntity item : partDevices){
+        if(!DeviceTypeEnum.SENSOR.equals(item.getDeviceType())){
+          //网关子设备才需要重写deviceId字段
+          break;
+        }
+        deviceId.add(item.getGatewayId());
+      }
+      t.setDeviceId(deviceId);
+      return t;
+    }).collect(Collectors.toList());
+
+  }
+
   @Override
   public List<DoActionDTO> findDoActionByAlarmProfileIds(
       String tenantId, Set<String> alarmProfileIds) {

@@ -440,8 +440,7 @@ public class TkSceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageM
       String currentSceneId, String tenantId, String customerId, Integer state) {
     List<TkSceneLinkageEntity> runningScenes =
         baseMapper.selectList(
-            new QueryWrapper<TkSceneLinkageEntity>()
-                .lambda()
+            new LambdaQueryWrapper<TkSceneLinkageEntity>()
                 .eq(TkSceneLinkageEntity::getTenantId, tenantId)
                 .eq(TkSceneLinkageEntity::getStatus, FastIotConstants.StateValue.ENABLE));
     Set<String> enableIds = new HashSet<>();
@@ -468,17 +467,7 @@ public class TkSceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageM
 
     List<DeviceDTO> organizationDevices =
         findDeviceList(self.getOrganizationId(), tenantId, customerId,new ArrayList<>());
-    List<String> allDevices = new ArrayList<>();
-    List<String> rpcDevices = new ArrayList<>();
-    if(organizationDevices != null && !organizationDevices.isEmpty()){
-      for (DeviceDTO item : organizationDevices) {
-        allDevices.add(item.getTbDeviceId());
-        DeviceTypeEnum deviceType = item.getDeviceType();
-        if(!DeviceTypeEnum.SENSOR.equals(deviceType)){
-          rpcDevices.add(item.getTbDeviceId());
-        }
-      }
-    }
+
 
     Map<String, List<String>> matchedDevices = new HashMap<>();
 
@@ -495,6 +484,7 @@ public class TkSceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageM
           String scenId = trigger.getSceneLinkageId();
           List<String> devices = trigger.getEntityId();
           if(currentSceneId.equals(scenId)){
+            List<String> allDevices = filterDevice(organizationDevices,trigger.getDeviceProfileId(),false);
             if (ScopeEnum.ALL.equals(trigger.getEntityType()) ) {
               devices = allDevices;
             }else{
@@ -516,7 +506,7 @@ public class TkSceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageM
     Executors.newScheduledThreadPool(1)
         .schedule(
             () -> {
-              freshEntityIds(currentSceneId, allDevices,rpcDevices, triggers);
+              freshEntityIds(currentSceneId, organizationDevices, triggers);
             },
             1,
             TimeUnit.SECONDS);
@@ -528,51 +518,66 @@ public class TkSceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageM
     return JacksonUtil.convertValue(engineConfig, JsonNode.class);
   }
 
+  private List<String> filterDevice(List<DeviceDTO> organizationDevices,String profileId,boolean rpc){
+    List<String> allDevices = new ArrayList<>();
+    if(organizationDevices != null && !organizationDevices.isEmpty()){
+      for (DeviceDTO item : organizationDevices) {
+        if(StringUtils.isBlank(item.getDeviceProfileId()) || !item.getDeviceProfileId().equals(profileId)){
+          continue;
+        }
+        DeviceTypeEnum deviceType = item.getDeviceType();
+        if(rpc && DeviceTypeEnum.SENSOR.equals(deviceType)){
+          allDevices.add(item.getGatewayId());
+          continue;
+        }
+        allDevices.add(item.getTbDeviceId());
+      }
+    }
+    return allDevices;
+  }
+
   /**
    * 异步刷新场景联动的设备ID
    *
    * @param sceneId
-   * @param allDevices
+   * @param organizationDevices
    * @param triggers
    */
-  public void freshEntityIds(String sceneId, List<String> allDevices,List<String> rpcDevices, List<TkTriggerEntity> triggers) {
+  public void freshEntityIds(String sceneId, List<DeviceDTO> organizationDevices,List<TkTriggerEntity> triggers) {
     triggers.forEach(
         trigger -> {
           if (ScopeEnum.ALL.equals(trigger.getEntityType())
               && sceneId.equals(trigger.getSceneLinkageId())) {
-            trigger.setEntityId(allDevices);
+            List<String> ids = filterDevice(organizationDevices,trigger.getDeviceProfileId(),false);
+            trigger.setEntityId(ids);
             triggerMapper.updateById(trigger);
           }
         });
 
     List<TkDoConditionEntity> conditions =
         doConditionMapper.selectList(
-            new QueryWrapper<TkDoConditionEntity>()
-                .lambda()
+            new LambdaQueryWrapper<TkDoConditionEntity>()
                 .eq(TkDoConditionEntity::getSceneLinkageId, sceneId)
                 .eq(TkDoConditionEntity::getEntityType, ScopeEnum.ALL));
     conditions.forEach(
         item -> {
           if (sceneId.equals(item.getSceneLinkageId())) {
-            item.setEntityId(allDevices);
+            List<String> ids = filterDevice(organizationDevices,item.getDeviceProfileId(),false);
+            item.setEntityId(ids);
             doConditionMapper.updateById(item);
           }
         });
 
     List<TkDoActionEntity> actions =
         doActionMapper.selectList(
-            new QueryWrapper<TkDoActionEntity>()
-                .lambda()
+            new LambdaQueryWrapper<TkDoActionEntity>()
                 .eq(TkDoActionEntity::getSceneLinkageId, sceneId)
                 .eq(TkDoActionEntity::getEntityType, ScopeEnum.ALL));
     actions.forEach(
         item -> {
           if (sceneId.equals(item.getSceneLinkageId())) {
-            if(ActionTypeEnum.DEVICE_OUT.equals(item.getOutTarget())){
-              item.setDeviceId(rpcDevices);
-            }else{
-              item.setDeviceId(allDevices);
-            }
+            List<String> ids = filterDevice(organizationDevices,item.getDeviceProfileId(),ActionTypeEnum.DEVICE_OUT.equals(item.getOutTarget())?true:false);
+            item.setDeviceId(ids);
 
             doActionMapper.updateById(item);
           }

@@ -13,7 +13,8 @@ import java.util.Set;
  */
 public interface DoActionService extends BaseService<TkDoActionEntity>{
 
-    List<TkDoActionEntity> getActions(String sceneId);
+    List<TkDoActionEntity> getActionsByAll(String sceneId);
+    List<TkDoActionEntity> getActionsByPart(String sceneId);
 
     List<DoActionDTO> findDoActionByAlarmProfileIds(String tenantId, Set<String> alarmProfileIds);
 }

@@ -39,6 +39,7 @@
         <result property="organizationId" column="organization_id"/>
         <result property="gatewayId" column="gateway_id"/>
         <result property="gatewayName" column="gateway_name"/>
+        <result property="gatewayAlias" column="gateway_alias"/>
         <association property="deviceProfile"
                      javaType="org.thingsboard.server.common.data.yunteng.dto.DeviceProfileDTO">
             <result property="name" column="profile_name"/>
@@ -50,8 +51,9 @@
         </association>
     </resultMap>
     <resultMap id="relationDeviceMap" type="org.thingsboard.server.common.data.yunteng.dto.RelationDeviceDTO">
-        <result property="tbDeviceId" column="id"/>
+        <result property="tbDeviceId" column="tb_device_id"/>
         <result property="tbDeviceName" column="name"/>
+        <result property="alias" column="alias"/>
         <result property="label" column="label"/>
         <result property="deviceState" column="status"/>
         <result property="createdTime" column="created_time"/>
@@ -71,7 +73,7 @@
     </sql>
     <sql id="detailColumns">
         <include refid="pageColumns"/>
-        ,ifd.gateway_id,idg.name gateway_name
+        ,ifd.gateway_id,idg.name gateway_name,idg.alias gateway_alias
     </sql>
     <sql id="pageColumns">
         <include refid="basicColumns"/>
@@ -103,6 +105,8 @@
                 ifd.name LIKE concat('%',#{queryMap.name}::TEXT,'%')
                 or
                 ifd.sn LIKE concat('%',#{queryMap.name}::TEXT,'%')
+                or
+                ifd.alias LIKE concat('%',#{queryMap.name}::TEXT,'%')
                 )
             </if>
             <if test="queryMap.deviceType !=null and queryMap.deviceType !=''">
@@ -207,27 +211,26 @@
     </select>
     <select id="getRelationDevicePage" resultMap="relationDeviceMap">
         SELECT
-        de.id,
+        de.tb_device_id,
         de.name,
+        de.alias,
         de.label,
-        de.created_time,
+        de.create_time as created_time,
         A.bool_v AS status,
         b.long_v AS last_online_time
         FROM
-        device de
-        LEFT JOIN relation rt ON de."id" = rt.to_id
-        LEFT JOIN attribute_kv A ON de."id" = A.entity_id
+        tk_device de
+        LEFT JOIN relation rt ON de.tb_device_id::uuid = rt.to_id
+        LEFT JOIN attribute_kv A ON de.tb_device_id::uuid = A.entity_id
         AND A.entity_type = 'DEVICE'
         AND A.attribute_key = 'active'
-        LEFT JOIN attribute_kv b ON de."id" = b.entity_id
+        LEFT JOIN attribute_kv b ON de.tb_device_id::uuid = b.entity_id
         AND b.entity_type = 'DEVICE'
         AND b.attribute_key = 'lastActivityTime'
         <where>
             rt.from_id ::TEXT = #{queryMap.fromId}
-            AND de.tenant_id ::TEXT = #{queryMap.tenantId}
-            <if test="queryMap.customerId !=null and queryMap.customerId !=''">
-                AND de.customer_id ::TEXT = #{queryMap.customerId}
-            </if>
+            AND de.tenant_id  = #{queryMap.tenantId}
+
             <if test="queryMap.name !=null and queryMap.name !=''">
                 AND de.name LIKE concat('%',#{queryMap.name}::TEXT,'%')
             </if>

@@ -97,7 +97,8 @@ class ReactState {
         DoConditionService conditionService = SpringBeanUtils.getBean(DoConditionService.class);
         this.conditions = conditionService.getConditions(reactId);
         DoActionService actionService = SpringBeanUtils.getBean(DoActionService.class);
-        this.actions = actionService.getActions(reactId);
+        this.actions = actionService.getActionsByAll(reactId);
+        this.actions.addAll(actionService.getActionsByPart(reactId));
         for (TkDoActionEntity action : actions) {
             /**动作中只有1个告警通知*/
             if (ActionTypeEnum.MSG_NOTIFY.equals(action.getOutTarget())) {
@@ -208,7 +209,8 @@ class ReactState {
         if (alarm != null && alarm.getClearRule() != null) {
             for (TriggerDTO rule : alarm.getClearRule()) {
                 if ((ScopeEnum.PART.equals(rule.getEntityType()) && !rule.getEntityId().contains(deviceId))
-                        || !alarmAction.getDeviceId().contains(deviceId)) {
+//                        || !alarmAction.getDeviceId().contains(deviceId)
+                ) {
                     continue;
                 }