Commit 8649bcff9fcdf46256abaa3c825b7ca1a5adefed
1 parent
307ffa79
refactor: 组织可用设备接口优化
1、租户管理员只能查看未分配客户的设备 2、客户只能查看分配给自己的。
Showing
1 changed file
with
3 additions
and
4 deletions
| @@ -48,7 +48,7 @@ public class YtSceneLinkageController extends BaseController { | @@ -48,7 +48,7 @@ public class YtSceneLinkageController extends BaseController { | ||
| 48 | throws ThingsboardException { | 48 | throws ThingsboardException { |
| 49 | SceneLinkageDTO newSceneLinkageDTO = | 49 | SceneLinkageDTO newSceneLinkageDTO = |
| 50 | sceneLinkageService.saveSceneLinkage( | 50 | sceneLinkageService.saveSceneLinkage( |
| 51 | - sceneLinkageDTO, getCurrentUser().getCurrentTenantId(),getCurrentUser().isPtTenantAdmin(), getCurrentUser().getCurrentUserId()); | 51 | + sceneLinkageDTO, getCurrentUser().getCurrentTenantId(),getCurrentUser().getCurrentUserId(),getCurrentUser().getCustomerId().getId().toString()); |
| 52 | return Optional.ofNullable(newSceneLinkageDTO) | 52 | return Optional.ofNullable(newSceneLinkageDTO) |
| 53 | .map( | 53 | .map( |
| 54 | dto -> { | 54 | dto -> { |
| @@ -67,7 +67,7 @@ public class YtSceneLinkageController extends BaseController { | @@ -67,7 +67,7 @@ public class YtSceneLinkageController extends BaseController { | ||
| 67 | public void updateSceneLinkage( | 67 | public void updateSceneLinkage( |
| 68 | @Validated(UpdateGroup.class) @RequestBody SceneLinkageDTO sceneLinkageDTO) | 68 | @Validated(UpdateGroup.class) @RequestBody SceneLinkageDTO sceneLinkageDTO) |
| 69 | throws ThingsboardException { | 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 | @ApiOperation("查询(分页列表)") | 73 | @ApiOperation("查询(分页列表)") |
| @@ -109,9 +109,8 @@ public class YtSceneLinkageController extends BaseController { | @@ -109,9 +109,8 @@ public class YtSceneLinkageController extends BaseController { | ||
| 109 | List<DeviceDTO> dtoList = | 109 | List<DeviceDTO> dtoList = |
| 110 | sceneLinkageService.findDeviceList( | 110 | sceneLinkageService.findDeviceList( |
| 111 | organizationId, | 111 | organizationId, |
| 112 | - getCurrentUser().isPtTenantAdmin(), | ||
| 113 | getCurrentUser().getCurrentTenantId(), | 112 | getCurrentUser().getCurrentTenantId(), |
| 114 | - getCurrentUser().getCurrentUserId()); | 113 | + getCurrentUser().getCustomerId().getId().toString()); |
| 115 | Map<String, Object> map = new HashMap<>(); | 114 | Map<String, Object> map = new HashMap<>(); |
| 116 | map.put("items", dtoList); | 115 | map.put("items", dtoList); |
| 117 | return ResponseEntity.ok(map); | 116 | return ResponseEntity.ok(map); |