Merge branch '202304171' into 'master_dev'

202304171

See merge request yunteng/thingskit!176

@@ -47,7 +47,7 @@ public class TkEventController extends BaseController {
             throws ThingsboardException {
         checkParameter("tbDeviceId", tbDeviceId);
 
-        if (orderBy != null && orderBy.isEmpty()) {
+        if (orderBy == null || orderBy.isEmpty()) {
             orderBy = ModelConstants.EVENT_TIME_COLUMN;
         }
         TimePageLink pageLink = createTimePageLink(pageSize, page, null, orderBy, orderType==null?"":orderType.name(), startTime, endTime);

@@ -15,13 +15,14 @@ import org.thingsboard.server.common.data.yunteng.core.exception.EntityCreationE
 import org.thingsboard.server.common.data.yunteng.utils.ReflectUtils;
 
 import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.time.LocalDateTime;
 
 @Data
 @JsonInclude(JsonInclude.Include.NON_NULL)
-public class BaseDTO {
+public class BaseDTO implements Serializable {
   @NotEmpty(message = "ID不能为空或者空字符串",groups = {UpdateGroup.class})
   @ApiModelProperty(value = "ID")
   private String id;

@@ -8,6 +8,7 @@ import org.thingsboard.server.common.data.yunteng.common.UpdateGroup;
 import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum;
 
 import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
 
 /**
  * 组态结点数据源
@@ -15,7 +16,7 @@ import javax.validation.constraints.NotEmpty;
  * @author Administrator
  */
 @Data
-public class ConfigurationDatasourceStatusDTO {
+public class ConfigurationDatasourceStatusDTO implements Serializable {
 
   @ApiModelProperty(value = "组织ID", required = true)
   @NotEmpty(

@@ -4,13 +4,15 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.thingsboard.server.common.data.yunteng.enums.EventTypeEnum;
 
+import java.io.Serializable;
+
 /**
  * 组态节点事件
  *
  * @author Administrator
  */
 @Data
-public class ConfigurationEventStatusDTO {
+public class ConfigurationEventStatusDTO implements Serializable {
 
   @ApiModelProperty(value = "事件类型", required = true)
   private EventTypeEnum type;

@@ -6,10 +6,11 @@ import org.thingsboard.server.common.data.yunteng.common.DeleteGroup;
 
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
+import java.io.Serializable;
 import java.util.Set;
 
 @Data
-public class DeleteDTO {
+public class DeleteDTO implements Serializable {
   /** 删除主键IDS */
   @NotNull(
       message = "IDS不能为空",

@@ -3,8 +3,10 @@ package org.thingsboard.server.common.data.yunteng.dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.io.Serializable;
+
 @Data
-public class HomeDeviceInfoDTO {
+public class HomeDeviceInfoDTO implements Serializable {
   @ApiModelProperty(value = "设备总数")
   private Integer sumCount;
 

@@ -4,11 +4,13 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.thingsboard.server.common.data.query.TsValue;
+
+import java.io.Serializable;
 import java.util.List;
 
 @Data
 @ApiModel("首页左边底部信息")
-public class HomePageLeftBottomDTO {
+public class HomePageLeftBottomDTO implements Serializable {
 
   @ApiModelProperty(value = "租户趋势分析")
   private List<TsValue> tenantInfo;

@@ -4,9 +4,11 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.io.Serializable;
+
 @Data
 @ApiModel("首页统计信息")
-public class HomePageLeftTopDTO {
+public class HomePageLeftTopDTO implements Serializable {
   @ApiModelProperty(value = "设备统计")
   private HomeDeviceInfoDTO deviceInfo;
 

@@ -5,11 +5,12 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 
+import java.io.Serializable;
 import java.util.List;
 
 @Data
 @ApiModel("首页右边信息")
-public class HomePageRightDTO {
+public class HomePageRightDTO implements Serializable {
 
   @ApiModelProperty(value = "租户消息量TOP10")
   private List<TenantTransportMessageDTO> top10;

@@ -3,8 +3,10 @@ package org.thingsboard.server.common.data.yunteng.dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.io.Serializable;
+
 @Data
-public class PlainRolesDTO {
+public class PlainRolesDTO implements Serializable {
   @ApiModelProperty(value = "角色ID")
   private String roleId;
 

@@ -7,10 +7,11 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.thingsboard.server.common.data.yunteng.enums.DeviceState;
 
+import java.io.Serializable;
 import java.time.LocalDateTime;
 
 @Data
-public class RelationDeviceDTO {
+public class RelationDeviceDTO implements Serializable {
   @ApiModelProperty(value = "TB设备ID")
   private String tbDeviceId;
 

@@ -4,8 +4,10 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum;
 
+import java.io.Serializable;
+
 @Data
-public class SelectItemDTO {
+public class SelectItemDTO implements Serializable {
   @ApiModelProperty(value = "下拉选项值")
   private String id;
 

@@ -4,9 +4,11 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.io.Serializable;
+
 @Data
 @ApiModel("租户消息量")
-public class TenantTransportMessageDTO {
+public class TenantTransportMessageDTO implements Serializable {
   @ApiModelProperty(value = "租户名称")
   private String name;
 

@@ -4,8 +4,10 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.thingsboard.server.common.data.yunteng.enums.RoleEnum;
 
+import java.io.Serializable;
+
 @Data
-public class UserDetailRoleDTO {
+public class UserDetailRoleDTO implements Serializable {
   @ApiModelProperty(value = "角色类型")
   private RoleEnum roleType;
 }

@@ -11,11 +11,12 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.apache.commons.lang3.StringUtils;
 
+import java.io.Serializable;
 import java.time.LocalDateTime;
 import java.util.Set;
 
 @Data
-public class UserInfoDTO {
+public class UserInfoDTO implements Serializable {
   @ExcelProperty("用户Id")
   @ApiModelProperty(value = "用户ID")
   private String userId;