Commit 8649bcff9fcdf46256abaa3c825b7ca1a5adefed

Authored by 云中非
1 parent 307ffa79

refactor: 组织可用设备接口优化

1、租户管理员只能查看未分配客户的设备
2、客户只能查看分配给自己的。
... ... @@ -48,7 +48,7 @@ public class YtSceneLinkageController extends BaseController {
48 48 throws ThingsboardException {
49 49 SceneLinkageDTO newSceneLinkageDTO =
50 50 sceneLinkageService.saveSceneLinkage(
51   - sceneLinkageDTO, getCurrentUser().getCurrentTenantId(),getCurrentUser().isPtTenantAdmin(), getCurrentUser().getCurrentUserId());
  51 + sceneLinkageDTO, getCurrentUser().getCurrentTenantId(),getCurrentUser().getCurrentUserId(),getCurrentUser().getCustomerId().getId().toString());
52 52 return Optional.ofNullable(newSceneLinkageDTO)
53 53 .map(
54 54 dto -> {
... ... @@ -67,7 +67,7 @@ public class YtSceneLinkageController extends BaseController {
67 67 public void updateSceneLinkage(
68 68 @Validated(UpdateGroup.class) @RequestBody SceneLinkageDTO sceneLinkageDTO)
69 69 throws ThingsboardException {
70   - sceneLinkageService.updateSceneLinkage(sceneLinkageDTO, getCurrentUser().getCurrentTenantId(),getCurrentUser().isPtTenantAdmin(), getCurrentUser().getCurrentUserId());
  70 + sceneLinkageService.updateSceneLinkage(sceneLinkageDTO, getCurrentUser().getCurrentTenantId(), getCurrentUser().getCurrentUserId(),getCurrentUser().getCustomerId().getId().toString());
71 71 }
72 72
73 73 @ApiOperation("查询(分页列表)")
... ... @@ -109,9 +109,8 @@ public class YtSceneLinkageController extends BaseController {
109 109 List<DeviceDTO> dtoList =
110 110 sceneLinkageService.findDeviceList(
111 111 organizationId,
112   - getCurrentUser().isPtTenantAdmin(),
113 112 getCurrentUser().getCurrentTenantId(),
114   - getCurrentUser().getCurrentUserId());
  113 + getCurrentUser().getCustomerId().getId().toString());
115 114 Map<String, Object> map = new HashMap<>();
116 115 map.put("items", dtoList);
117 116 return ResponseEntity.ok(map);
... ...