简柏林 / thingskit · Commits

Commit fdb2dd16902a8bfec39cbd32d5f9e90f1cd05833

Authored by lifeontrip
2 parents a70b5039 a0f98e83

Merge branch 'master' into 20220908

Inline Side-by-side
Showing 2 changed files with 31 additions and 5 deletions
@@ -9,18 +9,21 @@ import org.springframework.web.bind.annotation.*; @@ -9,18 +9,21 @@ import org.springframework.web.bind.annotation.*;
9 import org.thingsboard.server.common.data.exception.ThingsboardException; 9 import org.thingsboard.server.common.data.exception.ThingsboardException;
10 import org.thingsboard.server.common.data.yunteng.core.exception.YtDataValidationException; 10 import org.thingsboard.server.common.data.yunteng.core.exception.YtDataValidationException;
11 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage; 11 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
  12 +import org.thingsboard.server.common.data.yunteng.dto.DataBoardDTO;
  13 +import org.thingsboard.server.common.data.yunteng.dto.DataComponentDTO;
12 import org.thingsboard.server.common.data.yunteng.dto.FrpInfoDTO; 14 import org.thingsboard.server.common.data.yunteng.dto.FrpInfoDTO;
  15 +import org.thingsboard.server.common.data.yunteng.dto.board.MoreDataComponentInfoDTO;
13 import org.thingsboard.server.common.data.yunteng.dto.request.AccountReqDTO; 16 import org.thingsboard.server.common.data.yunteng.dto.request.AccountReqDTO;
14 import org.thingsboard.server.common.data.yunteng.enums.FrpPluginsEnum; 17 import org.thingsboard.server.common.data.yunteng.enums.FrpPluginsEnum;
15 import org.thingsboard.server.common.data.yunteng.enums.MsgTemplatePurposeEnum; 18 import org.thingsboard.server.common.data.yunteng.enums.MsgTemplatePurposeEnum;
16 import org.thingsboard.server.common.data.yunteng.enums.StatusEnum; 19 import org.thingsboard.server.common.data.yunteng.enums.StatusEnum;
  20 +import org.thingsboard.server.common.data.yunteng.enums.ViewType;
17 import org.thingsboard.server.common.data.yunteng.utils.JacksonUtil; 21 import org.thingsboard.server.common.data.yunteng.utils.JacksonUtil;
18 -import org.thingsboard.server.controller.BaseController;  
19 -import org.thingsboard.server.dao.yunteng.service.YtFrpInfoService;  
20 -import org.thingsboard.server.dao.yunteng.service.YtSmsService;  
21 -import org.thingsboard.server.dao.yunteng.service.YtUserService; 22 +import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
  23 +import org.thingsboard.server.dao.yunteng.service.*;
22 24
23 import java.net.UnknownHostException; 25 import java.net.UnknownHostException;
  26 +import java.util.List;
24 import java.util.Optional; 27 import java.util.Optional;
25 28
26 import static org.thingsboard.server.common.data.yunteng.constant.FastIotConstants.CHINA_MOBILE_PATTERN; 29 import static org.thingsboard.server.common.data.yunteng.constant.FastIotConstants.CHINA_MOBILE_PATTERN;
@@ -28,11 +31,13 @@ import static org.thingsboard.server.common.data.yunteng.constant.FastIotConstan @@ -28,11 +31,13 @@ import static org.thingsboard.server.common.data.yunteng.constant.FastIotConstan
28 @RestController 31 @RestController
29 @RequestMapping("api/yt/noauth") 32 @RequestMapping("api/yt/noauth")
30 @RequiredArgsConstructor 33 @RequiredArgsConstructor
31 -public class YtNoAuthController extends BaseController { 34 +public class YtNoAuthController{
32 35
33 private final YtSmsService smsService; 36 private final YtSmsService smsService;
34 private final YtUserService userService; 37 private final YtUserService userService;
35 private final YtFrpInfoService frpInfoService; 38 private final YtFrpInfoService frpInfoService;
  39 + private final YtDataComponentService ytDataComponentService;
  40 + private final YtDataBoardService ytDataBoardService;
36 41
37 @PostMapping("/sendLoginSmsCode/{phoneNumber}") 42 @PostMapping("/sendLoginSmsCode/{phoneNumber}")
38 public boolean sendVerificationCode(@PathVariable("phoneNumber") String phoneNumber) { 43 public boolean sendVerificationCode(@PathVariable("phoneNumber") String phoneNumber) {
@@ -107,4 +112,24 @@ public class YtNoAuthController extends BaseController { @@ -107,4 +112,24 @@ public class YtNoAuthController extends BaseController {
107 objectNode.put("unchange", true); 112 objectNode.put("unchange", true);
108 return objectNode; 113 return objectNode;
109 } 114 }
  115 + @GetMapping("/share/dataBoard/{boardId}/{tenantId}")
  116 + @ApiOperation(value = "查询看板下的所有组件信息")
  117 + public ResponseResult<MoreDataComponentInfoDTO> getDataComponentsByBoardId(
  118 + @PathVariable("boardId") String boardId,@PathVariable("tenantId") String tenantId) throws ThingsboardException {
  119 + DataBoardDTO dto =
  120 + ytDataBoardService.findDataBoardInfoById(boardId, tenantId);
  121 + if (null == dto) {
  122 + throw new YtDataValidationException(ErrorMessage.NOT_BELONG_CURRENT_TENANT.getMessage());
  123 + }
  124 + if(dto.getViewType() == ViewType.PRIVATE_VIEW){
  125 + throw new YtDataValidationException(ErrorMessage.DATA_BOARD_IS_PRIVATE.getMessage());
  126 + }
  127 + MoreDataComponentInfoDTO moreDataComponentInfoDTO = new MoreDataComponentInfoDTO();
  128 + List<DataComponentDTO> data =
  129 + ytDataComponentService.getDataComponentsByBoardId(
  130 + tenantId, boardId);
  131 + moreDataComponentInfoDTO.setComponentLayout(dto.getLayout());
  132 + moreDataComponentInfoDTO.setComponentData(data);
  133 + return ResponseResult.success(moreDataComponentInfoDTO);
  134 + }
110 } 135 }
@@ -75,6 +75,7 @@ public enum ErrorMessage { @@ -75,6 +75,7 @@ public enum ErrorMessage {
75 START_TIME_OR_END_TIME_EXCEPTION(400055,"开始时间或结束时间异常"), 75 START_TIME_OR_END_TIME_EXCEPTION(400055,"开始时间或结束时间异常"),
76 TARGET_TEMPLATE_NOT_EXISTS_SELF_NOTICE(400056,"密码重置成功，请自行通知用户！"), 76 TARGET_TEMPLATE_NOT_EXISTS_SELF_NOTICE(400056,"密码重置成功，请自行通知用户！"),
77 ASSERT_DEFAULT_NAME_NO_CHANGED(400056,"系统预制资源，不能修改名称！"), 77 ASSERT_DEFAULT_NAME_NO_CHANGED(400056,"系统预制资源，不能修改名称！"),
  78 + DATA_BOARD_IS_PRIVATE(400057,"该数据看板不是公有视图"),
78 HAVE_NO_PERMISSION(500002,"没有修改权限"); 79 HAVE_NO_PERMISSION(500002,"没有修改权限");
79 private final int code; 80 private final int code;
80 private String message; 81 private String message;