modules

doc/docs/.vuepress/config.js

@@ -1,14 +1,45 @@
 module.exports = {
-	base: '/doc/',
-	title: '大屏设计',
-	description: '使用拖拽快速生成动态大屏报表',
-	dest: 'dist',
-	lastUpdated: 'Last Updated',
-	theme: '',
-	themeConfig: {
-		logo: '/logo.png',
-		smoothScroll: true,
-		sidebarDepth: 2,
-
-	}
+    base: '/doc/',
+    title: '大屏设计',
+    description: '使用拖拽快速生成动态大屏报表',
+    dest: 'dist',
+    lastUpdated: 'Last Updated',
+    theme: '',
+    themeConfig: {
+        logo: '/logo.png',
+        smoothScroll: true,
+        sidebarDepth: 2,
+        nav: [
+            {text: '首页', link: '/'},
+            {text: '文档', link: '/guide/'},
+            {text: 'GitHub', link: 'https://github.com/anji-plus/report'},
+            {text: 'Gitee', link: 'https://gitee.com/anji-plus/report'},
+        ],
+        sidebar: {
+            '/guide/': [
+                {
+                    title: '文档',
+                    collapsable: false,
+                    children: [
+                        {title: '介绍', path: '/guide/'},
+                        {title: '快速了解', path: '/guide/quickly'},
+                        {title: '项目介绍', path: '/guide/productintro'},
+                        {title: '系统运行', path: '/guide/deploy'},
+                        {title: '开发手册', path: '/guide/devdoc'}
+                    ]
+                },
+                {
+                    title: '盖亚底盘',
+                    collapsable: false,
+                    children: []
+                },
+                {
+                    title: '其他',
+                    collapsable: false,
+                    children: [
+                        {title: '常见问题', path: '/guide/question'}
+                    ]
+                }],
+        }
+    }
 }

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/controller/ReportDashboardController.java

@@ -1,12 +1,12 @@
 
-package com.anjiplus.template.gaea.business.modules.data.dashboard.controller;
+package com.anjiplus.template.gaea.business.modules.dashboard.controller;
 
 import com.anji.plus.gaea.annotation.Permission;
 import com.anji.plus.gaea.annotation.log.GaeaAuditLog;
 import com.anji.plus.gaea.bean.ResponseBean;
-import com.anjiplus.template.gaea.business.modules.data.dashboard.controller.dto.ChartDto;
-import com.anjiplus.template.gaea.business.modules.data.dashboard.controller.dto.ReportDashboardObjectDto;
-import com.anjiplus.template.gaea.business.modules.data.dashboard.service.ReportDashboardService;
+import com.anjiplus.template.gaea.business.modules.dashboard.service.ReportDashboardService;
+import com.anjiplus.template.gaea.business.modules.dashboard.controller.dto.ChartDto;
+import com.anjiplus.template.gaea.business.modules.dashboard.controller.dto.ReportDashboardObjectDto;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/controller/dto/ChartDto.java

@@ -1,5 +1,5 @@
 
-package com.anjiplus.template.gaea.business.modules.data.dashboard.controller.dto;
+package com.anjiplus.template.gaea.business.modules.dashboard.controller.dto;
 
 import lombok.Data;
 

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/controller/dto/ReportDashboardDto.java

@@ -1,8 +1,8 @@
 
-package com.anjiplus.template.gaea.business.modules.data.dashboard.controller.dto;
+package com.anjiplus.template.gaea.business.modules.dashboard.controller.dto;
 
 import com.anji.plus.gaea.curd.dto.GaeaBaseDTO;
-import com.anjiplus.template.gaea.business.modules.data.dashboardwidget.controller.dto.ReportDashboardWidgetDto;
+import com.anjiplus.template.gaea.business.modules.dashboardwidget.controller.dto.ReportDashboardWidgetDto;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -52,4 +52,4 @@ public class ReportDashboardDto extends GaeaBaseDTO implements Serializable {
 
     private List<ReportDashboardWidgetDto> widgets;
 
-}
+}

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/controller/dto/ReportDashboardObjectDto.java

@@ -1,7 +1,7 @@
 
-package com.anjiplus.template.gaea.business.modules.data.dashboard.controller.dto;
+package com.anjiplus.template.gaea.business.modules.dashboard.controller.dto;
 
-import com.anjiplus.template.gaea.business.modules.data.dashboardwidget.controller.dto.ReportDashboardWidgetDto;
+import com.anjiplus.template.gaea.business.modules.dashboardwidget.controller.dto.ReportDashboardWidgetDto;
 import lombok.Data;
 
 import java.io.Serializable;

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/controller/param/ReportDashboardParam.java

@@ -1,5 +1,5 @@
 /**/
-package com.anjiplus.template.gaea.business.modules.data.dashboard.controller.param;
+package com.anjiplus.template.gaea.business.modules.dashboard.controller.param;
 
 import lombok.Data;
 import java.io.Serializable;
@@ -17,4 +17,4 @@ import java.util.List;
 **/
 @Data
 public class ReportDashboardParam extends PageParam implements Serializable{
-}
+}

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/dao/ReportDashboardMapper.java

@@ -1,9 +1,9 @@
-package com.anjiplus.template.gaea.business.modules.data.dashboard.dao;
+package com.anjiplus.template.gaea.business.modules.dashboard.dao;
 
 import org.apache.ibatis.annotations.Mapper;
 
 import com.anji.plus.gaea.curd.mapper.GaeaBaseMapper;
