Merge branch '20220517' into 'master'

20220517

See merge request huang/thingsboard3.3.2!101

@@ -353,8 +353,8 @@ public class YtDeviceController extends BaseController {
     @ApiOperation("获取该组织的所有设备")
     @ApiOperation("获取该组织的所有设备")
     public List<DeviceDTO> getGatewayDevices(
     public List<DeviceDTO> getGatewayDevices(
             @ApiParam(value = "组织ID") @RequestParam("organizationId") String organizationId,
             @ApiParam(value = "组织ID") @RequestParam("organizationId") String organizationId,
-            @ApiParam(value = "设备类型") @PathVariable("deviceType") DeviceTypeEnum deviceType) {
-        return deviceService.findDevicesByDeviceTypeAndOrganizationId(deviceType, organizationId);
+            @ApiParam(value = "设备类型") @PathVariable("deviceType") DeviceTypeEnum deviceType) throws ThingsboardException {
+        return deviceService.findDevicesByDeviceTypeAndOrganizationId(deviceType,getCurrentUser().getCurrentTenantId(), organizationId);
     }
     }
 
 
     @GetMapping("/gateway/{tbDeviceId}")
     @GetMapping("/gateway/{tbDeviceId}")

@@ -92,7 +92,7 @@ public class SceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageMap
         new QueryWrapper<SceneLinkage>()
         new QueryWrapper<SceneLinkage>()
             .lambda()
             .lambda()
             .eq(SceneLinkage::getTenantId, tenantId)
             .eq(SceneLinkage::getTenantId, tenantId)
-            .eq(SceneLinkage::getCreator, currentUserId)
+            .eq(StringUtils.isNotBlank(currentUserId),SceneLinkage::getCreator, currentUserId)
             .in(SceneLinkage::getId, ids);
             .in(SceneLinkage::getId, ids);
     int result = sceneLinkageMapper.delete(Wrapper);
     int result = sceneLinkageMapper.delete(Wrapper);
     if (result != ids.size()) {
     if (result != ids.size()) {

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import lombok.RequiredArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.Nullable;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
@@ -217,12 +218,13 @@ public class YtDeviceServiceImpl extends AbstractBaseService<DeviceMapper, YtDev
 
 
     @Override
     @Override
     public List<DeviceDTO> findDevicesByDeviceTypeAndOrganizationId(
     public List<DeviceDTO> findDevicesByDeviceTypeAndOrganizationId(
-            DeviceTypeEnum deviceType, String organizationId) {
+            DeviceTypeEnum deviceType, String tenantId, String organizationId) {
+        List<String> orgIds = organizationAllIds(tenantId,organizationId);
         return ReflectUtils.sourceToTarget(
         return ReflectUtils.sourceToTarget(
                 baseMapper.selectList(
                 baseMapper.selectList(
                         new LambdaQueryWrapper<YtDevice>()
                         new LambdaQueryWrapper<YtDevice>()
                                 .eq(YtDevice::getDeviceType, deviceType)
                                 .eq(YtDevice::getDeviceType, deviceType)
-                                .eq(YtDevice::getOrganizationId, organizationId)),
+                                .in(YtDevice::getOrganizationId, orgIds)),
                 DeviceDTO.class);
                 DeviceDTO.class);
     }
     }
 
 
@@ -286,16 +288,7 @@ public class YtDeviceServiceImpl extends AbstractBaseService<DeviceMapper, YtDev
         queryMap.put("tenantId", tenantId);
         queryMap.put("tenantId", tenantId);
         String organizationId = (String) queryMap.get("organizationId");
         String organizationId = (String) queryMap.get("organizationId");
         if (!StringUtils.isEmpty(organizationId)) {
         if (!StringUtils.isEmpty(organizationId)) {
-            List<String> organizationIds = new ArrayList<>();
-            organizationIds.add(organizationId);
-            // 查询该组织的所有子类
-            List<OrganizationDTO> organizationDTOS =
-                    ytOrganizationMapper.findOrganizationTreeList(tenantId, organizationIds);
-            List<String> queryOrganizationIds = new ArrayList<>();
-            organizationDTOS.forEach(
-                    item -> {
-                        queryOrganizationIds.add(item.getId());
-                    });
+            List<String> queryOrganizationIds = organizationAllIds(tenantId, organizationId);
             queryMap.put("organizationIds", queryOrganizationIds);
             queryMap.put("organizationIds", queryOrganizationIds);
         }
         }
         IPage<YtDevice> page = getPage(queryMap, FastIotConstants.DefaultOrder.CREATE_TIME, false);
         IPage<YtDevice> page = getPage(queryMap, FastIotConstants.DefaultOrder.CREATE_TIME, false);
@@ -311,6 +304,27 @@ public class YtDeviceServiceImpl extends AbstractBaseService<DeviceMapper, YtDev
         return new YtPageData<>(records, deviceIPage.getTotal());
         return new YtPageData<>(records, deviceIPage.getTotal());
     }
     }
 
 
+    /**
+     * 组织结构下的所有组织ID
+     * @param tenantId        租户ID
+     * @param organizationId  组织ID
+     * @return
+     */
+    @NotNull
+    private List<String> organizationAllIds(String tenantId, String organizationId) {
+        List<String> organizationIds = new ArrayList<>();
+        organizationIds.add(organizationId);
+        // 查询该组织的所有子类
+        List<OrganizationDTO> organizationDTOS =
+                ytOrganizationMapper.findOrganizationTreeList(tenantId, organizationIds);
+        List<String> queryOrganizationIds = new ArrayList<>();
+        organizationDTOS.forEach(
+                item -> {
+                    queryOrganizationIds.add(item.getId());
+                });
+        return queryOrganizationIds;
+    }
+
     @Override
     @Override
     public YtPageData<RelationDeviceDTO> pageRelation(Map<String, Object> queryMap) {
     public YtPageData<RelationDeviceDTO> pageRelation(Map<String, Object> queryMap) {
         IPage<YtDevice> page = getPage(queryMap, "last_online_time", false);
         IPage<YtDevice> page = getPage(queryMap, "last_online_time", false);

@@ -198,44 +198,37 @@ public class YtTenantServiceImpl extends AbstractBaseService<TenantMapper, Tenan
 
 
     /**
     /**
      * 刷新租户管理员与角色关系
      * 刷新租户管理员与角色关系
+     * 1、1个租户1个角色；1个角色多个租户
+     * 2、1个角色多个用户(租户管理员)
      *
      *
      * @param tenantIds 租户ID
      * @param tenantIds 租户ID
      * @param newRoles  新增的角色ID
      * @param newRoles  新增的角色ID
      */
      */
     private void freshTenantAdminRole(Set<String> tenantIds, List<String> newRoles) {
     private void freshTenantAdminRole(Set<String> tenantIds, List<String> newRoles) {
-        AtomicBoolean notChanged = new AtomicBoolean(false);
         LambdaQueryWrapper<TenantRole> roleFilter = new QueryWrapper<TenantRole>().lambda()
         LambdaQueryWrapper<TenantRole> roleFilter = new QueryWrapper<TenantRole>().lambda()
                 .in(TenantRole::getTenantId, tenantIds);
                 .in(TenantRole::getTenantId, tenantIds);
-        List<String> oldRoleIds = tenantRoleMapper.selectList(roleFilter).stream()
+        List<String> deleteIds = tenantRoleMapper.selectList(roleFilter).stream()
                 .map(i -> i.getRoleId())
                 .map(i -> i.getRoleId())
                 .collect(Collectors.toList());
                 .collect(Collectors.toList());
-        List<String> deleteIds = oldRoleIds.stream()
-                .filter(f -> {
-                    if(newRoles == null || newRoles.isEmpty()){
-                        return true;
-                    }
-                    if(newRoles.contains(f)){
-                        notChanged.set(true);
-                        return false;
-                    }
-                    return true;
-                })
-                .collect(Collectors.toList());
-        if(!deleteIds.isEmpty()){
-            LambdaQueryWrapper<UserRole> filter = new QueryWrapper<UserRole>().lambda()
-                    .in(UserRole::getRoleId, deleteIds);
-            userRoleMapper.delete(filter);
-        }
 
 
-        if (notChanged.get() || newRoles == null || newRoles.isEmpty()) {
-            return;
-        }
         LambdaQueryWrapper<User> userFilter = new QueryWrapper<User>().lambda()
         LambdaQueryWrapper<User> userFilter = new QueryWrapper<User>().lambda()
                 .eq(User::getLevel,2)
                 .eq(User::getLevel,2)
                 .in(User::getTenantId, tenantIds);
                 .in(User::getTenantId, tenantIds);
         List<String> userIds = userMapper.selectList(userFilter).stream()
         List<String> userIds = userMapper.selectList(userFilter).stream()
                 .map(m -> m.getId())
                 .map(m -> m.getId())
                 .collect(Collectors.toList());
                 .collect(Collectors.toList());
+
+        if(!deleteIds.isEmpty() && !userIds.isEmpty()){
+            LambdaQueryWrapper<UserRole> filter = new QueryWrapper<UserRole>().lambda()
+                    .in(UserRole::getRoleId, deleteIds)
+                    .in(UserRole::getUserId,userIds);
+            userRoleMapper.delete(filter);
+        }
+
+        if (newRoles == null || newRoles.isEmpty()
+                || userIds == null || userIds.isEmpty()) {
+            return;
+        }
         userIds.forEach(item -> {
         userIds.forEach(item -> {
             for (String roleId : newRoles) {
             for (String roleId : newRoles) {
                 UserRole role = new UserRole();
                 UserRole role = new UserRole();

 package org.thingsboard.server.dao.yunteng.impl;
 package org.thingsboard.server.dao.yunteng.impl;
 
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -70,6 +71,8 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
   private final YtMessageTemplateService messageTemplateService;
   private final YtMessageTemplateService messageTemplateService;
   private final YtOrganizationService organizationService;
   private final YtOrganizationService organizationService;
   private final UserOrganizationMappingService userOrganizationMappingService;
   private final UserOrganizationMappingService userOrganizationMappingService;
+  private final SceneLinkageService sceneLinkageService;
+  private final SceneLinkageMapper sceneLinkageMapper;
 
 
   public static final String ACTIVATE_URL_PATTERN = "%s/api/noauth/activate?activateToken=%s";
   public static final String ACTIVATE_URL_PATTERN = "%s/api/noauth/activate?activateToken=%s";
   private final PasswordEncoder passwordEncoder;
   private final PasswordEncoder passwordEncoder;
@@ -390,6 +393,20 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
     // 4. 删除人员
     // 4. 删除人员
     baseMapper.deleteBatchIds(userIds);
     baseMapper.deleteBatchIds(userIds);
 
 
+    // 5、删除场景联动
+    Wrapper filter = new QueryWrapper<SceneLinkage>().lambda()
+                    .in(SceneLinkage::getCreator,userIds);
+    List<SceneLinkage> sceneLinkages =sceneLinkageMapper.selectList(filter);
+    if(sceneLinkages ==null || sceneLinkages.isEmpty()){
+      return true;
+    }
+    Set<String> sceneIds = sceneLinkages.stream()
+            .map(i -> i.getId())
+            .collect(Collectors.toSet());
+    sceneLinkageService.deleteSceneLinkage(sceneIds, tenantId,null);
+
+
+
     return true;
     return true;
   }
   }
 
 

@@ -48,7 +48,7 @@ public interface YtDeviceService extends BaseService<YtDevice> {
      * @return 设备列表
      * @return 设备列表
      */
      */
     List<DeviceDTO> findDevicesByDeviceTypeAndOrganizationId(
     List<DeviceDTO> findDevicesByDeviceTypeAndOrganizationId(
-            DeviceTypeEnum deviceType, String organizationId);
+            DeviceTypeEnum deviceType, String tenantId, String organizationId);
 
 
     /**
     /**
      * 通过设备ID和租户ID判断该设备是否存在
      * 通过设备ID和租户ID判断该设备是否存在

@@ -41,8 +41,13 @@
         SELECT
         SELECT
         <include refid="menuDTOMapColumn">
         <include refid="menuDTOMapColumn">
         </include>
         </include>
-        FROM sys_menu
-        WHERE id IN (SELECT menu_id FROM sys_tenant_menu WHERE tenant_id = #{tenantId})
+        FROM sys_menu WHERE id IN (
+            SELECT menu_id FROM sys_role_menu WHERE role_id IN (
+                SELECT id FROM sys_role WHERE id in (
+                    SELECT role_id FROM sys_tenant_role WHERE tenant_id = #{tenantId}
+                ) AND enabled=true
+            )
+        )
     </select>
     </select>
 
 
     <select id="selectMyMenu" resultMap="menuDTOMap">
     <select id="selectMyMenu" resultMap="menuDTOMap">
@@ -50,10 +55,13 @@
         <include refid="menuDTOMapColumn">
         <include refid="menuDTOMapColumn">
         </include>
         </include>
         FROM sys_menu
         FROM sys_menu
-        WHERE id IN (SELECT menu_id
-        FROM sys_role_menu
-        WHERE role_id IN (SELECT id FROM sys_role WHERE id in (SELECT role_id FROM sys_user_role WHERE user_id
-        = #{userId}) AND enabled=true))
+        WHERE id IN (
+            SELECT menu_id FROM sys_role_menu WHERE role_id IN (
+                SELECT id FROM sys_role WHERE id in (
+                    SELECT role_id FROM sys_user_role WHERE user_id = #{userId}
+                ) AND enabled=true
+            )
+        )
     </select>
     </select>
 
 
     <delete id="deleteTenantMenuMappingByMenuIds">
     <delete id="deleteTenantMenuMappingByMenuIds">