Showing
14 changed files
with
36 additions
and
14 deletions
@@ -15,13 +15,14 @@ import org.thingsboard.server.common.data.yunteng.core.exception.EntityCreationE | @@ -15,13 +15,14 @@ import org.thingsboard.server.common.data.yunteng.core.exception.EntityCreationE | ||
15 | import org.thingsboard.server.common.data.yunteng.utils.ReflectUtils; | 15 | import org.thingsboard.server.common.data.yunteng.utils.ReflectUtils; |
16 | 16 | ||
17 | import javax.validation.constraints.NotEmpty; | 17 | import javax.validation.constraints.NotEmpty; |
18 | +import java.io.Serializable; | ||
18 | import java.lang.reflect.Constructor; | 19 | import java.lang.reflect.Constructor; |
19 | import java.lang.reflect.InvocationTargetException; | 20 | import java.lang.reflect.InvocationTargetException; |
20 | import java.time.LocalDateTime; | 21 | import java.time.LocalDateTime; |
21 | 22 | ||
22 | @Data | 23 | @Data |
23 | @JsonInclude(JsonInclude.Include.NON_NULL) | 24 | @JsonInclude(JsonInclude.Include.NON_NULL) |
24 | -public class BaseDTO { | 25 | +public class BaseDTO implements Serializable { |
25 | @NotEmpty(message = "ID不能为空或者空字符串",groups = {UpdateGroup.class}) | 26 | @NotEmpty(message = "ID不能为空或者空字符串",groups = {UpdateGroup.class}) |
26 | @ApiModelProperty(value = "ID") | 27 | @ApiModelProperty(value = "ID") |
27 | private String id; | 28 | private String id; |
@@ -8,6 +8,7 @@ import org.thingsboard.server.common.data.yunteng.common.UpdateGroup; | @@ -8,6 +8,7 @@ import org.thingsboard.server.common.data.yunteng.common.UpdateGroup; | ||
8 | import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum; | 8 | import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum; |
9 | 9 | ||
10 | import javax.validation.constraints.NotEmpty; | 10 | import javax.validation.constraints.NotEmpty; |
11 | +import java.io.Serializable; | ||
11 | 12 | ||
12 | /** | 13 | /** |
13 | * 组态结点数据源 | 14 | * 组态结点数据源 |
@@ -15,7 +16,7 @@ import javax.validation.constraints.NotEmpty; | @@ -15,7 +16,7 @@ import javax.validation.constraints.NotEmpty; | ||
15 | * @author Administrator | 16 | * @author Administrator |
16 | */ | 17 | */ |
17 | @Data | 18 | @Data |
18 | -public class ConfigurationDatasourceStatusDTO { | 19 | +public class ConfigurationDatasourceStatusDTO implements Serializable { |
19 | 20 | ||
20 | @ApiModelProperty(value = "组织ID", required = true) | 21 | @ApiModelProperty(value = "组织ID", required = true) |
21 | @NotEmpty( | 22 | @NotEmpty( |
@@ -4,13 +4,15 @@ import io.swagger.annotations.ApiModelProperty; | @@ -4,13 +4,15 @@ import io.swagger.annotations.ApiModelProperty; | ||
4 | import lombok.Data; | 4 | import lombok.Data; |
5 | import org.thingsboard.server.common.data.yunteng.enums.EventTypeEnum; | 5 | import org.thingsboard.server.common.data.yunteng.enums.EventTypeEnum; |
6 | 6 | ||
7 | +import java.io.Serializable; | ||
8 | + | ||
7 | /** | 9 | /** |
8 | * 组态节点事件 | 10 | * 组态节点事件 |
9 | * | 11 | * |
10 | * @author Administrator | 12 | * @author Administrator |
11 | */ | 13 | */ |
12 | @Data | 14 | @Data |
13 | -public class ConfigurationEventStatusDTO { | 15 | +public class ConfigurationEventStatusDTO implements Serializable { |
14 | 16 | ||
15 | @ApiModelProperty(value = "事件类型", required = true) | 17 | @ApiModelProperty(value = "事件类型", required = true) |
16 | private EventTypeEnum type; | 18 | private EventTypeEnum type; |
@@ -6,10 +6,11 @@ import org.thingsboard.server.common.data.yunteng.common.DeleteGroup; | @@ -6,10 +6,11 @@ import org.thingsboard.server.common.data.yunteng.common.DeleteGroup; | ||
6 | 6 | ||
7 | import javax.validation.constraints.NotNull; | 7 | import javax.validation.constraints.NotNull; |
8 | import javax.validation.constraints.Size; | 8 | import javax.validation.constraints.Size; |
9 | +import java.io.Serializable; | ||
9 | import java.util.Set; | 10 | import java.util.Set; |
10 | 11 | ||
11 | @Data | 12 | @Data |
12 | -public class DeleteDTO { | 13 | +public class DeleteDTO implements Serializable { |
13 | /** 删除主键IDS */ | 14 | /** 删除主键IDS */ |
14 | @NotNull( | 15 | @NotNull( |
15 | message = "IDS不能为空", | 16 | message = "IDS不能为空", |
@@ -3,8 +3,10 @@ package org.thingsboard.server.common.data.yunteng.dto; | @@ -3,8 +3,10 @@ package org.thingsboard.server.common.data.yunteng.dto; | ||
3 | import io.swagger.annotations.ApiModelProperty; | 3 | import io.swagger.annotations.ApiModelProperty; |
4 | import lombok.Data; | 4 | import lombok.Data; |
5 | 5 | ||
6 | +import java.io.Serializable; | ||
7 | + | ||
6 | @Data | 8 | @Data |
7 | -public class HomeDeviceInfoDTO { | 9 | +public class HomeDeviceInfoDTO implements Serializable { |
8 | @ApiModelProperty(value = "设备总数") | 10 | @ApiModelProperty(value = "设备总数") |
9 | private Integer sumCount; | 11 | private Integer sumCount; |
10 | 12 |
@@ -4,11 +4,13 @@ import io.swagger.annotations.ApiModel; | @@ -4,11 +4,13 @@ import io.swagger.annotations.ApiModel; | ||
4 | import io.swagger.annotations.ApiModelProperty; | 4 | import io.swagger.annotations.ApiModelProperty; |
5 | import lombok.Data; | 5 | import lombok.Data; |
6 | import org.thingsboard.server.common.data.query.TsValue; | 6 | import org.thingsboard.server.common.data.query.TsValue; |
7 | + | ||
8 | +import java.io.Serializable; | ||
7 | import java.util.List; | 9 | import java.util.List; |
8 | 10 | ||
9 | @Data | 11 | @Data |
10 | @ApiModel("首页左边底部信息") | 12 | @ApiModel("首页左边底部信息") |
11 | -public class HomePageLeftBottomDTO { | 13 | +public class HomePageLeftBottomDTO implements Serializable { |
12 | 14 | ||
13 | @ApiModelProperty(value = "租户趋势分析") | 15 | @ApiModelProperty(value = "租户趋势分析") |
14 | private List<TsValue> tenantInfo; | 16 | private List<TsValue> tenantInfo; |
@@ -4,9 +4,11 @@ import io.swagger.annotations.ApiModel; | @@ -4,9 +4,11 @@ import io.swagger.annotations.ApiModel; | ||
4 | import io.swagger.annotations.ApiModelProperty; | 4 | import io.swagger.annotations.ApiModelProperty; |
5 | import lombok.Data; | 5 | import lombok.Data; |
6 | 6 | ||
7 | +import java.io.Serializable; | ||
8 | + | ||
7 | @Data | 9 | @Data |
8 | @ApiModel("首页统计信息") | 10 | @ApiModel("首页统计信息") |
9 | -public class HomePageLeftTopDTO { | 11 | +public class HomePageLeftTopDTO implements Serializable { |
10 | @ApiModelProperty(value = "设备统计") | 12 | @ApiModelProperty(value = "设备统计") |
11 | private HomeDeviceInfoDTO deviceInfo; | 13 | private HomeDeviceInfoDTO deviceInfo; |
12 | 14 |
@@ -5,11 +5,12 @@ import io.swagger.annotations.ApiModelProperty; | @@ -5,11 +5,12 @@ import io.swagger.annotations.ApiModelProperty; | ||
5 | import lombok.Data; | 5 | import lombok.Data; |
6 | import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData; | 6 | import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData; |
7 | 7 | ||
8 | +import java.io.Serializable; | ||
8 | import java.util.List; | 9 | import java.util.List; |
9 | 10 | ||
10 | @Data | 11 | @Data |
11 | @ApiModel("首页右边信息") | 12 | @ApiModel("首页右边信息") |
12 | -public class HomePageRightDTO { | 13 | +public class HomePageRightDTO implements Serializable { |
13 | 14 | ||
14 | @ApiModelProperty(value = "租户消息量TOP10") | 15 | @ApiModelProperty(value = "租户消息量TOP10") |
15 | private List<TenantTransportMessageDTO> top10; | 16 | private List<TenantTransportMessageDTO> top10; |
@@ -3,8 +3,10 @@ package org.thingsboard.server.common.data.yunteng.dto; | @@ -3,8 +3,10 @@ package org.thingsboard.server.common.data.yunteng.dto; | ||
3 | import io.swagger.annotations.ApiModelProperty; | 3 | import io.swagger.annotations.ApiModelProperty; |
4 | import lombok.Data; | 4 | import lombok.Data; |
5 | 5 | ||
6 | +import java.io.Serializable; | ||
7 | + | ||
6 | @Data | 8 | @Data |
7 | -public class PlainRolesDTO { | 9 | +public class PlainRolesDTO implements Serializable { |
8 | @ApiModelProperty(value = "角色ID") | 10 | @ApiModelProperty(value = "角色ID") |
9 | private String roleId; | 11 | private String roleId; |
10 | 12 |
@@ -7,10 +7,11 @@ import io.swagger.annotations.ApiModelProperty; | @@ -7,10 +7,11 @@ import io.swagger.annotations.ApiModelProperty; | ||
7 | import lombok.Data; | 7 | import lombok.Data; |
8 | import org.thingsboard.server.common.data.yunteng.enums.DeviceState; | 8 | import org.thingsboard.server.common.data.yunteng.enums.DeviceState; |
9 | 9 | ||
10 | +import java.io.Serializable; | ||
10 | import java.time.LocalDateTime; | 11 | import java.time.LocalDateTime; |
11 | 12 | ||
12 | @Data | 13 | @Data |
13 | -public class RelationDeviceDTO { | 14 | +public class RelationDeviceDTO implements Serializable { |
14 | @ApiModelProperty(value = "TB设备ID") | 15 | @ApiModelProperty(value = "TB设备ID") |
15 | private String tbDeviceId; | 16 | private String tbDeviceId; |
16 | 17 |
@@ -4,8 +4,10 @@ import io.swagger.annotations.ApiModelProperty; | @@ -4,8 +4,10 @@ import io.swagger.annotations.ApiModelProperty; | ||
4 | import lombok.Data; | 4 | import lombok.Data; |
5 | import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum; | 5 | import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum; |
6 | 6 | ||
7 | +import java.io.Serializable; | ||
8 | + | ||
7 | @Data | 9 | @Data |
8 | -public class SelectItemDTO { | 10 | +public class SelectItemDTO implements Serializable { |
9 | @ApiModelProperty(value = "下拉选项值") | 11 | @ApiModelProperty(value = "下拉选项值") |
10 | private String id; | 12 | private String id; |
11 | 13 |
@@ -4,9 +4,11 @@ import io.swagger.annotations.ApiModel; | @@ -4,9 +4,11 @@ import io.swagger.annotations.ApiModel; | ||
4 | import io.swagger.annotations.ApiModelProperty; | 4 | import io.swagger.annotations.ApiModelProperty; |
5 | import lombok.Data; | 5 | import lombok.Data; |
6 | 6 | ||
7 | +import java.io.Serializable; | ||
8 | + | ||
7 | @Data | 9 | @Data |
8 | @ApiModel("租户消息量") | 10 | @ApiModel("租户消息量") |
9 | -public class TenantTransportMessageDTO { | 11 | +public class TenantTransportMessageDTO implements Serializable { |
10 | @ApiModelProperty(value = "租户名称") | 12 | @ApiModelProperty(value = "租户名称") |
11 | private String name; | 13 | private String name; |
12 | 14 |
@@ -4,8 +4,10 @@ import io.swagger.annotations.ApiModelProperty; | @@ -4,8 +4,10 @@ import io.swagger.annotations.ApiModelProperty; | ||
4 | import lombok.Data; | 4 | import lombok.Data; |
5 | import org.thingsboard.server.common.data.yunteng.enums.RoleEnum; | 5 | import org.thingsboard.server.common.data.yunteng.enums.RoleEnum; |
6 | 6 | ||
7 | +import java.io.Serializable; | ||
8 | + | ||
7 | @Data | 9 | @Data |
8 | -public class UserDetailRoleDTO { | 10 | +public class UserDetailRoleDTO implements Serializable { |
9 | @ApiModelProperty(value = "角色类型") | 11 | @ApiModelProperty(value = "角色类型") |
10 | private RoleEnum roleType; | 12 | private RoleEnum roleType; |
11 | } | 13 | } |
@@ -11,11 +11,12 @@ import io.swagger.annotations.ApiModelProperty; | @@ -11,11 +11,12 @@ import io.swagger.annotations.ApiModelProperty; | ||
11 | import lombok.Data; | 11 | import lombok.Data; |
12 | import org.apache.commons.lang3.StringUtils; | 12 | import org.apache.commons.lang3.StringUtils; |
13 | 13 | ||
14 | +import java.io.Serializable; | ||
14 | import java.time.LocalDateTime; | 15 | import java.time.LocalDateTime; |
15 | import java.util.Set; | 16 | import java.util.Set; |
16 | 17 | ||
17 | @Data | 18 | @Data |
18 | -public class UserInfoDTO { | 19 | +public class UserInfoDTO implements Serializable { |
19 | @ExcelProperty("用户Id") | 20 | @ExcelProperty("用户Id") |
20 | @ApiModelProperty(value = "用户ID") | 21 | @ApiModelProperty(value = "用户ID") |
21 | private String userId; | 22 | private String userId; |