1.business-api包结构规划调整

2.移除query-engine模块中跟openapi相关的代码

18 files changed, 15 insertions, 268 deletions

diff --git a/galaxy-query-engine/src/main/java/com/mesalab/common/configuration/BifangMysqlConfiguration.java b/galaxy-business-api/src/main/java/com/mesalab/api/common/config/BifangMysqlConfig.java
index e7f71c0..fba812e 100644
--- a/galaxy-query-engine/src/main/java/com/mesalab/common/configuration/BifangMysqlConfiguration.java
+++ b/galaxy-business-api/src/main/java/com/mesalab/api/common/config/BifangMysqlConfig.java
@@ -1,4 +1,4 @@
-package com.mesalab.common.configuration;
+package com.mesalab.api.common.config;
 
 import lombok.Data;
 import org.springframework.beans.factory.annotation.Value;
@@ -12,7 +12,7 @@ import org.springframework.stereotype.Component;
  */
 @Data
 @Component
-public class BifangMysqlConfiguration {
+public class BifangMysqlConfig {
 
     @Value("${spring.datasource.url}")
     private String url;
diff --git a/galaxy-business-api/src/main/java/com/mesalab/api/common/configuration/BifangMysqlConfiguration.java b/galaxy-business-api/src/main/java/com/mesalab/api/common/configuration/BifangMysqlConfiguration.java
deleted file mode 100644
index 93a3c50..0000000
--- a/galaxy-business-api/src/main/java/com/mesalab/api/common/configuration/BifangMysqlConfiguration.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.mesalab.api.common.configuration;
-
-import lombok.Data;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-
-/**
- * @Date: 2020-09-17 15:03
- * @Author : liuyongqiang
- * @ClassName : BifangMysqlConfiguration
- * @Description : BifangMysql数据源配置
- */
-@Data
-@Component
-public class BifangMysqlConfiguration {
-
-    @Value("${spring.datasource.url}")
-    private String url;
-
-    @Value("${spring.datasource.username}")
-    private String userName;
-
-    @Value("${spring.datasource.password}")
-    private String passWord;
-
-}
diff --git a/galaxy-business-api/src/main/java/com/mesalab/api/common/plugin/ActiveRecordInit.java b/galaxy-business-api/src/main/java/com/mesalab/api/common/plugin/ActiveRecordInit.java
index ed3cb93..a753141 100644
--- a/galaxy-business-api/src/main/java/com/mesalab/api/common/plugin/ActiveRecordInit.java
+++ b/galaxy-business-api/src/main/java/com/mesalab/api/common/plugin/ActiveRecordInit.java
@@ -1,7 +1,7 @@
 package com.mesalab.api.common.plugin;
 
 import com.jfinal.plugin.druid.DruidPlugin;
-import com.mesalab.api.common.configuration.BifangMysqlConfiguration;
+import com.mesalab.api.common.config.BifangMysqlConfig;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -19,7 +19,7 @@ import javax.annotation.PostConstruct;
 public class ActiveRecordInit {
 
     @Autowired
-    BifangMysqlConfiguration bmc;
+    BifangMysqlConfig bmc;
 
     @PostConstruct
     public void initDialect() {
diff --git a/galaxy-query-engine/src/main/java/com/mesalab/qgw/monitor/MariaDBHealthIndicator.java b/galaxy-business-api/src/main/java/com/mesalab/api/health/MariaDBHealthIndicator.java
index 831061a..76f5524 100644
--- a/galaxy-query-engine/src/main/java/com/mesalab/qgw/monitor/MariaDBHealthIndicator.java
+++ b/galaxy-business-api/src/main/java/com/mesalab/api/health/MariaDBHealthIndicator.java
@@ -1,4 +1,4 @@
-package com.mesalab.qgw.monitor;
+package com.mesalab.api.health;
 
 import com.jfinal.plugin.activerecord.Db;
 import org.springframework.beans.factory.annotation.Value;
diff --git a/galaxy-business-api/src/main/java/com/mesalab/api/controller/DemoController.java b/galaxy-business-api/src/main/java/com/mesalab/api/modules/demo/controller/DemoController.java
index 7078c89..510e988 100644
--- a/galaxy-business-api/src/main/java/com/mesalab/api/controller/DemoController.java
+++ b/galaxy-business-api/src/main/java/com/mesalab/api/modules/demo/controller/DemoController.java
@@ -1,6 +1,6 @@
-package com.mesalab.api.controller;
+package com.mesalab.api.modules.demo.controller;
 
-import com.mesalab.api.service.DemoService;
+import com.mesalab.api.modules.demo.service.DemoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
diff --git a/galaxy-business-api/src/main/java/com/mesalab/api/service/DemoService.java b/galaxy-business-api/src/main/java/com/mesalab/api/modules/demo/service/DemoService.java
index e47c465..943d9f9 100644
--- a/galaxy-business-api/src/main/java/com/mesalab/api/service/DemoService.java
+++ b/galaxy-business-api/src/main/java/com/mesalab/api/modules/demo/service/DemoService.java
@@ -1,4 +1,4 @@
-package com.mesalab.api.service;
+package com.mesalab.api.modules.demo.service;
 
 /**
  * @Date: 2020-12-03 09:47
diff --git a/galaxy-business-api/src/main/java/com/mesalab/api/service/impl/DemoServiceImpl.java b/galaxy-business-api/src/main/java/com/mesalab/api/modules/demo/service/impl/DemoServiceImpl.java
index c0400b7..6c8de06 100644
--- a/galaxy-business-api/src/main/java/com/mesalab/api/service/impl/DemoServiceImpl.java
+++ b/galaxy-business-api/src/main/java/com/mesalab/api/modules/demo/service/impl/DemoServiceImpl.java
@@ -1,6 +1,6 @@
-package com.mesalab.api.service.impl;
+package com.mesalab.api.modules.demo.service.impl;
 
-import com.mesalab.api.service.DemoService;
+import com.mesalab.api.modules.demo.service.DemoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
diff --git a/galaxy-business-api/src/main/java/com/mesalab/api/controller/OpenApiController.java b/galaxy-business-api/src/main/java/com/mesalab/api/modules/openapi/controller/OpenApiController.java
index c85a70b..2b68f8d 100644
--- a/galaxy-business-api/src/main/java/com/mesalab/api/controller/OpenApiController.java
+++ b/galaxy-business-api/src/main/java/com/mesalab/api/modules/openapi/controller/OpenApiController.java
@@ -1,7 +1,7 @@
-package com.mesalab.api.controller;
+package com.mesalab.api.modules.openapi.controller;
 
 import com.mesalab.api.common.base.BaseResult;
-import com.mesalab.api.service.OpenApiService;
+import com.mesalab.api.modules.openapi.service.OpenApiService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
diff --git a/galaxy-business-api/src/main/java/com/mesalab/api/service/OpenApiService.java b/galaxy-business-api/src/main/java/com/mesalab/api/modules/openapi/service/OpenApiService.java
index c5789de..2edf859 100644
--- a/galaxy-business-api/src/main/java/com/mesalab/api/service/OpenApiService.java
+++ b/galaxy-business-api/src/main/java/com/mesalab/api/modules/openapi/service/OpenApiService.java
@@ -1,4 +1,4 @@
-package com.mesalab.api.service;
+package com.mesalab.api.modules.openapi.service;
 
 import com.mesalab.api.common.base.BaseResult;
 
diff --git a/galaxy-business-api/src/main/java/com/mesalab/api/service/impl/OpenApiServiceImpl.java b/galaxy-business-api/src/main/java/com/mesalab/api/modules/openapi/service/impl/OpenApiServiceImpl.java
index 309d6e1..ddaea4e 100644
--- a/galaxy-business-api/src/main/java/com/mesalab/api/service/impl/OpenApiServiceImpl.java
+++ b/galaxy-business-api/src/main/java/com/mesalab/api/modules/openapi/service/impl/OpenApiServiceImpl.java
@@ -1,11 +1,11 @@
-package com.mesalab.api.service.impl;
+package com.mesalab.api.modules.openapi.service.impl;
 
 import com.jfinal.plugin.activerecord.Db;
 import com.jfinal.plugin.activerecord.Record;
 import com.mesalab.api.common.base.BaseResult;
 import com.mesalab.api.common.base.BaseResultGenerator;
 import com.mesalab.api.common.utils.ReportCacheUtils;
-import com.mesalab.api.service.OpenApiService;
+import com.mesalab.api.modules.openapi.service.OpenApiService;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
diff --git a/galaxy-query-engine/config/application.yml b/galaxy-query-engine/config/application.yml
index 78ff252..6fd95a6 100644
--- a/galaxy-query-engine/config/application.yml
+++ b/galaxy-query-engine/config/application.yml
@@ -4,11 +4,6 @@ server:
 spring:
   application:
     name: galaxy-query-engine
-  datasource:
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://192.168.44.3:3306/tsg-bifang?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&serverTimezone=Asia/Shanghai
-    username: root
-    password: 111111
   cloud:
     consul:
       host: 192.168.44.12
diff --git a/galaxy-query-engine/pom.xml b/galaxy-query-engine/pom.xml
index da1e3cb..f3396bc 100644
--- a/galaxy-query-engine/pom.xml
+++ b/galaxy-query-engine/pom.xml
@@ -31,15 +31,6 @@
             <artifactId>spring-cloud-starter-consul-discovery</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-jdbc</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <version>${mysql.connector.version}</version>
-        </dependency>
-        <dependency>
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-all</artifactId>
         </dependency>
@@ -82,11 +73,6 @@
             <version>${apache.calcite.version}</version>
         </dependency>
         <dependency>
-            <groupId>com.jfinal</groupId>
-            <artifactId>activerecord</artifactId>
-            <version>${active.record.version}</version>
-        </dependency>
-        <dependency>
             <groupId>org.apache.hbase</groupId>
             <artifactId>hbase-client</artifactId>
             <version>${hbase.client.version}</version>
diff --git a/galaxy-query-engine/src/main/java/com/mesalab/common/plugin/ActiveRecordInit.java b/galaxy-query-engine/src/main/java/com/mesalab/common/plugin/ActiveRecordInit.java
deleted file mode 100644
index ab8f595..0000000
--- a/galaxy-query-engine/src/main/java/com/mesalab/common/plugin/ActiveRecordInit.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.mesalab.common.plugin;
-
-import com.jfinal.plugin.druid.DruidPlugin;
-import com.mesalab.common.configuration.BifangMysqlConfiguration;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.PostConstruct;
-
-/**
- * @Date: 2020-09-17 15:24
- * @Author : liuyongqiang
- * @ClassName : ActiveRecordInit
- * @Description : ActiveRecordInit
- */
-@Slf4j
-@Component
-public class ActiveRecordInit {
-
-    @Autowired
-    BifangMysqlConfiguration bmc;
-
-    @PostConstruct
-    public void initDialect() {
-        DruidPlugin dp = new DruidPlugin(bmc.getUrl(), bmc.getUserName(), bmc.getPassWord());
-        ArpStartPlugin arp = new ArpStartPlugin(dp);
-        arp.addSqlTemplate("sql-temelate.sql");
-        dp.start();
-        arp.start();
-        log.info("Initializing ActiveRecordPlugin Complete");
-    }
-}
diff --git a/galaxy-query-engine/src/main/java/com/mesalab/common/plugin/ArpStartPlugin.java b/galaxy-query-engine/src/main/java/com/mesalab/common/plugin/ArpStartPlugin.java
deleted file mode 100644
index 8e0cfcf..0000000
--- a/galaxy-query-engine/src/main/java/com/mesalab/common/plugin/ArpStartPlugin.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.mesalab.common.plugin;
-
-import com.jfinal.plugin.activerecord.ActiveRecordPlugin;
-import com.jfinal.plugin.activerecord.IDataSourceProvider;
-import lombok.extern.slf4j.Slf4j;
-
-/**
- * @Date: 2020-10-09 16:09
- * @Author : liuyongqiang
- * @ClassName : ArpStartPlugin
- * @Description : ArpStartPlugin
- */
-@Slf4j
-public class ArpStartPlugin extends ActiveRecordPlugin {
-
-    public ArpStartPlugin(IDataSourceProvider dataSourceProvider) {
-        super(dataSourceProvider);
-    }
-
-    @Override
-    public boolean start() {
-        try {
-            super.start();
-        } catch (Exception e) {
-            log.error("ArpStartPlugin init error:{}", e.getMessage());
-        }
-        return true;
-    }
-}
diff --git a/galaxy-query-engine/src/main/java/com/mesalab/openapi/controller/OpenApiController.java b/galaxy-query-engine/src/main/java/com/mesalab/openapi/controller/OpenApiController.java
deleted file mode 100644
index fa18975..0000000
--- a/galaxy-query-engine/src/main/java/com/mesalab/openapi/controller/OpenApiController.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.mesalab.openapi.controller;
-
-import com.mesalab.common.base.BaseResult;
-import com.mesalab.common.base.BaseResultGenerator;
-import com.mesalab.openapi.service.OpenApiService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.Objects;
-
-/**
- * @Date: 2020-09-18 10:58
- * @Author : liuyongqiang
- * @ClassName : OpenApiController
- * @Description : OpenApiController
- */
-@RestController
-@RequestMapping("open-api")
-public class OpenApiController {
-
-    @Autowired
-    OpenApiService openApiService;
-
-    /**
-     * @Description: APP字典列表
-     * @Author: liuyongqiang
-     * @Date: 2020/9/17 15:32
-     * @return: com.mesalab.common.base.BaseResult
-     **/
-    @GetMapping("appDicList")
-    public BaseResult appDicList() {
-        return openApiService.appDicList();
-    }
-
-    /**
-     * @param id: 报告ID
-     * @Description: 查询报告结构
-     * @Author: liuyongqiang
-     * @Date: 2020/10/16 17:46
-     * @return: com.mesalab.common.base.BaseResult
-     **/
-    @GetMapping("reportResults/{id}")
-    public BaseResult reportResults(@PathVariable(name = "id") Integer id) {
-        return openApiService.reportResults(id);
-    }
-}
diff --git a/galaxy-query-engine/src/main/java/com/mesalab/openapi/service/OpenApiService.java b/galaxy-query-engine/src/main/java/com/mesalab/openapi/service/OpenApiService.java
deleted file mode 100644
index 65866ed..0000000
--- a/galaxy-query-engine/src/main/java/com/mesalab/openapi/service/OpenApiService.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.mesalab.openapi.service;
-
-import com.mesalab.common.base.BaseResult;
-
-/**
- * @Date: 2020-09-18 10:58
- * @Author : liuyongqiang
- * @ClassName : OpenApiService
- * @Description : OpenApiService
- */
-public interface OpenApiService {
-
-    /**
-     * @Description: APP字典列表
-     * @Author: liuyongqiang
-     * @Date: 2020/9/17 15:31
-     * @return: com.mesalab.common.base.BaseResult
-     **/
-    BaseResult appDicList();
-
-    /**
-     * @param id: 报告ID
-     * @Description: 查询报告结果
-     * @Author: liuyongqiang
-     * @Date: 2020/10/16 17:45
-     * @return: com.mesalab.common.base.BaseResult
-     **/
-    BaseResult reportResults(Integer id);
-}
diff --git a/galaxy-query-engine/src/main/java/com/mesalab/openapi/service/impl/OpenApiServiceImpl.java b/galaxy-query-engine/src/main/java/com/mesalab/openapi/service/impl/OpenApiServiceImpl.java
deleted file mode 100644
index 665cf23..0000000
--- a/galaxy-query-engine/src/main/java/com/mesalab/openapi/service/impl/OpenApiServiceImpl.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.mesalab.openapi.service.impl;
-
-import com.jfinal.plugin.activerecord.Db;
-import com.jfinal.plugin.activerecord.Record;
-import com.mesalab.common.base.BaseResult;
-import com.mesalab.common.base.BaseResultGenerator;
-import com.mesalab.common.utils.ReportCacheUtils;
-import com.mesalab.openapi.service.OpenApiService;
-import org.apache.commons.collections.CollectionUtils;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Date: 2020-09-18 11:00
- * @Author : liuyongqiang
- * @ClassName : OpenApiServiceImpl
- * @Description : OpenApiServiceImpl
- */
-@Service("openApiService")
-public class OpenApiServiceImpl implements OpenApiService {
-
-    /**
-     * @Description: APP字典列表
-     * @Author: liuyongqiang
-     * @Date: 2020/9/17 15:31
-     * @return: com.mesalab.common.base.BaseResult
-     **/
-    @Override
-    public BaseResult appDicList() {
-        List<?> list = Db.query(Db.getSql("appDicList"));
-        return BaseResultGenerator.success(list);
-    }
-
-    /**
-     * @param id: 报告ID
-     * @Description: 查询报告结果
-     * @Author: liuyongqiang
-     * @Date: 2020/10/16 17:45
-     * @return: com.mesalab.common.base.BaseResult
-     **/
-    @Override
-    public BaseResult reportResults(Integer id) {
-        List<Map<String, Object>> results = new ArrayList<>();
-        String sql = Db.getSql("reportResults");
-        List<Record> list = Db.find(sql, id);
-        if (CollectionUtils.isEmpty(list)) return BaseResultGenerator.success();
-
-        list.stream().forEach(record -> {
-            String querySql = record.get("query_sql");
-            int resultId = record.getInt("result_id");
-            String queryId = ReportCacheUtils.getQueryId(String.valueOf(resultId), querySql);
-            record.set("query_id", queryId);
-            results.add(record.getColumns());
-        });
-
-        return BaseResultGenerator.success(results);
-    }
-}
diff --git a/galaxy-query-engine/src/main/resources/sql-temelate.sql b/galaxy-query-engine/src/main/resources/sql-temelate.sql
deleted file mode 100644
index f3c2ca5..0000000
--- a/galaxy-query-engine/src/main/resources/sql-temelate.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-#sql("appDicList")
-  select app_id,app_name from app_id_dict
-#end
-
-#sql("reportResults")
-  select * from report_result where job_id = ? and status !=2 order by op_time desc
-#end
\ No newline at end of file