Merge branch 'master' of https://gitee.com/anji-plus/report

.gitignore

@@ -5,3 +5,4 @@ target
 **/*.log
 dist
 logs
+cache

derby.log

@@ -0,0 +1,13 @@
+----------------------------------------------------------------
+Thu Jun 24 13:44:40 CST 2021:
+Booting Derby version The Apache Software Foundation - Apache Derby - 10.14.2.0 - (1828579): instance a816c00e-017a-3c8c-7997-00000fdd7788 
+on database directory memory:D:\anji-code\gitee\aj-report\55b30257-1477-453c-b5b1-a9bbd7a931a7 with class loader sun.misc.Launcher$AppClassLoader@18b4aac2 
+Loaded from file:/C:/Users/raodeming/.m2/repository/org/apache/derby/derby/10.14.2.0/derby-10.14.2.0.jar
+java.vendor=Oracle Corporation
+java.runtime.version=1.8.0_191-b12
+user.dir=D:\anji-code\gitee\aj-report
+os.name=Windows 10
+os.arch=amd64
+os.version=10.0
+derby.system.home=null
+Database Class Loader started - derby.database.classpath=''

doc/docs/.vuepress/config.js

@@ -1,14 +1,63 @@
 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: '操作手册', link: '/operation/'},
+            {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: '其他',
+                    collapsable: false,
+                    children: [
+                        {title: '常见问题', path: '/guide/question'}
+                    ]
+                }],
+            '/operation/': [
+                {
+                    title: '操作手册',
+                    collapsable: false,
+                    children: [
+                        {title: '数据源', path: '/operation/datasource'},
+                        {title: '数据集', path: '/operation/dataset'},
+                        {title: '大屏设计', path: '/operation/dashboard'},
+                        {title: '国际化', path: '/operation/i18n'},
+                        {title: '字典', path: '/operation/dict'},
+                    ]
+                }
+            ]
+        }
+    },
+    plugins: [
+        ['@vuepress/back-to-top', true],
+    ],
+    configureWebpack: {
+        resolve: {
+            alias: {
+                '@': '/.vuepress/public'
+            }
+        }
+    }
 }

doc/docs/guide/devdoc.md

@@ -1 +0,0 @@
-# 开发手册

doc/docs/guide/productintro.md

@@ -1 +1,69 @@
 # 项目介绍
+
+# 项目介绍
+在线拖拽大屏设计，后续会持续更新新的功能。
+
+
+## 文件结构
+### 系统目录
+- 
+```
+├── doc                                           文档源码
+│   ├── docs
+│   ├── package.json
+│   └── README.md
+├── pom.xml                                       父pom，jar版本管理
+├── report-core                                   java源码
+│   ├── pom.xml                                   gaea父pom，jar版本管理
+│   └── README.md
+├── report-ui                                     前端vue源码
+├── LICENSE
+├── README.md
+```
+### 前端
+```
+├── build                      # 构建相关
+├── mock                       # 项目mock 模拟数据
+├── public                     # 静态资源
+│   │── favicon.ico            # favicon图标
+│   └── index.html             # html模板
+├── src                        # 源代码
+│   ├── api                    # 所有请求
+│   ├── assets                 # 主题 字体等静态资源
+│   ├── components             # 全局公用组件
+│   ├── directive              # 全局指令
+│   ├── icons                  # 项目所有 svg icons
+│   ├── lang                   # 国际化 language
+│   ├── layout                 # 全局 layout
+│   ├── router                 # 路由
+│   ├── store                  # 全局 store管理
+│   ├── styles                 # 全局样式
+│   ├── utils                  # 全局公用方法
+│   ├── views                  # views 所有页面
+│   ├── App.vue                # 入口页面
+│   ├── main.js                # 入口文件 加载组件 初始化等
+│   └── permission.js          # 权限管理
+├── .env.xxx                   # 环境变量配置
+├── .eslintrc.js               # eslint 配置项
+├── .babelrc                   # babel-loader 配置
+├── .travis.yml                # 自动化CI配置
+├── vue.config.js              # vue-cli 配置
+├── postcss.config.js          # postcss 配置
+└── package.json               # package.json
+```
+
+## 核心技术
+### 后端
+- [Spring Boot](https://spring.io/projects/spring-boot/): Spring Boot是一款开箱即用框架，让我们的Spring应用变的更轻量化、更快的入门。 在主程序执行main函数就可以运行。你也可以打包你的应用为jar并通过使用java -jar来运行你的Web应用；
+- [Mybatis-plus](https://mp.baomidou.com/): MyBatis-plus（简称 MP）是一个 MyBatis (opens new window) 的增强工具。
+- [flyway](https://flywaydb.org/): 主要用于在你的应用版本不断升级的同时，升级你的数据库结构和里面的数据
+### 前端
+- [npm](https://www.npmjs.com/)：node.js的包管理工具，用于统一管理我们前端项目中需要用到的包、插件、工具、命令等，便于开发和维护。
+- [webpack](https://webpack.docschina.org/)：用于现代 JavaScript 应用程序的_静态模块打包工具
+- [ES6](https://es6.ruanyifeng.com/)：Javascript的新版本，ECMAScript6的简称。利用ES6我们可以简化我们的JS代码，同时利用其提供的强大功能来快速实现JS逻辑。
+- [vue-cli](https://cli.vuejs.org/)：Vue的脚手架工具，用于自动生成Vue项目的目录及文件。
+- [vue-router](https://router.vuejs.org/)： Vue提供的前端路由工具，利用其我们实现页面的路由控制，局部刷新及按需加载，构建单页应用，实现前后端分离。
+- [vuex](https://vuex.vuejs.org/)：Vue提供的状态管理工具，用于统一管理我们项目中各种数据的交互和重用，存储我们需要用到数据对象。
+- [element-ui](https://element.eleme.cn/#/zh-CN)：基于MVVM框架Vue开源出来的一套前端ui组件。
+- [vue-element-admin](https://panjiachen.gitee.io/vue-element-admin-site/)：后台前端解决方案,它基于 vue 和 element-ui实现
+

doc/docs/guide/quickly.md

@@ -5,8 +5,8 @@
 - 在线提问: <https://gitee.com/anji-plus/report/issues>
 - 在线文档: 
 
-大屏设计（Report）是一个JavaEE微服务架构平台，采用经典组合（SpringBoot，SpringCloud，Vue，ElementUI）。目前提供两种架构，单体架构和微服务架构。
-内置的基础功能包括数据源，数据集，报表管理
+大屏设计（Report）是一个可视化拖拽编辑的，直观，酷炫，具有科技感的图表工具项目。
+内置的基础功能包括数据源，数据集，国际化，字典管理，报表管理
 
 
 ## 技术选型
@@ -17,8 +17,6 @@
 
 **2.主框架**
 -  Spring Boot 2.3.x
--  Spring Cloud Hoxton.SR9
--  Spring Security 5.3.x
 
 **3.持久层**
 -  Apache MyBatis 3.5.x

doc/docs/operation/README.md

@@ -0,0 +1,25 @@
+# 介绍
+---
+
+**大屏设计**
+
+大屏设计（Report）是一个JavaEE微服务架构平台，采用经典组合（SpringBoot，SpringCloud，Vue，ElementUI）。目前提供两种架构，单体架构和微服务架构。
+内置的基础功能包括数据源，数据集，报表管理
+
+**功能架构**
+- 前端
+
+
+- 后端
+
+
+**在线体验**
+- 访问地址
+
+- 默认账号密码
+
+
+**联系我们**
+
+
+

doc/docs/operation/dashboard.md

@@ -0,0 +1,32 @@
+# 快速了解
+---
+## 项目简介
+- 项目源代码地址: <https://gitee.com/anji-plus/report>
+- 在线提问: <https://gitee.com/anji-plus/report/issues>
+- 在线文档: 
+
+大屏设计（Report）是一个可视化拖拽编辑的，直观，酷炫，具有科技感的图表工具项目。
+内置的基础功能包括数据源，数据集，国际化，字典管理，报表管理
+
+
+## 技术选型
+
+**1.环境**
+-  JavaEE 8
+-  Apache Maven 3
+
+**2.主框架**
+-  Spring Boot 2.3.x
+
+**3.持久层**
+-  Apache MyBatis 3.5.x
+
+**4.视图层**
+-  Vue 2.6.10+
+-  ElementUI 2.13.0+
+
+
+## 系统特性
+1. 最新最稳定的技术栈；
+2. 支持多数据源配置
+3. 丰富的大屏组件。拖拽配置实现动态大屏

doc/docs/operation/dataset.md

@@ -0,0 +1,32 @@
+# 快速了解
+---
+## 项目简介
+- 项目源代码地址: <https://gitee.com/anji-plus/report>
+- 在线提问: <https://gitee.com/anji-plus/report/issues>
+- 在线文档: 
+
+大屏设计（Report）是一个可视化拖拽编辑的，直观，酷炫，具有科技感的图表工具项目。
+内置的基础功能包括数据源，数据集，国际化，字典管理，报表管理
+
+
+## 技术选型
+
+**1.环境**
+-  JavaEE 8
+-  Apache Maven 3
+
+**2.主框架**
+-  Spring Boot 2.3.x
+
+**3.持久层**
+-  Apache MyBatis 3.5.x
+
+**4.视图层**
+-  Vue 2.6.10+
+-  ElementUI 2.13.0+
+
+
+## 系统特性
+1. 最新最稳定的技术栈；
+2. 支持多数据源配置
+3. 丰富的大屏组件。拖拽配置实现动态大屏

doc/docs/operation/datasource.md

@@ -0,0 +1,3 @@
+# 数据源
+
+## 标题一

doc/docs/operation/dict.md

@@ -0,0 +1,32 @@
+# 快速了解
+---
+## 项目简介
+- 项目源代码地址: <https://gitee.com/anji-plus/report>
+- 在线提问: <https://gitee.com/anji-plus/report/issues>
+- 在线文档: 
+
+大屏设计（Report）是一个可视化拖拽编辑的，直观，酷炫，具有科技感的图表工具项目。
+内置的基础功能包括数据源，数据集，国际化，字典管理，报表管理
+
+
+## 技术选型
+
+**1.环境**
+-  JavaEE 8
+-  Apache Maven 3
+
+**2.主框架**
+-  Spring Boot 2.3.x
+
+**3.持久层**
+-  Apache MyBatis 3.5.x
+
+**4.视图层**
+-  Vue 2.6.10+
+-  ElementUI 2.13.0+
+
+
+## 系统特性
+1. 最新最稳定的技术栈；
+2. 支持多数据源配置
+3. 丰富的大屏组件。拖拽配置实现动态大屏

doc/docs/operation/i18n.md

@@ -0,0 +1,32 @@
+# 快速了解
+---
+## 项目简介
+- 项目源代码地址: <https://gitee.com/anji-plus/report>
+- 在线提问: <https://gitee.com/anji-plus/report/issues>
+- 在线文档: 
+
+大屏设计（Report）是一个可视化拖拽编辑的，直观，酷炫，具有科技感的图表工具项目。
+内置的基础功能包括数据源，数据集，国际化，字典管理，报表管理
+
+
+## 技术选型
+
+**1.环境**
+-  JavaEE 8
+-  Apache Maven 3
+
+**2.主框架**
+-  Spring Boot 2.3.x
+
+**3.持久层**
+-  Apache MyBatis 3.5.x
+
+**4.视图层**
+-  Vue 2.6.10+
+-  ElementUI 2.13.0+
+
+
+## 系统特性
+1. 最新最稳定的技术栈；
+2. 支持多数据源配置
+3. 丰富的大屏组件。拖拽配置实现动态大屏

docs/README.md

@@ -1 +0,0 @@
-## 文档

pom.xml

@@ -21,7 +21,7 @@
     </modules>
 
     <properties>
-        <gaea.version>1.0.0-SNAPSHOT</gaea.version>
+        <gaea.version>2.0.0-SNAPSHOT</gaea.version>
         <gaea.security.version>1.0.0-SNAPSHOT</gaea.security.version>
         <gaea.export.version>1.0.0-SNAPSHOT</gaea.export.version>
         <gaea.generator.version>1.0.0-SNAPSHOT</gaea.generator.version>

report-core/pom.xml

@@ -14,25 +14,47 @@
 
     <dependencies>
         <dependency>
-            <groupId>com.anjiplus.template.gaea</groupId>
-            <artifactId>template-gaea-common</artifactId>
-<!--            <exclusions>-->
-<!--                <exclusion>-->
-<!--                    <groupId>com.alibaba.cloud</groupId>-->
-<!--                    <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>-->
-<!--                </exclusion>-->
-<!--                <exclusion>-->
-<!--                    <groupId>com.alibaba.cloud</groupId>-->
-<!--                    <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>-->
-<!--                </exclusion>-->
-<!--            </exclusions>-->
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.anji-plus</groupId>
+            <artifactId>spring-boot-gaea</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-data-redis</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-context</artifactId>
         </dependency>
 
+        <!--模板引擎-->
         <dependency>
-            <groupId>com.anjiplus.template.gaea</groupId>
-            <artifactId>template-gaea-generator</artifactId>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-freemarker</artifactId>
         </dependency>
 
+<!--        <dependency>-->
+<!--            <groupId>com.anjiplus.template.gaea</groupId>-->
+<!--            <artifactId>template-gaea-generator</artifactId>-->
+<!--            <exclusions>-->
+<!--                <exclusion>-->
+<!--                    <groupId>org.springframework.boot</groupId>-->
+<!--                    <artifactId>spring-boot-starter-data-redis</artifactId>-->
+<!--                </exclusion>-->
+<!--            </exclusions>-->
+<!--        </dependency>-->
+
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
@@ -49,15 +71,17 @@
             <scope>test</scope>
         </dependency>
 
-<!--        <dependency>-->
-<!--            <groupId>com.alibaba.cloud</groupId>-->
-<!--            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>-->
-<!--        </dependency>-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-cache</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>net.sf.ehcache</groupId>
+            <artifactId>ehcache</artifactId>
+            <version>2.10.6</version>
+        </dependency>
 
-<!--        <dependency>-->
-<!--            <groupId>com.alibaba.cloud</groupId>-->
-<!--            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>-->
-<!--        </dependency>-->
         <dependency>
             <groupId>com.anji-plus</groupId>
             <artifactId>spring-boot-starter-gaea-export</artifactId>

report-core/src/main/java/com/anjiplus/template/gaea/business/ReportApplication.java

@@ -4,6 +4,7 @@ import com.anji.plus.gaea.annotation.enabled.EnabledGaeaConfiguration;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.ComponentScans;
 
 /**
  * 业务模板
@@ -11,7 +12,10 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
  * @since 2021-02-03
  */
 @EnabledGaeaConfiguration
