【优化】ureport2菜单，初始化数据，按照规范重新进行命名处理

yudao-module-report/yudao-module-report-biz/src/test/java/cn/iocoder/yudao/module/report/service/ureport/UReportDataServiceImplTest.java

@@ -0,0 +1,135 @@
+package cn.iocoder.yudao.module.report.service.ureport;
+
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+
+import javax.annotation.Resource;
+
+import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
+
+import cn.iocoder.yudao.module.report.controller.admin.ureport.vo.*;
+import cn.iocoder.yudao.module.report.dal.dataobject.ureport.UReportDataDO;
+import cn.iocoder.yudao.module.report.dal.mysql.ureport.UReportDataMapper;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+
+import org.springframework.context.annotation.Import;
+
+import static cn.iocoder.yudao.module.report.enums.ErrorCodeConstants.*;
+import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.*;
+import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
+import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.*;
+import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.*;
+import static org.junit.jupiter.api.Assertions.*;
+
+/**
+ * {@link UReportDataServiceImpl} 的单元测试类
+ *
+ * @author 芋道源码
+ */
+@Import(UReportDataServiceImpl.class)
+public class UReportDataServiceImplTest extends BaseDbUnitTest {
+
+    @Resource
+    private UReportDataServiceImpl uReportDataService;
+
+    @Resource
+    private UReportDataMapper uReportDataMapper;
+
+    @Test
+    public void testCreateUReportData_success() {
+        // 准备参数
+        UReportDataSaveReqVO createReqVO = randomPojo(UReportDataSaveReqVO.class).setId(null);
+
+        // 调用
+        Long uReportDataId = uReportDataService.createUReportData(createReqVO);
+        // 断言
+        assertNotNull(uReportDataId);
+        // 校验记录的属性是否正确
+        UReportDataDO uReportData = uReportDataMapper.selectById(uReportDataId);
+        assertPojoEquals(createReqVO, uReportData, "id");
+    }
+
+    @Test
+    public void testUpdateUReportData_success() {
+        // mock 数据
+        UReportDataDO dbUReportData = randomPojo(UReportDataDO.class);
+        uReportDataMapper.insert(dbUReportData);// @Sql: 先插入出一条存在的数据
+        // 准备参数
+        UReportDataSaveReqVO updateReqVO = randomPojo(UReportDataSaveReqVO.class, o -> {
+            o.setId(dbUReportData.getId()); // 设置更新的 ID
+        });
+
+        // 调用
+        uReportDataService.updateUReportData(updateReqVO);
+        // 校验是否更新正确
+        UReportDataDO uReportData = uReportDataMapper.selectById(updateReqVO.getId()); // 获取最新的
+        assertPojoEquals(updateReqVO, uReportData);
+    }
+
+    @Test
+    public void testUpdateUReportData_notExists() {
+        // 准备参数
+        UReportDataSaveReqVO updateReqVO = randomPojo(UReportDataSaveReqVO.class);
+
+        // 调用, 并断言异常
+        assertServiceException(() -> uReportDataService.updateUReportData(updateReqVO), REPORT_DATA_NOT_EXISTS);
+    }
+
+    @Test
+    public void testDeleteUReportData_success() {
+        // mock 数据
+        UReportDataDO dbUReportData = randomPojo(UReportDataDO.class);
+        uReportDataMapper.insert(dbUReportData);// @Sql: 先插入出一条存在的数据
+        // 准备参数
+        Long id = dbUReportData.getId();
+
+        // 调用
+        uReportDataService.deleteUReportData(id);
+       // 校验数据不存在了
+       assertNull(uReportDataMapper.selectById(id));
+    }
+
+    @Test
+    public void testDeleteUReportData_notExists() {
+        // 准备参数
+        Long id = randomLongId();
+
+        // 调用, 并断言异常
+        assertServiceException(() -> uReportDataService.deleteUReportData(id), REPORT_DATA_NOT_EXISTS);
+    }
+
+    @Test
+    @Disabled  // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解
+    public void testGetUReportDataPage() {
+       // mock 数据
+       UReportDataDO dbUReportData = randomPojo(UReportDataDO.class, o -> { // 等会查询到
+           o.setName(null);
+           o.setStatus(null);
+           o.setRemark(null);
+           o.setCreateTime(null);
+       });
+       uReportDataMapper.insert(dbUReportData);
+       // 测试 name 不匹配
+       uReportDataMapper.insert(cloneIgnoreId(dbUReportData, o -> o.setName(null)));
+       // 测试 status 不匹配
+       uReportDataMapper.insert(cloneIgnoreId(dbUReportData, o -> o.setStatus(null)));
+       // 测试 remark 不匹配
+       uReportDataMapper.insert(cloneIgnoreId(dbUReportData, o -> o.setRemark(null)));
+       // 测试 createTime 不匹配
+       uReportDataMapper.insert(cloneIgnoreId(dbUReportData, o -> o.setCreateTime(null)));
+       // 准备参数
+       UReportDataPageReqVO reqVO = new UReportDataPageReqVO();
+       reqVO.setName(null);
+       reqVO.setStatus(null);
+       reqVO.setRemark(null);
+       reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
+
+       // 调用
+       PageResult<UReportDataDO> pageResult = uReportDataService.getUReportDataPage(reqVO);
+       // 断言
+       assertEquals(1, pageResult.getTotal());
+       assertEquals(1, pageResult.getList().size());
+       assertPojoEquals(dbUReportData, pageResult.getList().get(0));
+    }
+
+}

