Merge branch '20220507' into 'master'

fix: 设备删除，场景联动启动失败问题

See merge request huang/thingsboard3.3.2!94

@@ -424,4 +424,10 @@ public class YtDeviceController extends BaseController {
         sendRelationNotificationMsg(
                 getTenantId(), relation, EdgeEventActionType.RELATION_ADD_OR_UPDATE);
     }
+    @GetMapping({"used/{id}"})
+    @ApiOperation("设备是否被占用")
+    public ResponseEntity<Boolean> otherUsing(@PathVariable("id") String deviceId) throws ThingsboardException {
+        Boolean result = deviceService.otherUsing(deviceId, getCurrentUser().getCurrentTenantId());
+        return ResponseEntity.ok(result);
+    }
 }

@@ -74,12 +74,19 @@ public class YtThirdPlatformController extends BaseController {
     }
 
     @DeleteMapping
-    @ApiOperation("解绑")
+    @ApiOperation("解绑(第三方小程序)")
     public boolean deleteAlarmProfile(@Validated(DeleteGroup.class) @RequestBody YtThirdUserDTO dto)
             throws ThingsboardException {
         return thirdService.unbindUser(getCurrentUser().getCurrentTenantId(), dto.getAppUserId(), dto.getThirdUserId());
     }
 
+    @DeleteMapping("/unbind")
+    @ApiOperation("解绑(平台账号)")
+    public boolean deleteAlarmProfile()
+            throws ThingsboardException {
+        return thirdService.unbindUser(getCurrentUser().getCurrentUserId());
+    }
+
     @GetMapping("login/{loginCode}")
     @ApiOperation("第三方登录")
     public YtLoginResponse login(@PathVariable("loginCode") String loginCode)