-import com.anjiplus.template.gaea.business.modules.data.dashboard.dao.entity.ReportDashboard;
+import com.anjiplus.template.gaea.business.modules.dashboard.dao.entity.ReportDashboard;
 
 /**
 * ReportDashboard Mapper
@@ -13,4 +13,4 @@ import com.anjiplus.template.gaea.business.modules.data.dashboard.dao.entity.Rep
 @Mapper
 public interface ReportDashboardMapper extends GaeaBaseMapper<ReportDashboard> {
 
-}
+}

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/dao/entity/ReportDashboard.java

@@ -1,5 +1,5 @@
 
-package com.anjiplus.template.gaea.business.modules.data.dashboard.dao.entity;
+package com.anjiplus.template.gaea.business.modules.dashboard.dao.entity;
 
 import com.anji.plus.gaea.annotation.Unique;
 import com.anji.plus.gaea.curd.entity.GaeaBaseEntity;

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/service/ChartStrategy.java

@@ -1,7 +1,7 @@
-package com.anjiplus.template.gaea.business.modules.data.dashboard.service;
+package com.anjiplus.template.gaea.business.modules.dashboard.service;
 
 import com.alibaba.fastjson.JSONObject;
-import com.anjiplus.template.gaea.business.modules.data.dashboard.controller.dto.ChartDto;
+import com.anjiplus.template.gaea.business.modules.dashboard.controller.dto.ChartDto;
 
 import java.util.List;
 

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/service/ReportDashboardService.java

@@ -1,11 +1,11 @@
 
-package com.anjiplus.template.gaea.business.modules.data.dashboard.service;
+package com.anjiplus.template.gaea.business.modules.dashboard.service;
 
 import com.anji.plus.gaea.curd.service.GaeaBaseService;
-import com.anjiplus.template.gaea.business.modules.data.dashboard.controller.dto.ChartDto;
-import com.anjiplus.template.gaea.business.modules.data.dashboard.controller.dto.ReportDashboardObjectDto;
-import com.anjiplus.template.gaea.business.modules.data.dashboard.controller.param.ReportDashboardParam;
-import com.anjiplus.template.gaea.business.modules.data.dashboard.dao.entity.ReportDashboard;
+import com.anjiplus.template.gaea.business.modules.dashboard.controller.dto.ChartDto;
+import com.anjiplus.template.gaea.business.modules.dashboard.controller.dto.ReportDashboardObjectDto;
+import com.anjiplus.template.gaea.business.modules.dashboard.controller.param.ReportDashboardParam;
+import com.anjiplus.template.gaea.business.modules.dashboard.dao.entity.ReportDashboard;
 
 /**
 * @desc ReportDashboard 大屏设计服务接口

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/service/impl/BarChartServiceImpl.java

@@ -1,12 +1,10 @@
-package com.anjiplus.template.gaea.business.modules.data.dashboard.service.impl;
+package com.anjiplus.template.gaea.business.modules.dashboard.service.impl;
 
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.anjiplus.template.gaea.business.modules.data.dashboard.controller.dto.ChartDto;
-import com.anjiplus.template.gaea.business.modules.data.dashboard.service.ChartStrategy;
+import com.anjiplus.template.gaea.business.modules.dashboard.controller.dto.ChartDto;
+import com.anjiplus.template.gaea.business.modules.dashboard.service.ChartStrategy;
 import org.springframework.stereotype.Component;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/service/impl/BarLineChartServiceImpl.java

@@ -1,14 +1,11 @@
-package com.anjiplus.template.gaea.business.modules.data.dashboard.service.impl;
+package com.anjiplus.template.gaea.business.modules.dashboard.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
-import com.anjiplus.template.gaea.business.modules.data.dashboard.controller.dto.ChartDto;
-import com.anjiplus.template.gaea.business.modules.data.dashboard.service.ChartStrategy;
+import com.anjiplus.template.gaea.business.modules.dashboard.controller.dto.ChartDto;
+import com.anjiplus.template.gaea.business.modules.dashboard.service.ChartStrategy;
 import org.springframework.stereotype.Component;
 
-import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 /**
  * 折柱图

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/service/impl/GaugeChartServiceImpl.java

@@ -1,8 +1,8 @@
-package com.anjiplus.template.gaea.business.modules.data.dashboard.service.impl;
+package com.anjiplus.template.gaea.business.modules.dashboard.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
-import com.anjiplus.template.gaea.business.modules.data.dashboard.controller.dto.ChartDto;
-import com.anjiplus.template.gaea.business.modules.data.dashboard.service.ChartStrategy;
+import com.anjiplus.template.gaea.business.modules.dashboard.controller.dto.ChartDto;
+import com.anjiplus.template.gaea.business.modules.dashboard.service.ChartStrategy;
 import org.springframework.stereotype.Component;
 
 import java.util.List;

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/service/impl/PieChartServiceImpl.java

@@ -1,8 +1,8 @@
-package com.anjiplus.template.gaea.business.modules.data.dashboard.service.impl;
+package com.anjiplus.template.gaea.business.modules.dashboard.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
-import com.anjiplus.template.gaea.business.modules.data.dashboard.controller.dto.ChartDto;
-import com.anjiplus.template.gaea.business.modules.data.dashboard.service.ChartStrategy;
+import com.anjiplus.template.gaea.business.modules.dashboard.controller.dto.ChartDto;
+import com.anjiplus.template.gaea.business.modules.dashboard.service.ChartStrategy;
 import org.springframework.stereotype.Component;
 
 import java.util.List;

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/service/impl/ReportDashboardServiceImpl.java

@@ -1,5 +1,5 @@
 
-package com.anjiplus.template.gaea.business.modules.data.dashboard.service.impl;
+package com.anjiplus.template.gaea.business.modules.dashboard.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.anji.plus.gaea.curd.mapper.GaeaBaseMapper;
@@ -7,21 +7,21 @@ import com.anji.plus.gaea.exception.BusinessExceptionBuilder;
 import com.anji.plus.gaea.utils.GaeaAssert;
 import com.anji.plus.gaea.utils.GaeaBeanUtils;
 import com.anjiplus.template.gaea.business.code.ResponseCode;
-import com.anjiplus.template.gaea.business.modules.data.dashboard.controller.dto.ChartDto;
-import com.anjiplus.template.gaea.business.modules.data.dashboard.controller.dto.ReportDashboardDto;
-import com.anjiplus.template.gaea.business.modules.data.dashboard.controller.dto.ReportDashboardObjectDto;
-import com.anjiplus.template.gaea.business.modules.data.dashboard.dao.ReportDashboardMapper;
-import com.anjiplus.template.gaea.business.modules.data.dashboard.dao.entity.ReportDashboard;
-import com.anjiplus.template.gaea.business.modules.data.dashboard.service.ChartStrategy;
-import com.anjiplus.template.gaea.business.modules.data.dashboard.service.ReportDashboardService;
-import com.anjiplus.template.gaea.business.modules.data.dashboard.util.DateUtil;
-import com.anjiplus.template.gaea.business.modules.data.dashboardwidget.controller.dto.ReportDashboardWidgetDto;
-import com.anjiplus.template.gaea.business.modules.data.dashboardwidget.controller.dto.ReportDashboardWidgetValueDto;
-import com.anjiplus.template.gaea.business.modules.data.dashboardwidget.dao.entity.ReportDashboardWidget;
-import com.anjiplus.template.gaea.business.modules.data.dashboardwidget.service.ReportDashboardWidgetService;
-import com.anjiplus.template.gaea.business.modules.data.dataSet.controller.dto.DataSetDto;
-import com.anjiplus.template.gaea.business.modules.data.dataSet.controller.dto.OriginalDataDto;
-import com.anjiplus.template.gaea.business.modules.data.dataSet.service.DataSetService;
+import com.anjiplus.template.gaea.business.modules.dashboard.controller.dto.ChartDto;
+import com.anjiplus.template.gaea.business.modules.dashboard.controller.dto.ReportDashboardDto;
+import com.anjiplus.template.gaea.business.modules.dashboard.controller.dto.ReportDashboardObjectDto;
+import com.anjiplus.template.gaea.business.modules.dashboard.dao.ReportDashboardMapper;
+import com.anjiplus.template.gaea.business.modules.dashboard.service.ChartStrategy;
+import com.anjiplus.template.gaea.business.modules.dashboard.service.ReportDashboardService;
+import com.anjiplus.template.gaea.business.modules.dashboard.util.DateUtil;
+import com.anjiplus.template.gaea.business.modules.dashboardwidget.controller.dto.ReportDashboardWidgetDto;
+import com.anjiplus.template.gaea.business.modules.dashboardwidget.controller.dto.ReportDashboardWidgetValueDto;
+import com.anjiplus.template.gaea.business.modules.dashboard.dao.entity.ReportDashboard;
+import com.anjiplus.template.gaea.business.modules.dashboardwidget.dao.entity.ReportDashboardWidget;
+import com.anjiplus.template.gaea.business.modules.dashboardwidget.service.ReportDashboardWidgetService;
+import com.anjiplus.template.gaea.business.modules.dataSet.controller.dto.DataSetDto;
+import com.anjiplus.template.gaea.business.modules.dataSet.controller.dto.OriginalDataDto;
+import com.anjiplus.template.gaea.business.modules.dataSet.service.DataSetService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/util/DateUtil.java

@@ -1,4 +1,4 @@
-package com.anjiplus.template.gaea.business.modules.data.dashboard.util;
+package com.anjiplus.template.gaea.business.modules.dashboard.util;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboardwidget/controller/dto/ReportDashboardWidgetDto.java

@@ -1,5 +1,5 @@
 
-package com.anjiplus.template.gaea.business.modules.data.dashboardwidget.controller.dto;
+package com.anjiplus.template.gaea.business.modules.dashboardwidget.controller.dto;
 
 import lombok.Data;
 

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboardwidget/controller/dto/ReportDashboardWidgetValueDto.java

@@ -1,5 +1,5 @@
 
-package com.anjiplus.template.gaea.business.modules.data.dashboardwidget.controller.dto;
+package com.anjiplus.template.gaea.business.modules.dashboardwidget.controller.dto;
 
 import com.alibaba.fastjson.JSONObject;
 import lombok.Data;

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboardwidget/controller/param/ReportDashboardWidgetParam.java

@@ -1,5 +1,5 @@
 /**/
-package com.anjiplus.template.gaea.business.modules.data.dashboardwidget.controller.param;
+package com.anjiplus.template.gaea.business.modules.dashboardwidget.controller.param;
 
 import lombok.Data;
 import java.io.Serializable;
@@ -17,4 +17,4 @@ import java.util.List;
 **/
 @Data
 public class ReportDashboardWidgetParam extends PageParam implements Serializable{
-}
+}

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboardwidget/dao/ReportDashboardWidgetMapper.java

@@ -1,9 +1,9 @@
-package com.anjiplus.template.gaea.business.modules.data.dashboardwidget.dao;
+package com.anjiplus.template.gaea.business.modules.dashboardwidget.dao;
 
 import org.apache.ibatis.annotations.Mapper;
 
 import com.anji.plus.gaea.curd.mapper.GaeaBaseMapper;
-import com.anjiplus.template.gaea.business.modules.data.dashboardwidget.dao.entity.ReportDashboardWidget;
+import com.anjiplus.template.gaea.business.modules.dashboardwidget.dao.entity.ReportDashboardWidget;
 
 /**
 * ReportDashboardWidget Mapper
@@ -13,4 +13,4 @@ import com.anjiplus.template.gaea.business.modules.data.dashboardwidget.dao.enti
 @Mapper
 public interface ReportDashboardWidgetMapper extends GaeaBaseMapper<ReportDashboardWidget> {
 
-}
+}

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboardwidget/dao/entity/ReportDashboardWidget.java

@@ -1,5 +1,5 @@
 
-package com.anjiplus.template.gaea.business.modules.data.dashboardwidget.dao.entity;
+package com.anjiplus.template.gaea.business.modules.dashboardwidget.dao.entity;
 
 import com.anji.plus.gaea.curd.entity.GaeaBaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboardwidget/service/ReportDashboardWidgetService.java

@@ -1,8 +1,8 @@
 
-package com.anjiplus.template.gaea.business.modules.data.dashboardwidget.service;
+package com.anjiplus.template.gaea.business.modules.dashboardwidget.service;
 
-import com.anjiplus.template.gaea.business.modules.data.dashboardwidget.dao.entity.ReportDashboardWidget;
-import com.anjiplus.template.gaea.business.modules.data.dashboardwidget.controller.param.ReportDashboardWidgetParam;
+import com.anjiplus.template.gaea.business.modules.dashboardwidget.controller.param.ReportDashboardWidgetParam;
+import com.anjiplus.template.gaea.business.modules.dashboardwidget.dao.entity.ReportDashboardWidget;
 import com.anji.plus.gaea.curd.service.GaeaBaseService;
 
 /**
@@ -18,4 +18,4 @@ public interface ReportDashboardWidgetService extends GaeaBaseService<ReportDash
      * @param id
      */
     ReportDashboardWidget getDetail(Long id);
-}
+}

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboardwidget/service/impl/ReportDashboardWidgetServiceImpl.java

@@ -1,14 +1,14 @@
 
-package com.anjiplus.template.gaea.business.modules.data.dashboardwidget.service.impl;
+package com.anjiplus.template.gaea.business.modules.dashboardwidget.service.impl;
 
 import com.anji.plus.gaea.curd.mapper.GaeaBaseMapper;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import com.anjiplus.template.gaea.business.modules.data.dashboardwidget.dao.entity.ReportDashboardWidget;
