项目初始化

datax-modules/data-market-service-parent/data-market-service-mapping/src/main/java/cn/datax/service/data/market/mapping/config/RabbitMqListenerConfig.java

@@ -53,9 +53,7 @@ public class RabbitMqListenerConfig {
                     mappingHandlerMapping.unregisterMapping(dataApiEntity);
                 }
             }
-            // 手动确认
-            channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
-        }catch (Exception e){
+        } catch (Exception e) {
             log.error("全局异常信息ex={}, StackTrace={}", e.getMessage(), ThrowableUtil.getStackTrace(e));
             if (message.getMessageProperties().getRedelivered()){
                 log.error("消息已处理,请勿重复处理！");
@@ -67,6 +65,9 @@ public class RabbitMqListenerConfig {
                 //第一个参数为消息的index，第二个参数是是否批量处理，第三个参数为是否让被拒绝的消息重新入队列
                 channel.basicNack(message.getMessageProperties().getDeliveryTag(), false, false);
             }
+        } finally {
+            // 手动确认
+            channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
         }
     }
 }

datax-modules/data-masterdata-service-parent/data-masterdata-service/src/main/java/cn/datax/service/data/masterdata/config/RabbitMqListenerConfig.java

@@ -45,9 +45,7 @@ public class RabbitMqListenerConfig {
             model.setId(businessKey);
             model.setFlowStatus(flowStatus);
             modelDao.updateById(model);
-            // 手动确认
-            channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
-        }catch (Exception e){
+        } catch (Exception e) {
             log.error("全局异常信息ex={}, StackTrace={}", e.getMessage(), ThrowableUtil.getStackTrace(e));
             if (message.getMessageProperties().getRedelivered()){
                 log.error("消息已处理,请勿重复处理！");
@@ -59,6 +57,9 @@ public class RabbitMqListenerConfig {
                 //第一个参数为消息的index，第二个参数是是否批量处理，第三个参数为是否让被拒绝的消息重新入队列
                 channel.basicNack(message.getMessageProperties().getDeliveryTag(), false, false);
             }
+        } finally {
+            // 手动确认
+            channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
         }
     }
 }

datax-ui/src/views/market/dataapi/DataApiAdd.vue

@@ -285,7 +285,7 @@ export default {
         showAdd: false,
         showEdit: false,
         showDetail: false,
-        showCall: false
+        showExample: false
       },
       // 保存按钮
       loadingOptions: {

datax-ui/src/views/market/dataapi/DataApiDetail.vue

@@ -3,8 +3,8 @@
     <div slot="header" class="clearfix">
       <span>{{ title }}</span>
       <el-button-group style="float: right;">
-        <el-button size="mini" icon="el-icon-coin" type="primary" round @click="handleWord">接口文档</el-button>
-        <el-button size="mini" icon="el-icon-s-data" round @click="apiTry">接口示例</el-button>
+        <el-button size="mini" icon="el-icon-coin" round @click="handleWord">接口文档</el-button>
+        <el-button size="mini" icon="el-icon-s-data" round @click="handleExample">接口示例</el-button>
         <el-button size="mini" icon="el-icon-back" round @click="showCard">返回</el-button>
       </el-button-group>
     </div>
@@ -258,7 +258,7 @@ export default {
         showAdd: false,
         showEdit: false,
         showDetail: false,
-        showCall: false
+        showExample: false
       },
       active: 1,
       // 表单参数
@@ -421,13 +421,13 @@ export default {
         }) || []
       }
     },
