From 972bd1bd3fde75685b2a95f3e31de31a45fc7653 Mon Sep 17 00:00:00 2001
From: Raod <1130305001@qq.com>
Date: Fri, 6 Aug 2021 15:38:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=85=E5=90=8D=E6=A0=BC=E5=BC=8F=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../impl/ReportDashboardServiceImpl.java | 6 ++--
.../controller/DataSetController.java | 12 ++++----
.../controller/dto/DataSetDto.java | 6 ++--
.../controller/dto/OriginalDataDto.java | 2 +-
.../controller/param/DataSetParam.java | 2 +-
.../param/DataSetTestTransformParam.java | 6 ++--
.../dao/DataSetMapper.java | 4 +--
.../dao/entity/DataSet.java | 2 +-
.../service/DataSetService.java | 10 +++----
.../service/impl/DataSetServiceImpl.java | 30 +++++++++----------
.../controller/DataSetParamController.java | 12 ++++----
.../controller/dto/DataSetParamDto.java | 2 +-
.../controller/param/DataSetParamParam.java | 2 +-
.../param/DataSetParamValidationParam.java | 2 +-
.../dao/DataSetParamMapper.java | 4 +--
.../dao/entity/DataSetParam.java | 2 +-
.../service/DataSetParamService.java | 8 ++---
.../service/impl/DataSetParamServiceImpl.java | 12 ++++----
.../util/ParamsResolverHelper.java | 2 +-
.../DataSetTransformController.java | 10 +++----
.../controller/dto/DataSetTransformDto.java | 2 +-
.../param/DataSetTransformParam.java | 2 +-
.../dao/DataSetTransformMapper.java | 4 +--
.../dao/entity/DataSetTransform.java | 2 +-
.../service/DataSetTransformService.java | 8 ++---
.../service/TransformStrategy.java | 4 +--
.../impl/DataSetTransformServiceImpl.java | 12 ++++----
.../impl/DictTransformServiceImpl.java | 6 ++--
.../service/impl/JsTransformServiceImpl.java | 6 ++--
.../config/HttpClientConfig.java | 2 +-
.../config/HttpClientPoolConfig.java | 2 +-
.../controller/DataSourceController.java | 12 ++++----
.../controller/dto/DataSourceDto.java | 2 +-
.../controller/param/ConnectionParam.java | 2 +-
.../controller/param/DataSourceParam.java | 2 +-
.../dao/DataSourceMapper.java | 4 +--
.../dao/entity/DataSource.java | 2 +-
.../service/DataSourceService.java | 12 ++++----
.../service/JdbcService.java | 4 +--
.../service/impl/DataSourceServiceImpl.java | 18 +++++------
.../service/impl/JdbcServiceImpl.java | 6 ++--
.../main/resources/mapper/DataSetMapper.xml | 4 +--
.../resources/mapper/DataSetParamMapper.xml | 4 +--
.../mapper/DataSetTransformMapper.xml | 4 +--
.../resources/mapper/DataSourceMapper.xml | 4 +--
.../impl/DataSourceServiceImplTest.java | 6 ++--
46 files changed, 136 insertions(+), 136 deletions(-)
rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{dataSet => dataset}/controller/DataSetController.java (93%)
rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{dataSet => dataset}/controller/dto/DataSetDto.java (86%)
rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{dataSet => dataset}/controller/dto/OriginalDataDto.java (90%)
rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{dataSet => dataset}/controller/param/DataSetParam.java (90%)
rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{dataSet => dataset}/controller/param/DataSetTestTransformParam.java (79%)
rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{dataSet => dataset}/dao/DataSetMapper.java (68%)
rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{dataSet => dataset}/dao/entity/DataSet.java (95%)
rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{dataSet => dataset}/service/DataSetService.java (80%)
rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{dataSet => dataset}/service/impl/DataSetServiceImpl.java (92%)
rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{dataSetParam => datasetparam}/controller/DataSetParamController.java (83%)
rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{dataSetParam => datasetparam}/controller/dto/DataSetParamDto.java (94%)
rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{dataSetParam => datasetparam}/controller/param/DataSetParamParam.java (83%)
rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{dataSetParam => datasetparam}/controller/param/DataSetParamValidationParam.java (88%)
rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{dataSetParam => datasetparam}/dao/DataSetParamMapper.java (70%)
rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{dataSetParam => datasetparam}/dao/entity/DataSetParam.java (95%)
rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{dataSetParam => datasetparam}/service/DataSetParamService.java (82%)
rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{dataSetParam => datasetparam}/service/impl/DataSetParamServiceImpl.java (91%)
rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{dataSetParam => datasetparam}/util/ParamsResolverHelper.java (94%)
rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{dataSetTransform => datasettransform}/controller/DataSetTransformController.java (80%)
rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{dataSetTransform => datasettransform}/controller/dto/DataSetTransformDto.java (92%)
rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{dataSetTransform => datasettransform}/controller/param/DataSetTransformParam.java (84%)
rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{dataSetTransform => datasettransform}/dao/DataSetTransformMapper.java (71%)
rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{dataSetTransform => datasettransform}/dao/entity/DataSetTransform.java (94%)
rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{dataSetTransform => datasettransform}/service/DataSetTransformService.java (69%)
rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{dataSetTransform => datasettransform}/service/TransformStrategy.java (78%)
rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{dataSetTransform => datasettransform}/service/impl/DataSetTransformServiceImpl.java (86%)
rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{dataSetTransform => datasettransform}/service/impl/DictTransformServiceImpl.java (88%)
rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{dataSetTransform => datasettransform}/service/impl/JsTransformServiceImpl.java (90%)
rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{dataSource => datasource}/config/HttpClientConfig.java (99%)
rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{dataSource => datasource}/config/HttpClientPoolConfig.java (95%)
rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{dataSource => datasource}/controller/DataSourceController.java (83%)
rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{dataSource => datasource}/controller/dto/DataSourceDto.java (96%)
rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{dataSource => datasource}/controller/param/ConnectionParam.java (92%)
rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{dataSource => datasource}/controller/param/DataSourceParam.java (92%)
rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{dataSource => datasource}/dao/DataSourceMapper.java (69%)
rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{dataSource => datasource}/dao/entity/DataSource.java (96%)
rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{dataSource => datasource}/service/DataSourceService.java (72%)
rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{dataSource => datasource}/service/JdbcService.java (85%)
rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{dataSource => datasource}/service/impl/DataSourceServiceImpl.java (96%)
rename report-core/src/main/java/com/anjiplus/template/gaea/business/modules/{dataSource => datasource}/service/impl/JdbcServiceImpl.java (93%)
rename report-core/src/test/java/com/anjiplus/template/gaea/business/modules/{dataSource => datasource}/service/impl/DataSourceServiceImplTest.java (88%)
diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/service/impl/ReportDashboardServiceImpl.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/service/impl/ReportDashboardServiceImpl.java
index 6fef3da1..7a41a7fa 100644
--- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/service/impl/ReportDashboardServiceImpl.java
+++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/service/impl/ReportDashboardServiceImpl.java
@@ -19,9 +19,9 @@ import com.anjiplus.template.gaea.business.modules.dashboardwidget.controller.dt
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.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/dataSet/controller/DataSetController.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/controller/DataSetController.java
similarity index 93%
rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSet/controller/DataSetController.java
rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/controller/DataSetController.java
index ee775f39..88a24bf9 100644
--- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/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.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.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 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/dataSet/controller/dto/DataSetDto.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/controller/dto/DataSetDto.java
similarity index 86%
rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSet/controller/dto/DataSetDto.java
rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/controller/dto/DataSetDto.java
index 75eb3dcd..06d4bc29 100644
--- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/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.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.dataSetParam.controller.dto.DataSetParamDto;
-import com.anjiplus.template.gaea.business.modules.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;
diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSet/controller/dto/OriginalDataDto.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/controller/dto/OriginalDataDto.java
similarity index 90%
rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSet/controller/dto/OriginalDataDto.java
rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/controller/dto/OriginalDataDto.java
index 82e3926c..c33d1fea 100644
--- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/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.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/dataSet/controller/param/DataSetParam.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/controller/param/DataSetParam.java
similarity index 90%
rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSet/controller/param/DataSetParam.java
rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/controller/param/DataSetParam.java
index f093c599..0cdca5c5 100644
--- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/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.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;
diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSet/controller/param/DataSetTestTransformParam.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/controller/param/DataSetTestTransformParam.java
similarity index 79%
rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSet/controller/param/DataSetTestTransformParam.java
rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/controller/param/DataSetTestTransformParam.java
index 166dc836..0bf50f18 100644
--- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/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.dataSet.controller.param;
+package com.anjiplus.template.gaea.business.modules.dataset.controller.param;
-import com.anjiplus.template.gaea.business.modules.dataSetParam.controller.dto.DataSetParamDto;
-import com.anjiplus.template.gaea.business.modules.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;
diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSet/dao/DataSetMapper.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/dao/DataSetMapper.java
similarity index 68%
rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSet/dao/DataSetMapper.java
rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/dao/DataSetMapper.java
index 334aebfa..d8514e48 100644
--- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/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.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.dataSet.dao.entity.DataSet;
+import com.anjiplus.template.gaea.business.modules.dataset.dao.entity.DataSet;
/**
* DataSet Mapper
diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSet/dao/entity/DataSet.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/dao/entity/DataSet.java
similarity index 95%
rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSet/dao/entity/DataSet.java
rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/dao/entity/DataSet.java
index 475a96e9..5a62b1a4 100644
--- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/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.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/dataSet/service/DataSetService.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/service/DataSetService.java
similarity index 80%
rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSet/service/DataSetService.java
rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/service/DataSetService.java
index 568de6da..8d37e3fa 100644
--- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/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.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.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 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/dataSet/service/impl/DataSetServiceImpl.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/service/impl/DataSetServiceImpl.java
similarity index 92%
rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSet/service/impl/DataSetServiceImpl.java
rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/service/impl/DataSetServiceImpl.java
index 6fcffa61..47e4e2ec 100644
--- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/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.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.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.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/dataSetParam/controller/DataSetParamController.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasetparam/controller/DataSetParamController.java
similarity index 83%
rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetParam/controller/DataSetParamController.java
rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasetparam/controller/DataSetParamController.java
index 984ce30e..4a7e076e 100644
--- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetParam/controller/DataSetParamController.java
+++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasetparam/controller/DataSetParamController.java
@@ -1,14 +1,14 @@
-package com.anjiplus.template.gaea.business.modules.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.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 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;
diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetParam/controller/dto/DataSetParamDto.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasetparam/controller/dto/DataSetParamDto.java
similarity index 94%
rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetParam/controller/dto/DataSetParamDto.java
rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasetparam/controller/dto/DataSetParamDto.java
index b447e954..81c5659f 100644
--- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetParam/controller/dto/DataSetParamDto.java
+++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasetparam/controller/dto/DataSetParamDto.java
@@ -1,5 +1,5 @@
-package com.anjiplus.template.gaea.business.modules.dataSetParam.controller.dto;
+package com.anjiplus.template.gaea.business.modules.datasetparam.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/dataSetParam/controller/param/DataSetParamParam.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasetparam/controller/param/DataSetParamParam.java
similarity index 83%
rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetParam/controller/param/DataSetParamParam.java
rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasetparam/controller/param/DataSetParamParam.java
index dfdb2c43..6ad9882d 100644
--- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetParam/controller/param/DataSetParamParam.java
+++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasetparam/controller/param/DataSetParamParam.java
@@ -1,5 +1,5 @@
/**/
-package com.anjiplus.template.gaea.business.modules.dataSetParam.controller.param;
+package com.anjiplus.template.gaea.business.modules.datasetparam.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/dataSetParam/controller/param/DataSetParamValidationParam.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasetparam/controller/param/DataSetParamValidationParam.java
similarity index 88%
rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetParam/controller/param/DataSetParamValidationParam.java
rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasetparam/controller/param/DataSetParamValidationParam.java
index 19cfcaaa..d2d9c0e8 100644
--- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetParam/controller/param/DataSetParamValidationParam.java
+++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasetparam/controller/param/DataSetParamValidationParam.java
@@ -1,4 +1,4 @@
-package com.anjiplus.template.gaea.business.modules.dataSetParam.controller.param;
+package com.anjiplus.template.gaea.business.modules.datasetparam.controller.param;
import lombok.Data;
diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetParam/dao/DataSetParamMapper.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasetparam/dao/DataSetParamMapper.java
similarity index 70%
rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetParam/dao/DataSetParamMapper.java
rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasetparam/dao/DataSetParamMapper.java
index 6ff61706..c4f776c7 100644
--- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetParam/dao/DataSetParamMapper.java
+++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasetparam/dao/DataSetParamMapper.java
@@ -1,7 +1,7 @@
-package com.anjiplus.template.gaea.business.modules.dataSetParam.dao;
+package com.anjiplus.template.gaea.business.modules.datasetparam.dao;
import com.anji.plus.gaea.curd.mapper.GaeaBaseMapper;
-import com.anjiplus.template.gaea.business.modules.dataSetParam.dao.entity.DataSetParam;
+import com.anjiplus.template.gaea.business.modules.datasetparam.dao.entity.DataSetParam;
import org.apache.ibatis.annotations.Mapper;
/**
diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetParam/dao/entity/DataSetParam.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasetparam/dao/entity/DataSetParam.java
similarity index 95%
rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetParam/dao/entity/DataSetParam.java
rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasetparam/dao/entity/DataSetParam.java
index 5dad6c77..52a7e07b 100644
--- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/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.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/dataSetParam/service/DataSetParamService.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasetparam/service/DataSetParamService.java
similarity index 82%
rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetParam/service/DataSetParamService.java
rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasetparam/service/DataSetParamService.java
index 2942228d..71c2286e 100644
--- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetParam/service/DataSetParamService.java
+++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasetparam/service/DataSetParamService.java
@@ -1,10 +1,10 @@
-package com.anjiplus.template.gaea.business.modules.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.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 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;
diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetParam/service/impl/DataSetParamServiceImpl.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasetparam/service/impl/DataSetParamServiceImpl.java
similarity index 91%
rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetParam/service/impl/DataSetParamServiceImpl.java
rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasetparam/service/impl/DataSetParamServiceImpl.java
index 40fc5183..79a367ac 100644
--- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/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.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.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.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 com.fasterxml.jackson.databind.ObjectMapper;
import lombok.extern.slf4j.Slf4j;
diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetParam/util/ParamsResolverHelper.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasetparam/util/ParamsResolverHelper.java
similarity index 94%
rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetParam/util/ParamsResolverHelper.java
rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasetparam/util/ParamsResolverHelper.java
index 3b86d7cc..51aad489 100644
--- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/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.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/dataSetTransform/controller/DataSetTransformController.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasettransform/controller/DataSetTransformController.java
similarity index 80%
rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetTransform/controller/DataSetTransformController.java
rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasettransform/controller/DataSetTransformController.java
index 94ad3ca0..047708ca 100644
--- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/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.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.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 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;
diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetTransform/controller/dto/DataSetTransformDto.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasettransform/controller/dto/DataSetTransformDto.java
similarity index 92%
rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetTransform/controller/dto/DataSetTransformDto.java
rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasettransform/controller/dto/DataSetTransformDto.java
index f5901ba4..28db676f 100644
--- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetTransform/controller/dto/DataSetTransformDto.java
+++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasettransform/controller/dto/DataSetTransformDto.java
@@ -1,5 +1,5 @@
-package com.anjiplus.template.gaea.business.modules.dataSetTransform.controller.dto;
+package com.anjiplus.template.gaea.business.modules.datasettransform.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/dataSetTransform/controller/param/DataSetTransformParam.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasettransform/controller/param/DataSetTransformParam.java
similarity index 84%
rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetTransform/controller/param/DataSetTransformParam.java
rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasettransform/controller/param/DataSetTransformParam.java
index 35c0e1c7..07ec30a0 100644
--- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetTransform/controller/param/DataSetTransformParam.java
+++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasettransform/controller/param/DataSetTransformParam.java
@@ -1,5 +1,5 @@
/**/
-package com.anjiplus.template.gaea.business.modules.dataSetTransform.controller.param;
+package com.anjiplus.template.gaea.business.modules.datasettransform.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/dataSetTransform/dao/DataSetTransformMapper.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasettransform/dao/DataSetTransformMapper.java
similarity index 71%
rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetTransform/dao/DataSetTransformMapper.java
rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasettransform/dao/DataSetTransformMapper.java
index bca6cb08..209303b7 100644
--- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetTransform/dao/DataSetTransformMapper.java
+++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasettransform/dao/DataSetTransformMapper.java
@@ -1,7 +1,7 @@
-package com.anjiplus.template.gaea.business.modules.dataSetTransform.dao;
+package com.anjiplus.template.gaea.business.modules.datasettransform.dao;
import com.anji.plus.gaea.curd.mapper.GaeaBaseMapper;
-import com.anjiplus.template.gaea.business.modules.dataSetTransform.dao.entity.DataSetTransform;
+import com.anjiplus.template.gaea.business.modules.datasettransform.dao.entity.DataSetTransform;
import org.apache.ibatis.annotations.Mapper;
/**
diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetTransform/dao/entity/DataSetTransform.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasettransform/dao/entity/DataSetTransform.java
similarity index 94%
rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetTransform/dao/entity/DataSetTransform.java
rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasettransform/dao/entity/DataSetTransform.java
index 281db47d..4ed3af3f 100644
--- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/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.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/dataSetTransform/service/DataSetTransformService.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasettransform/service/DataSetTransformService.java
similarity index 69%
rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetTransform/service/DataSetTransformService.java
rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasettransform/service/DataSetTransformService.java
index 1bc059c8..92a3bb82 100644
--- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/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.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.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.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;
diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetTransform/service/TransformStrategy.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasettransform/service/TransformStrategy.java
similarity index 78%
rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetTransform/service/TransformStrategy.java
rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasettransform/service/TransformStrategy.java
index c61855bd..ff8f35f8 100644
--- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/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.dataSetTransform.service;
+package com.anjiplus.template.gaea.business.modules.datasettransform.service;
import com.alibaba.fastjson.JSONObject;
-import com.anjiplus.template.gaea.business.modules.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/dataSetTransform/service/impl/DataSetTransformServiceImpl.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasettransform/service/impl/DataSetTransformServiceImpl.java
similarity index 86%
rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetTransform/service/impl/DataSetTransformServiceImpl.java
rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasettransform/service/impl/DataSetTransformServiceImpl.java
index 4d3dbb80..ec2ca5b5 100644
--- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/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.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.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 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;
diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetTransform/service/impl/DictTransformServiceImpl.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasettransform/service/impl/DictTransformServiceImpl.java
similarity index 88%
rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetTransform/service/impl/DictTransformServiceImpl.java
rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasettransform/service/impl/DictTransformServiceImpl.java
index 3922bf1e..c7a58390 100644
--- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/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.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.dataSetTransform.controller.dto.DataSetTransformDto;
-import com.anjiplus.template.gaea.business.modules.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/dataSetTransform/service/impl/JsTransformServiceImpl.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasettransform/service/impl/JsTransformServiceImpl.java
similarity index 90%
rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetTransform/service/impl/JsTransformServiceImpl.java
rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasettransform/service/impl/JsTransformServiceImpl.java
index 941cb96c..22945676 100644
--- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetTransform/service/impl/JsTransformServiceImpl.java
+++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasettransform/service/impl/JsTransformServiceImpl.java
@@ -1,10 +1,10 @@
-package com.anjiplus.template.gaea.business.modules.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.code.ResponseCode;
-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.modules.datasettransform.controller.dto.DataSetTransformDto;
+import com.anjiplus.template.gaea.business.modules.datasettransform.service.TransformStrategy;
import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/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/dataSource/config/HttpClientConfig.java
rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/config/HttpClientConfig.java
index 463704cf..e1c8f2b6 100644
--- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/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.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/dataSource/config/HttpClientPoolConfig.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/config/HttpClientPoolConfig.java
similarity index 95%
rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/config/HttpClientPoolConfig.java
rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/config/HttpClientPoolConfig.java
index 7945c535..ad12493a 100644
--- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/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.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/dataSource/controller/DataSourceController.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/controller/DataSourceController.java
similarity index 83%
rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/controller/DataSourceController.java
rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/controller/DataSourceController.java
index 0a19f3a9..ba6c3a4d 100644
--- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/controller/DataSourceController.java
+++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/controller/DataSourceController.java
@@ -1,15 +1,15 @@
-package com.anjiplus.template.gaea.business.modules.dataSource.controller;
+package com.anjiplus.template.gaea.business.modules.datasource.controller;
import com.anji.plus.gaea.annotation.Permission;
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.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 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;
diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/controller/dto/DataSourceDto.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/controller/dto/DataSourceDto.java
similarity index 96%
rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/controller/dto/DataSourceDto.java
rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/controller/dto/DataSourceDto.java
index 05849b7d..e22eea62 100644
--- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/controller/dto/DataSourceDto.java
+++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/controller/dto/DataSourceDto.java
@@ -1,5 +1,5 @@
-package com.anjiplus.template.gaea.business.modules.dataSource.controller.dto;
+package com.anjiplus.template.gaea.business.modules.datasource.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/dataSource/controller/param/ConnectionParam.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/controller/param/ConnectionParam.java
similarity index 92%
rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/controller/param/ConnectionParam.java
rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/controller/param/ConnectionParam.java
index 2b493762..ec97092c 100644
--- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/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.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/dataSource/controller/param/DataSourceParam.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/controller/param/DataSourceParam.java
similarity index 92%
rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/controller/param/DataSourceParam.java
rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/controller/param/DataSourceParam.java
index 85410097..f8d98e87 100644
--- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/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.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;
diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/dao/DataSourceMapper.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/dao/DataSourceMapper.java
similarity index 69%
rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/dao/DataSourceMapper.java
rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/dao/DataSourceMapper.java
index eb7493a3..3bcf882d 100644
--- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/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.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.dataSource.dao.entity.DataSource;
+import com.anjiplus.template.gaea.business.modules.datasource.dao.entity.DataSource;
/**
* DataSource Mapper
diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/dao/entity/DataSource.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/dao/entity/DataSource.java
similarity index 96%
rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/dao/entity/DataSource.java
rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/dao/entity/DataSource.java
index 04c1e6d5..d4939cc4 100644
--- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/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.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/dataSource/service/DataSourceService.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/service/DataSourceService.java
similarity index 72%
rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/service/DataSourceService.java
rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/service/DataSourceService.java
index 72ddf4fd..17e318b1 100644
--- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/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.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.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 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;
diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/service/JdbcService.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/service/JdbcService.java
similarity index 85%
rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/service/JdbcService.java
rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/service/JdbcService.java
index dc1041b3..56dadf96 100644
--- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/service/JdbcService.java
+++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/service/JdbcService.java
@@ -1,6 +1,6 @@
-package com.anjiplus.template.gaea.business.modules.dataSource.service;
+package com.anjiplus.template.gaea.business.modules.datasource.service;
-import com.anjiplus.template.gaea.business.modules.dataSource.controller.dto.DataSourceDto;
+import com.anjiplus.template.gaea.business.modules.datasource.controller.dto.DataSourceDto;
import java.sql.Connection;
import java.sql.SQLException;
diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/service/impl/DataSourceServiceImpl.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/service/impl/DataSourceServiceImpl.java
similarity index 96%
rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/service/impl/DataSourceServiceImpl.java
rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/service/impl/DataSourceServiceImpl.java
index 08f5b1b8..77b53950 100644
--- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/service/impl/DataSourceServiceImpl.java
+++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/service/impl/DataSourceServiceImpl.java
@@ -1,5 +1,5 @@
-package com.anjiplus.template.gaea.business.modules.dataSource.service.impl;
+package com.anjiplus.template.gaea.business.modules.datasource.service.impl;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
@@ -11,14 +11,14 @@ import com.anji.plus.gaea.exception.BusinessExceptionBuilder;
import com.anji.plus.gaea.utils.GaeaAssert;
import com.anjiplus.template.gaea.business.code.ResponseCode;
import com.anjiplus.template.gaea.business.constant.BusinessConstant;
-import com.anjiplus.template.gaea.business.modules.dataSet.controller.dto.DataSetDto;
-import com.anjiplus.template.gaea.business.modules.dataSetParam.service.DataSetParamService;
-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.dao.DataSourceMapper;
-import com.anjiplus.template.gaea.business.modules.dataSource.dao.entity.DataSource;
-import com.anjiplus.template.gaea.business.modules.dataSource.service.DataSourceService;
-import com.anjiplus.template.gaea.business.modules.dataSource.service.JdbcService;
+import com.anjiplus.template.gaea.business.modules.dataset.controller.dto.DataSetDto;
+import com.anjiplus.template.gaea.business.modules.datasetparam.service.DataSetParamService;
+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.dao.DataSourceMapper;
+import com.anjiplus.template.gaea.business.modules.datasource.dao.entity.DataSource;
+import com.anjiplus.template.gaea.business.modules.datasource.service.DataSourceService;
+import com.anjiplus.template.gaea.business.modules.datasource.service.JdbcService;
import com.anjiplus.template.gaea.business.util.JdbcConstants;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/service/impl/JdbcServiceImpl.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/service/impl/JdbcServiceImpl.java
similarity index 93%
rename from report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/service/impl/JdbcServiceImpl.java
rename to report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/service/impl/JdbcServiceImpl.java
index a7a49430..694aa2fd 100644
--- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/service/impl/JdbcServiceImpl.java
+++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/service/impl/JdbcServiceImpl.java
@@ -1,9 +1,9 @@
-package com.anjiplus.template.gaea.business.modules.dataSource.service.impl;
+package com.anjiplus.template.gaea.business.modules.datasource.service.impl;
import com.alibaba.druid.pool.DruidDataSource;
import com.anjiplus.template.gaea.business.config.DruidProperties;
-import com.anjiplus.template.gaea.business.modules.dataSource.controller.dto.DataSourceDto;
-import com.anjiplus.template.gaea.business.modules.dataSource.service.JdbcService;
+import com.anjiplus.template.gaea.business.modules.datasource.controller.dto.DataSourceDto;
+import com.anjiplus.template.gaea.business.modules.datasource.service.JdbcService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/report-core/src/main/resources/mapper/DataSetMapper.xml b/report-core/src/main/resources/mapper/DataSetMapper.xml
index 55a72c76..585950b2 100644
--- a/report-core/src/main/resources/mapper/DataSetMapper.xml
+++ b/report-core/src/main/resources/mapper/DataSetMapper.xml
@@ -1,7 +1,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.anjiplus.template.gaea.business.modules.dataSet.dao.DataSetMapper">
+<mapper namespace="com.anjiplus.template.gaea.business.modules.dataset.dao.DataSetMapper">
- <resultMap type="com.anjiplus.template.gaea.business.modules.dataSet.dao.entity.DataSet" id="DataSetMap">
+ <resultMap type="com.anjiplus.template.gaea.business.modules.dataset.dao.entity.DataSet" id="DataSetMap">
<!--jdbcType="{column.columnType}"-->
<result property="id" column="id" />
<result property="setCode" column="set_code" />
diff --git a/report-core/src/main/resources/mapper/DataSetParamMapper.xml b/report-core/src/main/resources/mapper/DataSetParamMapper.xml
index eebdfa8a..779d1149 100644
--- a/report-core/src/main/resources/mapper/DataSetParamMapper.xml
+++ b/report-core/src/main/resources/mapper/DataSetParamMapper.xml
@@ -1,7 +1,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.anjiplus.template.gaea.business.modules.dataSetParam.dao.DataSetParamMapper">
+<mapper namespace="com.anjiplus.template.gaea.business.modules.datasetparam.dao.DataSetParamMapper">
- <resultMap type="com.anjiplus.template.gaea.business.modules.dataSetParam.dao.entity.DataSetParam" id="DataSetParamMap">
+ <resultMap type="com.anjiplus.template.gaea.business.modules.datasetparam.dao.entity.DataSetParam" id="DataSetParamMap">
<!--jdbcType="{column.columnType}"-->
<result property="id" column="id" />
<result property="setCode" column="set_code" />
diff --git a/report-core/src/main/resources/mapper/DataSetTransformMapper.xml b/report-core/src/main/resources/mapper/DataSetTransformMapper.xml
index ee3cb7ce..13f2adc8 100644
--- a/report-core/src/main/resources/mapper/DataSetTransformMapper.xml
+++ b/report-core/src/main/resources/mapper/DataSetTransformMapper.xml
@@ -1,7 +1,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.anjiplus.template.gaea.business.modules.dataSetTransform.dao.DataSetTransformMapper">
+<mapper namespace="com.anjiplus.template.gaea.business.modules.datasettransform.dao.DataSetTransformMapper">
- <resultMap type="com.anjiplus.template.gaea.business.modules.dataSetTransform.dao.entity.DataSetTransform" id="DataSetTransformMap">
+ <resultMap type="com.anjiplus.template.gaea.business.modules.datasettransform.dao.entity.DataSetTransform" id="DataSetTransformMap">
<!--jdbcType="{column.columnType}"-->
<result property="id" column="id" />
<result property="setCode" column="set_code" />
diff --git a/report-core/src/main/resources/mapper/DataSourceMapper.xml b/report-core/src/main/resources/mapper/DataSourceMapper.xml
index 8ae699f0..a060de82 100644
--- a/report-core/src/main/resources/mapper/DataSourceMapper.xml
+++ b/report-core/src/main/resources/mapper/DataSourceMapper.xml
@@ -1,7 +1,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.anjiplus.template.gaea.business.modules.dataSource.dao.DataSourceMapper">
+<mapper namespace="com.anjiplus.template.gaea.business.modules.datasource.dao.DataSourceMapper">
- <resultMap type="com.anjiplus.template.gaea.business.modules.dataSource.dao.entity.DataSource" id="DataSourceMap">
+ <resultMap type="com.anjiplus.template.gaea.business.modules.datasource.dao.entity.DataSource" id="DataSourceMap">
<!--jdbcType="{column.columnType}"-->
<result property="id" column="id" />
<result property="sourceCode" column="source_code" />
diff --git a/report-core/src/test/java/com/anjiplus/template/gaea/business/modules/dataSource/service/impl/DataSourceServiceImplTest.java b/report-core/src/test/java/com/anjiplus/template/gaea/business/modules/datasource/service/impl/DataSourceServiceImplTest.java
similarity index 88%
rename from report-core/src/test/java/com/anjiplus/template/gaea/business/modules/dataSource/service/impl/DataSourceServiceImplTest.java
rename to report-core/src/test/java/com/anjiplus/template/gaea/business/modules/datasource/service/impl/DataSourceServiceImplTest.java
index 315bd0bc..4bb4368d 100644
--- a/report-core/src/test/java/com/anjiplus/template/gaea/business/modules/dataSource/service/impl/DataSourceServiceImplTest.java
+++ b/report-core/src/test/java/com/anjiplus/template/gaea/business/modules/datasource/service/impl/DataSourceServiceImplTest.java
@@ -1,9 +1,9 @@
-package com.anjiplus.template.gaea.business.modules.dataSource.service.impl;
+package com.anjiplus.template.gaea.business.modules.datasource.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.anjiplus.template.gaea.business.ReportApplication;
-import com.anjiplus.template.gaea.business.modules.dataSource.controller.dto.DataSourceDto;
-import com.anjiplus.template.gaea.business.modules.dataSource.service.DataSourceService;
+import com.anjiplus.template.gaea.business.modules.datasource.controller.dto.DataSourceDto;
+import com.anjiplus.template.gaea.business.modules.datasource.service.DataSourceService;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;