From 258f4e628ec7f73c0131128b4c71eda25dcc51fb Mon Sep 17 00:00:00 2001 From: Raod <1130305001@qq.com> Date: Wed, 23 Jun 2021 14:17:22 +0800 Subject: [PATCH] modules --- doc/docs/.vuepress/config.js | 55 +++++++++++++++---- .../controller/ReportDashboardController.java | 8 +-- .../dashboard/controller/dto/ChartDto.java | 2 +- .../controller/dto/ReportDashboardDto.java | 6 +- .../dto/ReportDashboardObjectDto.java | 4 +- .../param/ReportDashboardParam.java | 4 +- .../dashboard/dao/ReportDashboardMapper.java | 6 +- .../dashboard/dao/entity/ReportDashboard.java | 2 +- .../dashboard/service/ChartStrategy.java | 4 +- .../service/ReportDashboardService.java | 10 ++-- .../service/impl/BarChartServiceImpl.java | 8 +-- .../service/impl/BarLineChartServiceImpl.java | 9 +-- .../service/impl/GaugeChartServiceImpl.java | 6 +- .../service/impl/PieChartServiceImpl.java | 6 +- .../impl/ReportDashboardServiceImpl.java | 32 +++++------ .../{data => }/dashboard/util/DateUtil.java | 2 +- .../dto/ReportDashboardWidgetDto.java | 2 +- .../dto/ReportDashboardWidgetValueDto.java | 2 +- .../param/ReportDashboardWidgetParam.java | 4 +- .../dao/ReportDashboardWidgetMapper.java | 6 +- .../dao/entity/ReportDashboardWidget.java | 2 +- .../service/ReportDashboardWidgetService.java | 8 +-- .../ReportDashboardWidgetServiceImpl.java | 10 ++-- .../data/report/service/ReportService.java | 17 ------ .../dataSet/controller/DataSetController.java | 12 ++-- .../dataSet/controller/dto/DataSetDto.java | 8 +-- .../controller/dto/OriginalDataDto.java | 2 +- .../controller/param/DataSetParam.java | 4 +- .../param/DataSetTestTransformParam.java | 8 +-- .../{data => }/dataSet/dao/DataSetMapper.java | 6 +- .../dataSet/dao/entity/DataSet.java | 2 +- .../dataSet/service/DataSetService.java | 10 ++-- .../service/impl/DataSetServiceImpl.java | 30 +++++----- .../controller/DataSetParamController.java | 15 +++-- .../controller/dto/DataSetParamDto.java | 4 +- .../controller/param/DataSetParamParam.java | 4 +- .../param/DataSetParamValidationParam.java | 2 +- .../dataSetParam/dao/DataSetParamMapper.java | 6 +- .../dataSetParam/dao/entity/DataSetParam.java | 2 +- .../service/DataSetParamService.java | 11 ++-- .../service/impl/DataSetParamServiceImpl.java | 12 ++-- .../util/ParamsResolverHelper.java | 2 +- .../DataSetTransformController.java | 12 ++-- .../controller/dto/DataSetTransformDto.java | 4 +- .../param/DataSetTransformParam.java | 4 +- .../dao/DataSetTransformMapper.java | 6 +- .../dao/entity/DataSetTransform.java | 2 +- .../service/DataSetTransformService.java | 10 ++-- .../service/TransformStrategy.java | 4 +- .../impl/DataSetTransformServiceImpl.java | 14 ++--- .../impl/DictTransformServiceImpl.java | 6 +- .../service/impl/JsTransformServiceImpl.java | 6 +- .../dataSource/config/HttpClientConfig.java | 2 +- .../config/HttpClientPoolConfig.java | 2 +- .../controller/DataSourceController.java | 14 ++--- .../controller/dto/DataSourceDto.java | 4 +- .../controller/param/ConnectionParam.java | 2 +- .../controller/param/DataSourceParam.java | 4 +- .../dataSource/dao/DataSourceMapper.java | 6 +- .../dataSource/dao/entity/DataSource.java | 2 +- .../dataSource/pool/api/IConfig.java | 2 +- .../pool/api/IDataSourceConfig.java | 2 +- .../dataSource/pool/api/ILifeCycle.java | 2 +- .../pool/api/IPooledDataSourceConfig.java | 4 +- .../pool/connection/IPooledConnection.java | 4 +- .../pool/connection/PooledConnection.java | 6 +- .../pool/constant/JdbcConstants.java | 2 +- .../dataSource/pool/constant/PooledConst.java | 2 +- .../datasource/AbstractDataSourceConfig.java | 2 +- .../AbstractPooledDataSourceConfig.java | 8 +-- .../datasource/DataSourceConfigAdaptor.java | 4 +- .../pool/datasource/PooledDataSource.java | 10 ++-- .../pool/datasource/UnPooledDataSource.java | 4 +- .../pool/exception/JdbcPoolException.java | 2 +- .../pool/util/DataSourceHandleUtil.java | 2 +- .../dataSource/pool/util/DriverClassUtil.java | 2 +- .../dataSource/pool/util/JdbcUtil.java | 8 +-- .../dataSource/service/DataSourceService.java | 14 ++--- .../service/impl/DataSourceServiceImpl.java | 21 ++++--- .../report/constant/ExpConstant.java | 2 +- .../report/controller/ReportController.java | 10 ++-- .../report/controller/dto/ReportDto.java | 2 +- .../report/controller/param/ReportParam.java | 2 +- .../{data => }/report/dao/ReportMapper.java | 4 +- .../{data => }/report/dao/entity/Report.java | 2 +- .../modules/report/service/ReportService.java | 17 ++++++ .../service/impl/ReportServiceImpl.java | 14 ++--- .../controller/ReportExcelController.java | 10 ++-- .../controller/dto/ReportExcelDto.java | 2 +- .../controller/param/ReportExcelParam.java | 2 +- .../reportexcel/dao/ReportExcelMapper.java | 4 +- .../reportexcel/dao/entity/ReportExcel.java | 2 +- .../service/ReportExcelService.java | 8 +-- .../service/impl/ReportExcelServiceImpl.java | 16 +++--- .../reportexcel/util/ReportUtil.java | 12 ++-- .../main/resources/mapper/DataSetMapper.xml | 6 +- .../resources/mapper/DataSetParamMapper.xml | 6 +- .../mapper/DataSetTransformMapper.xml | 6 +- .../resources/mapper/DataSourceMapper.xml | 6 +- .../mapper/ReportDashboardMapper.xml | 6 +- .../mapper/ReportDashboardWidgetMapper.xml | 4 +- .../resources/mapper/ReportExcelMapper.xml | 4 +- .../main/resources/mapper/ReportMapper.xml | 4 +- 103 files changed, 367 insertions(+), 344 deletions(-) rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/dashboard/controller/ReportDashboardController.java (81%) rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/dashboard/controller/dto/ChartDto.java (90%) rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/dashboard/controller/dto/ReportDashboardDto.java (84%) rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/dashboard/controller/dto/ReportDashboardObjectDto.java (70%) rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/dashboard/controller/param/ReportDashboardParam.java (82%) rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/dashboard/dao/ReportDashboardMapper.java (61%) rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/dashboard/dao/entity/ReportDashboard.java (94%) rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/dashboard/service/ChartStrategy.java (70%) rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/dashboard/service/ReportDashboardService.java (57%) rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/dashboard/service/impl/BarChartServiceImpl.java (84%) rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/dashboard/service/impl/BarLineChartServiceImpl.java (88%) rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/dashboard/service/impl/GaugeChartServiceImpl.java (73%) rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/dashboard/service/impl/PieChartServiceImpl.java (77%) rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/dashboard/service/impl/ReportDashboardServiceImpl.java (89%) rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/dashboard/util/DateUtil.java (94%) rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/dashboardwidget/controller/dto/ReportDashboardWidgetDto.java (81%) rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/dashboardwidget/controller/dto/ReportDashboardWidgetValueDto.java (90%) rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/dashboardwidget/controller/param/ReportDashboardWidgetParam.java (82%) rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/dashboardwidget/dao/ReportDashboardWidgetMapper.java (61%) rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/dashboardwidget/dao/entity/ReportDashboardWidget.java (93%) rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/dashboardwidget/service/ReportDashboardWidgetService.java (57%) rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/dashboardwidget/service/impl/ReportDashboardWidgetServiceImpl.java (66%) delete mode 100644 report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/report/service/ReportService.java rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/dataSet/controller/DataSetController.java (90%) rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/dataSet/controller/dto/DataSetDto.java (80%) rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/dataSet/controller/dto/OriginalDataDto.java (87%) rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/dataSet/controller/param/DataSetParam.java (88%) rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/dataSet/controller/param/DataSetTestTransformParam.java (69%) rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/dataSet/dao/DataSetMapper.java (62%) rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/dataSet/dao/entity/DataSet.java (94%) rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/dataSet/service/DataSetService.java (73%) rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/dataSet/service/impl/DataSetServiceImpl.java (89%) rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/dataSetParam/controller/DataSetParamController.java (71%) rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/dataSetParam/controller/dto/DataSetParamDto.java (92%) rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/dataSetParam/controller/param/DataSetParamParam.java (77%) rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/dataSetParam/controller/param/DataSetParamValidationParam.java (84%) rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/dataSetParam/dao/DataSetParamMapper.java (61%) rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/dataSetParam/dao/entity/DataSetParam.java (94%) rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/dataSetParam/service/DataSetParamService.java (69%) rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/dataSetParam/service/impl/DataSetParamServiceImpl.java (87%) rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/dataSetParam/util/ParamsResolverHelper.java (93%) rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/dataSetTransform/controller/DataSetTransformController.java (68%) rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/dataSetTransform/controller/dto/DataSetTransformDto.java (89%) rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/dataSetTransform/controller/param/DataSetTransformParam.java (77%) rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/dataSetTransform/dao/DataSetTransformMapper.java (60%) rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/dataSetTransform/dao/entity/DataSetTransform.java (92%) rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/dataSetTransform/service/DataSetTransformService.java (52%) rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/dataSetTransform/service/TransformStrategy.java (68%) rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/dataSetTransform/service/impl/DataSetTransformServiceImpl.java (78%) rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/dataSetTransform/service/impl/DictTransformServiceImpl.java (82%) rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/dataSetTransform/service/impl/JsTransformServiceImpl.java (85%) rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/dataSource/config/HttpClientConfig.java (99%) rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/dataSource/config/HttpClientPoolConfig.java (94%) rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/dataSource/controller/DataSourceController.java (74%) rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/dataSource/controller/dto/DataSourceDto.java (95%) rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/dataSource/controller/param/ConnectionParam.java (90%) rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/dataSource/controller/param/DataSourceParam.java (89%) rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/dataSource/dao/DataSourceMapper.java (61%) rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/dataSource/dao/entity/DataSource.java (95%) rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/dataSource/pool/api/IConfig.java (89%) rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/dataSource/pool/api/IDataSourceConfig.java (67%) rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/dataSource/pool/api/ILifeCycle.java (75%) rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/dataSource/pool/api/IPooledDataSourceConfig.java (92%) rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/dataSource/pool/connection/IPooledConnection.java (83%) rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/dataSource/pool/connection/PooledConnection.java (97%) rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/dataSource/pool/constant/JdbcConstants.java (98%) rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/dataSource/pool/constant/PooledConst.java (94%) rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/dataSource/pool/datasource/AbstractDataSourceConfig.java (92%) rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/dataSource/pool/datasource/AbstractPooledDataSourceConfig.java (89%) rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/dataSource/pool/datasource/DataSourceConfigAdaptor.java (89%) rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/dataSource/pool/datasource/PooledDataSource.java (93%) rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/dataSource/pool/datasource/UnPooledDataSource.java (79%) rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/dataSource/pool/exception/JdbcPoolException.java (87%) rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/dataSource/pool/util/DataSourceHandleUtil.java (63%) rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/dataSource/pool/util/DriverClassUtil.java (97%) rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/dataSource/pool/util/JdbcUtil.java (88%) rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/dataSource/service/DataSourceService.java (60%) rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/dataSource/service/impl/DataSourceServiceImpl.java (93%) rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/report/constant/ExpConstant.java (87%) rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/report/controller/ReportController.java (78%) rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/report/controller/dto/ReportDto.java (90%) rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/report/controller/param/ReportParam.java (87%) rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/report/dao/ReportMapper.java (55%) rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/report/dao/entity/Report.java (93%) create mode 100644 report-core/src/main/java/com/anjiplus/template/gaea/business/modules/report/service/ReportService.java rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/report/service/impl/ReportServiceImpl.java (62%) rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/reportexcel/controller/ReportExcelController.java (86%) rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/reportexcel/controller/dto/ReportExcelDto.java (89%) rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/reportexcel/controller/param/ReportExcelParam.java (73%) rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/reportexcel/dao/ReportExcelMapper.java (52%) rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/reportexcel/dao/entity/ReportExcel.java (91%) rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/reportexcel/service/ReportExcelService.java (65%) rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/reportexcel/service/impl/ReportExcelServiceImpl.java (88%) rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{data => }/reportexcel/util/ReportUtil.java (99%) diff --git a/doc/docs/.vuepress/config.js b/doc/docs/.vuepress/config.js index c3e920ff..b6deb7e4 100644 --- a/doc/docs/.vuepress/config.js +++ b/doc/docs/.vuepress/config.js @@ -1,14 +1,45 @@ module.exports = { - base: '/doc/', - title: '大屏设计', - description: '使用拖拽快速生成动态大屏报表', - dest: 'dist', - lastUpdated: 'Last Updated', - theme: '', - themeConfig: { - logo: '/logo.png', - smoothScroll: true, - sidebarDepth: 2, - - } + base: '/doc/', + title: '大屏设计', + description: '使用拖拽快速生成动态大屏报表', + dest: 'dist', + lastUpdated: 'Last Updated', + theme: '', + themeConfig: { + logo: '/logo.png', + smoothScroll: true, + sidebarDepth: 2, + nav: [ + {text: '首页', link: '/'}, + {text: '文档', link: '/guide/'}, + {text: 'GitHub', link: 'https://github.com/anji-plus/report'}, + {text: 'Gitee', link: 'https://gitee.com/anji-plus/report'}, + ], + sidebar: { + '/guide/': [ + { + title: '文档', + collapsable: false, + children: [ + {title: '介绍', path: '/guide/'}, + {title: '快速了解', path: '/guide/quickly'}, + {title: '项目介绍', path: '/guide/productintro'}, + {title: '系统运行', path: '/guide/deploy'}, + {title: '开发手册', path: '/guide/devdoc'} + ] + }, + { + title: '盖亚底盘', + collapsable: false, + children: [] + }, + { + title: '其他', + collapsable: false, + children: [ + {title: '常见问题', path: '/guide/question'} + ] + }], + } + } } diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dashboard/controller/ReportDashboardController.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/controller/ReportDashboardController.java similarity index 81% rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dashboard/controller/ReportDashboardController.java rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/controller/ReportDashboardController.java index a1754871..e586c7a0 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dashboard/controller/ReportDashboardController.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/controller/ReportDashboardController.java @@ -1,12 +1,12 @@ -package com.anjiplus.template.gaea.business.modules.data.dashboard.controller; +package com.anjiplus.template.gaea.business.modules.dashboard.controller; import com.anji.plus.gaea.annotation.Permission; import com.anji.plus.gaea.annotation.log.GaeaAuditLog; import com.anji.plus.gaea.bean.ResponseBean; -import com.anjiplus.template.gaea.business.modules.data.dashboard.controller.dto.ChartDto; -import com.anjiplus.template.gaea.business.modules.data.dashboard.controller.dto.ReportDashboardObjectDto; -import com.anjiplus.template.gaea.business.modules.data.dashboard.service.ReportDashboardService; +import com.anjiplus.template.gaea.business.modules.dashboard.service.ReportDashboardService; +import com.anjiplus.template.gaea.business.modules.dashboard.controller.dto.ChartDto; +import com.anjiplus.template.gaea.business.modules.dashboard.controller.dto.ReportDashboardObjectDto; import io.swagger.annotations.Api; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dashboard/controller/dto/ChartDto.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/controller/dto/ChartDto.java similarity index 90% rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dashboard/controller/dto/ChartDto.java rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/controller/dto/ChartDto.java index b821eff3..d6b67f87 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dashboard/controller/dto/ChartDto.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/controller/dto/ChartDto.java @@ -1,5 +1,5 @@ -package com.anjiplus.template.gaea.business.modules.data.dashboard.controller.dto; +package com.anjiplus.template.gaea.business.modules.dashboard.controller.dto; import lombok.Data; diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dashboard/controller/dto/ReportDashboardDto.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/controller/dto/ReportDashboardDto.java similarity index 84% rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dashboard/controller/dto/ReportDashboardDto.java rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/controller/dto/ReportDashboardDto.java index b4ba347a..68123524 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dashboard/controller/dto/ReportDashboardDto.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/controller/dto/ReportDashboardDto.java @@ -1,8 +1,8 @@ -package com.anjiplus.template.gaea.business.modules.data.dashboard.controller.dto; +package com.anjiplus.template.gaea.business.modules.dashboard.controller.dto; import com.anji.plus.gaea.curd.dto.GaeaBaseDTO; -import com.anjiplus.template.gaea.business.modules.data.dashboardwidget.controller.dto.ReportDashboardWidgetDto; +import com.anjiplus.template.gaea.business.modules.dashboardwidget.controller.dto.ReportDashboardWidgetDto; import lombok.Data; import java.io.Serializable; @@ -52,4 +52,4 @@ public class ReportDashboardDto extends GaeaBaseDTO implements Serializable { private List widgets; -} \ No newline at end of file +} diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dashboard/controller/dto/ReportDashboardObjectDto.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/controller/dto/ReportDashboardObjectDto.java similarity index 70% rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dashboard/controller/dto/ReportDashboardObjectDto.java rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/controller/dto/ReportDashboardObjectDto.java index a74d3fa9..cc4ca08e 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dashboard/controller/dto/ReportDashboardObjectDto.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/controller/dto/ReportDashboardObjectDto.java @@ -1,7 +1,7 @@ -package com.anjiplus.template.gaea.business.modules.data.dashboard.controller.dto; +package com.anjiplus.template.gaea.business.modules.dashboard.controller.dto; -import com.anjiplus.template.gaea.business.modules.data.dashboardwidget.controller.dto.ReportDashboardWidgetDto; +import com.anjiplus.template.gaea.business.modules.dashboardwidget.controller.dto.ReportDashboardWidgetDto; import lombok.Data; import java.io.Serializable; diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dashboard/controller/param/ReportDashboardParam.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/controller/param/ReportDashboardParam.java similarity index 82% rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dashboard/controller/param/ReportDashboardParam.java rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/controller/param/ReportDashboardParam.java index f2045fcd..d044b966 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dashboard/controller/param/ReportDashboardParam.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/controller/param/ReportDashboardParam.java @@ -1,5 +1,5 @@ /**/ -package com.anjiplus.template.gaea.business.modules.data.dashboard.controller.param; +package com.anjiplus.template.gaea.business.modules.dashboard.controller.param; import lombok.Data; import java.io.Serializable; @@ -17,4 +17,4 @@ import java.util.List; **/ @Data public class ReportDashboardParam extends PageParam implements Serializable{ -} \ No newline at end of file +} diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dashboard/dao/ReportDashboardMapper.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/dao/ReportDashboardMapper.java similarity index 61% rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dashboard/dao/ReportDashboardMapper.java rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/dao/ReportDashboardMapper.java index 9c339a02..173e822b 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dashboard/dao/ReportDashboardMapper.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/dao/ReportDashboardMapper.java @@ -1,9 +1,9 @@ -package com.anjiplus.template.gaea.business.modules.data.dashboard.dao; +package com.anjiplus.template.gaea.business.modules.dashboard.dao; import org.apache.ibatis.annotations.Mapper; import com.anji.plus.gaea.curd.mapper.GaeaBaseMapper; -import com.anjiplus.template.gaea.business.modules.data.dashboard.dao.entity.ReportDashboard; +import com.anjiplus.template.gaea.business.modules.dashboard.dao.entity.ReportDashboard; /** * ReportDashboard Mapper @@ -13,4 +13,4 @@ import com.anjiplus.template.gaea.business.modules.data.dashboard.dao.entity.Rep @Mapper public interface ReportDashboardMapper extends GaeaBaseMapper { -} \ No newline at end of file +} diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dashboard/dao/entity/ReportDashboard.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/dao/entity/ReportDashboard.java similarity index 94% rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dashboard/dao/entity/ReportDashboard.java rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/dao/entity/ReportDashboard.java index 6be5bad3..bf89396e 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dashboard/dao/entity/ReportDashboard.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/dao/entity/ReportDashboard.java @@ -1,5 +1,5 @@ -package com.anjiplus.template.gaea.business.modules.data.dashboard.dao.entity; +package com.anjiplus.template.gaea.business.modules.dashboard.dao.entity; import com.anji.plus.gaea.annotation.Unique; import com.anji.plus.gaea.curd.entity.GaeaBaseEntity; diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dashboard/service/ChartStrategy.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/service/ChartStrategy.java similarity index 70% rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dashboard/service/ChartStrategy.java rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/service/ChartStrategy.java index aaa79d0c..ccaa4b04 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dashboard/service/ChartStrategy.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/service/ChartStrategy.java @@ -1,7 +1,7 @@ -package com.anjiplus.template.gaea.business.modules.data.dashboard.service; +package com.anjiplus.template.gaea.business.modules.dashboard.service; import com.alibaba.fastjson.JSONObject; -import com.anjiplus.template.gaea.business.modules.data.dashboard.controller.dto.ChartDto; +import com.anjiplus.template.gaea.business.modules.dashboard.controller.dto.ChartDto; import java.util.List; diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dashboard/service/ReportDashboardService.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/service/ReportDashboardService.java similarity index 57% rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dashboard/service/ReportDashboardService.java rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/service/ReportDashboardService.java index 2a5d62c6..508bfeed 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dashboard/service/ReportDashboardService.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/service/ReportDashboardService.java @@ -1,11 +1,11 @@ -package com.anjiplus.template.gaea.business.modules.data.dashboard.service; +package com.anjiplus.template.gaea.business.modules.dashboard.service; import com.anji.plus.gaea.curd.service.GaeaBaseService; -import com.anjiplus.template.gaea.business.modules.data.dashboard.controller.dto.ChartDto; -import com.anjiplus.template.gaea.business.modules.data.dashboard.controller.dto.ReportDashboardObjectDto; -import com.anjiplus.template.gaea.business.modules.data.dashboard.controller.param.ReportDashboardParam; -import com.anjiplus.template.gaea.business.modules.data.dashboard.dao.entity.ReportDashboard; +import com.anjiplus.template.gaea.business.modules.dashboard.controller.dto.ChartDto; +import com.anjiplus.template.gaea.business.modules.dashboard.controller.dto.ReportDashboardObjectDto; +import com.anjiplus.template.gaea.business.modules.dashboard.controller.param.ReportDashboardParam; +import com.anjiplus.template.gaea.business.modules.dashboard.dao.entity.ReportDashboard; /** * @desc ReportDashboard 大屏设计服务接口 diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dashboard/service/impl/BarChartServiceImpl.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/service/impl/BarChartServiceImpl.java similarity index 84% rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dashboard/service/impl/BarChartServiceImpl.java rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/service/impl/BarChartServiceImpl.java index 780d17d3..7874721d 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dashboard/service/impl/BarChartServiceImpl.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/service/impl/BarChartServiceImpl.java @@ -1,12 +1,10 @@ -package com.anjiplus.template.gaea.business.modules.data.dashboard.service.impl; +package com.anjiplus.template.gaea.business.modules.dashboard.service.impl; -import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.anjiplus.template.gaea.business.modules.data.dashboard.controller.dto.ChartDto; -import com.anjiplus.template.gaea.business.modules.data.dashboard.service.ChartStrategy; +import com.anjiplus.template.gaea.business.modules.dashboard.controller.dto.ChartDto; +import com.anjiplus.template.gaea.business.modules.dashboard.service.ChartStrategy; import org.springframework.stereotype.Component; -import java.util.ArrayList; import java.util.List; /** diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dashboard/service/impl/BarLineChartServiceImpl.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/service/impl/BarLineChartServiceImpl.java similarity index 88% rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dashboard/service/impl/BarLineChartServiceImpl.java rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/service/impl/BarLineChartServiceImpl.java index 362abb0e..032620cf 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dashboard/service/impl/BarLineChartServiceImpl.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/service/impl/BarLineChartServiceImpl.java @@ -1,14 +1,11 @@ -package com.anjiplus.template.gaea.business.modules.data.dashboard.service.impl; +package com.anjiplus.template.gaea.business.modules.dashboard.service.impl; import com.alibaba.fastjson.JSONObject; -import com.anjiplus.template.gaea.business.modules.data.dashboard.controller.dto.ChartDto; -import com.anjiplus.template.gaea.business.modules.data.dashboard.service.ChartStrategy; +import com.anjiplus.template.gaea.business.modules.dashboard.controller.dto.ChartDto; +import com.anjiplus.template.gaea.business.modules.dashboard.service.ChartStrategy; import org.springframework.stereotype.Component; -import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; /** * 折柱图 diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dashboard/service/impl/GaugeChartServiceImpl.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/service/impl/GaugeChartServiceImpl.java similarity index 73% rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dashboard/service/impl/GaugeChartServiceImpl.java rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/service/impl/GaugeChartServiceImpl.java index c9d75a05..89fbe6f0 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dashboard/service/impl/GaugeChartServiceImpl.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/service/impl/GaugeChartServiceImpl.java @@ -1,8 +1,8 @@ -package com.anjiplus.template.gaea.business.modules.data.dashboard.service.impl; +package com.anjiplus.template.gaea.business.modules.dashboard.service.impl; import com.alibaba.fastjson.JSONObject; -import com.anjiplus.template.gaea.business.modules.data.dashboard.controller.dto.ChartDto; -import com.anjiplus.template.gaea.business.modules.data.dashboard.service.ChartStrategy; +import com.anjiplus.template.gaea.business.modules.dashboard.controller.dto.ChartDto; +import com.anjiplus.template.gaea.business.modules.dashboard.service.ChartStrategy; import org.springframework.stereotype.Component; import java.util.List; diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dashboard/service/impl/PieChartServiceImpl.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/service/impl/PieChartServiceImpl.java similarity index 77% rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dashboard/service/impl/PieChartServiceImpl.java rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/service/impl/PieChartServiceImpl.java index e19e0055..5f1ffbf3 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dashboard/service/impl/PieChartServiceImpl.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/service/impl/PieChartServiceImpl.java @@ -1,8 +1,8 @@ -package com.anjiplus.template.gaea.business.modules.data.dashboard.service.impl; +package com.anjiplus.template.gaea.business.modules.dashboard.service.impl; import com.alibaba.fastjson.JSONObject; -import com.anjiplus.template.gaea.business.modules.data.dashboard.controller.dto.ChartDto; -import com.anjiplus.template.gaea.business.modules.data.dashboard.service.ChartStrategy; +import com.anjiplus.template.gaea.business.modules.dashboard.controller.dto.ChartDto; +import com.anjiplus.template.gaea.business.modules.dashboard.service.ChartStrategy; import org.springframework.stereotype.Component; import java.util.List; diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dashboard/service/impl/ReportDashboardServiceImpl.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/service/impl/ReportDashboardServiceImpl.java similarity index 89% rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dashboard/service/impl/ReportDashboardServiceImpl.java rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/service/impl/ReportDashboardServiceImpl.java index cfc1bd56..c9f4999e 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dashboard/service/impl/ReportDashboardServiceImpl.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/service/impl/ReportDashboardServiceImpl.java @@ -1,5 +1,5 @@ -package com.anjiplus.template.gaea.business.modules.data.dashboard.service.impl; +package com.anjiplus.template.gaea.business.modules.dashboard.service.impl; import com.alibaba.fastjson.JSONObject; import com.anji.plus.gaea.curd.mapper.GaeaBaseMapper; @@ -7,21 +7,21 @@ import com.anji.plus.gaea.exception.BusinessExceptionBuilder; import com.anji.plus.gaea.utils.GaeaAssert; import com.anji.plus.gaea.utils.GaeaBeanUtils; import com.anjiplus.template.gaea.business.code.ResponseCode; -import com.anjiplus.template.gaea.business.modules.data.dashboard.controller.dto.ChartDto; -import com.anjiplus.template.gaea.business.modules.data.dashboard.controller.dto.ReportDashboardDto; -import com.anjiplus.template.gaea.business.modules.data.dashboard.controller.dto.ReportDashboardObjectDto; -import com.anjiplus.template.gaea.business.modules.data.dashboard.dao.ReportDashboardMapper; -import com.anjiplus.template.gaea.business.modules.data.dashboard.dao.entity.ReportDashboard; -import com.anjiplus.template.gaea.business.modules.data.dashboard.service.ChartStrategy; -import com.anjiplus.template.gaea.business.modules.data.dashboard.service.ReportDashboardService; -import com.anjiplus.template.gaea.business.modules.data.dashboard.util.DateUtil; -import com.anjiplus.template.gaea.business.modules.data.dashboardwidget.controller.dto.ReportDashboardWidgetDto; -import com.anjiplus.template.gaea.business.modules.data.dashboardwidget.controller.dto.ReportDashboardWidgetValueDto; -import com.anjiplus.template.gaea.business.modules.data.dashboardwidget.dao.entity.ReportDashboardWidget; -import com.anjiplus.template.gaea.business.modules.data.dashboardwidget.service.ReportDashboardWidgetService; -import com.anjiplus.template.gaea.business.modules.data.dataSet.controller.dto.DataSetDto; -import com.anjiplus.template.gaea.business.modules.data.dataSet.controller.dto.OriginalDataDto; -import com.anjiplus.template.gaea.business.modules.data.dataSet.service.DataSetService; +import com.anjiplus.template.gaea.business.modules.dashboard.controller.dto.ChartDto; +import com.anjiplus.template.gaea.business.modules.dashboard.controller.dto.ReportDashboardDto; +import com.anjiplus.template.gaea.business.modules.dashboard.controller.dto.ReportDashboardObjectDto; +import com.anjiplus.template.gaea.business.modules.dashboard.dao.ReportDashboardMapper; +import com.anjiplus.template.gaea.business.modules.dashboard.service.ChartStrategy; +import com.anjiplus.template.gaea.business.modules.dashboard.service.ReportDashboardService; +import com.anjiplus.template.gaea.business.modules.dashboard.util.DateUtil; +import com.anjiplus.template.gaea.business.modules.dashboardwidget.controller.dto.ReportDashboardWidgetDto; +import com.anjiplus.template.gaea.business.modules.dashboardwidget.controller.dto.ReportDashboardWidgetValueDto; +import com.anjiplus.template.gaea.business.modules.dashboard.dao.entity.ReportDashboard; +import com.anjiplus.template.gaea.business.modules.dashboardwidget.dao.entity.ReportDashboardWidget; +import com.anjiplus.template.gaea.business.modules.dashboardwidget.service.ReportDashboardWidgetService; +import com.anjiplus.template.gaea.business.modules.dataSet.controller.dto.DataSetDto; +import com.anjiplus.template.gaea.business.modules.dataSet.controller.dto.OriginalDataDto; +import com.anjiplus.template.gaea.business.modules.dataSet.service.DataSetService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dashboard/util/DateUtil.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/util/DateUtil.java similarity index 94% rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dashboard/util/DateUtil.java rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/util/DateUtil.java index da8e3f4b..3f8403bf 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dashboard/util/DateUtil.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/util/DateUtil.java @@ -1,4 +1,4 @@ -package com.anjiplus.template.gaea.business.modules.data.dashboard.util; +package com.anjiplus.template.gaea.business.modules.dashboard.util; import java.text.ParseException; import java.text.SimpleDateFormat; diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dashboardwidget/controller/dto/ReportDashboardWidgetDto.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboardwidget/controller/dto/ReportDashboardWidgetDto.java similarity index 81% rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dashboardwidget/controller/dto/ReportDashboardWidgetDto.java rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboardwidget/controller/dto/ReportDashboardWidgetDto.java index 43965a43..ed976930 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dashboardwidget/controller/dto/ReportDashboardWidgetDto.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboardwidget/controller/dto/ReportDashboardWidgetDto.java @@ -1,5 +1,5 @@ -package com.anjiplus.template.gaea.business.modules.data.dashboardwidget.controller.dto; +package com.anjiplus.template.gaea.business.modules.dashboardwidget.controller.dto; import lombok.Data; diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dashboardwidget/controller/dto/ReportDashboardWidgetValueDto.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboardwidget/controller/dto/ReportDashboardWidgetValueDto.java similarity index 90% rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dashboardwidget/controller/dto/ReportDashboardWidgetValueDto.java rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboardwidget/controller/dto/ReportDashboardWidgetValueDto.java index c7a5ded1..805368be 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dashboardwidget/controller/dto/ReportDashboardWidgetValueDto.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboardwidget/controller/dto/ReportDashboardWidgetValueDto.java @@ -1,5 +1,5 @@ -package com.anjiplus.template.gaea.business.modules.data.dashboardwidget.controller.dto; +package com.anjiplus.template.gaea.business.modules.dashboardwidget.controller.dto; import com.alibaba.fastjson.JSONObject; import lombok.Data; diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dashboardwidget/controller/param/ReportDashboardWidgetParam.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboardwidget/controller/param/ReportDashboardWidgetParam.java similarity index 82% rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dashboardwidget/controller/param/ReportDashboardWidgetParam.java rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboardwidget/controller/param/ReportDashboardWidgetParam.java index 8e6073c5..09f54bff 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dashboardwidget/controller/param/ReportDashboardWidgetParam.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboardwidget/controller/param/ReportDashboardWidgetParam.java @@ -1,5 +1,5 @@ /**/ -package com.anjiplus.template.gaea.business.modules.data.dashboardwidget.controller.param; +package com.anjiplus.template.gaea.business.modules.dashboardwidget.controller.param; import lombok.Data; import java.io.Serializable; @@ -17,4 +17,4 @@ import java.util.List; **/ @Data public class ReportDashboardWidgetParam extends PageParam implements Serializable{ -} \ No newline at end of file +} diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dashboardwidget/dao/ReportDashboardWidgetMapper.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboardwidget/dao/ReportDashboardWidgetMapper.java similarity index 61% rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dashboardwidget/dao/ReportDashboardWidgetMapper.java rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboardwidget/dao/ReportDashboardWidgetMapper.java index cfa0d532..2570c7fd 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dashboardwidget/dao/ReportDashboardWidgetMapper.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboardwidget/dao/ReportDashboardWidgetMapper.java @@ -1,9 +1,9 @@ -package com.anjiplus.template.gaea.business.modules.data.dashboardwidget.dao; +package com.anjiplus.template.gaea.business.modules.dashboardwidget.dao; import org.apache.ibatis.annotations.Mapper; import com.anji.plus.gaea.curd.mapper.GaeaBaseMapper; -import com.anjiplus.template.gaea.business.modules.data.dashboardwidget.dao.entity.ReportDashboardWidget; +import com.anjiplus.template.gaea.business.modules.dashboardwidget.dao.entity.ReportDashboardWidget; /** * ReportDashboardWidget Mapper @@ -13,4 +13,4 @@ import com.anjiplus.template.gaea.business.modules.data.dashboardwidget.dao.enti @Mapper public interface ReportDashboardWidgetMapper extends GaeaBaseMapper { -} \ No newline at end of file +} diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dashboardwidget/dao/entity/ReportDashboardWidget.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboardwidget/dao/entity/ReportDashboardWidget.java similarity index 93% rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dashboardwidget/dao/entity/ReportDashboardWidget.java rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboardwidget/dao/entity/ReportDashboardWidget.java index 2214cb40..a0161db5 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dashboardwidget/dao/entity/ReportDashboardWidget.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboardwidget/dao/entity/ReportDashboardWidget.java @@ -1,5 +1,5 @@ -package com.anjiplus.template.gaea.business.modules.data.dashboardwidget.dao.entity; +package com.anjiplus.template.gaea.business.modules.dashboardwidget.dao.entity; import com.anji.plus.gaea.curd.entity.GaeaBaseEntity; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dashboardwidget/service/ReportDashboardWidgetService.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboardwidget/service/ReportDashboardWidgetService.java similarity index 57% rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dashboardwidget/service/ReportDashboardWidgetService.java rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboardwidget/service/ReportDashboardWidgetService.java index 690d5830..367030c8 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dashboardwidget/service/ReportDashboardWidgetService.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboardwidget/service/ReportDashboardWidgetService.java @@ -1,8 +1,8 @@ -package com.anjiplus.template.gaea.business.modules.data.dashboardwidget.service; +package com.anjiplus.template.gaea.business.modules.dashboardwidget.service; -import com.anjiplus.template.gaea.business.modules.data.dashboardwidget.dao.entity.ReportDashboardWidget; -import com.anjiplus.template.gaea.business.modules.data.dashboardwidget.controller.param.ReportDashboardWidgetParam; +import com.anjiplus.template.gaea.business.modules.dashboardwidget.controller.param.ReportDashboardWidgetParam; +import com.anjiplus.template.gaea.business.modules.dashboardwidget.dao.entity.ReportDashboardWidget; import com.anji.plus.gaea.curd.service.GaeaBaseService; /** @@ -18,4 +18,4 @@ public interface ReportDashboardWidgetService extends GaeaBaseService { - - void delReport(ReportDto reportDto); -} diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSet/controller/DataSetController.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSet/controller/DataSetController.java similarity index 90% rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSet/controller/DataSetController.java rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSet/controller/DataSetController.java index e5a0e58a..303ea854 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSet/controller/DataSetController.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSet/controller/DataSetController.java @@ -1,5 +1,5 @@ -package com.anjiplus.template.gaea.business.modules.data.dataSet.controller; +package com.anjiplus.template.gaea.business.modules.dataSet.controller; import com.anji.plus.gaea.annotation.AccessKey; import com.anji.plus.gaea.annotation.Permission; @@ -9,11 +9,11 @@ import com.anji.plus.gaea.curd.controller.GaeaBaseController; import com.anji.plus.gaea.curd.service.GaeaBaseService; import com.anji.plus.gaea.holder.UserContentHolder; import com.anji.plus.gaea.utils.GaeaUtils; -import com.anjiplus.template.gaea.business.modules.data.dataSet.controller.dto.DataSetDto; -import com.anjiplus.template.gaea.business.modules.data.dataSet.controller.param.DataSetParam; -import com.anjiplus.template.gaea.business.modules.data.dataSet.controller.param.DataSetTestTransformParam; -import com.anjiplus.template.gaea.business.modules.data.dataSet.dao.entity.DataSet; -import com.anjiplus.template.gaea.business.modules.data.dataSet.service.DataSetService; +import com.anjiplus.template.gaea.business.modules.dataSet.controller.dto.DataSetDto; +import com.anjiplus.template.gaea.business.modules.dataSet.controller.param.DataSetParam; +import com.anjiplus.template.gaea.business.modules.dataSet.controller.param.DataSetTestTransformParam; +import com.anjiplus.template.gaea.business.modules.dataSet.dao.entity.DataSet; +import com.anjiplus.template.gaea.business.modules.dataSet.service.DataSetService; import io.swagger.annotations.Api; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSet/controller/dto/DataSetDto.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSet/controller/dto/DataSetDto.java similarity index 80% rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSet/controller/dto/DataSetDto.java rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSet/controller/dto/DataSetDto.java index acef9c28..75eb3dcd 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSet/controller/dto/DataSetDto.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSet/controller/dto/DataSetDto.java @@ -1,9 +1,9 @@ -package com.anjiplus.template.gaea.business.modules.data.dataSet.controller.dto; +package com.anjiplus.template.gaea.business.modules.dataSet.controller.dto; import com.anji.plus.gaea.curd.dto.GaeaBaseDTO; -import com.anjiplus.template.gaea.business.modules.data.dataSetParam.controller.dto.DataSetParamDto; -import com.anjiplus.template.gaea.business.modules.data.dataSetTransform.controller.dto.DataSetTransformDto; +import com.anjiplus.template.gaea.business.modules.dataSetParam.controller.dto.DataSetParamDto; +import com.anjiplus.template.gaea.business.modules.dataSetTransform.controller.dto.DataSetTransformDto; import lombok.Data; import java.io.Serializable; @@ -55,4 +55,4 @@ public class DataSetDto extends GaeaBaseDTO implements Serializable { private Set setParamList; -} \ No newline at end of file +} diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSet/controller/dto/OriginalDataDto.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSet/controller/dto/OriginalDataDto.java similarity index 87% rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSet/controller/dto/OriginalDataDto.java rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSet/controller/dto/OriginalDataDto.java index 12b4aad0..82e3926c 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSet/controller/dto/OriginalDataDto.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSet/controller/dto/OriginalDataDto.java @@ -1,4 +1,4 @@ -package com.anjiplus.template.gaea.business.modules.data.dataSet.controller.dto; +package com.anjiplus.template.gaea.business.modules.dataSet.controller.dto; import com.alibaba.fastjson.JSONObject; import lombok.Data; diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSet/controller/param/DataSetParam.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSet/controller/param/DataSetParam.java similarity index 88% rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSet/controller/param/DataSetParam.java rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSet/controller/param/DataSetParam.java index f96ecf93..f093c599 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSet/controller/param/DataSetParam.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSet/controller/param/DataSetParam.java @@ -1,5 +1,5 @@ /**/ -package com.anjiplus.template.gaea.business.modules.data.dataSet.controller.param; +package com.anjiplus.template.gaea.business.modules.dataSet.controller.param; import com.anji.plus.gaea.annotation.Query; import com.anji.plus.gaea.constant.QueryEnum; @@ -27,4 +27,4 @@ public class DataSetParam extends PageParam implements Serializable{ /** 数据源编码 */ @Query(QueryEnum.EQ) private String sourceCode; -} \ No newline at end of file +} diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSet/controller/param/DataSetTestTransformParam.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSet/controller/param/DataSetTestTransformParam.java similarity index 69% rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSet/controller/param/DataSetTestTransformParam.java rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSet/controller/param/DataSetTestTransformParam.java index 33739099..166dc836 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSet/controller/param/DataSetTestTransformParam.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSet/controller/param/DataSetTestTransformParam.java @@ -1,8 +1,8 @@ /**/ -package com.anjiplus.template.gaea.business.modules.data.dataSet.controller.param; +package com.anjiplus.template.gaea.business.modules.dataSet.controller.param; -import com.anjiplus.template.gaea.business.modules.data.dataSetParam.controller.dto.DataSetParamDto; -import com.anjiplus.template.gaea.business.modules.data.dataSetTransform.controller.dto.DataSetTransformDto; +import com.anjiplus.template.gaea.business.modules.dataSetParam.controller.dto.DataSetParamDto; +import com.anjiplus.template.gaea.business.modules.dataSetTransform.controller.dto.DataSetTransformDto; import lombok.Data; import javax.validation.constraints.NotBlank; @@ -31,4 +31,4 @@ public class DataSetTestTransformParam implements Serializable{ /** 数据转换集合 */ private List dataSetTransformDtoList; -} \ No newline at end of file +} diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSet/dao/DataSetMapper.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSet/dao/DataSetMapper.java similarity index 62% rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSet/dao/DataSetMapper.java rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSet/dao/DataSetMapper.java index fe6a9ab9..334aebfa 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSet/dao/DataSetMapper.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSet/dao/DataSetMapper.java @@ -1,9 +1,9 @@ -package com.anjiplus.template.gaea.business.modules.data.dataSet.dao; +package com.anjiplus.template.gaea.business.modules.dataSet.dao; import org.apache.ibatis.annotations.Mapper; import com.anji.plus.gaea.curd.mapper.GaeaBaseMapper; -import com.anjiplus.template.gaea.business.modules.data.dataSet.dao.entity.DataSet; +import com.anjiplus.template.gaea.business.modules.dataSet.dao.entity.DataSet; /** * DataSet Mapper @@ -13,4 +13,4 @@ import com.anjiplus.template.gaea.business.modules.data.dataSet.dao.entity.DataS @Mapper public interface DataSetMapper extends GaeaBaseMapper { -} \ No newline at end of file +} diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSet/dao/entity/DataSet.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSet/dao/entity/DataSet.java similarity index 94% rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSet/dao/entity/DataSet.java rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSet/dao/entity/DataSet.java index fec167bd..475a96e9 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSet/dao/entity/DataSet.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSet/dao/entity/DataSet.java @@ -1,5 +1,5 @@ -package com.anjiplus.template.gaea.business.modules.data.dataSet.dao.entity; +package com.anjiplus.template.gaea.business.modules.dataSet.dao.entity; import com.anji.plus.gaea.annotation.Unique; import com.anji.plus.gaea.curd.entity.GaeaBaseEntity; diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSet/service/DataSetService.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSet/service/DataSetService.java similarity index 73% rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSet/service/DataSetService.java rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSet/service/DataSetService.java index b9dd4dd3..568de6da 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSet/service/DataSetService.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSet/service/DataSetService.java @@ -1,11 +1,11 @@ -package com.anjiplus.template.gaea.business.modules.data.dataSet.service; +package com.anjiplus.template.gaea.business.modules.dataSet.service; import com.anji.plus.gaea.curd.service.GaeaBaseService; -import com.anjiplus.template.gaea.business.modules.data.dataSet.controller.dto.DataSetDto; -import com.anjiplus.template.gaea.business.modules.data.dataSet.controller.dto.OriginalDataDto; -import com.anjiplus.template.gaea.business.modules.data.dataSet.controller.param.DataSetParam; -import com.anjiplus.template.gaea.business.modules.data.dataSet.dao.entity.DataSet; +import com.anjiplus.template.gaea.business.modules.dataSet.controller.dto.DataSetDto; +import com.anjiplus.template.gaea.business.modules.dataSet.controller.dto.OriginalDataDto; +import com.anjiplus.template.gaea.business.modules.dataSet.controller.param.DataSetParam; +import com.anjiplus.template.gaea.business.modules.dataSet.dao.entity.DataSet; import java.util.List; diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSet/service/impl/DataSetServiceImpl.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSet/service/impl/DataSetServiceImpl.java similarity index 89% rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSet/service/impl/DataSetServiceImpl.java rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSet/service/impl/DataSetServiceImpl.java index 3b536c51..6502db3b 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSet/service/impl/DataSetServiceImpl.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSet/service/impl/DataSetServiceImpl.java @@ -1,5 +1,5 @@ -package com.anjiplus.template.gaea.business.modules.data.dataSet.service.impl; +package com.anjiplus.template.gaea.business.modules.dataSet.service.impl; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; @@ -8,20 +8,20 @@ import com.anji.plus.gaea.curd.mapper.GaeaBaseMapper; import com.anji.plus.gaea.exception.BusinessExceptionBuilder; import com.anji.plus.gaea.utils.GaeaBeanUtils; import com.anjiplus.template.gaea.business.code.ResponseCode; -import com.anjiplus.template.gaea.business.modules.data.dataSet.controller.dto.OriginalDataDto; -import com.anjiplus.template.gaea.business.modules.data.dataSet.controller.dto.DataSetDto; -import com.anjiplus.template.gaea.business.modules.data.dataSet.dao.DataSetMapper; -import com.anjiplus.template.gaea.business.modules.data.dataSet.dao.entity.DataSet; -import com.anjiplus.template.gaea.business.modules.data.dataSet.service.DataSetService; -import com.anjiplus.template.gaea.business.modules.data.dataSetParam.controller.dto.DataSetParamDto; -import com.anjiplus.template.gaea.business.modules.data.dataSetParam.dao.entity.DataSetParam; -import com.anjiplus.template.gaea.business.modules.data.dataSetParam.service.DataSetParamService; -import com.anjiplus.template.gaea.business.modules.data.dataSetTransform.controller.dto.DataSetTransformDto; -import com.anjiplus.template.gaea.business.modules.data.dataSetTransform.dao.entity.DataSetTransform; -import com.anjiplus.template.gaea.business.modules.data.dataSetTransform.service.DataSetTransformService; -import com.anjiplus.template.gaea.business.modules.data.dataSource.controller.dto.DataSourceDto; -import com.anjiplus.template.gaea.business.modules.data.dataSource.dao.entity.DataSource; -import com.anjiplus.template.gaea.business.modules.data.dataSource.service.DataSourceService; +import com.anjiplus.template.gaea.business.modules.dataSet.controller.dto.OriginalDataDto; +import com.anjiplus.template.gaea.business.modules.dataSet.controller.dto.DataSetDto; +import com.anjiplus.template.gaea.business.modules.dataSet.dao.DataSetMapper; +import com.anjiplus.template.gaea.business.modules.dataSet.dao.entity.DataSet; +import com.anjiplus.template.gaea.business.modules.dataSet.service.DataSetService; +import com.anjiplus.template.gaea.business.modules.dataSetParam.controller.dto.DataSetParamDto; +import com.anjiplus.template.gaea.business.modules.dataSetParam.dao.entity.DataSetParam; +import com.anjiplus.template.gaea.business.modules.dataSetParam.service.DataSetParamService; +import com.anjiplus.template.gaea.business.modules.dataSetTransform.controller.dto.DataSetTransformDto; +import com.anjiplus.template.gaea.business.modules.dataSetTransform.dao.entity.DataSetTransform; +import com.anjiplus.template.gaea.business.modules.dataSetTransform.service.DataSetTransformService; +import com.anjiplus.template.gaea.business.modules.dataSource.controller.dto.DataSourceDto; +import com.anjiplus.template.gaea.business.modules.dataSource.dao.entity.DataSource; +import com.anjiplus.template.gaea.business.modules.dataSource.service.DataSourceService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSetParam/controller/DataSetParamController.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetParam/controller/DataSetParamController.java similarity index 71% rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSetParam/controller/DataSetParamController.java rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetParam/controller/DataSetParamController.java index dbefff3b..984ce30e 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSetParam/controller/DataSetParamController.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetParam/controller/DataSetParamController.java @@ -1,15 +1,14 @@ -package com.anjiplus.template.gaea.business.modules.data.dataSetParam.controller; +package com.anjiplus.template.gaea.business.modules.dataSetParam.controller; import com.anji.plus.gaea.bean.ResponseBean; import com.anji.plus.gaea.curd.controller.GaeaBaseController; import com.anji.plus.gaea.curd.service.GaeaBaseService; -import com.anjiplus.template.gaea.business.modules.data.dataSetParam.controller.dto.DataSetParamDto; -import com.anjiplus.template.gaea.business.modules.data.dataSetParam.controller.param.DataSetParamParam; -import com.anjiplus.template.gaea.business.modules.data.dataSetParam.controller.param.DataSetParamValidationParam; -import com.anjiplus.template.gaea.business.modules.data.dataSetParam.dao.entity.DataSetParam; -import com.anjiplus.template.gaea.business.modules.data.dataSetParam.service.DataSetParamService; -import com.anjiplus.template.gaea.business.modules.data.dataSource.controller.param.ConnectionParam; +import com.anjiplus.template.gaea.business.modules.dataSetParam.controller.dto.DataSetParamDto; +import com.anjiplus.template.gaea.business.modules.dataSetParam.controller.param.DataSetParamParam; +import com.anjiplus.template.gaea.business.modules.dataSetParam.controller.param.DataSetParamValidationParam; +import com.anjiplus.template.gaea.business.modules.dataSetParam.dao.entity.DataSetParam; +import com.anjiplus.template.gaea.business.modules.dataSetParam.service.DataSetParamService; import io.swagger.annotations.Api; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; @@ -59,4 +58,4 @@ public class DataSetParamController extends GaeaBaseController { -} \ No newline at end of file +} diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSetParam/dao/entity/DataSetParam.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetParam/dao/entity/DataSetParam.java similarity index 94% rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSetParam/dao/entity/DataSetParam.java rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetParam/dao/entity/DataSetParam.java index 758a01ea..5dad6c77 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSetParam/dao/entity/DataSetParam.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetParam/dao/entity/DataSetParam.java @@ -1,5 +1,5 @@ -package com.anjiplus.template.gaea.business.modules.data.dataSetParam.dao.entity; +package com.anjiplus.template.gaea.business.modules.dataSetParam.dao.entity; import com.anji.plus.gaea.curd.entity.GaeaBaseEntity; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSetParam/service/DataSetParamService.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetParam/service/DataSetParamService.java similarity index 69% rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSetParam/service/DataSetParamService.java rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetParam/service/DataSetParamService.java index 6ae3a2fb..2942228d 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSetParam/service/DataSetParamService.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetParam/service/DataSetParamService.java @@ -1,11 +1,10 @@ -package com.anjiplus.template.gaea.business.modules.data.dataSetParam.service; +package com.anjiplus.template.gaea.business.modules.dataSetParam.service; import com.anji.plus.gaea.curd.service.GaeaBaseService; -import com.anjiplus.template.gaea.business.modules.data.dataSet.controller.dto.DataSetDto; -import com.anjiplus.template.gaea.business.modules.data.dataSetParam.controller.dto.DataSetParamDto; -import com.anjiplus.template.gaea.business.modules.data.dataSetParam.controller.param.DataSetParamParam; -import com.anjiplus.template.gaea.business.modules.data.dataSetParam.dao.entity.DataSetParam; +import com.anjiplus.template.gaea.business.modules.dataSetParam.controller.dto.DataSetParamDto; +import com.anjiplus.template.gaea.business.modules.dataSetParam.controller.param.DataSetParamParam; +import com.anjiplus.template.gaea.business.modules.dataSetParam.dao.entity.DataSetParam; import java.util.List; import java.util.Map; @@ -49,4 +48,4 @@ public interface DataSetParamService extends GaeaBaseService dataSetParamDtoList, Map contextData); -} \ No newline at end of file +} diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSetParam/service/impl/DataSetParamServiceImpl.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetParam/service/impl/DataSetParamServiceImpl.java similarity index 87% rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSetParam/service/impl/DataSetParamServiceImpl.java rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetParam/service/impl/DataSetParamServiceImpl.java index e85e34c6..2a351563 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSetParam/service/impl/DataSetParamServiceImpl.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetParam/service/impl/DataSetParamServiceImpl.java @@ -1,13 +1,13 @@ -package com.anjiplus.template.gaea.business.modules.data.dataSetParam.service.impl; +package com.anjiplus.template.gaea.business.modules.dataSetParam.service.impl; import com.anji.plus.gaea.curd.mapper.GaeaBaseMapper; import com.anji.plus.gaea.exception.BusinessExceptionBuilder; -import com.anjiplus.template.gaea.business.modules.data.dataSetParam.controller.dto.DataSetParamDto; -import com.anjiplus.template.gaea.business.modules.data.dataSetParam.dao.DataSetParamMapper; -import com.anjiplus.template.gaea.business.modules.data.dataSetParam.dao.entity.DataSetParam; -import com.anjiplus.template.gaea.business.modules.data.dataSetParam.service.DataSetParamService; -import com.anjiplus.template.gaea.business.modules.data.dataSetParam.util.ParamsResolverHelper; +import com.anjiplus.template.gaea.business.modules.dataSetParam.controller.dto.DataSetParamDto; +import com.anjiplus.template.gaea.business.modules.dataSetParam.dao.DataSetParamMapper; +import com.anjiplus.template.gaea.business.modules.dataSetParam.dao.entity.DataSetParam; +import com.anjiplus.template.gaea.business.modules.dataSetParam.service.DataSetParamService; +import com.anjiplus.template.gaea.business.modules.dataSetParam.util.ParamsResolverHelper; import com.anjiplus.template.gaea.business.code.ResponseCode; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSetParam/util/ParamsResolverHelper.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetParam/util/ParamsResolverHelper.java similarity index 93% rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSetParam/util/ParamsResolverHelper.java rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetParam/util/ParamsResolverHelper.java index e0d79bff..3b86d7cc 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSetParam/util/ParamsResolverHelper.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetParam/util/ParamsResolverHelper.java @@ -1,4 +1,4 @@ -package com.anjiplus.template.gaea.business.modules.data.dataSetParam.util; +package com.anjiplus.template.gaea.business.modules.dataSetParam.util; import org.springframework.util.PropertyPlaceholderHelper; diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSetTransform/controller/DataSetTransformController.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetTransform/controller/DataSetTransformController.java similarity index 68% rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSetTransform/controller/DataSetTransformController.java rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetTransform/controller/DataSetTransformController.java index 4c5ff8b0..94ad3ca0 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSetTransform/controller/DataSetTransformController.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetTransform/controller/DataSetTransformController.java @@ -1,12 +1,12 @@ -package com.anjiplus.template.gaea.business.modules.data.dataSetTransform.controller; +package com.anjiplus.template.gaea.business.modules.dataSetTransform.controller; import com.anji.plus.gaea.curd.controller.GaeaBaseController; import com.anji.plus.gaea.curd.service.GaeaBaseService; -import com.anjiplus.template.gaea.business.modules.data.dataSetTransform.controller.dto.DataSetTransformDto; -import com.anjiplus.template.gaea.business.modules.data.dataSetTransform.controller.param.DataSetTransformParam; -import com.anjiplus.template.gaea.business.modules.data.dataSetTransform.dao.entity.DataSetTransform; -import com.anjiplus.template.gaea.business.modules.data.dataSetTransform.service.DataSetTransformService; +import com.anjiplus.template.gaea.business.modules.dataSetTransform.controller.dto.DataSetTransformDto; +import com.anjiplus.template.gaea.business.modules.dataSetTransform.controller.param.DataSetTransformParam; +import com.anjiplus.template.gaea.business.modules.dataSetTransform.dao.entity.DataSetTransform; +import com.anjiplus.template.gaea.business.modules.dataSetTransform.service.DataSetTransformService; import io.swagger.annotations.Api; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; @@ -41,4 +41,4 @@ public class DataSetTransformController extends GaeaBaseController { -} \ No newline at end of file +} diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSetTransform/dao/entity/DataSetTransform.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetTransform/dao/entity/DataSetTransform.java similarity index 92% rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSetTransform/dao/entity/DataSetTransform.java rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetTransform/dao/entity/DataSetTransform.java index 4ad053ed..281db47d 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSetTransform/dao/entity/DataSetTransform.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetTransform/dao/entity/DataSetTransform.java @@ -1,5 +1,5 @@ -package com.anjiplus.template.gaea.business.modules.data.dataSetTransform.dao.entity; +package com.anjiplus.template.gaea.business.modules.dataSetTransform.dao.entity; import com.anji.plus.gaea.curd.entity.GaeaBaseEntity; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSetTransform/service/DataSetTransformService.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetTransform/service/DataSetTransformService.java similarity index 52% rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSetTransform/service/DataSetTransformService.java rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetTransform/service/DataSetTransformService.java index 41997d30..1bc059c8 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSetTransform/service/DataSetTransformService.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetTransform/service/DataSetTransformService.java @@ -1,11 +1,11 @@ -package com.anjiplus.template.gaea.business.modules.data.dataSetTransform.service; +package com.anjiplus.template.gaea.business.modules.dataSetTransform.service; import com.alibaba.fastjson.JSONObject; import com.anji.plus.gaea.curd.service.GaeaBaseService; -import com.anjiplus.template.gaea.business.modules.data.dataSetTransform.controller.dto.DataSetTransformDto; -import com.anjiplus.template.gaea.business.modules.data.dataSetTransform.controller.param.DataSetTransformParam; -import com.anjiplus.template.gaea.business.modules.data.dataSetTransform.dao.entity.DataSetTransform; +import com.anjiplus.template.gaea.business.modules.dataSetTransform.controller.dto.DataSetTransformDto; +import com.anjiplus.template.gaea.business.modules.dataSetTransform.controller.param.DataSetTransformParam; +import com.anjiplus.template.gaea.business.modules.dataSetTransform.dao.entity.DataSetTransform; import java.util.List; @@ -18,4 +18,4 @@ public interface DataSetTransformService extends GaeaBaseService transform(List dataSetTransformDtoList, List data); -} \ No newline at end of file +} diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSetTransform/service/TransformStrategy.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetTransform/service/TransformStrategy.java similarity index 68% rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSetTransform/service/TransformStrategy.java rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetTransform/service/TransformStrategy.java index b8935771..c61855bd 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSetTransform/service/TransformStrategy.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetTransform/service/TransformStrategy.java @@ -1,7 +1,7 @@ -package com.anjiplus.template.gaea.business.modules.data.dataSetTransform.service; +package com.anjiplus.template.gaea.business.modules.dataSetTransform.service; import com.alibaba.fastjson.JSONObject; -import com.anjiplus.template.gaea.business.modules.data.dataSetTransform.controller.dto.DataSetTransformDto; +import com.anjiplus.template.gaea.business.modules.dataSetTransform.controller.dto.DataSetTransformDto; import java.util.List; diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSetTransform/service/impl/DataSetTransformServiceImpl.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetTransform/service/impl/DataSetTransformServiceImpl.java similarity index 78% rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSetTransform/service/impl/DataSetTransformServiceImpl.java rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetTransform/service/impl/DataSetTransformServiceImpl.java index f61d1167..4d3dbb80 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSetTransform/service/impl/DataSetTransformServiceImpl.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetTransform/service/impl/DataSetTransformServiceImpl.java @@ -1,13 +1,13 @@ -package com.anjiplus.template.gaea.business.modules.data.dataSetTransform.service.impl; +package com.anjiplus.template.gaea.business.modules.dataSetTransform.service.impl; import com.alibaba.fastjson.JSONObject; import com.anji.plus.gaea.curd.mapper.GaeaBaseMapper; -import com.anjiplus.template.gaea.business.modules.data.dataSetTransform.controller.dto.DataSetTransformDto; -import com.anjiplus.template.gaea.business.modules.data.dataSetTransform.dao.DataSetTransformMapper; -import com.anjiplus.template.gaea.business.modules.data.dataSetTransform.dao.entity.DataSetTransform; -import com.anjiplus.template.gaea.business.modules.data.dataSetTransform.service.DataSetTransformService; -import com.anjiplus.template.gaea.business.modules.data.dataSetTransform.service.TransformStrategy; +import com.anjiplus.template.gaea.business.modules.dataSetTransform.controller.dto.DataSetTransformDto; +import com.anjiplus.template.gaea.business.modules.dataSetTransform.dao.DataSetTransformMapper; +import com.anjiplus.template.gaea.business.modules.dataSetTransform.dao.entity.DataSetTransform; +import com.anjiplus.template.gaea.business.modules.dataSetTransform.service.DataSetTransformService; +import com.anjiplus.template.gaea.business.modules.dataSetTransform.service.TransformStrategy; import org.springframework.beans.BeansException; import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.annotation.Autowired; @@ -68,4 +68,4 @@ public class DataSetTransformServiceImpl implements DataSetTransformService, Ini } return data; } -} \ No newline at end of file +} diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSetTransform/service/impl/DictTransformServiceImpl.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetTransform/service/impl/DictTransformServiceImpl.java similarity index 82% rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSetTransform/service/impl/DictTransformServiceImpl.java rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetTransform/service/impl/DictTransformServiceImpl.java index ff4de0ed..3922bf1e 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSetTransform/service/impl/DictTransformServiceImpl.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetTransform/service/impl/DictTransformServiceImpl.java @@ -1,8 +1,8 @@ -package com.anjiplus.template.gaea.business.modules.data.dataSetTransform.service.impl; +package com.anjiplus.template.gaea.business.modules.dataSetTransform.service.impl; import com.alibaba.fastjson.JSONObject; -import com.anjiplus.template.gaea.business.modules.data.dataSetTransform.controller.dto.DataSetTransformDto; -import com.anjiplus.template.gaea.business.modules.data.dataSetTransform.service.TransformStrategy; +import com.anjiplus.template.gaea.business.modules.dataSetTransform.controller.dto.DataSetTransformDto; +import com.anjiplus.template.gaea.business.modules.dataSetTransform.service.TransformStrategy; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSetTransform/service/impl/JsTransformServiceImpl.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetTransform/service/impl/JsTransformServiceImpl.java similarity index 85% rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSetTransform/service/impl/JsTransformServiceImpl.java rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetTransform/service/impl/JsTransformServiceImpl.java index 73208467..4adaa2dc 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSetTransform/service/impl/JsTransformServiceImpl.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetTransform/service/impl/JsTransformServiceImpl.java @@ -1,9 +1,9 @@ -package com.anjiplus.template.gaea.business.modules.data.dataSetTransform.service.impl; +package com.anjiplus.template.gaea.business.modules.dataSetTransform.service.impl; import com.alibaba.fastjson.JSONObject; import com.anji.plus.gaea.exception.BusinessExceptionBuilder; -import com.anjiplus.template.gaea.business.modules.data.dataSetTransform.controller.dto.DataSetTransformDto; -import com.anjiplus.template.gaea.business.modules.data.dataSetTransform.service.TransformStrategy; +import com.anjiplus.template.gaea.business.modules.dataSetTransform.controller.dto.DataSetTransformDto; +import com.anjiplus.template.gaea.business.modules.dataSetTransform.service.TransformStrategy; import com.anjiplus.template.gaea.business.code.ResponseCode; import jdk.nashorn.api.scripting.ScriptObjectMirror; import lombok.extern.slf4j.Slf4j; diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSource/config/HttpClientConfig.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/config/HttpClientConfig.java similarity index 99% rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSource/config/HttpClientConfig.java rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/config/HttpClientConfig.java index 01e1dcf3..463704cf 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSource/config/HttpClientConfig.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/config/HttpClientConfig.java @@ -1,4 +1,4 @@ -package com.anjiplus.template.gaea.business.modules.data.dataSource.config; +package com.anjiplus.template.gaea.business.modules.dataSource.config; import com.alibaba.fastjson.JSON; import lombok.extern.slf4j.Slf4j; diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSource/config/HttpClientPoolConfig.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/config/HttpClientPoolConfig.java similarity index 94% rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSource/config/HttpClientPoolConfig.java rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/config/HttpClientPoolConfig.java index a8b91faa..7945c535 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSource/config/HttpClientPoolConfig.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/config/HttpClientPoolConfig.java @@ -1,4 +1,4 @@ -package com.anjiplus.template.gaea.business.modules.data.dataSource.config; +package com.anjiplus.template.gaea.business.modules.dataSource.config; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSource/controller/DataSourceController.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/controller/DataSourceController.java similarity index 74% rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSource/controller/DataSourceController.java rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/controller/DataSourceController.java index 8e569e9e..06f633fc 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSource/controller/DataSourceController.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/controller/DataSourceController.java @@ -1,14 +1,14 @@ -package com.anjiplus.template.gaea.business.modules.data.dataSource.controller; +package com.anjiplus.template.gaea.business.modules.dataSource.controller; import com.anji.plus.gaea.bean.ResponseBean; import com.anji.plus.gaea.curd.controller.GaeaBaseController; import com.anji.plus.gaea.curd.service.GaeaBaseService; -import com.anjiplus.template.gaea.business.modules.data.dataSource.controller.dto.DataSourceDto; -import com.anjiplus.template.gaea.business.modules.data.dataSource.controller.param.ConnectionParam; -import com.anjiplus.template.gaea.business.modules.data.dataSource.controller.param.DataSourceParam; -import com.anjiplus.template.gaea.business.modules.data.dataSource.dao.entity.DataSource; -import com.anjiplus.template.gaea.business.modules.data.dataSource.service.DataSourceService; +import com.anjiplus.template.gaea.business.modules.dataSource.controller.dto.DataSourceDto; +import com.anjiplus.template.gaea.business.modules.dataSource.controller.param.ConnectionParam; +import com.anjiplus.template.gaea.business.modules.dataSource.controller.param.DataSourceParam; +import com.anjiplus.template.gaea.business.modules.dataSource.dao.entity.DataSource; +import com.anjiplus.template.gaea.business.modules.dataSource.service.DataSourceService; import io.swagger.annotations.Api; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; @@ -64,4 +64,4 @@ public class DataSourceController extends GaeaBaseController contextData; -} \ No newline at end of file +} diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSource/controller/param/ConnectionParam.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/controller/param/ConnectionParam.java similarity index 90% rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSource/controller/param/ConnectionParam.java rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/controller/param/ConnectionParam.java index 0ccb40cf..2b493762 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSource/controller/param/ConnectionParam.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/controller/param/ConnectionParam.java @@ -1,4 +1,4 @@ -package com.anjiplus.template.gaea.business.modules.data.dataSource.controller.param; +package com.anjiplus.template.gaea.business.modules.dataSource.controller.param; import lombok.Data; diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSource/controller/param/DataSourceParam.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/controller/param/DataSourceParam.java similarity index 89% rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSource/controller/param/DataSourceParam.java rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/controller/param/DataSourceParam.java index 1804b03d..85410097 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSource/controller/param/DataSourceParam.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/controller/param/DataSourceParam.java @@ -1,5 +1,5 @@ /**/ -package com.anjiplus.template.gaea.business.modules.data.dataSource.controller.param; +package com.anjiplus.template.gaea.business.modules.dataSource.controller.param; import com.anji.plus.gaea.annotation.Query; import com.anji.plus.gaea.constant.QueryEnum; @@ -28,4 +28,4 @@ public class DataSourceParam extends PageParam implements Serializable{ /** 数据源类型 DIC_NAME=SOURCE_TYPE; mysql，orace，sqlserver，elasticsearch，接口，javaBean，数据源类型字典中item-extend动态生成表单 */ @Query(QueryEnum.EQ) private String sourceType; -} \ No newline at end of file +} diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSource/dao/DataSourceMapper.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/dao/DataSourceMapper.java similarity index 61% rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSource/dao/DataSourceMapper.java rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/dao/DataSourceMapper.java index dcf1e224..eb7493a3 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSource/dao/DataSourceMapper.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/dao/DataSourceMapper.java @@ -1,9 +1,9 @@ -package com.anjiplus.template.gaea.business.modules.data.dataSource.dao; +package com.anjiplus.template.gaea.business.modules.dataSource.dao; import org.apache.ibatis.annotations.Mapper; import com.anji.plus.gaea.curd.mapper.GaeaBaseMapper; -import com.anjiplus.template.gaea.business.modules.data.dataSource.dao.entity.DataSource; +import com.anjiplus.template.gaea.business.modules.dataSource.dao.entity.DataSource; /** * DataSource Mapper @@ -13,4 +13,4 @@ import com.anjiplus.template.gaea.business.modules.data.dataSource.dao.entity.Da @Mapper public interface DataSourceMapper extends GaeaBaseMapper { -} \ No newline at end of file +} diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSource/dao/entity/DataSource.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/dao/entity/DataSource.java similarity index 95% rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSource/dao/entity/DataSource.java rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/dao/entity/DataSource.java index cf10e553..04c1e6d5 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSource/dao/entity/DataSource.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/dao/entity/DataSource.java @@ -1,5 +1,5 @@ -package com.anjiplus.template.gaea.business.modules.data.dataSource.dao.entity; +package com.anjiplus.template.gaea.business.modules.dataSource.dao.entity; import com.anji.plus.gaea.annotation.Unique; import com.anji.plus.gaea.curd.entity.GaeaBaseEntity; diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSource/pool/api/IConfig.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/pool/api/IConfig.java similarity index 89% rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSource/pool/api/IConfig.java rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/pool/api/IConfig.java index f7354808..8fd16e0f 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSource/pool/api/IConfig.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/pool/api/IConfig.java @@ -1,4 +1,4 @@ -package com.anjiplus.template.gaea.business.modules.data.dataSource.pool.api; +package com.anjiplus.template.gaea.business.modules.dataSource.pool.api; /** * 配置接口 diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSource/pool/api/IDataSourceConfig.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/pool/api/IDataSourceConfig.java similarity index 67% rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSource/pool/api/IDataSourceConfig.java rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/pool/api/IDataSourceConfig.java index fb90392c..74dc45aa 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSource/pool/api/IDataSourceConfig.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/pool/api/IDataSourceConfig.java @@ -1,4 +1,4 @@ -package com.anjiplus.template.gaea.business.modules.data.dataSource.pool.api; +package com.anjiplus.template.gaea.business.modules.dataSource.pool.api; import javax.sql.DataSource; diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSource/pool/api/ILifeCycle.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/pool/api/ILifeCycle.java similarity index 75% rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSource/pool/api/ILifeCycle.java rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/pool/api/ILifeCycle.java index 5f0089df..21b4b63f 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSource/pool/api/ILifeCycle.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/pool/api/ILifeCycle.java @@ -1,4 +1,4 @@ -package com.anjiplus.template.gaea.business.modules.data.dataSource.pool.api; +package com.anjiplus.template.gaea.business.modules.dataSource.pool.api; /** * 生命周期管理 diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSource/pool/api/IPooledDataSourceConfig.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/pool/api/IPooledDataSourceConfig.java similarity index 92% rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSource/pool/api/IPooledDataSourceConfig.java rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/pool/api/IPooledDataSourceConfig.java index f542c7de..8db6078d 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSource/pool/api/IPooledDataSourceConfig.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/pool/api/IPooledDataSourceConfig.java @@ -1,6 +1,6 @@ -package com.anjiplus.template.gaea.business.modules.data.dataSource.pool.api; +package com.anjiplus.template.gaea.business.modules.dataSource.pool.api; -import com.anjiplus.template.gaea.business.modules.data.dataSource.pool.connection.IPooledConnection; +import com.anjiplus.template.gaea.business.modules.dataSource.pool.connection.IPooledConnection; /** * 池化的接口 diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSource/pool/connection/IPooledConnection.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/pool/connection/IPooledConnection.java similarity index 83% rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSource/pool/connection/IPooledConnection.java rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/pool/connection/IPooledConnection.java index f0365db0..4c746f88 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSource/pool/connection/IPooledConnection.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/pool/connection/IPooledConnection.java @@ -1,6 +1,6 @@ -package com.anjiplus.template.gaea.business.modules.data.dataSource.pool.connection; +package com.anjiplus.template.gaea.business.modules.dataSource.pool.connection; -import com.anjiplus.template.gaea.business.modules.data.dataSource.pool.api.IPooledDataSourceConfig; +import com.anjiplus.template.gaea.business.modules.dataSource.pool.api.IPooledDataSourceConfig; import java.sql.Connection; diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSource/pool/connection/PooledConnection.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/pool/connection/PooledConnection.java similarity index 97% rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSource/pool/connection/PooledConnection.java rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/pool/connection/PooledConnection.java index 8d5f03df..5d54e3f8 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSource/pool/connection/PooledConnection.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/pool/connection/PooledConnection.java @@ -1,7 +1,7 @@ -package com.anjiplus.template.gaea.business.modules.data.dataSource.pool.connection; +package com.anjiplus.template.gaea.business.modules.dataSource.pool.connection; -import com.anjiplus.template.gaea.business.modules.data.dataSource.pool.api.IPooledDataSourceConfig; -import com.anjiplus.template.gaea.business.modules.data.dataSource.pool.exception.JdbcPoolException; +import com.anjiplus.template.gaea.business.modules.dataSource.pool.api.IPooledDataSourceConfig; +import com.anjiplus.template.gaea.business.modules.dataSource.pool.exception.JdbcPoolException; import lombok.extern.slf4j.Slf4j; import java.sql.*; diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSource/pool/constant/JdbcConstants.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/pool/constant/JdbcConstants.java similarity index 98% rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSource/pool/constant/JdbcConstants.java rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/pool/constant/JdbcConstants.java index 419b72cf..9b267c09 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSource/pool/constant/JdbcConstants.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/pool/constant/JdbcConstants.java @@ -1,4 +1,4 @@ -package com.anjiplus.template.gaea.business.modules.data.dataSource.pool.constant; +package com.anjiplus.template.gaea.business.modules.dataSource.pool.constant; /** * Created by raodeming on 2021/3/19. diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSource/pool/constant/PooledConst.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/pool/constant/PooledConst.java similarity index 94% rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSource/pool/constant/PooledConst.java rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/pool/constant/PooledConst.java index b584060d..b3d6482f 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSource/pool/constant/PooledConst.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/pool/constant/PooledConst.java @@ -1,4 +1,4 @@ -package com.anjiplus.template.gaea.business.modules.data.dataSource.pool.constant; +package com.anjiplus.template.gaea.business.modules.dataSource.pool.constant; /** * 线程池常量 diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSource/pool/datasource/AbstractDataSourceConfig.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/pool/datasource/AbstractDataSourceConfig.java similarity index 92% rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSource/pool/datasource/AbstractDataSourceConfig.java rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/pool/datasource/AbstractDataSourceConfig.java index 786bc5f7..dff3776d 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSource/pool/datasource/AbstractDataSourceConfig.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/pool/datasource/AbstractDataSourceConfig.java @@ -1,4 +1,4 @@ -package com.anjiplus.template.gaea.business.modules.data.dataSource.pool.datasource; +package com.anjiplus.template.gaea.business.modules.dataSource.pool.datasource; /** * @author binbin.hou diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSource/pool/datasource/AbstractPooledDataSourceConfig.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/pool/datasource/AbstractPooledDataSourceConfig.java similarity index 89% rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSource/pool/datasource/AbstractPooledDataSourceConfig.java rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/pool/datasource/AbstractPooledDataSourceConfig.java index 786fb5ec..74e82139 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSource/pool/datasource/AbstractPooledDataSourceConfig.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/pool/datasource/AbstractPooledDataSourceConfig.java @@ -1,8 +1,8 @@ -package com.anjiplus.template.gaea.business.modules.data.dataSource.pool.datasource; +package com.anjiplus.template.gaea.business.modules.dataSource.pool.datasource; -import com.anjiplus.template.gaea.business.modules.data.dataSource.pool.api.ILifeCycle; -import com.anjiplus.template.gaea.business.modules.data.dataSource.pool.api.IPooledDataSourceConfig; -import com.anjiplus.template.gaea.business.modules.data.dataSource.pool.constant.PooledConst; +import com.anjiplus.template.gaea.business.modules.dataSource.pool.api.ILifeCycle; +import com.anjiplus.template.gaea.business.modules.dataSource.pool.api.IPooledDataSourceConfig; +import com.anjiplus.template.gaea.business.modules.dataSource.pool.constant.PooledConst; /** * @author binbin.hou diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSource/pool/datasource/DataSourceConfigAdaptor.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/pool/datasource/DataSourceConfigAdaptor.java similarity index 89% rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSource/pool/datasource/DataSourceConfigAdaptor.java rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/pool/datasource/DataSourceConfigAdaptor.java index dcab7f88..2e19fc9a 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSource/pool/datasource/DataSourceConfigAdaptor.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/pool/datasource/DataSourceConfigAdaptor.java @@ -1,6 +1,6 @@ -package com.anjiplus.template.gaea.business.modules.data.dataSource.pool.datasource; +package com.anjiplus.template.gaea.business.modules.dataSource.pool.datasource; -import com.anjiplus.template.gaea.business.modules.data.dataSource.pool.api.IDataSourceConfig; +import com.anjiplus.template.gaea.business.modules.dataSource.pool.api.IDataSourceConfig; import java.io.PrintWriter; import java.sql.Connection; diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSource/pool/datasource/PooledDataSource.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/pool/datasource/PooledDataSource.java similarity index 93% rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSource/pool/datasource/PooledDataSource.java rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/pool/datasource/PooledDataSource.java index 24b7def2..e8487336 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSource/pool/datasource/PooledDataSource.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/pool/datasource/PooledDataSource.java @@ -1,9 +1,9 @@ -package com.anjiplus.template.gaea.business.modules.data.dataSource.pool.datasource; +package com.anjiplus.template.gaea.business.modules.dataSource.pool.datasource; -import com.anjiplus.template.gaea.business.modules.data.dataSource.pool.connection.IPooledConnection; -import com.anjiplus.template.gaea.business.modules.data.dataSource.pool.connection.PooledConnection; -import com.anjiplus.template.gaea.business.modules.data.dataSource.pool.exception.JdbcPoolException; -import com.anjiplus.template.gaea.business.modules.data.dataSource.pool.util.DriverClassUtil; +import com.anjiplus.template.gaea.business.modules.dataSource.pool.connection.IPooledConnection; +import com.anjiplus.template.gaea.business.modules.dataSource.pool.connection.PooledConnection; +import com.anjiplus.template.gaea.business.modules.dataSource.pool.exception.JdbcPoolException; +import com.anjiplus.template.gaea.business.modules.dataSource.pool.util.DriverClassUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSource/pool/datasource/UnPooledDataSource.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/pool/datasource/UnPooledDataSource.java similarity index 79% rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSource/pool/datasource/UnPooledDataSource.java rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/pool/datasource/UnPooledDataSource.java index e45010c9..dbf8c66c 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSource/pool/datasource/UnPooledDataSource.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/pool/datasource/UnPooledDataSource.java @@ -1,6 +1,6 @@ -package com.anjiplus.template.gaea.business.modules.data.dataSource.pool.datasource; +package com.anjiplus.template.gaea.business.modules.dataSource.pool.datasource; -import com.anjiplus.template.gaea.business.modules.data.dataSource.pool.util.DriverClassUtil; +import com.anjiplus.template.gaea.business.modules.dataSource.pool.util.DriverClassUtil; import org.apache.commons.lang3.StringUtils; import java.sql.Connection; diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSource/pool/exception/JdbcPoolException.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/pool/exception/JdbcPoolException.java similarity index 87% rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSource/pool/exception/JdbcPoolException.java rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/pool/exception/JdbcPoolException.java index ace4113d..682f831c 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSource/pool/exception/JdbcPoolException.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/pool/exception/JdbcPoolException.java @@ -1,4 +1,4 @@ -package com.anjiplus.template.gaea.business.modules.data.dataSource.pool.exception; +package com.anjiplus.template.gaea.business.modules.dataSource.pool.exception; /** * @author binbin.hou diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSource/pool/util/DataSourceHandleUtil.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/pool/util/DataSourceHandleUtil.java similarity index 63% rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSource/pool/util/DataSourceHandleUtil.java rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/pool/util/DataSourceHandleUtil.java index 604ceeae..981d87a8 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSource/pool/util/DataSourceHandleUtil.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/pool/util/DataSourceHandleUtil.java @@ -1,4 +1,4 @@ -package com.anjiplus.template.gaea.business.modules.data.dataSource.pool.util; +package com.anjiplus.template.gaea.business.modules.dataSource.pool.util; /** * Created by raodeming on 2021/3/19. diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSource/pool/util/DriverClassUtil.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/pool/util/DriverClassUtil.java similarity index 97% rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSource/pool/util/DriverClassUtil.java rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/pool/util/DriverClassUtil.java index 5f3973f3..ed2917f1 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSource/pool/util/DriverClassUtil.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/pool/util/DriverClassUtil.java @@ -1,4 +1,4 @@ -package com.anjiplus.template.gaea.business.modules.data.dataSource.pool.util; +package com.anjiplus.template.gaea.business.modules.dataSource.pool.util; import com.anji.plus.gaea.exception.BusinessExceptionBuilder; import com.anjiplus.template.gaea.business.code.ResponseCode; diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSource/pool/util/JdbcUtil.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/pool/util/JdbcUtil.java similarity index 88% rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSource/pool/util/JdbcUtil.java rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/pool/util/JdbcUtil.java index 94d6eb26..e8a72bc0 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSource/pool/util/JdbcUtil.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/pool/util/JdbcUtil.java @@ -1,8 +1,8 @@ -package com.anjiplus.template.gaea.business.modules.data.dataSource.pool.util; +package com.anjiplus.template.gaea.business.modules.dataSource.pool.util; -import com.anjiplus.template.gaea.business.modules.data.dataSource.controller.dto.DataSourceDto; -import com.anjiplus.template.gaea.business.modules.data.dataSource.pool.datasource.PooledDataSource; -import com.anjiplus.template.gaea.business.modules.data.dataSource.pool.datasource.UnPooledDataSource; +import com.anjiplus.template.gaea.business.modules.dataSource.controller.dto.DataSourceDto; +import com.anjiplus.template.gaea.business.modules.dataSource.pool.datasource.PooledDataSource; +import com.anjiplus.template.gaea.business.modules.dataSource.pool.datasource.UnPooledDataSource; import lombok.extern.slf4j.Slf4j; import java.sql.Connection; diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSource/service/DataSourceService.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/service/DataSourceService.java similarity index 60% rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSource/service/DataSourceService.java rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/service/DataSourceService.java index 220b0b25..72ddf4fd 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dataSource/service/DataSourceService.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/service/DataSourceService.java @@ -1,13 +1,13 @@ -package com.anjiplus.template.gaea.business.modules.data.dataSource.service; +package com.anjiplus.template.gaea.business.modules.dataSource.service; import com.alibaba.fastjson.JSONObject; import com.anji.plus.gaea.curd.service.GaeaBaseService; -import com.anjiplus.template.gaea.business.modules.data.dataSet.controller.dto.DataSetDto; -import com.anjiplus.template.gaea.business.modules.data.dataSource.controller.dto.DataSourceDto; -import com.anjiplus.template.gaea.business.modules.data.dataSource.controller.param.ConnectionParam; -import com.anjiplus.template.gaea.business.modules.data.dataSource.controller.param.DataSourceParam; -import com.anjiplus.template.gaea.business.modules.data.dataSource.dao.entity.DataSource; +import com.anjiplus.template.gaea.business.modules.dataSet.controller.dto.DataSetDto; +import com.anjiplus.template.gaea.business.modules.dataSource.controller.dto.DataSourceDto; +import com.anjiplus.template.gaea.business.modules.dataSource.controller.param.ConnectionParam; +import com.anjiplus.template.gaea.business.modules.dataSource.controller.param.DataSourceParam; +import com.anjiplus.template.gaea.business.modules.dataSource.dao.entity.DataSource; import java.util.List; @@ -45,4 +45,4 @@ public interface DataSourceService extends GaeaBaseService { + + void delReport(ReportDto reportDto); +} diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/report/service/impl/ReportServiceImpl.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/report/service/impl/ReportServiceImpl.java similarity index 62% rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/report/service/impl/ReportServiceImpl.java rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/report/service/impl/ReportServiceImpl.java index 34104887..838315c7 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/report/service/impl/ReportServiceImpl.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/report/service/impl/ReportServiceImpl.java @@ -1,12 +1,12 @@ -package com.anjiplus.template.gaea.business.modules.data.report.service.impl; +package com.anjiplus.template.gaea.business.modules.report.service.impl; import com.anji.plus.gaea.curd.mapper.GaeaBaseMapper; -import com.anjiplus.template.gaea.business.modules.data.report.controller.dto.ReportDto; -import com.anjiplus.template.gaea.business.modules.data.report.dao.ReportMapper; -import com.anjiplus.template.gaea.business.modules.data.report.dao.entity.Report; -import com.anjiplus.template.gaea.business.modules.data.report.service.ReportService; -import com.anjiplus.template.gaea.business.modules.data.reportexcel.dao.ReportExcelMapper; -import com.anjiplus.template.gaea.business.modules.data.reportexcel.dao.entity.ReportExcel; +import com.anjiplus.template.gaea.business.modules.report.controller.dto.ReportDto; +import com.anjiplus.template.gaea.business.modules.report.dao.ReportMapper; +import com.anjiplus.template.gaea.business.modules.report.dao.entity.Report; +import com.anjiplus.template.gaea.business.modules.report.service.ReportService; +import com.anjiplus.template.gaea.business.modules.reportexcel.dao.ReportExcelMapper; +import com.anjiplus.template.gaea.business.modules.reportexcel.dao.entity.ReportExcel; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/reportexcel/controller/ReportExcelController.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/reportexcel/controller/ReportExcelController.java similarity index 86% rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/reportexcel/controller/ReportExcelController.java rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/reportexcel/controller/ReportExcelController.java index 2d9d7451..5ab7457d 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/reportexcel/controller/ReportExcelController.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/reportexcel/controller/ReportExcelController.java @@ -1,4 +1,4 @@ -package com.anjiplus.template.gaea.business.modules.data.reportexcel.controller; +package com.anjiplus.template.gaea.business.modules.reportexcel.controller; import com.anji.plus.gaea.annotation.Permission; import com.anji.plus.gaea.annotation.log.GaeaAuditLog; @@ -6,10 +6,10 @@ import com.anji.plus.gaea.bean.ResponseBean; import com.anji.plus.gaea.code.ResponseCode; import com.anji.plus.gaea.curd.controller.GaeaBaseController; import com.anji.plus.gaea.curd.service.GaeaBaseService; -import com.anjiplus.template.gaea.business.modules.data.reportexcel.controller.dto.ReportExcelDto; -import com.anjiplus.template.gaea.business.modules.data.reportexcel.controller.param.ReportExcelParam; -import com.anjiplus.template.gaea.business.modules.data.reportexcel.dao.entity.ReportExcel; -import com.anjiplus.template.gaea.business.modules.data.reportexcel.service.ReportExcelService; +import com.anjiplus.template.gaea.business.modules.reportexcel.controller.dto.ReportExcelDto; +import com.anjiplus.template.gaea.business.modules.reportexcel.controller.param.ReportExcelParam; +import com.anjiplus.template.gaea.business.modules.reportexcel.dao.entity.ReportExcel; +import com.anjiplus.template.gaea.business.modules.reportexcel.service.ReportExcelService; import io.swagger.annotations.Api; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/reportexcel/controller/dto/ReportExcelDto.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/reportexcel/controller/dto/ReportExcelDto.java similarity index 89% rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/reportexcel/controller/dto/ReportExcelDto.java rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/reportexcel/controller/dto/ReportExcelDto.java index ed36dd48..22c273e7 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/reportexcel/controller/dto/ReportExcelDto.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/reportexcel/controller/dto/ReportExcelDto.java @@ -1,5 +1,5 @@ -package com.anjiplus.template.gaea.business.modules.data.reportexcel.controller.dto; +package com.anjiplus.template.gaea.business.modules.reportexcel.controller.dto; import com.anji.plus.gaea.curd.dto.GaeaBaseDTO; import lombok.Data; diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/reportexcel/controller/param/ReportExcelParam.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/reportexcel/controller/param/ReportExcelParam.java similarity index 73% rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/reportexcel/controller/param/ReportExcelParam.java rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/reportexcel/controller/param/ReportExcelParam.java index 11d0a9f2..e4d85806 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/reportexcel/controller/param/ReportExcelParam.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/reportexcel/controller/param/ReportExcelParam.java @@ -1,5 +1,5 @@ -package com.anjiplus.template.gaea.business.modules.data.reportexcel.controller.param; +package com.anjiplus.template.gaea.business.modules.reportexcel.controller.param; import com.anji.plus.gaea.curd.params.PageParam; import lombok.Data; diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/reportexcel/dao/ReportExcelMapper.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/reportexcel/dao/ReportExcelMapper.java similarity index 52% rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/reportexcel/dao/ReportExcelMapper.java rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/reportexcel/dao/ReportExcelMapper.java index 2fe2ac51..422b83f8 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/reportexcel/dao/ReportExcelMapper.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/reportexcel/dao/ReportExcelMapper.java @@ -1,7 +1,7 @@ -package com.anjiplus.template.gaea.business.modules.data.reportexcel.dao; +package com.anjiplus.template.gaea.business.modules.reportexcel.dao; import com.anji.plus.gaea.curd.mapper.GaeaBaseMapper; -import com.anjiplus.template.gaea.business.modules.data.reportexcel.dao.entity.ReportExcel; +import com.anjiplus.template.gaea.business.modules.reportexcel.dao.entity.ReportExcel; /** * @author chenkening diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/reportexcel/dao/entity/ReportExcel.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/reportexcel/dao/entity/ReportExcel.java similarity index 91% rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/reportexcel/dao/entity/ReportExcel.java rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/reportexcel/dao/entity/ReportExcel.java index 45cb42fb..ea55d556 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/reportexcel/dao/entity/ReportExcel.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/reportexcel/dao/entity/ReportExcel.java @@ -1,4 +1,4 @@ -package com.anjiplus.template.gaea.business.modules.data.reportexcel.dao.entity; +package com.anjiplus.template.gaea.business.modules.reportexcel.dao.entity; import com.anji.plus.gaea.curd.entity.GaeaBaseEntity; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/reportexcel/service/ReportExcelService.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/reportexcel/service/ReportExcelService.java similarity index 65% rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/reportexcel/service/ReportExcelService.java rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/reportexcel/service/ReportExcelService.java index 8d5c9577..883899b6 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/reportexcel/service/ReportExcelService.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/reportexcel/service/ReportExcelService.java @@ -1,9 +1,9 @@ -package com.anjiplus.template.gaea.business.modules.data.reportexcel.service; +package com.anjiplus.template.gaea.business.modules.reportexcel.service; import com.anji.plus.gaea.curd.service.GaeaBaseService; -import com.anjiplus.template.gaea.business.modules.data.reportexcel.controller.dto.ReportExcelDto; -import com.anjiplus.template.gaea.business.modules.data.reportexcel.controller.param.ReportExcelParam; -import com.anjiplus.template.gaea.business.modules.data.reportexcel.dao.entity.ReportExcel; +import com.anjiplus.template.gaea.business.modules.reportexcel.controller.dto.ReportExcelDto; +import com.anjiplus.template.gaea.business.modules.reportexcel.controller.param.ReportExcelParam; +import com.anjiplus.template.gaea.business.modules.reportexcel.dao.entity.ReportExcel; /** * TODO diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/reportexcel/service/impl/ReportExcelServiceImpl.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/reportexcel/service/impl/ReportExcelServiceImpl.java similarity index 88% rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/reportexcel/service/impl/ReportExcelServiceImpl.java rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/reportexcel/service/impl/ReportExcelServiceImpl.java index 804fd4a7..4963f54c 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/reportexcel/service/impl/ReportExcelServiceImpl.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/reportexcel/service/impl/ReportExcelServiceImpl.java @@ -1,4 +1,4 @@ -package com.anjiplus.template.gaea.business.modules.data.reportexcel.service.impl; +package com.anjiplus.template.gaea.business.modules.reportexcel.service.impl; import com.alibaba.fastjson.JSONObject; import com.anji.plus.gaea.constant.BaseOperationEnum; @@ -11,13 +11,13 @@ import com.anji.plus.gaea.holder.UserContentHolder; import com.anji.plus.gaea.utils.GaeaAssert; import com.anji.plus.gaea.utils.GaeaBeanUtils; import com.anjiplus.template.gaea.business.code.ResponseCode; -import com.anjiplus.template.gaea.business.modules.data.report.dao.ReportMapper; -import com.anjiplus.template.gaea.business.modules.data.report.dao.entity.Report; -import com.anjiplus.template.gaea.business.modules.data.reportexcel.controller.dto.ReportExcelDto; -import com.anjiplus.template.gaea.business.modules.data.reportexcel.dao.ReportExcelMapper; -import com.anjiplus.template.gaea.business.modules.data.reportexcel.dao.entity.ReportExcel; -import com.anjiplus.template.gaea.business.modules.data.reportexcel.service.ReportExcelService; -import com.anjiplus.template.gaea.business.modules.data.reportexcel.util.ReportUtil; +import com.anjiplus.template.gaea.business.modules.report.dao.ReportMapper; +import com.anjiplus.template.gaea.business.modules.report.dao.entity.Report; +import com.anjiplus.template.gaea.business.modules.reportexcel.controller.dto.ReportExcelDto; +import com.anjiplus.template.gaea.business.modules.reportexcel.dao.ReportExcelMapper; +import com.anjiplus.template.gaea.business.modules.reportexcel.dao.entity.ReportExcel; +import com.anjiplus.template.gaea.business.modules.reportexcel.service.ReportExcelService; +import com.anjiplus.template.gaea.business.modules.reportexcel.util.ReportUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/reportexcel/util/ReportUtil.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/reportexcel/util/ReportUtil.java similarity index 99% rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/reportexcel/util/ReportUtil.java rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/reportexcel/util/ReportUtil.java index f0d58b4c..bcebc34a 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/reportexcel/util/ReportUtil.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/reportexcel/util/ReportUtil.java @@ -1,15 +1,15 @@ -package com.anjiplus.template.gaea.business.modules.data.reportexcel.util; +package com.anjiplus.template.gaea.business.modules.reportexcel.util; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.parser.Feature; import com.anji.plus.gaea.export.utils.QrCodeOrBarCodeUtil; -import com.anjiplus.template.gaea.business.modules.data.dataSet.controller.dto.DataSetDto; -import com.anjiplus.template.gaea.business.modules.data.dataSet.controller.dto.OriginalDataDto; -import com.anjiplus.template.gaea.business.modules.data.dataSet.service.DataSetService; -import com.anjiplus.template.gaea.business.modules.data.report.constant.ExpConstant; -import com.anjiplus.template.gaea.business.modules.data.reportexcel.controller.dto.ReportExcelDto; +import com.anjiplus.template.gaea.business.modules.dataSet.controller.dto.DataSetDto; +import com.anjiplus.template.gaea.business.modules.dataSet.controller.dto.OriginalDataDto; +import com.anjiplus.template.gaea.business.modules.dataSet.service.DataSetService; +import com.anjiplus.template.gaea.business.modules.report.constant.ExpConstant; +import com.anjiplus.template.gaea.business.modules.reportexcel.controller.dto.ReportExcelDto; import freemarker.template.Configuration; import freemarker.template.Template; import org.apache.commons.lang3.StringUtils; diff --git a/report-core/src/main/resources/mapper/DataSetMapper.xml b/report-core/src/main/resources/mapper/DataSetMapper.xml index 88731dbc..55a72c76 100644 --- a/report-core/src/main/resources/mapper/DataSetMapper.xml +++ b/report-core/src/main/resources/mapper/DataSetMapper.xml @@ -1,7 +1,7 @@ - + - + @@ -26,4 +26,4 @@ - \ No newline at end of file + diff --git a/report-core/src/main/resources/mapper/DataSetParamMapper.xml b/report-core/src/main/resources/mapper/DataSetParamMapper.xml index 428988c2..eebdfa8a 100644 --- a/report-core/src/main/resources/mapper/DataSetParamMapper.xml +++ b/report-core/src/main/resources/mapper/DataSetParamMapper.xml @@ -1,7 +1,7 @@ - + - + @@ -28,4 +28,4 @@ - \ No newline at end of file + diff --git a/report-core/src/main/resources/mapper/DataSetTransformMapper.xml b/report-core/src/main/resources/mapper/DataSetTransformMapper.xml index dca23fa3..ee3cb7ce 100644 --- a/report-core/src/main/resources/mapper/DataSetTransformMapper.xml +++ b/report-core/src/main/resources/mapper/DataSetTransformMapper.xml @@ -1,7 +1,7 @@ - + - + @@ -24,4 +24,4 @@ - \ No newline at end of file + diff --git a/report-core/src/main/resources/mapper/DataSourceMapper.xml b/report-core/src/main/resources/mapper/DataSourceMapper.xml index af55c19e..8ae699f0 100644 --- a/report-core/src/main/resources/mapper/DataSourceMapper.xml +++ b/report-core/src/main/resources/mapper/DataSourceMapper.xml @@ -1,7 +1,7 @@ - + - + @@ -25,4 +25,4 @@ - \ No newline at end of file + diff --git a/report-core/src/main/resources/mapper/ReportDashboardMapper.xml b/report-core/src/main/resources/mapper/ReportDashboardMapper.xml index ab9aa8bf..8fb4c3c6 100644 --- a/report-core/src/main/resources/mapper/ReportDashboardMapper.xml +++ b/report-core/src/main/resources/mapper/ReportDashboardMapper.xml @@ -1,7 +1,7 @@ - + - + @@ -28,4 +28,4 @@ - \ No newline at end of file + diff --git a/report-core/src/main/resources/mapper/ReportDashboardWidgetMapper.xml b/report-core/src/main/resources/mapper/ReportDashboardWidgetMapper.xml index 476e6388..891f2b02 100644 --- a/report-core/src/main/resources/mapper/ReportDashboardWidgetMapper.xml +++ b/report-core/src/main/resources/mapper/ReportDashboardWidgetMapper.xml @@ -1,7 +1,7 @@ - + - + diff --git a/report-core/src/main/resources/mapper/ReportExcelMapper.xml b/report-core/src/main/resources/mapper/ReportExcelMapper.xml index 216277cc..41a7bcf8 100644 --- a/report-core/src/main/resources/mapper/ReportExcelMapper.xml +++ b/report-core/src/main/resources/mapper/ReportExcelMapper.xml @@ -1,7 +1,7 @@ - + - + diff --git a/report-core/src/main/resources/mapper/ReportMapper.xml b/report-core/src/main/resources/mapper/ReportMapper.xml index 1a506d65..b63ef940 100644 --- a/report-core/src/main/resources/mapper/ReportMapper.xml +++ b/report-core/src/main/resources/mapper/ReportMapper.xml @@ -1,7 +1,7 @@ - + - +