-import com.anjiplus.template.gaea.business.modules.data.dashboardwidget.service.ReportDashboardWidgetService;
-import com.anjiplus.template.gaea.business.modules.data.dashboardwidget.dao.ReportDashboardWidgetMapper;
+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.dashboardwidget.dao.ReportDashboardWidgetMapper;
 /**
 * @desc ReportDashboardWidget 大屏看板数据渲染服务实现
 * @author Raod
@@ -31,4 +31,4 @@ public class ReportDashboardWidgetServiceImpl implements ReportDashboardWidgetSe
         ReportDashboardWidget reportDashboardWidget = this.selectOne(id);
         return reportDashboardWidget;
     }
-}
+}

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/report/service/ReportService.java

@@ -1,17 +0,0 @@
-package com.anjiplus.template.gaea.business.modules.data.report.service;
-
-import com.anji.plus.gaea.curd.service.GaeaBaseService;
-import com.anjiplus.template.gaea.business.modules.data.report.controller.dto.ReportDto;
-import com.anjiplus.template.gaea.business.modules.data.report.controller.param.ReportParam;
-import com.anjiplus.template.gaea.business.modules.data.report.dao.entity.Report;
-
-/**
- * TODO
- *
- * @author chenkening
- * @date 2021/3/26 10:35
- */
-public interface ReportService extends GaeaBaseService<ReportParam, Report> {
-
-    void delReport(ReportDto reportDto);
-}

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSet/controller/DataSetController.java

@@ -1,5 +1,5 @@
 
-package com.anjiplus.template.gaea.business.modules.data.dataSet.controller;
+package com.anjiplus.template.gaea.business.modules.dataSet.controller;
 
 import com.anji.plus.gaea.annotation.AccessKey;
 import com.anji.plus.gaea.annotation.Permission;
@@ -9,11 +9,11 @@ import com.anji.plus.gaea.curd.controller.GaeaBaseController;
 import com.anji.plus.gaea.curd.service.GaeaBaseService;
 import com.anji.plus.gaea.holder.UserContentHolder;
 import com.anji.plus.gaea.utils.GaeaUtils;
-import com.anjiplus.template.gaea.business.modules.data.dataSet.controller.dto.DataSetDto;
-import com.anjiplus.template.gaea.business.modules.data.dataSet.controller.param.DataSetParam;
-import com.anjiplus.template.gaea.business.modules.data.dataSet.controller.param.DataSetTestTransformParam;
-import com.anjiplus.template.gaea.business.modules.data.dataSet.dao.entity.DataSet;
-import com.anjiplus.template.gaea.business.modules.data.dataSet.service.DataSetService;
+import com.anjiplus.template.gaea.business.modules.dataSet.controller.dto.DataSetDto;
+import com.anjiplus.template.gaea.business.modules.dataSet.controller.param.DataSetParam;
+import com.anjiplus.template.gaea.business.modules.dataSet.controller.param.DataSetTestTransformParam;
+import com.anjiplus.template.gaea.business.modules.dataSet.dao.entity.DataSet;
+import com.anjiplus.template.gaea.business.modules.dataSet.service.DataSetService;
 import io.swagger.annotations.Api;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSet/controller/dto/DataSetDto.java

@@ -1,9 +1,9 @@
 
-package com.anjiplus.template.gaea.business.modules.data.dataSet.controller.dto;
+package com.anjiplus.template.gaea.business.modules.dataSet.controller.dto;
 
 import com.anji.plus.gaea.curd.dto.GaeaBaseDTO;
-import com.anjiplus.template.gaea.business.modules.data.dataSetParam.controller.dto.DataSetParamDto;
-import com.anjiplus.template.gaea.business.modules.data.dataSetTransform.controller.dto.DataSetTransformDto;
+import com.anjiplus.template.gaea.business.modules.dataSetParam.controller.dto.DataSetParamDto;
+import com.anjiplus.template.gaea.business.modules.dataSetTransform.controller.dto.DataSetTransformDto;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -55,4 +55,4 @@ public class DataSetDto extends GaeaBaseDTO implements Serializable {
 
     private Set<String> setParamList;
 
-}
+}

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSet/controller/dto/OriginalDataDto.java

@@ -1,4 +1,4 @@
-package com.anjiplus.template.gaea.business.modules.data.dataSet.controller.dto;
+package com.anjiplus.template.gaea.business.modules.dataSet.controller.dto;
 
 import com.alibaba.fastjson.JSONObject;
 import lombok.Data;

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSet/controller/param/DataSetParam.java

@@ -1,5 +1,5 @@
 /**/
-package com.anjiplus.template.gaea.business.modules.data.dataSet.controller.param;
+package com.anjiplus.template.gaea.business.modules.dataSet.controller.param;
 
 import com.anji.plus.gaea.annotation.Query;
 import com.anji.plus.gaea.constant.QueryEnum;
@@ -27,4 +27,4 @@ public class DataSetParam extends PageParam implements Serializable{
     /** 数据源编码 */
     @Query(QueryEnum.EQ)
     private String sourceCode;
-}
+}

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSet/controller/param/DataSetTestTransformParam.java

@@ -1,8 +1,8 @@
 /**/
-package com.anjiplus.template.gaea.business.modules.data.dataSet.controller.param;
+package com.anjiplus.template.gaea.business.modules.dataSet.controller.param;
 
-import com.anjiplus.template.gaea.business.modules.data.dataSetParam.controller.dto.DataSetParamDto;
-import com.anjiplus.template.gaea.business.modules.data.dataSetTransform.controller.dto.DataSetTransformDto;
+import com.anjiplus.template.gaea.business.modules.dataSetParam.controller.dto.DataSetParamDto;
+import com.anjiplus.template.gaea.business.modules.dataSetTransform.controller.dto.DataSetTransformDto;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
@@ -31,4 +31,4 @@ public class DataSetTestTransformParam implements Serializable{
     /** 数据转换集合 */
     private List<DataSetTransformDto> dataSetTransformDtoList;
 
-}
+}

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSet/dao/DataSetMapper.java

@@ -1,9 +1,9 @@
-package com.anjiplus.template.gaea.business.modules.data.dataSet.dao;
+package com.anjiplus.template.gaea.business.modules.dataSet.dao;
 
 import org.apache.ibatis.annotations.Mapper;
 
 import com.anji.plus.gaea.curd.mapper.GaeaBaseMapper;
