Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nnjcy-data-model
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
梁家彪
nnjcy-data-model
Commits
40d3d484
Commit
40d3d484
authored
Sep 12, 2023
by
wqc
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
清洗模块更新
parent
1736e103
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
74 additions
and
8 deletions
+74
-8
dataoperation-server/src/main/java/com/zq/dataoperation/controller/CommonQueryController.java
+5
-2
dataoperation-server/src/main/java/com/zq/dataoperation/controller/DataCleanController.java
+38
-5
dataoperation-server/src/main/java/com/zq/dataoperation/dao/DataCleanRuleDao.java
+8
-0
dataoperation-server/src/main/java/com/zq/dataoperation/entity/DataCleanRule.java
+1
-1
dataoperation-server/src/main/java/com/zq/dataoperation/service/DataCleanRuleService.java
+19
-0
dataoperation-server/src/main/java/com/zq/dataoperation/service/DataCleanService.java
+1
-0
spider-flow-web/src/main/java/com/zq/spiderflow/controller/DataSourceController.java
+2
-0
No files found.
dataoperation-server/src/main/java/com/zq/dataoperation/controller/CommonQueryController.java
View file @
40d3d484
...
@@ -14,6 +14,8 @@ import io.swagger.annotations.ApiOperation;
...
@@ -14,6 +14,8 @@ import io.swagger.annotations.ApiOperation;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.bind.annotation.*
;
import
javax.annotation.Resource
;
import
javax.annotation.Resource
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
@Api
(
tags
=
"通用查询"
)
@Api
(
tags
=
"通用查询"
)
...
@@ -29,8 +31,9 @@ public class CommonQueryController {
...
@@ -29,8 +31,9 @@ public class CommonQueryController {
@ApiOperation
(
"获取全部数据源"
)
@ApiOperation
(
"获取全部数据源"
)
@GetMapping
(
"/datasource"
)
@GetMapping
(
"/datasource"
)
public
ResultVo
getDatasource
()
{
public
List
<
QueryDb
>
getDatasource
()
{
return
ResultVo
.
success
(
commonQueryService
.
getDatasource
());
List
<
QueryDb
>
datasource
=
commonQueryService
.
getDatasource
();
return
datasource
;
}
}
@ApiOperation
(
"添加数据源"
)
@ApiOperation
(
"添加数据源"
)
...
...
dataoperation-server/src/main/java/com/zq/dataoperation/controller/DataCleanController.java
View file @
40d3d484
package
com
.
zq
.
dataoperation
.
controller
;
package
com
.
zq
.
dataoperation
.
controller
;
import
cn.hutool.core.date.DateUtil
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.zq.common.utils.AssertUtils
;
import
com.zq.common.utils.AssertUtils
;
import
com.zq.common.vo.PageVo
;
import
com.zq.common.vo.PageVo
;
import
com.zq.common.vo.ResultVo
;
import
com.zq.common.vo.ResultVo
;
import
com.zq.dataoperation.entity.DataCleanExpressCategory
;
import
com.zq.dataoperation.entity.DataCleanExpressCategory
;
import
com.zq.dataoperation.entity.DataCleanRule
;
import
com.zq.dataoperation.service.DataCleanRuleService
;
import
com.zq.dataoperation.service.DataCleanService
;
import
com.zq.dataoperation.service.DataCleanService
;
import
com.zq.spiderflow.dao.MetaDataDao
;
import
com.zq.spiderflow.entity.MetaData
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiOperation
;
import
io.swagger.annotations.ApiOperation
;
import
lombok.RequiredArgsConstructor
;
import
lombok.RequiredArgsConstructor
;
...
@@ -21,19 +27,30 @@ public class DataCleanController {
...
@@ -21,19 +27,30 @@ public class DataCleanController {
@Resource
@Resource
private
DataCleanService
dataCleanService
;
private
DataCleanService
dataCleanService
;
@Resource
private
DataCleanRuleService
dataCleanRuleService
;
@Resource
private
MetaDataDao
metaDataDao
;
/**
/**
* 新增模板目录
* 新增规则表达式
* @param entity
*
* @param dataCleanRule
*/
*/
@PostMapping
(
"/add"
)
@PostMapping
(
"/add"
)
public
ResultVo
add
(
@RequestBody
DataCleanExpressCategory
entity
){
public
ResultVo
add
(
@RequestBody
DataCleanRule
dataCleanRule
)
{
AssertUtils
.
notNull
(
entity
.
getCategoryName
(),
"缺少目录名称"
);
AssertUtils
.
notNull
(
dataCleanRule
.
getCleanExpress
(),
"缺少目录名称"
);
return
ResultVo
.
success
(
dataCleanService
.
save
(
entity
));
MetaData
metaData
=
metaDataDao
.
selectById
(
dataCleanRule
.
getMetadataId
());
if
(
metaData
!=
null
){
dataCleanRule
.
setMetadataId
(
metaData
.
getId
());
}
dataCleanRule
.
setCreateTime
(
DateUtil
.
date
());
return
ResultVo
.
success
(
dataCleanRuleService
.
save
(
dataCleanRule
));
}
}
/**
/**
* 修改模板目录
* 修改模板目录
*
* @param entity
* @param entity
* @return
* @return
*/
*/
...
@@ -46,6 +63,7 @@ public class DataCleanController {
...
@@ -46,6 +63,7 @@ public class DataCleanController {
/**
/**
* 获取全部目录列表
* 获取全部目录列表
*
* @return
* @return
*/
*/
@GetMapping
(
"/getAll"
)
@GetMapping
(
"/getAll"
)
...
@@ -60,5 +78,20 @@ public class DataCleanController {
...
@@ -60,5 +78,20 @@ public class DataCleanController {
}
}
/**
* 新增清洗表达式模板目录
*
* @param
*/
@PostMapping
(
"/addTemplateDir"
)
public
ResultVo
addTemplateDir
(
@RequestBody
DataCleanExpressCategory
dataCleanExpressCategory
)
{
AssertUtils
.
notNull
(
dataCleanExpressCategory
.
getCategoryName
(),
"缺少目录名称"
);
AssertUtils
.
notNull
(
dataCleanExpressCategory
.
getRuleCategoryId
(),
"缺少规则表ID"
);
DataCleanExpressCategory
one
=
dataCleanService
.
getOne
(
new
LambdaQueryWrapper
<
DataCleanExpressCategory
>().
eq
(
DataCleanExpressCategory:
:
getId
,
dataCleanExpressCategory
.
getId
()));
if
(
one
!=
null
){
dataCleanExpressCategory
.
setParentId
(
one
.
getId
());
}
return
null
;
}
}
}
dataoperation-server/src/main/java/com/zq/dataoperation/dao/DataCleanRuleDao.java
0 → 100644
View file @
40d3d484
package
com
.
zq
.
dataoperation
.
dao
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
com.zq.dataoperation.entity.DataCleanRule
;
public
interface
DataCleanRuleDao
extends
BaseMapper
<
DataCleanRule
>
{
}
dataoperation-server/src/main/java/com/zq/dataoperation/entity/DataCleanRule.java
View file @
40d3d484
...
@@ -33,7 +33,7 @@ public class DataCleanRule{
...
@@ -33,7 +33,7 @@ public class DataCleanRule{
* 元数据id
* 元数据id
*/
*/
@ApiModelProperty
(
"元数据id"
)
@ApiModelProperty
(
"元数据id"
)
private
Integer
metadataId
;
private
Long
metadataId
;
/**
/**
* 清洗表达式
* 清洗表达式
...
...
dataoperation-server/src/main/java/com/zq/dataoperation/service/DataCleanRuleService.java
0 → 100644
View file @
40d3d484
package
com
.
zq
.
dataoperation
.
service
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.zq.dataoperation.dao.DataCleanExpressCategoryDao
;
import
com.zq.dataoperation.dao.DataCleanRuleDao
;
import
com.zq.dataoperation.entity.DataCleanExpressCategory
;
import
com.zq.dataoperation.entity.DataCleanRule
;
import
lombok.RequiredArgsConstructor
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.stereotype.Service
;
@Slf4j
@RequiredArgsConstructor
@Service
public
class
DataCleanRuleService
extends
ServiceImpl
<
DataCleanRuleDao
,
DataCleanRule
>
{
private
DataCleanRuleDao
dataCleanRuleDao
;
}
dataoperation-server/src/main/java/com/zq/dataoperation/service/DataCleanService.java
View file @
40d3d484
...
@@ -2,6 +2,7 @@ package com.zq.dataoperation.service;
...
@@ -2,6 +2,7 @@ package com.zq.dataoperation.service;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.zq.dataoperation.dao.DataCleanExpressCategoryDao
;
import
com.zq.dataoperation.dao.DataCleanExpressCategoryDao
;
import
com.zq.dataoperation.dao.DataCleanRuleDao
;
import
com.zq.dataoperation.entity.DataCleanExpressCategory
;
import
com.zq.dataoperation.entity.DataCleanExpressCategory
;
import
lombok.RequiredArgsConstructor
;
import
lombok.RequiredArgsConstructor
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
...
...
spider-flow-web/src/main/java/com/zq/spiderflow/controller/DataSourceController.java
View file @
40d3d484
...
@@ -93,4 +93,6 @@ public class DataSourceController {
...
@@ -93,4 +93,6 @@ public class DataSourceController {
}
}
}
}
}
}
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