Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
datax-cloud
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
黄营
datax-cloud
Commits
f1e2b58b
Commit
f1e2b58b
authored
Sep 11, 2020
by
yuwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
项目初始化
parent
2e6edd46
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
74 additions
and
7 deletions
+74
-7
MetadataChangeRecordEntity.java
.../data/metadata/api/entity/MetadataChangeRecordEntity.java
+13
-1
MetadataChangeRecordVo.java
.../service/data/metadata/api/vo/MetadataChangeRecordVo.java
+4
-0
MetadataChangeRecordController.java
...a/metadata/controller/MetadataChangeRecordController.java
+2
-2
MetadataChangeRecordDao.java
...ax/service/data/metadata/dao/MetadataChangeRecordDao.java
+11
-0
MetadataChangeRecordMapper.xml
.../src/main/resources/mapper/MetadataChangeRecordMapper.xml
+36
-0
ApiMaskAdd.vue
datax-ui/src/views/market/apimask/ApiMaskAdd.vue
+6
-4
ChangeRecordList.vue
...x-ui/src/views/metadata/changerecord/ChangeRecordList.vue
+2
-0
No files found.
datax-modules/data-metadata-service-parent/data-metadata-service-api/src/main/java/cn/datax/service/data/metadata/api/entity/MetadataChangeRecordEntity.java
View file @
f1e2b58b
...
@@ -17,7 +17,7 @@ import lombok.experimental.Accessors;
...
@@ -17,7 +17,7 @@ import lombok.experimental.Accessors;
@Data
@Data
@EqualsAndHashCode
(
callSuper
=
true
)
@EqualsAndHashCode
(
callSuper
=
true
)
@Accessors
(
chain
=
true
)
@Accessors
(
chain
=
true
)
@TableName
(
"metadata_change_record"
)
@TableName
(
value
=
"metadata_change_record"
,
autoResultMap
=
true
)
public
class
MetadataChangeRecordEntity
extends
DataScopeBaseEntity
{
public
class
MetadataChangeRecordEntity
extends
DataScopeBaseEntity
{
private
static
final
long
serialVersionUID
=
1L
;
private
static
final
long
serialVersionUID
=
1L
;
...
@@ -51,4 +51,16 @@ public class MetadataChangeRecordEntity extends DataScopeBaseEntity {
...
@@ -51,4 +51,16 @@ public class MetadataChangeRecordEntity extends DataScopeBaseEntity {
* 该字段最新的值
* 该字段最新的值
*/
*/
private
String
fieldNewValue
;
private
String
fieldNewValue
;
/**
* 数据源
*/
private
String
sourceId
;
private
String
sourceName
;
/**
* 数据库表
*/
private
String
tableId
;
private
String
tableName
;
}
}
datax-modules/data-metadata-service-parent/data-metadata-service-api/src/main/java/cn/datax/service/data/metadata/api/vo/MetadataChangeRecordVo.java
View file @
f1e2b58b
...
@@ -29,4 +29,8 @@ public class MetadataChangeRecordVo implements Serializable {
...
@@ -29,4 +29,8 @@ public class MetadataChangeRecordVo implements Serializable {
private
String
fieldName
;
private
String
fieldName
;
private
String
fieldOldValue
;
private
String
fieldOldValue
;
private
String
fieldNewValue
;
private
String
fieldNewValue
;
private
String
sourceId
;
private
String
sourceName
;
private
String
tableId
;
private
String
tableName
;
}
}
datax-modules/data-metadata-service-parent/data-metadata-service/src/main/java/cn/datax/service/data/metadata/controller/MetadataChangeRecordController.java
View file @
f1e2b58b
...
@@ -72,8 +72,8 @@ public class MetadataChangeRecordController extends BaseController {
...
@@ -72,8 +72,8 @@ public class MetadataChangeRecordController extends BaseController {
@GetMapping
(
"/page"
)
@GetMapping
(
"/page"
)
public
R
getMetadataChangeRecordPage
(
MetadataChangeRecordQuery
metadataChangeRecordQuery
)
{
public
R
getMetadataChangeRecordPage
(
MetadataChangeRecordQuery
metadataChangeRecordQuery
)
{
QueryWrapper
<
MetadataChangeRecordEntity
>
queryWrapper
=
new
QueryWrapper
<>();
QueryWrapper
<
MetadataChangeRecordEntity
>
queryWrapper
=
new
QueryWrapper
<>();
queryWrapper
.
eq
(
StrUtil
.
isNotBlank
(
metadataChangeRecordQuery
.
getObjectId
()),
"object_id"
,
metadataChangeRecordQuery
.
getObjectId
());
queryWrapper
.
eq
(
StrUtil
.
isNotBlank
(
metadataChangeRecordQuery
.
getObjectId
()),
"
r.
object_id"
,
metadataChangeRecordQuery
.
getObjectId
());
queryWrapper
.
like
(
StrUtil
.
isNotBlank
(
metadataChangeRecordQuery
.
getFieldName
()),
"field_name"
,
metadataChangeRecordQuery
.
getFieldName
());
queryWrapper
.
like
(
StrUtil
.
isNotBlank
(
metadataChangeRecordQuery
.
getFieldName
()),
"
r.
field_name"
,
metadataChangeRecordQuery
.
getFieldName
());
IPage
<
MetadataChangeRecordEntity
>
page
=
metadataChangeRecordService
.
page
(
new
Page
<>(
metadataChangeRecordQuery
.
getPageNum
(),
metadataChangeRecordQuery
.
getPageSize
()),
queryWrapper
);
IPage
<
MetadataChangeRecordEntity
>
page
=
metadataChangeRecordService
.
page
(
new
Page
<>(
metadataChangeRecordQuery
.
getPageNum
(),
metadataChangeRecordQuery
.
getPageSize
()),
queryWrapper
);
List
<
MetadataChangeRecordVo
>
collect
=
page
.
getRecords
().
stream
().
map
(
metadataChangeRecordMapper:
:
toVO
).
collect
(
Collectors
.
toList
());
List
<
MetadataChangeRecordVo
>
collect
=
page
.
getRecords
().
stream
().
map
(
metadataChangeRecordMapper:
:
toVO
).
collect
(
Collectors
.
toList
());
JsonPage
<
MetadataChangeRecordVo
>
jsonPage
=
new
JsonPage
<>(
page
.
getCurrent
(),
page
.
getSize
(),
page
.
getTotal
(),
collect
);
JsonPage
<
MetadataChangeRecordVo
>
jsonPage
=
new
JsonPage
<>(
page
.
getCurrent
(),
page
.
getSize
(),
page
.
getTotal
(),
collect
);
...
...
datax-modules/data-metadata-service-parent/data-metadata-service/src/main/java/cn/datax/service/data/metadata/dao/MetadataChangeRecordDao.java
View file @
f1e2b58b
...
@@ -2,7 +2,13 @@ package cn.datax.service.data.metadata.dao;
...
@@ -2,7 +2,13 @@ package cn.datax.service.data.metadata.dao;
import
cn.datax.common.base.BaseDao
;
import
cn.datax.common.base.BaseDao
;
import
cn.datax.service.data.metadata.api.entity.MetadataChangeRecordEntity
;
import
cn.datax.service.data.metadata.api.entity.MetadataChangeRecordEntity
;
import
com.baomidou.mybatisplus.core.conditions.Wrapper
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.core.toolkit.Constants
;
import
org.apache.ibatis.annotations.Mapper
;
import
org.apache.ibatis.annotations.Mapper
;
import
org.apache.ibatis.annotations.Param
;
import
java.io.Serializable
;
/**
/**
* <p>
* <p>
...
@@ -15,4 +21,9 @@ import org.apache.ibatis.annotations.Mapper;
...
@@ -15,4 +21,9 @@ import org.apache.ibatis.annotations.Mapper;
@Mapper
@Mapper
public
interface
MetadataChangeRecordDao
extends
BaseDao
<
MetadataChangeRecordEntity
>
{
public
interface
MetadataChangeRecordDao
extends
BaseDao
<
MetadataChangeRecordEntity
>
{
@Override
MetadataChangeRecordEntity
selectById
(
Serializable
id
);
@Override
<
E
extends
IPage
<
MetadataChangeRecordEntity
>>
E
selectPage
(
E
page
,
@Param
(
Constants
.
WRAPPER
)
Wrapper
<
MetadataChangeRecordEntity
>
queryWrapper
);
}
}
datax-modules/data-metadata-service-parent/data-metadata-service/src/main/resources/mapper/MetadataChangeRecordMapper.xml
View file @
f1e2b58b
...
@@ -18,6 +18,10 @@
...
@@ -18,6 +18,10 @@
<result
column=
"field_name"
property=
"fieldName"
/>
<result
column=
"field_name"
property=
"fieldName"
/>
<result
column=
"field_old_value"
property=
"fieldOldValue"
/>
<result
column=
"field_old_value"
property=
"fieldOldValue"
/>
<result
column=
"field_new_value"
property=
"fieldNewValue"
/>
<result
column=
"field_new_value"
property=
"fieldNewValue"
/>
<result
column=
"source_id"
property=
"sourceId"
/>
<result
column=
"source_name"
property=
"sourceName"
/>
<result
column=
"table_id"
property=
"tableId"
/>
<result
column=
"table_name"
property=
"tableName"
/>
</resultMap>
</resultMap>
<!-- 通用查询结果列 -->
<!-- 通用查询结果列 -->
...
@@ -33,4 +37,36 @@
...
@@ -33,4 +37,36 @@
version, object_type, object_id, field_name, field_old_value, field_new_value
version, object_type, object_id, field_name, field_old_value, field_new_value
</sql>
</sql>
<sql
id=
"Record_Column_List"
>
${alias}.id,
${alias}.status,
${alias}.create_by,
${alias}.create_time,
${alias}.create_dept,
${alias}.update_by,
${alias}.update_time,
${alias}.remark,
${alias}.version, ${alias}.object_type, ${alias}.object_id, ${alias}.field_name, ${alias}.field_old_value, ${alias}.field_new_value
</sql>
<select
id=
"selectById"
resultMap=
"BaseResultMap"
>
SELECT c.source_id, s.source_name, c.table_id, t.table_name
<include
refid=
"Record_Column_List"
><property
name=
"alias"
value=
"r"
/></include>
FROM metadata_change_record r
LEFT JOIN metadata_column c ON c.id = r.object_id
LEFT JOIN metadata_source s ON s.id = c.source_id
LEFT JOIN metadata_table t ON t.id = c.table_id
WHERE 1 = 1 AND r.id = #{id}
</select>
<select
id=
"selectPage"
resultMap=
"BaseResultMap"
>
SELECT c.source_id, s.source_name, c.table_id, t.table_name
<include
refid=
"Record_Column_List"
><property
name=
"alias"
value=
"r"
/></include>
FROM metadata_change_record r
LEFT JOIN metadata_column c ON c.id = r.object_id
LEFT JOIN metadata_source s ON s.id = c.source_id
LEFT JOIN metadata_table t ON t.id = c.table_id
${ew.customSqlSegment}
</select>
</mapper>
</mapper>
datax-ui/src/views/market/apimask/ApiMaskAdd.vue
View file @
f1e2b58b
...
@@ -100,7 +100,7 @@
...
@@ -100,7 +100,7 @@
<
script
>
<
script
>
import
{
addApiMask
}
from
'@/api/market/apimask'
import
{
addApiMask
}
from
'@/api/market/apimask'
import
{
listDataApi
}
from
'@/api/market/dataapi'
import
{
listDataApi
,
getDataApi
}
from
'@/api/market/dataapi'
export
default
{
export
default
{
name
:
'ApiMaskAdd'
,
name
:
'ApiMaskAdd'
,
...
@@ -213,9 +213,11 @@ export default {
...
@@ -213,9 +213,11 @@ export default {
})
})
},
},
apiSelectChanged
(
val
)
{
apiSelectChanged
(
val
)
{
this
.
resParamList
=
this
.
apiOptions
.
find
(
function
(
item
)
{
getDataApi
(
val
).
then
(
response
=>
{
return
item
.
id
===
val
if
(
response
.
success
)
{
}).
resParams
this
.
resParamList
=
response
.
data
.
resParams
}
})
},
},
fieldRule
(
fieldName
)
{
fieldRule
(
fieldName
)
{
this
.
cipher
.
open
=
true
this
.
cipher
.
open
=
true
...
...
datax-ui/src/views/metadata/changerecord/ChangeRecordList.vue
View file @
f1e2b58b
...
@@ -176,6 +176,8 @@ export default {
...
@@ -176,6 +176,8 @@ export default {
multiple
:
true
,
multiple
:
true
,
// 表格头
// 表格头
tableColumns
:
[
tableColumns
:
[
{
prop
:
'sourceName'
,
label
:
'数据源'
,
show
:
true
},
{
prop
:
'tableName'
,
label
:
'数据库表'
,
show
:
true
},
{
prop
:
'fieldName'
,
label
:
'变更字段'
,
show
:
true
,
formatter
:
this
.
fieldNameFormatter
},
{
prop
:
'fieldName'
,
label
:
'变更字段'
,
show
:
true
,
formatter
:
this
.
fieldNameFormatter
},
{
prop
:
'fieldOldValue'
,
label
:
'原来的值'
,
show
:
true
},
{
prop
:
'fieldOldValue'
,
label
:
'原来的值'
,
show
:
true
},
{
prop
:
'fieldNewValue'
,
label
:
'最新的值'
,
show
:
true
},
{
prop
:
'fieldNewValue'
,
label
:
'最新的值'
,
show
:
true
},
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment