diff --git a/pqs-advance/advance-api/src/main/java/com/njcn/advance/pojo/carrycapacity/param/CarryCapacityDeviceParam.java b/pqs-advance/advance-api/src/main/java/com/njcn/advance/pojo/carrycapacity/param/CarryCapacityDeviceParam.java index 23f3168a8..3e0e04d29 100644 --- a/pqs-advance/advance-api/src/main/java/com/njcn/advance/pojo/carrycapacity/param/CarryCapacityDeviceParam.java +++ b/pqs-advance/advance-api/src/main/java/com/njcn/advance/pojo/carrycapacity/param/CarryCapacityDeviceParam.java @@ -23,7 +23,6 @@ public class CarryCapacityDeviceParam { /** * 设备名称 */ - @Pattern(regexp = PatternRegex.DES32_REGEX, message = ValidMessage.DATA_TOO_LONG) private String devName; private String devScale; diff --git a/pqs-advance/advance-api/src/main/java/com/njcn/advance/pojo/carrycapacity/param/CarryCapacityUserParam.java b/pqs-advance/advance-api/src/main/java/com/njcn/advance/pojo/carrycapacity/param/CarryCapacityUserParam.java index 07d6f39ef..e4ba232b9 100644 --- a/pqs-advance/advance-api/src/main/java/com/njcn/advance/pojo/carrycapacity/param/CarryCapacityUserParam.java +++ b/pqs-advance/advance-api/src/main/java/com/njcn/advance/pojo/carrycapacity/param/CarryCapacityUserParam.java @@ -31,7 +31,6 @@ public class CarryCapacityUserParam { /** * 用户名称 */ - @Pattern(regexp = PatternRegex.DES32_REGEX, message = ValidMessage.DATA_TOO_LONG) private String userName; /** diff --git a/pqs-advance/advance-api/src/main/java/com/njcn/advance/utils/CheckStringUtil.java b/pqs-advance/advance-api/src/main/java/com/njcn/advance/utils/CheckStringUtil.java index e5c54287d..714a307fa 100644 --- a/pqs-advance/advance-api/src/main/java/com/njcn/advance/utils/CheckStringUtil.java +++ b/pqs-advance/advance-api/src/main/java/com/njcn/advance/utils/CheckStringUtil.java @@ -16,10 +16,14 @@ import java.util.regex.Pattern; */ public class CheckStringUtil { public static void checkName(String name) { - Pattern pattern = Pattern.compile(PatternRegex.SPECIAL_REGEX); + Pattern pattern = Pattern.compile(PatternRegex.SPECIALCHARACTER); if(pattern.matcher(name).find()){ throw new BusinessException(ValidMessage.NAME_SPECIAL_REGEX); } } +// public static void main(String[] args) { +// checkName("100迈岭站2djvjva13ad"); +// } + } diff --git a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/carrycapacity/impl/CarryCapacityDevicePOServiceImpl.java b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/carrycapacity/impl/CarryCapacityDevicePOServiceImpl.java index 74a28599e..ba155a028 100644 --- a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/carrycapacity/impl/CarryCapacityDevicePOServiceImpl.java +++ b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/carrycapacity/impl/CarryCapacityDevicePOServiceImpl.java @@ -57,7 +57,10 @@ public class CarryCapacityDevicePOServiceImpl extends ServiceImpl32){ + throw new BusinessException("超过最大长度"); + } CheckStringUtil.checkName(carryCapacityDeviceParam.getDevName()); LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); diff --git a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/carrycapacity/impl/CarryCapacityUserPOServiceImpl.java b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/carrycapacity/impl/CarryCapacityUserPOServiceImpl.java index 5aa3ce660..9b3a551b2 100644 --- a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/carrycapacity/impl/CarryCapacityUserPOServiceImpl.java +++ b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/carrycapacity/impl/CarryCapacityUserPOServiceImpl.java @@ -61,7 +61,10 @@ public class CarryCapacityUserPOServiceImpl extends ServiceImpl32){ + throw new BusinessException("超过最大长度"); + } CheckStringUtil.checkName(carryCapacityUserParam.getUserName()); LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); //条件组合:where state = 1 and name = ? diff --git a/pqs-common/common-core/src/main/java/com/njcn/common/pojo/constant/PatternRegex.java b/pqs-common/common-core/src/main/java/com/njcn/common/pojo/constant/PatternRegex.java index 8e92e4821..e29582f5c 100644 --- a/pqs-common/common-core/src/main/java/com/njcn/common/pojo/constant/PatternRegex.java +++ b/pqs-common/common-core/src/main/java/com/njcn/common/pojo/constant/PatternRegex.java @@ -260,6 +260,8 @@ public interface PatternRegex { */ String ALL_CHAR_1_20 = "^[-_A-Za-z0-9\\u4e00-\\u9fa5]{1,20}$"; + String SPECIALCHARACTER ="[<>%'%;()&+/\\\\-\\\\\\\\_|@*?#$!,.]|html"; + /** * uuid 32位正则,数字 、 字母 */