优化定时调度

zhou-hao · zhou-hao · commit c645da058125 · 2018-01-19T00:46:01.000+08:00
diff --git a/hsweb-web-service/hsweb-web-service-api/src/main/java/org/hsweb/web/service/quartz/QuartzJobService.java b/hsweb-web-service/hsweb-web-service-api/src/main/java/org/hsweb/web/service/quartz/QuartzJobService.java
@@ -36,4 +36,7 @@ public interface QuartzJobService extends GenericService<QuartzJob, String> {
     List<Date> getExecTimes(String cron, int number);
 
     Object execute(String id, Map<String,Object> var);
+
+
+    Object executeNoTx(String id, Map<String,Object> var);
 }
diff --git a/hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/quartz/QuartzJobServiceImpl.java b/hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/quartz/QuartzJobServiceImpl.java
@@ -44,6 +44,7 @@
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.Assert;
 
@@ -167,8 +168,18 @@ public interface JobHelper {
     }
 
     @Override
-    @Transactional
+    @Transactional(propagation = Propagation.NOT_SUPPORTED)
+    public Object executeNoTx(String id, Map<String, Object> var) {
+        return doExecute(id, var);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
     public Object execute(String id, Map<String, Object> var) {
+        return doExecute(id, var);
+    }
+
+    protected Object doExecute(String id, Map<String, Object> var) {
         Assert.notNull(id, "定时任务ID错误");
         QuartzJob job = selectByPk(id);
         Assert.notNull(job, "任务不存在");
diff --git a/hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/quartz/SimpleJob.java b/hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/quartz/SimpleJob.java
@@ -30,10 +30,10 @@
 @DisallowConcurrentExecution
 public class SimpleJob implements Job {
     protected Logger logger = LoggerFactory.getLogger(this.getClass());
-    protected QuartzJobService        quartzJobService;
+    protected QuartzJobService quartzJobService;
     protected QuartzJobHistoryService quartzJobHistoryService;
-    protected Map<String, Object>     defaultVar;
-    protected User                    defaultUser;
+    protected Map<String, Object> defaultVar;
+    protected User defaultUser;
 
     /**
      * 子类必须实现此构造方法，否则无法创建任务
@@ -52,11 +52,16 @@ public void execute(JobExecutionContext context) throws JobExecutionException {
             WebUtil.setCurrentUser(defaultUser);
             JobDataMap jobDataMap = context.getJobDetail().getJobDataMap();
             String id = jobDataMap.getString(SimpleJobFactory.QUARTZ_ID_KEY);
+            boolean tx = jobDataMap.getBooleanFromString("tx");
             Map<String, Object> var = getVar();
             var.put("context", context);
             var.put("user", defaultUser);
             try {
-                quartzJobService.execute(id, var);
+                if (tx) {
+                    quartzJobService.execute(id, var);
+                } else {
+                    quartzJobService.executeNoTx(id, var);
+                }
             } catch (Throwable e) {
                 throw new JobExecutionException(e);
             }
diff --git a/hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/quartz/SimpleJobFactory.java b/hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/quartz/SimpleJobFactory.java
@@ -41,7 +41,7 @@
 public class SimpleJobFactory implements JobFactory {
 
     public static final String QUARTZ_ID_KEY = "quartz.id";
-    protected           Logger logger        = LoggerFactory.getLogger(this.getClass());
+    protected Logger logger = LoggerFactory.getLogger(this.getClass());
     @Resource
     private QuartzJobService quartzJobService;
 
@@ -62,6 +62,8 @@ public class SimpleJobFactory implements JobFactory {
     @Autowired(required = false)
     private Map<String, ExpressionScopeBean> expressionScopeBeanMap;
 
+    private User user;
+
     @Override
     public Job newJob(TriggerFiredBundle bundle, Scheduler scheduler) throws SchedulerException {
         Map<String, Object> data = bundle.getJobDetail().getJobDataMap();
@@ -70,16 +72,20 @@ public Job newJob(TriggerFiredBundle bundle, Scheduler scheduler) throws Schedul
             String id = (String) data.get(QUARTZ_ID_KEY);
             Assert.notNull(id);
             try {
-                SimpleJob job = (SimpleJob) jobClass.getConstructor(QuartzJobService.class, QuartzJobHistoryService.class).newInstance(quartzJobService, quartzJobHistoryService);
+                SimpleJob job = (SimpleJob) jobClass.getConstructor(QuartzJobService.class, QuartzJobHistoryService.class)
+                        .newInstance(quartzJobService, quartzJobHistoryService);
                 String username = configService.get("quartz", "executeUserName", "admin");
-                User user = userService.selectByUserName(username);
-                if (user != null) {
-                    user.initRoleInfo();
-                    job.setDefaultUser(user);
-                } else {
-                    //未找到用户名
-                    logger.warn("job executor user:{} not found!", username);
+                if (user == null || !user.getUsername().equals(username)) {
+                    user = userService.selectByUserName(username);
+                    if (user != null) {
+                        user.initRoleInfo();
+                        job.setDefaultUser(user);
+                    } else {
+                        //未找到用户名
+                        logger.warn("job executor user:{} not found!", username);
+                    }
                 }
+
                 Map<String, Object> var = new HashMap<>();
                 if (expressionScopeBeanMap != null)
                     var.putAll(expressionScopeBeanMap);

Original file line number	Diff line number	Diff line change
`@@ -36,4 +36,7 @@ public interface QuartzJobService extends GenericService<QuartzJob, String> {`
`36`	`36`	`List<Date> getExecTimes(String cron, int number);`
`37`	`37`
`38`	`38`	`Object execute(String id, Map<String,Object> var);`
	`39`	`+`
	`40`	`+`
	`41`	`+ Object executeNoTx(String id, Map<String,Object> var);`
`39`	`42`	`}`