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
42616dd9
Unverified
Commit
42616dd9
authored
Apr 06, 2022
by
aiwenmo
Committed by
GitHub
Apr 06, 2022
Browse files
Options
Browse Files
Download
Plain Diff
[Fix-358] [pom] Fix to install
[Fix-358] [pom] Fix to install
parents
c83f5fe5
a8778570
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
12 deletions
+11
-12
TaskServiceImpl.java
...src/main/java/com/dlink/service/impl/TaskServiceImpl.java
+11
-12
No files found.
dlink-admin/src/main/java/com/dlink/service/impl/TaskServiceImpl.java
View file @
42616dd9
package
com
.
dlink
.
service
.
impl
;
package
com
.
dlink
.
service
.
impl
;
import
org.apache.flink.runtime.jobgraph.SavepointConfigOptions
;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
import
com.dlink.alert.Alert
;
import
com.dlink.alert.Alert
;
import
com.dlink.alert.AlertConfig
;
import
com.dlink.alert.AlertConfig
;
...
@@ -32,6 +30,7 @@ import com.dlink.result.SqlExplainResult;
...
@@ -32,6 +30,7 @@ import com.dlink.result.SqlExplainResult;
import
com.dlink.service.*
;
import
com.dlink.service.*
;
import
com.dlink.utils.CustomStringJavaCompiler
;
import
com.dlink.utils.CustomStringJavaCompiler
;
import
com.dlink.utils.JSONUtil
;
import
com.dlink.utils.JSONUtil
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
...
@@ -91,7 +90,7 @@ public class TaskServiceImpl extends SuperServiceImpl<TaskMapper, Task> implemen
...
@@ -91,7 +90,7 @@ public class TaskServiceImpl extends SuperServiceImpl<TaskMapper, Task> implemen
Asserts
.
checkNull
(
task
,
Tips
.
TASK_NOT_EXIST
);
Asserts
.
checkNull
(
task
,
Tips
.
TASK_NOT_EXIST
);
if
(
Dialect
.
isSql
(
task
.
getDialect
()))
{
if
(
Dialect
.
isSql
(
task
.
getDialect
()))
{
return
executeCommonSql
(
SqlDTO
.
build
(
task
.
getStatement
(),
return
executeCommonSql
(
SqlDTO
.
build
(
task
.
getStatement
(),
task
.
getDatabaseId
(),
null
));
task
.
getDatabaseId
(),
null
));
}
}
JobConfig
config
=
buildJobConfig
(
task
);
JobConfig
config
=
buildJobConfig
(
task
);
JobManager
jobManager
=
JobManager
.
build
(
config
);
JobManager
jobManager
=
JobManager
.
build
(
config
);
...
@@ -109,7 +108,7 @@ public class TaskServiceImpl extends SuperServiceImpl<TaskMapper, Task> implemen
...
@@ -109,7 +108,7 @@ public class TaskServiceImpl extends SuperServiceImpl<TaskMapper, Task> implemen
task
.
setStep
(
JobLifeCycle
.
ONLINE
.
getValue
());
task
.
setStep
(
JobLifeCycle
.
ONLINE
.
getValue
());
if
(
Dialect
.
isSql
(
task
.
getDialect
()))
{
if
(
Dialect
.
isSql
(
task
.
getDialect
()))
{
return
executeCommonSql
(
SqlDTO
.
build
(
task
.
getStatement
(),
return
executeCommonSql
(
SqlDTO
.
build
(
task
.
getStatement
(),
task
.
getDatabaseId
(),
null
));
task
.
getDatabaseId
(),
null
));
}
}
JobConfig
config
=
buildJobConfig
(
task
);
JobConfig
config
=
buildJobConfig
(
task
);
JobManager
jobManager
=
JobManager
.
build
(
config
);
JobManager
jobManager
=
JobManager
.
build
(
config
);
...
@@ -129,7 +128,7 @@ public class TaskServiceImpl extends SuperServiceImpl<TaskMapper, Task> implemen
...
@@ -129,7 +128,7 @@ public class TaskServiceImpl extends SuperServiceImpl<TaskMapper, Task> implemen
}
}
if
(
Dialect
.
isSql
(
task
.
getDialect
()))
{
if
(
Dialect
.
isSql
(
task
.
getDialect
()))
{
return
executeCommonSql
(
SqlDTO
.
build
(
task
.
getStatement
(),
return
executeCommonSql
(
SqlDTO
.
build
(
task
.
getStatement
(),
task
.
getDatabaseId
(),
null
));
task
.
getDatabaseId
(),
null
));
}
}
task
.
setSavePointStrategy
(
SavePointStrategy
.
LATEST
.
getValue
());
task
.
setSavePointStrategy
(
SavePointStrategy
.
LATEST
.
getValue
());
JobConfig
config
=
buildJobConfig
(
task
);
JobConfig
config
=
buildJobConfig
(
task
);
...
@@ -238,7 +237,7 @@ public class TaskServiceImpl extends SuperServiceImpl<TaskMapper, Task> implemen
...
@@ -238,7 +237,7 @@ public class TaskServiceImpl extends SuperServiceImpl<TaskMapper, Task> implemen
public
boolean
saveOrUpdateTask
(
Task
task
)
{
public
boolean
saveOrUpdateTask
(
Task
task
)
{
// to compiler java udf
// to compiler java udf
if
(
Asserts
.
isNotNullString
(
task
.
getDialect
())
&&
Dialect
.
JAVA
.
equalsVal
(
task
.
getDialect
())
if
(
Asserts
.
isNotNullString
(
task
.
getDialect
())
&&
Dialect
.
JAVA
.
equalsVal
(
task
.
getDialect
())
&&
Asserts
.
isNotNullString
(
task
.
getStatement
()))
{
&&
Asserts
.
isNotNullString
(
task
.
getStatement
()))
{
CustomStringJavaCompiler
compiler
=
new
CustomStringJavaCompiler
(
task
.
getStatement
());
CustomStringJavaCompiler
compiler
=
new
CustomStringJavaCompiler
(
task
.
getStatement
());
task
.
setSavePointPath
(
compiler
.
getFullClassName
());
task
.
setSavePointPath
(
compiler
.
getFullClassName
());
}
}
...
@@ -247,8 +246,8 @@ public class TaskServiceImpl extends SuperServiceImpl<TaskMapper, Task> implemen
...
@@ -247,8 +246,8 @@ public class TaskServiceImpl extends SuperServiceImpl<TaskMapper, Task> implemen
Task
taskInfo
=
getById
(
task
.
getId
());
Task
taskInfo
=
getById
(
task
.
getId
());
Assert
.
check
(
taskInfo
);
Assert
.
check
(
taskInfo
);
if
(
JobLifeCycle
.
RELEASE
.
equalsValue
(
taskInfo
.
getStep
())
||
if
(
JobLifeCycle
.
RELEASE
.
equalsValue
(
taskInfo
.
getStep
())
||
JobLifeCycle
.
ONLINE
.
equalsValue
(
taskInfo
.
getStep
())
||
JobLifeCycle
.
ONLINE
.
equalsValue
(
taskInfo
.
getStep
())
||
JobLifeCycle
.
CANCEL
.
equalsValue
(
taskInfo
.
getStep
()))
{
JobLifeCycle
.
CANCEL
.
equalsValue
(
taskInfo
.
getStep
()))
{
throw
new
BusException
(
"该作业已"
+
JobLifeCycle
.
get
(
taskInfo
.
getStep
()).
getLabel
()
+
",禁止修改!"
);
throw
new
BusException
(
"该作业已"
+
JobLifeCycle
.
get
(
taskInfo
.
getStep
()).
getLabel
()
+
",禁止修改!"
);
}
}
task
.
setStep
(
JobLifeCycle
.
DEVELOP
.
getValue
());
task
.
setStep
(
JobLifeCycle
.
DEVELOP
.
getValue
());
...
@@ -528,18 +527,18 @@ public class TaskServiceImpl extends SuperServiceImpl<TaskMapper, Task> implemen
...
@@ -528,18 +527,18 @@ public class TaskServiceImpl extends SuperServiceImpl<TaskMapper, Task> implemen
Savepoints
latestSavepoints
=
savepointsService
.
getLatestSavepointByTaskId
(
task
.
getId
());
Savepoints
latestSavepoints
=
savepointsService
.
getLatestSavepointByTaskId
(
task
.
getId
());
if
(
Asserts
.
isNotNull
(
latestSavepoints
))
{
if
(
Asserts
.
isNotNull
(
latestSavepoints
))
{
config
.
setSavePointPath
(
latestSavepoints
.
getPath
());
config
.
setSavePointPath
(
latestSavepoints
.
getPath
());
config
.
getConfig
().
put
(
SavepointConfigOptions
.
SAVEPOINT_PATH
.
key
(),
latestSavepoints
.
getPath
());
config
.
getConfig
().
put
(
"execution.savepoint.path"
,
latestSavepoints
.
getPath
());
}
}
break
;
break
;
case
EARLIEST:
case
EARLIEST:
Savepoints
earliestSavepoints
=
savepointsService
.
getEarliestSavepointByTaskId
(
task
.
getId
());
Savepoints
earliestSavepoints
=
savepointsService
.
getEarliestSavepointByTaskId
(
task
.
getId
());
if
(
Asserts
.
isNotNull
(
earliestSavepoints
))
{
if
(
Asserts
.
isNotNull
(
earliestSavepoints
))
{
config
.
setSavePointPath
(
earliestSavepoints
.
getPath
());
config
.
setSavePointPath
(
earliestSavepoints
.
getPath
());
config
.
getConfig
().
put
(
SavepointConfigOptions
.
SAVEPOINT_PATH
.
key
(),
earliestSavepoints
.
getPath
());
config
.
getConfig
().
put
(
"execution.savepoint.path"
,
earliestSavepoints
.
getPath
());
}
}
break
;
break
;
case
CUSTOM:
case
CUSTOM:
config
.
getConfig
().
put
(
SavepointConfigOptions
.
SAVEPOINT_PATH
.
key
(),
config
.
getSavePointPath
());
config
.
getConfig
().
put
(
"execution.savepoint.path"
,
config
.
getSavePointPath
());
break
;
break
;
default
:
default
:
config
.
setSavePointPath
(
null
);
config
.
setSavePointPath
(
null
);
...
@@ -577,7 +576,7 @@ public class TaskServiceImpl extends SuperServiceImpl<TaskMapper, Task> implemen
...
@@ -577,7 +576,7 @@ public class TaskServiceImpl extends SuperServiceImpl<TaskMapper, Task> implemen
private
boolean
inRefreshPlan
(
JobInstance
jobInstance
)
{
private
boolean
inRefreshPlan
(
JobInstance
jobInstance
)
{
if
((!
JobStatus
.
isDone
(
jobInstance
.
getStatus
()))
||
(
Asserts
.
isNotNull
(
jobInstance
.
getFinishTime
())
if
((!
JobStatus
.
isDone
(
jobInstance
.
getStatus
()))
||
(
Asserts
.
isNotNull
(
jobInstance
.
getFinishTime
())
&&
Duration
.
between
(
jobInstance
.
getFinishTime
(),
LocalDateTime
.
now
()).
toMinutes
()
<
1
))
{
&&
Duration
.
between
(
jobInstance
.
getFinishTime
(),
LocalDateTime
.
now
()).
toMinutes
()
<
1
))
{
return
true
;
return
true
;
}
else
{
}
else
{
return
false
;
return
false
;
...
...
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