Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
xiaofang li
MeterSphere
Commits
c0629c1e
Commit
c0629c1e
authored
3 years ago
by
chenjianxing
Committed by
jianxing
3 years ago
Browse files
Options
Download
Email Patches
Plain Diff
fix: 删除项目清理定时任务
parent
f10650f8
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
backend/src/main/java/io/metersphere/service/ProjectService.java
+5
-0
.../src/main/java/io/metersphere/service/ProjectService.java
backend/src/main/java/io/metersphere/service/ScheduleService.java
+21
-0
...src/main/java/io/metersphere/service/ScheduleService.java
backend/src/main/java/io/metersphere/service/WorkspaceService.java
+5
-0
...rc/main/java/io/metersphere/service/WorkspaceService.java
with
31 additions
and
0 deletions
+31
-0
backend/src/main/java/io/metersphere/service/ProjectService.java
+
5
-
0
View file @
c0629c1e
...
...
@@ -86,6 +86,8 @@ public class ProjectService {
private
ExtUserGroupMapper
extUserGroupMapper
;
@Resource
private
ExtUserMapper
extUserMapper
;
@Resource
private
ScheduleService
scheduleService
;
public
Project
addProject
(
Project
project
)
{
if
(
StringUtils
.
isBlank
(
project
.
getName
()))
{
...
...
@@ -189,6 +191,9 @@ public class ProjectService {
// delete project
projectMapper
.
deleteByPrimaryKey
(
projectId
);
// 删除定时任务
scheduleService
.
deleteByProjectId
(
projectId
);
}
private
void
deleteProjectUserGroup
(
String
projectId
)
{
...
...
This diff is collapsed.
Click to expand it.
backend/src/main/java/io/metersphere/service/ScheduleService.java
+
21
-
0
View file @
c0629c1e
...
...
@@ -98,6 +98,27 @@ public class ScheduleService {
return
scheduleMapper
.
deleteByExample
(
scheduleExample
);
}
public
int
deleteByProjectId
(
String
projectId
)
{
ScheduleExample
scheduleExample
=
new
ScheduleExample
();
scheduleExample
.
createCriteria
().
andProjectIdEqualTo
(
projectId
);
List
<
Schedule
>
schedules
=
scheduleMapper
.
selectByExample
(
scheduleExample
);
schedules
.
forEach
(
item
->
{
removeJob
(
item
.
getKey
(),
item
.
getGroup
());
swaggerUrlProjectMapper
.
deleteByPrimaryKey
(
item
.
getResourceId
());
});
return
scheduleMapper
.
deleteByExample
(
scheduleExample
);
}
public
int
deleteByWorkspaceId
(
String
workspaceId
)
{
ScheduleExample
scheduleExample
=
new
ScheduleExample
();
scheduleExample
.
createCriteria
().
andWorkspaceIdEqualTo
(
workspaceId
);
List
<
Schedule
>
schedules
=
scheduleMapper
.
selectByExample
(
scheduleExample
);
schedules
.
forEach
(
item
->
{
removeJob
(
item
.
getResourceId
(),
item
.
getGroup
());
});
return
scheduleMapper
.
deleteByExample
(
scheduleExample
);
}
private
void
removeJob
(
String
resourceId
,
String
group
)
{
if
(
StringUtils
.
equals
(
ScheduleGroup
.
API_SCENARIO_TEST
.
name
(),
group
)){
scheduleManager
.
removeJob
(
ApiScenarioTestJob
.
getJobKey
(
resourceId
),
ApiScenarioTestJob
.
getTriggerKey
(
resourceId
));
...
...
This diff is collapsed.
Click to expand it.
backend/src/main/java/io/metersphere/service/WorkspaceService.java
+
5
-
0
View file @
c0629c1e
...
...
@@ -55,6 +55,8 @@ public class WorkspaceService {
private
ExtUserGroupMapper
extUserGroupMapper
;
@Resource
private
ExtUserMapper
extUserMapper
;
@Resource
private
ScheduleService
scheduleService
;
public
Workspace
saveWorkspace
(
Workspace
workspace
)
{
if
(
StringUtils
.
isBlank
(
workspace
.
getName
()))
{
...
...
@@ -131,6 +133,9 @@ public class WorkspaceService {
// delete workspace
workspaceMapper
.
deleteByPrimaryKey
(
workspaceId
);
// 删除定时任务
scheduleService
.
deleteByWorkspaceId
(
workspaceId
);
}
/**
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
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
Menu
Projects
Groups
Snippets
Help