diff --git a/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/DeviceIdGroup.java b/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/DeviceIdGroup.java index cf93fc92..fc5752a3 100644 --- a/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/DeviceIdGroup.java +++ b/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/DeviceIdGroup.java @@ -24,14 +24,23 @@ package cc.iotkit.data.model; import cc.iotkit.common.tenant.dao.TenantAware; import cc.iotkit.common.tenant.entiry.BaseTenantEntity; +import cc.iotkit.common.tenant.listener.TenantListener; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import org.hibernate.annotations.Filter; +import org.hibernate.annotations.FilterDef; +import org.hibernate.annotations.ParamDef; + +import javax.persistence.EntityListeners; @Data @NoArgsConstructor @AllArgsConstructor +@FilterDef(name = "tenantFilter", parameters = {@ParamDef(name = "tenantId", type = "long")}) +@Filter(name = "tenantFilter", condition = "tenant_id = :tenantId") +@EntityListeners(TenantListener.class) public class DeviceIdGroup extends BaseEntity implements TenantAware { @ApiModelProperty(value = "设备组id") diff --git a/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbAlertConfig.java b/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbAlertConfig.java index 57ea2815..4279b756 100644 --- a/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbAlertConfig.java +++ b/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbAlertConfig.java @@ -23,23 +23,27 @@ package cc.iotkit.data.model; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import javax.persistence.*; import cc.iotkit.common.tenant.dao.TenantAware; import cc.iotkit.common.tenant.entiry.BaseTenantEntity; +import cc.iotkit.common.tenant.listener.TenantListener; import cc.iotkit.model.alert.AlertConfig; import io.github.linpeilie.annotations.AutoMapper; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.hibernate.annotations.Filter; +import org.hibernate.annotations.FilterDef; import org.hibernate.annotations.GenericGenerator; +import org.hibernate.annotations.ParamDef; @Data @Entity @Table(name = "alert_config") @AutoMapper(target = AlertConfig.class) +@FilterDef(name = "tenantFilter", parameters = {@ParamDef(name = "tenantId", type = "long")}) +@Filter(name = "tenantFilter", condition = "tenant_id = :tenantId") +@EntityListeners(TenantListener.class) public class TbAlertConfig extends BaseEntity implements TenantAware { @Id diff --git a/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbAlertRecord.java b/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbAlertRecord.java index f61cc7ef..1e828688 100644 --- a/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbAlertRecord.java +++ b/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbAlertRecord.java @@ -25,21 +25,25 @@ package cc.iotkit.data.model; import cc.iotkit.common.tenant.dao.TenantAware; import cc.iotkit.common.tenant.entiry.BaseTenantEntity; +import cc.iotkit.common.tenant.listener.TenantListener; import cc.iotkit.model.alert.AlertRecord; import io.github.linpeilie.annotations.AutoMapper; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.hibernate.annotations.Filter; +import org.hibernate.annotations.FilterDef; import org.hibernate.annotations.GenericGenerator; +import org.hibernate.annotations.ParamDef; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import javax.persistence.*; @Data @Entity @Table(name = "alert_record") @AutoMapper(target = AlertRecord.class) +@FilterDef(name = "tenantFilter", parameters = {@ParamDef(name = "tenantId", type = "long")}) +@Filter(name = "tenantFilter", condition = "tenant_id = :tenantId") +@EntityListeners(TenantListener.class) public class TbAlertRecord extends BaseEntity implements TenantAware { @Id diff --git a/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbCategory.java b/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbCategory.java index 3865791e..7f26dd70 100644 --- a/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbCategory.java +++ b/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbCategory.java @@ -24,21 +24,25 @@ package cc.iotkit.data.model; import cc.iotkit.common.tenant.dao.TenantAware; import cc.iotkit.common.tenant.entiry.BaseTenantEntity; +import cc.iotkit.common.tenant.listener.TenantListener; import cc.iotkit.model.product.Category; import io.github.linpeilie.annotations.AutoMapper; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.hibernate.annotations.Filter; +import org.hibernate.annotations.FilterDef; import org.hibernate.annotations.GenericGenerator; +import org.hibernate.annotations.ParamDef; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import javax.persistence.*; @Data @Entity @Table(name = "category") @AutoMapper(target = Category.class) +@FilterDef(name = "tenantFilter", parameters = {@ParamDef(name = "tenantId", type = "long")}) +@Filter(name = "tenantFilter", condition = "tenant_id = :tenantId") +@EntityListeners(TenantListener.class) public class TbCategory extends BaseEntity implements TenantAware { @ApiModelProperty(value = "分类id") diff --git a/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbChannel.java b/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbChannel.java index 4d4ac462..831c0f99 100644 --- a/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbChannel.java +++ b/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbChannel.java @@ -25,16 +25,17 @@ package cc.iotkit.data.model; import cc.iotkit.common.tenant.dao.TenantAware; import cc.iotkit.common.tenant.entiry.BaseTenantEntity; +import cc.iotkit.common.tenant.listener.TenantListener; import cc.iotkit.model.notify.Channel; import io.github.linpeilie.annotations.AutoMapper; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.hibernate.annotations.Filter; +import org.hibernate.annotations.FilterDef; import org.hibernate.annotations.GenericGenerator; +import org.hibernate.annotations.ParamDef; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import javax.persistence.*; /** * author: 石恒 @@ -45,6 +46,9 @@ import javax.persistence.Table; @Entity @Table(name = "channel") @AutoMapper(target= Channel.class) +@FilterDef(name = "tenantFilter", parameters = {@ParamDef(name = "tenantId", type = "long")}) +@Filter(name = "tenantFilter", condition = "tenant_id = :tenantId") +@EntityListeners(TenantListener.class) public class TbChannel extends BaseEntity implements TenantAware { @Id @GeneratedValue(generator = "SnowflakeIdGenerator") diff --git a/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbChannelConfig.java b/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbChannelConfig.java index e47176e0..0a5bab3c 100644 --- a/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbChannelConfig.java +++ b/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbChannelConfig.java @@ -25,12 +25,16 @@ package cc.iotkit.data.model; import cc.iotkit.common.tenant.dao.TenantAware; import cc.iotkit.common.tenant.entiry.BaseTenantEntity; +import cc.iotkit.common.tenant.listener.TenantListener; import cc.iotkit.model.notify.ChannelConfig; import io.github.linpeilie.annotations.AutoMapper; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.hibernate.annotations.Filter; +import org.hibernate.annotations.FilterDef; import org.hibernate.annotations.GenericGenerator; +import org.hibernate.annotations.ParamDef; import javax.persistence.*; @@ -44,6 +48,9 @@ import javax.persistence.*; @Table(name = "channel_config") @ApiModel(value = "通道配置") @AutoMapper(target = ChannelConfig.class) +@FilterDef(name = "tenantFilter", parameters = {@ParamDef(name = "tenantId", type = "long")}) +@Filter(name = "tenantFilter", condition = "tenant_id = :tenantId") +@EntityListeners(TenantListener.class) public class TbChannelConfig extends BaseEntity implements TenantAware { @Id @GeneratedValue(generator = "SnowflakeIdGenerator") diff --git a/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbChannelTemplate.java b/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbChannelTemplate.java index 5600ae55..a406e0af 100644 --- a/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbChannelTemplate.java +++ b/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbChannelTemplate.java @@ -25,17 +25,18 @@ package cc.iotkit.data.model; import cc.iotkit.common.tenant.dao.TenantAware; import cc.iotkit.common.tenant.entiry.BaseTenantEntity; +import cc.iotkit.common.tenant.listener.TenantListener; import cc.iotkit.model.notify.ChannelTemplate; import io.github.linpeilie.annotations.AutoMapper; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.hibernate.annotations.Filter; +import org.hibernate.annotations.FilterDef; import org.hibernate.annotations.GenericGenerator; +import org.hibernate.annotations.ParamDef; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import javax.persistence.*; /** * @Author: 石恒 @@ -47,6 +48,9 @@ import javax.persistence.Table; @Table(name = "channel_template") @ApiModel(value = "通道模板") @AutoMapper(target= ChannelTemplate.class) +@FilterDef(name = "tenantFilter", parameters = {@ParamDef(name = "tenantId", type = "long")}) +@Filter(name = "tenantFilter", condition = "tenant_id = :tenantId") +@EntityListeners(TenantListener.class) public class TbChannelTemplate extends BaseEntity implements TenantAware { @Id @GeneratedValue(generator = "SnowflakeIdGenerator") diff --git a/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbDeviceConfig.java b/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbDeviceConfig.java index 5132f129..7fe81035 100644 --- a/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbDeviceConfig.java +++ b/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbDeviceConfig.java @@ -25,13 +25,17 @@ package cc.iotkit.data.model; import cc.iotkit.common.tenant.dao.TenantAware; import cc.iotkit.common.tenant.entiry.BaseTenantEntity; +import cc.iotkit.common.tenant.listener.TenantListener; import cc.iotkit.model.device.DeviceConfig; import io.github.linpeilie.annotations.AutoMapper; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.hibernate.annotations.Filter; +import org.hibernate.annotations.FilterDef; import org.hibernate.annotations.GenericGenerator; +import org.hibernate.annotations.ParamDef; import javax.persistence.*; @@ -40,6 +44,9 @@ import javax.persistence.*; @ApiModel(value = "设备配置") @Table(name = "device_config") @AutoMapper(target = DeviceConfig.class) +@FilterDef(name = "tenantFilter", parameters = {@ParamDef(name = "tenantId", type = "long")}) +@Filter(name = "tenantFilter", condition = "tenant_id = :tenantId") +@EntityListeners(TenantListener.class) public class TbDeviceConfig extends BaseEntity implements TenantAware { @Id diff --git a/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbDeviceGroup.java b/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbDeviceGroup.java index 1aa03336..de5ebd59 100644 --- a/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbDeviceGroup.java +++ b/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbDeviceGroup.java @@ -24,23 +24,27 @@ package cc.iotkit.data.model; import cc.iotkit.common.tenant.dao.TenantAware; import cc.iotkit.common.tenant.entiry.BaseTenantEntity; +import cc.iotkit.common.tenant.listener.TenantListener; import cc.iotkit.model.device.DeviceGroup; import io.github.linpeilie.annotations.AutoMapper; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.hibernate.annotations.Filter; +import org.hibernate.annotations.FilterDef; import org.hibernate.annotations.GenericGenerator; +import org.hibernate.annotations.ParamDef; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import javax.persistence.*; @Data @Entity @Table(name = "device_group") @ApiModel(value = "设备组") @AutoMapper(target = DeviceGroup.class) +@FilterDef(name = "tenantFilter", parameters = {@ParamDef(name = "tenantId", type = "long")}) +@Filter(name = "tenantFilter", condition = "tenant_id = :tenantId") +@EntityListeners(TenantListener.class) public class TbDeviceGroup extends BaseEntity implements TenantAware { @Id diff --git a/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbDeviceGroupMapping.java b/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbDeviceGroupMapping.java index b6053cc1..cda1beeb 100644 --- a/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbDeviceGroupMapping.java +++ b/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbDeviceGroupMapping.java @@ -25,22 +25,26 @@ package cc.iotkit.data.model; import cc.iotkit.common.tenant.dao.TenantAware; import cc.iotkit.common.tenant.entiry.BaseTenantEntity; +import cc.iotkit.common.tenant.listener.TenantListener; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import org.hibernate.annotations.Filter; +import org.hibernate.annotations.FilterDef; import org.hibernate.annotations.GenericGenerator; +import org.hibernate.annotations.ParamDef; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import javax.persistence.*; @Data @NoArgsConstructor @AllArgsConstructor @Entity @Table(name = "device_group_mapping") +@FilterDef(name = "tenantFilter", parameters = {@ParamDef(name = "tenantId", type = "long")}) +@Filter(name = "tenantFilter", condition = "tenant_id = :tenantId") +@EntityListeners(TenantListener.class) public class TbDeviceGroupMapping extends BaseEntity implements TenantAware { @Id diff --git a/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbDeviceOtaDetail.java b/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbDeviceOtaDetail.java index 327a2c77..013270aa 100644 --- a/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbDeviceOtaDetail.java +++ b/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbDeviceOtaDetail.java @@ -48,6 +48,8 @@ import javax.persistence.*; @Table(name = "device_ota_detail") @ApiModel(value = "设备升级明细") @AutoMapper(target = DeviceOtaDetail.class) +@FilterDef(name = "tenantFilter", parameters = {@ParamDef(name = "tenantId", type = "long")}) +@Filter(name = "tenantFilter", condition = "tenant_id = :tenantId") @EntityListeners(TenantListener.class) public class TbDeviceOtaDetail extends BaseEntity implements TenantAware { @Id diff --git a/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbDeviceOtaInfo.java b/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbDeviceOtaInfo.java index 194d7ecd..bb8eac19 100644 --- a/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbDeviceOtaInfo.java +++ b/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbDeviceOtaInfo.java @@ -25,12 +25,16 @@ package cc.iotkit.data.model; import cc.iotkit.common.tenant.dao.TenantAware; import cc.iotkit.common.tenant.entiry.BaseTenantEntity; +import cc.iotkit.common.tenant.listener.TenantListener; import cc.iotkit.model.ota.DeviceOtaInfo; import io.github.linpeilie.annotations.AutoMapper; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.hibernate.annotations.Filter; +import org.hibernate.annotations.FilterDef; import org.hibernate.annotations.GenericGenerator; +import org.hibernate.annotations.ParamDef; import javax.persistence.*; @@ -44,6 +48,9 @@ import javax.persistence.*; @Table(name = "device_ota_info") @ApiModel(value = "设备信息") @AutoMapper(target = DeviceOtaInfo.class) +@FilterDef(name = "tenantFilter", parameters = {@ParamDef(name = "tenantId", type = "long")}) +@Filter(name = "tenantFilter", condition = "tenant_id = :tenantId") +@EntityListeners(TenantListener.class) public class TbDeviceOtaInfo extends BaseEntity implements TenantAware { @Id @GeneratedValue(generator = "SnowflakeIdGenerator") diff --git a/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbDeviceSubUser.java b/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbDeviceSubUser.java index d29424ec..73b638cf 100644 --- a/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbDeviceSubUser.java +++ b/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbDeviceSubUser.java @@ -24,21 +24,24 @@ package cc.iotkit.data.model; import cc.iotkit.common.tenant.dao.TenantAware; import cc.iotkit.common.tenant.entiry.BaseTenantEntity; +import cc.iotkit.common.tenant.listener.TenantListener; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.hibernate.annotations.Filter; +import org.hibernate.annotations.FilterDef; import org.hibernate.annotations.GenericGenerator; +import org.hibernate.annotations.ParamDef; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import javax.persistence.*; @Data @Entity @Table(name = "device_sub_user") @ApiModel(value = "设备用户映射") - +@FilterDef(name = "tenantFilter", parameters = {@ParamDef(name = "tenantId", type = "long")}) +@Filter(name = "tenantFilter", condition = "tenant_id = :tenantId") +@EntityListeners(TenantListener.class) public class TbDeviceSubUser extends BaseEntity implements TenantAware { @Id diff --git a/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbDeviceTag.java b/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbDeviceTag.java index ba33c53e..f69cdcc9 100644 --- a/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbDeviceTag.java +++ b/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbDeviceTag.java @@ -24,13 +24,17 @@ package cc.iotkit.data.model; import cc.iotkit.common.tenant.dao.TenantAware; import cc.iotkit.common.tenant.entiry.BaseTenantEntity; +import cc.iotkit.common.tenant.listener.TenantListener; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.hibernate.annotations.Filter; +import org.hibernate.annotations.FilterDef; import org.hibernate.annotations.GenericGenerator; +import org.hibernate.annotations.ParamDef; import javax.persistence.*; @@ -41,6 +45,9 @@ import javax.persistence.*; @Entity @Table(name = "device_tag") @ApiModel(value = "设备标签") +@FilterDef(name = "tenantFilter", parameters = {@ParamDef(name = "tenantId", type = "long")}) +@Filter(name = "tenantFilter", condition = "tenant_id = :tenantId") +@EntityListeners(TenantListener.class) public class TbDeviceTag extends BaseEntity implements TenantAware { @Id diff --git a/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbIcon.java b/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbIcon.java index beab5976..cb12c49f 100644 --- a/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbIcon.java +++ b/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbIcon.java @@ -43,7 +43,9 @@ import javax.persistence.*; @ApiModel(value = "图标") @Table(name = "icon") @AutoMapper(target = Icon.class) - +@FilterDef(name = "tenantFilter", parameters = {@ParamDef(name = "tenantId", type = "long")}) +@Filter(name = "tenantFilter", condition = "tenant_id = :tenantId") +@EntityListeners(TenantListener.class) public class TbIcon extends BaseEntity implements TenantAware { @Id diff --git a/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbNotifyMessage.java b/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbNotifyMessage.java index c8c0dffe..88fa2ba6 100644 --- a/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbNotifyMessage.java +++ b/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbNotifyMessage.java @@ -25,17 +25,18 @@ package cc.iotkit.data.model; import cc.iotkit.common.tenant.dao.TenantAware; import cc.iotkit.common.tenant.entiry.BaseTenantEntity; +import cc.iotkit.common.tenant.listener.TenantListener; import cc.iotkit.model.notify.NotifyMessage; import io.github.linpeilie.annotations.AutoMapper; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.hibernate.annotations.Filter; +import org.hibernate.annotations.FilterDef; import org.hibernate.annotations.GenericGenerator; +import org.hibernate.annotations.ParamDef; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import javax.persistence.*; /** * @Author: 石恒 @@ -47,6 +48,9 @@ import javax.persistence.Table; @ApiModel(value = "通知消息") @Table(name = "notify_message") @AutoMapper(target= NotifyMessage.class) +@FilterDef(name = "tenantFilter", parameters = {@ParamDef(name = "tenantId", type = "long")}) +@Filter(name = "tenantFilter", condition = "tenant_id = :tenantId") +@EntityListeners(TenantListener.class) public class TbNotifyMessage extends BaseEntity implements TenantAware { @Id @GeneratedValue(generator = "SnowflakeIdGenerator") diff --git a/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbOauthClient.java b/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbOauthClient.java index 5d54d4f7..cd32dd4b 100644 --- a/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbOauthClient.java +++ b/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbOauthClient.java @@ -22,21 +22,25 @@ */ package cc.iotkit.data.model; +import cc.iotkit.common.tenant.listener.TenantListener; import cc.iotkit.model.OauthClient; import io.github.linpeilie.annotations.AutoMapper; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.hibernate.annotations.Filter; +import org.hibernate.annotations.FilterDef; import org.hibernate.annotations.GenericGenerator; +import org.hibernate.annotations.ParamDef; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import javax.persistence.*; @Data @Entity @Table(name = "oauth_client") @AutoMapper(target = OauthClient.class) +@FilterDef(name = "tenantFilter", parameters = {@ParamDef(name = "tenantId", type = "long")}) +@Filter(name = "tenantFilter", condition = "tenant_id = :tenantId") +@EntityListeners(TenantListener.class) public class TbOauthClient { @Id diff --git a/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbOtaDevice.java b/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbOtaDevice.java index 6d8ba4ab..67914b68 100644 --- a/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbOtaDevice.java +++ b/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbOtaDevice.java @@ -25,13 +25,14 @@ package cc.iotkit.data.model; import cc.iotkit.common.tenant.dao.TenantAware; import cc.iotkit.common.tenant.entiry.BaseTenantEntity; +import cc.iotkit.common.tenant.listener.TenantListener; import lombok.Data; +import org.hibernate.annotations.Filter; +import org.hibernate.annotations.FilterDef; import org.hibernate.annotations.GenericGenerator; +import org.hibernate.annotations.ParamDef; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import javax.persistence.*; /** * @Author: 石恒 @@ -41,6 +42,9 @@ import javax.persistence.Table; @Data @Entity @Table(name = "ota_device") +@FilterDef(name = "tenantFilter", parameters = {@ParamDef(name = "tenantId", type = "long")}) +@Filter(name = "tenantFilter", condition = "tenant_id = :tenantId") +@EntityListeners(TenantListener.class) public class TbOtaDevice extends BaseEntity implements TenantAware { @Id diff --git a/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbOtaPackage.java b/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbOtaPackage.java index 0c055a8a..a0efd308 100644 --- a/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbOtaPackage.java +++ b/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbOtaPackage.java @@ -25,10 +25,14 @@ package cc.iotkit.data.model; import cc.iotkit.common.tenant.dao.TenantAware; import cc.iotkit.common.tenant.entiry.BaseTenantEntity; +import cc.iotkit.common.tenant.listener.TenantListener; import cc.iotkit.model.ota.OtaPackage; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; +import org.hibernate.annotations.Filter; +import org.hibernate.annotations.FilterDef; import org.hibernate.annotations.GenericGenerator; +import org.hibernate.annotations.ParamDef; import javax.persistence.*; @@ -41,6 +45,9 @@ import javax.persistence.*; @Entity @Table(name = "ota_package") @AutoMapper(target = OtaPackage.class) +@FilterDef(name = "tenantFilter", parameters = {@ParamDef(name = "tenantId", type = "long")}) +@Filter(name = "tenantFilter", condition = "tenant_id = :tenantId") +@EntityListeners(TenantListener.class) public class TbOtaPackage extends BaseEntity implements TenantAware { @Id diff --git a/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbPluginInstance.java b/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbPluginInstance.java index f1d7f506..d81edac3 100644 --- a/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbPluginInstance.java +++ b/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbPluginInstance.java @@ -25,18 +25,19 @@ package cc.iotkit.data.model; import cc.iotkit.common.tenant.dao.TenantAware; import cc.iotkit.common.tenant.entiry.BaseTenantEntity; +import cc.iotkit.common.tenant.listener.TenantListener; import cc.iotkit.model.plugin.PluginInstance; 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.Filter; +import org.hibernate.annotations.FilterDef; import org.hibernate.annotations.GenericGenerator; +import org.hibernate.annotations.ParamDef; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import javax.persistence.*; @Data @EqualsAndHashCode(callSuper = true) @@ -44,6 +45,9 @@ import javax.persistence.Table; @ApiModel(value = "插件实例") @Table(name = "plugin_instance") @AutoMapper(target = PluginInstance.class) +@FilterDef(name = "tenantFilter", parameters = {@ParamDef(name = "tenantId", type = "long")}) +@Filter(name = "tenantFilter", condition = "tenant_id = :tenantId") +@EntityListeners(TenantListener.class) public class TbPluginInstance extends BaseEntity implements TenantAware { @Id diff --git a/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbProductModel.java b/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbProductModel.java index 6e1c6f34..3cb1c4a9 100644 --- a/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbProductModel.java +++ b/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbProductModel.java @@ -25,12 +25,16 @@ package cc.iotkit.data.model; import cc.iotkit.common.tenant.dao.TenantAware; import cc.iotkit.common.tenant.entiry.BaseTenantEntity; +import cc.iotkit.common.tenant.listener.TenantListener; import cc.iotkit.model.product.ProductModel; import io.github.linpeilie.annotations.AutoMapper; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.hibernate.annotations.Filter; +import org.hibernate.annotations.FilterDef; import org.hibernate.annotations.GenericGenerator; +import org.hibernate.annotations.ParamDef; import javax.persistence.*; @@ -39,6 +43,9 @@ import javax.persistence.*; @ApiModel(value = "产品型号") @Table(name = "product_model") @AutoMapper(target = ProductModel.class) +@FilterDef(name = "tenantFilter", parameters = {@ParamDef(name = "tenantId", type = "long")}) +@Filter(name = "tenantFilter", condition = "tenant_id = :tenantId") +@EntityListeners(TenantListener.class) public class TbProductModel extends BaseEntity implements TenantAware { @Id diff --git a/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbRuleInfo.java b/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbRuleInfo.java index e153eccd..f213c7b6 100644 --- a/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbRuleInfo.java +++ b/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbRuleInfo.java @@ -24,6 +24,7 @@ package cc.iotkit.data.model; import cc.iotkit.common.tenant.dao.TenantAware; import cc.iotkit.common.tenant.entiry.BaseTenantEntity; +import cc.iotkit.common.tenant.listener.TenantListener; import cc.iotkit.model.rule.RuleInfo; import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapping; @@ -31,7 +32,10 @@ import io.github.linpeilie.annotations.ReverseAutoMapping; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.hibernate.annotations.Filter; +import org.hibernate.annotations.FilterDef; import org.hibernate.annotations.GenericGenerator; +import org.hibernate.annotations.ParamDef; import javax.persistence.*; @@ -40,6 +44,9 @@ import javax.persistence.*; @Table(name = "rule_info") @ApiModel(value = "规则") @AutoMapper(target = RuleInfo.class) +@FilterDef(name = "tenantFilter", parameters = {@ParamDef(name = "tenantId", type = "long")}) +@Filter(name = "tenantFilter", condition = "tenant_id = :tenantId") +@EntityListeners(TenantListener.class) public class TbRuleInfo extends BaseEntity implements TenantAware { @Id diff --git a/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbScreen.java b/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbScreen.java index a86fdc47..3ec1c2d7 100644 --- a/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbScreen.java +++ b/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbScreen.java @@ -23,15 +23,16 @@ package cc.iotkit.data.model; +import cc.iotkit.common.tenant.listener.TenantListener; import cc.iotkit.model.screen.Screen; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; +import org.hibernate.annotations.Filter; +import org.hibernate.annotations.FilterDef; import org.hibernate.annotations.GenericGenerator; +import org.hibernate.annotations.ParamDef; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import javax.persistence.*; /** * @Author：tfd @@ -41,6 +42,9 @@ import javax.persistence.Table; @Entity @Table(name = "screen") @AutoMapper(target = Screen.class) +@FilterDef(name = "tenantFilter", parameters = {@ParamDef(name = "tenantId", type = "long")}) +@Filter(name = "tenantFilter", condition = "tenant_id = :tenantId") +@EntityListeners(TenantListener.class) public class TbScreen { @Id diff --git a/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbScreenApi.java b/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbScreenApi.java index d28de6b3..62f12a85 100644 --- a/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbScreenApi.java +++ b/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbScreenApi.java @@ -23,10 +23,14 @@ package cc.iotkit.data.model; +import cc.iotkit.common.tenant.listener.TenantListener; import cc.iotkit.model.screen.ScreenApi; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; +import org.hibernate.annotations.Filter; +import org.hibernate.annotations.FilterDef; import org.hibernate.annotations.GenericGenerator; +import org.hibernate.annotations.ParamDef; import javax.persistence.*; @@ -38,6 +42,9 @@ import javax.persistence.*; @Entity @Table(name = "screen_api") @AutoMapper(target = ScreenApi.class) +@FilterDef(name = "tenantFilter", parameters = {@ParamDef(name = "tenantId", type = "long")}) +@Filter(name = "tenantFilter", condition = "tenant_id = :tenantId") +@EntityListeners(TenantListener.class) public class TbScreenApi { @Id diff --git a/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysOss.java b/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysOss.java index acc398a4..17c3e9d8 100644 --- a/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysOss.java +++ b/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysOss.java @@ -25,18 +25,19 @@ package cc.iotkit.data.model; import cc.iotkit.common.tenant.dao.TenantAware; import cc.iotkit.common.tenant.entiry.BaseTenantEntity; +import cc.iotkit.common.tenant.listener.TenantListener; import cc.iotkit.model.system.SysOss; 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.Filter; +import org.hibernate.annotations.FilterDef; import org.hibernate.annotations.GenericGenerator; +import org.hibernate.annotations.ParamDef; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import javax.persistence.*; /** * OSS对象存储对象 @@ -49,6 +50,9 @@ import javax.persistence.Table; @Table(name = "sys_oss") @ApiModel(value = "OSS对象存储对象") @AutoMapper(target = SysOss.class) +@FilterDef(name = "tenantFilter", parameters = {@ParamDef(name = "tenantId", type = "long")}) +@Filter(name = "tenantFilter", condition = "tenant_id = :tenantId") +@EntityListeners(TenantListener.class) public class TbSysOss extends BaseEntity implements TenantAware { /** diff --git a/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysRoleDept.java b/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysRoleDept.java index c5c45e6f..5750c26c 100644 --- a/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysRoleDept.java +++ b/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysRoleDept.java @@ -25,16 +25,17 @@ package cc.iotkit.data.model; import cc.iotkit.common.tenant.dao.TenantAware; import cc.iotkit.common.tenant.entiry.BaseTenantEntity; +import cc.iotkit.common.tenant.listener.TenantListener; import cc.iotkit.model.system.SysRoleDept; import io.github.linpeilie.annotations.AutoMapper; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.hibernate.annotations.Filter; +import org.hibernate.annotations.FilterDef; import org.hibernate.annotations.GenericGenerator; +import org.hibernate.annotations.ParamDef; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import javax.persistence.*; /** * 角色和部门关联 sys_role_dept @@ -46,6 +47,9 @@ import javax.persistence.Table; @Entity @Table(name = "sys_role_dept") @AutoMapper(target = SysRoleDept.class) +@FilterDef(name = "tenantFilter", parameters = {@ParamDef(name = "tenantId", type = "long")}) +@Filter(name = "tenantFilter", condition = "tenant_id = :tenantId") +@EntityListeners(TenantListener.class) public class TbSysRoleDept extends BaseEntity implements TenantAware { @Id diff --git a/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysRoleMenu.java b/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysRoleMenu.java index cd626f2b..61b350e0 100644 --- a/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysRoleMenu.java +++ b/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysRoleMenu.java @@ -25,16 +25,17 @@ package cc.iotkit.data.model; import cc.iotkit.common.tenant.dao.TenantAware; import cc.iotkit.common.tenant.entiry.BaseTenantEntity; +import cc.iotkit.common.tenant.listener.TenantListener; import cc.iotkit.model.system.SysRoleMenu; import io.github.linpeilie.annotations.AutoMapper; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.hibernate.annotations.Filter; +import org.hibernate.annotations.FilterDef; import org.hibernate.annotations.GenericGenerator; +import org.hibernate.annotations.ParamDef; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import javax.persistence.*; /** * 角色和菜单关联 sys_role_menu @@ -46,6 +47,9 @@ import javax.persistence.Table; @Entity @Table(name = "sys_role_menu") @AutoMapper(target = SysRoleMenu.class) +@FilterDef(name = "tenantFilter", parameters = {@ParamDef(name = "tenantId", type = "long")}) +@Filter(name = "tenantFilter", condition = "tenant_id = :tenantId") +@EntityListeners(TenantListener.class) public class TbSysRoleMenu extends BaseEntity implements TenantAware { @Id diff --git a/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysUserPost.java b/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysUserPost.java index 1edd18b3..9ce9caaa 100644 --- a/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysUserPost.java +++ b/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysUserPost.java @@ -25,15 +25,16 @@ package cc.iotkit.data.model; import cc.iotkit.common.tenant.dao.TenantAware; import cc.iotkit.common.tenant.entiry.BaseTenantEntity; +import cc.iotkit.common.tenant.listener.TenantListener; import io.github.linpeilie.annotations.AutoMapper; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.hibernate.annotations.Filter; +import org.hibernate.annotations.FilterDef; import org.hibernate.annotations.GenericGenerator; +import org.hibernate.annotations.ParamDef; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import javax.persistence.*; /** * 用户和岗位关联 sys_user_post @@ -45,6 +46,9 @@ import javax.persistence.Table; @Entity @Table(name = "sys_user_post") @AutoMapper(target = cc.iotkit.model.system.SysUserPost.class) +@FilterDef(name = "tenantFilter", parameters = {@ParamDef(name = "tenantId", type = "long")}) +@Filter(name = "tenantFilter", condition = "tenant_id = :tenantId") +@EntityListeners(TenantListener.class) public class TbSysUserPost extends BaseEntity implements TenantAware { @Id diff --git a/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysUserRole.java b/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysUserRole.java index 6895fd22..40af0bfa 100644 --- a/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysUserRole.java +++ b/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysUserRole.java @@ -25,15 +25,16 @@ package cc.iotkit.data.model; import cc.iotkit.common.tenant.dao.TenantAware; import cc.iotkit.common.tenant.entiry.BaseTenantEntity; +import cc.iotkit.common.tenant.listener.TenantListener; import io.github.linpeilie.annotations.AutoMapper; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.hibernate.annotations.Filter; +import org.hibernate.annotations.FilterDef; import org.hibernate.annotations.GenericGenerator; +import org.hibernate.annotations.ParamDef; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import javax.persistence.*; /** * 用户和角色关联 sys_user_role @@ -45,6 +46,9 @@ import javax.persistence.Table; @Entity @Table(name = "sys_user_role") @AutoMapper(target = cc.iotkit.model.system.SysUserRole.class) +@FilterDef(name = "tenantFilter", parameters = {@ParamDef(name = "tenantId", type = "long")}) +@Filter(name = "tenantFilter", condition = "tenant_id = :tenantId") +@EntityListeners(TenantListener.class) public class TbSysUserRole extends BaseEntity implements TenantAware { @Id diff --git a/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbTaskInfo.java b/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbTaskInfo.java index 57500b0e..11db4c29 100644 --- a/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbTaskInfo.java +++ b/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbTaskInfo.java @@ -24,13 +24,17 @@ package cc.iotkit.data.model; import cc.iotkit.common.tenant.dao.TenantAware; import cc.iotkit.common.tenant.entiry.BaseTenantEntity; +import cc.iotkit.common.tenant.listener.TenantListener; import cc.iotkit.model.rule.TaskInfo; import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapping; import io.github.linpeilie.annotations.ReverseAutoMapping; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.hibernate.annotations.Filter; +import org.hibernate.annotations.FilterDef; import org.hibernate.annotations.GenericGenerator; +import org.hibernate.annotations.ParamDef; import javax.persistence.*; @@ -38,6 +42,9 @@ import javax.persistence.*; @Entity @Table(name = "task_info") @AutoMapper(target = TaskInfo.class) +@FilterDef(name = "tenantFilter", parameters = {@ParamDef(name = "tenantId", type = "long")}) +@Filter(name = "tenantFilter", condition = "tenant_id = :tenantId") +@EntityListeners(TenantListener.class) public class TbTaskInfo extends BaseEntity implements TenantAware { @Id diff --git a/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbThingModel.java b/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbThingModel.java index 2c4918a3..4e839e5e 100644 --- a/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbThingModel.java +++ b/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbThingModel.java @@ -24,13 +24,17 @@ package cc.iotkit.data.model; import cc.iotkit.common.tenant.dao.TenantAware; import cc.iotkit.common.tenant.entiry.BaseTenantEntity; +import cc.iotkit.common.tenant.listener.TenantListener; import cc.iotkit.model.product.ThingModel; import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapping; import io.github.linpeilie.annotations.ReverseAutoMapping; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.hibernate.annotations.Filter; +import org.hibernate.annotations.FilterDef; import org.hibernate.annotations.GenericGenerator; +import org.hibernate.annotations.ParamDef; import javax.persistence.*; @@ -38,6 +42,9 @@ import javax.persistence.*; @Entity @Table(name = "thing_model") @AutoMapper(target = ThingModel.class) +@FilterDef(name = "tenantFilter", parameters = {@ParamDef(name = "tenantId", type = "long")}) +@Filter(name = "tenantFilter", condition = "tenant_id = :tenantId") +@EntityListeners(TenantListener.class) public class TbThingModel extends BaseEntity implements TenantAware { @Id diff --git a/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbVirtualDevice.java b/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbVirtualDevice.java index a29be375..6c751f11 100644 --- a/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbVirtualDevice.java +++ b/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbVirtualDevice.java @@ -24,11 +24,15 @@ package cc.iotkit.data.model; import cc.iotkit.common.tenant.dao.TenantAware; import cc.iotkit.common.tenant.entiry.BaseTenantEntity; +import cc.iotkit.common.tenant.listener.TenantListener; import cc.iotkit.model.device.VirtualDevice; import io.github.linpeilie.annotations.AutoMapper; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.hibernate.annotations.Filter; +import org.hibernate.annotations.FilterDef; import org.hibernate.annotations.GenericGenerator; +import org.hibernate.annotations.ParamDef; import javax.persistence.*; @@ -36,6 +40,9 @@ import javax.persistence.*; @Entity @Table(name = "virtual_device") @AutoMapper(target = VirtualDevice.class) +@FilterDef(name = "tenantFilter", parameters = {@ParamDef(name = "tenantId", type = "long")}) +@Filter(name = "tenantFilter", condition = "tenant_id = :tenantId") +@EntityListeners(TenantListener.class) public class TbVirtualDevice extends BaseEntity implements TenantAware { @Id diff --git a/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbVirtualDeviceMapping.java b/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbVirtualDeviceMapping.java index 86b0d82c..9700b259 100644 --- a/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbVirtualDeviceMapping.java +++ b/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbVirtualDeviceMapping.java @@ -24,22 +24,26 @@ package cc.iotkit.data.model; import cc.iotkit.common.tenant.dao.TenantAware; import cc.iotkit.common.tenant.entiry.BaseTenantEntity; +import cc.iotkit.common.tenant.listener.TenantListener; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import org.hibernate.annotations.Filter; +import org.hibernate.annotations.FilterDef; import org.hibernate.annotations.GenericGenerator; +import org.hibernate.annotations.ParamDef; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import javax.persistence.*; @Data @NoArgsConstructor @AllArgsConstructor @Entity @Table(name = "virtual_device_mapping") +@FilterDef(name = "tenantFilter", parameters = {@ParamDef(name = "tenantId", type = "long")}) +@Filter(name = "tenantFilter", condition = "tenant_id = :tenantId") +@EntityListeners(TenantListener.class) public class TbVirtualDeviceMapping extends BaseEntity implements TenantAware { @Id