Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
D
dlink
Project
Project
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
zhaowei
dlink
Commits
6cfe7bae
Unverified
Commit
6cfe7bae
authored
Jul 01, 2022
by
hxp0618
Committed by
GitHub
Jul 01, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[feature][admin,web]add task copy feature (#673)
Co-authored-by:
huangxp
<
18670141050@163.com
>
parent
5c6d1ae4
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
97 additions
and
1 deletion
+97
-1
CatalogueController.java
...c/main/java/com/dlink/controller/CatalogueController.java
+10
-0
TaskMapper.java
dlink-admin/src/main/java/com/dlink/mapper/TaskMapper.java
+1
-0
CatalogueService.java
...min/src/main/java/com/dlink/service/CatalogueService.java
+2
-0
TaskService.java
dlink-admin/src/main/java/com/dlink/service/TaskService.java
+1
-0
CatalogueServiceImpl.java
...ain/java/com/dlink/service/impl/CatalogueServiceImpl.java
+51
-0
TaskServiceImpl.java
...src/main/java/com/dlink/service/impl/TaskServiceImpl.java
+7
-0
TaskMapper.xml
dlink-admin/src/main/resources/mapper/TaskMapper.xml
+7
-0
index.tsx
dlink-web/src/components/Studio/StudioTree/index.tsx
+18
-1
No files found.
dlink-admin/src/main/java/com/dlink/controller/CatalogueController.java
View file @
6cfe7bae
...
@@ -220,4 +220,14 @@ public class CatalogueController {
...
@@ -220,4 +220,14 @@ public class CatalogueController {
return
Result
.
failed
(
false
,
"移动失败"
);
return
Result
.
failed
(
false
,
"移动失败"
);
}
}
}
}
@PostMapping
(
"/copyTask"
)
public
Result
copyTask
(
@RequestBody
Catalogue
catalogue
)
throws
Exception
{
if
(
catalogueService
.
copyTask
(
catalogue
))
{
return
Result
.
succeed
(
"复制作业成功"
);
}
else
{
return
Result
.
failed
(
"复制作业失败"
);
}
}
}
}
dlink-admin/src/main/java/com/dlink/mapper/TaskMapper.java
View file @
6cfe7bae
...
@@ -13,4 +13,5 @@ import org.apache.ibatis.annotations.Mapper;
...
@@ -13,4 +13,5 @@ import org.apache.ibatis.annotations.Mapper;
@Mapper
@Mapper
public
interface
TaskMapper
extends
SuperMapper
<
Task
>
{
public
interface
TaskMapper
extends
SuperMapper
<
Task
>
{
Integer
queryAllSizeByName
(
String
name
);
}
}
dlink-admin/src/main/java/com/dlink/service/CatalogueService.java
View file @
6cfe7bae
...
@@ -27,4 +27,6 @@ public interface CatalogueService extends ISuperService<Catalogue> {
...
@@ -27,4 +27,6 @@ public interface CatalogueService extends ISuperService<Catalogue> {
boolean
removeCatalogueAndTaskById
(
Integer
id
);
boolean
removeCatalogueAndTaskById
(
Integer
id
);
boolean
moveCatalogue
(
Integer
id
,
Integer
parentId
);
boolean
moveCatalogue
(
Integer
id
,
Integer
parentId
);
boolean
copyTask
(
Catalogue
catalogue
);
}
}
dlink-admin/src/main/java/com/dlink/service/TaskService.java
View file @
6cfe7bae
...
@@ -63,4 +63,5 @@ public interface TaskService extends ISuperService<Task> {
...
@@ -63,4 +63,5 @@ public interface TaskService extends ISuperService<Task> {
Result
rollbackTask
(
TaskRollbackVersionDTO
dto
);
Result
rollbackTask
(
TaskRollbackVersionDTO
dto
);
Integer
queryAllSizeByName
(
String
name
);
}
}
dlink-admin/src/main/java/com/dlink/service/impl/CatalogueServiceImpl.java
View file @
6cfe7bae
package
com
.
dlink
.
service
.
impl
;
package
com
.
dlink
.
service
.
impl
;
import
cn.hutool.core.bean.BeanUtil
;
import
cn.hutool.core.util.ObjectUtil
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.baomidou.mybatisplus.core.toolkit.Wrappers
;
import
com.baomidou.mybatisplus.core.toolkit.Wrappers
;
import
com.dlink.db.service.impl.SuperServiceImpl
;
import
com.dlink.db.service.impl.SuperServiceImpl
;
import
com.dlink.dto.CatalogueTaskDTO
;
import
com.dlink.dto.CatalogueTaskDTO
;
import
com.dlink.mapper.CatalogueMapper
;
import
com.dlink.mapper.CatalogueMapper
;
import
com.dlink.model.Catalogue
;
import
com.dlink.model.Catalogue
;
import
com.dlink.model.JobLifeCycle
;
import
com.dlink.model.Statement
;
import
com.dlink.model.Task
;
import
com.dlink.model.Task
;
import
com.dlink.service.CatalogueService
;
import
com.dlink.service.CatalogueService
;
import
com.dlink.service.StatementService
;
import
com.dlink.service.StatementService
;
...
@@ -121,4 +126,50 @@ public class CatalogueServiceImpl extends SuperServiceImpl<CatalogueMapper, Cata
...
@@ -121,4 +126,50 @@ public class CatalogueServiceImpl extends SuperServiceImpl<CatalogueMapper, Cata
return
updateById
(
catalogue
);
return
updateById
(
catalogue
);
}
}
}
}
@Override
@Transactional
(
rollbackFor
=
Exception
.
class
)
public
boolean
copyTask
(
Catalogue
catalogue
)
{
if
(
ObjectUtil
.
isNull
(
catalogue
.
getTaskId
()))
{
return
false
;
}
Task
oldTask
=
taskService
.
getById
(
catalogue
.
getTaskId
());
if
(
ObjectUtil
.
isNull
(
oldTask
))
{
return
false
;
}
//查询作业名称
int
size
=
taskService
.
queryAllSizeByName
(
oldTask
.
getName
());
Task
newTask
=
new
Task
();
BeanUtil
.
copyProperties
(
oldTask
,
newTask
);
newTask
.
setId
(
null
);
//设置复制后的作业名称为:原名称+自增序列
size
=
size
+
1
;
newTask
.
setName
(
oldTask
.
getName
()
+
"_"
+
size
);
newTask
.
setAlias
(
oldTask
.
getAlias
()
+
"_"
+
size
);
newTask
.
setStep
(
JobLifeCycle
.
DEVELOP
.
getValue
());
taskService
.
save
(
newTask
);
Statement
statementServiceById
=
statementService
.
getById
(
catalogue
.
getTaskId
());
//新建作业的sql语句
Statement
statement
=
new
Statement
();
statement
.
setStatement
(
statementServiceById
.
getStatement
());
statement
.
setId
(
newTask
.
getId
());
statementService
.
save
(
statement
);
Catalogue
one
=
this
.
getOne
(
new
LambdaQueryWrapper
<
Catalogue
>().
eq
(
Catalogue:
:
getTaskId
,
catalogue
.
getTaskId
()));
catalogue
.
setName
(
newTask
.
getAlias
());
catalogue
.
setIsLeaf
(
one
.
getIsLeaf
());
catalogue
.
setTaskId
(
newTask
.
getId
());
catalogue
.
setType
(
one
.
getType
());
catalogue
.
setParentId
(
one
.
getParentId
());
return
this
.
save
(
catalogue
);
}
}
}
dlink-admin/src/main/java/com/dlink/service/impl/TaskServiceImpl.java
View file @
6cfe7bae
...
@@ -786,6 +786,13 @@ public class TaskServiceImpl extends SuperServiceImpl<TaskMapper, Task> implemen
...
@@ -786,6 +786,13 @@ public class TaskServiceImpl extends SuperServiceImpl<TaskMapper, Task> implemen
return
"127.0.0.1:"
+
serverPort
;
return
"127.0.0.1:"
+
serverPort
;
}
}
@Override
public
Integer
queryAllSizeByName
(
String
name
)
{
return
baseMapper
.
queryAllSizeByName
(
name
);
}
private
String
getDuration
(
long
jobStartTimeMills
,
long
jobEndTimeMills
)
{
private
String
getDuration
(
long
jobStartTimeMills
,
long
jobEndTimeMills
)
{
Instant
startTime
=
Instant
.
ofEpochMilli
(
jobStartTimeMills
);
Instant
startTime
=
Instant
.
ofEpochMilli
(
jobStartTimeMills
);
Instant
endTime
=
Instant
.
ofEpochMilli
(
jobEndTimeMills
);
Instant
endTime
=
Instant
.
ofEpochMilli
(
jobEndTimeMills
);
...
...
dlink-admin/src/main/resources/mapper/TaskMapper.xml
View file @
6cfe7bae
...
@@ -29,4 +29,11 @@
...
@@ -29,4 +29,11 @@
</if>
</if>
</where>
</where>
</select>
</select>
<select
id=
"queryAllSizeByName"
resultType=
"java.lang.Integer"
>
SELECT count(*)
from dlink_task
where `name` REGEXP '${name}_[0-9]$'
</select>
</mapper>
</mapper>
dlink-web/src/components/Studio/StudioTree/index.tsx
View file @
6cfe7bae
...
@@ -7,7 +7,7 @@ import {convertToTreeData, getTreeNodeByKey, TreeDataNode} from "@/components/St
...
@@ -7,7 +7,7 @@ import {convertToTreeData, getTreeNodeByKey, TreeDataNode} from "@/components/St
import
style
from
"./index.less"
;
import
style
from
"./index.less"
;
import
{
StateType
}
from
"@/pages/DataStudio/model"
;
import
{
StateType
}
from
"@/pages/DataStudio/model"
;
import
{
import
{
getInfoById
,
handleAddOrUpdate
,
handleAddOrUpdateWithResult
,
handleRemoveById
,
handleSubmit
getInfoById
,
handleAddOrUpdate
,
handleAddOrUpdateWithResult
,
handle
Option
,
handle
RemoveById
,
handleSubmit
}
from
"@/components/Common/crud"
;
}
from
"@/components/Common/crud"
;
import
UpdateCatalogueForm
from
'./components/UpdateCatalogueForm'
;
import
UpdateCatalogueForm
from
'./components/UpdateCatalogueForm'
;
import
SimpleTaskForm
from
"@/components/Studio/StudioTree/components/SimpleTaskForm"
;
import
SimpleTaskForm
from
"@/components/Studio/StudioTree/components/SimpleTaskForm"
;
...
@@ -170,6 +170,8 @@ const StudioTree: React.FC<StudioTreeProps> = (props) => {
...
@@ -170,6 +170,8 @@ const StudioTree: React.FC<StudioTreeProps> = (props) => {
toCut
(
rightClickNode
);
toCut
(
rightClickNode
);
}
else
if
(
key
==
'Paste'
)
{
}
else
if
(
key
==
'Paste'
)
{
toPaste
(
rightClickNode
);
toPaste
(
rightClickNode
);
}
else
if
(
key
==
'Copy'
)
{
toCopy
(
rightClickNode
);
}
}
};
};
...
@@ -304,6 +306,18 @@ const StudioTree: React.FC<StudioTreeProps> = (props) => {
...
@@ -304,6 +306,18 @@ const StudioTree: React.FC<StudioTreeProps> = (props) => {
}
}
};
};
const
toCopy
=
async
(
node
:
TreeDataNode
|
undefined
)
=>
{
let
catalogues
=
{
taskId
:
node
?.
taskId
,
parentId
:
node
?.
id
};
const
datas
=
await
handleOption
(
'/api/catalogue/copyTask'
,
"复制作业"
,
catalogues
);
if
(
datas
)
{
getTreeData
();
}
};
const
createTask
=
(
node
:
TreeDataNode
|
undefined
)
=>
{
const
createTask
=
(
node
:
TreeDataNode
|
undefined
)
=>
{
if
(
!
node
?.
isLeaf
)
{
if
(
!
node
?.
isLeaf
)
{
handleUpdateTaskModalVisible
(
true
);
handleUpdateTaskModalVisible
(
true
);
...
@@ -349,6 +363,7 @@ const StudioTree: React.FC<StudioTreeProps> = (props) => {
...
@@ -349,6 +363,7 @@ const StudioTree: React.FC<StudioTreeProps> = (props) => {
<Menu.Item key='Open'>{'打开'}</Menu.Item>
<Menu.Item key='Open'>{'打开'}</Menu.Item>
<Menu.Item key='Submit'>{'异步提交'}</Menu.Item>
<Menu.Item key='Submit'>{'异步提交'}</Menu.Item>
<Menu.Item key='Rename'>{'重命名'}</Menu.Item>
<Menu.Item key='Rename'>{'重命名'}</Menu.Item>
<Menu.Item key='Copy'>{'复制'}</Menu.Item>
<Menu.Item key='Cut'>{'剪切'}</Menu.Item>
<Menu.Item key='Cut'>{'剪切'}</Menu.Item>
{cutId && <Menu.Item key='Paste'>{'粘贴'}</Menu.Item>}
{cutId && <Menu.Item key='Paste'>{'粘贴'}</Menu.Item>}
<Menu.Item key='Delete'>{'删除'}</Menu.Item>
<Menu.Item key='Delete'>{'删除'}</Menu.Item>
...
@@ -360,6 +375,7 @@ const StudioTree: React.FC<StudioTreeProps> = (props) => {
...
@@ -360,6 +375,7 @@ const StudioTree: React.FC<StudioTreeProps> = (props) => {
<Menu.Item key='ShowUploadModal'>{'上传zip包创建工程'}</Menu.Item>
<Menu.Item key='ShowUploadModal'>{'上传zip包创建工程'}</Menu.Item>
<Menu.Item key='CreateTask'>{'创建作业'}</Menu.Item>
<Menu.Item key='CreateTask'>{'创建作业'}</Menu.Item>
<Menu.Item key='Rename'>{'重命名'}</Menu.Item>
<Menu.Item key='Rename'>{'重命名'}</Menu.Item>
<Menu.Item key='Copy'>{'复制'}</Menu.Item>
<Menu.Item key='Cut'>{'剪切'}</Menu.Item>
<Menu.Item key='Cut'>{'剪切'}</Menu.Item>
{cutId && <Menu.Item key='Paste'>{'粘贴'}</Menu.Item>}
{cutId && <Menu.Item key='Paste'>{'粘贴'}</Menu.Item>}
<Menu.Item disabled>{'删除'}</Menu.Item>
<Menu.Item disabled>{'删除'}</Menu.Item>
...
@@ -369,6 +385,7 @@ const StudioTree: React.FC<StudioTreeProps> = (props) => {
...
@@ -369,6 +385,7 @@ const StudioTree: React.FC<StudioTreeProps> = (props) => {
<Menu.Item key='CreateCatalogue'>{'创建目录'}</Menu.Item>
<Menu.Item key='CreateCatalogue'>{'创建目录'}</Menu.Item>
<Menu.Item key='CreateTask'>{'创建作业'}</Menu.Item>
<Menu.Item key='CreateTask'>{'创建作业'}</Menu.Item>
<Menu.Item key='Rename'>{'重命名'}</Menu.Item>
<Menu.Item key='Rename'>{'重命名'}</Menu.Item>
<Menu.Item key='Copy'>{'复制'}</Menu.Item>
<Menu.Item key='Cut'>{'剪切'}</Menu.Item>
<Menu.Item key='Cut'>{'剪切'}</Menu.Item>
{cutId && <Menu.Item key='Paste'>{'粘贴'}</Menu.Item>}
{cutId && <Menu.Item key='Paste'>{'粘贴'}</Menu.Item>}
<Menu.Item key='Delete'>{'删除'}</Menu.Item>
<Menu.Item key='Delete'>{'删除'}</Menu.Item>
...
...
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