demo测试模块类命名回退

yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/controller/admin/material/MaterialController.java

@@ -1,40 +1,38 @@
 package com.yunxi.scm.module.demo.controller.admin.material;
 
-import com.yunxi.scm.module.demo.dal.dataobject.material.MaterialDODemo;
+import com.yunxi.scm.framework.common.pojo.CommonResult;
-import org.springframework.web.bind.annotation.*;
+import com.yunxi.scm.framework.common.pojo.PageResult;
-import javax.annotation.Resource;
+import com.yunxi.scm.framework.excel.core.util.ExcelUtils;
-import org.springframework.validation.annotation.Validated;
+import com.yunxi.scm.framework.operatelog.core.annotations.OperateLog;
-import org.springframework.security.access.prepost.PreAuthorize;
+import com.yunxi.scm.module.demo.controller.admin.material.vo.*;
-import io.swagger.v3.oas.annotations.tags.Tag;
+import com.yunxi.scm.module.demo.convert.material.MaterialConvert;
-import io.swagger.v3.oas.annotations.Parameter;
+import com.yunxi.scm.module.demo.dal.dataobject.material.MaterialDO;
+import com.yunxi.scm.module.demo.service.material.MaterialService;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
 
-import javax.validation.*;
+import javax.annotation.Resource;
-import javax.servlet.http.*;
+import javax.servlet.http.HttpServletResponse;
-import java.util.*;
+import javax.validation.Valid;
 import java.io.IOException;
+import java.util.Collection;
+import java.util.List;
 
-import com.yunxi.scm.framework.common.pojo.PageResult;
-import com.yunxi.scm.framework.common.pojo.CommonResult;
 import static com.yunxi.scm.framework.common.pojo.CommonResult.success;
-
+import static com.yunxi.scm.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
-import com.yunxi.scm.framework.excel.core.util.ExcelUtils;
-
-import com.yunxi.scm.framework.operatelog.core.annotations.OperateLog;
-import static com.yunxi.scm.framework.operatelog.core.enums.OperateTypeEnum.*;
-
-import com.yunxi.scm.module.demo.controller.admin.material.vo.*;
-import com.yunxi.scm.module.demo.convert.material.MaterialConvertDemo;
-import com.yunxi.scm.module.demo.service.material.MaterialServiceDemo;
 
 @Tag(name = "管理后台 - 物料管理")
 @RestController
 @RequestMapping("/demo/material")
 @Validated
