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
d0cf908a
Commit
d0cf908a
authored
Jul 29, 2020
by
huangfusuper
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改类名
parent
e260687e
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
11 deletions
+7
-11
ApiNodeServiceImpl.java
...c/main/java/com/byit/service/impl/ApiNodeServiceImpl.java
+2
-4
JavaTaskAndLogServiceServiceImpl.java
...ice/mapservice/impl/JavaTaskAndLogServiceServiceImpl.java
+2
-4
JavaJobConfDTO.java
...rc/main/java/com/byit/dto/personalise/JavaJobConfDTO.java
+1
-1
JavaTask.java
...-dto-core/src/main/java/com/byit/dto/plugin/JavaTask.java
+2
-2
No files found.
byit-myth-admin/src/main/java/com/byit/service/impl/ApiNodeServiceImpl.java
View file @
d0cf908a
...
@@ -3,7 +3,7 @@ package com.byit.service.impl;
...
@@ -3,7 +3,7 @@ package com.byit.service.impl;
import
cn.hutool.http.HttpUtil
;
import
cn.hutool.http.HttpUtil
;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.JSONObject
;
import
com.alibaba.fastjson.JSONObject
;
import
com.byit.dto.personalise.JavaJobConfD
to
;
import
com.byit.dto.personalise.JavaJobConfD
TO
;
import
com.byit.dto.plugin.JavaTask
;
import
com.byit.dto.plugin.JavaTask
;
import
com.byit.dto.plugin.RunLog
;
import
com.byit.dto.plugin.RunLog
;
import
com.byit.dto.plugin.RunNode
;
import
com.byit.dto.plugin.RunNode
;
...
@@ -28,13 +28,11 @@ import com.byit.task.JavaTaskJobTask;
...
@@ -28,13 +28,11 @@ import com.byit.task.JavaTaskJobTask;
import
com.byit.task.ScriptExecutorJobTask
;
import
com.byit.task.ScriptExecutorJobTask
;
import
com.byit.utils.ValidationUtil
;
import
com.byit.utils.ValidationUtil
;
import
io.netty.util.TimerTask
;
import
io.netty.util.TimerTask
;
import
lombok.ToString
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.commons.lang3.StringUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
org.springframework.beans.BeanUtils
;
import
org.springframework.beans.BeanUtils
;
import
org.springframework.data.redis.core.StringRedisTemplate
;
import
org.springframework.data.redis.core.StringRedisTemplate
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Propagation
;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.transaction.annotation.Transactional
;
import
javax.annotation.Resource
;
import
javax.annotation.Resource
;
...
@@ -329,7 +327,7 @@ public class ApiNodeServiceImpl implements ApiNodeService {
...
@@ -329,7 +327,7 @@ public class ApiNodeServiceImpl implements ApiNodeService {
//当自定义参数不为空时
//当自定义参数不为空时
String
personalise
=
javaTask
.
getPersonalise
();
String
personalise
=
javaTask
.
getPersonalise
();
if
(
StringUtils
.
isNoneBlank
(
personalise
)){
if
(
StringUtils
.
isNoneBlank
(
personalise
)){
JavaJobConfD
to
javaJobConfDto
=
JSON
.
parseObject
(
personalise
,
JavaJobConfDto
.
class
);
JavaJobConfD
TO
javaJobConfDto
=
JSON
.
parseObject
(
personalise
,
JavaJobConfDTO
.
class
);
Long
startTime
=
javaJobConfDto
.
getStartTime
();
Long
startTime
=
javaJobConfDto
.
getStartTime
();
Integer
interval
=
javaJobConfDto
.
getInterval
();
Integer
interval
=
javaJobConfDto
.
getInterval
();
TimeUnit
timeUnit
=
javaJobConfDto
.
getTimeUnit
();
TimeUnit
timeUnit
=
javaJobConfDto
.
getTimeUnit
();
...
...
byit-myth-core/myth-admin-core/src/main/java/com/byit/service/mapservice/impl/JavaTaskAndLogServiceServiceImpl.java
View file @
d0cf908a
package
com
.
byit
.
service
.
mapservice
.
impl
;
package
com
.
byit
.
service
.
mapservice
.
impl
;
import
cn.hutool.core.date.DateUtil
;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.JSON
;
import
com.byit.dto.personalise.JavaJobConfD
to
;
import
com.byit.dto.personalise.JavaJobConfD
TO
;
import
com.byit.dto.plugin.JavaTask
;
import
com.byit.dto.plugin.JavaTask
;
import
com.byit.job.WorkRoulette
;
import
com.byit.job.WorkRoulette
;
import
com.byit.job.utils.CronExpression
;
import
com.byit.job.utils.CronExpression
;
import
com.byit.model.RunRecording
;
import
com.byit.service.JavaTaskService
;
import
com.byit.service.JavaTaskService
;
import
com.byit.service.mapservice.JavaTaskAndLogService
;
import
com.byit.service.mapservice.JavaTaskAndLogService
;
import
com.byit.task.JavaTaskJobTask
;
import
com.byit.task.JavaTaskJobTask
;
...
@@ -38,7 +36,7 @@ public class JavaTaskAndLogServiceServiceImpl implements JavaTaskAndLogService {
...
@@ -38,7 +36,7 @@ public class JavaTaskAndLogServiceServiceImpl implements JavaTaskAndLogService {
BeanUtils
.
copyProperties
(
javaTask
,
updateJavaTask
);
BeanUtils
.
copyProperties
(
javaTask
,
updateJavaTask
);
String
personalise
=
javaTask
.
getPersonalise
();
String
personalise
=
javaTask
.
getPersonalise
();
if
(
StringUtils
.
isNotBlank
(
personalise
)){
if
(
StringUtils
.
isNotBlank
(
personalise
)){
JavaJobConfD
to
javaJobConfDto
=
JSON
.
parseObject
(
personalise
,
JavaJobConfDto
.
class
);
JavaJobConfD
TO
javaJobConfDto
=
JSON
.
parseObject
(
personalise
,
JavaJobConfDTO
.
class
);
Integer
interval
=
javaJobConfDto
.
getInterval
();
Integer
interval
=
javaJobConfDto
.
getInterval
();
TimeUnit
timeUnit
=
javaJobConfDto
.
getTimeUnit
();
TimeUnit
timeUnit
=
javaJobConfDto
.
getTimeUnit
();
//使用默认的毫秒级别
//使用默认的毫秒级别
...
...
byit-myth-core/myth-dto-core/src/main/java/com/byit/dto/personalise/JavaJobConfD
to
.java
→
byit-myth-core/myth-dto-core/src/main/java/com/byit/dto/personalise/JavaJobConfD
TO
.java
View file @
d0cf908a
...
@@ -14,7 +14,7 @@ import java.util.concurrent.TimeUnit;
...
@@ -14,7 +14,7 @@ import java.util.concurrent.TimeUnit;
@Data
@Data
@AllArgsConstructor
@AllArgsConstructor
@NoArgsConstructor
@NoArgsConstructor
public
class
JavaJobConfD
to
implements
Serializable
{
public
class
JavaJobConfD
TO
implements
Serializable
{
private
static
final
long
serialVersionUID
=
-
8854344978247302329L
;
private
static
final
long
serialVersionUID
=
-
8854344978247302329L
;
/**
/**
* 任务的开始时间
* 任务的开始时间
...
...
byit-myth-core/myth-dto-core/src/main/java/com/byit/dto/plugin/JavaTask.java
View file @
d0cf908a
package
com
.
byit
.
dto
.
plugin
;
package
com
.
byit
.
dto
.
plugin
;
import
com.byit.dto.personalise.JavaJobConfD
to
;
import
com.byit.dto.personalise.JavaJobConfD
TO
;
import
lombok.AllArgsConstructor
;
import
lombok.AllArgsConstructor
;
import
lombok.Data
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
import
lombok.NoArgsConstructor
;
...
@@ -92,7 +92,7 @@ public class JavaTask implements Serializable {
...
@@ -92,7 +92,7 @@ public class JavaTask implements Serializable {
private
String
delMark
;
private
String
delMark
;
/**
/**
* 个性化配置 json {@link JavaJobConfD
to
}
* 个性化配置 json {@link JavaJobConfD
TO
}
*/
*/
private
String
personalise
;
private
String
personalise
;
...
...
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