yudao-module-report/yudao-module-report-biz/src/test/java/cn/iocoder/yudao/module/report/service/ureport/UreportFileServiceImplTest.java

@@ -1,136 +0,0 @@
-package cn.iocoder.yudao.module.report.service.ureport;
-
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
-import cn.iocoder.yudao.module.report.controller.admin.ureport.vo.UreportFilePageReqVO;
-import cn.iocoder.yudao.module.report.controller.admin.ureport.vo.UreportFileSaveReqVO;
-import cn.iocoder.yudao.module.report.dal.dataobject.ureport.UreportFileDO;
-import cn.iocoder.yudao.module.report.dal.mysql.ureport.UreportFileMapper;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-import org.springframework.context.annotation.Import;
-
-import javax.annotation.Resource;
-
-import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildBetweenTime;
-import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId;
-import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
-import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
-import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomLongId;
-import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo;
-import static cn.iocoder.yudao.module.report.enums.ErrorCodeConstants.UREPORT_FILE_NOT_EXISTS;
-import static org.junit.jupiter.api.Assertions.*;
-
-// TODO 芋艿：但愿测试后面补
-/**
- * {@link UreportFileServiceImpl} 的单元测试类
- *
- * @author 芋道源码
- */
-@Import(UreportFileServiceImpl.class)
-public class UreportFileServiceImplTest extends BaseDbUnitTest {
-
-    @Resource
-    private UreportFileServiceImpl ureportFileService;
-
-    @Resource
-    private UreportFileMapper ureportFileMapper;
-
-    @Test
-    public void testCreateUreportFile_success() {
-        // 准备参数
-        UreportFileSaveReqVO createReqVO = randomPojo(UreportFileSaveReqVO.class).setId(null);
-
-        // 调用
-        Long ureportFileId = ureportFileService.createUreportFile(createReqVO);
-        // 断言
-        assertNotNull(ureportFileId);
-        // 校验记录的属性是否正确
-        UreportFileDO ureportFile = ureportFileMapper.selectById(ureportFileId);
-        assertPojoEquals(createReqVO, ureportFile, "id");
-    }
-
-    @Test
-    public void testUpdateUreportFile_success() {
-        // mock 数据
-        UreportFileDO dbUreportFile = randomPojo(UreportFileDO.class);
-        ureportFileMapper.insert(dbUreportFile);// @Sql: 先插入出一条存在的数据
-        // 准备参数
-        UreportFileSaveReqVO updateReqVO = randomPojo(UreportFileSaveReqVO.class, o -> {
-            o.setId(dbUreportFile.getId()); // 设置更新的 ID
-        });
-
-        // 调用
-        ureportFileService.updateUreportFile(updateReqVO);
-        // 校验是否更新正确
-        UreportFileDO ureportFile = ureportFileMapper.selectById(updateReqVO.getId()); // 获取最新的
-        assertPojoEquals(updateReqVO, ureportFile);
-    }
-
-    @Test
-    public void testUpdateUreportFile_notExists() {
-        // 准备参数
-        UreportFileSaveReqVO updateReqVO = randomPojo(UreportFileSaveReqVO.class);
-
-        // 调用, 并断言异常
-        assertServiceException(() -> ureportFileService.updateUreportFile(updateReqVO), UREPORT_FILE_NOT_EXISTS);
-    }
-
-    @Test
-    public void testDeleteUreportFile_success() {
-        // mock 数据
-        UreportFileDO dbUreportFile = randomPojo(UreportFileDO.class);
-        ureportFileMapper.insert(dbUreportFile);// @Sql: 先插入出一条存在的数据
-        // 准备参数
-        Long id = dbUreportFile.getId();
-
-        // 调用
-        ureportFileService.deleteUreportFile(id);
-       // 校验数据不存在了
-       assertNull(ureportFileMapper.selectById(id));
-    }
-
-    @Test
-    public void testDeleteUreportFile_notExists() {
-        // 准备参数
-        Long id = randomLongId();
-
-        // 调用, 并断言异常
-        assertServiceException(() -> ureportFileService.deleteUreportFile(id), UREPORT_FILE_NOT_EXISTS);
-    }
-
-    @Test
-    @Disabled  // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解
-    public void testGetUreportFilePage() {
-       // mock 数据
-       UreportFileDO dbUreportFile = randomPojo(UreportFileDO.class, o -> { // 等会查询到
-           o.setFileName(null);
-           o.setStatus(null);
-           o.setRemark(null);
-           o.setCreateTime(null);
-       });
-       ureportFileMapper.insert(dbUreportFile);
-       // 测试 fileName 不匹配
-       ureportFileMapper.insert(cloneIgnoreId(dbUreportFile, o -> o.setFileName(null)));
-       // 测试 status 不匹配
-       ureportFileMapper.insert(cloneIgnoreId(dbUreportFile, o -> o.setStatus(null)));
-       // 测试 remark 不匹配
-       ureportFileMapper.insert(cloneIgnoreId(dbUreportFile, o -> o.setRemark(null)));
-       // 测试 createTime 不匹配
-       ureportFileMapper.insert(cloneIgnoreId(dbUreportFile, o -> o.setCreateTime(null)));
-       // 准备参数
-       UreportFilePageReqVO reqVO = new UreportFilePageReqVO();
-       reqVO.setFileName(null);
-       reqVO.setStatus(null);
-       reqVO.setRemark(null);
-       reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
-
-       // 调用
-       PageResult<UreportFileDO> pageResult = ureportFileService.getUreportFilePage(reqVO);
-       // 断言
-       assertEquals(1, pageResult.getTotal());
-       assertEquals(1, pageResult.getList().size());
-       assertPojoEquals(dbUreportFile, pageResult.getList().get(0));
-    }
-
-}

