简柏林 / thingskit · Commits

Commit 9cb113cfb60fa34de7642b905d4c2885aa351440

Authored by xp.Huang
1 parent 6791561a

fix: 客户不允许配置报表，且导出报表列表不允许删除

Inline Side-by-side
Showing 2 changed files with 5 additions and 5 deletions
@@ -33,13 +33,13 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant. @@ -33,13 +33,13 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
33 @RequestMapping("api/yt/report_form/config") 33 @RequestMapping("api/yt/report_form/config")
34 @Api(tags = "报表配置信息") 34 @Api(tags = "报表配置信息")
35 @RequiredArgsConstructor 35 @RequiredArgsConstructor
36 -@PreAuthorize("@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{})")  
37 public class TkReportFormConfigController extends BaseController { 36 public class TkReportFormConfigController extends BaseController {
38 37
39 private final TkReportFormConfigService reportFormConfigService; 38 private final TkReportFormConfigService reportFormConfigService;
40 39
41 @GetMapping(params = {PAGE_SIZE, PAGE}) 40 @GetMapping(params = {PAGE_SIZE, PAGE})
42 @ApiOperation("分页") 41 @ApiOperation("分页")
  42 + @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN'},{})")
43 public TkPageData<ReportFormConfigDTO> page( 43 public TkPageData<ReportFormConfigDTO> page(
44 @RequestParam(PAGE_SIZE) int pageSize, 44 @RequestParam(PAGE_SIZE) int pageSize,
45 @RequestParam(PAGE) int page, 45 @RequestParam(PAGE) int page,
@@ -77,7 +77,7 @@ public class TkReportFormConfigController extends BaseController { @@ -77,7 +77,7 @@ public class TkReportFormConfigController extends BaseController {
77 77
78 @PostMapping 78 @PostMapping
79 @ApiOperation("新增") 79 @ApiOperation("新增")
80 - @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{'api:yt:report_form:config:post'})") 80 + @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN'},{'api:yt:report_form:config:post'})")
81 public ResponseResult<ReportFormConfigDTO> saveReportFromConfig( 81 public ResponseResult<ReportFormConfigDTO> saveReportFromConfig(
82 @Validated({AddGroup.class}) @RequestBody ReportFormConfigDTO configDTO) 82 @Validated({AddGroup.class}) @RequestBody ReportFormConfigDTO configDTO)
83 throws ThingsboardException, SchedulerException { 83 throws ThingsboardException, SchedulerException {
@@ -89,7 +89,7 @@ public class TkReportFormConfigController extends BaseController { @@ -89,7 +89,7 @@ public class TkReportFormConfigController extends BaseController {
89 89
90 @PutMapping 90 @PutMapping
91 @ApiOperation("编辑") 91 @ApiOperation("编辑")
92 - @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{'api:yt:report_form:config:update'})") 92 + @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN'},{'api:yt:report_form:config:update'})")
93 public ResponseResult<ReportFormConfigDTO> updateReportFromConfig( 93 public ResponseResult<ReportFormConfigDTO> updateReportFromConfig(
94 @Validated({UpdateGroup.class}) @RequestBody ReportFormConfigDTO configDTO) 94 @Validated({UpdateGroup.class}) @RequestBody ReportFormConfigDTO configDTO)
95 throws ThingsboardException, SchedulerException { 95 throws ThingsboardException, SchedulerException {
@@ -108,7 +108,7 @@ public class TkReportFormConfigController extends BaseController { @@ -108,7 +108,7 @@ public class TkReportFormConfigController extends BaseController {
108 108
109 @DeleteMapping 109 @DeleteMapping
110 @ApiOperation("删除") 110 @ApiOperation("删除")
111 - @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{'api:yt:report_form:config:delete'})") 111 + @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN'},{'api:yt:report_form:config:delete'})")
112 public ResponseResult<Boolean> deleteReportFormConfig( 112 public ResponseResult<Boolean> deleteReportFormConfig(
113 @Validated({DeleteGroup.class}) @RequestBody DeleteDTO deleteDTO) throws SchedulerException { 113 @Validated({DeleteGroup.class}) @RequestBody DeleteDTO deleteDTO) throws SchedulerException {
114 return reportFormConfigService.deleteReportFormConfig(deleteDTO) 114 return reportFormConfigService.deleteReportFormConfig(deleteDTO)
@@ -82,7 +82,7 @@ public class TkReportGenerateRecordController extends BaseController { @@ -82,7 +82,7 @@ public class TkReportGenerateRecordController extends BaseController {
82 @DeleteMapping 82 @DeleteMapping
83 @ApiOperation("删除") 83 @ApiOperation("删除")
84 @PreAuthorize( 84 @PreAuthorize(
85 - "@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{'api:yt:report:generate:record:delete'})") 85 + "@check.checkPermissions({'TENANT_ADMIN'},{'api:yt:report:generate:record:delete'})")
86 public ResponseResult<Boolean> deleteReportGenerateRecord( 86 public ResponseResult<Boolean> deleteReportGenerateRecord(
87 @Validated({DeleteGroup.class}) @RequestBody DeleteDTO deleteDTO) { 87 @Validated({DeleteGroup.class}) @RequestBody DeleteDTO deleteDTO) {
88 return reportFormGenerateRecordService.deleteReportGenerateRecord(deleteDTO) 88 return reportFormGenerateRecordService.deleteReportGenerateRecord(deleteDTO)