修改bug
This commit is contained in:
@@ -23,7 +23,6 @@ public class CarryCapacityDeviceParam {
|
|||||||
/**
|
/**
|
||||||
* 设备名称
|
* 设备名称
|
||||||
*/
|
*/
|
||||||
@Pattern(regexp = PatternRegex.DES32_REGEX, message = ValidMessage.DATA_TOO_LONG)
|
|
||||||
private String devName;
|
private String devName;
|
||||||
|
|
||||||
private String devScale;
|
private String devScale;
|
||||||
|
|||||||
@@ -31,7 +31,6 @@ public class CarryCapacityUserParam {
|
|||||||
/**
|
/**
|
||||||
* 用户名称
|
* 用户名称
|
||||||
*/
|
*/
|
||||||
@Pattern(regexp = PatternRegex.DES32_REGEX, message = ValidMessage.DATA_TOO_LONG)
|
|
||||||
private String userName;
|
private String userName;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -16,10 +16,14 @@ import java.util.regex.Pattern;
|
|||||||
*/
|
*/
|
||||||
public class CheckStringUtil {
|
public class CheckStringUtil {
|
||||||
public static void checkName(String name) {
|
public static void checkName(String name) {
|
||||||
Pattern pattern = Pattern.compile(PatternRegex.SPECIAL_REGEX);
|
Pattern pattern = Pattern.compile(PatternRegex.SPECIALCHARACTER);
|
||||||
if(pattern.matcher(name).find()){
|
if(pattern.matcher(name).find()){
|
||||||
throw new BusinessException(ValidMessage.NAME_SPECIAL_REGEX);
|
throw new BusinessException(ValidMessage.NAME_SPECIAL_REGEX);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// public static void main(String[] args) {
|
||||||
|
// checkName("100迈岭站2djvjva13ad");
|
||||||
|
// }
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -57,7 +57,10 @@ public class CarryCapacityDevicePOServiceImpl extends ServiceImpl<CarryCapacityD
|
|||||||
* @return 结果
|
* @return 结果
|
||||||
*/
|
*/
|
||||||
private void checkName(CarryCapacityDeviceParam carryCapacityDeviceParam, boolean isUpdate) {
|
private void checkName(CarryCapacityDeviceParam carryCapacityDeviceParam, boolean isUpdate) {
|
||||||
|
if(carryCapacityDeviceParam.getDevName().length()>32){
|
||||||
|
throw new BusinessException("超过最大长度");
|
||||||
|
|
||||||
|
}
|
||||||
CheckStringUtil.checkName(carryCapacityDeviceParam.getDevName());
|
CheckStringUtil.checkName(carryCapacityDeviceParam.getDevName());
|
||||||
|
|
||||||
LambdaQueryWrapper<CarryCapacityDevicePO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
|
LambdaQueryWrapper<CarryCapacityDevicePO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
|
||||||
|
|||||||
@@ -61,7 +61,10 @@ public class CarryCapacityUserPOServiceImpl extends ServiceImpl<CarryCapacityUse
|
|||||||
* @return 结果
|
* @return 结果
|
||||||
*/
|
*/
|
||||||
private void checkName(CarryCapacityUserParam carryCapacityUserParam, boolean isUpdate) {
|
private void checkName(CarryCapacityUserParam carryCapacityUserParam, boolean isUpdate) {
|
||||||
|
if(carryCapacityUserParam.getUserName().length()>32){
|
||||||
|
throw new BusinessException("超过最大长度");
|
||||||
|
|
||||||
|
}
|
||||||
CheckStringUtil.checkName(carryCapacityUserParam.getUserName());
|
CheckStringUtil.checkName(carryCapacityUserParam.getUserName());
|
||||||
LambdaQueryWrapper<CarryCapacityUserPO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
|
LambdaQueryWrapper<CarryCapacityUserPO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
|
||||||
//条件组合:where state = 1 and name = ?
|
//条件组合:where state = 1 and name = ?
|
||||||
|
|||||||
@@ -260,6 +260,8 @@ public interface PatternRegex {
|
|||||||
*/
|
*/
|
||||||
String ALL_CHAR_1_20 = "^[-_A-Za-z0-9\\u4e00-\\u9fa5]{1,20}$";
|
String ALL_CHAR_1_20 = "^[-_A-Za-z0-9\\u4e00-\\u9fa5]{1,20}$";
|
||||||
|
|
||||||
|
String SPECIALCHARACTER ="[<>%'%;()&+/\\\\-\\\\\\\\_|@*?#$!,.]|html";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* uuid 32位正则,数字 、 字母
|
* uuid 32位正则,数字 、 字母
|
||||||
*/
|
*/
|
||||||
|
|||||||
Reference in New Issue
Block a user