feat：各个接口权限修改

@@ -1004,8 +1004,8 @@ public abstract class BaseController {
         }
     }
 
-    protected List<String> commonTenantOrganizationAllIds(String currentUserId) {
-      return   organizationService.currentUserOrganizationAllIds(currentUserId);
+    protected List<String> commonTenantOrganizationAllIds() throws ThingsboardException {
+      return   organizationService.currentUserOrganizationAllIds(getCurrentUser().getCurrentUserId());
     }
 
 }

@@ -45,6 +45,7 @@ public class HomePageController extends BaseController {
         getCurrentUser().isPtSysadmin(),
         getCurrentUser().isPtAdmin(),
         getCurrentUser().isPtTenantAdmin(),
+        getCurrentUser().isPtCommonTenant(),
         getCurrentUser().getCurrentTenantId(),
         getCurrentUser().getCurrentUserId());
   }

@@ -174,6 +174,7 @@ public class TkAdminController extends BaseController {
             sendEmail,
             sendMsg,
             getCurrentUser().isPtSysadmin(),
+            getCurrentUser().isPtCommonTenant(),
             getCurrentUser().getCurrentTenantId());
     Optional<UserDTO> optional =
         tkUserService.getUser(

@@ -75,6 +75,10 @@ public class TkAlarmInfoController extends BaseController {
     if (getCurrentUser().isCustomerUser()) {
       customerId = getCurrentUser().getCustomerId().getId();
     }
+    List<String> orgIds = null;
+    if(getCurrentUser().isPtCommonTenant()){
+      orgIds = commonTenantOrganizationAllIds();
+    }
     return alarmInfoService.alarmPage(
         pageFilter,
         getCurrentUser().getTenantId(),
@@ -88,7 +92,8 @@ public class TkAlarmInfoController extends BaseController {
         deviceName,
         deviceType,
         EntityType.DEVICE,
-        organizationId);
+        organizationId,
+        orgIds);
   }
   @ApiOperation(value = "组态告警查询")
   @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
@@ -115,6 +120,10 @@ public class TkAlarmInfoController extends BaseController {
     String deviceName = page.getDeviceName();
     String organizationId = page.getOrganizationId();
     DeviceTypeEnum deviceType = page.getDeviceType();
+    List<String> orgIds = null;
+    if(getCurrentUser().isPtCommonTenant()){
+      orgIds = commonTenantOrganizationAllIds();
+    }
     return alarmInfoService.alarmPage(
             pageFilter,
             getCurrentUser().getTenantId(),
@@ -128,7 +137,8 @@ public class TkAlarmInfoController extends BaseController {
             deviceName,
             deviceType,
             EntityType.DEVICE,
-            organizationId);
+            organizationId,
+            orgIds);
   }
 
   @ApiOperation(value = "告警类型")

@@ -68,6 +68,10 @@ public class TkConfigurationCenterController extends BaseController {
     if (null != orderType) {
       queryMap.put(ORDER_TYPE, orderType.name());
     }
+    //如果是普通租户在最外层默认放入组织id
+    if(getCurrentUser().isPtCommonTenant()){
+      queryMap.put("organizationIds",commonTenantOrganizationAllIds());
+    }
     queryMap.put("userId", getCurrentUser().getCurrentUserId());
     queryMap.put("isTemplate", isTemplate);
     TkPageData<ConfigurationCenterDTO> pageData =

@@ -2,8 +2,12 @@ package org.thingsboard.server.controller.yunteng;
 
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
 
+import com.amazonaws.util.json.Jackson;
+import com.eclipsesource.json.Json;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonObject;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -31,12 +35,16 @@ import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
 import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
+import org.thingsboard.server.common.data.yunteng.dto.DeviceDTO;
+import org.thingsboard.server.common.data.yunteng.dto.SelectItemDTO;
 import org.thingsboard.server.common.data.yunteng.dto.convert.ConvertConfigDTO;
 import org.thingsboard.server.common.data.yunteng.dto.convert.ConvertConfigReqDTO;
 import org.thingsboard.server.common.data.yunteng.dto.convert.ConvertReqDTO;
+import org.thingsboard.server.common.data.yunteng.enums.DatasourceTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.controller.BaseController;
+import org.thingsboard.server.dao.yunteng.mapper.DeviceMapper;
 import org.thingsboard.server.dao.yunteng.service.ConvertConfigService;
 import org.thingsboard.server.dao.yunteng.service.SceneLinkageService;
 import org.thingsboard.server.dao.yunteng.service.TkRuleChainService;
@@ -61,6 +69,8 @@ public class TkConvertDataToController extends BaseController {
 
   @Autowired private TbRuleChainService tbRuleChainService;
 
+  @Autowired private DeviceMapper deviceMapper;
+
   @GetMapping(params = {PAGE_SIZE, PAGE})
   @ApiOperation("分页查询")
   public TkPageData<ConvertConfigDTO> pageMessageConfig(
@@ -107,6 +117,26 @@ 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);
+    }
     convertConfigDTO.setNodeType(FastIotConstants.CONVERT_DATA);
     return ResponseEntity.ok(convertConfigService.createOrUpdate(convertConfigDTO));
   }

@@ -53,6 +53,9 @@ public class TkDataBoardController extends BaseController {
     queryMap.put(ORDER_FILED, orderBy);
     queryMap.put(ORDER_TYPE, orderType);
     queryMap.put(TENANT_ID, getCurrentUser().getCurrentTenantId());
+    if(getCurrentUser().isPtCommonTenant()){
+      queryMap.put("organizationIds", commonTenantOrganizationAllIds());
+    }
     if (StringUtils.isNotBlank(organizationId)) {
       queryMap.put("organizationId", organizationId);
     }

@@ -66,6 +66,10 @@ public class TkDataViewController extends BaseController {
     if (null != orderType) {
       queryMap.put(ORDER_TYPE, orderType.name());
     }
+    //如果是普通租户在最外层默认放入组织id
+    if(getCurrentUser().isPtCommonTenant()){
+      queryMap.put("organizationIds",commonTenantOrganizationAllIds());
+    }
     queryMap.put("userId", getCurrentUser().getCurrentUserId());
     TkPageData<TkDataViewDTO> pageData =
         tkDataViewService.page(queryMap, getCurrentUser().isTenantAdmin());

@@ -254,7 +254,7 @@ public class TkDeviceController extends BaseController {
     }
     //如果当前用户是普通租户
     if (getCurrentUser().isPtCommonTenant()) {
-      List<String> organizationIds =commonTenantOrganizationAllIds(getCurrentUser().getCurrentUserId());
+      List<String> organizationIds =commonTenantOrganizationAllIds();
       if(null!=organizationIds&&organizationIds.size()>0){
         queryMap.put("organizationIds", organizationIds);
       }
@@ -429,7 +429,7 @@ public class TkDeviceController extends BaseController {
       throws ThingsboardException {
     List<String> orgIds = null;
     if(getCurrentUser().isPtCommonTenant()){
-      orgIds= commonTenantOrganizationAllIds(getCurrentUser().getCurrentUserId());
+      orgIds= commonTenantOrganizationAllIds();
     }
     return tkdeviceService.findDevicesByTransportTypeAndOrganizationId(
         getCurrentUser().getCurrentTenantId(), orgIds,organizationId, transportType);

@@ -63,8 +63,11 @@ public class TkDeviceStateLogController extends BaseController {
     if(getCurrentUser().isCustomerUser()){
       queryMap.put(CUSTOMER_ID, getCurrentUser().getCustomerId().getId().toString());
     }
+    if(getCurrentUser().isPtCommonTenant()){
+      queryMap.put("orgIds", commonTenantOrganizationAllIds());
+    }
     return tkDeviceStateLogService.page(
-        getCurrentUser().isCustomerUser(), getCurrentUser().getCurrentTenantId(), queryMap);
+        getCurrentUser().isCustomerUser(),getCurrentUser().isPtCommonTenant(), getCurrentUser().getCurrentTenantId(), queryMap);
   }
 
   @DeleteMapping

@@ -64,6 +64,10 @@ public class TkReportFormConfigController extends BaseController {
       queryMap.put(ORDER_TYPE, orderType.name());
     }
     queryMap.put("userId",getCurrentUser().getCurrentUserId());
+    //如果是普通租户在最外层默认放入组织id
+    if(getCurrentUser().isPtCommonTenant()){
+      queryMap.put("organizationIds",commonTenantOrganizationAllIds());
+    }
     checkTimeAndPut(queryMap,startTime,endTime);
     return reportFormConfigService.page(queryMap, getCurrentUser().isTenantAdmin());
   }

@@ -71,6 +71,9 @@ public class TkReportGenerateRecordController extends BaseController {
     if(getCurrentUser().isCustomerUser()){
       queryMap.put("customerId", getCurrentUser().getCustomerId().toString());
     }
+    if(getCurrentUser().isPtCommonTenant()){
+      queryMap.put("organizationIds",commonTenantOrganizationAllIds());
+    }
     return reportFormGenerateRecordService.page(queryMap, getCurrentUser().isTenantAdmin());
   }
 

@@ -106,6 +106,10 @@ public class TkSceneLinkageController extends BaseController {
     queryMap.put("organizationId", organizationId);
     queryMap.put("triggers", triggers);
     queryMap.put("currentUser",getCurrentUser().getCurrentUserId());
+    //如果是普通租户在最外层默认放入组织id
+    if(getCurrentUser().isPtCommonTenant()){
+      queryMap.put("organizationIds",commonTenantOrganizationAllIds());
+    }
     return sceneLinkageService.page(queryMap, getCurrentUser().getCurrentTenantId(),getCurrentUser().isCustomerUser());
   }
 

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.quartz.SchedulerException;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -14,6 +15,7 @@ import org.thingsboard.server.common.data.yunteng.common.UpdateGroup;
 import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
+import org.thingsboard.server.common.data.yunteng.dto.DeviceDTO;
 import org.thingsboard.server.common.data.yunteng.dto.task.TaskImmediateExecuteDTO;
 import org.thingsboard.server.common.data.yunteng.dto.task.TkTaskCenterDTO;
 import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
@@ -21,9 +23,12 @@ import org.thingsboard.server.common.data.yunteng.enums.TargetTypeEnum;
 import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.controller.BaseController;
+import org.thingsboard.server.dao.yunteng.mapper.DeviceMapper;
 import org.thingsboard.server.dao.yunteng.service.TkTaskCenterService;
 
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.ORDER_TYPE;
@@ -34,6 +39,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
 @RequiredArgsConstructor
 public class TkTaskCenterController extends BaseController {
   private final TkTaskCenterService tkTaskCenterService;
+  @Autowired private DeviceMapper deviceMapper;
 
   @GetMapping(
       name = "page",
@@ -57,6 +63,14 @@ public class TkTaskCenterController extends BaseController {
     if (!StringUtils.isEmpty(tbDeviceId)) {
       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);
+      }
+    }
     return tkTaskCenterService.taskCenterPage(queryMap, getCurrentUser().getCurrentTenantId());
   }
 

@@ -54,6 +54,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Objects;
 import java.util.UUID;
+import java.util.stream.Collectors;
 
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
 
@@ -131,6 +132,9 @@ public class TkUserController extends AbstractUserAccount {
     }
     queryMap.put("currentUserId", getCurrentUser().getCurrentUserId());
     queryMap.put("tenantId", tenantId);
+    if(getCurrentUser().isPtCommonTenant()){
+      queryMap.put("organizationIds", commonTenantOrganizationAllIds());
+    }
     return userService.page(
         queryMap, getCurrentUser().isPtSysadmin(), getCurrentUser().isTenantAdmin());
   }
@@ -199,7 +203,8 @@ public class TkUserController extends AbstractUserAccount {
     userService.validateUserNameAndPhoneNumberAndEmail(userDTO);
     // 如果当前用户是租户管理员，则代表创建的用户为CUSTOMER_USER,则需要调用TB,否则为本平台的管理员不需要调用TB
     boolean isTenantAdminOperator = getCurrentUser().isPtTenantAdmin();
-    if (isTenantAdminOperator) {
+    boolean isPtCommonTenantOperator = getCurrentUser(). isPtCommonTenant();
+    if (isTenantAdminOperator||isPtCommonTenantOperator) {
       // 创建CUSTOMER_USER用户
       Customer customer = createCustomer(userDTO.getUsername());
       // 创建CUSTOMER_USER的管理员
@@ -216,6 +221,7 @@ public class TkUserController extends AbstractUserAccount {
             sendEmail,
             sendMsg,
             getCurrentUser().isPtTenantAdmin(),
+            getCurrentUser().isPtCommonTenant(),
             getCurrentUser().getCurrentTenantId()));
   }
 

@@ -92,8 +92,8 @@ public class SysUserServiceImpl extends AbstractBaseService<UserMapper, SysUserE
   @Override
   @Transactional
   public UserDTO saveAccount(
-      UserDTO userDTO, boolean sendEmail, boolean sendMsg, boolean isTenantAdmin, String tenantId) {
-    boolean isTenantAdminOperate = isTenantAdmin;
+      UserDTO userDTO, boolean sendEmail, boolean sendMsg, boolean isTenantAdmin, boolean isCommonTenant,String tenantId) {
+    boolean isTenantAdminOperate = isTenantAdmin||isCommonTenant;
     if (sendMsg && StringUtils.isEmpty(userDTO.getPhoneNumber())) {
       throw new TkDataValidationException(
           "you must specify user phone number if you want send activate email to this user");
@@ -328,10 +328,16 @@ public class SysUserServiceImpl extends AbstractBaseService<UserMapper, SysUserE
     IPage<SysUserEntity> userIPage = getPage(queryMap, "create_time", false);
     String organizationId =
         queryMap.get("organizationId") != null ? (String) queryMap.get("organizationId") : null;
+    List<String> organizationIds =
+            queryMap.get("organizationIds") != null ? (List<String>) queryMap.get("organizationIds") : null;
     List<String> userIds = null;
+
     if (null != organizationId) {
       userIds = userOrganizationMappingService.getUserIdByOrganizationIds(tenantId,null, organizationId);
       queryMap.put("userIds", userIds);
+    }else if(null!=organizationIds){
+      userIds = userOrganizationMappingService.getUserIdByOrganizationIds(tenantId,null, organizationIds.toArray(new String[0]));
+      queryMap.put("userIds", userIds);
     }
     if (isPtSysadmin) {
       if (null != organizationId && (userIds.size() == FastIotConstants.MagicNumber.ZERO)) {

@@ -55,19 +55,22 @@ public class TkAlarmInfoServiceImpl implements TkAlarmInfoService {
       String deviceName,
       DeviceTypeEnum deviceType,
       EntityType originatorType,
-      String organizationId) {
+      String organizationId,
+      List<String> organizationIds) {
     StringBuilder defaultOrderFields = new StringBuilder("status asc,");
     defaultOrderFields.append(ModelConstants.CREATED_TIME_PROPERTY);
     IPage<TkAlarmEntity> page = getPage(pageMap, defaultOrderFields.toString(), OrderTypeEnum.DESC);
-    List<String> ids = new ArrayList<>();
+    List<String> ids =  null!= organizationIds ? organizationIds : null;
     if (StringUtils.isNotBlank(organizationId)) {
       List<String> filter = new ArrayList<>();
       filter.add(organizationId);
+      List<String> orgIds = new ArrayList<>();
       List<OrganizationDTO> all =
               organizationService.findOrganizationTreeList(tenantId.getId().toString(),null, filter);
       for (OrganizationDTO item : all) {
-        ids.add(item.getId());
+        orgIds.add(item.getId());
       }
+      ids = orgIds;
     }
 
     IPage<TkAlarmEntity> tbDatas =
@@ -84,7 +87,7 @@ public class TkAlarmInfoServiceImpl implements TkAlarmInfoService {
             deviceName,
             deviceType,
             originatorType,
-            ids.size() > 0 ? ids : null);
+            null!=ids&&ids.size() > 0 ? ids : null);
     return new TkPageData<>(tbDatas.getRecords(), tbDatas.getTotal());
   }
 

@@ -47,7 +47,8 @@ public class TkDataBoardServiceImpl extends AbstractBaseService<DataBoardMapper,
                 () -> new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage()));
     String organizationId =
         null != queryMap.get("organizationId") ? queryMap.get("organizationId").toString() : null;
-    List<String> organizationIds = null;
+    List<String> organizationIds =
+            null!= queryMap.get("organizationIds")?(List<String>)queryMap.get("organizationIds"):null;
     if (null != organizationId) {
       List<OrganizationDTO> list =
               organizationService.findOrganizationTreeList(

@@ -11,6 +11,7 @@ import org.thingsboard.server.common.data.yunteng.constant.QueryConstant;
 import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
+import org.thingsboard.server.common.data.yunteng.dto.DeviceDTO;
 import org.thingsboard.server.common.data.yunteng.dto.TkDeviceStateLogDTO;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.dao.yunteng.entities.TkDeviceStateLogEntity;
@@ -31,7 +32,7 @@ public class TkDeviceStateLogServiceImpl
 
   @Override
   public TkPageData<TkDeviceStateLogDTO> page(
-      boolean isCustomer, String tenantId, Map<String, Object> queryMap) {
+      boolean isCustomer,boolean isPtCommonTenant, String tenantId, Map<String, Object> queryMap) {
     String deviceName =
         Optional.ofNullable(queryMap.get("deviceName")).map(Object::toString).orElse(null);
     String organizationName =
@@ -49,19 +50,26 @@ public class TkDeviceStateLogServiceImpl
     List<String> deviceIds = null;
     if (isCustomer) {
       String customerId =
-          null != queryMap.get(QueryConstant.CUSTOMER_ID)
-              ? (String) queryMap.get(QueryConstant.CUSTOMER_ID)
-              : null;
+              null != queryMap.get(QueryConstant.CUSTOMER_ID)
+                      ? (String) queryMap.get(QueryConstant.CUSTOMER_ID)
+                      : null;
       deviceIds = deviceMapper.findDeviceIdsByCustomerId(customerId);
       if (null == deviceIds || deviceIds.isEmpty()) {
         return new TkPageData<>(new ArrayList<>(), 0);
       }
     }
+    if(isPtCommonTenant){
+      List<DeviceDTO> devices = deviceMapper.findDevicesByDeviceTypeAndOrganizationId((List<String>) queryMap.get("orgIds"),
+              null,null,null,null);
+      List<String> finalTbDevices = new ArrayList<>();
+      devices.forEach(item -> finalTbDevices.add(item.getTbDeviceId()));
+      deviceIds = finalTbDevices;
+    }
     LambdaQueryWrapper<TkDeviceStateLogEntity> queryWrapper =
         new LambdaQueryWrapper<TkDeviceStateLogEntity>()
             .eq(TkDeviceStateLogEntity::getTenantId, tenantId)
             .eq(null != status, TkDeviceStateLogEntity::getStatus, status)
-            .in(isCustomer, TkDeviceStateLogEntity::getTbDeviceId, deviceIds)
+            .in(isCustomer||isPtCommonTenant, TkDeviceStateLogEntity::getTbDeviceId, deviceIds)
             .like(
                 StringUtils.isNotEmpty(deviceName),
                 TkDeviceStateLogEntity::getDeviceName,

@@ -45,10 +45,7 @@ import org.thingsboard.server.dao.usagerecord.ApiUsageStateService;
 import org.thingsboard.server.dao.yunteng.mapper.DeviceMapper;
 import org.thingsboard.server.dao.yunteng.mapper.TkAlarmMapper;
 import org.thingsboard.server.dao.yunteng.mapper.UserMapper;
-import org.thingsboard.server.dao.yunteng.service.HomePageService;
-import org.thingsboard.server.dao.yunteng.service.TkDeviceProfileService;
-import org.thingsboard.server.dao.yunteng.service.TkTenantService;
-import org.thingsboard.server.dao.yunteng.service.TkUserService;
+import org.thingsboard.server.dao.yunteng.service.*;
 
 @Service
 @RequiredArgsConstructor
@@ -74,11 +71,14 @@ public class TkHomePageServiceImpl implements HomePageService {
 
   private final TkDeviceProfileService tkDeviceProfileService;
 
+  private final TkOrganizationService organizationService;
+
   @Override
   public HomePageLeftTopDTO getHomePageLeftTopInfo(
       boolean isPtSysAdmin,
       boolean isPtAdmin,
       boolean isTenantAdmin,
+      boolean isPtCommonTenant,
       String tenantId,
       String currentUserId)
       throws ExecutionException, InterruptedException {
@@ -99,6 +99,7 @@ public class TkHomePageServiceImpl implements HomePageService {
     TenantId currentTenantId = TenantId.fromUUID(UUID.fromString(tenantId));
     String customerId = null;
     List<DeviceDTO> deviceList;
+    List<String> orgIds = null;
     if (isPtSysAdmin || isPtAdmin) {
       setTenantInfoData(homePageLeftTopDTO, todayBegin, todayEnd);
       setCustomerInfoData(homePageLeftTopDTO, todayBegin, todayEnd);
@@ -112,26 +113,40 @@ public class TkHomePageServiceImpl implements HomePageService {
       setTodayAlarmAndMessageInfo(
           todayBegin, todayEnd, currentTenantId, apiUsageState.getId(), messageInfo, alarm);
 
-    } else {
-      customerId = userMapper.findCustomerIdByUserId(currentUserId);
-      if (StringUtils.isNotEmpty(customerId)) {
-        // 查询customerId
-        queryMap.put("customerId", customerId);
-        List<String> tbDevices = deviceMapper.findDeviceIdsByCustomerId(customerId);
+    }else {
+        List<String> tbDevices = null;
+        List<BaseHomePageTop> alarmList = null;
+        long startTs = todayBegin.toInstant(ZoneOffset.of("+8")).toEpochMilli();
+        if(isPtCommonTenant){
+          //查询所有组织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);
+          if (StringUtils.isNotEmpty(customerId)) {
+            // 查询customerId
+            queryMap.put("customerId", customerId);
+            tbDevices = deviceMapper.findDeviceIdsByCustomerId(customerId);
+          }
+          alarmList = deviceMapper.findDeviceAlarmInfoByCustomer(startTs, customerId,null);
+        }
         for (String devId : tbDevices) {
           setCustomerMessageInfo(
               todayBegin, todayEnd, currentTenantId, DeviceId.fromString(devId), messageInfo);
         }
-        long startTs = todayBegin.toInstant(ZoneOffset.of("+8")).toEpochMilli();
-        List<BaseHomePageTop> alarmList =
-            deviceMapper.findDeviceAlarmInfoByCustomer(startTs, customerId);
         if (alarmList.size() > zero) {
           BaseHomePageTop baseHomePageTop = alarmList.get(0);
           alarm.setSumCount(baseHomePageTop.getSumCount());
           alarm.setTodayAdd(
               baseHomePageTop.getTodayAdd() == null ? zero : baseHomePageTop.getTodayAdd());
         }
-      }
     }
     deviceList = deviceMapper.findDevices(queryMap);
     homeDeviceInfo = new HomeDeviceInfoDTO(zero);
@@ -140,7 +155,7 @@ public class TkHomePageServiceImpl implements HomePageService {
     }
     if (!isPtSysAdmin && !isPtAdmin) {
       List<DeviceProfileDTO> deviceProfileDTOList = null;
-      if (isTenantAdmin) {
+      if (isTenantAdmin||isPtCommonTenant) {
         deviceProfileDTOList = tkDeviceProfileService.findDeviceProfile(tenantId);
 
       } else {

@@ -67,7 +67,9 @@ public class TkReportFromConfigServiceImpl
           userOrganizationMappingService.compareOrganizationIdsByCustomerId(
               organizationIds, userId);
     }
-    queryMap.put("organizationIds", organizationIds);
+    if(null!=organizationIds){
+      queryMap.put("organizationIds", organizationIds);
+    }
     IPage<ReportFormConfigDTO> page =
         baseMapper.getReportFormConfigPage(
             getPage(queryMap, FastIotConstants.DefaultOrder.CREATE_TIME, false), queryMap);

@@ -79,7 +79,7 @@ public class TkReportGenerateRecordServiceImpl
         Optional.ofNullable(queryMap.get("executeStatus"))
             .map(obj -> Integer.valueOf(obj.toString()))
             .orElse(null);
-    List<String> organizationIds = null;
+    List<String> organizationIds =  null!= queryMap.get("organizationIds") ? (List<String>)queryMap.get("organizationIds") : null;
     boolean isCustomer =!tenantAdmin && null != queryMap.get("userId");
     if (isCustomer) {
       organizationIds =

@@ -73,7 +73,10 @@ public interface DeviceMapper extends BaseMapper<TkDeviceEntity> {
       @Param("todayTime") Long todayTime, @Param("customerId") String customerId);
 
   List<BaseHomePageTop> findDeviceAlarmInfoByCustomer(
-      @Param("todayTime") Long todayTime, @Param("customerId") String customerId);
+      @Param("todayTime") Long todayTime,
+      @Param("customerId") String customerId,
+      @Param("organizationIds") List<String> organizationIds
+  );
 
   @Deprecated
   Integer findDeviceMessageInfoByTs(
@@ -158,4 +161,11 @@ public interface DeviceMapper extends BaseMapper<TkDeviceEntity> {
           @Param("deviceLabel") String deviceLabel,
           @Param("deviceProfileId") String deviceProfileId,
           @Param("transportType")TransportTypeEnum transportType) ;
+
+
+  List<DeviceDTO> findDevicesByProfileIdAndOrganizationId(
+          @Param("orgIds")List<String> orgIds,
+          @Param("profileId") String profileId) ;
+
+
 }

@@ -31,6 +31,7 @@ public interface HomePageService {
       boolean isPtSysAdmin,
       boolean isPtAdmin,
       boolean isTenantAdmin,
+      boolean isPtCommonTenant,
       String tenantId,
       String currentUserId)
       throws ExecutionException, InterruptedException;

@@ -44,7 +44,9 @@ public interface TkAlarmInfoService {
       String deviceName,
       DeviceTypeEnum deviceType,
       EntityType originatorType,
-      String organizationId);
+      String organizationId,
+      List<String> organizationIds
+      );
 
   /**
    * 设备告警类型

@@ -8,7 +8,7 @@ import org.thingsboard.server.dao.yunteng.entities.TkDeviceStateLogEntity;
 import java.util.Map;
 
 public interface TkDeviceStateLogService extends BaseService<TkDeviceStateLogEntity> {
-  TkPageData<TkDeviceStateLogDTO> page(boolean isCustomer,String tenantId,Map<String, Object> queryMap);
+  TkPageData<TkDeviceStateLogDTO> page(boolean isCustomer,boolean isPtCommonTenant,String tenantId,Map<String, Object> queryMap);
 
   boolean deleteTkDeviceStateLog(DeleteDTO deleteDTO);
 

@@ -23,7 +23,7 @@ public interface TkUserService {
   List<UserDetailsDTO> findUserDetailsByUsername(String username, String tenantId);
 
   UserDTO saveAccount(
-      UserDTO userDTO, boolean sendEmail, boolean sendMsg, boolean isTenantAdmin, String tenantId);
+      UserDTO userDTO, boolean sendEmail, boolean sendMsg, boolean isTenantAdmin, boolean isCommonTenant, String tenantId);
 
   String getActivationLink(String userId, boolean isPtSysadmin, String tenantId);
 

@@ -245,6 +245,12 @@
             <if test="queryMap.customerId !=null and queryMap.customerId !=''">
                 AND d.customer_id :: TEXT = #{queryMap.customerId}
             </if>
+            <if test="queryMap.organizationIds !=null">
+                AND ifd.organization_id IN
+                <foreach collection="queryMap.organizationIds" item="orgId" open="(" separator="," close=")">
+                    #{orgId}
+                </foreach>
+            </if>
         </where>
     </select>
     <select id="getRelationDevicePage" resultMap="relationDeviceMap">
@@ -302,8 +308,16 @@
         FROM alarm m
         LEFT JOIN tk_device d ON m.originator_id = d.tb_device_id::uuid
         LEFT JOIN device bd ON bd.id = d.tb_device_id::uuid
-        WHERE bd.customer_id ::TEXT = #{customerId}
-          AND m.originator_type = 5;
+        WHERE  m.originator_type = 5
+        <if test="customerId !=null">
+        AND bd.customer_id ::TEXT = #{customerId}
+        </if>
+        <if test="organizationIds !=null">
+            AND d.organization_id IN
+            <foreach collection="organizationIds" item="orgId" open="(" separator="," close=")">
+                #{orgId}
+            </foreach>
+        </if>
     </select>
 
     <select id="findDeviceMessageInfoByTs" resultType="java.lang.Integer">
@@ -518,4 +532,20 @@
         AND ifd.tenant_id = #{tenantId}
         AND d.id::TEXT = #{tbDeviceId}
     </select>
+
+    <select id="findDevicesByProfileIdAndOrganizationId" resultMap="deviceMap">
+        SELECT
+        <include refid="basicColumns"/>,dev.transport_type
+        FROM tk_device ifd
+        left join device_profile dev on ifd.profile_id = dev.id :: TEXT
+        where
+        1=1
+        <if test="profileId !=null and profileId !=''">
+            AND ifd.profile_id = #{profileId}
+        </if>
+        and ifd.organization_id in
+        <foreach collection="orgIds" item="orgId" open="(" separator="," close=")">
+            #{orgId}
+        </foreach>
+    </select>
 </mapper>

@@ -37,10 +37,16 @@
         <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}
@@ -54,6 +60,12 @@
             <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>