From 5515d5d1581e9eed08828064a38e9dedd9309578 Mon Sep 17 00:00:00 2001 From: gaoqr <13665037151@163.com> Date: Thu, 11 Jul 2024 16:55:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E5=9F=BA=E7=A1=80=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=EF=BC=9A=E7=9B=AE=E5=BD=95=E7=BB=93=E6=9E=84=E7=BB=86?= =?UTF-8?q?=E5=88=86=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ReportDatasetController.java | 12 ++++++------ .../vo/ReportDatasetFieldVO.java | 2 +- .../vo/ReportDatasetParameterVO.java | 2 +- .../vo/ReportDatasetReqVO.java | 2 +- .../vo/ReportDatasetRespVO.java | 2 +- .../vo/ReportDatasetSaveReqVO.java | 2 +- .../ReportDatasourceController.java | 12 ++++++------ .../vo/ReportDatasourceReqVO.java | 2 +- .../vo/ReportDatasourceRespVO.java | 3 ++- .../vo/ReportDatasourceSaveReqVO.java | 3 ++- .../admin/template/vo/ReportTemplateRespVO.java | 1 + .../admin/template/vo/ReportTemplateSaveReqVO.java | 2 +- .../{template => dataset}/ReportDatasetDO.java | 6 +++--- .../ReportDatasourceDO.java | 3 ++- .../dal/dataobject/template/ReportTemplateDO.java | 1 + .../{template => dataset}/ReportDatasetMapper.java | 4 ++-- .../ReportDatasourceMapper.java | 4 ++-- .../ReportDatasetService.java | 8 ++++---- .../ReportDatasetServiceImpl.java | 10 +++++----- .../ReportDatasourceService.java | 10 ++++++---- .../ReportDatasourceServiceImpl.java | 10 +++++----- .../template/ReportTemplateServiceImpl.java | 14 ++++++++------ .../template/ReportCommonServiceImplTest.java | 8 ++++---- .../template/ReportDatasetServiceImplTest.java | 9 +++++++-- .../template/ReportDatasourceServiceImplTest.java | 7 ++++--- 25 files changed, 77 insertions(+), 62 deletions(-) rename cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/{template => dataset}/ReportDatasetController.java (86%) rename cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/{template => dataset}/vo/ReportDatasetFieldVO.java (89%) rename cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/{template => dataset}/vo/ReportDatasetParameterVO.java (92%) rename cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/{template => dataset}/vo/ReportDatasetReqVO.java (91%) rename cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/{template => dataset}/vo/ReportDatasetRespVO.java (94%) rename cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/{template => dataset}/vo/ReportDatasetSaveReqVO.java (94%) rename cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/{template => datasource}/ReportDatasourceController.java (87%) rename cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/{template => datasource}/vo/ReportDatasourceReqVO.java (91%) rename cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/{template => datasource}/vo/ReportDatasourceRespVO.java (90%) rename cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/{template => datasource}/vo/ReportDatasourceSaveReqVO.java (90%) rename cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/dal/dataobject/{template => dataset}/ReportDatasetDO.java (88%) rename cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/dal/dataobject/{template => datasource}/ReportDatasourceDO.java (91%) rename cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/dal/mysql/{template => dataset}/ReportDatasetMapper.java (68%) rename cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/dal/mysql/{template => datasource}/ReportDatasourceMapper.java (67%) rename cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/service/{template => dataset}/ReportDatasetService.java (81%) rename cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/service/{template => dataset}/ReportDatasetServiceImpl.java (88%) rename cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/service/{template => datasource}/ReportDatasourceService.java (76%) rename cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/service/{template => datasource}/ReportDatasourceServiceImpl.java (86%) diff --git a/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/template/ReportDatasetController.java b/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/dataset/ReportDatasetController.java similarity index 86% rename from cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/template/ReportDatasetController.java rename to cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/dataset/ReportDatasetController.java index 95eee00bd..2a971c838 100644 --- a/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/template/ReportDatasetController.java +++ b/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/dataset/ReportDatasetController.java @@ -1,12 +1,12 @@ -package com.cf.imes.module.report.controller.admin.template; +package com.cf.imes.module.report.controller.admin.dataset; import com.cf.imes.framework.common.pojo.CommonResult; import com.cf.imes.framework.common.util.object.BeanUtils; -import com.cf.imes.module.report.controller.admin.template.vo.ReportDatasetReqVO; -import com.cf.imes.module.report.controller.admin.template.vo.ReportDatasetRespVO; -import com.cf.imes.module.report.controller.admin.template.vo.ReportDatasetSaveReqVO; -import com.cf.imes.module.report.dal.dataobject.template.ReportDatasetDO; -import com.cf.imes.module.report.service.template.ReportDatasetService; +import com.cf.imes.module.report.controller.admin.dataset.vo.ReportDatasetReqVO; +import com.cf.imes.module.report.controller.admin.dataset.vo.ReportDatasetRespVO; +import com.cf.imes.module.report.controller.admin.dataset.vo.ReportDatasetSaveReqVO; +import com.cf.imes.module.report.dal.dataobject.dataset.ReportDatasetDO; +import com.cf.imes.module.report.service.dataset.ReportDatasetService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/template/vo/ReportDatasetFieldVO.java b/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/dataset/vo/ReportDatasetFieldVO.java similarity index 89% rename from cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/template/vo/ReportDatasetFieldVO.java rename to cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/dataset/vo/ReportDatasetFieldVO.java index 9b9ce8542..e2eeef6bf 100644 --- a/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/template/vo/ReportDatasetFieldVO.java +++ b/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/dataset/vo/ReportDatasetFieldVO.java @@ -1,4 +1,4 @@ -package com.cf.imes.module.report.controller.admin.template.vo; +package com.cf.imes.module.report.controller.admin.dataset.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/template/vo/ReportDatasetParameterVO.java b/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/dataset/vo/ReportDatasetParameterVO.java similarity index 92% rename from cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/template/vo/ReportDatasetParameterVO.java rename to cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/dataset/vo/ReportDatasetParameterVO.java index c2be9590a..b78774a24 100644 --- a/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/template/vo/ReportDatasetParameterVO.java +++ b/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/dataset/vo/ReportDatasetParameterVO.java @@ -1,4 +1,4 @@ -package com.cf.imes.module.report.controller.admin.template.vo; +package com.cf.imes.module.report.controller.admin.dataset.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/template/vo/ReportDatasetReqVO.java b/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/dataset/vo/ReportDatasetReqVO.java similarity index 91% rename from cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/template/vo/ReportDatasetReqVO.java rename to cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/dataset/vo/ReportDatasetReqVO.java index f3efa38cd..f91b103d9 100644 --- a/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/template/vo/ReportDatasetReqVO.java +++ b/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/dataset/vo/ReportDatasetReqVO.java @@ -1,4 +1,4 @@ -package com.cf.imes.module.report.controller.admin.template.vo; +package com.cf.imes.module.report.controller.admin.dataset.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/template/vo/ReportDatasetRespVO.java b/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/dataset/vo/ReportDatasetRespVO.java similarity index 94% rename from cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/template/vo/ReportDatasetRespVO.java rename to cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/dataset/vo/ReportDatasetRespVO.java index da440041d..dc88d8a7a 100644 --- a/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/template/vo/ReportDatasetRespVO.java +++ b/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/dataset/vo/ReportDatasetRespVO.java @@ -1,4 +1,4 @@ -package com.cf.imes.module.report.controller.admin.template.vo; +package com.cf.imes.module.report.controller.admin.dataset.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/template/vo/ReportDatasetSaveReqVO.java b/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/dataset/vo/ReportDatasetSaveReqVO.java similarity index 94% rename from cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/template/vo/ReportDatasetSaveReqVO.java rename to cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/dataset/vo/ReportDatasetSaveReqVO.java index 17a91107f..f9257b07f 100644 --- a/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/template/vo/ReportDatasetSaveReqVO.java +++ b/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/dataset/vo/ReportDatasetSaveReqVO.java @@ -1,4 +1,4 @@ -package com.cf.imes.module.report.controller.admin.template.vo; +package com.cf.imes.module.report.controller.admin.dataset.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/template/ReportDatasourceController.java b/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/datasource/ReportDatasourceController.java similarity index 87% rename from cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/template/ReportDatasourceController.java rename to cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/datasource/ReportDatasourceController.java index c085b5e53..63c9955f3 100644 --- a/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/template/ReportDatasourceController.java +++ b/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/datasource/ReportDatasourceController.java @@ -1,12 +1,12 @@ -package com.cf.imes.module.report.controller.admin.template; +package com.cf.imes.module.report.controller.admin.datasource; import com.cf.imes.framework.common.pojo.CommonResult; import com.cf.imes.framework.common.util.object.BeanUtils; -import com.cf.imes.module.report.controller.admin.template.vo.ReportDatasourceReqVO; -import com.cf.imes.module.report.controller.admin.template.vo.ReportDatasourceRespVO; -import com.cf.imes.module.report.controller.admin.template.vo.ReportDatasourceSaveReqVO; -import com.cf.imes.module.report.dal.dataobject.template.ReportDatasourceDO; -import com.cf.imes.module.report.service.template.ReportDatasourceService; +import com.cf.imes.module.report.controller.admin.datasource.vo.ReportDatasourceReqVO; +import com.cf.imes.module.report.controller.admin.datasource.vo.ReportDatasourceRespVO; +import com.cf.imes.module.report.controller.admin.datasource.vo.ReportDatasourceSaveReqVO; +import com.cf.imes.module.report.dal.dataobject.datasource.ReportDatasourceDO; +import com.cf.imes.module.report.service.datasource.ReportDatasourceService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/template/vo/ReportDatasourceReqVO.java b/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/datasource/vo/ReportDatasourceReqVO.java similarity index 91% rename from cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/template/vo/ReportDatasourceReqVO.java rename to cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/datasource/vo/ReportDatasourceReqVO.java index fef00a43a..9fc3c5ca8 100644 --- a/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/template/vo/ReportDatasourceReqVO.java +++ b/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/datasource/vo/ReportDatasourceReqVO.java @@ -1,4 +1,4 @@ -package com.cf.imes.module.report.controller.admin.template.vo; +package com.cf.imes.module.report.controller.admin.datasource.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/template/vo/ReportDatasourceRespVO.java b/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/datasource/vo/ReportDatasourceRespVO.java similarity index 90% rename from cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/template/vo/ReportDatasourceRespVO.java rename to cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/datasource/vo/ReportDatasourceRespVO.java index 74d7a875f..2921db9af 100644 --- a/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/template/vo/ReportDatasourceRespVO.java +++ b/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/datasource/vo/ReportDatasourceRespVO.java @@ -1,5 +1,6 @@ -package com.cf.imes.module.report.controller.admin.template.vo; +package com.cf.imes.module.report.controller.admin.datasource.vo; +import com.cf.imes.module.report.controller.admin.dataset.vo.ReportDatasetRespVO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/template/vo/ReportDatasourceSaveReqVO.java b/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/datasource/vo/ReportDatasourceSaveReqVO.java similarity index 90% rename from cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/template/vo/ReportDatasourceSaveReqVO.java rename to cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/datasource/vo/ReportDatasourceSaveReqVO.java index d34aeccca..cce0b9d30 100644 --- a/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/template/vo/ReportDatasourceSaveReqVO.java +++ b/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/datasource/vo/ReportDatasourceSaveReqVO.java @@ -1,5 +1,6 @@ -package com.cf.imes.module.report.controller.admin.template.vo; +package com.cf.imes.module.report.controller.admin.datasource.vo; +import com.cf.imes.module.report.controller.admin.dataset.vo.ReportDatasetSaveReqVO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/template/vo/ReportTemplateRespVO.java b/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/template/vo/ReportTemplateRespVO.java index 3dcf50627..7479e566b 100644 --- a/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/template/vo/ReportTemplateRespVO.java +++ b/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/template/vo/ReportTemplateRespVO.java @@ -1,5 +1,6 @@ package com.cf.imes.module.report.controller.admin.template.vo; +import com.cf.imes.module.report.controller.admin.datasource.vo.ReportDatasourceRespVO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/template/vo/ReportTemplateSaveReqVO.java b/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/template/vo/ReportTemplateSaveReqVO.java index 9ecc67bb7..9f7bdbfce 100644 --- a/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/template/vo/ReportTemplateSaveReqVO.java +++ b/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/template/vo/ReportTemplateSaveReqVO.java @@ -1,12 +1,12 @@ package com.cf.imes.module.report.controller.admin.template.vo; +import com.cf.imes.module.report.controller.admin.datasource.vo.ReportDatasourceSaveReqVO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import java.io.Serializable; import java.util.List; /** diff --git a/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/dal/dataobject/template/ReportDatasetDO.java b/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/dal/dataobject/dataset/ReportDatasetDO.java similarity index 88% rename from cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/dal/dataobject/template/ReportDatasetDO.java rename to cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/dal/dataobject/dataset/ReportDatasetDO.java index 38d9d5a50..d998f5446 100644 --- a/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/dal/dataobject/template/ReportDatasetDO.java +++ b/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/dal/dataobject/dataset/ReportDatasetDO.java @@ -1,4 +1,4 @@ -package com.cf.imes.module.report.dal.dataobject.template; +package com.cf.imes.module.report.dal.dataobject.dataset; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableField; @@ -7,8 +7,8 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.cf.imes.framework.mybatis.core.dataobject.BaseDO; import com.cf.imes.framework.mybatis.core.type.CompressObjectListTypeHandler; import com.cf.imes.framework.mybatis.core.type.CompressStringTypeHandler; -import com.cf.imes.module.report.controller.admin.template.vo.ReportDatasetFieldVO; -import com.cf.imes.module.report.controller.admin.template.vo.ReportDatasetParameterVO; +import com.cf.imes.module.report.controller.admin.dataset.vo.ReportDatasetFieldVO; +import com.cf.imes.module.report.controller.admin.dataset.vo.ReportDatasetParameterVO; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/dal/dataobject/template/ReportDatasourceDO.java b/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/dal/dataobject/datasource/ReportDatasourceDO.java similarity index 91% rename from cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/dal/dataobject/template/ReportDatasourceDO.java rename to cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/dal/dataobject/datasource/ReportDatasourceDO.java index 148c79153..37eecdb03 100644 --- a/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/dal/dataobject/template/ReportDatasourceDO.java +++ b/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/dal/dataobject/datasource/ReportDatasourceDO.java @@ -1,10 +1,11 @@ -package com.cf.imes.module.report.dal.dataobject.template; +package com.cf.imes.module.report.dal.dataobject.datasource; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.cf.imes.framework.mybatis.core.dataobject.BaseDO; +import com.cf.imes.module.report.dal.dataobject.dataset.ReportDatasetDO; import lombok.*; import java.util.List; diff --git a/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/dal/dataobject/template/ReportTemplateDO.java b/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/dal/dataobject/template/ReportTemplateDO.java index 535159f0b..ad550a9a7 100644 --- a/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/dal/dataobject/template/ReportTemplateDO.java +++ b/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/dal/dataobject/template/ReportTemplateDO.java @@ -2,6 +2,7 @@ package com.cf.imes.module.report.dal.dataobject.template; import com.baomidou.mybatisplus.annotation.*; import com.cf.imes.framework.mybatis.core.dataobject.BaseDO; +import com.cf.imes.module.report.dal.dataobject.datasource.ReportDatasourceDO; import lombok.*; import java.util.List; diff --git a/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/dal/mysql/template/ReportDatasetMapper.java b/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/dal/mysql/dataset/ReportDatasetMapper.java similarity index 68% rename from cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/dal/mysql/template/ReportDatasetMapper.java rename to cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/dal/mysql/dataset/ReportDatasetMapper.java index 9e8e20c77..51a4cc91b 100644 --- a/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/dal/mysql/template/ReportDatasetMapper.java +++ b/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/dal/mysql/dataset/ReportDatasetMapper.java @@ -1,7 +1,7 @@ -package com.cf.imes.module.report.dal.mysql.template; +package com.cf.imes.module.report.dal.mysql.dataset; import com.cf.imes.framework.mybatis.core.mapper.BaseMapperX; -import com.cf.imes.module.report.dal.dataobject.template.ReportDatasetDO; +import com.cf.imes.module.report.dal.dataobject.dataset.ReportDatasetDO; import org.apache.ibatis.annotations.Mapper; /** diff --git a/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/dal/mysql/template/ReportDatasourceMapper.java b/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/dal/mysql/datasource/ReportDatasourceMapper.java similarity index 67% rename from cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/dal/mysql/template/ReportDatasourceMapper.java rename to cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/dal/mysql/datasource/ReportDatasourceMapper.java index 0cca2271a..d0bb8dbf4 100644 --- a/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/dal/mysql/template/ReportDatasourceMapper.java +++ b/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/dal/mysql/datasource/ReportDatasourceMapper.java @@ -1,7 +1,7 @@ -package com.cf.imes.module.report.dal.mysql.template; +package com.cf.imes.module.report.dal.mysql.datasource; import com.cf.imes.framework.mybatis.core.mapper.BaseMapperX; -import com.cf.imes.module.report.dal.dataobject.template.ReportDatasourceDO; +import com.cf.imes.module.report.dal.dataobject.datasource.ReportDatasourceDO; import org.apache.ibatis.annotations.Mapper; /** diff --git a/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/service/template/ReportDatasetService.java b/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/service/dataset/ReportDatasetService.java similarity index 81% rename from cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/service/template/ReportDatasetService.java rename to cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/service/dataset/ReportDatasetService.java index 083ce154e..154dd68eb 100644 --- a/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/service/template/ReportDatasetService.java +++ b/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/service/dataset/ReportDatasetService.java @@ -1,8 +1,8 @@ -package com.cf.imes.module.report.service.template; +package com.cf.imes.module.report.service.dataset; -import com.cf.imes.module.report.controller.admin.template.vo.ReportDatasetReqVO; -import com.cf.imes.module.report.controller.admin.template.vo.ReportDatasetSaveReqVO; -import com.cf.imes.module.report.dal.dataobject.template.ReportDatasetDO; +import com.cf.imes.module.report.controller.admin.dataset.vo.ReportDatasetReqVO; +import com.cf.imes.module.report.controller.admin.dataset.vo.ReportDatasetSaveReqVO; +import com.cf.imes.module.report.dal.dataobject.dataset.ReportDatasetDO; import javax.validation.Valid; import java.util.List; diff --git a/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/service/template/ReportDatasetServiceImpl.java b/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/service/dataset/ReportDatasetServiceImpl.java similarity index 88% rename from cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/service/template/ReportDatasetServiceImpl.java rename to cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/service/dataset/ReportDatasetServiceImpl.java index affcc376b..f4e37b2b0 100644 --- a/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/service/template/ReportDatasetServiceImpl.java +++ b/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/service/dataset/ReportDatasetServiceImpl.java @@ -1,12 +1,12 @@ -package com.cf.imes.module.report.service.template; +package com.cf.imes.module.report.service.dataset; import cn.hutool.core.collection.CollUtil; import com.cf.imes.framework.common.util.object.BeanUtils; import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX; -import com.cf.imes.module.report.controller.admin.template.vo.ReportDatasetReqVO; -import com.cf.imes.module.report.controller.admin.template.vo.ReportDatasetSaveReqVO; -import com.cf.imes.module.report.dal.dataobject.template.ReportDatasetDO; -import com.cf.imes.module.report.dal.mysql.template.ReportDatasetMapper; +import com.cf.imes.module.report.controller.admin.dataset.vo.ReportDatasetReqVO; +import com.cf.imes.module.report.controller.admin.dataset.vo.ReportDatasetSaveReqVO; +import com.cf.imes.module.report.dal.dataobject.dataset.ReportDatasetDO; +import com.cf.imes.module.report.dal.mysql.dataset.ReportDatasetMapper; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; diff --git a/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/service/template/ReportDatasourceService.java b/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/service/datasource/ReportDatasourceService.java similarity index 76% rename from cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/service/template/ReportDatasourceService.java rename to cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/service/datasource/ReportDatasourceService.java index cfc0e5d04..153fd6b03 100644 --- a/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/service/template/ReportDatasourceService.java +++ b/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/service/datasource/ReportDatasourceService.java @@ -1,8 +1,8 @@ -package com.cf.imes.module.report.service.template; +package com.cf.imes.module.report.service.datasource; -import com.cf.imes.module.report.controller.admin.template.vo.ReportDatasourceReqVO; -import com.cf.imes.module.report.controller.admin.template.vo.ReportDatasourceSaveReqVO; -import com.cf.imes.module.report.dal.dataobject.template.ReportDatasourceDO; +import com.cf.imes.module.report.controller.admin.datasource.vo.ReportDatasourceReqVO; +import com.cf.imes.module.report.controller.admin.datasource.vo.ReportDatasourceSaveReqVO; +import com.cf.imes.module.report.dal.dataobject.datasource.ReportDatasourceDO; import javax.validation.Valid; import java.util.List; @@ -51,4 +51,6 @@ public interface ReportDatasourceService { * @return 报表数据源分页 */ List getTemplateDatasourceList(ReportDatasourceReqVO reqVO); + + } diff --git a/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/service/template/ReportDatasourceServiceImpl.java b/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/service/datasource/ReportDatasourceServiceImpl.java similarity index 86% rename from cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/service/template/ReportDatasourceServiceImpl.java rename to cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/service/datasource/ReportDatasourceServiceImpl.java index 62bedc213..cd7544378 100644 --- a/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/service/template/ReportDatasourceServiceImpl.java +++ b/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/service/datasource/ReportDatasourceServiceImpl.java @@ -1,11 +1,11 @@ -package com.cf.imes.module.report.service.template; +package com.cf.imes.module.report.service.datasource; import com.cf.imes.framework.common.util.object.BeanUtils; import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX; -import com.cf.imes.module.report.controller.admin.template.vo.ReportDatasourceReqVO; -import com.cf.imes.module.report.controller.admin.template.vo.ReportDatasourceSaveReqVO; -import com.cf.imes.module.report.dal.dataobject.template.ReportDatasourceDO; -import com.cf.imes.module.report.dal.mysql.template.ReportDatasourceMapper; +import com.cf.imes.module.report.controller.admin.datasource.vo.ReportDatasourceReqVO; +import com.cf.imes.module.report.controller.admin.datasource.vo.ReportDatasourceSaveReqVO; +import com.cf.imes.module.report.dal.dataobject.datasource.ReportDatasourceDO; +import com.cf.imes.module.report.dal.mysql.datasource.ReportDatasourceMapper; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; diff --git a/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/service/template/ReportTemplateServiceImpl.java b/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/service/template/ReportTemplateServiceImpl.java index 488830c85..bbe73c9fe 100644 --- a/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/service/template/ReportTemplateServiceImpl.java +++ b/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/service/template/ReportTemplateServiceImpl.java @@ -5,17 +5,19 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.URLUtil; import com.cf.imes.framework.common.util.object.BeanUtils; import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX; -import com.cf.imes.module.report.controller.admin.template.vo.ReportDatasetReqVO; -import com.cf.imes.module.report.controller.admin.template.vo.ReportDatasetSaveReqVO; -import com.cf.imes.module.report.controller.admin.template.vo.ReportDatasourceReqVO; -import com.cf.imes.module.report.controller.admin.template.vo.ReportDatasourceSaveReqVO; +import com.cf.imes.module.report.controller.admin.dataset.vo.ReportDatasetReqVO; +import com.cf.imes.module.report.controller.admin.dataset.vo.ReportDatasetSaveReqVO; +import com.cf.imes.module.report.controller.admin.datasource.vo.ReportDatasourceReqVO; +import com.cf.imes.module.report.controller.admin.datasource.vo.ReportDatasourceSaveReqVO; import com.cf.imes.module.report.controller.admin.template.vo.ReportTemplateReqVO; import com.cf.imes.module.report.controller.admin.template.vo.ReportTemplateSaveReqVO; -import com.cf.imes.module.report.dal.dataobject.template.ReportDatasetDO; -import com.cf.imes.module.report.dal.dataobject.template.ReportDatasourceDO; +import com.cf.imes.module.report.dal.dataobject.dataset.ReportDatasetDO; +import com.cf.imes.module.report.dal.dataobject.datasource.ReportDatasourceDO; import com.cf.imes.module.report.dal.dataobject.template.ReportTemplateDO; import com.cf.imes.module.report.dal.mysql.template.ReportTemplateMapper; import com.cf.imes.module.report.enums.ErrorCodeConstants; +import com.cf.imes.module.report.service.dataset.ReportDatasetService; +import com.cf.imes.module.report.service.datasource.ReportDatasourceService; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/cf-module-report/cf-module-report-biz/src/test/java/com/cf/imes/module/report/service/template/ReportCommonServiceImplTest.java b/cf-module-report/cf-module-report-biz/src/test/java/com/cf/imes/module/report/service/template/ReportCommonServiceImplTest.java index 9de16789d..b38f44f96 100644 --- a/cf-module-report/cf-module-report-biz/src/test/java/com/cf/imes/module/report/service/template/ReportCommonServiceImplTest.java +++ b/cf-module-report/cf-module-report-biz/src/test/java/com/cf/imes/module/report/service/template/ReportCommonServiceImplTest.java @@ -2,10 +2,10 @@ package com.cf.imes.module.report.service.template; import com.cf.imes.framework.organ.core.context.OrganContextHolder; import com.cf.imes.framework.test.core.util.RandomUtils; -import com.cf.imes.module.report.controller.admin.template.vo.ReportDatasetFieldVO; -import com.cf.imes.module.report.controller.admin.template.vo.ReportDatasetParameterVO; -import com.cf.imes.module.report.controller.admin.template.vo.ReportDatasetSaveReqVO; -import com.cf.imes.module.report.controller.admin.template.vo.ReportDatasourceSaveReqVO; +import com.cf.imes.module.report.controller.admin.dataset.vo.ReportDatasetFieldVO; +import com.cf.imes.module.report.controller.admin.dataset.vo.ReportDatasetParameterVO; +import com.cf.imes.module.report.controller.admin.dataset.vo.ReportDatasetSaveReqVO; +import com.cf.imes.module.report.controller.admin.datasource.vo.ReportDatasourceSaveReqVO; import com.cf.imes.module.report.controller.admin.template.vo.ReportTemplateSaveReqVO; import com.cf.imes.module.report.enums.template.ReportTemplateTypeEnum; diff --git a/cf-module-report/cf-module-report-biz/src/test/java/com/cf/imes/module/report/service/template/ReportDatasetServiceImplTest.java b/cf-module-report/cf-module-report-biz/src/test/java/com/cf/imes/module/report/service/template/ReportDatasetServiceImplTest.java index 87f8acef3..bdf1d5c86 100644 --- a/cf-module-report/cf-module-report-biz/src/test/java/com/cf/imes/module/report/service/template/ReportDatasetServiceImplTest.java +++ b/cf-module-report/cf-module-report-biz/src/test/java/com/cf/imes/module/report/service/template/ReportDatasetServiceImplTest.java @@ -1,10 +1,15 @@ package com.cf.imes.module.report.service.template; import com.cf.imes.framework.test.core.util.RandomUtils; +import com.cf.imes.module.report.controller.admin.dataset.vo.ReportDatasetReqVO; +import com.cf.imes.module.report.controller.admin.dataset.vo.ReportDatasetSaveReqVO; +import com.cf.imes.module.report.controller.admin.datasource.vo.ReportDatasourceSaveReqVO; import com.cf.imes.module.report.controller.admin.template.vo.*; -import com.cf.imes.module.report.dal.dataobject.template.ReportDatasetDO; -import com.cf.imes.module.report.dal.dataobject.template.ReportDatasourceDO; +import com.cf.imes.module.report.dal.dataobject.dataset.ReportDatasetDO; +import com.cf.imes.module.report.dal.dataobject.datasource.ReportDatasourceDO; import com.cf.imes.module.report.dal.dataobject.template.ReportTemplateDO; +import com.cf.imes.module.report.service.dataset.ReportDatasetService; +import com.cf.imes.module.report.service.datasource.ReportDatasourceService; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; diff --git a/cf-module-report/cf-module-report-biz/src/test/java/com/cf/imes/module/report/service/template/ReportDatasourceServiceImplTest.java b/cf-module-report/cf-module-report-biz/src/test/java/com/cf/imes/module/report/service/template/ReportDatasourceServiceImplTest.java index 2be30e4d6..89716203e 100644 --- a/cf-module-report/cf-module-report-biz/src/test/java/com/cf/imes/module/report/service/template/ReportDatasourceServiceImplTest.java +++ b/cf-module-report/cf-module-report-biz/src/test/java/com/cf/imes/module/report/service/template/ReportDatasourceServiceImplTest.java @@ -1,12 +1,13 @@ package com.cf.imes.module.report.service.template; import com.cf.imes.framework.test.core.util.RandomUtils; -import com.cf.imes.module.report.controller.admin.template.vo.ReportDatasourceReqVO; -import com.cf.imes.module.report.controller.admin.template.vo.ReportDatasourceSaveReqVO; +import com.cf.imes.module.report.controller.admin.datasource.vo.ReportDatasourceReqVO; +import com.cf.imes.module.report.controller.admin.datasource.vo.ReportDatasourceSaveReqVO; import com.cf.imes.module.report.controller.admin.template.vo.ReportTemplateSaveReqVO; -import com.cf.imes.module.report.dal.dataobject.template.ReportDatasourceDO; +import com.cf.imes.module.report.dal.dataobject.datasource.ReportDatasourceDO; import com.cf.imes.module.report.dal.dataobject.template.ReportTemplateDO; import com.cf.imes.module.report.enums.template.ReportTemplateTypeEnum; +import com.cf.imes.module.report.service.datasource.ReportDatasourceService; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest;