Pre Merge pull request !94 from Hitler_man/1.3.0-beta1
This commit is contained in:
commit
97abf52da4
@ -151,8 +151,6 @@ public class JobServiceImpl implements JobService {
|
|||||||
% systemProperties.getBucketTotal());
|
% systemProperties.getBucketTotal());
|
||||||
job.setNextTriggerAt(calculateNextTriggerAt(jobRequestVO, DateUtils.toNowMilli()));
|
job.setNextTriggerAt(calculateNextTriggerAt(jobRequestVO, DateUtils.toNowMilli()));
|
||||||
job.setNamespaceId(UserSessionUtils.currentUserSession().getNamespaceId());
|
job.setNamespaceId(UserSessionUtils.currentUserSession().getNamespaceId());
|
||||||
job.setNotifyIds(JsonUtil.toJsonString(jobRequestVO.getNotifyIds()));
|
|
||||||
job.setOwnerId(jobRequestVO.getOwnerId());
|
|
||||||
job.setId(null);
|
job.setId(null);
|
||||||
return 1 == jobMapper.insert(job);
|
return 1 == jobMapper.insert(job);
|
||||||
}
|
}
|
||||||
@ -166,8 +164,6 @@ public class JobServiceImpl implements JobService {
|
|||||||
|
|
||||||
// 判断常驻任务
|
// 判断常驻任务
|
||||||
Job updateJob = JobConverter.INSTANCE.convert(jobRequestVO);
|
Job updateJob = JobConverter.INSTANCE.convert(jobRequestVO);
|
||||||
updateJob.setNotifyIds(JsonUtil.toJsonString(jobRequestVO.getNotifyIds()));
|
|
||||||
updateJob.setOwnerId(jobRequestVO.getOwnerId());
|
|
||||||
updateJob.setResident(isResident(jobRequestVO));
|
updateJob.setResident(isResident(jobRequestVO));
|
||||||
updateJob.setNamespaceId(job.getNamespaceId());
|
updateJob.setNamespaceId(job.getNamespaceId());
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user