Merge branch 'tianfu' into 'master'

fix: 修改bug，关于大屏设计器

See merge request yunteng/thingskit!166

@@ -4,7 +4,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
 import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
@@ -17,19 +16,19 @@ import org.thingsboard.server.common.data.yunteng.dto.request.TkDataViewContentI
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.TkDataViewContentService;
 import org.thingsboard.server.dao.yunteng.service.TkDataViewContentService;
 
 
+/**
+ * @author tianfuLei
+ */
 @RestController
 @RestController
 @RequestMapping("/api/yt/data_view/content")
 @RequestMapping("/api/yt/data_view/content")
 @RequiredArgsConstructor
 @RequiredArgsConstructor
 @Api(tags = "大屏内容")
 @Api(tags = "大屏内容")
-@PreAuthorize("@check.checkPermissions('TENANT_ADMIN','CUSTOMER_USER')")
 public class TkDataViewContentController extends BaseController {
 public class TkDataViewContentController extends BaseController {
 
 
   private final TkDataViewContentService tkDataViewContentService;
   private final TkDataViewContentService tkDataViewContentService;
 
 
   @PostMapping
   @PostMapping
   @ApiOperation("新增")
   @ApiOperation("新增")
-  @PreAuthorize(
-          "@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{'api:yt:dataview:content:post'})")
   public ResponseEntity<TkDataViewContentDTO> save(
   public ResponseEntity<TkDataViewContentDTO> save(
       @Validated({AddGroup.class}) @RequestBody TkDataViewContentDTO tkDataViewContentDTO)
       @Validated({AddGroup.class}) @RequestBody TkDataViewContentDTO tkDataViewContentDTO)
       throws ThingsboardException {
       throws ThingsboardException {
@@ -40,8 +39,6 @@ public class TkDataViewContentController extends BaseController {
 
 
   @PutMapping
   @PutMapping
   @ApiOperation("修改")
   @ApiOperation("修改")
-  @PreAuthorize(
-          "@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{'api:yt:dataview:content:update'})")
   public ResponseEntity<TkDataViewContentInfoDTO> update(
   public ResponseEntity<TkDataViewContentInfoDTO> update(
       @Validated({UpdateGroup.class}) @RequestBody TkDataViewContentInfoDTO contentReqDTO)
       @Validated({UpdateGroup.class}) @RequestBody TkDataViewContentInfoDTO contentReqDTO)
       throws ThingsboardException {
       throws ThingsboardException {
@@ -55,8 +52,6 @@ public class TkDataViewContentController extends BaseController {
 
 
   @DeleteMapping
   @DeleteMapping
   @ApiOperation("删除")
   @ApiOperation("删除")
-  @PreAuthorize(
-          "@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{'api:yt:dataview:content:delete'})")
   public ResponseEntity<Boolean> delete(
   public ResponseEntity<Boolean> delete(
       @Validated({DeleteGroup.class}) @RequestBody DeleteDTO deleteDTO)
       @Validated({DeleteGroup.class}) @RequestBody DeleteDTO deleteDTO)
       throws ThingsboardException {
       throws ThingsboardException {

@@ -24,11 +24,14 @@ import java.util.HashMap;
 
 
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
 
 
+/**
+ * @author tianfuLei
+ */
 @RestController
 @RestController
 @RequestMapping("/api/yt/data_view")
 @RequestMapping("/api/yt/data_view")
 @RequiredArgsConstructor
 @RequiredArgsConstructor
 @Api(tags = "大屏设计器")
 @Api(tags = "大屏设计器")
-@PreAuthorize("@check.checkPermissions('TENANT_ADMIN','CUSTOMER_USER')")
+@PreAuthorize("@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{})")
 public class TkDataViewController extends BaseController {
 public class TkDataViewController extends BaseController {
 
 
     private final TkDataViewService tkDataViewService;
     private final TkDataViewService tkDataViewService;
@@ -103,7 +106,8 @@ public class TkDataViewController extends BaseController {
 
 
     @GetMapping("/get_configuration_info/{id}")
     @GetMapping("/get_configuration_info/{id}")
     @ApiOperation("获取大屏信息")
     @ApiOperation("获取大屏信息")
-//    @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{'api:yt:dataview:center:get_configuration_info:get'})")
+    @PreAuthorize(
+            "@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{'api:yt:dataview:center:get_dataview_info:design','api:yt:dataview:center:get_dataview_info:preview'})")
     public ResponseEntity<TkDataViewContentInfoDTO> getConfigurationInfos(
     public ResponseEntity<TkDataViewContentInfoDTO> getConfigurationInfos(
             @PathVariable("id") String id) throws ThingsboardException {
             @PathVariable("id") String id) throws ThingsboardException {
         return ResponseEntity.ok(
         return ResponseEntity.ok(