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
fab6ef58
Unverified
Commit
fab6ef58
authored
Jul 27, 2022
by
zhu-mingye
Committed by
GitHub
Jul 27, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Optimization][admin] The task version was not deleted after deleting the task (#782)
parent
8fd47134
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
4 deletions
+9
-4
CatalogueServiceImpl.java
...ain/java/com/dlink/service/impl/CatalogueServiceImpl.java
+9
-4
No files found.
dlink-admin/src/main/java/com/dlink/service/impl/CatalogueServiceImpl.java
View file @
fab6ef58
...
@@ -29,13 +29,11 @@ import com.dlink.assertion.Asserts;
...
@@ -29,13 +29,11 @@ import com.dlink.assertion.Asserts;
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.*
;
import
com.dlink.model.JobLifeCycle
;
import
com.dlink.model.Statement
;
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
;
import
com.dlink.service.TaskService
;
import
com.dlink.service.TaskService
;
import
com.dlink.service.TaskVersionService
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.transaction.annotation.Transactional
;
...
@@ -59,6 +57,9 @@ public class CatalogueServiceImpl extends SuperServiceImpl<CatalogueMapper, Cata
...
@@ -59,6 +57,9 @@ public class CatalogueServiceImpl extends SuperServiceImpl<CatalogueMapper, Cata
@Autowired
@Autowired
private
StatementService
statementService
;
private
StatementService
statementService
;
@Autowired
private
TaskVersionService
taskVersionService
;
@Override
@Override
public
List
<
Catalogue
>
getAllData
()
{
public
List
<
Catalogue
>
getAllData
()
{
return
this
.
list
();
return
this
.
list
();
...
@@ -132,6 +133,10 @@ public class CatalogueServiceImpl extends SuperServiceImpl<CatalogueMapper, Cata
...
@@ -132,6 +133,10 @@ public class CatalogueServiceImpl extends SuperServiceImpl<CatalogueMapper, Cata
if
(
isNotNull
(
catalogue
.
getTaskId
()))
{
if
(
isNotNull
(
catalogue
.
getTaskId
()))
{
taskService
.
removeById
(
catalogue
.
getTaskId
());
taskService
.
removeById
(
catalogue
.
getTaskId
());
statementService
.
removeById
(
catalogue
.
getTaskId
());
statementService
.
removeById
(
catalogue
.
getTaskId
());
List
<
TaskVersion
>
taskVersionList
=
taskVersionService
.
getTaskVersionByTaskId
(
catalogue
.
getTaskId
());
if
(
taskVersionList
.
size
()
>
0
){
taskVersionService
.
removeByIds
(
taskVersionList
);
}
}
}
this
.
removeById
(
id
);
this
.
removeById
(
id
);
return
true
;
return
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