fix:字典表完善

src/api/etl/datasource.js

@@ -114,3 +114,12 @@ export function statisticsInfo(data) {
   })
 }
 
+
+export function UpdateAssetModel(data) {
+  return request({
+    url: '/etl/model/UpdateAssetModel',
+    method: 'put',
+    data
+  })
+}
+

src/api/etl/dictionary.js

@@ -28,7 +28,7 @@ export function deleteDictionary(id) {
 // 新增【请填写功能名称】
 export function addDictionary(data) {
   return request({
-    url: '/etl/dictionary',
+    url: '/etl/dictionary/dictionary',
     method: 'post',
     data: data
   })
@@ -57,3 +57,10 @@ export function getDictionaryList(id) {
     method: 'get'
   })
 }
+
+export function delDict(id) {
+  return request({
+    url: '/etl/dictionary/delDict?id=' + id,
+    method: 'get'
+  })
+}

src/views/etl/assets/dashboard/OverallAssetStructure.vue

@@ -166,13 +166,13 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="formStatus = false">取 消</el-button>
-        <el-button type="primary" @click="formStatus = false">确 定</el-button>
+        <el-button type="primary" @click="updDict()">确 定</el-button>
       </div>
     </el-dialog>
   </div>
 </template>
 <script>
-import {assetModelList} from "@/api/etl/datasource";
+import {assetModelList, UpdateAssetModel} from "@/api/etl/datasource";
 import {getDictionaryList} from "@/api/etl/dictionary";
 
 export default {
@@ -180,8 +180,9 @@ export default {
   watch:{
     'title':{
       handler(val){
-       this.getDictionaryList()
+        this.getDictionaryList()
         assetModelList(val).then(res=>{
+          console.log("zuida",res)
           this.tableData = res.data
         })
       },
@@ -213,13 +214,23 @@ export default {
   },
   methods: {
     getDictionaryList(){
-      getDictionaryList(this.title.id).then(res=>{
-        console.log("灌灌灌灌灌孤寡孤寡孤寡尴尬",this.title.dataSourceId)
-        console.log("sourceId",res)
+      getDictionaryList(this.title.dataSourceId).then(res=>{
         this.dictMap = res.data
       })
     },
-    update(row) {
+    assetModelList(){
+      assetModelList(this.title).then(res=>{
+        this.tableData = res.data
+        this.formStatus = false
+      })
+    },
+    updDict(){
+      UpdateAssetModel(this.form).then(res=>{
+        this.assetModelList();
+      })
+    },
+    async update(row) {
+      await this.getDictionaryList()
       this.form = row;
       this.formStatus = true;
     }

src/views/etl/assets/index.vue

@@ -103,10 +103,15 @@ export default {
   watch: {},
   //方法集合",
   methods: {
+    test(data){
+      console.log("红红火火恍恍惚惚哈哈哈哈",data)
+      this.sourceData = data
+    },
 
     handleNodeClick(data) {
       if (data.dataType === 'dataSource'){
         dataAssetList(data).then(res => {
+          console.log(res)
           res.data.forEach(table => {
             table.dataType = "dataTable"
             table.label=table.tableName+"-"+table.tableComment+"("+table.tableCount+"条)"

src/views/etl/datasource/index.vue

@@ -1,176 +1,525 @@
 <template>
-  <div>
-    <el-container style="height: 80%; border: 1px solid #eee">
-      <el-aside width="300px" style="background-color: rgb(238, 241, 246)">
-        <el-tree :data="sourceList"
-                 @node-click="handleNodeClick"
-                 :props="defaultProps">
-        </el-tree>
-      </el-aside>
-      <el-container>
-        <el-main>
-          <el-tabs v-model="activeName">
-            <el-tab-pane label="资产结构" name="structure">
-              <OverallAssets v-if="showAssets == null"/>
-              <overall-specific-assets v-if="showAssets === 'dataSource'" :title="title"/>
-              <overall-asset-structure v-if="showAssets === 'dataTable'" :title="title"/>
-            </el-tab-pane>
-            <el-tab-pane label="资产数据" name="data">
-              <el-card style="height: 280px">
-                <div slot="header" class="clearfix">
-                  <span>查询语句</span>
-                </div>
-                <el-input type="textarea" v-model="source.sql" style="width: 1080px;" :rows="6"></el-input>
-                <el-button style="float: right;margin-top: 20px" @click="sql()">查询</el-button>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="数据源名称" prop="dataSourceName" label-width="100px">
+        <el-input
+          v-model="queryParams.dataSourceName"
+          placeholder="请输入数据源名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="数据源链接地址" prop="linkAddress" label-width="120px">
+        <el-input
+          v-model="queryParams.linkAddress"
+          placeholder="请输入数据源链接地址"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
 
-              </el-card>
-              <br>
-              <el-card>
-                <div slot="header" class="clearfix">
-                  <span>数据资产</span>
-                </div>
-                <el-table :data="structureList" v-if="structureList!=null">
-                  <el-table-column v-for="(assets,index) in assetsList" :label="index+' ('+assets+')'" width="140">
-                    <template slot-scope="scope">
-                      {{scope.row[index].value}}
-                    </template>
-                  </el-table-column>
-                </el-table>
-              </el-card>
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['system:source:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['system:source:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['system:source:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['system:source:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
 
-            </el-tab-pane>
-          </el-tabs>
+    <el-table v-loading="loading" :data="datasourceList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="主键" align="center" prop="id" />
+      <el-table-column label="端口" align="center" prop="port" />
+      <el-table-column label="用户名" align="center" prop="username" />
+      <el-table-column label="密码" align="center" prop="password" />
+      <el-table-column label="连接地址" align="center" prop="linkAddress" />
+      <el-table-column label="数据源名称" align="center" prop="dataSourceName" />
+      <el-table-column label="数据库名" align="center" prop="databaseName" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-link"
+            @click="test(scope.row)"
+          >测试连接</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-s-open"
+            @click="synchronization(scope.row)"
+          >同步资产结构</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['etl:datasource:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['etl:datasource:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
 
-        </el-main>
-      </el-container>
-    </el-container>
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改【请填写功能名称】对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="1150px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="140px">
+        <el-card>
+          <div slot="header" class="clearfix">
+            <span>基础配置信息</span>
+          </div>
+          <el-row>
+            <el-col :md="12" :sm="24">
+              <el-form-item label="接入源名称" prop="dataSourceName">
+                <el-input v-model="form.dataSourceName" placeholder="请输入接入源名称" />
+              </el-form-item>
+            </el-col>
+            <el-col :md="12" :sm="24">
+              <el-form-item label="数据来源系统名称" prop="systemName">
+                <el-input v-model="form.systemName" placeholder="请输入数据来源系统名称" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :md="12" :sm="24">
+              <el-form-item label="主机IP" prop="linkAddress">
+                <el-input v-model="form.linkAddress" placeholder="请输入主机地址" />
+              </el-form-item>
+            </el-col>
+            <el-col :md="12" :sm="24">
+              <el-form-item label="主机地址" prop="port">
+                <el-input v-model="form.port" placeholder="请输入主机地址" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :md="12" :sm="24">
+              <el-form-item label="数据接入类型" prop="type">
+                <el-select style="width: 100%" v-model="form.type">
+                  <el-option label="MySql" value="MySql">MySql</el-option>
+                  <el-option label="PostGre" value="PostGre">PostGre</el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :md="12" :sm="24">
+              <el-form-item label="数据库名称" prop="databaseName">
+                <el-input v-model="form.databaseName" placeholder="请输入数据库名称" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row v-if="form.type == 'PostGre'">
+            <el-col :md="12" :sm="24">
+              <el-form-item label="模式名称" prop="modeName">
+                <el-input v-model="form.modeName" placeholder="模式名称" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :md="12" :sm="24">
+              <el-form-item label="连接用户名" prop="username">
+                <el-input v-model="form.username" placeholder="请输入连接用户名" />
+              </el-form-item>
+            </el-col>
+            <el-col :md="12" :sm="24">
+              <el-form-item label="连接密码" prop="password">
+                <el-input v-model="form.password" placeholder="请输入连接密码" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-card>
+              <div slot="header" class="clearfix">
+                <span>数据连接参数</span>
+              </div>
+              <el-col :sm="24">
+                <el-form-item label="数据连接参数" prop="connectionParam">
+                  <el-input v-model="form.connectionParam" placeholder="请输入内容" />
+                </el-form-item>
+              </el-col>
+              <el-row :gutter="10" style="margin: 10px 0">
+                <el-col :span="2">
+                  <el-button type="primary" @click="addParam()">新增参数</el-button>
+                </el-col>
+                <el-col :span="2">
+                  <el-button type="danger" @click="deleteParam(null)">清空参数</el-button>
+                </el-col>
+              </el-row>
+              <el-row :gutter="10">
+                <el-col :md="8" :xs="12" style="margin: 10px 0" v-for="(dataSourceParam, dataSourceParamIndex) in dataSourceParamList">
+                  <el-col :span="10">
+                    <el-input v-model="dataSourceParam.name" placeholder="请输入参数键" @keyup.native="processParam"/>
+                  </el-col>
+                  <el-col :span="1"><span style="font-size: 28px; margin: 0 3px 0 0;">:</span></el-col>
+                  <el-col :span="10">
+                    <el-input v-model="dataSourceParam.val" placeholder="请输入参数值" @keyup.native="processParam"/>
+                  </el-col>
+                  <el-col :span="3">
+                    <el-button type="danger" @click="deleteParam(dataSourceParamIndex)">删除</el-button>
+                  </el-col>
+                </el-col>
+              </el-row>
+            </el-card>
+          </el-row>
+        </el-card>
+        <el-card style="margin-top: 20px">
+          <div slot="header" class="clearfix">
+            <span>连接池配置</span>
+          </div>
+          <el-row>
+            <el-col :md="12" :sm="24">
+              <el-form-item label="初始连接数量" prop="initNum">
+                <el-input v-model="form.initNum" placeholder="请输入初始连接数量" />
+              </el-form-item>
+            </el-col>
+            <el-col :md="12" :sm="24">
+              <el-form-item label="最大连接数量" prop="maxNum">
+                <el-input v-model="form.maxNum" placeholder="请输入最大连接数量" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :md="12" :sm="24">
+              <el-form-item label="最大等待时间" prop="maxWaitTime">
+                <el-input v-model="form.maxWaitTime" placeholder="请输入最大等待时间" />
+              </el-form-item>
+            </el-col>
+            <el-col :md="12" :sm="24">
+              <el-form-item label="最大等待次数" prop="maxWaitSize">
+                <el-input v-model="form.maxWaitSize" placeholder="请输入最大等待次数" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-card>
+
+        <el-card style="margin-top: 20px">
+          <div slot="header" class="clearfix">
+            <span>其他信息</span>
+          </div>
+          <el-form-item label="备注" prop="remark">
+            <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+          </el-form-item>
+        </el-card>
+      </el-form>
+
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+
+
+    </el-dialog>
   </div>
 </template>
 
 <script>
-//这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）,
-//例如：import 《组件名称》 from '《组件路径》,
-import {dataAssetList, listDatasource, structureList} from "@/api/etl/datasource";
-import OverallSpecificAssets from "@/views/etl/assets/dashboard/OverallSpecificAssets.vue";
-import OverallAssets from "@/views/etl/assets/dashboard/OverallAssets.vue";
-import OverallAssetStructure from "@/views/etl/assets/dashboard/OverallAssetStructure.vue";
-export default {
-  components: { OverallSpecificAssets, OverallAssets,OverallAssetStructure},
+import {
+  listDatasource,
+  getDatasource,
+  addDatasource,
+  updateDatasource,
+  delDatasource,
+  test,
+  synchronization
+} from "@/api/etl/datasource";
 
-  //import引入的组件需要注入到对象中才能使用"
-  props: {},
+export default {
+  watch:{
+    'form.type':{
+      handler(val) {
+        if(val != 'PostGre'){
+          this.form.modeName = ''
+        }
+      }
+    }
+  },
+  name: "Source",
   data() {
     return {
-      mainHeight: window.innerHeight - 85,
-      assetsCompute:{
-        assetsModuleSum: 0,
-        dataModuleSum: 0,
-        dataSourceSum: 0
-      },
-      showAssets: null,
-      title: {},
-      activeName: 'structure',
+      datasourceList:[],
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 数据源表格数据
+      sourceList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      datasource:{},
+      // 查询参数
       queryParams: {
         pageNum: 1,
         pageSize: 10,
         dataSourceName: null,
         linkAddress: null
       },
-      // 总条数
-      total: 0,
-      // 【请填写功能名称】表格数据
-      datasourceList:[
-
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        dataSourceName: [
+          {required: true, message: "接入源名称不能为空", trigger: "blur"}
+        ],
+        systemName: [
+          {required: true, message: "数据来源系统名称不能为空", trigger: "blur"}
+        ],
+        type: [
+          {required: true, message: "数据接入类型不能为空", trigger: "blur"}
+        ],
+        host: [
+          {required: true, message: "主机地址不能为空", trigger: "blur"}
+        ],
+        port: [
+          {required: true, message: "主机地址不能为空", trigger: "blur"}
+        ],
+        databaseName: [
+          {required: true, message: "数据库名称不能为空", trigger: "blur"}
+        ],
+        connectionParam: [
+          {required: true, message: "数据连接参数不能为空", trigger: "blur"}
+        ],
+        initNum: [
+          {required: true, message: "初始连接数量不能为空", trigger: "blur"}
+        ],
+        maxNum: [
+          {required: true, message: "最大连接数量不能为空", trigger: "blur"}
+        ],
+        maxWaitTime: [
+          {required: true, message: "最大等待时间不能为空", trigger: "blur"}
+        ],
+        maxWaitSize: [
+          {required: true, message: "最大等待次数不能为空", trigger: "blur"}
+        ],
+        modeName:[
+          {required: true, message: "数据源模式不能为空", trigger: "blur"}
+        ]
+      },
+      dataSourceParamList: [
+        {
+          name: null,
+          val: null
+        }
       ],
-      sourceList: [],
-      assetsList:[],
-      structureList:[],
-      tableAssets:[],
-      defaultProps: {
-        children: 'tableList',
-        label: 'label'
-      },
-      sourceData:{},
-      source:{
-        sql:''
-      },
-      statisticsInfo:{}
+
     };
   },
-  //计算属性 类似于data概念",
-  computed: {},
-  //监控data中的数据变化",
-  watch: {},
-  //方法集合",
+  created() {
+    this.getList();
+
+  },
   methods: {
-    test(data){
-      console.log("红红火火恍恍惚惚哈哈哈哈",data)
-      this.sourceData = data
-    },
 
-    handleNodeClick(data) {
-      if (data.dataType === 'dataSource'){
-        dataAssetList(data).then(res => {
-          console.log(res)
-          res.data.forEach(table => {
-            table.dataType = "dataTable"
-            table.label=table.tableName+"-"+table.tableComment+"("+table.tableCount+"条)"
+    synchronization(data){
+      synchronization(data).then(res=>{
+        console.log(res)
+        if (res.code == 200){
+          this.$message({
+            message:("成功")
           })
-          data.tableList = res.data
-          this.sourceList[this.sourceList.indexOf(data)].tableList = res.data
-          this.title = data
-        })
-
-      }else{
-        this.title= data
-      }
-      this.showAssets = data.dataType
-    },
-    sql(){
-      structureList(this.source).then(res => {
-        this.structureList = res.data.kvtList
+        }else{
+          this.$message({
+            message:("失败")
+          })
+        }
       })
     },
+    addParam(){
+      this.dataSourceParamList.push({
+      name:null,
+      val:null
+      })
+    },
+    deleteParam(){
+      if (index!=null){
+        this.dataSourceParamList.splice(index,1)
+      }else{
+        this.dataSourceParamList = []
+      }
+      this.processParam()
+    },
+    processParam(){
+      this.form.connectionParam= this.dataSourceParamList
+        .filter(item=>item.name !=null || item .val!=null)
+        .map(ite =>{
+          return ite.name + "=" + ite.val
+      }).join("&")
+    },
+    //测试
+    test(datasource){
+      test(datasource).then(res=>{
+        if (res.code == 200){
+          this.$message({
+            message:("成功")
+          })
+        }else{
+          this.$message({
+            message:("失败")
+          })
+        }
+      })
+    },
+    /** 查询数据源列表 */
     getList() {
+      this.loading = true;
       listDatasource(this.queryParams).then(response => {
-        this.sourceList = response.data.rows;
-        console.log(this.sourceList)
-        this.sourceList.forEach(source => {
-          if (source.type=='PostGre'){
-            source.label=source.dataSourceName+'('+source.databaseName+'-'+source.modeName+'-'+source.systemName+')'
-          }else{
-            source.label=source.dataSourceName+'('+source.databaseName+'-'+source.systemName+')'
-          }
-
-          source.dataType = 'dataSource'
-          if (source.tableList!=null){
-            source.tableList.forEach(table => {
-              table.label = table.tableName+'-'+table.tableComment+'('+table.tableCount+'条)'
-              table.dataType = 'dataTable'
-            })
-          }
-        })
-        this.total = response.data.total;
+        console.log(response)
+        this.datasourceList = response.data.rows;
+        this.loading = false;
       });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        port: null,
+        username: null,
+        password: null,
+        linkAddress: null,
+        modeName: null,
+        dataSourceName: null,
+        databaseName: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加数据源";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getDatasource(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改数据源";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateDatasource(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addDatasource(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除数据源编号为"' + ids + '"的数据项？').then(function() {
+        return delDatasource(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('etl/datasource/export', {
+        ...this.queryParams
+      }, `datasource_${new Date().getTime()}.xlsx`)
     }
-  },
-  //生命周期 - 创建完成（可以访问当前this实例）",
-  created() {
-    this.getList()
-  },
-  //生命周期 - 挂载完成（可以访问DOM元素）",
-  mounted() {
   }
 };
 </script>
-<style scoped>
-.el-header {
-  background-color: #B3C0D1;
-  color: #333;
-  line-height: 60px;
-}
-
-.el-aside {
-  color: #333;
-}
-</style>