cmhi
/
dispose
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OCT 

REM:
1. 修改迪普防护对象名称字符串长度要求
This commit is contained in:
HuangXin 2021-01-25 10:50:57 +08:00
parent 1165e7e690
commit 20ba8158a2
2 changed files with 40 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/dispose/ability/impl/DpTechBypassAbilityImpl.java
View File

@ -54,7 +54,7 @@ public class DpTechBypassAbilityImpl extends DpTechAbilityImpl {
/** /**
* The Object prefix. * The Object prefix.
*/ */
private final String objectPrefix = "CMHI"; private final String objectPrefix = "C";
/** /**
* The All cleanup devices. * The All cleanup devices.
*/ */
@ -63,7 +63,7 @@ public class DpTechBypassAbilityImpl extends DpTechAbilityImpl {
/** /**
* The Dp bypass manager. * The Dp bypass manager.
*/ */
private DpBypassManager dpBypassManager = DpBypassManager.builder() private final DpBypassManager dpBypassManager = DpBypassManager.builder()
.protectObject(new Hashtable<>()) .protectObject(new Hashtable<>())
.protectStrategy(new Hashtable<>()) .protectStrategy(new Hashtable<>())
.tractionStrategyName(new Hashtable<>()) .tractionStrategyName(new Hashtable<>())
@ -596,8 +596,10 @@ public class DpTechBypassAbilityImpl extends DpTechAbilityImpl {
* @return the protect object name * @return the protect object name
*/ */
private String getProtectObjectName(String serviceId, IpAddrType ipAddrType) { private String getProtectObjectName(String serviceId, IpAddrType ipAddrType) {
if (IpAddrType.IPV4.equals(ipAddrType) || IpAddrType.IPV6.equals(ipAddrType)) { if (IpAddrType.IPV4.equals(ipAddrType)) {
return objectPrefix + "_" + serviceId + "_" + ipAddrType.getDescription(); return objectPrefix + "4" + "_" + serviceId;
} else if (IpAddrType.IPV6.equals(ipAddrType)) {
return objectPrefix + "6" + "_" + serviceId;
} else { } else {
return objectPrefix + "_" + serviceId; return objectPrefix + "_" + serviceId;
} }

2
src/main/java/com/dispose/pojo/dto/protocol/device/business/UserSvrInfo.java
View File

@ -11,6 +11,7 @@ import lombok.NoArgsConstructor;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Pattern; import javax.validation.constraints.Pattern;
import javax.validation.constraints.Size;
/** /**
* The type User svr info. * The type User svr info.
@ -26,6 +27,7 @@ public class UserSvrInfo {
* The Business id. * The Business id.
*/ */
@NotBlank(message = "businessId 客户业务ID能为空", groups = ValidGroups.AddUserInfoValid.class) @NotBlank(message = "businessId 客户业务ID能为空", groups = ValidGroups.AddUserInfoValid.class)
@Size(min = 1, max = 13, message = "businessId 字符串长度为 [1, 13]", groups = ValidGroups.AddUserInfoValid.class)
private String businessId; private String businessId;
/** /**
* The Business type. * The Business type.