From 5d8b110ef1fb587a95516a96cbdf4951ad4a9f0c Mon Sep 17 00:00:00 2001
From: zhangheng <3226558941@qq.com>
Date: Mon, 27 May 2024 18:21:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SubscribeMessageSendDataServiceImpl.java  |  3 ++
 .../mapper/homepage/HomePageMapper.xml        | 18 ++++++-----
 .../MessageSubscriptionController.java        | 30 +++++++++++++++++++
 .../com/xinelu/quartz/task/SubscribeTask.java |  2 +-
 4 files changed, 45 insertions(+), 8 deletions(-)
 create mode 100644 postdischarge-quartz/src/main/java/com/xinelu/quartz/controller/MessageSubscriptionController.java

diff --git a/postdischarge-mobile/src/main/java/com/xinelu/mobile/service/subscribemessagesendrecord/impl/SubscribeMessageSendDataServiceImpl.java b/postdischarge-mobile/src/main/java/com/xinelu/mobile/service/subscribemessagesendrecord/impl/SubscribeMessageSendDataServiceImpl.java
index b91e6e43..5b715c6c 100644
--- a/postdischarge-mobile/src/main/java/com/xinelu/mobile/service/subscribemessagesendrecord/impl/SubscribeMessageSendDataServiceImpl.java
+++ b/postdischarge-mobile/src/main/java/com/xinelu/mobile/service/subscribemessagesendrecord/impl/SubscribeMessageSendDataServiceImpl.java
@@ -37,6 +37,9 @@ public class SubscribeMessageSendDataServiceImpl implements SubscribeMessageSend
     public void subscribeMessageSendDataTask() {
         List<PatientVO> patient = homePageMapper.selectResidentAndSubscribeMessageRecord(SubscribeStatusEnum.accept.getValue(), weChatAppletChatConfig.getSignTemplateId());
         List<Long> collect = patient.stream().filter(Objects::nonNull).map(PatientVO::getPatientId).filter(Objects::nonNull).collect(Collectors.toList());
+        if (CollectionUtils.isEmpty(collect)) {
+            return;
+        }
         List<PatientVO> signPatientManageRouteNodes = homePageMapper.selectSignPatientManageRouteNode(collect);
         List<PatientVO> patientVOS = new ArrayList<>();
         for (PatientVO signPatientManageRouteNode : signPatientManageRouteNodes) {
diff --git a/postdischarge-mobile/src/main/resources/mapper/homepage/HomePageMapper.xml b/postdischarge-mobile/src/main/resources/mapper/homepage/HomePageMapper.xml
index 576322be..daca4435 100644
--- a/postdischarge-mobile/src/main/resources/mapper/homepage/HomePageMapper.xml
+++ b/postdischarge-mobile/src/main/resources/mapper/homepage/HomePageMapper.xml
@@ -116,17 +116,21 @@
         spmrn.task_subdivision,
         spmrn.applet_push_sign,
         spmrn.node_content,
-        spmrn.node_execute_status
+        spmrn.node_execute_status,
+        spmr.patient_id
         from sign_patient_manage_route_node spmrn
         LEFT JOIN sign_patient_manage_route spmr ON spmr.id = spmrn.manage_route_id
         LEFT JOIN patient_info pi ON pi.id = spmr.patient_id
         <where>
-            spmr.patient_id in
-            <foreach item="patientId" collection="patientId" open="(" separator="," close=")">
-                #{patientId}
-            </foreach>
-            and node_execute_status = 'UNEXECUTED'
-            and del_flag = 0
+            <if test="patientId != null and patientId.size() > 0">
+                spmr.patient_id in
+                <foreach item="patientId" collection="patientId" open="(" separator="," close=")">
+                    #{patientId}
+                </foreach>
+            </if>
+            and spmrn.node_execute_status = 'UNEXECUTED'
+            and spmrn.del_flag = 0
+            and pi.del_flag = 0
         </where>
     </select>
 </mapper>
\ No newline at end of file
diff --git a/postdischarge-quartz/src/main/java/com/xinelu/quartz/controller/MessageSubscriptionController.java b/postdischarge-quartz/src/main/java/com/xinelu/quartz/controller/MessageSubscriptionController.java
new file mode 100644
index 00000000..0904226d
--- /dev/null
+++ b/postdischarge-quartz/src/main/java/com/xinelu/quartz/controller/MessageSubscriptionController.java
@@ -0,0 +1,30 @@
+package com.xinelu.quartz.controller;
+
+import com.xinelu.quartz.task.SubscribeTask;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * 消息推送
+ *
+ * @author xinelu
+ */
+@RestController
+@RequestMapping("/monitor/messageSubscription")
+public class MessageSubscriptionController {
+
+    @Resource
+    private SubscribeTask subscribeTask;
+
+
+    /**
+     * 手动执行专病路径定时任务
+     */
+    @GetMapping("/signPatientManageRouteNode")
+    public void signPatientManageRouteNode() {
+        subscribeTask.automaticSendSignPatientManageRouteNodeTask();
+    }
+}
diff --git a/postdischarge-quartz/src/main/java/com/xinelu/quartz/task/SubscribeTask.java b/postdischarge-quartz/src/main/java/com/xinelu/quartz/task/SubscribeTask.java
index 92782468..f7becbd3 100644
--- a/postdischarge-quartz/src/main/java/com/xinelu/quartz/task/SubscribeTask.java
+++ b/postdischarge-quartz/src/main/java/com/xinelu/quartz/task/SubscribeTask.java
@@ -21,7 +21,7 @@ public class SubscribeTask {
     /**
      * 签约患者管理任务路径节点消息推送定时任务，每10分钟执行一次
      */
-    public void automaticSendGoodsOrderTask() {
+    public void automaticSendSignPatientManageRouteNodeTask() {
         log.info("开始执行签约患者管理任务路径节点推送定时任务......");
         subscribeTaskService.signPatientManageRouteNodeTask();
         log.info("完成订阅签约患者管理任务路径节点推送定时任务......");