-import com.anjiplus.template.gaea.business.modules.data.dataSet.dao.entity.DataSet;
+import com.anjiplus.template.gaea.business.modules.dataSet.dao.entity.DataSet;
 
 /**
 * DataSet Mapper
@@ -13,4 +13,4 @@ import com.anjiplus.template.gaea.business.modules.data.dataSet.dao.entity.DataS
 @Mapper
 public interface DataSetMapper extends GaeaBaseMapper<DataSet> {
 
-}
+}

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSet/dao/entity/DataSet.java

@@ -1,5 +1,5 @@
 
-package com.anjiplus.template.gaea.business.modules.data.dataSet.dao.entity;
+package com.anjiplus.template.gaea.business.modules.dataSet.dao.entity;
 
 import com.anji.plus.gaea.annotation.Unique;
 import com.anji.plus.gaea.curd.entity.GaeaBaseEntity;

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSet/service/DataSetService.java

@@ -1,11 +1,11 @@
 
-package com.anjiplus.template.gaea.business.modules.data.dataSet.service;
+package com.anjiplus.template.gaea.business.modules.dataSet.service;
 
 import com.anji.plus.gaea.curd.service.GaeaBaseService;
-import com.anjiplus.template.gaea.business.modules.data.dataSet.controller.dto.DataSetDto;
-import com.anjiplus.template.gaea.business.modules.data.dataSet.controller.dto.OriginalDataDto;
-import com.anjiplus.template.gaea.business.modules.data.dataSet.controller.param.DataSetParam;
-import com.anjiplus.template.gaea.business.modules.data.dataSet.dao.entity.DataSet;
+import com.anjiplus.template.gaea.business.modules.dataSet.controller.dto.DataSetDto;
+import com.anjiplus.template.gaea.business.modules.dataSet.controller.dto.OriginalDataDto;
+import com.anjiplus.template.gaea.business.modules.dataSet.controller.param.DataSetParam;
+import com.anjiplus.template.gaea.business.modules.dataSet.dao.entity.DataSet;
 
 import java.util.List;
 

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSet/service/impl/DataSetServiceImpl.java

@@ -1,5 +1,5 @@
 
-package com.anjiplus.template.gaea.business.modules.data.dataSet.service.impl;
+package com.anjiplus.template.gaea.business.modules.dataSet.service.impl;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -8,20 +8,20 @@ import com.anji.plus.gaea.curd.mapper.GaeaBaseMapper;
 import com.anji.plus.gaea.exception.BusinessExceptionBuilder;
 import com.anji.plus.gaea.utils.GaeaBeanUtils;
 import com.anjiplus.template.gaea.business.code.ResponseCode;
-import com.anjiplus.template.gaea.business.modules.data.dataSet.controller.dto.OriginalDataDto;
-import com.anjiplus.template.gaea.business.modules.data.dataSet.controller.dto.DataSetDto;
-import com.anjiplus.template.gaea.business.modules.data.dataSet.dao.DataSetMapper;
-import com.anjiplus.template.gaea.business.modules.data.dataSet.dao.entity.DataSet;
-import com.anjiplus.template.gaea.business.modules.data.dataSet.service.DataSetService;
-import com.anjiplus.template.gaea.business.modules.data.dataSetParam.controller.dto.DataSetParamDto;
-import com.anjiplus.template.gaea.business.modules.data.dataSetParam.dao.entity.DataSetParam;
-import com.anjiplus.template.gaea.business.modules.data.dataSetParam.service.DataSetParamService;
-import com.anjiplus.template.gaea.business.modules.data.dataSetTransform.controller.dto.DataSetTransformDto;
-import com.anjiplus.template.gaea.business.modules.data.dataSetTransform.dao.entity.DataSetTransform;
-import com.anjiplus.template.gaea.business.modules.data.dataSetTransform.service.DataSetTransformService;
-import com.anjiplus.template.gaea.business.modules.data.dataSource.controller.dto.DataSourceDto;
-import com.anjiplus.template.gaea.business.modules.data.dataSource.dao.entity.DataSource;
-import com.anjiplus.template.gaea.business.modules.data.dataSource.service.DataSourceService;
+import com.anjiplus.template.gaea.business.modules.dataSet.controller.dto.OriginalDataDto;
+import com.anjiplus.template.gaea.business.modules.dataSet.controller.dto.DataSetDto;
+import com.anjiplus.template.gaea.business.modules.dataSet.dao.DataSetMapper;
+import com.anjiplus.template.gaea.business.modules.dataSet.dao.entity.DataSet;
+import com.anjiplus.template.gaea.business.modules.dataSet.service.DataSetService;
+import com.anjiplus.template.gaea.business.modules.dataSetParam.controller.dto.DataSetParamDto;
+import com.anjiplus.template.gaea.business.modules.dataSetParam.dao.entity.DataSetParam;
+import com.anjiplus.template.gaea.business.modules.dataSetParam.service.DataSetParamService;
+import com.anjiplus.template.gaea.business.modules.dataSetTransform.controller.dto.DataSetTransformDto;
+import com.anjiplus.template.gaea.business.modules.dataSetTransform.dao.entity.DataSetTransform;
+import com.anjiplus.template.gaea.business.modules.dataSetTransform.service.DataSetTransformService;
+import com.anjiplus.template.gaea.business.modules.dataSource.controller.dto.DataSourceDto;
+import com.anjiplus.template.gaea.business.modules.dataSource.dao.entity.DataSource;
+import com.anjiplus.template.gaea.business.modules.dataSource.service.DataSourceService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetParam/controller/DataSetParamController.java

@@ -1,15 +1,14 @@
 
-package com.anjiplus.template.gaea.business.modules.data.dataSetParam.controller;
+package com.anjiplus.template.gaea.business.modules.dataSetParam.controller;
 
 import com.anji.plus.gaea.bean.ResponseBean;
 import com.anji.plus.gaea.curd.controller.GaeaBaseController;
 import com.anji.plus.gaea.curd.service.GaeaBaseService;
-import com.anjiplus.template.gaea.business.modules.data.dataSetParam.controller.dto.DataSetParamDto;
-import com.anjiplus.template.gaea.business.modules.data.dataSetParam.controller.param.DataSetParamParam;
-import com.anjiplus.template.gaea.business.modules.data.dataSetParam.controller.param.DataSetParamValidationParam;
-import com.anjiplus.template.gaea.business.modules.data.dataSetParam.dao.entity.DataSetParam;
-import com.anjiplus.template.gaea.business.modules.data.dataSetParam.service.DataSetParamService;
-import com.anjiplus.template.gaea.business.modules.data.dataSource.controller.param.ConnectionParam;
+import com.anjiplus.template.gaea.business.modules.dataSetParam.controller.dto.DataSetParamDto;
+import com.anjiplus.template.gaea.business.modules.dataSetParam.controller.param.DataSetParamParam;
+import com.anjiplus.template.gaea.business.modules.dataSetParam.controller.param.DataSetParamValidationParam;
+import com.anjiplus.template.gaea.business.modules.dataSetParam.dao.entity.DataSetParam;
+import com.anjiplus.template.gaea.business.modules.dataSetParam.service.DataSetParamService;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -59,4 +58,4 @@ public class DataSetParamController extends GaeaBaseController<DataSetParamParam
         dto.setValidationRules(param.getValidationRules());
         return responseSuccessWithData(dataSetParamService.verification(dto));
     }
-}
+}

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.data.dataSetParam.controller.dto;
+package com.anjiplus.template.gaea.business.modules.dataSetParam.controller.dto;
 
 import com.anji.plus.gaea.curd.dto.GaeaBaseDTO;
 import lombok.Data;
@@ -45,4 +45,4 @@ public class DataSetParamDto extends GaeaBaseDTO implements Serializable {
     /** 0--未删除 1--已删除 DIC_NAME=DELETE_FLAG */
      private Integer deleteFlag;
 
-}
+}

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.data.dataSetParam.controller.param;
+package com.anjiplus.template.gaea.business.modules.dataSetParam.controller.param;
 
 import com.anji.plus.gaea.curd.params.PageParam;
 import lombok.Data;
@@ -14,4 +14,4 @@ import java.io.Serializable;
 **/
 @Data
 public class DataSetParamParam extends PageParam implements Serializable{
-}
+}

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.data.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

@@ -1,7 +1,7 @@
-package com.anjiplus.template.gaea.business.modules.data.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.data.dataSetParam.dao.entity.DataSetParam;
+import com.anjiplus.template.gaea.business.modules.dataSetParam.dao.entity.DataSetParam;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -12,4 +12,4 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface DataSetParamMapper extends GaeaBaseMapper<DataSetParam> {
 
-}
+}

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetParam/dao/entity/DataSetParam.java

@@ -1,5 +1,5 @@
 
-package com.anjiplus.template.gaea.business.modules.data.dataSetParam.dao.entity;
+package com.anjiplus.template.gaea.business.modules.dataSetParam.dao.entity;
 
 import com.anji.plus.gaea.curd.entity.GaeaBaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetParam/service/DataSetParamService.java

@@ -1,11 +1,10 @@
 
-package com.anjiplus.template.gaea.business.modules.data.dataSetParam.service;
+package com.anjiplus.template.gaea.business.modules.dataSetParam.service;
 
 import com.anji.plus.gaea.curd.service.GaeaBaseService;
-import com.anjiplus.template.gaea.business.modules.data.dataSet.controller.dto.DataSetDto;
-import com.anjiplus.template.gaea.business.modules.data.dataSetParam.controller.dto.DataSetParamDto;
-import com.anjiplus.template.gaea.business.modules.data.dataSetParam.controller.param.DataSetParamParam;
-import com.anjiplus.template.gaea.business.modules.data.dataSetParam.dao.entity.DataSetParam;
+import com.anjiplus.template.gaea.business.modules.dataSetParam.controller.dto.DataSetParamDto;
+import com.anjiplus.template.gaea.business.modules.dataSetParam.controller.param.DataSetParamParam;
+import com.anjiplus.template.gaea.business.modules.dataSetParam.dao.entity.DataSetParam;
 
 import java.util.List;
 import java.util.Map;
@@ -49,4 +48,4 @@ public interface DataSetParamService extends GaeaBaseService<DataSetParamParam,
      * @return
      */
     boolean verification(List<DataSetParamDto> dataSetParamDtoList, Map<String, Object> contextData);
-}
+}

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetParam/service/impl/DataSetParamServiceImpl.java

@@ -1,13 +1,13 @@
 
-package com.anjiplus.template.gaea.business.modules.data.dataSetParam.service.impl;
+package com.anjiplus.template.gaea.business.modules.dataSetParam.service.impl;
 
 import com.anji.plus.gaea.curd.mapper.GaeaBaseMapper;
 import com.anji.plus.gaea.exception.BusinessExceptionBuilder;
-import com.anjiplus.template.gaea.business.modules.data.dataSetParam.controller.dto.DataSetParamDto;
-import com.anjiplus.template.gaea.business.modules.data.dataSetParam.dao.DataSetParamMapper;
-import com.anjiplus.template.gaea.business.modules.data.dataSetParam.dao.entity.DataSetParam;
-import com.anjiplus.template.gaea.business.modules.data.dataSetParam.service.DataSetParamService;
-import com.anjiplus.template.gaea.business.modules.data.dataSetParam.util.ParamsResolverHelper;
+import com.anjiplus.template.gaea.business.modules.dataSetParam.controller.dto.DataSetParamDto;
+import com.anjiplus.template.gaea.business.modules.dataSetParam.dao.DataSetParamMapper;
+import com.anjiplus.template.gaea.business.modules.dataSetParam.dao.entity.DataSetParam;
+import com.anjiplus.template.gaea.business.modules.dataSetParam.service.DataSetParamService;
+import com.anjiplus.template.gaea.business.modules.dataSetParam.util.ParamsResolverHelper;
 import com.anjiplus.template.gaea.business.code.ResponseCode;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetParam/util/ParamsResolverHelper.java

@@ -1,4 +1,4 @@
-package com.anjiplus.template.gaea.business.modules.data.dataSetParam.util;
+package com.anjiplus.template.gaea.business.modules.dataSetParam.util;
 
 import org.springframework.util.PropertyPlaceholderHelper;
 

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetTransform/controller/DataSetTransformController.java

@@ -1,12 +1,12 @@
 
-package com.anjiplus.template.gaea.business.modules.data.dataSetTransform.controller;
+package com.anjiplus.template.gaea.business.modules.dataSetTransform.controller;
 
 import com.anji.plus.gaea.curd.controller.GaeaBaseController;
 import com.anji.plus.gaea.curd.service.GaeaBaseService;
-import com.anjiplus.template.gaea.business.modules.data.dataSetTransform.controller.dto.DataSetTransformDto;
-import com.anjiplus.template.gaea.business.modules.data.dataSetTransform.controller.param.DataSetTransformParam;
-import com.anjiplus.template.gaea.business.modules.data.dataSetTransform.dao.entity.DataSetTransform;
-import com.anjiplus.template.gaea.business.modules.data.dataSetTransform.service.DataSetTransformService;
+import com.anjiplus.template.gaea.business.modules.dataSetTransform.controller.dto.DataSetTransformDto;
+import com.anjiplus.template.gaea.business.modules.dataSetTransform.controller.param.DataSetTransformParam;
+import com.anjiplus.template.gaea.business.modules.dataSetTransform.dao.entity.DataSetTransform;
+import com.anjiplus.template.gaea.business.modules.dataSetTransform.service.DataSetTransformService;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -41,4 +41,4 @@ public class DataSetTransformController extends GaeaBaseController<DataSetTransf
         return new DataSetTransformDto();
     }
 
