From 0d3a1094a984088ffcf6befd7ebf06929419dd7d Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 08 一月 2025 10:09:45 +0800
Subject: [PATCH] #

---
 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/ActionService.java          |    2 ++
 zy-acs-manager/src/main/resources/mapper/manager/ActionMapper.xml                           |    9 +++++++++
 zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/KernelScheduler.java         |    2 +-
 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/mapper/ActionMapper.java            |    2 ++
 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/ActionServiceImpl.java |    5 +++++
 5 files changed, 19 insertions(+), 1 deletions(-)

diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/KernelScheduler.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/KernelScheduler.java
index 79e4062..c3fa97f 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/KernelScheduler.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/KernelScheduler.java
@@ -134,7 +134,7 @@
                 try {
                     Thread.sleep(CORE_SCAN_FREQUENCY_MILLISECOND);
 
-                    List<String> actionGroupIds = actionService.selectPrepareGroup();
+                    List<String> actionGroupIds = actionService.selectGroupNo(ActionStsType.PREPARE);
                     for (String actionGroupId : actionGroupIds) {
                         mainService.publishAction(actionGroupId);
                     }
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/mapper/ActionMapper.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/mapper/ActionMapper.java
index fbade3c..56e7903 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/mapper/ActionMapper.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/mapper/ActionMapper.java
@@ -15,6 +15,8 @@
 
     List<Map<String, Object>> selectCountGroupByType();
 
+    List<String> selectGroupNo(@Param("actionSts") Long actionSts);
+
     List<String> selectPrepareGroup();
 
     List<Long> selectTaskIdsByGroupId(@Param("groupId") String groupId);
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/ActionService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/ActionService.java
index ab25e0d..f3c28bb 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/ActionService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/ActionService.java
@@ -15,6 +15,8 @@
 
     List<Map<String, Object>> selectCountGroupByType();
 
+    List<String> selectGroupNo(ActionStsType actionStsType);
+
     List<String> selectPrepareGroup();
 
     List<Long> selectTaskIdsByGroupId(String groupId);
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/ActionServiceImpl.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/ActionServiceImpl.java
index b65be67..f444dce 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/ActionServiceImpl.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/ActionServiceImpl.java
@@ -36,6 +36,11 @@
     }
 
     @Override
+    public List<String> selectGroupNo(ActionStsType actionStsType) {
+        return this.baseMapper.selectGroupNo(actionStsType.val());
+    }
+
+    @Override
     public List<String> selectPrepareGroup() {
         return this.baseMapper.selectPrepareGroup();
     }
diff --git a/zy-acs-manager/src/main/resources/mapper/manager/ActionMapper.xml b/zy-acs-manager/src/main/resources/mapper/manager/ActionMapper.xml
index fa68274..f86b28a 100644
--- a/zy-acs-manager/src/main/resources/mapper/manager/ActionMapper.xml
+++ b/zy-acs-manager/src/main/resources/mapper/manager/ActionMapper.xml
@@ -65,6 +65,15 @@
         ORDER BY count DESC
     </select>
 
+    <select id="selectGroupNo" resultType="java.lang.String">
+        SELECT group_id
+        FROM man_action
+        WHERE 1=1
+        AND action_sts = #{actionSts}
+        AND group_id IS NOT NULL
+        GROUP BY group_id
+    </select>
+
     <select id="selectPrepareGroup" resultType="java.lang.String">
         SELECT ma.group_id
         FROM man_action ma

--
Gitblit v1.9.1