From cb28566904fe08aaa617702dd85ef7d861c69022 Mon Sep 17 00:00:00 2001 From: HuangXin Date: Wed, 16 Sep 2020 17:16:57 +0800 Subject: [PATCH] =?UTF-8?q?OCT=20REM:=201.=20=E4=BF=AE=E6=94=B9=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E8=AE=BE=E5=A4=87=E6=8E=A5=E5=8F=A3=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E9=AA=8C=E8=AF=81=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../device/manager/AddCapacityInfo.java | 18 +++++++++--------- .../protocol/device/manager/AddDeviceInfo.java | 10 +++++----- .../protocol/device/manager/AddDeviceReq.java | 4 ++-- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/dispose/pojo/dto/protocol/device/manager/AddCapacityInfo.java b/src/main/java/com/dispose/pojo/dto/protocol/device/manager/AddCapacityInfo.java index 99e06c9b..6de174c5 100644 --- a/src/main/java/com/dispose/pojo/dto/protocol/device/manager/AddCapacityInfo.java +++ b/src/main/java/com/dispose/pojo/dto/protocol/device/manager/AddCapacityInfo.java @@ -30,34 +30,34 @@ public class AddCapacityInfo { /** * The Capacity type. */ - @NotNull(message = "capacityType 能力类型不能为空", groups = ValidGroups.AddDeviceValid.class) - @ValidBaseEnum(enumClass = DisposeCapacityType.class, groups = ValidGroups.AddDeviceValid.class) + @NotNull(message = "capacityType 能力类型不能为空", groups = ValidGroups.UpgradeDeviceValid.class) + @ValidBaseEnum(enumClass = DisposeCapacityType.class, groups = ValidGroups.UpgradeDeviceValid.class) private Integer capacityType; /** * The Object type. */ - @NotNull(message = "objectType 处置对象类型不能为空", groups = ValidGroups.AddDeviceValid.class) - @ValidBaseEnum(enumClass = DisposeObjectType.class, groups = ValidGroups.AddDeviceValid.class) + @NotNull(message = "objectType 处置对象类型不能为空", groups = ValidGroups.UpgradeDeviceValid.class) + @ValidBaseEnum(enumClass = DisposeObjectType.class, groups = ValidGroups.UpgradeDeviceValid.class) private Integer objectType; /** * The Ip type. */ - @NotNull(message = "ipType IP地址类型不能为空", groups = ValidGroups.AddDeviceValid.class) - @ValidBaseEnum(enumClass = IpAddrType.class, groups = ValidGroups.AddDeviceValid.class) + @NotNull(message = "ipType IP地址类型不能为空", groups = ValidGroups.UpgradeDeviceValid.class) + @ValidBaseEnum(enumClass = IpAddrType.class, groups = ValidGroups.UpgradeDeviceValid.class) private Integer ipType; /** * The Protect ip. */ - @NotNull(message = "protectIp 处置IP不能为空", groups = ValidGroups.AddDeviceValid.class) - @ValidIpSegment(message = "protectIp Ip地址格式错误", groups = ValidGroups.AddDeviceValid.class) + @NotNull(message = "protectIp 处置IP不能为空", groups = ValidGroups.UpgradeDeviceValid.class) + @ValidIpSegment(message = "protectIp Ip地址格式错误", groups = ValidGroups.UpgradeDeviceValid.class) private String protectIp; /** * The Reserve netflow. */ - @NotNull(message = "reserveNetflow 清洗储备流量不能为空", groups = ValidGroups.AddDeviceValid.class) + @NotNull(message = "reserveNetflow 清洗储备流量不能为空", groups = ValidGroups.UpgradeDeviceValid.class) private Integer reserveNetflow; } diff --git a/src/main/java/com/dispose/pojo/dto/protocol/device/manager/AddDeviceInfo.java b/src/main/java/com/dispose/pojo/dto/protocol/device/manager/AddDeviceInfo.java index 783d4832..8edf0100 100644 --- a/src/main/java/com/dispose/pojo/dto/protocol/device/manager/AddDeviceInfo.java +++ b/src/main/java/com/dispose/pojo/dto/protocol/device/manager/AddDeviceInfo.java @@ -92,14 +92,14 @@ public class AddDeviceInfo { /** * The Url path. */ - @NotBlank(message = "urlPath URL接口路径不能为空", groups = ValidGroups.AddDeviceValid.class) + @NotBlank(message = "urlPath URL接口路径不能为空", groups = ValidGroups.UpgradeDeviceValid.class) private String urlPath; /** * The Url type. */ - @NotNull(message = "urlType URL类型不能为空", groups = ValidGroups.AddDeviceValid.class) - @ValidBaseEnum(enumClass = HttpType.class, groups = ValidGroups.AddDeviceValid.class) + @NotNull(message = "urlType URL类型不能为空", groups = ValidGroups.UpgradeDeviceValid.class) + @ValidBaseEnum(enumClass = HttpType.class, groups = ValidGroups.UpgradeDeviceValid.class) private Integer urlType; /** @@ -110,8 +110,8 @@ public class AddDeviceInfo { /** * The Capacity. */ - @NotNull(message = "capacity 处置设备能力不能为空", groups = ValidGroups.AddDeviceValid.class) - @Size(min = 1, message = "capacity 至少需要包含一种能力", groups = ValidGroups.AddDeviceValid.class) + @NotNull(message = "capacity 处置设备能力不能为空", groups = ValidGroups.UpgradeDeviceValid.class) + @Size(min = 1, message = "capacity 至少需要包含一种能力", groups = ValidGroups.UpgradeDeviceValid.class) @Valid private List capacity; } diff --git a/src/main/java/com/dispose/pojo/dto/protocol/device/manager/AddDeviceReq.java b/src/main/java/com/dispose/pojo/dto/protocol/device/manager/AddDeviceReq.java index fe498904..350112ee 100644 --- a/src/main/java/com/dispose/pojo/dto/protocol/device/manager/AddDeviceReq.java +++ b/src/main/java/com/dispose/pojo/dto/protocol/device/manager/AddDeviceReq.java @@ -26,8 +26,8 @@ public class AddDeviceReq { /** * The Items. */ - @NotNull(message = "items 设备列表不能为空", groups = ValidGroups.AddDeviceValid.class) - @Size(min = 1, message = "items 至少需要有一个元素", groups = ValidGroups.AddDeviceValid.class) + @NotNull(message = "items 设备列表不能为空", groups = ValidGroups.UpgradeDeviceValid.class) + @Size(min = 1, message = "items 至少需要有一个元素", groups = ValidGroups.UpgradeDeviceValid.class) @Valid private List items; }