-}
+}

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.data.dataSetTransform.controller.dto;
+package com.anjiplus.template.gaea.business.modules.dataSetTransform.controller.dto;
 
 import com.anji.plus.gaea.curd.dto.GaeaBaseDTO;
 import lombok.Data;
@@ -33,4 +33,4 @@ public class DataSetTransformDto extends GaeaBaseDTO implements Serializable {
     /** 0--未删除 1--已删除 DIC_NAME=DELETE_FLAG */
      private Integer deleteFlag;
 
-}
+}

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.data.dataSetTransform.controller.param;
+package com.anjiplus.template.gaea.business.modules.dataSetTransform.controller.param;
 
 import com.anji.plus.gaea.curd.params.PageParam;
 import lombok.Data;
@@ -14,4 +14,4 @@ import java.io.Serializable;
 **/
 @Data
 public class DataSetTransformParam extends PageParam implements Serializable{
-}
+}

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.data.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.data.dataSetTransform.dao.entity.DataSetTransform;
+import com.anjiplus.template.gaea.business.modules.dataSetTransform.dao.entity.DataSetTransform;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -12,4 +12,4 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface DataSetTransformMapper extends GaeaBaseMapper<DataSetTransform> {
 
-}
+}

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetTransform/dao/entity/DataSetTransform.java

@@ -1,5 +1,5 @@
 
-package com.anjiplus.template.gaea.business.modules.data.dataSetTransform.dao.entity;
+package com.anjiplus.template.gaea.business.modules.dataSetTransform.dao.entity;
 
 import com.anji.plus.gaea.curd.entity.GaeaBaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetTransform/service/DataSetTransformService.java

@@ -1,11 +1,11 @@
 
-package com.anjiplus.template.gaea.business.modules.data.dataSetTransform.service;
+package com.anjiplus.template.gaea.business.modules.dataSetTransform.service;
 
 import com.alibaba.fastjson.JSONObject;
 import com.anji.plus.gaea.curd.service.GaeaBaseService;
-import com.anjiplus.template.gaea.business.modules.data.dataSetTransform.controller.dto.DataSetTransformDto;
-import com.anjiplus.template.gaea.business.modules.data.dataSetTransform.controller.param.DataSetTransformParam;
-import com.anjiplus.template.gaea.business.modules.data.dataSetTransform.dao.entity.DataSetTransform;
+import com.anjiplus.template.gaea.business.modules.dataSetTransform.controller.dto.DataSetTransformDto;
+import com.anjiplus.template.gaea.business.modules.dataSetTransform.controller.param.DataSetTransformParam;
+import com.anjiplus.template.gaea.business.modules.dataSetTransform.dao.entity.DataSetTransform;
 
 import java.util.List;
 
@@ -18,4 +18,4 @@ public interface DataSetTransformService extends GaeaBaseService<DataSetTransfor
 
     List<JSONObject> transform(List<DataSetTransformDto> dataSetTransformDtoList, List<JSONObject> data);
 
-}
+}

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetTransform/service/TransformStrategy.java

@@ -1,7 +1,7 @@
-package com.anjiplus.template.gaea.business.modules.data.dataSetTransform.service;
+package com.anjiplus.template.gaea.business.modules.dataSetTransform.service;
 
 import com.alibaba.fastjson.JSONObject;
-import com.anjiplus.template.gaea.business.modules.data.dataSetTransform.controller.dto.DataSetTransformDto;
+import com.anjiplus.template.gaea.business.modules.dataSetTransform.controller.dto.DataSetTransformDto;
 
 import java.util.List;
 

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetTransform/service/impl/DataSetTransformServiceImpl.java

@@ -1,13 +1,13 @@
 
-package com.anjiplus.template.gaea.business.modules.data.dataSetTransform.service.impl;
+package com.anjiplus.template.gaea.business.modules.dataSetTransform.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.anji.plus.gaea.curd.mapper.GaeaBaseMapper;
-import com.anjiplus.template.gaea.business.modules.data.dataSetTransform.controller.dto.DataSetTransformDto;
-import com.anjiplus.template.gaea.business.modules.data.dataSetTransform.dao.DataSetTransformMapper;
-import com.anjiplus.template.gaea.business.modules.data.dataSetTransform.dao.entity.DataSetTransform;
-import com.anjiplus.template.gaea.business.modules.data.dataSetTransform.service.DataSetTransformService;
-import com.anjiplus.template.gaea.business.modules.data.dataSetTransform.service.TransformStrategy;
+import com.anjiplus.template.gaea.business.modules.dataSetTransform.controller.dto.DataSetTransformDto;
+import com.anjiplus.template.gaea.business.modules.dataSetTransform.dao.DataSetTransformMapper;
+import com.anjiplus.template.gaea.business.modules.dataSetTransform.dao.entity.DataSetTransform;
+import com.anjiplus.template.gaea.business.modules.dataSetTransform.service.DataSetTransformService;
+import com.anjiplus.template.gaea.business.modules.dataSetTransform.service.TransformStrategy;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -68,4 +68,4 @@ public class DataSetTransformServiceImpl implements DataSetTransformService, Ini
         }
         return data;
     }
-}
+}

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetTransform/service/impl/DictTransformServiceImpl.java

@@ -1,8 +1,8 @@
-package com.anjiplus.template.gaea.business.modules.data.dataSetTransform.service.impl;
+package com.anjiplus.template.gaea.business.modules.dataSetTransform.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
-import com.anjiplus.template.gaea.business.modules.data.dataSetTransform.controller.dto.DataSetTransformDto;
-import com.anjiplus.template.gaea.business.modules.data.dataSetTransform.service.TransformStrategy;
+import com.anjiplus.template.gaea.business.modules.dataSetTransform.controller.dto.DataSetTransformDto;
+import com.anjiplus.template.gaea.business.modules.dataSetTransform.service.TransformStrategy;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSetTransform/service/impl/JsTransformServiceImpl.java

@@ -1,9 +1,9 @@
-package com.anjiplus.template.gaea.business.modules.data.dataSetTransform.service.impl;
+package com.anjiplus.template.gaea.business.modules.dataSetTransform.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.anji.plus.gaea.exception.BusinessExceptionBuilder;
-import com.anjiplus.template.gaea.business.modules.data.dataSetTransform.controller.dto.DataSetTransformDto;
-import com.anjiplus.template.gaea.business.modules.data.dataSetTransform.service.TransformStrategy;
+import com.anjiplus.template.gaea.business.modules.dataSetTransform.controller.dto.DataSetTransformDto;
+import com.anjiplus.template.gaea.business.modules.dataSetTransform.service.TransformStrategy;
 import com.anjiplus.template.gaea.business.code.ResponseCode;
 import jdk.nashorn.api.scripting.ScriptObjectMirror;
 import lombok.extern.slf4j.Slf4j;

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/config/HttpClientConfig.java

@@ -1,4 +1,4 @@
-package com.anjiplus.template.gaea.business.modules.data.dataSource.config;
+package com.anjiplus.template.gaea.business.modules.dataSource.config;
 
 import com.alibaba.fastjson.JSON;
 import lombok.extern.slf4j.Slf4j;

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/config/HttpClientPoolConfig.java

@@ -1,4 +1,4 @@
-package com.anjiplus.template.gaea.business.modules.data.dataSource.config;
+package com.anjiplus.template.gaea.business.modules.dataSource.config;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/controller/DataSourceController.java

@@ -1,14 +1,14 @@
 
-package com.anjiplus.template.gaea.business.modules.data.dataSource.controller;
+package com.anjiplus.template.gaea.business.modules.dataSource.controller;
 
 import com.anji.plus.gaea.bean.ResponseBean;
 import com.anji.plus.gaea.curd.controller.GaeaBaseController;
 import com.anji.plus.gaea.curd.service.GaeaBaseService;
-import com.anjiplus.template.gaea.business.modules.data.dataSource.controller.dto.DataSourceDto;
-import com.anjiplus.template.gaea.business.modules.data.dataSource.controller.param.ConnectionParam;
-import com.anjiplus.template.gaea.business.modules.data.dataSource.controller.param.DataSourceParam;
-import com.anjiplus.template.gaea.business.modules.data.dataSource.dao.entity.DataSource;
-import com.anjiplus.template.gaea.business.modules.data.dataSource.service.DataSourceService;
+import com.anjiplus.template.gaea.business.modules.dataSource.controller.dto.DataSourceDto;
+import com.anjiplus.template.gaea.business.modules.dataSource.controller.param.ConnectionParam;
+import com.anjiplus.template.gaea.business.modules.dataSource.controller.param.DataSourceParam;
+import com.anjiplus.template.gaea.business.modules.dataSource.dao.entity.DataSource;
+import com.anjiplus.template.gaea.business.modules.dataSource.service.DataSourceService;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -64,4 +64,4 @@ public class DataSourceController extends GaeaBaseController<DataSourceParam, Da
 
 
 
-}
+}

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.data.dataSource.controller.dto;
+package com.anjiplus.template.gaea.business.modules.dataSource.controller.dto;
 
 import com.anji.plus.gaea.curd.dto.GaeaBaseDTO;
 import lombok.Data;
@@ -71,4 +71,4 @@ public class DataSourceDto extends GaeaBaseDTO implements Serializable {
     /** 传入的自定义参数，解决url中存在的动态参数*/
     private Map<String, Object> contextData;
 
-}
+}

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/controller/param/ConnectionParam.java

