定时任务调用逻辑修改

monitor-spring-boot-starter/src/main/java/com/hxuanyu/monitor/base/BaseMonitorItem.java

@@ -10,10 +10,11 @@ import com.hxuanyu.monitor.common.CheckResult;
  * @version 1.0
  */
 public abstract class BaseMonitorItem {
-    private String monitorItemName;
+    protected String monitorItemName;
-    private String cron;
+    protected String cron;
 
     public BaseMonitorItem() {
+
     }
 
     public BaseMonitorItem(String monitorItemName, String cron) {
@@ -21,6 +22,11 @@ public abstract class BaseMonitorItem {
         this.cron = cron;
     }
 
+    public BaseMonitorItem(String cron) {
+        this.monitorItemName = getClass().getSimpleName();
+        this.cron = cron;
+    }
+
     public String getMonitorItemName() {
         return monitorItemName;
     }

monitor-spring-boot-starter/src/main/java/com/hxuanyu/monitor/manager/MonitorItemBeanManager.java

@@ -1,6 +1,7 @@
 package com.hxuanyu.monitor.manager;
 
 import com.hxuanyu.common.message.Msg;
+import com.hxuanyu.common.spring.SpringContextUtil;
 import com.hxuanyu.monitor.annotation.MonitorItem;
 import com.hxuanyu.monitor.base.BaseMonitorItem;
 import com.hxuanyu.monitor.common.CheckResult;
@@ -78,6 +79,15 @@ public class MonitorItemBeanManager implements ApplicationListener<ContextRefres
         return Msg.success("添加成功");
     }
 
+    public Msg<String> addMonitorTask(String itemName, Class<? extends BaseMonitorItem> clazz, Object... args) {
+        BaseMonitorItem item = SpringContextUtil.registerBean(itemName, clazz, args);
+        return addMonitorTask(item);
+    }
+
+    public Msg<String> addMonitorTask(Class<? extends BaseMonitorItem> clazz, Object... args) {
+        return addMonitorTask(clazz.getSimpleName(), clazz, args);
+    }
+
     public Msg<String> setMonitorTaskCron(String taskId, String cron) {
         if (MONITOR_ITEM_MAP.containsKey(taskId)) {
             schedulingConfigurer.cancelTriggerTask(taskId);
@@ -107,7 +117,7 @@ public class MonitorItemBeanManager implements ApplicationListener<ContextRefres
         schedulingConfigurer.resetTriggerTask(taskId, new TriggerTask(() -> {
             CheckResult checkResult = item.check();
             if (checkResult.isTriggered()) {
-                if (NotifyType.TYPE_CUSTOM.equals(checkResult.getNotifyType())){
+                if (NotifyType.TYPE_CUSTOM.equals(checkResult.getNotifyType())) {
                     logger.info("定时任务[{}]触发成功，执行自定义通知", taskId);
                     notifyService.notify(checkResult.getCustomNotify());
                 } else {

test/src/main/java/com/hxuanyu/test/controller/MonitorTestController.java

@@ -2,9 +2,10 @@ package com.hxuanyu.test.controller;
 
 import com.hxuanyu.common.message.Msg;
 import com.hxuanyu.monitor.base.BaseMonitorItem;
-import com.hxuanyu.monitor.common.CheckResult;
 import com.hxuanyu.monitor.manager.MonitorItemBeanManager;
-import com.hxuanyu.notify.enums.NotifyType;
+import com.hxuanyu.test.monitor.TestMonitorItem;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -21,6 +22,7 @@ import java.util.Map;
 @RequestMapping("/monitor")
 @RestController
 public class MonitorTestController {
+    private final Logger logger = LoggerFactory.getLogger(MonitorTestController.class);
 
     @Resource
     MonitorItemBeanManager monitorItemBeanManager;
@@ -49,12 +51,7 @@ public class MonitorTestController {
 
     @PostMapping("/")
     public Msg<String> addTaskList() {
-        return monitorItemBeanManager.addMonitorTask(new BaseMonitorItem("CustomBean", "0/10 * * * * *") {
+        return monitorItemBeanManager.addMonitorTask(TestMonitorItem.class, "0/5 * * * * *");
-            @Override
-            public CheckResult check() {
-                return CheckResult.triggered("动态新增通知", NotifyType.TYPE_LOG);
-            }
-        });
     }
 
 

test/src/main/java/com/hxuanyu/test/monitor/TestMonitorItem.java

@@ -14,14 +14,21 @@ import org.slf4j.LoggerFactory;
  *
  * @author hxuanyu
  */
-@MonitorItem(cron = "0/20 * * * * *")
 public class TestMonitorItem extends BaseMonitorItem {
 
     private final Logger logger = LoggerFactory.getLogger(TestMonitorItem.class);
 
+    public TestMonitorItem(String monitorItemName, String cron) {
+        super(monitorItemName, cron);
+    }
+
+    public TestMonitorItem(String cron) {
+        super(cron);
+    }
+
+
     @Override
     public CheckResult check() {
-
         double random = Math.random();
         int result = (int) (random * NotifyType.values().length);
         logger.info("随机索引值：{}", result);

test/src/test/java/com/hxuanyu/starter/test/monitor/MonitorTest.java

@@ -19,7 +19,9 @@ public class MonitorTest {
     @Test
     public void testMonitorItemScan() {
         BaseMonitorItem testMonitorItem = monitorItemBeanManager.getMonitorItemMap().get("ScheduledTask-TestMonitorItem");
+        if (testMonitorItem != null){
             assert testMonitorItem.getMonitorItemName() != null;
             logger.info("获取到的Bean：{}", testMonitorItem.toString());
         }
+    }
 }