From 26bef0e5f11b125bdb4849a2a6de438d99fefe70 Mon Sep 17 00:00:00 2001 From: zichun Date: Mon, 1 Jun 2026 13:59:17 +0800 Subject: [PATCH] feat(usr): 修改用户入参 UpdateUserDTO 与校验 REQ-USR-002 --- backend/src/main/java/com/xly/erp/modules/usr/dto/UpdateUserDTO.java | 120 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ backend/src/test/java/com/xly/erp/modules/usr/dto/UpdateUserDTOValidationTest.java | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 205 insertions(+), 0 deletions(-) create mode 100644 backend/src/main/java/com/xly/erp/modules/usr/dto/UpdateUserDTO.java create mode 100644 backend/src/test/java/com/xly/erp/modules/usr/dto/UpdateUserDTOValidationTest.java diff --git a/backend/src/main/java/com/xly/erp/modules/usr/dto/UpdateUserDTO.java b/backend/src/main/java/com/xly/erp/modules/usr/dto/UpdateUserDTO.java new file mode 100644 index 0000000..6132167 --- /dev/null +++ b/backend/src/main/java/com/xly/erp/modules/usr/dto/UpdateUserDTO.java @@ -0,0 +1,120 @@ +package com.xly.erp.modules.usr.dto; + +import com.fasterxml.jackson.annotation.JsonProperty; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Pattern; +import jakarta.validation.constraints.Size; +import java.util.List; + +/** + * 修改用户入参（docs/05 契约 / spec § 2.1）。REQ-USR-002 T1。 + * + *

用于 {@code PUT /api/usr/users/{id}}：管理员修改已有用户基本信息。 + * 部分更新语义（spec § 8 D3）——可选字段（{@code sUserNo} / {@code iEmployeeId} / + * {@code iCanModifyBill} / {@code iIsVoid}）传 {@code null} = 本次不改该列（保持原值）， + * 非 null 即覆盖；{@code permissionIds} 非 null 全量覆盖授权、{@code []} 清空、{@code null} 不改。

+ * + *

本 DTO 不含 {@code sUserName} / {@code sPassword} / 审计字段（{@code tCreateDate} / + * {@code sCreator}）/ 租户字段，这些字段为只读、本接口不接收（spec § 2.1 / § 3）。

+ * + *

字段为匈牙利前缀命名（与列名一致），其 getter 形如 {@code getSUserType} 会被 + * Jackson 推断为属性名 {@code SUserType}，与契约 JSON 键不符；故对带前缀字段显式 + * {@link JsonProperty} 锁定 JSON 键名（与 {@code CreateUserDTO} 同样做法）。

+ */ +public class UpdateUserDTO { + + /** 用户号：可选；非 null 覆盖，null 不改。 */ + @JsonProperty("sUserNo") + @Size(max = 50, message = "用户号长度不能超过 50") + private String sUserNo; + + /** 关联职员 ID：可选，存在性在 Service 校验；非 null 覆盖，null 不改。 */ + @JsonProperty("iEmployeeId") + private Integer iEmployeeId; + + /** 用户类型：必填，取值 ∈ {普通用户, 超级管理员}。 */ + @JsonProperty("sUserType") + @NotBlank(message = "用户类型不能为空") + @Pattern(regexp = "^(普通用户|超级管理员)$", message = "用户类型取值非法") + private String sUserType; + + /** 界面语言：必填，取值 ∈ {中文, 英文, 繁体}。 */ + @JsonProperty("sLanguage") + @NotBlank(message = "语言不能为空") + @Pattern(regexp = "^(中文|英文|繁体)$", message = "语言取值非法") + private String sLanguage; + + /** 单据修改权限：可选，0 / 1；null 不改。 */ + @JsonProperty("iCanModifyBill") + @Min(value = 0, message = "单据修改权限取值非法") + @Max(value = 1, message = "单据修改权限取值非法") + private Integer iCanModifyBill; + + /** 作废 / 禁用标志：可选，0 正常 / 1 禁用；null 不改。 */ + @JsonProperty("iIsVoid") + @Min(value = 0, message = "作废标志取值非法") + @Max(value = 1, message = "作废标志取值非法") + private Integer iIsVoid; + + /** 权限组 ID 列表：可选；非 null 全量覆盖授权，[] 清空，null 不改。元素存在性在 Service 校验。 */ + @JsonProperty("permissionIds") + private List permissionIds; + + public String getSUserNo() { + return sUserNo; + } + + public void setSUserNo(String sUserNo) { + this.sUserNo = sUserNo; + } + + public Integer getIEmployeeId() { + return iEmployeeId; + } + + public void setIEmployeeId(Integer iEmployeeId) { + this.iEmployeeId = iEmployeeId; + } + + public String getSUserType() { + return sUserType; + } + + public void setSUserType(String sUserType) { + this.sUserType = sUserType; + } + + public String getSLanguage() { + return sLanguage; + } + + public void setSLanguage(String sLanguage) { + this.sLanguage = sLanguage; + } + + public Integer getICanModifyBill() { + return iCanModifyBill; + } + + public void setICanModifyBill(Integer iCanModifyBill) { + this.iCanModifyBill = iCanModifyBill; + } + + public Integer getIIsVoid() { + return iIsVoid; + } + + public void setIIsVoid(Integer iIsVoid) { + this.iIsVoid = iIsVoid; + } + + public List getPermissionIds() { + return permissionIds; + } + + public void setPermissionIds(List permissionIds) { + this.permissionIds = permissionIds; + } +} diff --git a/backend/src/test/java/com/xly/erp/modules/usr/dto/UpdateUserDTOValidationTest.java b/backend/src/test/java/com/xly/erp/modules/usr/dto/UpdateUserDTOValidationTest.java new file mode 100644 index 0000000..d042c45 --- /dev/null +++ b/backend/src/test/java/com/xly/erp/modules/usr/dto/UpdateUserDTOValidationTest.java @@ -0,0 +1,85 @@ +package com.xly.erp.modules.usr.dto; + +import static org.assertj.core.api.Assertions.assertThat; + +import jakarta.validation.ConstraintViolation; +import jakarta.validation.Validation; +import jakarta.validation.Validator; +import jakarta.validation.ValidatorFactory; +import java.util.Set; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; + +/** + * REQ-USR-002 T1：UpdateUserDTO Bean Validation 校验。 + * + *

用 {@link Validator} 直接 validate DTO，断言 violations。

+ */ +class UpdateUserDTOValidationTest { + + private static ValidatorFactory factory; + private static Validator validator; + + @BeforeAll + static void setUp() { + factory = Validation.buildDefaultValidatorFactory(); + validator = factory.getValidator(); + } + + @AfterAll + static void tearDown() { + if (factory != null) { + factory.close(); + } + } + + private UpdateUserDTO minimalValid() { + UpdateUserDTO dto = new UpdateUserDTO(); + dto.setSUserType("普通用户"); + dto.setSLanguage("中文"); + return dto; + } + + @Test + void acceptsMinimalValidBody() { + Set> violations = validator.validate(minimalValid()); + assertThat(violations).isEmpty(); + } + + @Test + void rejectsBlankUserType() { + UpdateUserDTO dto = minimalValid(); + dto.setSUserType(" "); + Set> violations = validator.validate(dto); + assertThat(violations) + .anyMatch(v -> v.getPropertyPath().toString().equals("sUserType")); + } + + @Test + void rejectsIllegalLanguage() { + UpdateUserDTO dto = minimalValid(); + dto.setSLanguage("日文"); + Set> violations = validator.validate(dto); + assertThat(violations) + .anyMatch(v -> v.getPropertyPath().toString().equals("sLanguage")); + } + + @Test + void rejectsOutOfRangeIsVoid() { + UpdateUserDTO dto = minimalValid(); + dto.setIIsVoid(2); + Set> violations = validator.validate(dto); + assertThat(violations) + .anyMatch(v -> v.getPropertyPath().toString().equals("iIsVoid")); + } + + @Test + void rejectsOutOfRangeCanModifyBill() { + UpdateUserDTO dto = minimalValid(); + dto.setICanModifyBill(2); + Set> violations = validator.validate(dto); + assertThat(violations) + .anyMatch(v -> v.getPropertyPath().toString().equals("iCanModifyBill")); + } +} -- libgit2 0.22.2