-public class MaterialControllerDemo {
+public class MaterialController {
 
     @Resource
-    private MaterialServiceDemo materialServiceDemo;
+    private MaterialService materialServiceDemo;
 
     @PostMapping("/create")
     @Operation(summary = "创建物料管理")
@@ -65,8 +63,8 @@ public class MaterialControllerDemo {
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
     @PreAuthorize("@ss.hasPermission('demo:material:query')")
     public CommonResult<MaterialRespVO> getMaterial(@RequestParam("id") Long id) {
-        MaterialDODemo material = materialServiceDemo.getMaterial(id);
+        MaterialDO material = materialServiceDemo.getMaterial(id);
-        return success(MaterialConvertDemo.INSTANCE.convert(material));
+        return success(MaterialConvert.INSTANCE.convert(material));
     }
 
     @GetMapping("/list")
@@ -74,16 +72,16 @@ public class MaterialControllerDemo {
     @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
     @PreAuthorize("@ss.hasPermission('demo:material:query')")
     public CommonResult<List<MaterialRespVO>> getMaterialList(@RequestParam("ids") Collection<Long> ids) {
-        List<MaterialDODemo> list = materialServiceDemo.getMaterialList(ids);
+        List<MaterialDO> list = materialServiceDemo.getMaterialList(ids);
-        return success(MaterialConvertDemo.INSTANCE.convertList(list));
+        return success(MaterialConvert.INSTANCE.convertList(list));
     }
 
     @GetMapping("/page")
     @Operation(summary = "获得物料管理分页")
     @PreAuthorize("@ss.hasPermission('demo:material:query')")
     public CommonResult<PageResult<MaterialRespVO>> getMaterialPage(@Valid MaterialPageReqVO pageVO) {
-        PageResult<MaterialDODemo> pageResult = materialServiceDemo.getMaterialPage(pageVO);
+        PageResult<MaterialDO> pageResult = materialServiceDemo.getMaterialPage(pageVO);
-        return success(MaterialConvertDemo.INSTANCE.convertPage(pageResult));
+        return success(MaterialConvert.INSTANCE.convertPage(pageResult));
     }
 
     @GetMapping("/export-excel")
@@ -92,9 +90,9 @@ public class MaterialControllerDemo {
     @OperateLog(type = EXPORT)
     public void exportMaterialExcel(@Valid MaterialExportReqVO exportReqVO,
               HttpServletResponse response) throws IOException {
-        List<MaterialDODemo> list = materialServiceDemo.getMaterialList(exportReqVO);
+        List<MaterialDO> list = materialServiceDemo.getMaterialList(exportReqVO);
         // 导出 Excel
-        List<MaterialExcelVO> datas = MaterialConvertDemo.INSTANCE.convertList02(list);
+        List<MaterialExcelVO> datas = MaterialConvert.INSTANCE.convertList02(list);
         ExcelUtils.write(response, "物料管理.xls", "数据", MaterialExcelVO.class, datas);
     }
 

yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/convert/material/MaterialConvert.java

@@ -4,7 +4,7 @@ import java.util.*;
 
 import com.yunxi.scm.framework.common.pojo.PageResult;
 
-import com.yunxi.scm.module.demo.dal.dataobject.material.MaterialDODemo;
+import com.yunxi.scm.module.demo.dal.dataobject.material.MaterialDO;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
 import com.yunxi.scm.module.demo.controller.admin.material.vo.*;
@@ -15,20 +15,20 @@ import com.yunxi.scm.module.demo.controller.admin.material.vo.*;
  * @author ccongli
  */
 @Mapper
-public interface MaterialConvertDemo {
+public interface MaterialConvert {
 
-    MaterialConvertDemo INSTANCE = Mappers.getMapper(MaterialConvertDemo.class);
+    MaterialConvert INSTANCE = Mappers.getMapper(MaterialConvert.class);
 
-    MaterialDODemo convert(MaterialCreateReqVO bean);
+    MaterialDO convert(MaterialCreateReqVO bean);
 
-    MaterialDODemo convert(MaterialUpdateReqVO bean);
+    MaterialDO convert(MaterialUpdateReqVO bean);
 
-    MaterialRespVO convert(MaterialDODemo bean);
+    MaterialRespVO convert(MaterialDO bean);
 
-    List<MaterialRespVO> convertList(List<MaterialDODemo> list);
+    List<MaterialRespVO> convertList(List<MaterialDO> list);
 
-    PageResult<MaterialRespVO> convertPage(PageResult<MaterialDODemo> page);
+    PageResult<MaterialRespVO> convertPage(PageResult<MaterialDO> page);
 
-    List<MaterialExcelVO> convertList02(List<MaterialDODemo> list);
+    List<MaterialExcelVO> convertList02(List<MaterialDO> list);
 
 }

yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/dal/dataobject/material/MaterialDO.java

@@ -24,7 +24,7 @@ import java.util.List;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class MaterialDODemo extends BaseDO {
+public class MaterialDO extends BaseDO {
 
     /**
      * ID

yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/dal/mysql/material/MaterialMapper.java

@@ -0,0 +1,40 @@
+package com.yunxi.scm.module.demo.dal.mysql.material;
+
+import java.util.*;
+
+import com.yunxi.scm.framework.common.pojo.PageResult;
+import com.yunxi.scm.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.yunxi.scm.framework.mybatis.core.mapper.BaseMapperX;
+import com.yunxi.scm.module.demo.dal.dataobject.material.MaterialDO;
+import org.apache.ibatis.annotations.Mapper;
+import com.yunxi.scm.module.demo.controller.admin.material.vo.*;
+
+/**
+ * 物料管理 Mapper
+ *
+ * @author ccongli
+ */
+@Mapper
+public interface MaterialMapper extends BaseMapperX<MaterialDO> {
+
+    default PageResult<MaterialDO> selectPage(MaterialPageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<MaterialDO>()
+                .likeIfPresent(MaterialDO::getName, reqVO.getName())
+                .eqIfPresent(MaterialDO::getStatus, reqVO.getStatus())
+                .eqIfPresent(MaterialDO::getType, reqVO.getType())
+                .eqIfPresent(MaterialDO::getCategory, reqVO.getCategory())
+                .betweenIfPresent(MaterialDO::getCreateTime, reqVO.getCreateTime())
+                .orderByDesc(MaterialDO::getId));
+    }
+
+    default List<MaterialDO> selectList(MaterialExportReqVO reqVO) {
+        return selectList(new LambdaQueryWrapperX<MaterialDO>()
+                .likeIfPresent(MaterialDO::getName, reqVO.getName())
+                .eqIfPresent(MaterialDO::getStatus, reqVO.getStatus())
+                .eqIfPresent(MaterialDO::getType, reqVO.getType())
+                .eqIfPresent(MaterialDO::getCategory, reqVO.getCategory())
+                .betweenIfPresent(MaterialDO::getCreateTime, reqVO.getCreateTime())
+                .orderByDesc(MaterialDO::getId));
+    }
+
+}

yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/dal/mysql/material/MaterialMapperDemo.java

@@ -1,40 +0,0 @@
-package com.yunxi.scm.module.demo.dal.mysql.material;
-
-import java.util.*;
-
-import com.yunxi.scm.framework.common.pojo.PageResult;
-import com.yunxi.scm.framework.mybatis.core.query.LambdaQueryWrapperX;
-import com.yunxi.scm.framework.mybatis.core.mapper.BaseMapperX;
-import com.yunxi.scm.module.demo.dal.dataobject.material.MaterialDODemo;
-import org.apache.ibatis.annotations.Mapper;
-import com.yunxi.scm.module.demo.controller.admin.material.vo.*;
-
-/**
- * 物料管理 Mapper
- *
- * @author ccongli
- */
-@Mapper
-public interface MaterialMapperDemo extends BaseMapperX<MaterialDODemo> {
-
-    default PageResult<MaterialDODemo> selectPage(MaterialPageReqVO reqVO) {
-        return selectPage(reqVO, new LambdaQueryWrapperX<MaterialDODemo>()
-                .likeIfPresent(MaterialDODemo::getName, reqVO.getName())
-                .eqIfPresent(MaterialDODemo::getStatus, reqVO.getStatus())
-                .eqIfPresent(MaterialDODemo::getType, reqVO.getType())
-                .eqIfPresent(MaterialDODemo::getCategory, reqVO.getCategory())
-                .betweenIfPresent(MaterialDODemo::getCreateTime, reqVO.getCreateTime())
-                .orderByDesc(MaterialDODemo::getId));
-    }
-
-    default List<MaterialDODemo> selectList(MaterialExportReqVO reqVO) {
-        return selectList(new LambdaQueryWrapperX<MaterialDODemo>()
-                .likeIfPresent(MaterialDODemo::getName, reqVO.getName())
-                .eqIfPresent(MaterialDODemo::getStatus, reqVO.getStatus())
-                .eqIfPresent(MaterialDODemo::getType, reqVO.getType())
-                .eqIfPresent(MaterialDODemo::getCategory, reqVO.getCategory())
-                .betweenIfPresent(MaterialDODemo::getCreateTime, reqVO.getCreateTime())
-                .orderByDesc(MaterialDODemo::getId));
-    }
-
-}

yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/service/material/MaterialService.java

@@ -3,7 +3,7 @@ package com.yunxi.scm.module.demo.service.material;
 import java.util.*;
 import javax.validation.*;
 import com.yunxi.scm.module.demo.controller.admin.material.vo.*;
-import com.yunxi.scm.module.demo.dal.dataobject.material.MaterialDODemo;
+import com.yunxi.scm.module.demo.dal.dataobject.material.MaterialDO;
 import com.yunxi.scm.framework.common.pojo.PageResult;
 
 /**
@@ -11,7 +11,7 @@ import com.yunxi.scm.framework.common.pojo.PageResult;
  *
  * @author ccongli
  */
-public interface MaterialServiceDemo {
+public interface MaterialService {
 
     /**
      * 创建物料管理
@@ -41,7 +41,7 @@ public interface MaterialServiceDemo {
      * @param id 编号
      * @return 物料管理
      */
-    MaterialDODemo getMaterial(Long id);
+    MaterialDO getMaterial(Long id);
 
     /**
      * 获得物料管理列表
@@ -49,7 +49,7 @@ public interface MaterialServiceDemo {
      * @param ids 编号
      * @return 物料管理列表
      */
-    List<MaterialDODemo> getMaterialList(Collection<Long> ids);
+    List<MaterialDO> getMaterialList(Collection<Long> ids);
 
     /**
      * 获得物料管理分页
@@ -57,7 +57,7 @@ public interface MaterialServiceDemo {
      * @param pageReqVO 分页查询
      * @return 物料管理分页
      */
-    PageResult<MaterialDODemo> getMaterialPage(MaterialPageReqVO pageReqVO);
+    PageResult<MaterialDO> getMaterialPage(MaterialPageReqVO pageReqVO);
 
     /**
      * 获得物料管理列表, 用于 Excel 导出
@@ -65,6 +65,6 @@ public interface MaterialServiceDemo {
      * @param exportReqVO 查询条件
      * @return 物料管理列表
      */
-    List<MaterialDODemo> getMaterialList(MaterialExportReqVO exportReqVO);
+    List<MaterialDO> getMaterialList(MaterialExportReqVO exportReqVO);
 
 }

yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/service/material/MaterialServiceImpl.java

@@ -1,19 +1,22 @@
 package com.yunxi.scm.module.demo.service.material;
 
-import com.yunxi.scm.module.demo.convert.material.MaterialConvertDemo;
+import com.yunxi.scm.framework.common.pojo.PageResult;
-import com.yunxi.scm.module.demo.dal.dataobject.material.MaterialDODemo;
+import com.yunxi.scm.module.demo.controller.admin.material.vo.MaterialCreateReqVO;
+import com.yunxi.scm.module.demo.controller.admin.material.vo.MaterialExportReqVO;
+import com.yunxi.scm.module.demo.controller.admin.material.vo.MaterialPageReqVO;
+import com.yunxi.scm.module.demo.controller.admin.material.vo.MaterialUpdateReqVO;
+import com.yunxi.scm.module.demo.convert.material.MaterialConvert;
+import com.yunxi.scm.module.demo.dal.dataobject.material.MaterialDO;
+import com.yunxi.scm.module.demo.dal.mysql.material.MaterialMapper;
 import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
 
-import java.util.*;
+import javax.annotation.Resource;
-import com.yunxi.scm.module.demo.controller.admin.material.vo.*;
+import java.util.Collection;
-import com.yunxi.scm.framework.common.pojo.PageResult;
+import java.util.List;
-
-import com.yunxi.scm.module.demo.dal.mysql.material.MaterialMapperDemo;
 
 import static com.yunxi.scm.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static com.yunxi.scm.module.demo.enums.ErrorCodeConstants.*;
+import static com.yunxi.scm.module.demo.enums.ErrorCodeConstants.MATERIAL_NOT_EXISTS;
 
 /**
  * 物料管理 Service 实现类
@@ -22,15 +25,15 @@ import static com.yunxi.scm.module.demo.enums.ErrorCodeConstants.*;
  */
 @Service
 @Validated
-public class MaterialServiceDemoImpl implements MaterialServiceDemo {
+public class MaterialServiceImpl implements MaterialService {
 
     @Resource
-    private MaterialMapperDemo materialMapperDemo;
+    private MaterialMapper materialMapperDemo;
 
     @Override
     public Long createMaterial(MaterialCreateReqVO createReqVO) {
         // 插入
-        MaterialDODemo material = MaterialConvertDemo.INSTANCE.convert(createReqVO);
+        MaterialDO material = MaterialConvert.INSTANCE.convert(createReqVO);
         materialMapperDemo.insert(material);
         // 返回
         return material.getId();
@@ -41,7 +44,7 @@ public class MaterialServiceDemoImpl implements MaterialServiceDemo {
         // 校验存在
         validateMaterialExists(updateReqVO.getId());
         // 更新
-        MaterialDODemo updateObj = MaterialConvertDemo.INSTANCE.convert(updateReqVO);
+        MaterialDO updateObj = MaterialConvert.INSTANCE.convert(updateReqVO);
         materialMapperDemo.updateById(updateObj);
     }
 
@@ -60,22 +63,22 @@ public class MaterialServiceDemoImpl implements MaterialServiceDemo {
     }
 
     @Override
-    public MaterialDODemo getMaterial(Long id) {
+    public MaterialDO getMaterial(Long id) {
         return materialMapperDemo.selectById(id);
     }
 
     @Override
-    public List<MaterialDODemo> getMaterialList(Collection<Long> ids) {
+    public List<MaterialDO> getMaterialList(Collection<Long> ids) {
         return materialMapperDemo.selectBatchIds(ids);
     }
 
     @Override
-    public PageResult<MaterialDODemo> getMaterialPage(MaterialPageReqVO pageReqVO) {
+    public PageResult<MaterialDO> getMaterialPage(MaterialPageReqVO pageReqVO) {
         return materialMapperDemo.selectPage(pageReqVO);
     }
 
     @Override
-    public List<MaterialDODemo> getMaterialList(MaterialExportReqVO exportReqVO) {
+    public List<MaterialDO> getMaterialList(MaterialExportReqVO exportReqVO) {
         return materialMapperDemo.selectList(exportReqVO);
     }
 

yunxi-module-demo/yunxi-module-demo-biz/src/main/resources/mapper/material/MaterialMapperDemo.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yunxi.scm.module.demo.dal.mysql.material.MaterialMapperDemo">
+<mapper namespace="com.yunxi.scm.module.demo.dal.mysql.material.MaterialMapper">
 
     <!--
         一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。

yunxi-module-demo/yunxi-module-demo-biz/src/test/java/com/yunxi/scm/module/demo/service/material/MaterialServiceDemoImplTest.java

@@ -1,40 +1,42 @@
 package com.yunxi.scm.module.demo.service.material;
 
-import com.yunxi.scm.module.demo.dal.dataobject.material.MaterialDODemo;
+import com.yunxi.scm.framework.common.pojo.PageResult;
+import com.yunxi.scm.framework.test.core.ut.BaseDbUnitTest;
+import com.yunxi.scm.module.demo.controller.admin.material.vo.MaterialCreateReqVO;
+import com.yunxi.scm.module.demo.controller.admin.material.vo.MaterialExportReqVO;
+import com.yunxi.scm.module.demo.controller.admin.material.vo.MaterialPageReqVO;
+import com.yunxi.scm.module.demo.controller.admin.material.vo.MaterialUpdateReqVO;
+import com.yunxi.scm.module.demo.dal.dataobject.material.MaterialDO;
+import com.yunxi.scm.module.demo.dal.mysql.material.MaterialMapper;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
-
-import javax.annotation.Resource;
-
-import com.yunxi.scm.framework.test.core.ut.BaseDbUnitTest;
-
-import com.yunxi.scm.module.demo.controller.admin.material.vo.*;
-import com.yunxi.scm.module.demo.dal.mysql.material.MaterialMapperDemo;
-import com.yunxi.scm.framework.common.pojo.PageResult;
-
 import org.springframework.context.annotation.Import;
-import java.util.*;
 
-import static com.yunxi.scm.module.demo.enums.ErrorCodeConstants.*;
+import javax.annotation.Resource;
-import static com.yunxi.scm.framework.test.core.util.AssertUtils.*;
+import java.util.List;
-import static com.yunxi.scm.framework.test.core.util.RandomUtils.*;
+
-import static com.yunxi.scm.framework.common.util.date.LocalDateTimeUtils.*;
+import static com.yunxi.scm.framework.common.util.date.LocalDateTimeUtils.buildBetweenTime;
-import static com.yunxi.scm.framework.common.util.object.ObjectUtils.*;
+import static com.yunxi.scm.framework.common.util.object.ObjectUtils.cloneIgnoreId;
+import static com.yunxi.scm.framework.test.core.util.AssertUtils.assertPojoEquals;
+import static com.yunxi.scm.framework.test.core.util.AssertUtils.assertServiceException;
+import static com.yunxi.scm.framework.test.core.util.RandomUtils.randomLongId;
+import static com.yunxi.scm.framework.test.core.util.RandomUtils.randomPojo;
+import static com.yunxi.scm.module.demo.enums.ErrorCodeConstants.MATERIAL_NOT_EXISTS;
 import static org.junit.jupiter.api.Assertions.*;
 
 /**
- * {@link MaterialServiceDemoImpl} 的单元测试类
+ * {@link MaterialServiceImpl} 的单元测试类
  *
  * @author ccongli
  */
-@Import(MaterialServiceDemoImpl.class)
+@Import(MaterialServiceImpl.class)
 public class MaterialServiceDemoImplTest extends BaseDbUnitTest {
 
     @Resource
-    private MaterialServiceDemoImpl materialService;
+    private MaterialServiceImpl materialService;
 
     @Resource
-    private MaterialMapperDemo materialMapperDemo;
+    private MaterialMapper materialMapperDemo;
 
     @Test
     public void testCreateMaterial_success() {
@@ -46,14 +48,14 @@ public class MaterialServiceDemoImplTest extends BaseDbUnitTest {
         // 断言
         assertNotNull(materialId);
         // 校验记录的属性是否正确
-        MaterialDODemo material = materialMapperDemo.selectById(materialId);
+        MaterialDO material = materialMapperDemo.selectById(materialId);
         assertPojoEquals(reqVO, material);
     }
 
     @Test
     public void testUpdateMaterial_success() {
         // mock 数据
-        MaterialDODemo dbMaterial = randomPojo(MaterialDODemo.class);
+        MaterialDO dbMaterial = randomPojo(MaterialDO.class);
         materialMapperDemo.insert(dbMaterial);// @Sql: 先插入出一条存在的数据
         // 准备参数
         MaterialUpdateReqVO reqVO = randomPojo(MaterialUpdateReqVO.class, o -> {
@@ -63,7 +65,7 @@ public class MaterialServiceDemoImplTest extends BaseDbUnitTest {
         // 调用
         materialService.updateMaterial(reqVO);
         // 校验是否更新正确
-        MaterialDODemo material = materialMapperDemo.selectById(reqVO.getId()); // 获取最新的
+        MaterialDO material = materialMapperDemo.selectById(reqVO.getId()); // 获取最新的
         assertPojoEquals(reqVO, material);
     }
 
@@ -79,7 +81,7 @@ public class MaterialServiceDemoImplTest extends BaseDbUnitTest {
     @Test
     public void testDeleteMaterial_success() {
         // mock 数据
-        MaterialDODemo dbMaterial = randomPojo(MaterialDODemo.class);
+        MaterialDO dbMaterial = randomPojo(MaterialDO.class);
         materialMapperDemo.insert(dbMaterial);// @Sql: 先插入出一条存在的数据
         // 准备参数
         Long id = dbMaterial.getId();
@@ -103,7 +105,7 @@ public class MaterialServiceDemoImplTest extends BaseDbUnitTest {
     @Disabled  // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解
     public void testGetMaterialPage() {
        // mock 数据
-       MaterialDODemo dbMaterial = randomPojo(MaterialDODemo.class, o -> { // 等会查询到
+       MaterialDO dbMaterial = randomPojo(MaterialDO.class, o -> { // 等会查询到
            o.setName(null);
            o.setStatus(null);
            o.setType(null);
@@ -130,7 +132,7 @@ public class MaterialServiceDemoImplTest extends BaseDbUnitTest {
        reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
 
        // 调用
-       PageResult<MaterialDODemo> pageResult = materialService.getMaterialPage(reqVO);
+       PageResult<MaterialDO> pageResult = materialService.getMaterialPage(reqVO);
        // 断言
        assertEquals(1, pageResult.getTotal());
        assertEquals(1, pageResult.getList().size());
@@ -141,7 +143,7 @@ public class MaterialServiceDemoImplTest extends BaseDbUnitTest {
     @Disabled  // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解
     public void testGetMaterialList() {
        // mock 数据
-       MaterialDODemo dbMaterial = randomPojo(MaterialDODemo.class, o -> { // 等会查询到
+       MaterialDO dbMaterial = randomPojo(MaterialDO.class, o -> { // 等会查询到
            o.setName(null);
            o.setStatus(null);
            o.setType(null);
@@ -168,7 +170,7 @@ public class MaterialServiceDemoImplTest extends BaseDbUnitTest {
        reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
 
        // 调用
-       List<MaterialDODemo> list = materialService.getMaterialList(reqVO);
+       List<MaterialDO> list = materialService.getMaterialList(reqVO);
        // 断言
        assertEquals(1, list.size());
        assertPojoEquals(dbMaterial, list.get(0));

yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/material/MaterialController.java

@@ -1,32 +1,29 @@
 package com.yunxi.scm.module.xxjj.controller.admin.material;
 
+import com.yunxi.scm.framework.common.pojo.CommonResult;
+import com.yunxi.scm.framework.common.pojo.PageResult;
+import com.yunxi.scm.framework.excel.core.util.ExcelUtils;
+import com.yunxi.scm.framework.operatelog.core.annotations.OperateLog;
 import com.yunxi.scm.module.xxjj.controller.admin.material.vo.*;
 import com.yunxi.scm.module.xxjj.convert.material.MaterialConvert;
 import com.yunxi.scm.module.xxjj.dal.dataobject.material.MaterialDO;
 import com.yunxi.scm.module.xxjj.service.material.MaterialService;
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.security.access.prepost.PreAuthorize;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
 
-import javax.validation.*;
+import javax.annotation.Resource;
-import javax.servlet.http.*;
+import javax.servlet.http.HttpServletResponse;
-import java.util.*;
+import javax.validation.Valid;
 import java.io.IOException;
+import java.util.Collection;
+import java.util.List;
 
-import com.yunxi.scm.framework.common.pojo.PageResult;
-import com.yunxi.scm.framework.common.pojo.CommonResult;
 import static com.yunxi.scm.framework.common.pojo.CommonResult.success;
-
+import static com.yunxi.scm.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
-import com.yunxi.scm.framework.excel.core.util.ExcelUtils;
-
-import com.yunxi.scm.framework.operatelog.core.annotations.OperateLog;
-import static com.yunxi.scm.framework.operatelog.core.enums.OperateTypeEnum.*;
-
-import com.yunxi.scm.module.xxjj.controller.admin.material.vo.*;
 
 @Tag(name = "管理后台 - 物料")
 @RestController