fix

yaoliyc · May 13, 2016 · a662b56 · a662b56
1 parent 8760c49
commit a662b56
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/lts-core/src/main/java/com/github/ltsopensource/core/support/JobDomainConverter.java b/lts-core/src/main/java/com/github/ltsopensource/core/support/JobDomainConverter.java
@@ -53,7 +53,11 @@ public static JobPo convert(Job job) {
         // 设置JobType
         if (job.isCron()) {
             jobPo.setJobType(JobType.CRON);
+            jobPo.setCronExpression(job.getCronExpression());
         } else if (job.isRepeatable()) {
+            jobPo.setCronExpression(null);
+            jobPo.setRepeatInterval(job.getRepeatInterval());
+            jobPo.setInternalExtParam(Constants.FIRST_FIRE_TIME, String.valueOf(jobPo.getTriggerTime()));
             jobPo.setJobType(JobType.REPEAT);
         } else if (job.getTriggerTime() == null) {
             jobPo.setJobType(JobType.REAL_TIME);
@@ -63,7 +67,6 @@ public static JobPo convert(Job job) {
 
         jobPo.setExtParams(job.getExtParams());
         jobPo.setNeedFeedback(job.isNeedFeedback());
-        jobPo.setCronExpression(job.getCronExpression());
         jobPo.setMaxRetryTimes(job.getMaxRetryTimes());
         jobPo.setRelyOnPrevCycle(job.isRelyOnPrevCycle());
         jobPo.setRepeatCount(job.getRepeatCount());
@@ -74,11 +77,6 @@ public static JobPo convert(Job job) {
                 jobPo.setTriggerTime(job.getTriggerTime());
             }
         }
-        if (job.getRepeatCount() != 0) {
-            jobPo.setCronExpression(null);
-            jobPo.setRepeatInterval(job.getRepeatInterval());
-            jobPo.setInternalExtParam(Constants.FIRST_FIRE_TIME, String.valueOf(jobPo.getTriggerTime()));
-        }
         return jobPo;
     }