From f76fae0722f9d7a4e6750c454b306075ddc6ed08 Mon Sep 17 00:00:00 2001 From: clay <20932067@zju.edu.cn> Date: Thu, 23 Sep 2021 19:41:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E7=BA=BF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tool/top/packages/topology/src/toolbar-edit.vue | 1 + .../views/tool/top/packages/topology/src/topology.vue | 4 ++++ ebts-ui/src/views/tool/top/topology.vue | 11 +++++++++++ ebts/ebts-admin/src/main/resources/application.yml | 4 ++-- ebts/ebts-generator/pom.xml | 4 ++-- .../ebts/generator/controller/TopQueryController.java | 11 +++++++++++ .../main/java/com/ebts/generator/entity/UniQuery.java | 11 +++++++++++ .../com/ebts/generator/service/TopQueryService.java | 2 ++ .../generator/service/impl/TopQueryServiceImpl.java | 6 ++++++ .../resources/mapper/generator/UniQueryMapper.xml | 1 + 10 files changed, 51 insertions(+), 4 deletions(-) diff --git a/ebts-ui/src/views/tool/top/packages/topology/src/toolbar-edit.vue b/ebts-ui/src/views/tool/top/packages/topology/src/toolbar-edit.vue index fbd3df1..bba3420 100644 --- a/ebts-ui/src/views/tool/top/packages/topology/src/toolbar-edit.vue +++ b/ebts-ui/src/views/tool/top/packages/topology/src/toolbar-edit.vue @@ -49,6 +49,7 @@ 预览 + 上线 保存 diff --git a/ebts-ui/src/views/tool/top/packages/topology/src/topology.vue b/ebts-ui/src/views/tool/top/packages/topology/src/topology.vue index e29aea2..a6c0611 100644 --- a/ebts-ui/src/views/tool/top/packages/topology/src/topology.vue +++ b/ebts-ui/src/views/tool/top/packages/topology/src/topology.vue @@ -1417,6 +1417,10 @@ export default { let graphData = this.getGraphData() this.$emit('doPreview', graphData) }, + // 上线 + searchOnLine(){ + this.$emit('doOnLine') + }, // 保存函数 saveDataHandler() { let graphData = this.getGraphData() diff --git a/ebts-ui/src/views/tool/top/topology.vue b/ebts-ui/src/views/tool/top/topology.vue index 3998834..a64308e 100644 --- a/ebts-ui/src/views/tool/top/topology.vue +++ b/ebts-ui/src/views/tool/top/topology.vue @@ -12,6 +12,7 @@ @doChangeMode="doChangeMode" @doSaveData="doSaveData" @doPreview="doPreview" + @doOnLine="doOnLine" > @@ -241,6 +242,16 @@ export default { this.msgSuccess(res.msg) }) }, + doOnLine(){ + this.$confirm('请确认top图结构无误并预览结果无误后上线?', "警告", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning" + }).then(function () { + + }) + }, + //预览 doPreview(graphData){ if (graphData.nodes&&graphData.nodes.length>0){ let data = { diff --git a/ebts/ebts-admin/src/main/resources/application.yml b/ebts/ebts-admin/src/main/resources/application.yml index a8e6ca5..67eb30c 100644 --- a/ebts/ebts-admin/src/main/resources/application.yml +++ b/ebts/ebts-admin/src/main/resources/application.yml @@ -106,8 +106,8 @@ spring: redis: # 地址 # host: 114.215.82.135 - host: 127.0.0.1 -# host: 13.70.28.14 +# host: 127.0.0.1 + host: 13.70.28.14 # 端口，默认为6379 port: 6379 # 密码 diff --git a/ebts/ebts-generator/pom.xml b/ebts/ebts-generator/pom.xml index fae7848..91ba740 100644 --- a/ebts/ebts-generator/pom.xml +++ b/ebts/ebts-generator/pom.xml @@ -4,8 +4,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> ebts - com.ebts - 1.0.0 + com.ebts1 +1 1.0.0 4.0.0 diff --git a/ebts/ebts-generator/src/main/java/com/ebts/generator/controller/TopQueryController.java b/ebts/ebts-generator/src/main/java/com/ebts/generator/controller/TopQueryController.java index 1f6a7c2..0886db2 100644 --- a/ebts/ebts-generator/src/main/java/com/ebts/generator/controller/TopQueryController.java +++ b/ebts/ebts-generator/src/main/java/com/ebts/generator/controller/TopQueryController.java @@ -53,6 +53,17 @@ public class TopQueryController extends BaseController { } } + @GetMapping("/online/{id}") + public AjaxResult online(@PathVariable("id") Long id){ + ServerResult ServerResult = queryService.updateQueryInfo(uniQuery); + if (ServerResult.isStart()) { + return AjaxResult.success(ServerResult.getData()); + } else { + return AjaxResult.info(ServerResult.getMsg()); + } + } + + /** * 获取基本信息 * diff --git a/ebts/ebts-generator/src/main/java/com/ebts/generator/entity/UniQuery.java b/ebts/ebts-generator/src/main/java/com/ebts/generator/entity/UniQuery.java index 4ab755b..6b48876 100644 --- a/ebts/ebts-generator/src/main/java/com/ebts/generator/entity/UniQuery.java +++ b/ebts/ebts-generator/src/main/java/com/ebts/generator/entity/UniQuery.java @@ -45,6 +45,8 @@ public class UniQuery extends BaseEntity { */ private Integer isRelease; + private Integer isPreview; + private List uniCons; private Integer pageNum; @@ -55,6 +57,15 @@ public class UniQuery extends BaseEntity { return topJson; } + + public Integer getIsPreview() { + return isPreview; + } + + public void setIsPreview(Integer isPreview) { + this.isPreview = isPreview; + } + public void setTopJson(String topJson) { this.topJson = topJson; } diff --git a/ebts/ebts-generator/src/main/java/com/ebts/generator/service/TopQueryService.java b/ebts/ebts-generator/src/main/java/com/ebts/generator/service/TopQueryService.java index cf6fa81..023151c 100644 --- a/ebts/ebts-generator/src/main/java/com/ebts/generator/service/TopQueryService.java +++ b/ebts/ebts-generator/src/main/java/com/ebts/generator/service/TopQueryService.java @@ -16,4 +16,6 @@ public interface TopQueryService { Map selectTopSearchTables(); ServerResult preview(String jsonData, String id); + + ServerResult online(Long id); } diff --git a/ebts/ebts-generator/src/main/java/com/ebts/generator/service/impl/TopQueryServiceImpl.java b/ebts/ebts-generator/src/main/java/com/ebts/generator/service/impl/TopQueryServiceImpl.java index bc2ae54..5cce30b 100644 --- a/ebts/ebts-generator/src/main/java/com/ebts/generator/service/impl/TopQueryServiceImpl.java +++ b/ebts/ebts-generator/src/main/java/com/ebts/generator/service/impl/TopQueryServiceImpl.java @@ -117,6 +117,7 @@ public class TopQueryServiceImpl implements TopQueryService { UniQuery uniQuery = new UniQuery(); uniQuery.setId(Long.valueOf(id)); uniQuery.setUqSql(sql.toString()); + uniQuery.setIsPreview(1); List uniCons = uniQuery.getUniCons(); for (TopNode node : topNodes) { JSONArray columns = node.getColumns(); @@ -150,6 +151,11 @@ public class TopQueryServiceImpl implements TopQueryService { } } + @Override + public ServerResult online(Long id) { + return null; + } + void ParseSelectSQL(TopNode mainNode, List topNodes, StringBuilder selectSql, StringBuilder selectQuery) { selectSql.append(mainNode.getTableSQL()); selectQuery.append(mainNode.getQuerySql()); diff --git a/ebts/ebts-generator/src/main/resources/mapper/generator/UniQueryMapper.xml b/ebts/ebts-generator/src/main/resources/mapper/generator/UniQueryMapper.xml index 2643b92..4d2e61d 100644 --- a/ebts/ebts-generator/src/main/resources/mapper/generator/UniQueryMapper.xml +++ b/ebts/ebts-generator/src/main/resources/mapper/generator/UniQueryMapper.xml @@ -64,6 +64,7 @@ uq_name = #{uqName}, uq_sql = #{uqSql}, + is_preview = #{isPreview}, uq_describe = #{uqDescribe}, type = #{type}, top_json = #{topJson},