Merge remote-tracking branch 'origin/dev' into dev

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/AdamEntersParam.java

@@ -14,7 +14,8 @@ public class AdamEntersParam implements java.io.Serializable {
     @ApiModelProperty(position = 10, required = false, value = "入场人ID，编辑时必传[50]")
     private String entersId;
     @ApiModelProperty(position = 11, required = true, value = "入场人姓名[50]", example = "测试")
-    @Pattern(regexp = LnsRegex.Valid.CHINESE_HANZI, message = "姓名必须为2～20位汉字")
+//    @Pattern(regexp = LnsRegex.Valid.CHINESE_HANZI, message = "姓名必须为2～20位汉字")
+    @Size(min = 1, max = 30)
     private String name;
     @ApiModelProperty(position = 12, required = true, value = "入场人手机号[11]", example = "13100000000")
     @Pattern(regexp = "\\d{11}", message = "手机号格式有误")

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamEntersController.java

@@ -2,6 +2,8 @@ package com.liquidnet.service.adam.controller;
 
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
+import com.liquidnet.common.exception.constant.ErrorCode;
+import com.liquidnet.commons.lang.constant.LnsRegex;
 import com.liquidnet.commons.lang.util.CurrentUtil;
 import com.liquidnet.commons.lang.util.SensitizeUtil;
 import com.liquidnet.service.adam.dto.AdamEntersParam;
@@ -23,6 +25,7 @@ import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
 import java.util.List;
 import java.util.Optional;
+import java.util.regex.Pattern;
 
 /**
  * <p>
@@ -48,6 +51,12 @@ public class AdamEntersController {
     @ApiOperation(value = "添加入场人")
     @PostMapping("add")
     public ResponseDto<String> add(@RequestBody @Valid AdamEntersParam parameter) {
+        if (1 == parameter.getType()) {
+            if (!Pattern.matches(LnsRegex.Valid.CHINESE_HANZI, parameter.getName())) {
+                return ResponseDto.failure(ErrorCode.HTTP_PARAM_ERROR.getCode(), "姓名必须为2～20位汉字");
+            }
+        }
+
         List<AdamEntersVo> vos = adamRdmService.getEntersVoByUid(CurrentUtil.getCurrentUid());
 
         Optional<AdamEntersVo> any = vos.stream().filter(r -> (r.getIdCard().equals(parameter.getIdCard())) && r.getType().equals(parameter.getType())).findAny();
@@ -93,6 +102,11 @@ public class AdamEntersController {
     @ApiOperation(value = "编辑入场人")
     @PostMapping("edit")
     public ResponseDto<Object> edit(@RequestBody @Valid AdamEntersParam parameter) {
+        if (1 == parameter.getType()) {
+            if (!Pattern.matches(LnsRegex.Valid.CHINESE_HANZI, parameter.getName())) {
+                return ResponseDto.failure(ErrorCode.HTTP_PARAM_ERROR.getCode(), "姓名必须为2～20位汉字");
+            }
+        }
         if (StringUtils.isBlank(parameter.getEntersId())) {
             return ResponseDto.failure(ErrorMapping.get("10015"));
         }