From 40af1e6f518b24fb7d67ffa242e0b827a4c83ebb Mon Sep 17 00:00:00 2001 From: jay <75509151@qq.com> Date: Wed, 12 Jun 2024 20:54:48 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E5=8F=82=E6=95=B0=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E4=B8=8D=E7=94=9F=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- iot-dao/iot-data-serviceImpl-rdb/pom.xml | 4 ---- .../java/cc/iotkit/data/model/TbIcon.java | 4 ++-- .../java/cc/iotkit/data/model/TbIconType.java | 4 ++-- .../java/cc/iotkit/data/model/TbProduct.java | 3 +-- .../cc/iotkit/generator/domain/GenTable.java | 4 ++-- .../generator/domain/GenTableColumn.java | 2 +- .../generator/dto/bo/ImportTableBo.java | 2 +- .../src/main/resources/vm/java/bo.java.vm | 2 +- .../manager/controller/OtaController.java | 2 +- .../iotkit/manager/dto/bo/ChangeStateBo.java | 4 ++-- .../manager/dto/bo/category/CategoryBo.java | 2 +- .../dto/bo/device/DeviceConsumerBo.java | 2 +- .../manager/dto/bo/device/DeviceInfoBo.java | 4 +++- .../manager/dto/bo/device/DeviceQueryBo.java | 2 +- .../dto/bo/device/DeviceQueryByPkDnBo.java | 2 +- .../dto/bo/device/DeviceSaveScriptBo.java | 2 +- .../bo/device/GetDeviceServicePorpertyBo.java | 2 +- .../dto/bo/device/ServiceInvokeBo.java | 2 +- .../bo/device/SetDeviceServicePorpertyBo.java | 2 +- .../bo/deviceconfig/DeviceConfigAddBo.java | 2 +- .../dto/bo/deviceconfig/DeviceConfigBo.java | 2 +- .../dto/bo/devicegroup/DeviceGroupBo.java | 4 ++-- .../manager/dto/bo/plugin/PluginInfoBo.java | 2 +- .../iotkit/manager/dto/bo/product/IconBo.java | 2 +- .../manager/dto/bo/product/ProductBo.java | 6 +++--- .../dto/bo/productmodel/ProductModelBo.java | 2 +- .../manager/dto/bo/ruleinfo/RuleInfoBo.java | 2 +- .../manager/dto/bo/screen/DebugChangeBo.java | 2 +- .../dto/bo/screen/PublishChangeBo.java | 4 ++-- .../manager/dto/bo/taskinfo/TaskInfoBo.java | 2 +- .../dto/bo/thingmodel/ThingModelBo.java | 2 +- .../bo/thingmodel/ThingModelMessageBo.java | 2 +- .../virtualdevice/VirtualSaveDevicesBo.java | 2 +- .../dto/bo/modbus/ModbusThingModelBo.java | 4 ++-- .../cc/iotkit/modbus/model/TbModbusInfo.java | 20 ++++++++++++++----- .../modbus/model/TbModbusThingModel.java | 13 +++++++++++- .../iotkit/openapi/dto/bo/TokenVerifyBo.java | 6 ++++-- .../dto/bo/device/OpenapiDeviceBo.java | 2 +- .../OpenapiSetDeviceServicePropertyBo.java | 2 +- .../controller/SysTenantController.java | 2 +- .../SysTenantPackageController.java | 4 ++-- .../java/cc/iotkit/system/dto/LoginBody.java | 8 +++++--- .../cc/iotkit/system/dto/bo/SysAppBo.java | 2 +- .../cc/iotkit/system/dto/bo/SysConfigBo.java | 6 +++--- .../cc/iotkit/system/dto/bo/SysDeptBo.java | 8 ++++---- .../iotkit/system/dto/bo/SysDictDataBo.java | 6 +++--- .../iotkit/system/dto/bo/SysDictTypeBo.java | 8 ++++---- .../cc/iotkit/system/dto/bo/SysMenuBo.java | 6 +++--- .../cc/iotkit/system/dto/bo/SysNoticeBo.java | 6 +++--- .../iotkit/system/dto/bo/SysOssConfigBo.java | 6 +++--- .../cc/iotkit/system/dto/bo/SysPostBo.java | 6 +++--- .../iotkit/system/dto/bo/SysRoleAuthBo.java | 2 +- .../cc/iotkit/system/dto/bo/SysRoleBo.java | 6 +++--- .../cc/iotkit/system/dto/bo/SysTenantBo.java | 4 ++-- .../system/dto/bo/SysTenantPackageBo.java | 4 ++-- .../cc/iotkit/system/dto/bo/SysUserBo.java | 8 ++++---- .../system/dto/bo/SysUserProfileBo.java | 4 ++-- .../iotkit/system/dto/bo/SysUserRolesBo.java | 4 ++-- .../cc/iotkit/system/dto/bo/XcxLoginBo.java | 5 ++++- pom.xml | 6 ------ 60 files changed, 132 insertions(+), 113 deletions(-) diff --git a/iot-dao/iot-data-serviceImpl-rdb/pom.xml b/iot-dao/iot-data-serviceImpl-rdb/pom.xml index 346b1e3b..806d0861 100644 --- a/iot-dao/iot-data-serviceImpl-rdb/pom.xml +++ b/iot-dao/iot-data-serviceImpl-rdb/pom.xml @@ -85,10 +85,6 @@ spring-data-commons - - javax.validation - validation-api - com.github.biyanwen 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 028c5fee..cfcfe0ab 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 @@ -28,7 +28,7 @@ import cc.iotkit.model.product.Icon; import io.github.linpeilie.annotations.AutoMapper; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import jakarta.validation.constraints.Size; +import javax.validation.constraints.Size; import lombok.Data; import org.hibernate.annotations.Filter; import org.hibernate.annotations.FilterDef; @@ -53,7 +53,7 @@ public class TbIcon extends BaseEntity implements TenantAware { @ApiModelProperty(value = "iconId") private Long id; - @Size(max = 30) + @Column(name = "tenant_id") private String tenantId; diff --git a/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbIconType.java b/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbIconType.java index f7402b0c..75240394 100644 --- a/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbIconType.java +++ b/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbIconType.java @@ -28,7 +28,7 @@ import cc.iotkit.model.product.IconType; import io.github.linpeilie.annotations.AutoMapper; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import jakarta.validation.constraints.Size; +import javax.validation.constraints.Size; import lombok.Data; import org.hibernate.annotations.Filter; import org.hibernate.annotations.FilterDef; @@ -53,7 +53,7 @@ public class TbIconType extends BaseEntity implements TenantAware { @ApiModelProperty(value = "主键id") private Long id; - @Size(max = 30) + @Column(name = "tenant_id") private String tenantId; diff --git a/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbProduct.java b/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbProduct.java index be91c0cb..ed2d8b36 100644 --- a/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbProduct.java +++ b/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbProduct.java @@ -28,7 +28,6 @@ import cc.iotkit.model.product.Product; import io.github.linpeilie.annotations.AutoMapper; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import jakarta.validation.constraints.Size; import lombok.Data; import org.hibernate.annotations.Filter; import org.hibernate.annotations.FilterDef; @@ -53,7 +52,7 @@ public class TbProduct implements TenantAware { @ApiModelProperty(value = "产品id") private Long id; - @Size(max = 30) + @Column(name = "tenant_id") private String tenantId; diff --git a/iot-module/iot-generator/src/main/java/cc/iotkit/generator/domain/GenTable.java b/iot-module/iot-generator/src/main/java/cc/iotkit/generator/domain/GenTable.java index 16c1a903..ec1e52be 100644 --- a/iot-module/iot-generator/src/main/java/cc/iotkit/generator/domain/GenTable.java +++ b/iot-module/iot-generator/src/main/java/cc/iotkit/generator/domain/GenTable.java @@ -7,8 +7,8 @@ import com.baomidou.mybatisplus.annotation.FieldStrategy; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import jakarta.validation.Valid; -import jakarta.validation.constraints.NotBlank; +import javax.validation.Valid; +import org.hibernate.validator.constraints.NotBlank; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/iot-module/iot-generator/src/main/java/cc/iotkit/generator/domain/GenTableColumn.java b/iot-module/iot-generator/src/main/java/cc/iotkit/generator/domain/GenTableColumn.java index 6535f28f..83ee8c58 100644 --- a/iot-module/iot-generator/src/main/java/cc/iotkit/generator/domain/GenTableColumn.java +++ b/iot-module/iot-generator/src/main/java/cc/iotkit/generator/domain/GenTableColumn.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.annotation.FieldStrategy; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import jakarta.validation.constraints.NotBlank; +import org.hibernate.validator.constraints.NotBlank; import lombok.Data; import lombok.EqualsAndHashCode; import org.apache.ibatis.type.JdbcType; diff --git a/iot-module/iot-generator/src/main/java/cc/iotkit/generator/dto/bo/ImportTableBo.java b/iot-module/iot-generator/src/main/java/cc/iotkit/generator/dto/bo/ImportTableBo.java index 19544e38..daa156fb 100644 --- a/iot-module/iot-generator/src/main/java/cc/iotkit/generator/dto/bo/ImportTableBo.java +++ b/iot-module/iot-generator/src/main/java/cc/iotkit/generator/dto/bo/ImportTableBo.java @@ -2,7 +2,7 @@ package cc.iotkit.generator.dto.bo; import cc.iotkit.common.api.BaseDto; import io.swagger.annotations.ApiModelProperty; -import jakarta.validation.constraints.NotEmpty; +import javax.validation.constraints.NotEmpty; import lombok.Data; import java.util.List; diff --git a/iot-module/iot-generator/src/main/resources/vm/java/bo.java.vm b/iot-module/iot-generator/src/main/resources/vm/java/bo.java.vm index 400b821a..291858cf 100644 --- a/iot-module/iot-generator/src/main/resources/vm/java/bo.java.vm +++ b/iot-module/iot-generator/src/main/resources/vm/java/bo.java.vm @@ -8,7 +8,7 @@ import io.github.linpeilie.annotations.AutoMapper; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import jakarta.validation.constraints.*; +import javax.validation.constraints.*; #foreach ($import in $importList) import ${import}; #end diff --git a/iot-module/iot-manager/src/main/java/cc/iotkit/manager/controller/OtaController.java b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/controller/OtaController.java index ef0d165d..e3893316 100644 --- a/iot-module/iot-manager/src/main/java/cc/iotkit/manager/controller/OtaController.java +++ b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/controller/OtaController.java @@ -41,7 +41,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.util.ObjectUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import jakarta.validation.Valid; +import javax.validation.Valid; import lombok.extern.slf4j.Slf4j; import org.springframework.http.MediaType; import org.springframework.validation.annotation.Validated; diff --git a/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/ChangeStateBo.java b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/ChangeStateBo.java index a9dab542..2b28667a 100644 --- a/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/ChangeStateBo.java +++ b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/ChangeStateBo.java @@ -26,8 +26,8 @@ package cc.iotkit.manager.dto.bo; import cc.iotkit.common.api.BaseDto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.Size; +import org.hibernate.validator.constraints.NotBlank; +import javax.validation.constraints.Size; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/category/CategoryBo.java b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/category/CategoryBo.java index 6a0f2ece..edaf893c 100644 --- a/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/category/CategoryBo.java +++ b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/category/CategoryBo.java @@ -28,7 +28,7 @@ import cc.iotkit.model.product.Category; import io.github.linpeilie.annotations.AutoMapper; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import jakarta.validation.constraints.Size; +import javax.validation.constraints.Size; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/device/DeviceConsumerBo.java b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/device/DeviceConsumerBo.java index aae077de..fd41d919 100644 --- a/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/device/DeviceConsumerBo.java +++ b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/device/DeviceConsumerBo.java @@ -26,7 +26,7 @@ package cc.iotkit.manager.dto.bo.device; import cc.iotkit.common.api.BaseDto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import jakarta.validation.constraints.NotBlank; +import org.hibernate.validator.constraints.NotBlank; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/device/DeviceInfoBo.java b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/device/DeviceInfoBo.java index 4310f86a..e482a3b9 100644 --- a/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/device/DeviceInfoBo.java +++ b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/device/DeviceInfoBo.java @@ -30,7 +30,8 @@ import io.github.linpeilie.annotations.AutoMapping; import io.github.linpeilie.annotations.ReverseAutoMapping; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import jakarta.validation.constraints.Size; +import org.hibernate.validator.constraints.NotBlank; +import javax.validation.constraints.Size; import lombok.Data; import lombok.EqualsAndHashCode; @@ -72,6 +73,7 @@ public class DeviceInfoBo extends BaseDto { @ApiModelProperty(value = "产品key") @Size(max = 255, message = "产品key长度不正确") + @NotBlank(message = "产品Key不能为空") private String productKey; @ApiModelProperty(value = "设备描述") diff --git a/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/device/DeviceQueryBo.java b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/device/DeviceQueryBo.java index 975c36d6..2969a3f3 100644 --- a/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/device/DeviceQueryBo.java +++ b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/device/DeviceQueryBo.java @@ -29,7 +29,7 @@ import io.github.linpeilie.annotations.AutoMapping; import io.github.linpeilie.annotations.ReverseAutoMapping; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import jakarta.validation.constraints.Size; +import javax.validation.constraints.Size; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/device/DeviceQueryByPkDnBo.java b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/device/DeviceQueryByPkDnBo.java index b97c32e9..88a40344 100644 --- a/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/device/DeviceQueryByPkDnBo.java +++ b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/device/DeviceQueryByPkDnBo.java @@ -26,7 +26,7 @@ package cc.iotkit.manager.dto.bo.device; import cc.iotkit.common.api.BaseDto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import jakarta.validation.constraints.NotBlank; +import org.hibernate.validator.constraints.NotBlank; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/device/DeviceSaveScriptBo.java b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/device/DeviceSaveScriptBo.java index 1b1f94af..ced0ada5 100644 --- a/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/device/DeviceSaveScriptBo.java +++ b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/device/DeviceSaveScriptBo.java @@ -26,7 +26,7 @@ package cc.iotkit.manager.dto.bo.device; import cc.iotkit.common.api.BaseDto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import jakarta.validation.constraints.NotBlank; +import org.hibernate.validator.constraints.NotBlank; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/device/GetDeviceServicePorpertyBo.java b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/device/GetDeviceServicePorpertyBo.java index 35c841b3..daf1f352 100644 --- a/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/device/GetDeviceServicePorpertyBo.java +++ b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/device/GetDeviceServicePorpertyBo.java @@ -25,7 +25,7 @@ package cc.iotkit.manager.dto.bo.device; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import jakarta.validation.constraints.NotBlank; +import org.hibernate.validator.constraints.NotBlank; import lombok.Data; import java.util.List; diff --git a/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/device/ServiceInvokeBo.java b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/device/ServiceInvokeBo.java index d2139e9c..a4b33176 100644 --- a/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/device/ServiceInvokeBo.java +++ b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/device/ServiceInvokeBo.java @@ -25,7 +25,7 @@ package cc.iotkit.manager.dto.bo.device; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import jakarta.validation.constraints.NotBlank; +import org.hibernate.validator.constraints.NotBlank; import lombok.Data; import java.util.Map; diff --git a/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/device/SetDeviceServicePorpertyBo.java b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/device/SetDeviceServicePorpertyBo.java index d6eb4fda..bedb7275 100644 --- a/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/device/SetDeviceServicePorpertyBo.java +++ b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/device/SetDeviceServicePorpertyBo.java @@ -25,7 +25,7 @@ package cc.iotkit.manager.dto.bo.device; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import jakarta.validation.constraints.NotBlank; +import org.hibernate.validator.constraints.NotBlank; import lombok.Data; import java.util.Map; diff --git a/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/deviceconfig/DeviceConfigAddBo.java b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/deviceconfig/DeviceConfigAddBo.java index cb444bc2..3bfce3d5 100644 --- a/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/deviceconfig/DeviceConfigAddBo.java +++ b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/deviceconfig/DeviceConfigAddBo.java @@ -28,7 +28,7 @@ import cc.iotkit.model.device.DeviceConfig; import io.github.linpeilie.annotations.AutoMapper; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import jakarta.validation.constraints.Size; +import javax.validation.constraints.Size; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/deviceconfig/DeviceConfigBo.java b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/deviceconfig/DeviceConfigBo.java index 749f9f77..5bc25a45 100644 --- a/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/deviceconfig/DeviceConfigBo.java +++ b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/deviceconfig/DeviceConfigBo.java @@ -28,7 +28,7 @@ import cc.iotkit.model.device.DeviceConfig; import io.github.linpeilie.annotations.AutoMapper; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import jakarta.validation.constraints.Size; +import javax.validation.constraints.Size; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/devicegroup/DeviceGroupBo.java b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/devicegroup/DeviceGroupBo.java index e525b7eb..668d96df 100644 --- a/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/devicegroup/DeviceGroupBo.java +++ b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/devicegroup/DeviceGroupBo.java @@ -28,8 +28,8 @@ import cc.iotkit.model.device.DeviceGroup; import io.github.linpeilie.annotations.AutoMapper; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Size; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/plugin/PluginInfoBo.java b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/plugin/PluginInfoBo.java index 3bfa07e9..50833828 100644 --- a/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/plugin/PluginInfoBo.java +++ b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/plugin/PluginInfoBo.java @@ -28,7 +28,7 @@ import cc.iotkit.common.validate.AddGroup; import cc.iotkit.common.validate.EditGroup; import cc.iotkit.model.plugin.PluginInfo; import io.github.linpeilie.annotations.AutoMapper; -import jakarta.validation.constraints.NotNull; +import javax.validation.constraints.NotNull; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/product/IconBo.java b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/product/IconBo.java index 0f3ae045..b03d0f9c 100644 --- a/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/product/IconBo.java +++ b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/product/IconBo.java @@ -28,7 +28,7 @@ import cc.iotkit.model.product.Icon; import io.github.linpeilie.annotations.AutoMapper; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import jakarta.validation.constraints.Size; +import javax.validation.constraints.Size; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/product/ProductBo.java b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/product/ProductBo.java index d6a6858d..bfdcbb94 100644 --- a/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/product/ProductBo.java +++ b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/product/ProductBo.java @@ -28,9 +28,9 @@ import cc.iotkit.model.product.Product; import io.github.linpeilie.annotations.AutoMapper; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import jakarta.validation.constraints.Min; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.Size; +import javax.validation.constraints.Min; +import org.hibernate.validator.constraints.NotBlank; +import javax.validation.constraints.Size; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/productmodel/ProductModelBo.java b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/productmodel/ProductModelBo.java index 8f2c22ee..e9ef843e 100644 --- a/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/productmodel/ProductModelBo.java +++ b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/productmodel/ProductModelBo.java @@ -28,7 +28,7 @@ import cc.iotkit.model.product.ProductModel; import io.github.linpeilie.annotations.AutoMapper; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import jakarta.validation.constraints.Size; +import javax.validation.constraints.Size; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/ruleinfo/RuleInfoBo.java b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/ruleinfo/RuleInfoBo.java index 7efb32c9..f3470290 100644 --- a/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/ruleinfo/RuleInfoBo.java +++ b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/ruleinfo/RuleInfoBo.java @@ -30,7 +30,7 @@ import cc.iotkit.model.rule.RuleInfo; import io.github.linpeilie.annotations.AutoMapper; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import jakarta.validation.constraints.Size; +import javax.validation.constraints.Size; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/screen/DebugChangeBo.java b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/screen/DebugChangeBo.java index 2df33b91..d7d0d7c9 100644 --- a/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/screen/DebugChangeBo.java +++ b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/screen/DebugChangeBo.java @@ -24,7 +24,7 @@ package cc.iotkit.manager.dto.bo.screen; import io.swagger.annotations.ApiModelProperty; -import jakarta.validation.constraints.NotBlank; +import org.hibernate.validator.constraints.NotBlank; import lombok.Data; /** diff --git a/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/screen/PublishChangeBo.java b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/screen/PublishChangeBo.java index 678e9ac8..66cf70ff 100644 --- a/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/screen/PublishChangeBo.java +++ b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/screen/PublishChangeBo.java @@ -26,8 +26,8 @@ package cc.iotkit.manager.dto.bo.screen; import cc.iotkit.common.api.BaseDto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.Size; +import org.hibernate.validator.constraints.NotBlank; +import javax.validation.constraints.Size; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/taskinfo/TaskInfoBo.java b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/taskinfo/TaskInfoBo.java index d9143d4d..8a8addb3 100644 --- a/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/taskinfo/TaskInfoBo.java +++ b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/taskinfo/TaskInfoBo.java @@ -29,7 +29,7 @@ import cc.iotkit.model.rule.TaskInfo; import io.github.linpeilie.annotations.AutoMapper; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import jakarta.validation.constraints.Size; +import javax.validation.constraints.Size; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/thingmodel/ThingModelBo.java b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/thingmodel/ThingModelBo.java index 8fe0f6d5..4cd891be 100644 --- a/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/thingmodel/ThingModelBo.java +++ b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/thingmodel/ThingModelBo.java @@ -30,7 +30,7 @@ import io.github.linpeilie.annotations.AutoMapping; import io.github.linpeilie.annotations.ReverseAutoMapping; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import jakarta.validation.constraints.Size; +import javax.validation.constraints.Size; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/thingmodel/ThingModelMessageBo.java b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/thingmodel/ThingModelMessageBo.java index 4c805346..05df09e1 100644 --- a/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/thingmodel/ThingModelMessageBo.java +++ b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/thingmodel/ThingModelMessageBo.java @@ -25,7 +25,7 @@ package cc.iotkit.manager.dto.bo.thingmodel; import cc.iotkit.common.api.BaseDto; import cc.iotkit.common.thing.ThingModelMessage; import io.github.linpeilie.annotations.AutoMapper; -import jakarta.validation.constraints.NotNull; +import javax.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/virtualdevice/VirtualSaveDevicesBo.java b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/virtualdevice/VirtualSaveDevicesBo.java index 0fd93f60..076abaf9 100644 --- a/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/virtualdevice/VirtualSaveDevicesBo.java +++ b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/virtualdevice/VirtualSaveDevicesBo.java @@ -26,7 +26,7 @@ package cc.iotkit.manager.dto.bo.virtualdevice; import cc.iotkit.common.api.BaseDto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import jakarta.validation.constraints.NotBlank; +import org.hibernate.validator.constraints.NotBlank; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/iot-module/iot-modbus/src/main/java/cc/iotkit/modbus/dto/bo/modbus/ModbusThingModelBo.java b/iot-module/iot-modbus/src/main/java/cc/iotkit/modbus/dto/bo/modbus/ModbusThingModelBo.java index a7721585..2e9c1d1a 100644 --- a/iot-module/iot-modbus/src/main/java/cc/iotkit/modbus/dto/bo/modbus/ModbusThingModelBo.java +++ b/iot-module/iot-modbus/src/main/java/cc/iotkit/modbus/dto/bo/modbus/ModbusThingModelBo.java @@ -7,8 +7,8 @@ import io.github.linpeilie.annotations.AutoMapping; import io.github.linpeilie.annotations.ReverseAutoMapping; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.Size; +import org.hibernate.validator.constraints.NotBlank; +import javax.validation.constraints.Size; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/iot-module/iot-modbus/src/main/java/cc/iotkit/modbus/model/TbModbusInfo.java b/iot-module/iot-modbus/src/main/java/cc/iotkit/modbus/model/TbModbusInfo.java index 038e2e8f..c0d2d39d 100644 --- a/iot-module/iot-modbus/src/main/java/cc/iotkit/modbus/model/TbModbusInfo.java +++ b/iot-module/iot-modbus/src/main/java/cc/iotkit/modbus/model/TbModbusInfo.java @@ -1,16 +1,19 @@ package cc.iotkit.modbus.model; +import cc.iotkit.common.tenant.dao.TenantAware; +import cc.iotkit.common.tenant.listener.TenantListener; import cc.iotkit.model.modbus.ModbusInfo; import io.github.linpeilie.annotations.AutoMapper; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import javax.validation.constraints.Size; 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.*; /** * @Description: modbus点表信息 @@ -22,7 +25,10 @@ import javax.persistence.Table; @Table(name = "modbus_info") @ApiModel(value = "modbus点表信息") @AutoMapper(target = ModbusInfo.class) -public class TbModbusInfo { +@EntityListeners(TenantListener.class) +@FilterDef(name = "tenantFilter", parameters = {@ParamDef(name = "tenantId", type = "long")}) +@Filter(name = "tenantFilter", condition = "tenant_id = :tenantId") +public class TbModbusInfo implements TenantAware { @Id @GeneratedValue(generator = "SnowflakeIdGenerator") @GenericGenerator(name = "SnowflakeIdGenerator", strategy = "cc.iotkit.data.config.id.SnowflakeIdGenerator") @@ -58,4 +64,8 @@ public class TbModbusInfo { */ @ApiModelProperty(value = "创建时间") private Long updateAt; + + + @Column(name = "tenant_id") + private Long tenantId; } diff --git a/iot-module/iot-modbus/src/main/java/cc/iotkit/modbus/model/TbModbusThingModel.java b/iot-module/iot-modbus/src/main/java/cc/iotkit/modbus/model/TbModbusThingModel.java index 14b05d4f..da864d3d 100644 --- a/iot-module/iot-modbus/src/main/java/cc/iotkit/modbus/model/TbModbusThingModel.java +++ b/iot-module/iot-modbus/src/main/java/cc/iotkit/modbus/model/TbModbusThingModel.java @@ -9,14 +9,20 @@ */ package cc.iotkit.modbus.model; +import cc.iotkit.common.tenant.dao.TenantAware; +import cc.iotkit.common.tenant.listener.TenantListener; import cc.iotkit.model.modbus.ModbusThingModel; import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapping; import io.github.linpeilie.annotations.ReverseAutoMapping; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import javax.validation.constraints.Size; 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.*; @@ -30,7 +36,10 @@ import javax.persistence.*; @Table(name = "modbus_thing_model") @ApiModel(value = "modbus物模型") @AutoMapper(target = ModbusThingModel.class) -public class TbModbusThingModel { +@EntityListeners(TenantListener.class) +@FilterDef(name = "tenantFilter", parameters = {@ParamDef(name = "tenantId", type = "long")}) +@Filter(name = "tenantFilter", condition = "tenant_id = :tenantId") +public class TbModbusThingModel implements TenantAware { @Id @GeneratedValue(generator = "SnowflakeIdGenerator") @GenericGenerator(name = "SnowflakeIdGenerator", strategy = "cc.iotkit.data.config.id.SnowflakeIdGenerator") @@ -49,4 +58,6 @@ public class TbModbusThingModel { @ApiModelProperty(value = "更新时间") private Long updateAt; + @Column(name = "tenant_id") + private Long tenantId; } diff --git a/iot-module/iot-openapi/src/main/java/cc/iotkit/openapi/dto/bo/TokenVerifyBo.java b/iot-module/iot-openapi/src/main/java/cc/iotkit/openapi/dto/bo/TokenVerifyBo.java index 87e18c53..48eaf167 100644 --- a/iot-module/iot-openapi/src/main/java/cc/iotkit/openapi/dto/bo/TokenVerifyBo.java +++ b/iot-module/iot-openapi/src/main/java/cc/iotkit/openapi/dto/bo/TokenVerifyBo.java @@ -25,9 +25,11 @@ package cc.iotkit.openapi.dto.bo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import jakarta.validation.constraints.NotBlank; +import org.hibernate.validator.constraints.NotBlank; import lombok.Data; +import javax.validation.constraints.NotNull; + @ApiModel(value = "TokenVerifyBo") @Data public class TokenVerifyBo { @@ -45,7 +47,7 @@ public class TokenVerifyBo { @ApiModelProperty(value = "标识符") private String identifier; - @NotBlank(message = "{tenant.number.not.blank}") + @NotNull(message = "{tenant.number.not.blank}") @ApiModelProperty(value = "租户ID") private String tenantId; diff --git a/iot-module/iot-openapi/src/main/java/cc/iotkit/openapi/dto/bo/device/OpenapiDeviceBo.java b/iot-module/iot-openapi/src/main/java/cc/iotkit/openapi/dto/bo/device/OpenapiDeviceBo.java index fc0f9c6e..a11031c4 100644 --- a/iot-module/iot-openapi/src/main/java/cc/iotkit/openapi/dto/bo/device/OpenapiDeviceBo.java +++ b/iot-module/iot-openapi/src/main/java/cc/iotkit/openapi/dto/bo/device/OpenapiDeviceBo.java @@ -25,7 +25,7 @@ package cc.iotkit.openapi.dto.bo.device; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import jakarta.validation.constraints.NotBlank; +import org.hibernate.validator.constraints.NotBlank; import lombok.Data; @ApiModel(value = "OpenapiDeviceBo") diff --git a/iot-module/iot-openapi/src/main/java/cc/iotkit/openapi/dto/bo/device/OpenapiSetDeviceServicePropertyBo.java b/iot-module/iot-openapi/src/main/java/cc/iotkit/openapi/dto/bo/device/OpenapiSetDeviceServicePropertyBo.java index 3c1286a2..86066a1c 100644 --- a/iot-module/iot-openapi/src/main/java/cc/iotkit/openapi/dto/bo/device/OpenapiSetDeviceServicePropertyBo.java +++ b/iot-module/iot-openapi/src/main/java/cc/iotkit/openapi/dto/bo/device/OpenapiSetDeviceServicePropertyBo.java @@ -25,7 +25,7 @@ package cc.iotkit.openapi.dto.bo.device; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import jakarta.validation.constraints.NotBlank; +import org.hibernate.validator.constraints.NotBlank; import lombok.Data; import java.util.Map; diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysTenantController.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysTenantController.java index 359562c5..780007d6 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysTenantController.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysTenantController.java @@ -41,7 +41,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaCheckRole; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import jakarta.validation.constraints.NotBlank; +import org.hibernate.validator.constraints.NotBlank; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PostMapping; diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysTenantPackageController.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysTenantPackageController.java index 9362dd3a..f18f978d 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysTenantPackageController.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysTenantPackageController.java @@ -39,8 +39,8 @@ import cc.iotkit.system.service.ISysTenantPackageService; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaCheckRole; import io.swagger.annotations.ApiOperation; -import jakarta.validation.constraints.NotEmpty; -import jakarta.validation.constraints.NotNull; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/dto/LoginBody.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/dto/LoginBody.java index 5ef5d2d8..8b9e6705 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/dto/LoginBody.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/dto/LoginBody.java @@ -23,9 +23,11 @@ package cc.iotkit.system.dto; -import jakarta.validation.constraints.NotBlank; +import org.hibernate.validator.constraints.NotBlank; import lombok.Data; +import javax.validation.constraints.NotNull; + /** * 用户登录对象 * @@ -38,8 +40,8 @@ public class LoginBody { /** * 租户ID */ - @NotBlank(message = "{tenant.number.not.blank}") - private String tenantId; + @NotNull(message = "{tenant.number.not.blank}") + private Long tenantId; /** * 用户名 diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysAppBo.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysAppBo.java index 0f6e07ac..9567ffa5 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysAppBo.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysAppBo.java @@ -29,7 +29,7 @@ import cc.iotkit.common.validate.EditGroup; import cc.iotkit.model.system.SysApp; import io.github.linpeilie.annotations.AutoMapper; import io.swagger.annotations.ApiModelProperty; -import jakarta.validation.constraints.NotBlank; +import org.hibernate.validator.constraints.NotBlank; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysConfigBo.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysConfigBo.java index 84dbe881..4f621511 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysConfigBo.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysConfigBo.java @@ -28,9 +28,9 @@ import cc.iotkit.common.validate.AddGroup; import cc.iotkit.common.validate.EditGroup; import cc.iotkit.model.system.SysConfig; import io.github.linpeilie.annotations.AutoMapper; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Size; +import org.hibernate.validator.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysDeptBo.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysDeptBo.java index 74e434ae..2f575157 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysDeptBo.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysDeptBo.java @@ -28,10 +28,10 @@ import cc.iotkit.common.validate.AddGroup; import cc.iotkit.common.validate.EditGroup; import cc.iotkit.model.system.SysDept; import io.github.linpeilie.annotations.AutoMapper; -import jakarta.validation.constraints.Email; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Size; +import javax.validation.constraints.Email; +import org.hibernate.validator.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysDictDataBo.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysDictDataBo.java index 908ca126..b13f20ed 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysDictDataBo.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysDictDataBo.java @@ -28,9 +28,9 @@ import cc.iotkit.common.validate.AddGroup; import cc.iotkit.common.validate.EditGroup; import cc.iotkit.model.system.SysDictData; import io.github.linpeilie.annotations.AutoMapper; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Size; +import org.hibernate.validator.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysDictTypeBo.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysDictTypeBo.java index 3e7c2d29..587b5230 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysDictTypeBo.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysDictTypeBo.java @@ -28,10 +28,10 @@ import cc.iotkit.common.validate.AddGroup; import cc.iotkit.common.validate.EditGroup; import cc.iotkit.model.system.SysDictType; import io.github.linpeilie.annotations.AutoMapper; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Pattern; -import jakarta.validation.constraints.Size; +import org.hibernate.validator.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Pattern; +import javax.validation.constraints.Size; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysMenuBo.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysMenuBo.java index ccdf8a9f..6781c289 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysMenuBo.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysMenuBo.java @@ -29,9 +29,9 @@ import cc.iotkit.common.validate.EditGroup; import cc.iotkit.model.system.SysMenu; import com.fasterxml.jackson.annotation.JsonInclude; import io.github.linpeilie.annotations.AutoMapper; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Size; +import org.hibernate.validator.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysNoticeBo.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysNoticeBo.java index 1ea8de41..42d2c8b3 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysNoticeBo.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysNoticeBo.java @@ -28,9 +28,9 @@ import cc.iotkit.common.validate.AddGroup; import cc.iotkit.common.validate.EditGroup; import cc.iotkit.model.system.SysNotice; import io.github.linpeilie.annotations.AutoMapper; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Size; +import org.hibernate.validator.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysOssConfigBo.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysOssConfigBo.java index 42df41a4..c070ffe0 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysOssConfigBo.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysOssConfigBo.java @@ -28,9 +28,9 @@ import cc.iotkit.common.validate.AddGroup; import cc.iotkit.common.validate.EditGroup; import cc.iotkit.model.system.SysOssConfig; import io.github.linpeilie.annotations.AutoMapper; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Size; +import org.hibernate.validator.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysPostBo.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysPostBo.java index 84bb44ac..d61837ad 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysPostBo.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysPostBo.java @@ -28,9 +28,9 @@ import cc.iotkit.common.validate.AddGroup; import cc.iotkit.common.validate.EditGroup; import cc.iotkit.model.system.SysPost; import io.github.linpeilie.annotations.AutoMapper; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Size; +import org.hibernate.validator.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysRoleAuthBo.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysRoleAuthBo.java index 2fa2d8a8..65eb283f 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysRoleAuthBo.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysRoleAuthBo.java @@ -25,7 +25,7 @@ package cc.iotkit.system.dto.bo; import cc.iotkit.common.api.BaseDto; import io.swagger.annotations.ApiModelProperty; -import jakarta.validation.constraints.NotNull; +import javax.validation.constraints.NotNull; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysRoleBo.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysRoleBo.java index 09d699f9..f65bc13c 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysRoleBo.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysRoleBo.java @@ -29,9 +29,9 @@ import cc.iotkit.common.validate.AddGroup; import cc.iotkit.common.validate.EditGroup; import cc.iotkit.model.system.SysRole; import io.github.linpeilie.annotations.AutoMapper; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Size; +import org.hibernate.validator.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysTenantBo.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysTenantBo.java index 0da0c199..139e5d5d 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysTenantBo.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysTenantBo.java @@ -28,8 +28,8 @@ import cc.iotkit.common.validate.AddGroup; import cc.iotkit.common.validate.EditGroup; import cc.iotkit.model.system.SysTenant; import io.github.linpeilie.annotations.AutoMapper; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; +import org.hibernate.validator.constraints.NotBlank; +import javax.validation.constraints.NotNull; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysTenantPackageBo.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysTenantPackageBo.java index cd512ba1..1d63ee86 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysTenantPackageBo.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysTenantPackageBo.java @@ -29,8 +29,8 @@ import cc.iotkit.common.validate.EditGroup; import cc.iotkit.model.system.SysTenantPackage; import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapping; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; +import org.hibernate.validator.constraints.NotBlank; +import javax.validation.constraints.NotNull; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysUserBo.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysUserBo.java index 149bf271..c3ae8a20 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysUserBo.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysUserBo.java @@ -28,10 +28,10 @@ import cc.iotkit.common.constant.UserConstants; import cc.iotkit.common.validate.EditGroup; import cc.iotkit.model.system.SysUser; import io.github.linpeilie.annotations.AutoMapper; -import jakarta.validation.constraints.Email; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Size; +import javax.validation.constraints.Email; +import org.hibernate.validator.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysUserProfileBo.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysUserProfileBo.java index 596f3d04..b3871b80 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysUserProfileBo.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysUserProfileBo.java @@ -24,8 +24,8 @@ package cc.iotkit.system.dto.bo; import cc.iotkit.common.api.BaseDto; -import jakarta.validation.constraints.Email; -import jakarta.validation.constraints.Size; +import javax.validation.constraints.Email; +import javax.validation.constraints.Size; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysUserRolesBo.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysUserRolesBo.java index 09fb0f03..c75245f5 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysUserRolesBo.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysUserRolesBo.java @@ -24,8 +24,8 @@ package cc.iotkit.system.dto.bo; import cc.iotkit.common.api.BaseDto; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Size; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/XcxLoginBo.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/XcxLoginBo.java index 2445cc29..b9d7f4b8 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/XcxLoginBo.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/XcxLoginBo.java @@ -23,7 +23,8 @@ package cc.iotkit.system.dto.bo; -import jakarta.validation.constraints.NotBlank; +import io.swagger.annotations.ApiModelProperty; +import org.hibernate.validator.constraints.NotBlank; import lombok.Data; /** @@ -38,12 +39,14 @@ public class XcxLoginBo { /** * appId */ + @ApiModelProperty("appId") @NotBlank(message = "appId不能为空") private String appId; /** * 授权码 */ + @ApiModelProperty("授权码") @NotBlank(message = "code不能为空") private String code; diff --git a/pom.xml b/pom.xml index 028750a7..605644d9 100755 --- a/pom.xml +++ b/pom.xml @@ -94,12 +94,6 @@ 6.0.0 - - jakarta.validation - jakarta.validation-api - 3.0.2 - - org.quartz-scheduler quartz