Commit d0cf908a by huangfusuper

修改类名

parent e260687e
...@@ -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.JavaJobConfDto; import com.byit.dto.personalise.JavaJobConfDTO;
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)){
JavaJobConfDto javaJobConfDto = JSON.parseObject(personalise, JavaJobConfDto.class); JavaJobConfDTO 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();
......
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.JavaJobConfDto; import com.byit.dto.personalise.JavaJobConfDTO;
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)){
JavaJobConfDto javaJobConfDto = JSON.parseObject(personalise, JavaJobConfDto.class); JavaJobConfDTO javaJobConfDto = JSON.parseObject(personalise, JavaJobConfDTO.class);
Integer interval = javaJobConfDto.getInterval(); Integer interval = javaJobConfDto.getInterval();
TimeUnit timeUnit = javaJobConfDto.getTimeUnit(); TimeUnit timeUnit = javaJobConfDto.getTimeUnit();
//使用默认的毫秒级别 //使用默认的毫秒级别
......
...@@ -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 JavaJobConfDto implements Serializable { public class JavaJobConfDTO implements Serializable {
private static final long serialVersionUID = -8854344978247302329L; private static final long serialVersionUID = -8854344978247302329L;
/** /**
* 任务的开始时间 * 任务的开始时间
......
package com.byit.dto.plugin; package com.byit.dto.plugin;
import com.byit.dto.personalise.JavaJobConfDto; import com.byit.dto.personalise.JavaJobConfDTO;
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 JavaJobConfDto} * 个性化配置 json {@link JavaJobConfDTO}
*/ */
private String personalise; private String personalise;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment