Merge remote-tracking branch 'origin/master'

quartz/src/main/java/com/foreverwin/mesnac/quartz/job/AnomalyJob.java

@@ -2,11 +2,11 @@ package com.foreverwin.mesnac.quartz.job;
 
 import com.foreverwin.mesnac.anomaly.service.AnomalyJobService;
 import com.foreverwin.mesnac.common.util.StringUtil;
-import com.foreverwin.modular.core.exception.BaseException;
 import org.quartz.DisallowConcurrentExecution;
 import org.quartz.Job;
 import org.quartz.JobExecutionContext;
-import org.quartz.JobExecutionException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 
 /**
@@ -19,17 +19,20 @@ public class AnomalyJob implements Job {
     private static final String SITE_UPPERCASE = "SITE";
     private static final String SITE_LOWERCASE = "site";
 
+    private Logger logger = LoggerFactory.getLogger(AnomalyJob.class);
+
     @Autowired
     private AnomalyJobService anomalyJobService;
 
     @Override
-    public void execute(JobExecutionContext context) throws JobExecutionException {
+    public void execute(JobExecutionContext context) {
+        logger.info("异常定时任务开始执行");
         //获取站点，若站点为空则抛出异常
         String site = getSite(context);
         if (StringUtil.isBlank(site)) {
-            throw new BaseException("anomaly.quartz.task.not.site", null);
+            logger.error("异常定时任务未配置站点参数！");
+            return;
         }
-
         anomalyJobService.anomalyJobProcess(site);
     }
 

quartz/src/main/java/com/foreverwin/mesnac/quartz/job/ProdUnReadySendMsgJob.java

@@ -7,6 +7,8 @@ import org.quartz.DisallowConcurrentExecution;
 import org.quartz.Job;
 import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 
 /**
@@ -19,17 +21,19 @@ public class ProdUnReadySendMsgJob implements Job {
     private static final String SITE_UPPERCASE = "SITE";
     private static final String SITE_LOWERCASE = "site";
 
+    private Logger logger = LoggerFactory.getLogger(ProdUnReadySendMsgJob.class);
     @Autowired
     private ProdReadyTaskService prodReadyTaskService;
 
     @Override
-    public void execute(JobExecutionContext context) throws JobExecutionException {
+    public void execute(JobExecutionContext context) {
+        logger.info("生产准备发送信息定时任务开始执行");
         //获取站点，若站点为空则抛出异常
         String site = getSite(context);
         if (StringUtil.isBlank(site)) {
-            throw new BaseException("anomaly.quartz.task.not.site", null);
+            logger.error("生产准备发送信息定时任务未配置站点参数！");
+            return;
         }
-
         prodReadyTaskService.sendMsgJob(site);
     }
 

quartz/src/main/java/com/foreverwin/mesnac/quartz/job/ResourceInspectTaskJob.java

@@ -2,12 +2,9 @@ package com.foreverwin.mesnac.quartz.job;
 
 import com.foreverwin.mesnac.common.util.StringUtil;
 import com.foreverwin.mesnac.equip.service.ResourceInspectTaskJobService;
-import com.foreverwin.mesnac.equip.service.ResourceInspectTaskService;
-import com.foreverwin.modular.core.exception.BaseException;
 import org.quartz.DisallowConcurrentExecution;
 import org.quartz.Job;
 import org.quartz.JobExecutionContext;
-import org.quartz.JobExecutionException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -28,15 +25,14 @@ public class ResourceInspectTaskJob implements Job {
     private ResourceInspectTaskJobService resourceInspectTaskJobService;
 
     @Override
-    public void execute(JobExecutionContext context) throws JobExecutionException {
+    public void execute(JobExecutionContext context) {
         logger.info("设备点检任务创建定时任务开始执行");
-
         //获取站点，若站点为空则抛出异常
         String site = getSite(context);
         if (StringUtil.isBlank(site)) {
-            throw new BaseException("equip.quartz.task.not.site", null);
+            logger.error("备点检任务创建定时任务没有配置站点参数！");
+            return;
         }
-
         resourceInspectTaskJobService.resourceInspectTaskJobProcess(site);
     }