diff --git a/pqs-user/user-api/src/main/java/com/njcn/user/pojo/param/UserParam.java b/pqs-user/user-api/src/main/java/com/njcn/user/pojo/param/UserParam.java index 4a7f22454..1fea2ec95 100644 --- a/pqs-user/user-api/src/main/java/com/njcn/user/pojo/param/UserParam.java +++ b/pqs-user/user-api/src/main/java/com/njcn/user/pojo/param/UserParam.java @@ -98,6 +98,11 @@ public class UserParam { @NotBlank(message = UserValidMessage.LOGIN_NAME_NOT_BLANK) @Pattern(regexp = PatternRegex.LOGIN_NAME_REGEX, message = UserValidMessage.LOGIN_NAME_FORMAT_ERROR) private String loginName; + + @ApiModelProperty("用户表Id") + @NotBlank(message = UserValidMessage.ID_NOT_BLANK) + @Pattern(regexp = PatternRegex.SYSTEM_ID, message = ValidMessage.ID_FORMAT_ERROR) + private String id; } diff --git a/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/UserSetServiceImpl.java b/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/UserSetServiceImpl.java index 6728bca4f..eb3ebb5a7 100644 --- a/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/UserSetServiceImpl.java +++ b/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/UserSetServiceImpl.java @@ -21,6 +21,7 @@ import com.njcn.user.pojo.po.UserSet; import com.njcn.user.service.IUserSetService; import com.njcn.web.utils.RequestUtil; import lombok.RequiredArgsConstructor; +import org.apache.commons.lang.StringUtils; import org.springframework.stereotype.Service; import java.util.Objects; @@ -45,8 +46,13 @@ public class UserSetServiceImpl extends ServiceImpl impl @Override public UserSet addUserSet(UserParam.UserAddParam addUserParam) { + String userId; UserSet userSet = new UserSet(); - String userId = IdUtil.simpleUUID(); + if (StringUtils.isBlank(addUserParam.getId()) || Objects.isNull(addUserParam.getId())){ + userId = IdUtil.simpleUUID(); + } else { + userId = addUserParam.getId(); + } userSet.setUserId(userId); String secretKey = PubUtils.randomCode(16); userSet.setSecretKey(secretKey);