@@ -62,6 +62,7 @@ public enum ErrorMessage {
   SCENE_REACT_USED_ALARM_PROFILE(400042,"场景联动正在使用该告警配置"),
   APP_USER_BINDED(400043,"平台用户【%s】已被其它账号绑定"),
   THIRD_PLATFORM_EXCEPTION(400044,"【%s】，第三方异常【%s】"),
+  DEVICE_NOT_EXTIED(400045,"设备不存在"),
   HAVE_NO_PERMISSION(500002,"没有修改权限");
   private final int code;
   private String message;

@@ -64,6 +64,7 @@ public class DeviceDTO extends TenantDTO {
 
     @ApiModelProperty(value = "分配客户")
     private String customerId;
+    private String customerName;
 
     private DeviceProfileDTO deviceProfile;
     private OrganizationDTO organizationDTO;

@@ -179,7 +179,7 @@ public class SceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageMap
     }
 
     // 先删除触发器
-    triggerMapper.delete(
+    int result = triggerMapper.delete(
         new QueryWrapper<Trigger>()
             .lambda()
             .eq(
@@ -469,8 +469,10 @@ public class SceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageMap
     List<DeviceDTO> organizationDevices =
         findDeviceList(self.getOrganizationId(), tenantId, customerId);
     List<String> allDevices = new ArrayList<>();
-    for (DeviceDTO item : organizationDevices) {
-      allDevices.add(item.getTbDeviceId());
+    if(organizationDevices != null && !organizationDevices.isEmpty()){
+      for (DeviceDTO item : organizationDevices) {
+        allDevices.add(item.getTbDeviceId());
+      }
     }
 
     Map<String, List<String>> matchedDevices = new HashMap<>();
@@ -487,8 +489,17 @@ public class SceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageMap
         trigger -> {
           String scenId = trigger.getSceneLinkageId();
           List<String> devices = trigger.getEntityId();
-          if (ScopeEnum.ALL.equals(trigger.getEntityType()) && currentSceneId.equals(scenId)) {
-            devices = allDevices;
+          if(currentSceneId.equals(scenId)){
+            if (ScopeEnum.ALL.equals(trigger.getEntityType()) ) {
+              devices = allDevices;
+            }else{
+              devices = devices.stream()
+                      .filter(t -> allDevices.contains(t))
+                      .collect(Collectors.toList());
+            }
+            if (devices == null || devices.isEmpty()) {
+              throw new YtDataValidationException(ErrorMessage.DEVICE_NOT_EXTIED.getMessage());
+            }
           }
           deviceSceneMap(matchedDevices, devices, scenId);
         });

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.jetbrains.annotations.Nullable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.thingsboard.server.common.data.DeviceProfile;
@@ -355,4 +356,63 @@ public class YtDeviceServiceImpl extends AbstractBaseService<DeviceMapper, YtDev
         return snBuilder.substring(0, 16);
     }
 
+
+    @Override
+    public Boolean otherUsing(String deviceId,String tenantId) {
+        YtDevice device = baseMapper.selectById(deviceId);
+        if(device == null){
+            throw new YtDataValidationException(ErrorMessage.DEVICE_NOT_EXTIED.getMessage());
+        }
+        String tbDeviceId = device.getTbDeviceId();
+
+        /**场景联动*/
+        Boolean userd = usedBySceneLinkage(tenantId, tbDeviceId);
+
+        return userd;
+    }
+
+    @Nullable
+    private Boolean usedBySceneLinkage(String tenantId, String tbDeviceId) {
+        LambdaQueryWrapper<SceneLinkage> sceneFilter =
+                new QueryWrapper<SceneLinkage>()
+                        .lambda()
+                        .eq(SceneLinkage::getTenantId, tenantId)
+                        .eq(SceneLinkage::getStatus, 1);
+        Optional<List<SceneLinkage>> list= Optional.ofNullable(sceneLinkageMapper.selectList(sceneFilter));
+        if(list.isEmpty()){
+            return false;
+        }
+        List<String> sceneIds = list.get().stream()
+                .map(i -> i.getId()).collect(Collectors.toList());
+        LambdaQueryWrapper<Trigger> triggerFilter =
+                new QueryWrapper<Trigger>()
+                        .lambda()
+                        .in(sceneIds.size()>0,Trigger::getSceneLinkageId, sceneIds)
+                        .eq(Trigger::getEntityId, tbDeviceId);
+        Optional<List<Trigger>> triggers = Optional.ofNullable(triggerMapper.selectList(triggerFilter));
+        if(triggers.isPresent() && triggers.get().size()>0){
+            return true;
+        }
+
+        LambdaQueryWrapper<DoCondition> conditionFilter =
+                new QueryWrapper<DoCondition>()
+                        .lambda()
+                        .in(sceneIds.size()>0,DoCondition::getSceneLinkageId, sceneIds)
+                        .eq(DoCondition::getEntityId, tbDeviceId);
+        Optional<List<DoCondition>> doConditions = Optional.ofNullable(conditionMapper.selectList(conditionFilter));
+        if(doConditions.isPresent()&& doConditions.get().size()>0){
+            return true;
+        }
+
+        LambdaQueryWrapper<DoAction> actionFilter =
+                new QueryWrapper<DoAction>()
+                        .lambda()
+                        .in(sceneIds.size()>0,DoAction::getSceneLinkageId, sceneIds)
+                        .eq(DoAction::getDeviceId, tbDeviceId);
+        Optional<List<DoAction>> doActions = Optional.ofNullable(actionMapper.selectList(actionFilter));
+        if(doActions.isPresent()&& doActions.get().size()>0){
+            return true;
+        }
+        return false;
+    }
 }

@@ -178,6 +178,15 @@ public class YtThirdPlatformServiceImpl extends AbstractBaseService<YtThirdPlatf
         return baseMapper.delete(filter) > 0;
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean unbindUser(String appUserId) {
+        Wrapper filter = new QueryWrapper<YtThirdUserEntity>().lambda()
+                .eq(YtThirdUserEntity::getAppUserId,appUserId);
+        baseMapper.delete(filter);
+        return true;
+    }
+
     private static final String loginApi="/sns/jscode2session?appid={appid}&secret={appid}&js_code={appid}&grant_type=authorization_code";
     @Override
     public String thirdLogin(String loginCode) {

@@ -94,4 +94,13 @@ public interface YtDeviceService extends BaseService<YtDevice> {
      * @return
      */
     String generateSn();
+
+    /**
+     *
+     * 设备是否被其它资源使用，例如：场景联动
+     * @param deviceId  平台设备ID
+     * @param tenantId  租户ID
+     * @return
+     */
+    Boolean otherUsing(String deviceId,String tenantId);
 }

@@ -35,12 +35,20 @@ public interface YtThirdPlatformService extends BaseService<YtThirdUserEntity> {
 
     /**
      * 第三方平台用户与系统用户解绑
-     * @param appUserId
-     * @param thirdUserId
+     * @param appUserId    平台用户ID
+     * @param thirdUserId  第三方用户ID
      * @return
      */
     boolean unbindUser(String tenantId,String appUserId,String thirdUserId);
 
+
+    /**
+     * 第三方平台用户与系统用户解绑
+     * @param appUserId    平台用户ID
+     * @return
+     */
+    boolean unbindUser(String appUserId);
+
     /**
      * 第三方登录
      *

@@ -25,6 +25,7 @@
         <result property="updater" column="updater"/>
         <result property="description" column="description"/>
         <result property="customerId" column="customer_id"/>
+        <result property="customerName" column="cusotomer_name"/>
         <result property="organizationId" column="organization_id"/>
         <result property="gatewayId" column="gateway_id"/>
         <result property="gatewayName" column="gateway_name"/>
@@ -72,7 +73,7 @@
     </sql>
     <select id="getDevicePage" resultMap="deviceMap">
         SELECT
-        <include refid="pageColumns"/>,d.customer_id::TEXT AS customer_id
+        <include refid="pageColumns"/>,d.customer_id::TEXT AS customer_id,cus.title AS cusotomer_name
         FROM iotfs_device ifd
         LEFT JOIN device_profile ifdp ON ifd.profile_id = ifdp.id::TEXT
         LEFT JOIN iotfs_organization io ON io.id = ifd.organization_id
@@ -83,6 +84,7 @@
         LEFT JOIN attribute_kv c ON ifd.tb_device_id = c.entity_id::TEXT AND c.entity_type ='DEVICE' AND
         c.attribute_key='inactivityAlarmTime'
         LEFT JOIN device d ON d.id::TEXT = ifd.tb_device_id
+        LEFT JOIN customer cus ON cus.id = d.customer_id
         <where>
             <if test="queryMap.tenantId !=null and queryMap.tenantId !=''">
                 AND ifd.tenant_id = #{queryMap.tenantId}