@@ -1,4 +1,4 @@
-package com.anjiplus.template.gaea.business.modules.data.dataSource.controller.param;
+package com.anjiplus.template.gaea.business.modules.dataSource.controller.param;
 
 import lombok.Data;
 

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/controller/param/DataSourceParam.java

@@ -1,5 +1,5 @@
 /**/
-package com.anjiplus.template.gaea.business.modules.data.dataSource.controller.param;
+package com.anjiplus.template.gaea.business.modules.dataSource.controller.param;
 
 import com.anji.plus.gaea.annotation.Query;
 import com.anji.plus.gaea.constant.QueryEnum;
@@ -28,4 +28,4 @@ public class DataSourceParam extends PageParam implements Serializable{
     /** 数据源类型 DIC_NAME=SOURCE_TYPE; mysql，orace，sqlserver，elasticsearch，接口，javaBean，数据源类型字典中item-extend动态生成表单 */
     @Query(QueryEnum.EQ)
     private String sourceType;
-}
+}

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/dao/DataSourceMapper.java

@@ -1,9 +1,9 @@
-package com.anjiplus.template.gaea.business.modules.data.dataSource.dao;
+package com.anjiplus.template.gaea.business.modules.dataSource.dao;
 
 import org.apache.ibatis.annotations.Mapper;
 
 import com.anji.plus.gaea.curd.mapper.GaeaBaseMapper;
-import com.anjiplus.template.gaea.business.modules.data.dataSource.dao.entity.DataSource;
+import com.anjiplus.template.gaea.business.modules.dataSource.dao.entity.DataSource;
 
 /**
 * DataSource Mapper
@@ -13,4 +13,4 @@ import com.anjiplus.template.gaea.business.modules.data.dataSource.dao.entity.Da
 @Mapper
 public interface DataSourceMapper extends GaeaBaseMapper<DataSource> {
 
-}
+}

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/dao/entity/DataSource.java

@@ -1,5 +1,5 @@
 
-package com.anjiplus.template.gaea.business.modules.data.dataSource.dao.entity;
+package com.anjiplus.template.gaea.business.modules.dataSource.dao.entity;
 
 import com.anji.plus.gaea.annotation.Unique;
 import com.anji.plus.gaea.curd.entity.GaeaBaseEntity;

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/pool/api/IConfig.java

@@ -1,4 +1,4 @@
-package com.anjiplus.template.gaea.business.modules.data.dataSource.pool.api;
+package com.anjiplus.template.gaea.business.modules.dataSource.pool.api;
 
 /**
  * 配置接口

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/pool/api/IDataSourceConfig.java

@@ -1,4 +1,4 @@
-package com.anjiplus.template.gaea.business.modules.data.dataSource.pool.api;
+package com.anjiplus.template.gaea.business.modules.dataSource.pool.api;
 
 import javax.sql.DataSource;
 

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/pool/api/ILifeCycle.java

@@ -1,4 +1,4 @@
-package com.anjiplus.template.gaea.business.modules.data.dataSource.pool.api;
+package com.anjiplus.template.gaea.business.modules.dataSource.pool.api;
 
 /**
  * 生命周期管理

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/pool/api/IPooledDataSourceConfig.java

@@ -1,6 +1,6 @@
-package com.anjiplus.template.gaea.business.modules.data.dataSource.pool.api;
+package com.anjiplus.template.gaea.business.modules.dataSource.pool.api;
 
-import com.anjiplus.template.gaea.business.modules.data.dataSource.pool.connection.IPooledConnection;
+import com.anjiplus.template.gaea.business.modules.dataSource.pool.connection.IPooledConnection;
 
 /**
  * 池化的接口

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/pool/connection/IPooledConnection.java

@@ -1,6 +1,6 @@
-package com.anjiplus.template.gaea.business.modules.data.dataSource.pool.connection;
+package com.anjiplus.template.gaea.business.modules.dataSource.pool.connection;
 
-import com.anjiplus.template.gaea.business.modules.data.dataSource.pool.api.IPooledDataSourceConfig;
+import com.anjiplus.template.gaea.business.modules.dataSource.pool.api.IPooledDataSourceConfig;
 
 import java.sql.Connection;
 

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/pool/connection/PooledConnection.java

@@ -1,7 +1,7 @@
-package com.anjiplus.template.gaea.business.modules.data.dataSource.pool.connection;
+package com.anjiplus.template.gaea.business.modules.dataSource.pool.connection;
 
-import com.anjiplus.template.gaea.business.modules.data.dataSource.pool.api.IPooledDataSourceConfig;
-import com.anjiplus.template.gaea.business.modules.data.dataSource.pool.exception.JdbcPoolException;
+import com.anjiplus.template.gaea.business.modules.dataSource.pool.api.IPooledDataSourceConfig;
+import com.anjiplus.template.gaea.business.modules.dataSource.pool.exception.JdbcPoolException;
 import lombok.extern.slf4j.Slf4j;
 
 import java.sql.*;

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/pool/constant/JdbcConstants.java

@@ -1,4 +1,4 @@
-package com.anjiplus.template.gaea.business.modules.data.dataSource.pool.constant;
+package com.anjiplus.template.gaea.business.modules.dataSource.pool.constant;
 
 /**
  * Created by raodeming on 2021/3/19.

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/pool/constant/PooledConst.java

@@ -1,4 +1,4 @@
-package com.anjiplus.template.gaea.business.modules.data.dataSource.pool.constant;
+package com.anjiplus.template.gaea.business.modules.dataSource.pool.constant;
 
 /**
  * 线程池常量

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/pool/datasource/AbstractDataSourceConfig.java

@@ -1,4 +1,4 @@
-package com.anjiplus.template.gaea.business.modules.data.dataSource.pool.datasource;
+package com.anjiplus.template.gaea.business.modules.dataSource.pool.datasource;
 
 /**
  * @author binbin.hou

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/pool/datasource/AbstractPooledDataSourceConfig.java

@@ -1,8 +1,8 @@
-package com.anjiplus.template.gaea.business.modules.data.dataSource.pool.datasource;
+package com.anjiplus.template.gaea.business.modules.dataSource.pool.datasource;
 
-import com.anjiplus.template.gaea.business.modules.data.dataSource.pool.api.ILifeCycle;
-import com.anjiplus.template.gaea.business.modules.data.dataSource.pool.api.IPooledDataSourceConfig;
-import com.anjiplus.template.gaea.business.modules.data.dataSource.pool.constant.PooledConst;
+import com.anjiplus.template.gaea.business.modules.dataSource.pool.api.ILifeCycle;
+import com.anjiplus.template.gaea.business.modules.dataSource.pool.api.IPooledDataSourceConfig;
+import com.anjiplus.template.gaea.business.modules.dataSource.pool.constant.PooledConst;
 
 /**
  * @author binbin.hou

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/pool/datasource/DataSourceConfigAdaptor.java

@@ -1,6 +1,6 @@
-package com.anjiplus.template.gaea.business.modules.data.dataSource.pool.datasource;
+package com.anjiplus.template.gaea.business.modules.dataSource.pool.datasource;
 
-import com.anjiplus.template.gaea.business.modules.data.dataSource.pool.api.IDataSourceConfig;
+import com.anjiplus.template.gaea.business.modules.dataSource.pool.api.IDataSourceConfig;
 
 import java.io.PrintWriter;
 import java.sql.Connection;

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/pool/datasource/PooledDataSource.java

@@ -1,9 +1,9 @@
-package com.anjiplus.template.gaea.business.modules.data.dataSource.pool.datasource;
+package com.anjiplus.template.gaea.business.modules.dataSource.pool.datasource;
 
-import com.anjiplus.template.gaea.business.modules.data.dataSource.pool.connection.IPooledConnection;
-import com.anjiplus.template.gaea.business.modules.data.dataSource.pool.connection.PooledConnection;
-import com.anjiplus.template.gaea.business.modules.data.dataSource.pool.exception.JdbcPoolException;
-import com.anjiplus.template.gaea.business.modules.data.dataSource.pool.util.DriverClassUtil;
+import com.anjiplus.template.gaea.business.modules.dataSource.pool.connection.IPooledConnection;
+import com.anjiplus.template.gaea.business.modules.dataSource.pool.connection.PooledConnection;
+import com.anjiplus.template.gaea.business.modules.dataSource.pool.exception.JdbcPoolException;
+import com.anjiplus.template.gaea.business.modules.dataSource.pool.util.DriverClassUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/pool/datasource/UnPooledDataSource.java

@@ -1,6 +1,6 @@
-package com.anjiplus.template.gaea.business.modules.data.dataSource.pool.datasource;
+package com.anjiplus.template.gaea.business.modules.dataSource.pool.datasource;
 
-import com.anjiplus.template.gaea.business.modules.data.dataSource.pool.util.DriverClassUtil;
+import com.anjiplus.template.gaea.business.modules.dataSource.pool.util.DriverClassUtil;
 import org.apache.commons.lang3.StringUtils;
 
 import java.sql.Connection;

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/pool/exception/JdbcPoolException.java

@@ -1,4 +1,4 @@
-package com.anjiplus.template.gaea.business.modules.data.dataSource.pool.exception;
+package com.anjiplus.template.gaea.business.modules.dataSource.pool.exception;
 
 /**
  * @author binbin.hou

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/pool/util/DataSourceHandleUtil.java

@@ -1,4 +1,4 @@
-package com.anjiplus.template.gaea.business.modules.data.dataSource.pool.util;
+package com.anjiplus.template.gaea.business.modules.dataSource.pool.util;
 
 /**
  * Created by raodeming on 2021/3/19.

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/pool/util/DriverClassUtil.java

@@ -1,4 +1,4 @@
-package com.anjiplus.template.gaea.business.modules.data.dataSource.pool.util;
+package com.anjiplus.template.gaea.business.modules.dataSource.pool.util;
 
 import com.anji.plus.gaea.exception.BusinessExceptionBuilder;
 import com.anjiplus.template.gaea.business.code.ResponseCode;

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/pool/util/JdbcUtil.java

@@ -1,8 +1,8 @@
-package com.anjiplus.template.gaea.business.modules.data.dataSource.pool.util;
+package com.anjiplus.template.gaea.business.modules.dataSource.pool.util;
 
-import com.anjiplus.template.gaea.business.modules.data.dataSource.controller.dto.DataSourceDto;
-import com.anjiplus.template.gaea.business.modules.data.dataSource.pool.datasource.PooledDataSource;
-import com.anjiplus.template.gaea.business.modules.data.dataSource.pool.datasource.UnPooledDataSource;
+import com.anjiplus.template.gaea.business.modules.dataSource.controller.dto.DataSourceDto;
+import com.anjiplus.template.gaea.business.modules.dataSource.pool.datasource.PooledDataSource;
+import com.anjiplus.template.gaea.business.modules.dataSource.pool.datasource.UnPooledDataSource;
 import lombok.extern.slf4j.Slf4j;
 
 import java.sql.Connection;

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/service/DataSourceService.java

@@ -1,13 +1,13 @@
 
-package com.anjiplus.template.gaea.business.modules.data.dataSource.service;
+package com.anjiplus.template.gaea.business.modules.dataSource.service;
 
 import com.alibaba.fastjson.JSONObject;
 import com.anji.plus.gaea.curd.service.GaeaBaseService;
-import com.anjiplus.template.gaea.business.modules.data.dataSet.controller.dto.DataSetDto;
-import com.anjiplus.template.gaea.business.modules.data.dataSource.controller.dto.DataSourceDto;
-import com.anjiplus.template.gaea.business.modules.data.dataSource.controller.param.ConnectionParam;
-import com.anjiplus.template.gaea.business.modules.data.dataSource.controller.param.DataSourceParam;
-import com.anjiplus.template.gaea.business.modules.data.dataSource.dao.entity.DataSource;
+import com.anjiplus.template.gaea.business.modules.dataSet.controller.dto.DataSetDto;
+import com.anjiplus.template.gaea.business.modules.dataSource.controller.dto.DataSourceDto;
+import com.anjiplus.template.gaea.business.modules.dataSource.controller.param.ConnectionParam;
+import com.anjiplus.template.gaea.business.modules.dataSource.controller.param.DataSourceParam;
+import com.anjiplus.template.gaea.business.modules.dataSource.dao.entity.DataSource;
 
 import java.util.List;
 
@@ -45,4 +45,4 @@ public interface DataSourceService extends GaeaBaseService<DataSourceParam, Data
      * @return
      */
     long total(DataSourceDto dataSourceDto, DataSetDto dto);
