From 2d71b0126b76cca5acc2c1606a4400f2cfa951dd Mon Sep 17 00:00:00 2001 From: jay <75509151@qq.com> Date: Fri, 14 Jun 2024 14:26:10 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E6=A0=A1=E9=AA=8C=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manager/controller/ProductController.java | 3 +- .../manager/dto/bo/device/DeviceQueryBo.java | 1 - .../dto/bo/devicegroup/DeviceGroupBo.java | 3 -- .../manager/dto/bo/product/ProductBo.java | 7 ++- .../dto/bo/product/ProductListReqBo.java | 52 +++++++++++++++++++ .../dto/bo/thingmodel/ThingModelBo.java | 4 +- .../system/controller/SysDeptController.java | 3 +- .../cc/iotkit/system/dto/bo/SysDeptBo.java | 4 +- .../cc/iotkit/system/dto/bo/SysUserBo.java | 2 +- .../system/dto/bo/SysUserProfileBo.java | 5 +- 10 files changed, 71 insertions(+), 13 deletions(-) create mode 100644 iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/product/ProductListReqBo.java diff --git a/iot-module/iot-manager/src/main/java/cc/iotkit/manager/controller/ProductController.java b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/controller/ProductController.java index 39f012ff..47acf224 100644 --- a/iot-module/iot-manager/src/main/java/cc/iotkit/manager/controller/ProductController.java +++ b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/controller/ProductController.java @@ -29,6 +29,7 @@ import cc.iotkit.common.log.annotation.Log; import cc.iotkit.common.log.enums.BusinessType; import cc.iotkit.common.validate.AddGroup; import cc.iotkit.common.validate.EditGroup; +import cc.iotkit.common.validate.QueryGroup; import cc.iotkit.manager.dto.bo.category.CategoryBo; import cc.iotkit.manager.dto.bo.product.IconBo; import cc.iotkit.manager.dto.bo.product.IconTypeBo; @@ -67,7 +68,7 @@ public class ProductController { @ApiOperation("列表") @SaCheckPermission("iot:product:query") @PostMapping("/list") - public Paging getProducts(@Validated @RequestBody + public Paging getProducts(@Validated(QueryGroup.class) @RequestBody PageRequest request) { return productService.selectPageList(request); } 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 2969a3f3..f5c9b23e 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 @@ -69,7 +69,6 @@ public class DeviceQueryBo extends BaseDto { @ApiModelProperty(value="设备状态") - @Size(max = 255, message = "设备状态长度不正确") @AutoMapping(ignore = true) @ReverseAutoMapping(ignore = true) private Boolean online; 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 668d96df..99278a29 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 @@ -43,15 +43,12 @@ public class DeviceGroupBo extends BaseDto { private static final long serialVersionUID = -1L; @ApiModelProperty(value = "分组id") - @NotNull(message = "分组id不能为空") private String id; @ApiModelProperty(value = "创建时间") - @NotNull(message = "创建时间不能为空") private Long createAt; @ApiModelProperty(value = "设备数量") - @NotNull(message = "设备数量不能为空") private Integer deviceQty; @ApiModelProperty(value = "设备组名称") 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 bfdcbb94..fd6e2af0 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 @@ -24,12 +24,16 @@ package cc.iotkit.manager.dto.bo.product; import cc.iotkit.common.api.BaseDto; +import cc.iotkit.common.validate.AddGroup; +import cc.iotkit.common.validate.EditGroup; import cc.iotkit.model.product.Product; import io.github.linpeilie.annotations.AutoMapper; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import javax.validation.constraints.Min; import org.hibernate.validator.constraints.NotBlank; + +import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; import lombok.Data; import lombok.EqualsAndHashCode; @@ -70,7 +74,6 @@ public class ProductBo extends BaseDto { private Integer nodeType; @ApiModelProperty(value = "是否透传,true/false") - @Size(max = 255, message = "是否透传,true/false长度不正确") private Boolean transparent; @ApiModelProperty(value = "是否开启设备定位,true/false") @@ -88,7 +91,7 @@ public class ProductBo extends BaseDto { private String productSecret; @ApiModelProperty(value = "保活时长") - @NotBlank(message = "保活时长不能为空") + @NotNull(message = "保活时长不能为空",groups = { AddGroup.class, EditGroup.class }) @Min(value = 10, message = "保活时长(秒)必须大于10") private Long keepAliveTime; diff --git a/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/product/ProductListReqBo.java b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/product/ProductListReqBo.java new file mode 100644 index 00000000..975fd46b --- /dev/null +++ b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/product/ProductListReqBo.java @@ -0,0 +1,52 @@ +/* + * + * * | Licensed 未经许可不能去掉「OPENIITA」相关版权 + * * +---------------------------------------------------------------------- + * * | Author: xw2sy@163.com + * * +---------------------------------------------------------------------- + * + * Copyright [2024] [OPENIITA] + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * / + */ + +package cc.iotkit.manager.dto.bo.product; + +import cc.iotkit.common.api.BaseDto; +import cc.iotkit.model.product.Product; +import io.github.linpeilie.annotations.AutoMapper; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import javax.validation.constraints.Size; + + +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = ProductBo.class, reverseConvertGenerate = false) +public class ProductListReqBo extends BaseDto { + + private static final long serialVersionUID = -1L; + + + @ApiModelProperty(value = "productKey") + private String productKey; + + @ApiModelProperty(value = "产品名称") + @Size(max = 255, message = "产品名称长度不正确") + private String name; + +} 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 4cd891be..951e9398 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,6 +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 javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; import lombok.Data; import lombok.EqualsAndHashCode; @@ -49,7 +51,7 @@ public class ThingModelBo extends BaseDto { private String model; @ApiModelProperty(value = "产品key") - @Size(min = 16, max = 16, message = "产品key长度不正确") + @NotBlank(message = "产品Key不许为空") private String productKey; } diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysDeptController.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysDeptController.java index 6c44cfc8..beb6dacd 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysDeptController.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysDeptController.java @@ -29,6 +29,7 @@ import cc.iotkit.common.constant.UserConstants; import cc.iotkit.common.log.annotation.Log; import cc.iotkit.common.log.enums.BusinessType; import cc.iotkit.common.utils.StringUtils; +import cc.iotkit.common.validate.QueryGroup; import cc.iotkit.common.web.core.BaseController; import cc.iotkit.system.dto.bo.SysDeptBo; import cc.iotkit.system.dto.vo.SysDeptVo; @@ -64,7 +65,7 @@ public class SysDeptController extends BaseController { @SaCheckPermission("system:dept:list") @ApiOperation("获取部门列表") @PostMapping("/list") - public List list(@RequestBody @Validated PageRequest dept) { + public List list(@RequestBody @Validated(QueryGroup.class) PageRequest dept) { return deptService.selectDeptList(dept.getData()); } 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 2f575157..5ef70d3e 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 @@ -67,7 +67,7 @@ public class SysDeptBo extends BaseDto { /** * 显示顺序 */ - @NotNull(message = "显示顺序不能为空") + @NotNull(message = "显示顺序不能为空", groups = { AddGroup.class, EditGroup.class }) private Integer orderNum; /** @@ -84,7 +84,7 @@ public class SysDeptBo extends BaseDto { /** * 邮箱 */ - @Email(message = "邮箱格式不正确") + // @Email(message = "邮箱格式不正确") @Size(min = 0, max = 50, message = "邮箱长度不能超过{max}个字符") private String email; 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 c3ae8a20..1a079a68 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 @@ -83,7 +83,7 @@ public class SysUserBo extends BaseDto { /** * 用户邮箱 */ - @Email(message = "邮箱格式不正确") + // @Email(message = "邮箱格式不正确") @Size(min = 0, max = 50, message = "邮箱长度不能超过{max}个字符") private String email; 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 b3871b80..bf3376ba 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 @@ -26,6 +26,9 @@ package cc.iotkit.system.dto.bo; import cc.iotkit.common.api.BaseDto; import javax.validation.constraints.Email; import javax.validation.constraints.Size; + +import cc.iotkit.common.validate.AddGroup; +import cc.iotkit.common.validate.EditGroup; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; @@ -55,7 +58,7 @@ public class SysUserProfileBo extends BaseDto { /** * 用户邮箱 */ - @Email(message = "邮箱格式不正确") + // @Email(message = "邮箱格式不正确") @Size(min = 0, max = 50, message = "邮箱长度不能超过{max}个字符") private String email;