yudao-module-report/yudao-module-report-biz/src/test/resources/sql/clean.sql

@@ -1,2 +1,2 @@
 DELETE FROM "report_go_view_project";
-DELETE FROM "ureport_file";
+DELETE FROM "report_ureport_data";

yudao-module-report/yudao-module-report-biz/src/test/resources/sql/create_tables.sql

@@ -12,16 +12,16 @@ CREATE TABLE IF NOT EXISTS "report_go_view_project" (
     "deleted" bit NOT NULL DEFAULT FALSE,
     PRIMARY KEY ("id")
 ) COMMENT 'GoView 项目表';
-CREATE TABLE IF NOT EXISTS "ureport_file" (
-      "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY,
-      "file_name" varchar NOT NULL,
-      "status" int NOT NULL,
-      "file_content" varchar,
-      "remark" varchar,
-      "creator" varchar DEFAULT '',
-      "create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
-      "updater" varchar DEFAULT '',
-      "update_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-      "deleted" bit NOT NULL DEFAULT FALSE,
-      PRIMARY KEY ("id")
+CREATE TABLE IF NOT EXISTS "report_ureport_data" (
+     "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY,
+     "name" varchar NOT NULL,
+     "status" int NOT NULL,
+     "content" varchar,
+     "remark" varchar,
+     "creator" varchar DEFAULT '',
+     "create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+     "updater" varchar DEFAULT '',
+     "update_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+     "deleted" bit NOT NULL DEFAULT FALSE,
+     PRIMARY KEY ("id")
 ) COMMENT 'Ureport2报表';