-    apiTry() {
+    handleExample() {
       this.showOptions.data.id = this.data.id
       this.showOptions.showList = false
       this.showOptions.showAdd = false
       this.showOptions.showEdit = false
       this.showOptions.showDetail = false
-      this.showOptions.showCall = true
+      this.showOptions.showExample = true
       this.$emit('showCard', this.showOptions)
     },
     /** 接口文档 */

datax-ui/src/views/market/dataapi/DataApiEdit.vue

@@ -285,7 +285,7 @@ export default {
         showAdd: false,
         showEdit: false,
         showDetail: false,
-        showCall: false
+        showExample: false
       },
       // 保存按钮
       loadingOptions: {

datax-ui/src/views/market/dataapi/DataApiCall.vue → datax-ui/src/views/market/dataapi/DataApiExample.vue

@@ -3,7 +3,7 @@
     <div slot="header" class="clearfix">
       <span>{{ title }}</span>
       <el-button-group style="float: right;">
-        <el-button size="mini" icon="el-icon-s-data" round @click="apiDataCall">接口调用</el-button>
+        <el-button size="mini" icon="el-icon-s-data" round @click="handleCall">接口调用</el-button>
         <el-button size="mini" icon="el-icon-back" round @click="showCard">返回</el-button>
       </el-button-group>
     </div>
@@ -165,7 +165,7 @@ import { getDataApiDetail } from '@/api/market/dataapi'
 import { getApiCall, postApiCall } from '@/api/market/apimapping'
 
 export default {
-  name: 'DataApiCall',
+  name: 'DataApiExample',
   props: {
     data: {
       type: Object,
@@ -184,7 +184,7 @@ export default {
         showAdd: false,
         showEdit: false,
         showDetail: false,
-        showCall: false
+        showExample: false
       },
       activeTabName: 'table0',
       form: {},
@@ -239,13 +239,13 @@ export default {
     handleSizeChange(val) {
       this.callData.pageNum = 1
       this.callData.pageSize = val
-      this.apiDataCall()
+      this.handleCall()
     },
     handleCurrentChange(val) {
       this.callData.pageNum = val
-      this.apiDataCall()
+      this.handleCall()
     },
-    apiDataCall() {
+    handleCall() {
       const url = 'services/' + this.form.apiVersion + this.form.apiUrl
       const header = { api_key: this.apiHeader.apiKey, secret_key: this.apiHeader.secretKey }
       const data = {}

datax-ui/src/views/market/dataapi/DataApiList.vue

@@ -127,14 +127,14 @@
               size="mini"
               type="text"
               icon="el-icon-upload2"
-              @click="handleRegister(scope.row)"
+              @click="handleRelease(scope.row)"
             >发布</el-button>
             <el-button
               :disabled="scope.row.status !== '2'"
               size="mini"
               type="text"
               icon="el-icon-download"
-              @click="handleUnRegister(scope.row)"
+              @click="handleCancel(scope.row)"
             >注销</el-button>
             <el-button slot="reference">操作</el-button>
           </el-popover>
@@ -169,7 +169,7 @@ export default {
         showAdd: false,
         showEdit: false,
         showDetail: false,
-        showCall: false
+        showExample: false
       },
       // 遮罩层
       loading: true,
@@ -269,7 +269,7 @@ export default {
       this.showOptions.showAdd = true
       this.showOptions.showEdit = false
       this.showOptions.showDetail = false
-      this.showOptions.showCall = false
+      this.showOptions.showExample = false
       this.$emit('showCard', this.showOptions)
     },
     /** 修改按钮操作 */
@@ -279,7 +279,7 @@ export default {
       this.showOptions.showAdd = false
       this.showOptions.showEdit = true
       this.showOptions.showDetail = false
-      this.showOptions.showCall = false
+      this.showOptions.showExample = false
       this.$emit('showCard', this.showOptions)
     },
     /** 详情按钮操作 */
@@ -289,7 +289,7 @@ export default {
       this.showOptions.showAdd = false
       this.showOptions.showEdit = false
       this.showOptions.showDetail = true
-      this.showOptions.showCall = false
+      this.showOptions.showExample = false
       this.$emit('showCard', this.showOptions)
     },
     /** 删除按钮操作 */
@@ -318,7 +318,7 @@ export default {
       })
     },
     /** 接口发布 */
-    handleRegister(row) {
+    handleRelease(row) {
       releaseDataApi(row.id).then(response => {
         if (response.success) {
           this.$message.success('接口发布成功')
@@ -327,7 +327,7 @@ export default {
       })
     },
     /** 接口注销 */
-    handleUnRegister(row) {
+    handleCancel(row) {
       cancelDataApi(row.id).then(response => {
         if (response.success) {
           this.$message.success('接口注销成功')

datax-ui/src/views/market/dataapi/index.vue

@@ -13,7 +13,7 @@
       <data-api-detail v-if="options.showDetail" :data="options.data" @showCard="showCard"></data-api-detail>
     </transition>
     <transition name="el-zoom-in-bottom">
-      <data-api-call v-if="options.showCall" :data="options.data" @showCard="showCard"></data-api-call>
+      <data-api-example v-if="options.showExample" :data="options.data" @showCard="showCard"></data-api-example>
     </transition>
   </div>
 </template>
@@ -23,11 +23,11 @@ import DataApiList from './DataApiList'
 import DataApiAdd from './DataApiAdd'
 import DataApiEdit from './DataApiEdit'
 import DataApiDetail from './DataApiDetail'
-import DataApiCall from './DataApiCall'
+import DataApiExample from './DataApiExample'
 
 export default {
   name: 'DataApi',
-  components: { DataApiList, DataApiAdd, DataApiEdit, DataApiDetail, DataApiCall },
+  components: { DataApiList, DataApiAdd, DataApiEdit, DataApiDetail, DataApiExample },
   data () {
     return {
       options: {
@@ -36,7 +36,7 @@ export default {
         showAdd: false,
         showEdit: false,
         showDetail: false,
-        showCall: false
+        showExample: false
       }
     }
   },

datax-ui/src/views/metadata/changerecord/index.vue

 <template>
   <div class="app-container">
     <transition name="el-zoom-in-center">
-      <change-record-list v-if="options.showList" @showCard="showCard"></change-record-list>
+      <change-record-list v-if="options.showList" @showCard="showCard" />
     </transition>
     <transition name="el-zoom-in-top">
-      <change-record-add v-if="options.showAdd" :data="options.data" @showCard="showCard"></change-record-add>
+      <change-record-add v-if="options.showAdd" :data="options.data" @showCard="showCard" />
     </transition>
     <transition name="el-zoom-in-top">
-      <change-record-edit v-if="options.showEdit" :data="options.data" @showCard="showCard"></change-record-edit>
+      <change-record-edit v-if="options.showEdit" :data="options.data" @showCard="showCard" />
     </transition>
     <transition name="el-zoom-in-bottom">
-      <change-record-detail v-if="options.showDetail" :data="options.data" @showCard="showCard"></change-record-detail>
+      <change-record-detail v-if="options.showDetail" :data="options.data" @showCard="showCard" />
     </transition>
   </div>
 </template>
@@ -24,7 +24,7 @@ import ChangeRecordDetail from './ChangeRecordDetail'
 export default {
   name: 'ChangeRecord',
   components: { ChangeRecordList, ChangeRecordAdd, ChangeRecordEdit, ChangeRecordDetail },
-  data () {
+  data() {
     return {
       options: {
         data: {},
@@ -36,7 +36,7 @@ export default {
     }
   },
   methods: {
-    showCard (data) {
+    showCard(data) {
       Object.assign(this.options, data)
     }
   }

datax-ui/src/views/metadata/datasource/DataSourceDetail.vue

@@ -3,9 +3,9 @@
     <div slot="header" class="clearfix">
       <span>{{ title }}</span>
       <el-button-group style="float: right;">
-        <el-button :disabled="form.sourceSync === 1" size="mini" icon="el-icon-coin" type="primary" round @click="handleSync">元数据同步</el-button>
-        <el-button :disabled="form.sourceSync === 0" size="mini" icon="el-icon-coin" type="primary" round @click="handleWord">数据库文档</el-button>
-        <el-button size="mini" icon="el-icon-coin" type="primary" round @click="handleCheckConnection">连通性检测</el-button>
+        <el-button v-if="form.isSync === '0'" size="mini" icon="el-icon-coin" round @click="handleSync">元数据同步</el-button>
+        <el-button v-if="form.isSync === '1'" size="mini" icon="el-icon-coin" round @click="handleWord">数据库文档</el-button>
+        <el-button size="mini" icon="el-icon-coin" round @click="handleCheckConnection">连通性检测</el-button>
         <el-button size="mini" icon="el-icon-back" round @click="showCard">返回</el-button>
       </el-button-group>
     </div>

datax-ui/src/views/quality/checkjob/CheckJobList.vue

@@ -43,7 +43,7 @@
               size="mini"
               type="text"
               icon="el-icon-delete"
-              @click="resumePause(scope.row)"
+              @click="handleResume(scope.row)"
             >恢复任务</el-button>
             <el-button
               size="mini"
@@ -148,7 +148,7 @@ export default {
       }).catch(() => {
       })
     },
-    resumePause(row) {
+    handleResume(row) {
       this.$confirm('是否恢复该任务', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',

datax-ui/src/views/quality/checklog/CheckLogList.vue

+<template>
+  <el-card class="box-card" shadow="always">
+    <el-form ref="queryForm" :model="queryParams" :inline="true">
+      <el-form-item label="规则类型" prop="ruleTypeId">
+        <el-select v-model="queryParams.ruleTypeId" clearable placeholder="请选择规则类型">
+          <el-option
+            v-for="item in ruleTypeOptions"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </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-table
+      v-loading="loading"
+      :data="tableDataList"
+      border
+      tooltip-effect="dark"
+      :height="tableHeight"
+      style="width: 100%;margin: 15px 0;"
+    >
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="序号" width="55" align="center">
+        <template slot-scope="scope">
+          <span>{{ scope.$index +1 }}</span>
+        </template>
+      </el-table-column>
+      <template v-for="(item, index) in tableColumns">
+        <el-table-column
+          v-if="item.show"
+          :key="index"
+          :prop="item.prop"
+          :label="item.label"
+          :formatter="item.formatter"
+          align="center"
+          show-overflow-tooltip
+        />
+      </template>
+    </el-table>
+
+    <el-pagination
+      :page-sizes="[10, 20, 50, 100]"
+      layout="total, sizes, prev, pager, next, jumper"
+      :current-page.sync="queryParams.pageNum"
+      :page-size.sync="queryParams.pageSize"
+      :total="total"
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+    />
+  </el-card>
+</template>
+
+<script>
+import { listRuleType } from '@/api/quality/checkrule'
+import { pageCheckLog } from '@/api/quality/checklog'
+
+export default {
+  name: 'CheckLogList',
+  data() {
+    return {
+      tableHeight: document.body.offsetHeight - 310 + 'px',
+      // 展示切换
+      showOptions: {
+        data: {},
+        showList: true
+      },
+      // 遮罩层
+      loading: true,
+      // 表格头
+      tableColumns: [
+        { prop: 'executeJobName', label: '任务名称', show: true },
+        { prop: 'executeRuleTypeName', label: '规则类型', show: true },
+        { prop: 'executeRuleName', label: '规则名称', show: true },
+        { prop: 'executeBatch', label: '执行批次', show: true },
+        {
+          prop: 'status',
+          label: '状态',
+          show: true,
+          formatter: this.statusFormatter
+        },
+        { prop: 'executeDate', label: '执行时间', show: true }
+      ],
+      // 状态数据字典
+      statusOptions: [],
+      // 数据集表格数据
+      tableDataList: [],
+      // 总数据条数
+      total: 0,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        ruleTypeId: ''
+      },
+      ruleTypeOptions: []
+    }
+  },
+  created() {
+    this.getDicts('sys_normal_status').then(response => {
+      if (response.success) {
+        this.statusOptions = response.data
+      }
+    })
+    this.getRuleTypeList()
+    this.getList()
+  },
+  methods: {
+    getRuleTypeList() {
+      listRuleType().then(response => {
+        if (response.success) {
+          this.ruleTypeOptions = response.data
+        }
+      })
+    },
+    /** 查询数据集列表 */
+    getList() {
+      this.loading = true
+      pageCheckLog(this.queryParams).then(response => {
+        this.loading = false
+        if (response.success) {
+          const { data } = response
+          this.tableDataList = data.data
+          this.total = data.total
+        }
+      })
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1
+      this.getList()
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.queryParams = {
+        pageNum: 1,
+        pageSize: 20,
+        ruleTypeId: ''
+      }
+      this.handleQuery()
+    },
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`)
+      this.queryParams.pageNum = 1
+      this.queryParams.pageSize = val
+      this.getList()
+    },
+    handleCurrentChange(val) {
+      console.log(`当前页: ${val}`)
+      this.queryParams.pageNum = val
+      this.getList()
+    },
+    statusFormatter(row, column, cellValue, index) {
+      const dictLabel = this.selectDictLabel(this.statusOptions, cellValue)
+      if (cellValue === '1') {
+        return <el-tag type='success'>{dictLabel}</el-tag>
+      } else {
+        return <el-tag type='warning'>{dictLabel}</el-tag>
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.right-toolbar {
+  float: right;
+}
+.el-card ::v-deep .el-card__body {
+  height: calc(100vh - 170px);
+}
+</style>

datax-ui/src/views/quality/checklog/index.vue

+<template>
+  <div class="app-container">
+    <transition name="el-zoom-in-center">
+      <check-log-list v-if="options.showList" @showCard="showCard" />
+    </transition>
+  </div>
+</template>
+
+<script>
+import CheckLogList from './CheckLogList'
+
+export default {
+  name: 'CheckLog',
+  components: { CheckLogList },
+  data() {
+    return {
+      options: {
+        data: {},
+        showList: true
+      }
+    }
+  },
+  methods: {
+    showCard(data) {
+      Object.assign(this.options, data)
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+
+</style>

datax-ui/src/views/quality/checkreport/CheckReportList.vue → datax-ui/src/views/quality/checkstatistic/CheckReportList.vue

@@ -87,7 +87,7 @@
 import { listRuleType, pageCheckReport } from '@/api/quality/checkreport'
 
 export default {
-  name: 'CheckReportList',
+  name: 'CheckStatisticList',
   data() {
     return {
       tableHeight: document.body.offsetHeight - 310 + 'px',

datax-ui/src/views/quality/checkstatistic/index.vue

+<template>
+  <div class="app-container">
+    <transition name="el-zoom-in-center">
+      <check-report-list v-if="options.showList" @showCard="showCard" />
+    </transition>
+  </div>
+</template>
+
+<script>
+import CheckReportList from './CheckReportList'
+
+export default {
+  name: 'CheckReport',
+  components: { CheckReportList },
+  data() {
+    return {
+      options: {
+        data: {},
+        showList: true
+      }
+    }
+  },
+  methods: {
+    showCard(data) {
+      Object.assign(this.options, data)
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+
+</style>

datax-ui/src/views/standard/dictmapping/index.vue

@@ -239,7 +239,6 @@ export default {
         })
         // 连线
         _this.jsPlumb.bind('connection', function(evt) {
-          console.log('connection', evt)
           _this.connEndpoints.push({
             sourceId: evt.sourceId,
             targetId: evt.targetId
@@ -247,7 +246,6 @@ export default {
         })
         // 删除连线
         _this.jsPlumb.bind('connectionDetached', function(evt) {
-          console.log('connectionDetached', evt)
           _this.connEndpoints.splice(_this.connEndpoints.findIndex(item => item.sourceId === evt.sourceId && item.targetId === evt.targetId), 1)
         })
       })
@@ -292,7 +290,6 @@ export default {
       }
     },
     handleCancel(id) {
-      console.log(id)
       this.$confirm('是否取消对照关系？', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',

datax-ui/src/views/workflow/instance/myinvolved/MyInvolvedInstanceList.vue

@@ -53,6 +53,7 @@
               icon="el-icon-view"
               @click="handleTrack(scope.row)"
             >流程追踪</el-button>
+            <el-button slot="reference">操作</el-button>
           </el-popover>
         </template>
       </el-table-column>