Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
B
byit-myth-job
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
liyuan
byit-myth-job
Commits
667eb042
Commit
667eb042
authored
Aug 05, 2020
by
huangfusuper
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化节点保存校验逻辑
parent
7461ec3f
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
42 additions
and
1 deletion
+42
-1
ApiNodeCheckService.java
...n/src/main/java/com/byit/service/ApiNodeCheckService.java
+5
-0
ApiFlowServiceImpl.java
...c/main/java/com/byit/service/impl/ApiFlowServiceImpl.java
+1
-1
ApiNodeCheckServiceImpl.java
...n/java/com/byit/service/impl/ApiNodeCheckServiceImpl.java
+13
-0
NodeMapper.java
...-admin-core/src/main/java/com/byit/mapper/NodeMapper.java
+7
-0
NodeService.java
...dmin-core/src/main/java/com/byit/service/NodeService.java
+6
-0
NodeServiceImpl.java
.../src/main/java/com/byit/service/impl/NodeServiceImpl.java
+5
-0
NodeMapper.xml
.../myth-admin-core/src/main/resources/mapper/NodeMapper.xml
+5
-0
No files found.
byit-myth-admin/src/main/java/com/byit/service/ApiNodeCheckService.java
View file @
667eb042
...
@@ -10,4 +10,9 @@ public interface ApiNodeCheckService {
...
@@ -10,4 +10,9 @@ public interface ApiNodeCheckService {
* @param mainFlowId 主工作流的id
* @param mainFlowId 主工作流的id
*/
*/
void
checkFlowNode
(
Integer
mainFlowId
);
void
checkFlowNode
(
Integer
mainFlowId
);
/**
* 工作流节点校验 删除不在调度上的节点
*/
void
checkFlowNode
();
}
}
byit-myth-admin/src/main/java/com/byit/service/impl/ApiFlowServiceImpl.java
View file @
667eb042
...
@@ -133,7 +133,7 @@ public class ApiFlowServiceImpl implements ApiFlowService {
...
@@ -133,7 +133,7 @@ public class ApiFlowServiceImpl implements ApiFlowService {
log
.
debug
(
"生成版本"
);
log
.
debug
(
"生成版本"
);
FlowVersion
flowVersion
=
saveFlowVersion
(
flow
);
FlowVersion
flowVersion
=
saveFlowVersion
(
flow
);
apiNodeCheckService
.
checkFlowNode
(
flow
.
getFlowId
()
);
apiNodeCheckService
.
checkFlowNode
();
log
.
debug
(
"插件端通过API保存成功!"
);
log
.
debug
(
"插件端通过API保存成功!"
);
}
}
...
...
byit-myth-admin/src/main/java/com/byit/service/impl/ApiNodeCheckServiceImpl.java
View file @
667eb042
...
@@ -28,7 +28,12 @@ public class ApiNodeCheckServiceImpl implements ApiNodeCheckService {
...
@@ -28,7 +28,12 @@ public class ApiNodeCheckServiceImpl implements ApiNodeCheckService {
this
.
flowService
=
flowService
;
this
.
flowService
=
flowService
;
}
}
/**
* 废弃原因:查询次数多,性能低
* @param mainFlowId 主工作流的id
*/
@Override
@Override
@Deprecated
public
void
checkFlowNode
(
Integer
mainFlowId
)
{
public
void
checkFlowNode
(
Integer
mainFlowId
)
{
//查询工作流
//查询工作流
FlowVo
mainFlow
=
flowService
.
getFlowId
(
mainFlowId
);
FlowVo
mainFlow
=
flowService
.
getFlowId
(
mainFlowId
);
...
@@ -48,6 +53,14 @@ public class ApiNodeCheckServiceImpl implements ApiNodeCheckService {
...
@@ -48,6 +53,14 @@ public class ApiNodeCheckServiceImpl implements ApiNodeCheckService {
nodeService
.
deleteNode
(
collect
);
nodeService
.
deleteNode
(
collect
);
}
}
/**
* 删除不在调度上的节点
*/
@Override
public
void
checkFlowNode
()
{
nodeService
.
deleteNoForkNode
();
}
private
void
getAllInnerNode
(
List
<
Node
>
mainNodes
,
List
<
Node
>
candidateNodes
){
private
void
getAllInnerNode
(
List
<
Node
>
mainNodes
,
List
<
Node
>
candidateNodes
){
for
(
Node
node
:
mainNodes
)
{
for
(
Node
node
:
mainNodes
)
{
if
(
"1"
.
equals
(
node
.
getIsVirtual
()))
{
if
(
"1"
.
equals
(
node
.
getIsVirtual
()))
{
...
...
byit-myth-core/myth-admin-core/src/main/java/com/byit/mapper/NodeMapper.java
View file @
667eb042
...
@@ -97,4 +97,10 @@ public interface NodeMapper {
...
@@ -97,4 +97,10 @@ public interface NodeMapper {
List
<
Node
>
findbyFlowIds
(
@Param
(
"flowIdList"
)
List
<
Integer
>
flowIdList
);
List
<
Node
>
findbyFlowIds
(
@Param
(
"flowIdList"
)
List
<
Integer
>
flowIdList
);
int
deleteNodeByIds
(
@Param
(
"ids"
)
List
<
Integer
>
ids
);
int
deleteNodeByIds
(
@Param
(
"ids"
)
List
<
Integer
>
ids
);
/**
* 删除不在调度上的
* @return
*/
int
deleteNoForkNode
();
}
}
\ No newline at end of file
byit-myth-core/myth-admin-core/src/main/java/com/byit/service/NodeService.java
View file @
667eb042
...
@@ -28,4 +28,10 @@ public interface NodeService {
...
@@ -28,4 +28,10 @@ public interface NodeService {
int
deleteNode
(
List
<
Integer
>
ids
);
int
deleteNode
(
List
<
Integer
>
ids
);
/**
* 删除不在调度上的节点
* @return 删除数目
*/
int
deleteNoForkNode
();
}
}
byit-myth-core/myth-admin-core/src/main/java/com/byit/service/impl/NodeServiceImpl.java
View file @
667eb042
...
@@ -36,4 +36,9 @@ public class NodeServiceImpl implements NodeService {
...
@@ -36,4 +36,9 @@ public class NodeServiceImpl implements NodeService {
return
nodeMapper
.
deleteNodeByIds
(
ids
);
return
nodeMapper
.
deleteNodeByIds
(
ids
);
}
}
@Override
public
int
deleteNoForkNode
()
{
return
nodeMapper
.
deleteNoForkNode
();
}
}
}
byit-myth-core/myth-admin-core/src/main/resources/mapper/NodeMapper.xml
View file @
667eb042
...
@@ -496,4 +496,8 @@
...
@@ -496,4 +496,8 @@
where node_id = #{nodeId,jdbcType=INTEGER}
where node_id = #{nodeId,jdbcType=INTEGER}
</update>
</update>
<delete
id=
"deleteNoForkNode"
>
delete from node where on_fork = '1'
</delete>
</mapper>
</mapper>
\ No newline at end of file
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