BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 52e3bbdf75117a9ae37b472037aa532cbe850224

Authored by YunaiV
1 parent 0f6363c1

fix(infra): 增加代码生成模块名、业务名和类名的格式校验 

- 移植 PR #1261 的修复，适配 jakarta.validation
- 补充名称格式校验的单元测试，4 个测试通过

原 PR 作者：huanghaiwei123
关联 Issue：#1252
Inline Side-by-side
Showing 2 changed files with 107 additions and 0 deletions
yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/vo/table/CodegenTableSaveReqVO.java
  View file @52e3bbd
... ... @@ -7,6 +7,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
7 7 import io.swagger.v3.oas.annotations.media.Schema;
8 8 import jakarta.validation.constraints.AssertTrue;
9 9 import jakarta.validation.constraints.NotNull;
  10 +import jakarta.validation.constraints.Pattern;
10 11 import lombok.Data;
11 12  
12 13 @Schema(description = "管理后台 - 代码生成表定义创建/修改 Response VO")
... ... @@ -33,14 +34,17 @@ public class CodegenTableSaveReqVO {
33 34  
34 35 @Schema(description = "模块名", requiredMode = Schema.RequiredMode.REQUIRED, example = "system")
35 36 @NotNull(message = "模块名不能为空")
  37 + @Pattern(regexp = "^[a-z][a-z0-9]*$", message = "模块名只能由小写字母和数字组成，且不能以数字开头")
36 38 private String moduleName;
37 39  
38 40 @Schema(description = "业务名", requiredMode = Schema.RequiredMode.REQUIRED, example = "codegen")
39 41 @NotNull(message = "业务名不能为空")
  42 + @Pattern(regexp = "^[a-z][a-z0-9]*$", message = "业务名只能由小写字母和数字组成，且不能以数字开头")
40 43 private String businessName;
41 44  
42 45 @Schema(description = "类名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "CodegenTable")
43 46 @NotNull(message = "类名称不能为空")
  47 + @Pattern(regexp = "^[A-Z][A-Za-z0-9]*$", message = "类名称必须以大写字母开头，且只能由字母和数字组成")
44 48 private String className;
45 49  
46 50 @Schema(description = "类描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "代码生成器的表定义")
... ...
yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/barcode/MesWmBarcodeServiceImplTest.java 0 → 100644
  View file @52e3bbd
  1 +package cn.iocoder.yudao.module.mes.service.wm.barcode;
  2 +
  3 +import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest;
  4 +import cn.iocoder.yudao.module.mes.controller.admin.wm.barcode.vo.MesWmBarcodeSaveReqVO;
  5 +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.barcode.MesWmBarcodeConfigDO;
  6 +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.barcode.MesWmBarcodeDO;
  7 +import cn.iocoder.yudao.module.mes.dal.mysql.wm.barcode.MesWmBarcodeMapper;
  8 +import org.junit.jupiter.api.Test;
  9 +import org.mockito.InjectMocks;
  10 +import org.mockito.Mock;
  11 +
  12 +import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
  13 +import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.WM_BARCODE_ALREADY_EXISTS;
  14 +import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.WM_BARCODE_CONTENT_DUPLICATE;
  15 +import static org.mockito.ArgumentMatchers.any;
  16 +import static org.mockito.ArgumentMatchers.argThat;
  17 +import static org.mockito.Mockito.never;
  18 +import static org.mockito.Mockito.verify;
  19 +import static org.mockito.Mockito.when;
  20 +
  21 +/**
  22 + * {@link MesWmBarcodeServiceImpl} 的单元测试
  23 + *
  24 + * @author 芋道源码
  25 + */
  26 +public class MesWmBarcodeServiceImplTest extends BaseMockitoUnitTest {
  27 +
  28 + @InjectMocks
  29 + private MesWmBarcodeServiceImpl barcodeService;
  30 +
  31 + @Mock
  32 + private MesWmBarcodeMapper barcodeMapper;
  33 + @Mock
  34 + private MesWmBarcodeConfigService barcodeConfigService;
  35 +
  36 + @Test
  37 + public void testUpdateBarcode_sameBizObject() {
  38 + // 准备参数：保持业务对象和条码内容不变
  39 + MesWmBarcodeSaveReqVO reqVO = createReqVO().setId(1L);
  40 + MesWmBarcodeDO barcode = new MesWmBarcodeDO().setId(1L);
  41 + when(barcodeMapper.selectById(1L)).thenReturn(barcode);
  42 + mockConfig();
  43 + when(barcodeMapper.selectByBizTypeAndBizId(102, 10L)).thenReturn(barcode);
  44 + when(barcodeMapper.selectByContent("WH001")).thenReturn(barcode);
  45 +
  46 + // 调用
  47 + barcodeService.updateBarcode(reqVO);
  48 + // 断言：排除自身后正常更新
  49 + verify(barcodeMapper).updateById(argThat((MesWmBarcodeDO o) -> o.getId().equals(1L)
  50 + && o.getContent().equals("WH001") && o.getConfigId().equals(5L)));
  51 + }
  52 +
  53 + @Test
  54 + public void testUpdateBarcode_bizObjectDuplicate() {
  55 + // 准备参数：业务对象已被另一条条码占用
  56 + MesWmBarcodeSaveReqVO reqVO = createReqVO().setId(1L);
  57 + when(barcodeMapper.selectById(1L)).thenReturn(new MesWmBarcodeDO().setId(1L));
  58 + mockConfig();
  59 + when(barcodeMapper.selectByBizTypeAndBizId(102, 10L)).thenReturn(new MesWmBarcodeDO().setId(2L));
  60 +
  61 + // 调用并断言
  62 + assertServiceException(() -> barcodeService.updateBarcode(reqVO), WM_BARCODE_ALREADY_EXISTS);
  63 + verify(barcodeMapper, never()).updateById(any(MesWmBarcodeDO.class));
  64 + }
  65 +
  66 + @Test
  67 + public void testCreateBarcode_bizObjectDuplicate() {
  68 + // 准备参数：新增时业务对象已有条码
  69 + MesWmBarcodeSaveReqVO reqVO = createReqVO();
  70 + mockConfig();
  71 + when(barcodeMapper.selectByBizTypeAndBizId(102, 10L)).thenReturn(new MesWmBarcodeDO().setId(2L));
  72 +
  73 + // 调用并断言
  74 + assertServiceException(() -> barcodeService.createBarcode(reqVO), WM_BARCODE_ALREADY_EXISTS);
  75 + verify(barcodeMapper, never()).insert(any(MesWmBarcodeDO.class));
  76 + }
  77 +
  78 + @Test
  79 + public void testUpdateBarcode_contentDuplicate() {
  80 + // 准备参数：业务对象未改变，条码内容已被另一条记录占用
  81 + MesWmBarcodeSaveReqVO reqVO = createReqVO().setId(1L);
  82 + MesWmBarcodeDO barcode = new MesWmBarcodeDO().setId(1L);
  83 + when(barcodeMapper.selectById(1L)).thenReturn(barcode);
  84 + mockConfig();
  85 + when(barcodeMapper.selectByBizTypeAndBizId(102, 10L)).thenReturn(barcode);
  86 + when(barcodeMapper.selectByContent("WH001")).thenReturn(new MesWmBarcodeDO().setId(2L));
  87 +
  88 + // 调用并断言
  89 + assertServiceException(() -> barcodeService.updateBarcode(reqVO), WM_BARCODE_CONTENT_DUPLICATE);
  90 + verify(barcodeMapper, never()).updateById(any(MesWmBarcodeDO.class));
  91 + }
  92 +
  93 + private MesWmBarcodeSaveReqVO createReqVO() {
  94 + return new MesWmBarcodeSaveReqVO().setBizType(102).setBizId(10L).setBizCode("WH001")
  95 + .setContent("WH001");
  96 + }
  97 +
  98 + private void mockConfig() {
  99 + when(barcodeConfigService.validateBarcodeConfigByBizType(102))
  100 + .thenReturn(new MesWmBarcodeConfigDO().setId(5L));
  101 + }
  102 +
  103 +}
... ...