-}
+}

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.data.dataSource.service.impl;
+package com.anjiplus.template.gaea.business.modules.dataSource.service.impl;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -8,16 +8,15 @@ import com.anji.plus.gaea.curd.mapper.GaeaBaseMapper;
 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.modules.data.dataSet.controller.dto.DataSetDto;
-import com.anjiplus.template.gaea.business.modules.data.dataSetParam.service.DataSetParamService;
-import com.anjiplus.template.gaea.business.modules.data.dataSource.controller.dto.DataSourceDto;
-import com.anjiplus.template.gaea.business.modules.data.dataSource.controller.param.ConnectionParam;
-import com.anjiplus.template.gaea.business.modules.data.dataSource.dao.DataSourceMapper;
-import com.anjiplus.template.gaea.business.modules.data.dataSource.dao.entity.DataSource;
-import com.anjiplus.template.gaea.business.modules.data.dataSource.pool.constant.JdbcConstants;
-import com.anjiplus.template.gaea.business.modules.data.dataSource.pool.util.JdbcUtil;
-import com.anjiplus.template.gaea.business.modules.data.dataSource.service.DataSourceService;
-import com.anjiplus.template.gaea.business.code.ResponseCode;
+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.pool.constant.JdbcConstants;
+import com.anjiplus.template.gaea.business.modules.dataSource.pool.util.JdbcUtil;
+import com.anjiplus.template.gaea.business.modules.dataSource.service.DataSourceService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.extern.slf4j.Slf4j;

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/report/constant/ExpConstant.java

@@ -1,4 +1,4 @@
-package com.anjiplus.template.gaea.business.modules.data.report.constant;
+package com.anjiplus.template.gaea.business.modules.report.constant;
 
 
 import java.util.ArrayList;

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/report/controller/ReportController.java

@@ -1,14 +1,14 @@
-package com.anjiplus.template.gaea.business.modules.data.report.controller;
+package com.anjiplus.template.gaea.business.modules.report.controller;
 
 import com.anji.plus.gaea.annotation.Permission;
 import com.anji.plus.gaea.annotation.log.GaeaAuditLog;
 import com.anji.plus.gaea.bean.ResponseBean;
 import com.anji.plus.gaea.curd.controller.GaeaBaseController;
 import com.anji.plus.gaea.curd.service.GaeaBaseService;
-import com.anjiplus.template.gaea.business.modules.data.report.controller.dto.ReportDto;
-import com.anjiplus.template.gaea.business.modules.data.report.controller.param.ReportParam;
-import com.anjiplus.template.gaea.business.modules.data.report.dao.entity.Report;
-import com.anjiplus.template.gaea.business.modules.data.report.service.ReportService;
+import com.anjiplus.template.gaea.business.modules.report.controller.dto.ReportDto;
+import com.anjiplus.template.gaea.business.modules.report.controller.param.ReportParam;
+import com.anjiplus.template.gaea.business.modules.report.dao.entity.Report;
+import com.anjiplus.template.gaea.business.modules.report.service.ReportService;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/report/controller/dto/ReportDto.java

@@ -1,4 +1,4 @@
-package com.anjiplus.template.gaea.business.modules.data.report.controller.dto;
+package com.anjiplus.template.gaea.business.modules.report.controller.dto;
 
 import com.anji.plus.gaea.curd.dto.GaeaBaseDTO;
 import lombok.Data;

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/report/controller/param/ReportParam.java

@@ -1,4 +1,4 @@
-package com.anjiplus.template.gaea.business.modules.data.report.controller.param;
+package com.anjiplus.template.gaea.business.modules.report.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/report/dao/ReportMapper.java

@@ -1,7 +1,7 @@
-package com.anjiplus.template.gaea.business.modules.data.report.dao;
+package com.anjiplus.template.gaea.business.modules.report.dao;
 
 import com.anji.plus.gaea.curd.mapper.GaeaBaseMapper;
-import com.anjiplus.template.gaea.business.modules.data.report.dao.entity.Report;
+import com.anjiplus.template.gaea.business.modules.report.dao.entity.Report;
 
 /**
  * TODO

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/report/dao/entity/Report.java

@@ -1,4 +1,4 @@
-package com.anjiplus.template.gaea.business.modules.data.report.dao.entity;
+package com.anjiplus.template.gaea.business.modules.report.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/report/service/ReportService.java

@@ -0,0 +1,17 @@
+package com.anjiplus.template.gaea.business.modules.report.service;
+
+import com.anji.plus.gaea.curd.service.GaeaBaseService;
+import com.anjiplus.template.gaea.business.modules.report.controller.dto.ReportDto;
+import com.anjiplus.template.gaea.business.modules.report.controller.param.ReportParam;
+import com.anjiplus.template.gaea.business.modules.report.dao.entity.Report;
+
+/**
+ * TODO
+ *
+ * @author chenkening
+ * @date 2021/3/26 10:35
+ */
+public interface ReportService extends GaeaBaseService<ReportParam, Report> {
+
+    void delReport(ReportDto reportDto);
+}

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/report/service/impl/ReportServiceImpl.java

@@ -1,12 +1,12 @@
-package com.anjiplus.template.gaea.business.modules.data.report.service.impl;
+package com.anjiplus.template.gaea.business.modules.report.service.impl;
 
 import com.anji.plus.gaea.curd.mapper.GaeaBaseMapper;
-import com.anjiplus.template.gaea.business.modules.data.report.controller.dto.ReportDto;
-import com.anjiplus.template.gaea.business.modules.data.report.dao.ReportMapper;
-import com.anjiplus.template.gaea.business.modules.data.report.dao.entity.Report;
-import com.anjiplus.template.gaea.business.modules.data.report.service.ReportService;
-import com.anjiplus.template.gaea.business.modules.data.reportexcel.dao.ReportExcelMapper;
-import com.anjiplus.template.gaea.business.modules.data.reportexcel.dao.entity.ReportExcel;
+import com.anjiplus.template.gaea.business.modules.report.controller.dto.ReportDto;
+import com.anjiplus.template.gaea.business.modules.report.dao.ReportMapper;
+import com.anjiplus.template.gaea.business.modules.report.dao.entity.Report;
+import com.anjiplus.template.gaea.business.modules.report.service.ReportService;
+import com.anjiplus.template.gaea.business.modules.reportexcel.dao.ReportExcelMapper;
+import com.anjiplus.template.gaea.business.modules.reportexcel.dao.entity.ReportExcel;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/reportexcel/controller/ReportExcelController.java

@@ -1,4 +1,4 @@
-package com.anjiplus.template.gaea.business.modules.data.reportexcel.controller;
+package com.anjiplus.template.gaea.business.modules.reportexcel.controller;
 
 import com.anji.plus.gaea.annotation.Permission;
 import com.anji.plus.gaea.annotation.log.GaeaAuditLog;
