From 713e6d216a4d16610082feae345370d9a4b1e5e6 Mon Sep 17 00:00:00 2001 From: jay <75509151@qq.com> Date: Tue, 30 May 2023 14:27:15 +0800 Subject: [PATCH] =?UTF-8?q?refactor=20=E6=95=B0=E6=8D=AE=E5=BA=93=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iot-data-serviceImpl-rdb/pom.xml | 10 ++++----- .../java/cc/iotkit/data/model/BaseEntity.java | 6 ++++++ .../cc/iotkit/data/model/DeviceIdGroup.java | 4 ++++ .../cc/iotkit/data/model/TbAlertConfig.java | 11 ++++++++++ .../cc/iotkit/data/model/TbAlertRecord.java | 11 ++++++++++ .../java/cc/iotkit/data/model/TbCategory.java | 7 ++++++- .../java/cc/iotkit/data/model/TbChannel.java | 6 ++++++ .../cc/iotkit/data/model/TbChannelConfig.java | 8 +++++++ .../iotkit/data/model/TbChannelTemplate.java | 8 +++++++ .../cc/iotkit/data/model/TbDeviceConfig.java | 9 ++++++++ .../cc/iotkit/data/model/TbDeviceGroup.java | 9 ++++++++ .../data/model/TbDeviceGroupMapping.java | 4 ++++ .../cc/iotkit/data/model/TbDeviceInfo.java | 14 +++++++++++++ .../cc/iotkit/data/model/TbDeviceSubUser.java | 6 ++++++ .../cc/iotkit/data/model/TbDeviceTag.java | 8 +++++++ .../java/cc/iotkit/data/model/TbHome.java | 10 +++++++++ .../cc/iotkit/data/model/TbOauthClient.java | 7 +++++++ .../java/cc/iotkit/data/model/TbProduct.java | 11 ++++++++++ .../cc/iotkit/data/model/TbProductModel.java | 16 +++++++++++++- .../data/model/TbProtocolComponent.java | 21 +++++++++++++++++++ .../data/model/TbProtocolConverter.java | 8 ++++++- .../java/cc/iotkit/data/model/TbRuleInfo.java | 13 ++++++++++++ .../java/cc/iotkit/data/model/TbSpace.java | 9 ++++++++ .../cc/iotkit/data/model/TbSpaceDevice.java | 12 +++++++++++ .../cc/iotkit/data/model/TbSysConfig.java | 9 ++++++++ .../java/cc/iotkit/data/model/TbSysDept.java | 14 +++++++++++++ .../cc/iotkit/data/model/TbSysDictData.java | 14 +++++++++++++ .../cc/iotkit/data/model/TbSysDictType.java | 9 ++++++++ .../cc/iotkit/data/model/TbSysLogininfor.java | 11 ++++++++++ .../java/cc/iotkit/data/model/TbSysMenu.java | 18 ++++++++++++++++ .../cc/iotkit/data/model/TbSysNotice.java | 10 +++++++++ .../cc/iotkit/data/model/TbSysOperLog.java | 21 +++++++++++++++++++ .../java/cc/iotkit/data/model/TbSysOss.java | 10 +++++++++ .../cc/iotkit/data/model/TbSysOssConfig.java | 18 ++++++++++++++++ .../java/cc/iotkit/data/model/TbSysPost.java | 8 +++++++ .../java/cc/iotkit/data/model/TbSysRole.java | 12 +++++++++++ .../cc/iotkit/data/model/TbSysRoleDept.java | 4 ++++ .../cc/iotkit/data/model/TbSysRoleMenu.java | 4 ++++ .../cc/iotkit/data/model/TbSysTenant.java | 16 ++++++++++++++ .../iotkit/data/model/TbSysTenantPackage.java | 8 +++++++ .../java/cc/iotkit/data/model/TbSysUser.java | 17 +++++++++++++++ .../cc/iotkit/data/model/TbSysUserPost.java | 3 +++ .../cc/iotkit/data/model/TbSysUserRole.java | 3 +++ .../java/cc/iotkit/data/model/TbTaskInfo.java | 11 ++++++++++ .../cc/iotkit/data/model/TbThingModel.java | 4 ++++ .../java/cc/iotkit/data/model/TbUserInfo.java | 15 +++++++++++++ .../cc/iotkit/data/model/TbVirtualDevice.java | 10 +++++++++ .../data/model/TbVirtualDeviceMapping.java | 3 +++ pom.xml | 6 ++++++ 49 files changed, 478 insertions(+), 8 deletions(-) diff --git a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/pom.xml b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/pom.xml index 7146be31..9f15e092 100644 --- a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/pom.xml +++ b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/pom.xml @@ -37,11 +37,6 @@ h2 - - - - - commons-io commons-io @@ -63,6 +58,11 @@ provided + + com.github.biyanwen + jpa-comment-spring-boot-starter + + cc.iotkit iot-common-core diff --git a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/BaseEntity.java b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/BaseEntity.java index 941b67ff..c6b28451 100644 --- a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/BaseEntity.java +++ b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/BaseEntity.java @@ -1,5 +1,6 @@ package cc.iotkit.data.model; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.springframework.data.annotation.CreatedBy; import org.springframework.data.annotation.CreatedDate; @@ -25,6 +26,7 @@ public class BaseEntity { /** * 创建部门 */ + @ApiModelProperty(value = "创建部门") private Long createDept; /** @@ -32,6 +34,7 @@ public class BaseEntity { */ @CreatedBy @Column(name = "create_by", updatable = false) + @ApiModelProperty(value = "创建者") private Long createBy; /** @@ -39,6 +42,7 @@ public class BaseEntity { */ @CreatedDate @Column(name = "create_time", updatable = false) + @ApiModelProperty(value = "创建时间") private Date createTime; /** @@ -46,6 +50,7 @@ public class BaseEntity { */ @LastModifiedBy @Column(name = "update_by") + @ApiModelProperty(value = "更新者") private Long updateBy; /** @@ -53,6 +58,7 @@ public class BaseEntity { */ @LastModifiedDate @Column(name = "update_time") + @ApiModelProperty(value = "更新时间") private Date updateTime; } diff --git a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/DeviceIdGroup.java b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/DeviceIdGroup.java index f964e483..82cc8603 100644 --- a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/DeviceIdGroup.java +++ b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/DeviceIdGroup.java @@ -9,6 +9,7 @@ */ package cc.iotkit.data.model; +import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -18,8 +19,11 @@ import lombok.NoArgsConstructor; @AllArgsConstructor public class DeviceIdGroup { + @ApiModelProperty(value = "设备组id") private String id; + @ApiModelProperty(value = "设备id") private String deviceId; + @ApiModelProperty(value = "组名称") private String name; } diff --git a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbAlertConfig.java b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbAlertConfig.java index c3938999..936be41b 100644 --- a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbAlertConfig.java +++ b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbAlertConfig.java @@ -3,6 +3,8 @@ package cc.iotkit.data.model; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; + +import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data @@ -11,46 +13,55 @@ import lombok.Data; public class TbAlertConfig { @Id + @ApiModelProperty(value = "告警配置id") private String id; /** * 配置所属用户 */ + @ApiModelProperty(value = "配置所属用户") private String uid; /** * 告警名称 */ + @ApiModelProperty(value = "告警名称") private String name; /** * 告警严重度 */ + @ApiModelProperty(value = "告警严重度") private String level; /** * 关联规则引擎ID */ + @ApiModelProperty(value = "关联规则引擎ID") private String ruleInfoId; /** * 关联消息转发模板ID */ + @ApiModelProperty(value = "关联消息转发模板ID") private String messageTemplateId; /** * 描述 */ + @ApiModelProperty(value = "描述") private String description; /** * 是否启用 */ + @ApiModelProperty(value = "是否启用") private Boolean enable; /** * 创建时间 */ + @ApiModelProperty(value = "创建时间") private Long createAt; } diff --git a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbAlertRecord.java b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbAlertRecord.java index bb87049a..94300c70 100644 --- a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbAlertRecord.java +++ b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbAlertRecord.java @@ -3,44 +3,55 @@ package cc.iotkit.data.model; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data @Entity +@ApiModel(value = "告警记录") @Table(name = "alert_record") public class TbAlertRecord { @Id + @ApiModelProperty(value = "告警记录id") private String id; /** * 配置所属用户 */ + @ApiModelProperty(value = "配置所属用户") private String uid; /** * 告警名称 */ + @ApiModelProperty(value = "告警名称") private String name; /** * 告警严重度（1-5） */ + @ApiModelProperty(value = "告警严重度（1-5）") private String level; /** * 告警时间 */ + @ApiModelProperty(value = "告警时间") private Long alertTime; /** * 告警详情 */ + @ApiModelProperty(value = "告警详情") private String details; /** * 是否已读 */ + @ApiModelProperty(value = "是否已读") private Boolean read; } diff --git a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbCategory.java b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbCategory.java index f2976712..60f16142 100644 --- a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbCategory.java +++ b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbCategory.java @@ -9,9 +9,11 @@ */ package cc.iotkit.data.model; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.persistence.Entity; +import javax.persistence.Id; import javax.persistence.Table; @Data @@ -19,11 +21,14 @@ import javax.persistence.Table; @Table(name = "category") public class TbCategory { - @javax.persistence.Id + @ApiModelProperty(value = "分类id") + @Id private String id; + @ApiModelProperty(value = "分类名称") private String name; + @ApiModelProperty(value = "分类描述") private Long createAt; diff --git a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbChannel.java b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbChannel.java index 3672eb18..b5ce5fcd 100644 --- a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbChannel.java +++ b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbChannel.java @@ -1,5 +1,6 @@ package cc.iotkit.data.model; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.persistence.Entity; @@ -16,13 +17,18 @@ import javax.persistence.Table; @Table(name = "channel") public class TbChannel { @Id + @ApiModelProperty(value = "通道id") private String id; + @ApiModelProperty(value = "通道名称") private String code; + @ApiModelProperty(value = "标题") private String title; + @ApiModelProperty(value = "图标") private String icon; + @ApiModelProperty(value = "创建时间") private Long createAt; } diff --git a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbChannelConfig.java b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbChannelConfig.java index b018763c..f854b1f6 100644 --- a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbChannelConfig.java +++ b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbChannelConfig.java @@ -1,5 +1,7 @@ package cc.iotkit.data.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.persistence.Entity; @@ -14,15 +16,21 @@ import javax.persistence.Table; @Data @Entity @Table(name = "channel_config") +@ApiModel(value = "通道配置") public class TbChannelConfig { @Id + @ApiModelProperty(value = "通道配置id") private String id; + @ApiModelProperty(value = "通道id") private String channelId; + @ApiModelProperty(value = "通道配置名称") private String title; + @ApiModelProperty(value = "通道配置参数") private String param; + @ApiModelProperty(value = "创建时间") private Long createAt; } diff --git a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbChannelTemplate.java b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbChannelTemplate.java index 6f98f2cb..99d19361 100644 --- a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbChannelTemplate.java +++ b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbChannelTemplate.java @@ -1,5 +1,7 @@ package cc.iotkit.data.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.persistence.Entity; @@ -14,15 +16,21 @@ import javax.persistence.Table; @Data @Entity @Table(name = "channel_template") +@ApiModel(value = "通道模板") public class TbChannelTemplate { @Id + @ApiModelProperty(value = "通道模板id") private String id; + @ApiModelProperty(value = "通道配置id") private String channelConfigId; + @ApiModelProperty(value = "通道模板名称") private String title; + @ApiModelProperty(value = "通道模板内容") private String content; + @ApiModelProperty(value = "创建时间") private Long createAt; } diff --git a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbDeviceConfig.java b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbDeviceConfig.java index c79fe928..e75ec846 100644 --- a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbDeviceConfig.java +++ b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbDeviceConfig.java @@ -1,5 +1,7 @@ package cc.iotkit.data.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.persistence.Column; @@ -9,27 +11,34 @@ import javax.persistence.Table; @Data @Entity +@ApiModel(value = "设备配置") @Table(name = "device_config") public class TbDeviceConfig { @Id + @ApiModelProperty(value = "设备配置id") private String id; + @ApiModelProperty(value = "设备id") private String deviceId; /** * 产品key */ + @ApiModelProperty(value = "产品key") private String productKey; + @ApiModelProperty(value = "设备名称") private String deviceName; /** * 设备配置json内容 */ @Column(columnDefinition = "text") + @ApiModelProperty(value = "设备配置json内容") private String config; + @ApiModelProperty(value = "创建时间") private Long createAt; } diff --git a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbDeviceGroup.java b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbDeviceGroup.java index edb75960..fd50867a 100644 --- a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbDeviceGroup.java +++ b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbDeviceGroup.java @@ -9,6 +9,8 @@ */ package cc.iotkit.data.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.persistence.Entity; @@ -18,31 +20,38 @@ import javax.persistence.Table; @Data @Entity @Table(name = "device_group") +@ApiModel(value = "设备组") public class TbDeviceGroup { @Id + @ApiModelProperty(value = "设备组id") private String id; + @ApiModelProperty(value = "设备组名称") private String name; /** * 所属用户 */ + @ApiModelProperty(value = "所属用户") private String uid; /** * 分组说明 */ + @ApiModelProperty(value = "分组说明") private String remark; /** * 设备数量 */ + @ApiModelProperty(value = "设备数量") private int deviceQty; /** * 创建时间 */ + @ApiModelProperty(value = "创建时间") private long createAt; } diff --git a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbDeviceGroupMapping.java b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbDeviceGroupMapping.java index 1e82038e..6e4d3c38 100644 --- a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbDeviceGroupMapping.java +++ b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbDeviceGroupMapping.java @@ -1,5 +1,6 @@ package cc.iotkit.data.model; +import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -16,10 +17,13 @@ import javax.persistence.Table; public class TbDeviceGroupMapping { @Id + @ApiModelProperty(value = "设备组映射id") private String id; + @ApiModelProperty(value = "设备id") private String deviceId; + @ApiModelProperty(value = "设备组id") private String groupId; } diff --git a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbDeviceInfo.java b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbDeviceInfo.java index b9aecdf1..ac092bfe 100644 --- a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbDeviceInfo.java +++ b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbDeviceInfo.java @@ -1,5 +1,7 @@ package cc.iotkit.data.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.persistence.Entity; @@ -8,31 +10,43 @@ import javax.persistence.Table; @Data @Entity @Table(name = "device_info") +@ApiModel(value = "设备信息") public class TbDeviceInfo { @javax.persistence.Id private String id; + @ApiModelProperty(value = "设备id") private String deviceId; + @ApiModelProperty(value = "产品key") private String productKey; + @ApiModelProperty(value = "设备名称") private String deviceName; + @ApiModelProperty(value = "设备类型") private String model; + @ApiModelProperty(value = "设备描述") private String secret; + @ApiModelProperty(value = "父级id") private String parentId; + @ApiModelProperty(value = "用户id") private String uid; + @ApiModelProperty(value = "设备状态") private String state; + @ApiModelProperty(value = "设备在线时间") private Long onlineTime; + @ApiModelProperty(value = "设备离线时间") private Long offlineTime; + @ApiModelProperty(value = "创建时间") private Long createAt; } diff --git a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbDeviceSubUser.java b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbDeviceSubUser.java index 5c83f05c..4cd0ea21 100644 --- a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbDeviceSubUser.java +++ b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbDeviceSubUser.java @@ -9,6 +9,8 @@ */ package cc.iotkit.data.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.persistence.Entity; @@ -18,13 +20,17 @@ import javax.persistence.Table; @Data @Entity @Table(name = "device_sub_user") +@ApiModel(value = "设备用户映射") public class TbDeviceSubUser { @Id + @ApiModelProperty(value = "id") private String id; + @ApiModelProperty(value = "设备id") private String deviceId; + @ApiModelProperty(value = "设备用户id") private String uid; } diff --git a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbDeviceTag.java b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbDeviceTag.java index e3051f5d..4c07bc95 100644 --- a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbDeviceTag.java +++ b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbDeviceTag.java @@ -9,6 +9,8 @@ */ package cc.iotkit.data.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -24,26 +26,32 @@ import javax.persistence.Table; @AllArgsConstructor @Entity @Table(name = "device_tag") +@ApiModel(value = "设备标签") public class TbDeviceTag { @Id + @ApiModelProperty(value = "id") private String id; + @ApiModelProperty(value = "设备id") private String deviceId; /** * 标签码 */ + @ApiModelProperty(value = "标签码") private String code; /** * 标签名称 */ + @ApiModelProperty(value = "标签名称") private String name; /** * 标签值 */ + @ApiModelProperty(value = "标签值") private String value; } diff --git a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbHome.java b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbHome.java index a0788676..516f2bdd 100644 --- a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbHome.java +++ b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbHome.java @@ -1,5 +1,7 @@ package cc.iotkit.data.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.persistence.Entity; @@ -9,39 +11,47 @@ import javax.persistence.Table; @Data @Entity @Table(name = "home") +@ApiModel(value = "家庭信息") public class TbHome { @Id + @ApiModelProperty(value = "家庭id") private String id; /** * 家庭名称 */ + @ApiModelProperty(value = "家庭名称") private String name; /** * 家庭地址 */ + @ApiModelProperty(value = "家庭地址") private String address; /** * 关联用户id */ + @ApiModelProperty(value = "关联用户id") private String uid; /** * 空间数量 */ + @ApiModelProperty(value = "空间数量") private Integer spaceNum; /** * 设备数量 */ + @ApiModelProperty(value = "设备数量") private Integer deviceNum; /** * 是否为用户当前使用的家庭 */ + @ApiModelProperty(value = "是否为用户当前使用的家庭") private Boolean current; } diff --git a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbOauthClient.java b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbOauthClient.java index 61494285..b81fb92d 100644 --- a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbOauthClient.java +++ b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbOauthClient.java @@ -9,6 +9,7 @@ */ package cc.iotkit.data.model; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.persistence.Entity; @@ -21,16 +22,22 @@ import javax.persistence.Table; public class TbOauthClient { @Id + @ApiModelProperty(value = "id") private String id; + @ApiModelProperty(value = "客户端id") private String clientId; + @ApiModelProperty(value = "客户端名称") private String name; + @ApiModelProperty(value = "客户端密钥") private String clientSecret; + @ApiModelProperty(value = "允许访问的url") private String allowUrl; + @ApiModelProperty(value = "创建时间") private Long createAt; } diff --git a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbProduct.java b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbProduct.java index 2e9cbabb..ace5b2bf 100644 --- a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbProduct.java +++ b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbProduct.java @@ -9,6 +9,8 @@ */ package cc.iotkit.data.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.persistence.Entity; @@ -17,30 +19,39 @@ import javax.persistence.Table; @Data @Entity +@ApiModel(value = "产品") @Table(name = "product") public class TbProduct { @Id + @ApiModelProperty(value = "产品id") private String id; + @ApiModelProperty(value = "产品名称") private String name; + @ApiModelProperty(value = "品类") private String category; + @ApiModelProperty(value = "节点类型") private Integer nodeType; /** * 所属平台用户ID */ + @ApiModelProperty(value = "用户ID") private String uid; + @ApiModelProperty(value = "图片") private String img; /** * 是否透传,true/false */ + @ApiModelProperty(value = "是否透传,true/false") private String transparent; + @ApiModelProperty(value = "创建时间") private Long createAt; } \ No newline at end of file diff --git a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbProductModel.java b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbProductModel.java index e99bfa9a..49424375 100644 --- a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbProductModel.java +++ b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbProductModel.java @@ -1,5 +1,7 @@ package cc.iotkit.data.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.persistence.Column; @@ -9,30 +11,42 @@ import javax.persistence.Table; @Data @Entity +@ApiModel(value = "产品型号") @Table(name = "product_model") public class TbProductModel { @Id + @ApiModelProperty(value = "型号id") private String id; /** * 型号在所有产品中唯一 */ + @ApiModelProperty(value = "型号") private String model; + @ApiModelProperty(value = "名称") + private String name; + @ApiModelProperty(value = "产品Key") + private String productKey; + @ApiModelProperty(value = "脚本类型") private String type; @Column(columnDefinition = "text") + @ApiModelProperty(value = "脚本内容") + private String script; /** * 脚本状态，只有发布状态才生效 */ - private String state; + @ApiModelProperty(value = "脚本状态") + private String state; + @ApiModelProperty(value = "修改时间") private Long modifyAt; } diff --git a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbProtocolComponent.java b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbProtocolComponent.java index 8705df86..33f05960 100644 --- a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbProtocolComponent.java +++ b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbProtocolComponent.java @@ -1,5 +1,6 @@ package cc.iotkit.data.model; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.persistence.Column; @@ -18,29 +19,49 @@ public class TbProtocolComponent { /** * 所属性用户id */ + @ApiModelProperty(value = "所属性用户id") private String uid; + @ApiModelProperty(value = "组件名称") private String name; + @ApiModelProperty(value = "组件类型") + private String type; + @ApiModelProperty(value = "通讯协议") + private String protocol; + @ApiModelProperty(value = "jar包") + private String jarFile; @Column(columnDefinition = "text") private String config; + @ApiModelProperty(value = "转换脚本") + private String converter; + @ApiModelProperty(value = "转换器类型") + private String converType; + @ApiModelProperty(value = "运行状态") + private String state; + @ApiModelProperty(value = "创建时间") + private Long createAt; + @ApiModelProperty(value = "通讯脚本语言类型") + private String scriptTyp; + @ApiModelProperty(value = "脚本内容") + @Column(columnDefinition = "text")//设置映射为text类型 private String script; diff --git a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbProtocolConverter.java b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbProtocolConverter.java index b7350138..734d0c13 100644 --- a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbProtocolConverter.java +++ b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbProtocolConverter.java @@ -9,6 +9,7 @@ */ package cc.iotkit.data.model; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.persistence.Column; @@ -27,20 +28,25 @@ public class TbProtocolConverter { /** * 所属性用户id */ + @ApiModelProperty(value = "所属性用户id") private String uid; + @ApiModelProperty(value = "转换器名称") private String name; @Column(name = "[desc]") + @ApiModelProperty(value = "描述") private String desc; + @ApiModelProperty(value = "创建时间") private Long createAt; - + @ApiModelProperty(value = "转换脚本类型") private String typ; // 脚本内容 @Column(columnDefinition = "text")//设置映射为text类型 + @ApiModelProperty(value = "脚本内容") private String script; } diff --git a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbRuleInfo.java b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbRuleInfo.java index d1fc6768..7ef15a3d 100644 --- a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbRuleInfo.java +++ b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbRuleInfo.java @@ -9,6 +9,8 @@ */ package cc.iotkit.data.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.persistence.Column; @@ -19,31 +21,42 @@ import javax.persistence.Table; @Data @Entity @Table(name = "rule_info") +@ApiModel(value = "规则") public class TbRuleInfo { @Id + @ApiModelProperty(value = "规则id") private String id; + @ApiModelProperty(value = "规则名称") private String name; + @ApiModelProperty(value = "规则类型") private String type; @Column(columnDefinition = "text") + @ApiModelProperty(value = "监听器") private String listeners; @Column(columnDefinition = "text") + @ApiModelProperty(value = "过滤器") private String filters; @Column(columnDefinition = "text") + @ApiModelProperty(value = "动作") private String actions; + @ApiModelProperty(value = "用户id") private String uid; + @ApiModelProperty(value = "状态") private String state; @Column(name = "[desc]") + @ApiModelProperty(value = "描述") private String desc; + @ApiModelProperty(value = "创建时间") private Long createAt; } diff --git a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSpace.java b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSpace.java index 15ac4c34..1d03731a 100644 --- a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSpace.java +++ b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSpace.java @@ -9,6 +9,8 @@ */ package cc.iotkit.data.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.persistence.Entity; @@ -17,32 +19,39 @@ import javax.persistence.Table; @Data @Entity +@ApiModel(value = "空间") @Table(name = "space") public class TbSpace { @Id + @ApiModelProperty(value = "空间id") private String id; /** * 关联家庭id */ + @ApiModelProperty(value = "关联家庭id") private String homeId; /** * 关联用户id */ + @ApiModelProperty(value = "关联用户id") private String uid; /** * 空间名称 */ + @ApiModelProperty(value = "空间名称") private String name; /** * 设备数量 */ + @ApiModelProperty(value = "设备数量") private Integer deviceNum; + @ApiModelProperty(value = "创建时间") private Long createAt; } diff --git a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSpaceDevice.java b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSpaceDevice.java index 58f81b59..33d53695 100644 --- a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSpaceDevice.java +++ b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSpaceDevice.java @@ -9,6 +9,8 @@ */ package cc.iotkit.data.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.persistence.Entity; @@ -18,6 +20,7 @@ import javax.persistence.Table; @Data @Entity @Table(name = "space_device") +@ApiModel(value = "空间设备") public class TbSpaceDevice { @Id @@ -26,46 +29,55 @@ public class TbSpaceDevice { /** * 关联用户id */ + @ApiModelProperty(value = "关联用户id") private String uid; /** * 分享的用户id */ + @ApiModelProperty(value = "分享的用户id") private String sharedUid; /** * 空间中的设备id */ + @ApiModelProperty(value = "空间中的设备id") private String deviceId; /** * 空间中的设备名称 */ + @ApiModelProperty(value = "空间中的设备名称") private String name; /** * 所属家庭Id */ + @ApiModelProperty(value = "所属家庭Id") private String homeId; /** * 空间id */ + @ApiModelProperty(value = "空间id") private String spaceId; /** * 添加时间 */ + @ApiModelProperty(value = "添加时间") private Long addAt; /** * 使用时间 */ + @ApiModelProperty(value = "使用时间") private Long useAt; /** * 是否收藏 */ + @ApiModelProperty(value = "是否收藏") private Boolean collect; } diff --git a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysConfig.java b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysConfig.java index 718fe367..63e7e3f1 100644 --- a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysConfig.java +++ b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysConfig.java @@ -4,6 +4,8 @@ import cc.iotkit.data.model.BaseEntity; import cc.iotkit.model.system.SysConfig; import io.github.linpeilie.annotations.AutoMapper; import javax.persistence.GeneratedValue; + +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -31,36 +33,43 @@ public class TbSysConfig extends BaseEntity { @Id @GeneratedValue(generator = "SnowflakeIdGenerator") @GenericGenerator(name = "SnowflakeIdGenerator", strategy = "cc.iotkit.data.config.id.SnowflakeIdGenerator") + @ApiModelProperty(value = "参数主键") private Long configId; /** * 租户编号 */ + @ApiModelProperty(value = "租户编号") private String tenantId; /** * 参数名称 */ + @ApiModelProperty(value = "参数名称") private String configName; /** * 参数键名 */ + @ApiModelProperty(value = "参数键名") private String configKey; /** * 参数键值 */ + @ApiModelProperty(value = "参数键值") private String configValue; /** * 系统内置（Y是 N否） */ + @ApiModelProperty(value = "系统内置（Y是 N否）") private String configType; /** * 备注 */ + @ApiModelProperty(value = "备注") private String remark; } diff --git a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysDept.java b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysDept.java index 32c6c533..5bcd3131 100644 --- a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysDept.java +++ b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysDept.java @@ -4,6 +4,8 @@ import cc.iotkit.data.model.BaseEntity; import cc.iotkit.model.system.SysConfig; import cc.iotkit.model.system.SysDept; import io.github.linpeilie.annotations.AutoMapper; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -22,6 +24,7 @@ import javax.persistence.Table; @Entity @Table(name = "sys_dept") @AutoMapper(target = SysDept.class) +@ApiModel(value = "部门表") public class TbSysDept extends BaseEntity { private static final long serialVersionUID = 1L; @@ -29,56 +32,67 @@ public class TbSysDept extends BaseEntity { * 部门ID */ @Id + @ApiModelProperty(value = "部门ID") private Long deptId; /** * 租户编号 */ + @ApiModelProperty(value = "租户ID") private String tenantId; /** * 父部门ID */ + @ApiModelProperty(value = "父部门ID") private Long parentId; /** * 部门名称 */ + @ApiModelProperty(value = "部门名称") private String deptName; /** * 显示顺序 */ + @ApiModelProperty(value = "显示顺序") private Integer orderNum; /** * 负责人 */ + @ApiModelProperty(value = "负责人") private String leader; /** * 联系电话 */ + @ApiModelProperty(value = "联系电话") private String phone; /** * 邮箱 */ + @ApiModelProperty(value = "邮箱") private String email; /** * 部门状态:0正常,1停用 */ + @ApiModelProperty(value = "部门状态:0正常,1停用") private String status; /** * 删除标志（0代表存在 2代表删除） */ + @ApiModelProperty(value = "删除标志（0代表存在 2代表删除）") private String delFlag; /** * 祖级列表 */ + @ApiModelProperty(value = "祖级列表") private String ancestors; } diff --git a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysDictData.java b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysDictData.java index c31b76c6..da7d1f56 100644 --- a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysDictData.java +++ b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysDictData.java @@ -2,6 +2,8 @@ package cc.iotkit.data.model; import cc.iotkit.model.system.SysDictData; import io.github.linpeilie.annotations.AutoMapper; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -19,62 +21,74 @@ import javax.persistence.Table; @Entity @Table(name = "sys_dict_data") @AutoMapper(target = SysDictData.class) +@ApiModel(value = "字典数据表") public class TbSysDictData extends BaseEntity { /** * 字典编码 */ @Id + @ApiModelProperty(value = "字典编码") private Long dictCode; /** * 租户编号 */ + @ApiModelProperty(value = "租户编号") private String tenantId; /** * 字典排序 */ + @ApiModelProperty(value = "字典排序") private Integer dictSort; /** * 字典标签 */ + @ApiModelProperty(value = "字典标签") private String dictLabel; /** * 字典键值 */ + @ApiModelProperty(value = "字典键值") private String dictValue; /** * 字典类型 */ + @ApiModelProperty(value = "字典类型") private String dictType; /** * 样式属性（其他样式扩展） */ + @ApiModelProperty(value = "样式属性（其他样式扩展）") private String cssClass; /** * 表格字典样式 */ + @ApiModelProperty(value = "表格字典样式") private String listClass; /** * 是否默认（Y是 N否） */ + @ApiModelProperty(value = "是否默认（Y是 N否）") private String isDefault; /** * 状态（0正常 1停用） */ + @ApiModelProperty(value = "状态（0正常 1停用）") private String status; /** * 备注 */ + @ApiModelProperty(value = "备注") private String remark; } diff --git a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysDictType.java b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysDictType.java index 53b4bd62..0620aa5a 100644 --- a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysDictType.java +++ b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysDictType.java @@ -4,6 +4,8 @@ import cc.iotkit.data.model.BaseEntity; import cc.iotkit.model.system.SysDictData; import cc.iotkit.model.system.SysDictType; import io.github.linpeilie.annotations.AutoMapper; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -22,37 +24,44 @@ import javax.persistence.Table; @Entity @Table(name = "sys_dict_type") @AutoMapper(target = SysDictType.class) +@ApiModel(value = "字典类型表") public class TbSysDictType extends BaseEntity { /** * 字典主键 */ @Id + @ApiModelProperty(value = "字典主键") private Long dictId; /** * 租户编号 */ + @ApiModelProperty(value = "租户编号") private String tenantId; /** * 字典名称 */ + @ApiModelProperty(value = "字典名称") private String dictName; /** * 字典类型 */ + @ApiModelProperty(value = "字典类型") private String dictType; /** * 状态（0正常 1停用） */ + @ApiModelProperty(value = "状态（0正常 1停用）") private String status; /** * 备注 */ + @ApiModelProperty(value = "备注") private String remark; } diff --git a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysLogininfor.java b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysLogininfor.java index 26f423b6..10e4459e 100644 --- a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysLogininfor.java +++ b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysLogininfor.java @@ -4,6 +4,7 @@ import cc.iotkit.data.model.BaseEntity; import cc.iotkit.model.system.SysDictData; import cc.iotkit.model.system.SysLogininfor; import io.github.linpeilie.annotations.AutoMapper; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.persistence.Entity; @@ -26,51 +27,61 @@ public class TbSysLogininfor extends BaseEntity { * ID */ @Id + @ApiModelProperty(value = "ID") private Long infoId; /** * 租户编号 */ + @ApiModelProperty(value = "租户编号") private String tenantId; /** * 用户账号 */ + @ApiModelProperty(value = "用户账号") private String userName; /** * 登录状态 0成功 1失败 */ + @ApiModelProperty(value = "登录状态 0成功 1失败") private String status; /** * 登录IP地址 */ + @ApiModelProperty(value = "登录IP地址") private String ipaddr; /** * 登录地点 */ + @ApiModelProperty(value = "登录地点") private String loginLocation; /** * 浏览器类型 */ + @ApiModelProperty(value = "浏览器类型") private String browser; /** * 操作系统 */ + @ApiModelProperty(value = "操作系统") private String os; /** * 提示消息 */ + @ApiModelProperty(value = "提示消息") private String msg; /** * 访问时间 */ + @ApiModelProperty(value = "访问时间") private Date loginTime; } diff --git a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysMenu.java b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysMenu.java index ce46d13c..bcb1a4ac 100644 --- a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysMenu.java +++ b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysMenu.java @@ -2,6 +2,8 @@ package cc.iotkit.data.model; import cc.iotkit.model.system.SysMenu; import io.github.linpeilie.annotations.AutoMapper; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.GenericGenerator; @@ -19,6 +21,7 @@ import javax.persistence.*; @Entity @Table(name = "sys_menu") @AutoMapper(target = SysMenu.class) +@ApiModel(value = "菜单权限表") public class TbSysMenu extends BaseEntity { /** @@ -28,78 +31,93 @@ public class TbSysMenu extends BaseEntity { @GeneratedValue(generator = "SnowflakeIdGenerator") @GenericGenerator(name = "SnowflakeIdGenerator", strategy = "cc.iotkit.data.config.id.SnowflakeIdGenerator") @Column(name = "menu_id") + @ApiModelProperty(value = "菜单ID") private Long menuId; /** * 父菜单ID */ + @ApiModelProperty(value = "父菜单ID") @Column(name = "parent_id") private Long parentId; /** * 菜单名称 */ + @ApiModelProperty(value = "菜单名称") @Column(name = "menu_name") private String menuName; /** * 显示顺序 */ + @ApiModelProperty(value = "显示顺序") private Integer orderNum; /** * 路由地址 */ + @ApiModelProperty(value = "路由地址") private String path; /** * 组件路径 */ + @ApiModelProperty(value = "组件路径") private String component; /** * 路由参数 */ + @ApiModelProperty(value = "路由参数") private String queryParam; /** * 是否为外链（0是 1否） */ + @ApiModelProperty(value = "是否为外链（0是 1否）") private String isFrame; /** * 是否缓存（0缓存 1不缓存） */ + @ApiModelProperty(value = "是否缓存（0缓存 1不缓存）") private String isCache; /** * 类型（M目录 C菜单 F按钮） */ + @ApiModelProperty(value = "类型（M目录 C菜单 F按钮）") private String menuType; /** * 显示状态（0显示 1隐藏） */ + @ApiModelProperty(value = "显示状态（0显示 1隐藏）") private String visible; /** * 菜单状态（0正常 1停用） */ + @ApiModelProperty(value = "菜单状态（0正常 1停用）") private String status; /** * 权限字符串 */ + @ApiModelProperty(value = "权限字符串") private String perms; /** * 菜单图标 */ + @ApiModelProperty(value = "菜单图标") private String icon; /** * 备注 */ + @ApiModelProperty(value = "备注") private String remark; } diff --git a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysNotice.java b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysNotice.java index 97c103d0..208484bb 100644 --- a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysNotice.java +++ b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysNotice.java @@ -4,6 +4,8 @@ import cc.iotkit.data.model.BaseEntity; import cc.iotkit.model.system.SysLogininfor; import cc.iotkit.model.system.SysNotice; import io.github.linpeilie.annotations.AutoMapper; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -21,42 +23,50 @@ import javax.persistence.Table; @Entity @Table(name = "sys_notice") @AutoMapper(target = SysNotice.class) +@ApiModel(value = "通知公告表") public class TbSysNotice extends BaseEntity { /** * 公告ID */ @Id + @ApiModelProperty(value = "公告ID") private Long noticeId; /** * 租户编号 */ + @ApiModelProperty(value = "租户编号") private String tenantId; /** * 公告标题 */ + @ApiModelProperty(value = "公告标题") private String noticeTitle; /** * 公告类型（1通知 2公告） */ + @ApiModelProperty(value = "公告类型（1通知 2公告）") private String noticeType; /** * 公告内容 */ + @ApiModelProperty(value = "公告内容") private String noticeContent; /** * 公告状态（0正常 1关闭） */ + @ApiModelProperty(value = "公告状态（0正常 1关闭）") private String status; /** * 备注 */ + @ApiModelProperty(value = "备注") private String remark; } diff --git a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysOperLog.java b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysOperLog.java index dfb35ad0..fe4e0a30 100644 --- a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysOperLog.java +++ b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysOperLog.java @@ -3,6 +3,8 @@ package cc.iotkit.data.model; import cc.iotkit.model.system.SysLogininfor; import cc.iotkit.model.system.SysOperLog; import io.github.linpeilie.annotations.AutoMapper; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.persistence.Entity; @@ -20,6 +22,7 @@ import java.util.Date; @Entity @Table(name = "oper_log") @AutoMapper(target = SysOperLog.class) +@ApiModel(value = "操作日志记录表") public class TbSysOperLog implements Serializable { private static final long serialVersionUID = 1L; @@ -27,91 +30,109 @@ public class TbSysOperLog implements Serializable { * 日志主键 */ @Id + @ApiModelProperty(value = "日志主键") private Long operId; /** * 租户编号 */ + @ApiModelProperty(value = "租户编号") private String tenantId; /** * 操作模块 */ + @ApiModelProperty(value = "操作模块") private String title; /** * 业务类型（0其它 1新增 2修改 3删除） */ + @ApiModelProperty(value = "业务类型（0其它 1新增 2修改 3删除）") private Integer businessType; /** * 请求方法 */ + @ApiModelProperty(value = "请求方法") private String method; /** * 请求方式 */ + @ApiModelProperty(value = "请求方式") private String requestMethod; /** * 操作类别（0其它 1后台用户 2手机端用户） */ + @ApiModelProperty(value = "操作类别（0其它 1后台用户 2手机端用户）") private Integer operatorType; /** * 操作人员 */ + @ApiModelProperty(value = "操作人员") private String operName; /** * 部门名称 */ + @ApiModelProperty(value = "部门名称") private String deptName; /** * 请求url */ + @ApiModelProperty(value = "请求url") private String operUrl; /** * 操作地址 */ + @ApiModelProperty(value = "操作地址") private String operIp; /** * 操作地点 */ + @ApiModelProperty(value = "操作地点") private String operLocation; /** * 请求参数 */ + @ApiModelProperty(value = "请求参数") private String operParam; /** * 返回参数 */ + @ApiModelProperty(value = "返回参数") private String jsonResult; /** * 操作状态（0正常 1异常） */ + @ApiModelProperty(value = "操作状态（0正常 1异常）") private Integer status; /** * 错误消息 */ + @ApiModelProperty(value = "错误消息") private String errorMsg; /** * 操作时间 */ + @ApiModelProperty(value = "操作时间") private Date operTime; /** * 消耗时间 */ + @ApiModelProperty(value = "消耗时间") private Long costTime; } diff --git a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysOss.java b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysOss.java index 11668f1e..b9564796 100644 --- a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysOss.java +++ b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysOss.java @@ -1,6 +1,8 @@ package cc.iotkit.data.model; import cc.iotkit.data.model.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -17,42 +19,50 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Entity @Table(name = "sys_oss") +@ApiModel(value = "OSS对象存储对象") public class TbSysOss extends BaseEntity { /** * 对象存储主键 */ @Id + @ApiModelProperty(value = "对象存储主键") private Long ossId; /** * 租户编号 */ + @ApiModelProperty(value = "租户编号") private String tenantId; /** * 文件名 */ + @ApiModelProperty(value = "文件名") private String fileName; /** * 原名 */ + @ApiModelProperty(value = "原名") private String originalName; /** * 文件后缀名 */ + @ApiModelProperty(value = "文件后缀名") private String fileSuffix; /** * URL地址 */ + @ApiModelProperty(value = "URL地址") private String url; /** * 服务商 */ + @ApiModelProperty(value = "服务商") private String service; } diff --git a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysOssConfig.java b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysOssConfig.java index 236ba63c..7a1fbe8e 100644 --- a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysOssConfig.java +++ b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysOssConfig.java @@ -1,6 +1,8 @@ package cc.iotkit.data.model; import cc.iotkit.data.model.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -17,81 +19,97 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Entity @Table(name = "sys_oss_config") +@ApiModel(value = "对象存储配置对象") public class TbSysOssConfig extends BaseEntity { /** * 主建 */ @Id + @ApiModelProperty(value = "主建") private Long ossConfigId; /** * 租户编号 */ + @ApiModelProperty(value = "租户编号") private String tenantId; /** * 配置key */ + @ApiModelProperty(value = "配置key") private String configKey; /** * accessKey */ + @ApiModelProperty(value = "accessKey") private String accessKey; /** * 秘钥 */ + @ApiModelProperty(value = "秘钥") private String secretKey; /** * 桶名称 */ + @ApiModelProperty(value = "桶名称") private String bucketName; /** * 前缀 */ + @ApiModelProperty(value = "前缀") private String prefix; /** * 访问站点 */ + @ApiModelProperty(value = "访问站点") private String endpoint; /** * 自定义域名 */ + @ApiModelProperty(value = "自定义域名") private String domain; /** * 是否https（0否 1是） */ + @ApiModelProperty(value = "是否https（0否 1是）") private String isHttps; /** * 域 */ + @ApiModelProperty(value = "域") private String region; /** * 是否默认（0=是,1=否） */ + @ApiModelProperty(value = "是否默认（0=是,1=否）") private String status; /** * 扩展字段 */ + @ApiModelProperty(value = "扩展字段") private String ext1; /** * 备注 */ + @ApiModelProperty(value = "备注") private String remark; /** * 桶权限类型(0private 1public 2custom) */ + @ApiModelProperty(value = "桶权限类型(0private 1public 2custom)") private String accessPolicy; } diff --git a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysPost.java b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysPost.java index b91aead8..27bbb5bd 100644 --- a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysPost.java +++ b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysPost.java @@ -1,6 +1,7 @@ package cc.iotkit.data.model; import cc.iotkit.data.model.BaseEntity; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -24,36 +25,43 @@ public class TbSysPost extends BaseEntity { * 岗位序号 */ @Id + @ApiModelProperty(value = "岗位序号") private Long postId; /** * 租户编号 */ + @ApiModelProperty(value = "租户编号") private String tenantId; /** * 岗位编码 */ + @ApiModelProperty(value = "岗位编码") private String postCode; /** * 岗位名称 */ + @ApiModelProperty(value = "岗位名称") private String postName; /** * 岗位排序 */ + @ApiModelProperty(value = "岗位排序") private Integer postSort; /** * 状态（0正常 1停用） */ + @ApiModelProperty(value = "状态（0正常 1停用）") private String status; /** * 备注 */ + @ApiModelProperty(value = "备注") private String remark; } diff --git a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysRole.java b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysRole.java index 8a7b53dd..7fd993b8 100644 --- a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysRole.java +++ b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysRole.java @@ -1,6 +1,7 @@ package cc.iotkit.data.model; import cc.iotkit.data.model.BaseEntity; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; @@ -26,56 +27,67 @@ public class TbSysRole extends BaseEntity { * 角色ID */ @Id + @ApiModelProperty(value = "角色ID") private Long roleId; /** * 租户编号 */ + @ApiModelProperty(value = "租户编号") private String tenantId; /** * 角色名称 */ + @ApiModelProperty(value = "角色名称") private String roleName; /** * 角色权限 */ + @ApiModelProperty(value = "角色权限") private String roleKey; /** * 角色排序 */ + @ApiModelProperty(value = "角色排序") private Integer roleSort; /** * 数据范围（1：所有数据权限；2：自定义数据权限；3：本部门数据权限；4：本部门及以下数据权限；5：仅本人数据权限） */ + @ApiModelProperty(value = "数据范围（1：所有数据权限；2：自定义数据权限；3：本部门数据权限；4：本部门及以下数据权限；5：仅本人数据权限）") private String dataScope; /** * 菜单树选择项是否关联显示（ 0：父子不互相关联显示 1：父子互相关联显示） */ + @ApiModelProperty(value = "菜单树选择项是否关联显示（ 0：父子不互相关联显示 1：父子互相关联显示）") private Boolean menuCheckStrictly; /** * 部门树选择项是否关联显示（0：父子不互相关联显示 1：父子互相关联显示 ） */ + @ApiModelProperty(value = "部门树选择项是否关联显示（0：父子不互相关联显示 1：父子互相关联显示 ）") private Boolean deptCheckStrictly; /** * 角色状态（0正常 1停用） */ + @ApiModelProperty(value = "角色状态（0正常 1停用）") private String status; /** * 删除标志（0代表存在 2代表删除） */ + @ApiModelProperty(value = "删除标志（0代表存在 2代表删除）") private String delFlag; /** * 备注 */ + @ApiModelProperty(value = "备注") private String remark; public TbSysRole(Long roleId) { diff --git a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysRoleDept.java b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysRoleDept.java index 7ea1a6cc..d037d31d 100644 --- a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysRoleDept.java +++ b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysRoleDept.java @@ -1,5 +1,6 @@ package cc.iotkit.data.model; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.persistence.Entity; @@ -18,16 +19,19 @@ import javax.persistence.Table; public class TbSysRoleDept { @Id + @ApiModelProperty(value = "主键") private Long id; /** * 角色ID */ + @ApiModelProperty(value = "角色ID") private Long roleId; /** * 部门ID */ + @ApiModelProperty(value = "部门ID") private Long deptId; } diff --git a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysRoleMenu.java b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysRoleMenu.java index 0b384c6d..8d478d44 100644 --- a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysRoleMenu.java +++ b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysRoleMenu.java @@ -1,5 +1,6 @@ package cc.iotkit.data.model; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.persistence.Entity; @@ -18,16 +19,19 @@ import javax.persistence.Table; public class TbSysRoleMenu { @Id + @ApiModelProperty(value = "主键") private Long id; /** * 角色ID */ + @ApiModelProperty(value = "角色ID") private Long roleId; /** * 菜单ID */ + @ApiModelProperty(value = "菜单ID") private Long menuId; } diff --git a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysTenant.java b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysTenant.java index 1e0ef5ed..7513c652 100644 --- a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysTenant.java +++ b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysTenant.java @@ -1,6 +1,7 @@ package cc.iotkit.data.model; import cc.iotkit.data.model.BaseEntity; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -25,76 +26,91 @@ public class TbSysTenant extends BaseEntity { * id */ @Id + @ApiModelProperty(value = "id") private Long id; /** * 租户编号 */ + @ApiModelProperty(value = "租户编号") private String tenantId; /** * 联系人 */ + @ApiModelProperty(value = "联系人") private String contactUserName; /** * 联系电话 */ + @ApiModelProperty(value = "联系电话") private String contactPhone; /** * 企业名称 */ + @ApiModelProperty(value = "企业名称") private String companyName; /** * 统一社会信用代码 */ + @ApiModelProperty(value = "统一社会信用代码") private String licenseNumber; /** * 地址 */ + @ApiModelProperty(value = "地址") private String address; /** * 域名 */ + @ApiModelProperty(value = "域名") private String domain; /** * 企业简介 */ + @ApiModelProperty(value = "企业简介") private String intro; /** * 备注 */ + @ApiModelProperty(value = "备注") private String remark; /** * 租户套餐编号 */ + @ApiModelProperty(value = "租户套餐编号") private Long packageId; /** * 过期时间 */ + @ApiModelProperty(value = "过期时间") private Date expireTime; /** * 用户数量（-1不限制） */ + @ApiModelProperty(value = "用户数量（-1不限制）") private Long accountCount; /** * 租户状态（0正常 1停用） */ + @ApiModelProperty(value = "租户状态（0正常 1停用）") private String status; /** * 删除标志（0代表存在 2代表删除） */ + @ApiModelProperty(value = "删除标志（0代表存在 2代表删除）") private String delFlag; } diff --git a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysTenantPackage.java b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysTenantPackage.java index 34e811d3..2532d2f4 100644 --- a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysTenantPackage.java +++ b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysTenantPackage.java @@ -1,6 +1,7 @@ package cc.iotkit.data.model; import cc.iotkit.data.model.BaseEntity; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -24,30 +25,37 @@ public class TbSysTenantPackage extends BaseEntity { * 租户套餐id */ @Id + @ApiModelProperty(value = "租户套餐id") private Long packageId; /** * 套餐名称 */ + @ApiModelProperty(value = "套餐名称") private String packageName; /** * 关联菜单id */ + @ApiModelProperty(value = "关联菜单id") private String menuIds; /** * 备注 */ + @ApiModelProperty(value = "备注") private String remark; /** * 菜单树选择项是否关联显示（ 0：父子不互相关联显示 1：父子互相关联显示） */ + @ApiModelProperty(value = "菜单树选择项是否关联显示（ 0：父子不互相关联显示 1：父子互相关联显示）") private Boolean menuCheckStrictly; /** * 状态（0正常 1停用） */ + @ApiModelProperty(value = "状态（0正常 1停用）") private String status; /** * 删除标志（0代表存在 2代表删除） */ + @ApiModelProperty(value = "删除标志（0代表存在 2代表删除）") private String delFlag; } diff --git a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysUser.java b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysUser.java index d23baad3..36cb5760 100644 --- a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysUser.java +++ b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysUser.java @@ -1,6 +1,7 @@ package cc.iotkit.data.model; import cc.iotkit.data.model.BaseEntity; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; @@ -27,81 +28,97 @@ public class TbSysUser extends BaseEntity { * 用户ID */ @Id + @ApiModelProperty(value = "用户ID") private Long userId; /** * 租户编号 */ + @ApiModelProperty(value = "租户编号") private String tenantId; /** * 部门ID */ + @ApiModelProperty(value = "部门ID") private Long deptId; /** * 用户账号 */ + @ApiModelProperty(value = "用户账号") private String userName; /** * 用户昵称 */ + @ApiModelProperty(value = "用户昵称") private String nickName; /** * 用户类型（sys_user系统用户） */ + @ApiModelProperty(value = "用户类型（sys_user系统用户）") private String userType; /** * 用户邮箱 */ + @ApiModelProperty(value = "用户邮箱") private String email; /** * 手机号码 */ + @ApiModelProperty(value = "手机号码") private String phonenumber; /** * 用户性别 */ + @ApiModelProperty(value = "用户性别") private String sex; /** * 用户头像 */ + @ApiModelProperty(value = "用户头像") private Long avatar; /** * 密码 */ + @ApiModelProperty(value = "密码") private String password; /** * 帐号状态（0正常 1停用） */ + @ApiModelProperty(value = "帐号状态（0正常 1停用）") private String status; /** * 删除标志（0代表存在 2代表删除） */ + @ApiModelProperty(value = "删除标志（0代表存在 2代表删除）") private String delFlag; /** * 最后登录IP */ + @ApiModelProperty(value = "最后登录IP") private String loginIp; /** * 最后登录时间 */ + @ApiModelProperty(value = "最后登录时间") private Date loginDate; /** * 备注 */ + @ApiModelProperty(value = "备注") private String remark; public TbSysUser(Long userId) { diff --git a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysUserPost.java b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysUserPost.java index 0e2ccc8a..acd7064d 100644 --- a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysUserPost.java +++ b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysUserPost.java @@ -1,6 +1,7 @@ package cc.iotkit.data.model; import cc.iotkit.data.model.BaseEntity; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.persistence.Entity; @@ -24,11 +25,13 @@ public class TbSysUserPost extends BaseEntity { /** * 用户ID */ + @ApiModelProperty(value = "用户ID") private Long userId; /** * 岗位ID */ + @ApiModelProperty(value = "岗位ID") private Long postId; } diff --git a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysUserRole.java b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysUserRole.java index 62fdd3d0..a5ffd76b 100644 --- a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysUserRole.java +++ b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysUserRole.java @@ -1,6 +1,7 @@ package cc.iotkit.data.model; import cc.iotkit.data.model.BaseEntity; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.persistence.Entity; @@ -24,11 +25,13 @@ public class TbSysUserRole extends BaseEntity { /** * 用户ID */ + @ApiModelProperty(value = "用户ID") private Long userId; /** * 角色ID */ + @ApiModelProperty(value = "角色ID") private Long roleId; } diff --git a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbTaskInfo.java b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbTaskInfo.java index b02c68d8..d6661a5a 100644 --- a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbTaskInfo.java +++ b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbTaskInfo.java @@ -9,6 +9,7 @@ */ package cc.iotkit.data.model; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.persistence.Column; @@ -22,13 +23,16 @@ import javax.persistence.Table; public class TbTaskInfo { @Id + @ApiModelProperty(value = "主键") private String id; + @ApiModelProperty(value = "任务名称") private String name; /** * 任务类型 */ + @ApiModelProperty(value = "任务类型") private String type; /** @@ -36,35 +40,42 @@ public class TbTaskInfo { * 定时器使用cron表达式 * 延时器使用延时时长（秒） */ + @ApiModelProperty(value = "表达式") private String expression; /** * 描述 */ @Column(name = "[desc]") + @ApiModelProperty(value = "描述") private String desc; /** * 任务输出 */ @Column(columnDefinition = "text") + @ApiModelProperty(value = "任务输出") private String actions; /** * 任务状态 */ + @ApiModelProperty(value = "任务状态") private String state; /** * 创建者 */ + @ApiModelProperty(value = "创建者") private String uid; + @ApiModelProperty(value = "创建时间") private Long createAt; /** * 操作备注 */ + @ApiModelProperty(value = "操作备注") private String reason; } diff --git a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbThingModel.java b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbThingModel.java index 080b2682..8aeccf2c 100644 --- a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbThingModel.java +++ b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbThingModel.java @@ -9,6 +9,7 @@ */ package cc.iotkit.data.model; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.persistence.Column; @@ -22,10 +23,13 @@ import javax.persistence.Table; public class TbThingModel { @Id + @ApiModelProperty(value = "主键") private String id; + @ApiModelProperty(value = "产品key") private String productKey; + @ApiModelProperty(value = "模型内容") @Column(columnDefinition = "text") private String model; diff --git a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbUserInfo.java b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbUserInfo.java index 796a8a86..fc0b7927 100644 --- a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbUserInfo.java +++ b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbUserInfo.java @@ -1,5 +1,6 @@ package cc.iotkit.data.model; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.persistence.Entity; @@ -17,40 +18,49 @@ public class TbUserInfo { /** * 用户账号 */ + @ApiModelProperty(value = "用户账号") private String uid; /** * 归属账号 */ + @ApiModelProperty(value = "归属账号") private String ownerId; /** * 密钥（密码加密后的内容） */ + @ApiModelProperty(value = "密钥（密码加密后的内容）") private String secret; /** * 用户昵称 */ + @ApiModelProperty(value = "用户昵称") private String nickName; /** * 性别 0-未知 1-male,2-female */ + @ApiModelProperty(value="性别 0-未知 1-male,2-female") private Integer gender; /** * 头像地址 */ + @ApiModelProperty(value="头像地址") private String avatarUrl; + @ApiModelProperty(value="email") private String email; + @ApiModelProperty(value="地址") private String address; /** * 当前家庭Id */ + @ApiModelProperty(value="当前家庭Id") private String currHomeId; /** @@ -58,24 +68,29 @@ public class TbUserInfo { * 0:平台用户 * 1:终端用户 */ + @ApiModelProperty(value="用户类型 0:平台用户 1:终端用户") private Integer type; /** * 角色 */ + @ApiModelProperty(value="角色") private String roles; /** * 权限 */ + @ApiModelProperty(value="权限") private String permissions; /** * 用户使用的平台 * 见:Constants.THIRD_PLATFORM */ + @ApiModelProperty(value="用户使用的平台") private String usePlatforms; + @ApiModelProperty(value="创建时间") private Long createAt; } diff --git a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbVirtualDevice.java b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbVirtualDevice.java index 81a9f9ab..7024785e 100644 --- a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbVirtualDevice.java +++ b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbVirtualDevice.java @@ -9,6 +9,7 @@ */ package cc.iotkit.data.model; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.persistence.Column; @@ -27,48 +28,57 @@ public class TbVirtualDevice { /** * 所属用户 */ + @ApiModelProperty(value = "所属用户") private String uid; /** * 虚拟设备名称 */ + @ApiModelProperty(value = "虚拟设备名称") private String name; /** * 产品key */ + @ApiModelProperty(value = "产品key") private String productKey; /** * 虚拟类型 */ + @ApiModelProperty(value = "虚拟类型") private String type; /** * 设备行为脚本 */ + @ApiModelProperty(value = "设备行为脚本") @Column(columnDefinition = "text") private String script; /** * 触发方式执行方式 */ + @ApiModelProperty(value = "触发方式执行方式") @Column(name = "[trigger]") private String trigger; /** * 触发表达式 */ + @ApiModelProperty(value = "触发表达式") private String triggerExpression; /** * 运行状态 */ + @ApiModelProperty(value = "运行状态") private String state; /** * 创建时间 */ + @ApiModelProperty(value = "创建时间") private Long createAt; } diff --git a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbVirtualDeviceMapping.java b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbVirtualDeviceMapping.java index c5ff725e..cd0db1c2 100644 --- a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbVirtualDeviceMapping.java +++ b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbVirtualDeviceMapping.java @@ -9,6 +9,7 @@ */ package cc.iotkit.data.model; +import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -27,8 +28,10 @@ public class TbVirtualDeviceMapping { @Id private String id; + @ApiModelProperty(value = "虚拟设备ID") private String virtualId; + @ApiModelProperty(value = "设备ID") private String deviceId; } diff --git a/pom.xml b/pom.xml index 6b97f89e..f37c1412 100755 --- a/pom.xml +++ b/pom.xml @@ -41,6 +41,7 @@ 3.2.1 2.3 2.7.0 + 1.0.0 @@ -512,6 +513,11 @@ velocity-engine-core ${velocity.version} + + com.github.biyanwen + jpa-comment-spring-boot-starter + ${jap-comment.version} +