Merge branch 'master' into 20220907

@@ -9,18 +9,21 @@ import org.springframework.web.bind.annotation.*;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.yunteng.core.exception.YtDataValidationException;
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
+import org.thingsboard.server.common.data.yunteng.dto.DataBoardDTO;
+import org.thingsboard.server.common.data.yunteng.dto.DataComponentDTO;
 import org.thingsboard.server.common.data.yunteng.dto.FrpInfoDTO;
+import org.thingsboard.server.common.data.yunteng.dto.board.MoreDataComponentInfoDTO;
 import org.thingsboard.server.common.data.yunteng.dto.request.AccountReqDTO;
 import org.thingsboard.server.common.data.yunteng.enums.FrpPluginsEnum;
 import org.thingsboard.server.common.data.yunteng.enums.MsgTemplatePurposeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.StatusEnum;
+import org.thingsboard.server.common.data.yunteng.enums.ViewType;
 import org.thingsboard.server.common.data.yunteng.utils.JacksonUtil;
-import org.thingsboard.server.controller.BaseController;
-import org.thingsboard.server.dao.yunteng.service.YtFrpInfoService;
-import org.thingsboard.server.dao.yunteng.service.YtSmsService;
-import org.thingsboard.server.dao.yunteng.service.YtUserService;
+import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
+import org.thingsboard.server.dao.yunteng.service.*;
 
 import java.net.UnknownHostException;
+import java.util.List;
 import java.util.Optional;
 
 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
 @RestController
 @RequestMapping("api/yt/noauth")
 @RequiredArgsConstructor
