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

- 移植 PR #1261 的修复，适配 jakarta.validation - 补充名称格式校验的单元测试，4 个测试通过原 PR 作者：huanghaiwei123 关联 Issue：#1252

fix(infra): 增加代码生成模块名、业务名和类名的格式校验
- 移植 PR #1261 的修复，适配 jakarta.validation - 补充名称格式校验的单元测试，4 个测试通过原 PR 作者：huanghaiwei123 关联 Issue：#1252
YunaiV
1 parent 0f6363c1
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
yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/barcode/MesWmBarcodeServiceImplTest.java
@@ -7,6 +7,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.AssertTrue;
 import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Pattern;
 import lombok.Data;
 @Schema(description = "管理后台 - 代码生成表定义创建/修改 Response VO")
@@ -33,14 +34,17 @@ public class CodegenTableSaveReqVO {
     @Schema(description = "模块名", requiredMode = Schema.RequiredMode.REQUIRED, example = "system")
     @NotNull(message = "模块名不能为空")
+    @Pattern(regexp = "^[a-z][a-z0-9]*$", message = "模块名只能由小写字母和数字组成，且不能以数字开头")
     private String moduleName;
     @Schema(description = "业务名", requiredMode = Schema.RequiredMode.REQUIRED, example = "codegen")
     @NotNull(message = "业务名不能为空")
+    @Pattern(regexp = "^[a-z][a-z0-9]*$", message = "业务名只能由小写字母和数字组成，且不能以数字开头")
     private String businessName;
     @Schema(description = "类名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "CodegenTable")
     @NotNull(message = "类名称不能为空")
+    @Pattern(regexp = "^[A-Z][A-Za-z0-9]*$", message = "类名称必须以大写字母开头，且只能由字母和数字组成")
     private String className;
     @Schema(description = "类描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "代码生成器的表定义")
+package cn.iocoder.yudao.module.mes.service.wm.barcode;
+
+import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.barcode.vo.MesWmBarcodeSaveReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.barcode.MesWmBarcodeConfigDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.barcode.MesWmBarcodeDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.wm.barcode.MesWmBarcodeMapper;
+import org.junit.jupiter.api.Test;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+
+import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
+import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.WM_BARCODE_ALREADY_EXISTS;
+import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.WM_BARCODE_CONTENT_DUPLICATE;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.argThat;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+/**
+ * {@link MesWmBarcodeServiceImpl} 的单元测试
+ *
+ * @author 芋道源码
+ */
+public class MesWmBarcodeServiceImplTest extends BaseMockitoUnitTest {
+
+    @InjectMocks
+    private MesWmBarcodeServiceImpl barcodeService;
+
+    @Mock
+    private MesWmBarcodeMapper barcodeMapper;
+    @Mock
+    private MesWmBarcodeConfigService barcodeConfigService;
+
+    @Test
+    public void testUpdateBarcode_sameBizObject() {
+        // 准备参数：保持业务对象和条码内容不变
+        MesWmBarcodeSaveReqVO reqVO = createReqVO().setId(1L);
+        MesWmBarcodeDO barcode = new MesWmBarcodeDO().setId(1L);
+        when(barcodeMapper.selectById(1L)).thenReturn(barcode);
+        mockConfig();
+        when(barcodeMapper.selectByBizTypeAndBizId(102, 10L)).thenReturn(barcode);
+        when(barcodeMapper.selectByContent("WH001")).thenReturn(barcode);
+
+        // 调用
+        barcodeService.updateBarcode(reqVO);
+        // 断言：排除自身后正常更新
+        verify(barcodeMapper).updateById(argThat((MesWmBarcodeDO o) -> o.getId().equals(1L)
+                && o.getContent().equals("WH001") && o.getConfigId().equals(5L)));
+    }
+
+    @Test
+    public void testUpdateBarcode_bizObjectDuplicate() {
+        // 准备参数：业务对象已被另一条条码占用
+        MesWmBarcodeSaveReqVO reqVO = createReqVO().setId(1L);
+        when(barcodeMapper.selectById(1L)).thenReturn(new MesWmBarcodeDO().setId(1L));
+        mockConfig();
+        when(barcodeMapper.selectByBizTypeAndBizId(102, 10L)).thenReturn(new MesWmBarcodeDO().setId(2L));
+
+        // 调用并断言
+        assertServiceException(() -> barcodeService.updateBarcode(reqVO), WM_BARCODE_ALREADY_EXISTS);
+        verify(barcodeMapper, never()).updateById(any(MesWmBarcodeDO.class));
+    }
+
+    @Test
+    public void testCreateBarcode_bizObjectDuplicate() {
+        // 准备参数：新增时业务对象已有条码
+        MesWmBarcodeSaveReqVO reqVO = createReqVO();
+        mockConfig();
+        when(barcodeMapper.selectByBizTypeAndBizId(102, 10L)).thenReturn(new MesWmBarcodeDO().setId(2L));
+
+        // 调用并断言
+        assertServiceException(() -> barcodeService.createBarcode(reqVO), WM_BARCODE_ALREADY_EXISTS);
+        verify(barcodeMapper, never()).insert(any(MesWmBarcodeDO.class));
+    }
+
+    @Test
+    public void testUpdateBarcode_contentDuplicate() {
+        // 准备参数：业务对象未改变，条码内容已被另一条记录占用
+        MesWmBarcodeSaveReqVO reqVO = createReqVO().setId(1L);
+        MesWmBarcodeDO barcode = new MesWmBarcodeDO().setId(1L);
+        when(barcodeMapper.selectById(1L)).thenReturn(barcode);
+        mockConfig();
+        when(barcodeMapper.selectByBizTypeAndBizId(102, 10L)).thenReturn(barcode);
+        when(barcodeMapper.selectByContent("WH001")).thenReturn(new MesWmBarcodeDO().setId(2L));
+
+        // 调用并断言
+        assertServiceException(() -> barcodeService.updateBarcode(reqVO), WM_BARCODE_CONTENT_DUPLICATE);
+        verify(barcodeMapper, never()).updateById(any(MesWmBarcodeDO.class));
+    }
+
+    private MesWmBarcodeSaveReqVO createReqVO() {
+        return new MesWmBarcodeSaveReqVO().setBizType(102).setBizId(10L).setBizCode("WH001")
+                .setContent("WH001");
+    }
+
+    private void mockConfig() {
+        when(barcodeConfigService.validateBarcodeConfigByBizType(102))
+                .thenReturn(new MesWmBarcodeConfigDO().setId(5L));
+    }
+
+}