-@SpringBootApplication
+@SpringBootApplication(scanBasePackages = {
+        "com.anjiplus.template.gaea",
+        "com.anji.plus"
+})
 @MapperScan(basePackages = {
         "com.anjiplus.template.gaea.business.modules.*.dao",
         "com.anjiplus.template.gaea.business.modules.*.**.dao",

report-core/src/main/java/com/anjiplus/template/gaea/business/cache/ReportCacheHelper.java

@@ -0,0 +1,150 @@
+package com.anjiplus.template.gaea.business.cache;
+
+
+import com.anji.plus.gaea.cache.CacheHelper;
+import com.google.common.collect.Maps;
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.Cache;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+public class ReportCacheHelper implements CacheHelper, ApplicationContextAware {
+
+    @Autowired
+    private Cache cache;
+
+    @Override
+    public String stringGet(String key) {
+        Cache.ValueWrapper valueWrapper = cache.get(key);
+        if (valueWrapper != null) {
+            return (String) valueWrapper.get();
+        }
+        return CacheHelper.super.stringGet(key);
+    }
+
+    @Override
+    public Boolean setIfAbsent(String key, String value) {
+        cache.putIfAbsent(key, value);
+        return true;
+    }
+
+
+    @Override
+    public boolean exist(String key) {
+        String cacheHoldTime = stringGet(key + "_HoldTime");
+        if (cacheHoldTime != null && Long.parseLong(cacheHoldTime) > 0) {
+            if (Long.parseLong(cacheHoldTime) < System.currentTimeMillis()) {
+                delete(key + "_HoldTime");
+                delete(key);
+                return false;
+            }
+        }
+        return cache.get(key) != null;
+    }
+
+
+    @Override
+    public void stringSet(String key, String value) {
+        cache.put(key, value);
+    }
+
+
+    @Override
+    public String regKey(String key) {
+        return CacheHelper.super.regKey(key);
+    }
+
+    @Override
+    public void stringSetExpire(String key, String value, long seconds) {
+        stringSet(key, value);
+        if (seconds > 0) {
+            //缓存失效时间
+            stringSet(key + "_HoldTime", String.valueOf(System.currentTimeMillis() + seconds * 1000));
+        }
+    }
+
+    @Override
+    public Map<String, String> hashGet(String key) {
+        Cache.ValueWrapper t = cache.get(key);
+        if (t != null) {
+            return (Map<String, String>) t.get();
+        }
+        return Maps.newHashMap();
+    }
+
+    @Override
+    public String hashGetString(String key, String hashKey) {
+        Map<String, String> stringStringMap = hashGet(key);
+        return stringStringMap.get(hashKey);
+    }
+
+    @Override
+    public void hashDel(String key, String hashKey) {
+        Map<String, String> stringStringMap = hashGet(key);
+        stringStringMap.remove(hashKey);
+    }
+
+    @Override
+    public void hashBatchDel(String key, Set<String> hashKeys) {
+        Map<String, String> stringStringMap = hashGet(key);
+        hashKeys.forEach(stringStringMap::remove);
+    }
+
+    @Override
+    public boolean hashExist(String key, String hashKey) {
+        if (exist(key)) {
+            Map<String, String> map = hashGet(key);
+            return map.containsKey(hashKey);
+        }
+        return false;
+    }
+
+    @Override
+    public boolean hashAnyExist(String key, String[] hashKeys) {
+        return CacheHelper.super.hashAnyExist(key, hashKeys);
+    }
+
+    @Override
+    public void hashSet(String key, String hashKey, String hashValue) {
+        Map<String, String> map;
+        if (exist(key)) {
+            map = hashGet(key);
+        } else {
+            map = new HashMap<>();
+        }
+        map.put(hashKey, hashValue);
+        hashSet(key, map);
+    }
+
+    @Override
+    public void hashSet(String key, Map<String, String> hash) {
+        cache.put(key, hash);
+    }
+
+    @Override
+    public boolean delete(String key) {
+        if (exist(key)) {
+            cache.evict(key);
+        }
+        return true;
+    }
+
+    @Override
+    public boolean delete(List<String> keys) {
+        keys.forEach(this::delete);
+        return true;
+    }
+
+
+    @Override
+    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+        /*基于内存的本地缓存*/
+        cache = (Cache) applicationContext.getBean("ehCacheCache");
+    }
+}

report-core/src/main/java/com/anjiplus/template/gaea/business/code/ResponseCode.java

@@ -6,6 +6,15 @@ package com.anjiplus.template.gaea.business.code;
  * @since 2021-02-22
  */
 public interface ResponseCode {
+    /**
+     * 用户名或者密码不正确
+     */
+    String LOGIN_ERROR = "login.error";
+
+    /**
+     * 用户token过期
+     */
+    String USER_TOKEN_EXPIRED = "User.token.expired";
 
     /**
      * 字典项重复
@@ -98,4 +107,5 @@ public interface ResponseCode {
     String SET_CODE_ISEXIST = "4008";
     String SOURCE_CODE_ISEXIST = "4009";
     String CLASS_NOT_FOUND = "4010";
+
 }

report-core/src/main/java/com/anjiplus/template/gaea/business/config/BusinessAutoConfiguration.java

@@ -1,8 +1,11 @@
 package com.anjiplus.template.gaea.business.config;
 
+import com.anji.plus.gaea.cache.CacheHelper;
+import com.anjiplus.template.gaea.business.cache.ReportCacheHelper;
 import com.anjiplus.template.gaea.business.runner.ApplicationInitRunner;
-
 import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.cache.ehcache.EhCacheCache;
+import org.springframework.cache.ehcache.EhCacheCacheManager;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -26,4 +29,23 @@ public class BusinessAutoConfiguration {
     public ApplicationInitRunner applicationInitRunner() {
         return new ApplicationInitRunner();
     }
+
+    @Bean
+    public CacheHelper gaeaCacheHelper(){
+        return new ReportCacheHelper();
+    }
+
+    @Bean
+    public EhCacheCache ehCacheCache() {
+        return (EhCacheCache) ehCacheCacheManager().getCache("reportCache");
+    }
+
+    /**
+     * 创建ehCacheCacheManager
+     */
+    @Bean
+    public EhCacheCacheManager ehCacheCacheManager() {
+
+        return new EhCacheCacheManager();
+    }
 }

report-core/src/main/java/com/anjiplus/template/gaea/business/filter/TokenFilter.java

@@ -0,0 +1,75 @@
+package com.anjiplus.template.gaea.business.filter;
+
+
+import com.alibaba.fastjson.JSONObject;
+import com.anji.plus.gaea.bean.ResponseBean;
+import com.anji.plus.gaea.cache.CacheHelper;
+import com.anji.plus.gaea.utils.JwtBean;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import javax.servlet.*;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+/**
+ * 简单的鉴权
+ * Created by raodeming on 2021/6/24.
+ */
+@Component
+public class TokenFilter implements Filter {
+    @Autowired
+    private CacheHelper cacheHelper;
+    @Autowired
+    private JwtBean jwtBean;
+
+    @Override
+    public void init(FilterConfig filterConfig) throws ServletException {
+        Filter.super.init(filterConfig);
+    }
+
+    @Override
+    public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {
+        HttpServletRequest request = (HttpServletRequest) servletRequest;
+        HttpServletResponse response = (HttpServletResponse) servletResponse;
+        String uri = request.getRequestURI();
+
+        if (!uri.startsWith("/login")) {
+
+            //获取token
+            String authorization = request.getHeader("Authorization");
+            if (StringUtils.isBlank(authorization)) {
+                error(response);
+                return;
+            }
+
+            String username = jwtBean.getUsername(authorization);
+//            String uuid = jwtBean.getUUID(authorization);
+
+            if (!cacheHelper.exist(username)) {
+                error(response);
+                return;
+            }
+
+            //延长有效期
+            cacheHelper.stringSetExpire(username, authorization, 3600);
+        }
+
+        //执行
+        filterChain.doFilter(request, response);
+
+    }
+
+    @Override
+    public void destroy() {
+        Filter.super.destroy();
+    }
+
+    private void error(HttpServletResponse response) throws IOException {
+        ResponseBean responseBean = ResponseBean.builder().code("500").message("The Token has expired").build();
+        response.getWriter().print(JSONObject.toJSONString(responseBean));
+        response.getOutputStream().flush();
+    }
+}

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/data/dashboard/controller/ReportDashboardController.java → 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/data/dashboard/controller/dto/ChartDto.java → 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/data/dashboard/controller/dto/ReportDashboardDto.java → 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/data/dashboard/controller/dto/ReportDashboardObjectDto.java → 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/data/dashboard/controller/param/ReportDashboardParam.java → 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/data/dashboard/dao/ReportDashboardMapper.java → 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/data/dashboard/dao/entity/ReportDashboard.java → 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/data/dashboard/service/ChartStrategy.java → 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/data/dashboard/service/ReportDashboardService.java → 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/data/dashboard/service/impl/BarChartServiceImpl.java → 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/data/dashboard/service/impl/BarLineChartServiceImpl.java → 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/data/dashboard/service/impl/GaugeChartServiceImpl.java → 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/data/dashboard/service/impl/PieChartServiceImpl.java → 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/data/dashboard/service/impl/ReportDashboardServiceImpl.java → 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/data/dashboard/util/DateUtil.java → 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/data/dashboardwidget/controller/dto/ReportDashboardWidgetDto.java → 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/data/dashboardwidget/controller/dto/ReportDashboardWidgetValueDto.java → 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/data/dashboardwidget/controller/param/ReportDashboardWidgetParam.java → 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/data/dashboardwidget/dao/ReportDashboardWidgetMapper.java → 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/data/dashboardwidget/dao/entity/ReportDashboardWidget.java → 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/data/dashboardwidget/service/ReportDashboardWidgetService.java → 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/data/dashboardwidget/service/impl/ReportDashboardWidgetServiceImpl.java → 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/data/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.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/data/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.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/data/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.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/data/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.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/data/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.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/data/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.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/data/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.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/data/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.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/data/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.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/data/dataSetParam/controller/DataSetParamController.java → 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/data/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.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/data/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.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/data/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.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/data/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.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/data/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.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/data/dataSetParam/service/DataSetParamService.java → 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/data/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.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/data/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.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/data/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.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/data/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.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/data/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.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/data/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.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/data/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.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/data/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.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/data/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.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/data/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.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/data/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.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/data/dataSetTransform/service/impl/JsTransformServiceImpl.java → 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/data/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.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/data/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.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/data/dataSource/controller/DataSourceController.java → 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/data/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.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/data/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.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/data/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.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/data/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.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/data/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.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/data/dataSource/pool/api/IConfig.java → 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/data/dataSource/pool/api/IDataSourceConfig.java → 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/data/dataSource/pool/api/ILifeCycle.java → 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/data/dataSource/pool/api/IPooledDataSourceConfig.java → 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/data/dataSource/pool/connection/IPooledConnection.java → 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/data/dataSource/pool/connection/PooledConnection.java → 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/data/dataSource/pool/constant/JdbcConstants.java → 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/data/dataSource/pool/constant/PooledConst.java → 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/data/dataSource/pool/datasource/AbstractDataSourceConfig.java → 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/data/dataSource/pool/datasource/AbstractPooledDataSourceConfig.java → 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/data/dataSource/pool/datasource/DataSourceConfigAdaptor.java → 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/data/dataSource/pool/datasource/PooledDataSource.java → 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/data/dataSource/pool/datasource/UnPooledDataSource.java → 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/data/dataSource/pool/exception/JdbcPoolException.java → 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/data/dataSource/pool/util/DataSourceHandleUtil.java → 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/data/dataSource/pool/util/DriverClassUtil.java → 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/data/dataSource/pool/util/JdbcUtil.java → 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/data/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.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/data/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.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/export/controller/GaeaExportController.java

@@ -1,74 +0,0 @@
-package com.anjiplus.template.gaea.business.modules.export.controller;
-
-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.anji.plus.gaea.utils.GaeaBeanUtils;
-import com.anjiplus.template.gaea.business.modules.export.controller.dto.GaeaExportDTO;
-import com.anjiplus.template.gaea.business.modules.export.controller.param.GaeaExportParam;
-import com.anjiplus.template.gaea.business.modules.export.controller.param.GaeaExportQueryParam;
-import com.anjiplus.template.gaea.business.modules.export.dao.entity.GaeaExport;
-import com.anjiplus.template.gaea.business.modules.export.service.GaeaExportService;
-import com.anji.plus.gaea.export.vo.ExportOperation;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import io.swagger.annotations.Api;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * 导出中心(GaeaExport)实体类
- *
- * @author makejava
- * @since 2021-02-07 17:12:31
- */
-@RestController
-@RequestMapping("/export")
-@Api(value = "/export", tags = "导出中心")
-public class GaeaExportController extends GaeaBaseController<GaeaExportParam, GaeaExport, GaeaExportDTO> {
-    @Autowired
-    private GaeaExportService gaeaExportService;
-
-    @Override
-    public GaeaBaseService<GaeaExportParam, GaeaExport> getService() {
-        return gaeaExportService;
-    }
-
-    @Override
-    public GaeaExport getEntity() {
-        return new GaeaExport();
-    }
-
-    @Override
-    public GaeaExportDTO getDTO() {
-        return new GaeaExportDTO();
-    }
-
-    @PostMapping("/queryAdvanceExport")
-    @GaeaAuditLog(pageTitle = "高级查询")
-    public ResponseBean queryExportInfo(@RequestBody GaeaExportQueryParam param) {
-        Page<GaeaExport> exportList=gaeaExportService.getExportListPage(param);
-        List<GaeaExportDTO> list = exportList.getRecords().stream()
-                .map(entity -> GaeaBeanUtils.copyAndFormatter(entity, getDTO()))
-                .collect(Collectors.toList());
-        Page<GaeaExportDTO> pageDto = new Page<>();
-        pageDto.setCurrent(exportList.getCurrent());
-        pageDto.setRecords(list);
-        pageDto.setPages(exportList.getPages());
-        pageDto.setTotal(exportList.getTotal());
-        pageDto.setSize(exportList.getSize());
-        return responseSuccessWithData(pageDto);
-    }
-
-    @PostMapping("/saveExportLog")
-    public Boolean export(@RequestBody ExportOperation exportOperation) {
-        return gaeaExportService.saveExportLog(exportOperation);
-    }
-
-}

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

@@ -1,144 +0,0 @@
-package com.anjiplus.template.gaea.business.modules.export.controller.dto;
-
-import com.anji.plus.gaea.curd.dto.GaeaBaseDTO;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * 导出中心(GaeaExport)实体类
- *
- * @author makejava
- * @since 2021-02-07 17:12:25
- */
-@ApiModel(value = "导出中心")
-public class GaeaExportDTO extends GaeaBaseDTO {
-    /**
-     * 文件在t_file中的id，前端传它来读流接口显示，http://auth/file/download/fileId
-     */
-    @ApiModelProperty(value = "文件在t_file中的id，前端传它来读流接口显示，http://auth/file/download/fileId")
-    private String fileId;
-    /**
-     * 文件标题，比如:对账单报表6月份报表
-     */
-    @ApiModelProperty(value = "文件标题，比如:对账单报表6月份报表")
-    private String fileTitle;
-    /**
-     * 导出前，查询的数据开始时间
-     */
-    @ApiModelProperty(value = "导出前，查询的数据开始时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-    private LocalDateTime resultStartTime;
-    /**
-     * 导出前，查询的数据结束时间
-     */
-    @ApiModelProperty(value = "导出前，查询的数据结束时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-    private LocalDateTime resultEndTime;
-    /**
-     * 导出查询结果，数据总条数
-     */
-    @ApiModelProperty(value = "导出查询结果，数据总条数")
-    private Long resultSize;
-    /**
-     * 文件导出触发时间
-     */
-    @ApiModelProperty(value = "文件导出触发时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-    private LocalDateTime fileCreateTime;
-    /**
-     * 文件生成完成时间
-     */
-    @ApiModelProperty(value = "文件生成完成时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-    private LocalDateTime fileFinishTime;
-    /**
-     * 文件状态，creating生成中，success生成成功,failed生成失败
-     */
-    @ApiModelProperty(value = "文件状态，creating生成中，success生成成功,failed生成失败")
-    private String fileStatus;
-    /**
-     * 备注
-     */
-    @ApiModelProperty(value = "备注")
-    private String remark;
-
-    public String getFileId() {
-        return fileId;
-    }
-
-    public void setFileId(String fileId) {
-        this.fileId = fileId;
-    }
-
-    public String getFileTitle() {
-        return fileTitle;
-    }
-
-    public void setFileTitle(String fileTitle) {
-        this.fileTitle = fileTitle;
-    }
-
-
-
-    public Long getResultSize() {
-        return resultSize;
-    }
-
-    public void setResultSize(Long resultSize) {
-        this.resultSize = resultSize;
-    }
-
-    public LocalDateTime getResultStartTime() {
-        return resultStartTime;
-    }
-
-    public void setResultStartTime(LocalDateTime resultStartTime) {
-        this.resultStartTime = resultStartTime;
-    }
-
-    public LocalDateTime getResultEndTime() {
-        return resultEndTime;
-    }
-
-    public void setResultEndTime(LocalDateTime resultEndTime) {
-        this.resultEndTime = resultEndTime;
-    }
-
-    public LocalDateTime getFileCreateTime() {
-        return fileCreateTime;
-    }
-
-    public void setFileCreateTime(LocalDateTime fileCreateTime) {
-        this.fileCreateTime = fileCreateTime;
-    }
-
-    public LocalDateTime getFileFinishTime() {
-        return fileFinishTime;
-    }
-
-    public void setFileFinishTime(LocalDateTime fileFinishTime) {
-        this.fileFinishTime = fileFinishTime;
-    }
-
-    public String getFileStatus() {
-        return fileStatus;
-    }
-
-    public void setFileStatus(String fileStatus) {
-        this.fileStatus = fileStatus;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-
-}