feat：接口权限相关修改

@@ -138,7 +138,7 @@ public class TkAdminController extends BaseController {
 
   @DeleteMapping("/user/deleteTenantAdmin")
   @PreAuthorize(
-      "@check.checkPermissions({'SYS_ADMIN','PLATFORM_ADMIN'},{'api:yt:admin:user:deleteTenantAdmin:delete'})")
+      "@check.checkPermissions({'SYS_ADMIN','PLATFORM_ADMIN','TENANT_ADMIN'},{'api:yt:admin:user:deleteTenantAdmin:delete'})")
   public ResponseEntity<Boolean> deleteTenantAdmin(
       @Validated(DeleteGroup.class) @RequestBody DeleteDTO deleteDTO) throws ThingsboardException {
     for (String strUserId : deleteDTO.getIds()) {

@@ -69,8 +69,6 @@ public class TkConvertDataToController extends BaseController {
 
   @Autowired private TbRuleChainService tbRuleChainService;
 
-  @Autowired private DeviceMapper deviceMapper;
-
   @GetMapping(params = {PAGE_SIZE, PAGE})
   @ApiOperation("分页查询")
   public TkPageData<ConvertConfigDTO> pageMessageConfig(
@@ -117,26 +115,27 @@ public class TkConvertDataToController extends BaseController {
   public ResponseEntity<ConvertConfigDTO> createOrUpdateConvertData(
       @Validated @RequestBody ConvertConfigDTO convertConfigDTO) throws ThingsboardException {
     convertConfigDTO.setTenantId(getCurrentUser().getCurrentTenantId());
-    if(getCurrentUser().isPtCommonTenant()){
-      convertConfigDTO.setDatasourceType(DatasourceTypeEnum.DEVICES);
-      JsonArray convertDevices = new JsonArray();
-      JsonNode productNode = convertConfigDTO.getDatasourceContent().get("convertProducts");
-      List<String> orgIds = commonTenantOrganizationAllIds();
-      for (JsonNode deviceProfileId: productNode ) {
-        JsonObject product =new JsonObject();
-        JsonArray devices = new JsonArray();
-        List<DeviceDTO> dto=deviceMapper.findDevicesByProfileIdAndOrganizationId(orgIds,deviceProfileId.asText());
-        if(null!=dto&&dto.size()>0){
-          dto.forEach(device ->{devices.add(device.getTbDeviceId());});
-          product.addProperty("product",deviceProfileId.asText());
-          product.add("devices",devices);
-          convertDevices.add(product);
-        }
-      }
-      ObjectNode convertProducts = (ObjectNode) convertConfigDTO.getDatasourceContent();
-      convertProducts.set("convertDevices",JacksonUtil.toJsonNode(convertDevices.toString()));
-      convertConfigDTO.setDatasourceContent(convertProducts);
-    }
+    //这里针对普通租户管理员的代码 暂时屏蔽根据后续清空看是否开启或删除
+//    if(getCurrentUser().isPtCommonTenant()){
+//      convertConfigDTO.setDatasourceType(DatasourceTypeEnum.DEVICES);
+//      JsonArray convertDevices = new JsonArray();
+//      JsonNode productNode = convertConfigDTO.getDatasourceContent().get("convertProducts");
+//      List<String> orgIds = commonTenantOrganizationAllIds();
+//      for (JsonNode deviceProfileId: productNode ) {
+//        JsonObject product =new JsonObject();
+//        JsonArray devices = new JsonArray();
+//        List<DeviceDTO> dto=deviceMapper.findDevicesByProfileIdAndOrganizationId(orgIds,deviceProfileId.asText());
+//        if(null!=dto&&dto.size()>0){
+//          dto.forEach(device ->{devices.add(device.getTbDeviceId());});
+//          product.addProperty("product",deviceProfileId.asText());
+//          product.add("devices",devices);
+//          convertDevices.add(product);
+//        }
+//      }
+//      ObjectNode convertProducts = (ObjectNode) convertConfigDTO.getDatasourceContent();
+//      convertProducts.set("convertDevices",JacksonUtil.toJsonNode(convertDevices.toString()));
+//      convertConfigDTO.setDatasourceContent(convertProducts);
+//    }
     convertConfigDTO.setNodeType(FastIotConstants.CONVERT_DATA);
     return ResponseEntity.ok(convertConfigService.createOrUpdate(convertConfigDTO));
   }

@@ -46,7 +46,7 @@ public class TkRoleController extends BaseController {
   @GetMapping(
       path = "/tenant",
       params = {PAGE_SIZE, PAGE})
-  @PreAuthorize("hasAnyAuthority('SYS_ADMIN','PLATFORM_ADMIN')")
+  @PreAuthorize("hasAnyAuthority('SYS_ADMIN','PLATFORM_ADMIN','TENANT_ADMIN')")
   public TkPageData<RoleDTO> pageTenantRole(
       @RequestParam(PAGE_SIZE) int pageSize,
       @RequestParam(PAGE) int page,

@@ -64,12 +64,7 @@ public class TkTaskCenterController extends BaseController {
       queryMap.put("tbDeviceId", tbDeviceId);
     }
     if(getCurrentUser().isPtCommonTenant()){
-      List<DeviceDTO> dto = deviceMapper.findDevicesByProfileIdAndOrganizationId(commonTenantOrganizationAllIds(),null);
-      if(null!=dto&&dto.size()>0) {
-        List<String> tbDeviceIds = new ArrayList<>();
-        dto.forEach(device -> {tbDeviceIds.add(device.getTbDeviceId());});
-        queryMap.put("tbDeviceIds",tbDeviceIds);
-      }
+        queryMap.put("orgIds",commonTenantOrganizationAllIds());
     }
     return tkTaskCenterService.taskCenterPage(queryMap, getCurrentUser().getCurrentTenantId());
   }

@@ -139,7 +139,7 @@ public class TkUserController extends AbstractUserAccount {
         queryMap, getCurrentUser().isPtSysadmin(), getCurrentUser().isTenantAdmin());
   }
 
-  @PreAuthorize("hasAnyAuthority('SYS_ADMIN','PLATFORM_ADMIN')")
+  @PreAuthorize("hasAnyAuthority('SYS_ADMIN','PLATFORM_ADMIN','TENANT_ADMIN')")
   @GetMapping(
       path = "/tenant/page",
       params = {PAGE_SIZE, PAGE})
@@ -158,7 +158,7 @@ public class TkUserController extends AbstractUserAccount {
       queryMap.put(ORDER_TYPE, orderType.name());
     }
     queryMap.put(ORDER_FILED, orderBy);
-    if (getCurrentUser().isPtCommonTenant()) {
+    if (getCurrentUser().isPtTenantAdmin()) {
       queryMap.put("level", FastIotConstants.MagicNumber.FOUR);
     }else{
       queryMap.put("level", FastIotConstants.MagicNumber.TWO);
@@ -234,7 +234,7 @@ public class TkUserController extends AbstractUserAccount {
   }
 
   @PreAuthorize(
-          "@check.checkPermissions({'TENANT_ADMIN'},{''})")//todo
+          "@check.checkPermissions({'TENANT_ADMIN'},{'api:yt:user:saveCommonTenant:post'})")//todo
   @PostMapping("save_common_tenant")
   public UserDTO saveCommonTenant(@Validated(AddGroup.class) @RequestBody UserDTO userDTO)
           throws ThingsboardException {
@@ -265,7 +265,7 @@ public class TkUserController extends AbstractUserAccount {
       throw handleException(e);
     }
     UserDTO result =
-            userService.saveTenantAdmin(
+              userService.saveTenantAdmin(
                     userDTO, getCurrentUser().isPtSysadmin(), tenantId.getId().toString());
 
     userService.updateTenantAdminUserCredentials(
@@ -352,7 +352,8 @@ public class TkUserController extends AbstractUserAccount {
         userService.getMyCustomers(
             organizationId,
             getCurrentUser().getCurrentTenantId(),
-            getCurrentUser().isPtTenantAdmin()));
+            getCurrentUser().isPtTenantAdmin(),
+            getCurrentUser().isPtCommonTenant()));
   }
 
   @PostMapping("/reset_password/{userId}")

@@ -285,6 +285,7 @@ public class SysRoleServiceImpl extends AbstractBaseService<RoleMapper, SysRoleE
               .collect(Collectors.toList());
       roleDTO.setRoleIds(roleIds.toArray(new String[roleIds.size()]));
     }
+
     return baseMapper.findRoleInfo(roleDTO);
   }
 

@@ -462,15 +462,19 @@ public class SysUserServiceImpl extends AbstractBaseService<UserMapper, SysUserE
       throw new TkDataValidationException("用户已存在");
     }
     baseMapper.insert(user);
-    //查询租户的角色
-    List<SysTenantRoleEntity> tenantRoleList = validateTenantRole(userDTO.getTenantId());
-    for (SysTenantRoleEntity tenantRole : tenantRoleList) {
-      roleMapper.saveUserRoleMapping(user.getId(), tenantRole.getRoleId());
-    }
-    // 如果为普通租户绑定用户和组织的关系
+    // 如果为普通租户绑定用户和组织的关系和角色
     if(null!=user.getLevel()&&user.getLevel()==FastIotConstants.LevelValue.IS_CUSTOMER_TENANT){
       organizationService.bindUserToOrganization(
               tenantId, user.getId(), userDTO.getOrganizationIds());
+      for (String tenantRole : userDTO.getRoleIds()) {
+        roleMapper.saveUserRoleMapping(user.getId(), tenantRole);
+      }
+    }else{
+      //查询租户的角色
+      List<SysTenantRoleEntity> tenantRoleList = validateTenantRole(userDTO.getTenantId());
+      for (SysTenantRoleEntity tenantRole : tenantRoleList) {
+        roleMapper.saveUserRoleMapping(user.getId(), tenantRole.getRoleId());
+      }
     }
 
     user.copyToDTO(userDTO, PASSWORD, ACTIVATE_TOKEN);
@@ -677,11 +681,11 @@ public class SysUserServiceImpl extends AbstractBaseService<UserMapper, SysUserE
 
   @Override
   public List<UserDTO> getMyCustomers(
-      String organizationId, String tenantId, boolean isTenantAdmin) {
+      String organizationId, String tenantId, boolean isTenantAdmin,boolean isPtCommonTenant) {
     if (StringUtils.isEmpty(organizationId)) {
       throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
     }
-    if (isTenantAdmin) {
+    if (isTenantAdmin||isPtCommonTenant) {
       List<String> userList =
           userOrganizationMappingService.getUserIdByOrganizationIds(tenantId, OrganizationEnum.UP, organizationId);
       if (null != userList && userList.size() > FastIotConstants.MagicNumber.ZERO) {

@@ -121,12 +121,6 @@ public class TkHomePageServiceImpl implements HomePageService {
           //查询所有组织id
           orgIds = organizationService.currentUserOrganizationAllIds(currentUserId);
           queryMap.put("organizationIds",orgIds);
-          //查询所有设备
-          List<DeviceDTO> devices = deviceMapper.findDevicesByDeviceTypeAndOrganizationId(orgIds,null,
-                  null,null,null);
-          List<String> finalTbDevices = new ArrayList<>();
-          devices.forEach(item -> finalTbDevices.add(item.getId()));
-          tbDevices = finalTbDevices;
           alarmList = deviceMapper.findDeviceAlarmInfoByCustomer(startTs, null,orgIds);
         }else{
           customerId = userMapper.findCustomerIdByUserId(currentUserId);
@@ -136,10 +130,10 @@ public class TkHomePageServiceImpl implements HomePageService {
             tbDevices = deviceMapper.findDeviceIdsByCustomerId(customerId);
           }
           alarmList = deviceMapper.findDeviceAlarmInfoByCustomer(startTs, customerId,null);
-        }
-        for (String devId : tbDevices) {
-          setCustomerMessageInfo(
-              todayBegin, todayEnd, currentTenantId, DeviceId.fromString(devId), messageInfo);
+          for (String devId : tbDevices) {
+            setCustomerMessageInfo(
+                    todayBegin, todayEnd, currentTenantId, DeviceId.fromString(devId), messageInfo);
+          }
         }
         if (alarmList.size() > zero) {
           BaseHomePageTop baseHomePageTop = alarmList.get(0);

@@ -54,6 +54,18 @@ public class TkTaskCenterServiceImpl
     IPage<TkTaskCenterEntity> page =
         getPage(queryMap, FastIotConstants.DefaultOrder.CREATE_TIME, false);
     IPage<TkTaskCenterDTO> iPage = baseMapper.getPageData(page, queryMap);
+    List<String> orgIds = (List<String>) queryMap.get("orgIds");
+    if(null!=orgIds&&!iPage.getRecords().isEmpty()){
+      List<TkTaskCenterDTO> list  = new ArrayList<>();
+      iPage.getRecords().stream().forEach(dto->{
+        orgIds.forEach(orgId-> {
+          if(dto.getExecuteTarget().getOrganizationId().equals(orgId)){
+            list.add(dto);
+          }
+        });
+      });
+      iPage.setRecords(list);
+    }
     if (!iPage.getRecords().isEmpty()) {
       iPage.setRecords(
           iPage.getRecords().stream()

@@ -126,7 +126,7 @@ public interface TkUserService {
    * @param isTenantAdmin 是否是租户管理员
    * @return 租户创建的所有用户
    */
-  List<UserDTO> getMyCustomers(String organizationId, String tenantId, boolean isTenantAdmin);
+  List<UserDTO> getMyCustomers(String organizationId, String tenantId, boolean isTenantAdmin,boolean isPtCommonTenant);
 
   /**
    * 异步获取用户列表

@@ -37,16 +37,10 @@
         <if test="queryMap.tbDeviceId !=null and queryMap.tbDeviceId !=''">
             ,tdc.allow_state,tdc.task_center_id,tdc.tb_device_id
         </if>
-        <if test="queryMap.tbDeviceIds !=null and queryMap.tbDeviceIds !=''">
-            ,tdc.allow_state,tdc.task_center_id,tdc.tb_device_id
-        </if>
         FROM tk_task_center tc
         <if test="queryMap.tbDeviceId !=null and queryMap.tbDeviceId !=''">
             LEFT JOIN tk_device_task_center tdc ON tc.id = tdc.task_center_id
         </if>
-        <if test="queryMap.tbDeviceIds !=null and queryMap.tbDeviceIds !=''">
-            LEFT JOIN tk_device_task_center tdc ON tc.id = tdc.task_center_id
-        </if>
         <where>
             <if test="queryMap.tenantId !=null and queryMap.tenantId !=''">
                 AND tc.tenant_id = #{queryMap.tenantId}
@@ -60,12 +54,6 @@
             <if test="queryMap.tbDeviceId !=null and queryMap.tbDeviceId !=''">
                 AND tdc.tb_device_id = #{queryMap.tbDeviceId}
             </if>
-            <if test="queryMap.tbDeviceIds !=null and queryMap.tbDeviceIds !=''">
-                AND tdc.tb_device_id IN
-                <foreach collection="queryMap.tbDeviceIds" item="tbDeviceId" open="(" separator="," close=")">
-                    #{tbDeviceId}
-                </foreach>
-            </if>
         </where>
     </select>
 </mapper>