-public class YtNoAuthController extends BaseController {
+public class YtNoAuthController{
 
   private final YtSmsService smsService;
   private final YtUserService userService;
   private final YtFrpInfoService frpInfoService;
+  private final YtDataComponentService ytDataComponentService;
+  private final YtDataBoardService ytDataBoardService;
 
   @PostMapping("/sendLoginSmsCode/{phoneNumber}")
   public boolean sendVerificationCode(@PathVariable("phoneNumber") String phoneNumber) {
@@ -107,4 +112,24 @@ public class YtNoAuthController extends BaseController {
     objectNode.put("unchange", true);
     return objectNode;
   }
+  @GetMapping("/share/dataBoard/{boardId}/{tenantId}")
+  @ApiOperation(value = "查询看板下的所有组件信息")
+  public ResponseResult<MoreDataComponentInfoDTO> getDataComponentsByBoardId(
+          @PathVariable("boardId") String boardId,@PathVariable("tenantId") String tenantId) throws ThingsboardException {
+    DataBoardDTO dto =
+            ytDataBoardService.findDataBoardInfoById(boardId, tenantId);
+    if (null == dto) {
+      throw new YtDataValidationException(ErrorMessage.NOT_BELONG_CURRENT_TENANT.getMessage());
+    }
+    if(dto.getViewType() == ViewType.PRIVATE_VIEW){
+      throw new YtDataValidationException(ErrorMessage.DATA_BOARD_IS_PRIVATE.getMessage());
+    }
+    MoreDataComponentInfoDTO moreDataComponentInfoDTO = new MoreDataComponentInfoDTO();
+    List<DataComponentDTO> data =
+            ytDataComponentService.getDataComponentsByBoardId(
+                    tenantId, boardId);
+    moreDataComponentInfoDTO.setComponentLayout(dto.getLayout());
+    moreDataComponentInfoDTO.setComponentData(data);
+    return ResponseResult.success(moreDataComponentInfoDTO);
+  }
 }

@@ -23,7 +23,7 @@ public enum ErrorMessage {
   PROVIDE_CORRECT_PHONE_NUMBER(400004,"请提供正确的电话号码"),
   PROVIDE_CORRECT_EMAIL(400005,"请提供正确的邮箱"),
   PHONE_NUMBER_OR_EMAIL_REQUIRED(400006,"必须提供电话或者邮箱"),
-  NAME_ALREADY_EXISTS(400007,"名称已存在"),
+  NAME_ALREADY_EXISTS(400007,"名称已被使用"),
   ROLE_IN_USE(400008,"该角色还存在用户使用"),
   NONE_DEFAULT_RULE_CHAIN(400009,"该租户不存在默认的规则链"),
   TENANT_MISMATCHING(400010,"租户不匹配"),
@@ -67,7 +67,7 @@ public enum ErrorMessage {
   VIDEO_PLATFORM_CONFIG_LACK(400047,"流媒体平台信息缺失"),
   VIDEO_PLATFORM_CONFIG_ERROR(400048,"流媒体平台信息配置有误"),
   VIDEO_PLATFORM_NEED_ENABLE_HLS_HTTPS(400049,"平台需开启https的hls协议"),
-  NAME_EXISTED(400050,"名称【%s】已存在"),
+  NAME_EXISTED(400050,"名称【%s】已被使用"),
   INVALID_PARAMETER_OR_NOT_MATCH_TENANT(400051,"参数错误或该条数据不属于当前租户"),
   CRON_INVALID(400052,"cron表达式无效"),
   EXPORT_CONFIG_NON_EXISTENT(400053,"报表配置不存在或已被删除"),
@@ -75,6 +75,7 @@ public enum ErrorMessage {
   START_TIME_OR_END_TIME_EXCEPTION(400055,"开始时间或结束时间异常"),
   TARGET_TEMPLATE_NOT_EXISTS_SELF_NOTICE(400056,"密码重置成功，请自行通知用户！"),
   ASSERT_DEFAULT_NAME_NO_CHANGED(400056,"系统预制资源，不能修改名称！"),
+  DATA_BOARD_IS_PRIVATE(400057,"该数据看板不是公有视图"),
   HAVE_NO_PERMISSION(500002,"没有修改权限");
   private final int code;
   private String message;

@@ -20,9 +20,6 @@ public class DataBoardDTO extends TenantDTO {
   @ApiModelProperty(value = "视图类型")
   private ViewType viewType = ViewType.PRIVATE_VIEW;
 
-  @ApiModelProperty(value = "公有视图URL")
-  private String openUrl;
-
   @ApiModelProperty(value = "组件布局")
   private List<ComponentLayoutDTO> layout;
 

@@ -19,6 +19,15 @@ public class DataSourceInfoDTO implements Serializable {
   @ApiModelProperty(value = "属性", required = true)
   private String attribute;
 
+  @ApiModelProperty(value = "设备名称")
+  private String deviceName;
+
+  @ApiModelProperty(value = "是否网关设备")
+  private boolean gatewayDevice = false;
+
+  @ApiModelProperty(value = "子设备ID")
+  private String slaveDeviceId;
+
   @ApiModelProperty(value = "设备重命名")
   private String deviceRename;
 

@@ -36,6 +36,8 @@ import org.thingsboard.server.common.data.id.DeviceProfileId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageLink;
+import org.thingsboard.server.common.data.yunteng.core.exception.YtDataValidationException;
+import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.dao.entity.AbstractEntityService;
 import org.thingsboard.server.dao.exception.DataValidationException;
 import org.thingsboard.server.dao.service.DataValidator;
@@ -112,7 +114,7 @@ public class DeviceProfileServiceImpl extends AbstractEntityService implements D
         } catch (Exception t) {
             ConstraintViolationException e = extractConstraintViolationException(t).orElse(null);
             if (e != null && e.getConstraintName() != null && e.getConstraintName().equalsIgnoreCase("device_profile_name_unq_key")) {
-                throw new DataValidationException("Device profile with such name already exists!");
+                throw new YtDataValidationException(ErrorMessage.NAME_ALREADY_EXISTS.getMessage());
             } else if (e != null && e.getConstraintName() != null && e.getConstraintName().equalsIgnoreCase("device_provision_key_unq_key")) {
                 throw new DataValidationException("Device profile with such provision device key already exists!");
             } else {

@@ -22,8 +22,6 @@ public class DataBoard extends TenantBaseEntity {
   @TableField(typeHandler = EnumTypeHandler.class)
   private ViewType viewType;
 
-  private String openUrl;
-
   @TableField(typeHandler = JacksonTypeHandler.class)
   private JsonNode layout;
 

@@ -174,7 +174,7 @@ public class HomePageServiceImpl implements HomePageService {
                 }else{
                     totalExpired.getAndIncrement();
                 }
-                if(endTime.isAfter(customer.getUpdateTime()) && startTime.isBefore(customer.getUpdateTime())){
+                if(customer.getUpdateTime() != null && endTime.isAfter(customer.getUpdateTime()) && startTime.isBefore(customer.getUpdateTime())){
                     totalActivity.incrementAndGet();
                 }
 

@@ -380,8 +380,8 @@
     <select id="findDeviceKeys" resultType="string">
         SELECT
         DISTINCT base.key as keyName
-        FROM  ts_kv_latest latest
-        LEFT JOIN ts_kv_dictionary base ON latest.key = base.key_id
+        FROM  ts_kv_dictionary base
+        LEFT JOIN ts_kv_latest latest ON latest.key = base.key_id
         LEFT JOIN device tb ON tb.ID  = latest.entity_id
         LEFT JOIN iotfs_device iot ON tb.ID :: TEXT = iot.tb_device_id
         <where>