From edfe19c9534ef566feb914ab4b1fe559cd669e2f Mon Sep 17 00:00:00 2001
From: 18616268358 <1440265357@qq.com>
Date: Wed, 24 May 2023 18:34:21 +0800
Subject: [PATCH] =?UTF-8?q?#20230510=20=E6=AC=A3=E5=BD=B1=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=B9=B3=E5=8F=B0=E8=A3=85=E7=BD=AE=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mappers/RequestResultsDao.xml   | 18 ++++++------
 .../timeTask/ScheduledTask.java               | 29 +++++++++++++++++++
 .../timeTask/TerminalTime/TerminalTask.java   | 27 +++++++++++++++++
 .../impl/TerminalScheduleRuleServiceImpl.java |  2 +-
 .../service/TerminalScheduleRuleService.java  |  6 ++++
 5 files changed, 72 insertions(+), 10 deletions(-)
 create mode 100644 xymanager_framework/src/main/java/com/shxy/xymanager_framework/timeTask/ScheduledTask.java
 create mode 100644 xymanager_framework/src/main/java/com/shxy/xymanager_framework/timeTask/TerminalTime/TerminalTask.java

diff --git a/xymanager_dao/src/main/resources/mappers/RequestResultsDao.xml b/xymanager_dao/src/main/resources/mappers/RequestResultsDao.xml
index 40c57e8..626af2e 100644
--- a/xymanager_dao/src/main/resources/mappers/RequestResultsDao.xml
+++ b/xymanager_dao/src/main/resources/mappers/RequestResultsDao.xml
@@ -32,15 +32,15 @@
         where request_id = #{requestId}
     </select>
 
-<!--    <select id="selectByTypeAndStatus" resultMap="BaseResultMap">-->
-<!--        select-->
-<!--        <include refid="Base_Column_List"/>-->
-<!--        from request_results-->
-<!--        where request_type = #{requesttype}-->
-<!--        and client_id = #{clientid}-->
-<!--        and result = #{result}-->
-<!--        and request_schedule_status = #{schedulestatus}-->
-<!--    </select>-->
+    <select id="selectByTypeAndStatus" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from request_results
+        where request_type = #{requesttype}
+        and client_id = #{clientid}
+        and result = #{result}
+        and request_schedule_status = #{schedulestatus}
+    </select>
 
     <select id="selectByRequestIdList" resultMap="BaseResultMap">
         select
diff --git a/xymanager_framework/src/main/java/com/shxy/xymanager_framework/timeTask/ScheduledTask.java b/xymanager_framework/src/main/java/com/shxy/xymanager_framework/timeTask/ScheduledTask.java
new file mode 100644
index 0000000..1d68ec3
--- /dev/null
+++ b/xymanager_framework/src/main/java/com/shxy/xymanager_framework/timeTask/ScheduledTask.java
@@ -0,0 +1,29 @@
+package com.shxy.xymanager_framework.timeTask;
+
+import com.shxy.xymanager_framework.timeTask.TerminalTime.TerminalTask;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author CY
+ * @date 2021-01-27 15:06
+ */
+@Component
+@EnableScheduling
+@Slf4j
+public class ScheduledTask {
+
+    @Autowired
+    private TerminalTask terminalTask;
+
+
+    @Scheduled(cron = "0 0/2 * * * ?")
+    private void terminalTask() {
+        log.info("我进来了");
+        terminalTask.execute();
+    }
+
+}
diff --git a/xymanager_framework/src/main/java/com/shxy/xymanager_framework/timeTask/TerminalTime/TerminalTask.java b/xymanager_framework/src/main/java/com/shxy/xymanager_framework/timeTask/TerminalTime/TerminalTask.java
new file mode 100644
index 0000000..840cb6b
--- /dev/null
+++ b/xymanager_framework/src/main/java/com/shxy/xymanager_framework/timeTask/TerminalTime/TerminalTask.java
@@ -0,0 +1,27 @@
+package com.shxy.xymanager_framework.timeTask.TerminalTime;
+
+import com.shxy.xymanager_service.service.TerminalScheduleRuleService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author Bobi_huo
+ * @date 2020-12-22 15:12
+ */
+@Slf4j
+@Component("TerminalTask")
+public class TerminalTask {
+
+    @Autowired
+    TerminalScheduleRuleService terminalScheduleRuleService;
+    /**
+     * 下发结束
+     */
+    public void execute() {
+        terminalScheduleRuleService.timerscheckScheldule();
+        log.info("-- >>> 下发结束");
+    }
+
+
+}
diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalScheduleRuleServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalScheduleRuleServiceImpl.java
index 84ddf7b..d677d0a 100644
--- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalScheduleRuleServiceImpl.java
+++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalScheduleRuleServiceImpl.java
@@ -417,7 +417,7 @@ public class TerminalScheduleRuleServiceImpl implements TerminalScheduleRuleServ
 
 
     /*定时任务查询下发*/
-    public ServiceBody<String> TimerscheckScheldule() {
+    public ServiceBody<String> timerscheckScheldule() {
         /*
          * 当定时任务或者用户主动查询下发状态时
          * */
diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalScheduleRuleService.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalScheduleRuleService.java
index c8bdafd..aa4dfde 100644
--- a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalScheduleRuleService.java
+++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalScheduleRuleService.java
@@ -84,4 +84,10 @@ public interface TerminalScheduleRuleService {
      * @return
      */
     ServiceBody<TerminalScheduleRuleTimeListModel> getCmaSchelduleDetials(RequestIdVo vo);
+
+    /**
+     * 下发任务
+     * @return
+     */
+    ServiceBody<String> timerscheckScheldule();
 }