lyhzzz 1 년 전
부모
커밋
24333e56c7
2개의 변경된 파일28개의 추가작업 그리고 10개의 파일을 삭제
  1. 15 7
      src/main/java/com/fdkankan/mqcontroller/task/TaskController.java
  2. 13 3
      src/main/java/com/fdkankan/mqcontroller/task/TaskService.java

+ 15 - 7
src/main/java/com/fdkankan/mqcontroller/task/TaskController.java

@@ -14,15 +14,23 @@ public class TaskController {
     @Autowired
     TaskService taskService;
 
-    /**
-     * 将数据库中待计算的mq消息推送,rabbitmq
-     */
-    @Scheduled(initialDelay = 2000,fixedDelay = 1000 * 60 )
-    public void taskSendMq(){
+
+    @Scheduled(cron = "*/60 * * * * ?") // 每60秒执行一次(使用cron表达式)
+    public void runTask(){
+        try {
+            taskService.runTask();
+        }catch (Exception e){
+            log.info("runTask:",e);
+        }
+    }
+
+
+    @Scheduled(cron = "*/20 * * * * ?") // 每20秒执行一次(使用cron表达式)
+    public void checkEcs(){
         try {
-            taskService.sendMq();
+            taskService.checkEcs();
         }catch (Exception e){
-            log.info("taskSendMq执行失败:",e);
+            log.info("checkEcs:",e);
         }
     }
 

+ 13 - 3
src/main/java/com/fdkankan/mqcontroller/task/TaskService.java

@@ -58,6 +58,18 @@ public class TaskService {
 
     public static HashMap<String,Integer> countMap = new HashMap<>();
 
+    public void runTask() {
+        sendMq();
+        checkDelEcs();
+    }
+
+    public void checkEcs() {
+        openEcsList();
+        delEcsList();
+    }
+    /**
+     * 将数据库中待计算的mq消息推送,rabbitmq
+     */
     public void sendMq() {
         checkCount();
         List<MqSendLog> mqSendLogs = mqSendLogService.getNoSendMsg();
@@ -121,9 +133,7 @@ public class TaskService {
             }
             sendRabbitMq(msgList,mqMsg.getConsumers() - mqMsg.getMessages_unacknowledged() - mqMsg.getMessages_ready(),mqQueueConfig.getQueueName());
         }
-        openEcsList();
-        checkDelEcs();
-        delEcsList();
+
     }
 
     /**