简柏林 / thingskit · Commits

Commit 2ae50db0dca7451e5540bf01a4f453dd937be7da

Authored by xp.Huang
1 parent 32d2f0d6

fix: 首页接口在大屏页面分享情况下的调用

Inline Side-by-side
Showing 3 changed files with 8 additions and 6 deletions
@@ -47,7 +47,8 @@ public class HomePageController extends BaseController { @@ -47,7 +47,8 @@ public class HomePageController extends BaseController {
47 getCurrentUser().isPtTenantAdmin(), 47 getCurrentUser().isPtTenantAdmin(),
48 getCurrentUser().isPtCommonTenant(), 48 getCurrentUser().isPtCommonTenant(),
49 getCurrentUser().getCurrentTenantId(), 49 getCurrentUser().getCurrentTenantId(),
50 - getCurrentUser().getCurrentUserId()); 50 + getCurrentUser().getCurrentUserId(),
  51 + getCurrentUser().getCustomerId().getId().toString());
51 } 52 }
52 53
53 @GetMapping("right/overdue") 54 @GetMapping("right/overdue")
@@ -40,7 +40,6 @@ import org.thingsboard.server.common.data.yunteng.enums.TrendType; @@ -40,7 +40,6 @@ import org.thingsboard.server.common.data.yunteng.enums.TrendType;
40 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData; 40 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
41 import org.thingsboard.server.dao.entity.EntityService; 41 import org.thingsboard.server.dao.entity.EntityService;
42 import org.thingsboard.server.dao.timeseries.TimeseriesService; 42 import org.thingsboard.server.dao.timeseries.TimeseriesService;
43 -import org.thingsboard.server.dao.usagerecord.ApiUsageStateDao;  
44 import org.thingsboard.server.dao.usagerecord.ApiUsageStateService; 43 import org.thingsboard.server.dao.usagerecord.ApiUsageStateService;
45 import org.thingsboard.server.dao.yunteng.mapper.DeviceMapper; 44 import org.thingsboard.server.dao.yunteng.mapper.DeviceMapper;
46 import org.thingsboard.server.dao.yunteng.mapper.TkAlarmMapper; 45 import org.thingsboard.server.dao.yunteng.mapper.TkAlarmMapper;
@@ -79,7 +78,8 @@ public class TkHomePageServiceImpl implements HomePageService { @@ -79,7 +78,8 @@ public class TkHomePageServiceImpl implements HomePageService {
79 boolean isTenantAdmin, 78 boolean isTenantAdmin,
80 boolean isPtCommonTenant, 79 boolean isPtCommonTenant,
81 String tenantId, 80 String tenantId,
82 - String currentUserId) 81 + String currentUserId,
  82 + String customerId)
83 throws ExecutionException, InterruptedException { 83 throws ExecutionException, InterruptedException {
84 // 如果当前用户是超级管理员或平台管理员，查询所有的设备数量、租户数量、客户数量 84 // 如果当前用户是超级管理员或平台管理员，查询所有的设备数量、租户数量、客户数量
85 // 如果当前用户是租户管理员，查询租户下的所有设备、告警、消息量 85 // 如果当前用户是租户管理员，查询租户下的所有设备、告警、消息量
@@ -96,7 +96,6 @@ public class TkHomePageServiceImpl implements HomePageService { @@ -96,7 +96,6 @@ public class TkHomePageServiceImpl implements HomePageService {
96 BaseHomePageTop product = new BaseHomePageTop(zero); 96 BaseHomePageTop product = new BaseHomePageTop(zero);
97 Map<String, Object> queryMap = new HashMap<>(); 97 Map<String, Object> queryMap = new HashMap<>();
98 TenantId currentTenantId = TenantId.fromUUID(UUID.fromString(tenantId)); 98 TenantId currentTenantId = TenantId.fromUUID(UUID.fromString(tenantId));
99 - String customerId = null;  
100 List<DeviceDTO> deviceList; 99 List<DeviceDTO> deviceList;
101 List<String> orgIds = null; 100 List<String> orgIds = null;
102 if (isPtSysAdmin || isPtAdmin) { 101 if (isPtSysAdmin || isPtAdmin) {
@@ -128,7 +127,6 @@ public class TkHomePageServiceImpl implements HomePageService { @@ -128,7 +127,6 @@ public class TkHomePageServiceImpl implements HomePageService {
128 devices.forEach(item -> finalTbDevices.add(item.getTbDeviceId())); 127 devices.forEach(item -> finalTbDevices.add(item.getTbDeviceId()));
129 tbDevices = finalTbDevices; 128 tbDevices = finalTbDevices;
130 }else{ 129 }else{
131 - customerId = userMapper.findCustomerIdByUserId(currentUserId);  
132 if (StringUtils.isNotEmpty(customerId)) { 130 if (StringUtils.isNotEmpty(customerId)) {
133 // 查询customerId 131 // 查询customerId
134 queryMap.put("customerId", customerId); 132 queryMap.put("customerId", customerId);
@@ -25,6 +25,8 @@ public interface HomePageService { @@ -25,6 +25,8 @@ public interface HomePageService {
25 * @param isTenantAdmin 是否租户管理员 25 * @param isTenantAdmin 是否租户管理员
26 * @param tenantId 租户ID 26 * @param tenantId 租户ID
27 * @param currentUserId 当前用户ID 27 * @param currentUserId 当前用户ID
  28 + * @param isPtCommonTenant 是否普通租户管理员
  29 + * @param customerId 客户ID
28 * @return 首页左边顶部信息 30 * @return 首页左边顶部信息
29 */ 31 */
30 HomePageLeftTopDTO getHomePageLeftTopInfo( 32 HomePageLeftTopDTO getHomePageLeftTopInfo(
@@ -33,7 +35,8 @@ public interface HomePageService { @@ -33,7 +35,8 @@ public interface HomePageService {
33 boolean isTenantAdmin, 35 boolean isTenantAdmin,
34 boolean isPtCommonTenant, 36 boolean isPtCommonTenant,
35 String tenantId, 37 String tenantId,
36 - String currentUserId) 38 + String currentUserId,
  39 + String customerId)
37 throws ExecutionException, InterruptedException; 40 throws ExecutionException, InterruptedException;
38 41
39 /** 42 /**