@@ -6,10 +6,10 @@ import com.anji.plus.gaea.bean.ResponseBean;
 import com.anji.plus.gaea.code.ResponseCode;
 import com.anji.plus.gaea.curd.controller.GaeaBaseController;
 import com.anji.plus.gaea.curd.service.GaeaBaseService;
-import com.anjiplus.template.gaea.business.modules.data.reportexcel.controller.dto.ReportExcelDto;
-import com.anjiplus.template.gaea.business.modules.data.reportexcel.controller.param.ReportExcelParam;
-import com.anjiplus.template.gaea.business.modules.data.reportexcel.dao.entity.ReportExcel;
-import com.anjiplus.template.gaea.business.modules.data.reportexcel.service.ReportExcelService;
+import com.anjiplus.template.gaea.business.modules.reportexcel.controller.dto.ReportExcelDto;
+import com.anjiplus.template.gaea.business.modules.reportexcel.controller.param.ReportExcelParam;
+import com.anjiplus.template.gaea.business.modules.reportexcel.dao.entity.ReportExcel;
+import com.anjiplus.template.gaea.business.modules.reportexcel.service.ReportExcelService;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/reportexcel/controller/dto/ReportExcelDto.java

@@ -1,5 +1,5 @@
 
-package com.anjiplus.template.gaea.business.modules.data.reportexcel.controller.dto;
+package com.anjiplus.template.gaea.business.modules.reportexcel.controller.dto;
 
 import com.anji.plus.gaea.curd.dto.GaeaBaseDTO;
 import lombok.Data;

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/reportexcel/controller/param/ReportExcelParam.java

@@ -1,5 +1,5 @@
 
-package com.anjiplus.template.gaea.business.modules.data.reportexcel.controller.param;
+package com.anjiplus.template.gaea.business.modules.reportexcel.controller.param;
 
 import com.anji.plus.gaea.curd.params.PageParam;
 import lombok.Data;

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/reportexcel/dao/ReportExcelMapper.java

@@ -1,7 +1,7 @@
-package com.anjiplus.template.gaea.business.modules.data.reportexcel.dao;
+package com.anjiplus.template.gaea.business.modules.reportexcel.dao;
 
 import com.anji.plus.gaea.curd.mapper.GaeaBaseMapper;
-import com.anjiplus.template.gaea.business.modules.data.reportexcel.dao.entity.ReportExcel;
+import com.anjiplus.template.gaea.business.modules.reportexcel.dao.entity.ReportExcel;
 
 /**
  * @author chenkening

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/reportexcel/dao/entity/ReportExcel.java

@@ -1,4 +1,4 @@
-package com.anjiplus.template.gaea.business.modules.data.reportexcel.dao.entity;
+package com.anjiplus.template.gaea.business.modules.reportexcel.dao.entity;
 
 import com.anji.plus.gaea.curd.entity.GaeaBaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/reportexcel/service/ReportExcelService.java

@@ -1,9 +1,9 @@
-package com.anjiplus.template.gaea.business.modules.data.reportexcel.service;
+package com.anjiplus.template.gaea.business.modules.reportexcel.service;
 
 import com.anji.plus.gaea.curd.service.GaeaBaseService;
-import com.anjiplus.template.gaea.business.modules.data.reportexcel.controller.dto.ReportExcelDto;
-import com.anjiplus.template.gaea.business.modules.data.reportexcel.controller.param.ReportExcelParam;
-import com.anjiplus.template.gaea.business.modules.data.reportexcel.dao.entity.ReportExcel;
+import com.anjiplus.template.gaea.business.modules.reportexcel.controller.dto.ReportExcelDto;
+import com.anjiplus.template.gaea.business.modules.reportexcel.controller.param.ReportExcelParam;
+import com.anjiplus.template.gaea.business.modules.reportexcel.dao.entity.ReportExcel;
 
 /**
  * TODO

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/reportexcel/service/impl/ReportExcelServiceImpl.java

@@ -1,4 +1,4 @@
-package com.anjiplus.template.gaea.business.modules.data.reportexcel.service.impl;
+package com.anjiplus.template.gaea.business.modules.reportexcel.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.anji.plus.gaea.constant.BaseOperationEnum;
@@ -11,13 +11,13 @@ import com.anji.plus.gaea.holder.UserContentHolder;
 import com.anji.plus.gaea.utils.GaeaAssert;
 import com.anji.plus.gaea.utils.GaeaBeanUtils;
 import com.anjiplus.template.gaea.business.code.ResponseCode;
-import com.anjiplus.template.gaea.business.modules.data.report.dao.ReportMapper;
-import com.anjiplus.template.gaea.business.modules.data.report.dao.entity.Report;
-import com.anjiplus.template.gaea.business.modules.data.reportexcel.controller.dto.ReportExcelDto;
-import com.anjiplus.template.gaea.business.modules.data.reportexcel.dao.ReportExcelMapper;
-import com.anjiplus.template.gaea.business.modules.data.reportexcel.dao.entity.ReportExcel;
-import com.anjiplus.template.gaea.business.modules.data.reportexcel.service.ReportExcelService;
-import com.anjiplus.template.gaea.business.modules.data.reportexcel.util.ReportUtil;
+import com.anjiplus.template.gaea.business.modules.report.dao.ReportMapper;
+import com.anjiplus.template.gaea.business.modules.report.dao.entity.Report;
+import com.anjiplus.template.gaea.business.modules.reportexcel.controller.dto.ReportExcelDto;
+import com.anjiplus.template.gaea.business.modules.reportexcel.dao.ReportExcelMapper;
+import com.anjiplus.template.gaea.business.modules.reportexcel.dao.entity.ReportExcel;
+import com.anjiplus.template.gaea.business.modules.reportexcel.service.ReportExcelService;
+import com.anjiplus.template.gaea.business.modules.reportexcel.util.ReportUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/reportexcel/util/ReportUtil.java

@@ -1,15 +1,15 @@
-package com.anjiplus.template.gaea.business.modules.data.reportexcel.util;
+package com.anjiplus.template.gaea.business.modules.reportexcel.util;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.parser.Feature;
 import com.anji.plus.gaea.export.utils.QrCodeOrBarCodeUtil;
-import com.anjiplus.template.gaea.business.modules.data.dataSet.controller.dto.DataSetDto;
-import com.anjiplus.template.gaea.business.modules.data.dataSet.controller.dto.OriginalDataDto;
-import com.anjiplus.template.gaea.business.modules.data.dataSet.service.DataSetService;
-import com.anjiplus.template.gaea.business.modules.data.report.constant.ExpConstant;
-import com.anjiplus.template.gaea.business.modules.data.reportexcel.controller.dto.ReportExcelDto;
+import com.anjiplus.template.gaea.business.modules.dataSet.controller.dto.DataSetDto;
+import com.anjiplus.template.gaea.business.modules.dataSet.controller.dto.OriginalDataDto;
+import com.anjiplus.template.gaea.business.modules.dataSet.service.DataSetService;
+import com.anjiplus.template.gaea.business.modules.report.constant.ExpConstant;
+import com.anjiplus.template.gaea.business.modules.reportexcel.controller.dto.ReportExcelDto;
 import freemarker.template.Configuration;
 import freemarker.template.Template;
 import org.apache.commons.lang3.StringUtils;

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.data.dataSet.dao.DataSetMapper">
+<mapper namespace="com.anjiplus.template.gaea.business.modules.dataSet.dao.DataSetMapper">
 
-    <resultMap type="com.anjiplus.template.gaea.business.modules.data.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"  />
@@ -26,4 +26,4 @@
 
     <!--自定义sql -->
 
-</mapper>
+</mapper>

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.data.dataSetParam.dao.DataSetParamMapper">
+<mapper namespace="com.anjiplus.template.gaea.business.modules.dataSetParam.dao.DataSetParamMapper">
 
-    <resultMap type="com.anjiplus.template.gaea.business.modules.data.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"  />
@@ -28,4 +28,4 @@
 
     <!--自定义sql -->
 
-</mapper>
+</mapper>

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.data.dataSetTransform.dao.DataSetTransformMapper">
+<mapper namespace="com.anjiplus.template.gaea.business.modules.dataSetTransform.dao.DataSetTransformMapper">
 
-    <resultMap type="com.anjiplus.template.gaea.business.modules.data.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"  />
@@ -24,4 +24,4 @@
 
     <!--自定义sql -->
 
-</mapper>
+</mapper>

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.data.dataSource.dao.DataSourceMapper">
+<mapper namespace="com.anjiplus.template.gaea.business.modules.dataSource.dao.DataSourceMapper">
 
-    <resultMap type="com.anjiplus.template.gaea.business.modules.data.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"  />
@@ -25,4 +25,4 @@
 
     <!--自定义sql -->
 
-</mapper>
+</mapper>

report-core/src/main/resources/mapper/ReportDashboardMapper.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.data.dashboard.dao.ReportDashboardMapper">
+<mapper namespace="com.anjiplus.template.gaea.business.modules.dashboard.dao.ReportDashboardMapper">
 
-    <resultMap type="com.anjiplus.template.gaea.business.modules.data.dashboard.dao.entity.ReportDashboard" id="ReportDashboardMap">
+    <resultMap type="com.anjiplus.template.gaea.business.modules.dashboard.dao.entity.ReportDashboard" id="ReportDashboardMap">
         <!--jdbcType="{column.columnType}"-->
         <result property="id" column="id"  />
         <result property="reportCode" column="report_code"  />
@@ -28,4 +28,4 @@
 
     <!--自定义sql -->
 
-</mapper>
+</mapper>