包名格式化

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;

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSet/controller/DataSetController.java → 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;

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSet/controller/dto/DataSetDto.java → 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;

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSet/controller/dto/OriginalDataDto.java → 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;

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSet/controller/param/DataSetParam.java → 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;

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSet/controller/param/DataSetTestTransformParam.java → 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;

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSet/dao/DataSetMapper.java → 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

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSet/dao/entity/DataSet.java → 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;

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSet/service/DataSetService.java → 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;
 

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSet/service/impl/DataSetServiceImpl.java → 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;

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetParam/controller/DataSetParamController.java → 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;

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetParam/controller/dto/DataSetParamDto.java → 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;

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetParam/controller/param/DataSetParamParam.java → 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;

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetParam/controller/param/DataSetParamValidationParam.java → 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;
 

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetParam/dao/DataSetParamMapper.java → 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;
 
 /**

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetParam/dao/entity/DataSetParam.java → 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;

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetParam/service/DataSetParamService.java → 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;

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetParam/service/impl/DataSetParamServiceImpl.java → 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;

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetParam/util/ParamsResolverHelper.java → 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;
 

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetTransform/controller/DataSetTransformController.java → 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;

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetTransform/controller/dto/DataSetTransformDto.java → 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;

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetTransform/controller/param/DataSetTransformParam.java → 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;

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetTransform/dao/DataSetTransformMapper.java → 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;
 
 /**

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetTransform/dao/entity/DataSetTransform.java → 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;

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetTransform/service/DataSetTransformService.java → 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;
 

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetTransform/service/TransformStrategy.java → 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;
 

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetTransform/service/impl/DataSetTransformServiceImpl.java → 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;

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetTransform/service/impl/DictTransformServiceImpl.java → 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;

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetTransform/service/impl/JsTransformServiceImpl.java → 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;

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/config/HttpClientConfig.java → 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;

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/config/HttpClientPoolConfig.java → 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;

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/controller/DataSourceController.java → 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;

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/controller/dto/DataSourceDto.java → 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;

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/controller/param/ConnectionParam.java → 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;
 

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/controller/param/DataSourceParam.java → 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;

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/dao/DataSourceMapper.java → 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

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/dao/entity/DataSource.java → 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;

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/service/DataSourceService.java → 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;
 

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/service/JdbcService.java → 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;

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/service/impl/DataSourceServiceImpl.java → 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;

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/service/impl/JdbcServiceImpl.java → 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;

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"  />

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"  />

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"  />

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"  />

report-core/src/test/java/com/anjiplus/template/gaea/business/modules/dataSource/service/impl/DataSourceServiceImplTest.java → 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;