From ce46a17bc9ce02b68026562beaebc5a53677c364 Mon Sep 17 00:00:00 2001
From: zhangheng <3226558941@qq.com>
Date: Fri, 2 Aug 2024 16:00:14 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=B6=88=E6=81=AF=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SubscribeMessageSendRecordMapper.xml             | 10 ++++++----
 .../service/impl/subscribeTaskServiceImpl.java       | 12 ++----------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/postdischarge-manage/src/main/resources/mapper/manage/subscribemessagesendrecord/SubscribeMessageSendRecordMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/subscribemessagesendrecord/SubscribeMessageSendRecordMapper.xml
index 9586800e..517a6506 100644
--- a/postdischarge-manage/src/main/resources/mapper/manage/subscribemessagesendrecord/SubscribeMessageSendRecordMapper.xml
+++ b/postdischarge-manage/src/main/resources/mapper/manage/subscribemessagesendrecord/SubscribeMessageSendRecordMapper.xml
@@ -235,10 +235,12 @@
     <select id="selectRecordCountByManageRouteNodeIds"
             resultType="com.xinelu.manage.vo.subscribemessagesendrecord.RecordNum">
         select
-        manage_route_node_id,
-        COUNT(1) num
-        from subscribe_message_send_record
-        where manage_route_node_id IN
+        spmrn.id manageRouteNodeId,
+        COUNT(smsr.id) num
+        FROM
+        sign_patient_manage_route_node spmrn
+        LEFT JOIN subscribe_message_send_record smsr ON spmrn.id = smsr.manage_route_node_id
+        where spmrn.id IN
         <foreach item="manageRouteNodeIds" collection="manageRouteNodeIds" open="(" separator="," close=")">
             #{manageRouteNodeIds}
         </foreach>
diff --git a/postdischarge-quartz/src/main/java/com/xinelu/quartz/service/impl/subscribeTaskServiceImpl.java b/postdischarge-quartz/src/main/java/com/xinelu/quartz/service/impl/subscribeTaskServiceImpl.java
index 0ff3f93b..b1082f67 100644
--- a/postdischarge-quartz/src/main/java/com/xinelu/quartz/service/impl/subscribeTaskServiceImpl.java
+++ b/postdischarge-quartz/src/main/java/com/xinelu/quartz/service/impl/subscribeTaskServiceImpl.java
@@ -1,6 +1,5 @@
 package com.xinelu.quartz.service.impl;
 
-import com.alibaba.fastjson2.JSON;
 import com.xinelu.common.config.PushMessageRestrictions;
 import com.xinelu.common.config.WeChatAppletChatConfig;
 import com.xinelu.common.enums.*;
@@ -9,7 +8,6 @@ import com.xinelu.manage.domain.subscribemessagesendrecord.SubscribeMessageSendR
 import com.xinelu.manage.mapper.signpatientmanageroutenode.SignPatientManageRouteNodeMapper;
 import com.xinelu.manage.mapper.subscribemessagesendrecord.SubscribeMessageSendRecordMapper;
 import com.xinelu.manage.vo.subscribemessagesendrecord.RecordNum;
-import com.xinelu.mobile.domain.TemplateContent;
 import com.xinelu.mobile.mapper.homepage.HomePageMapper;
 import com.xinelu.mobile.utils.WeChatOfficialAccountUtils;
 import com.xinelu.mobile.vo.wechatofficialaccountcallback.PatientVO;
@@ -87,9 +85,9 @@ public class subscribeTaskServiceImpl implements SubscribeTaskService {
             }
             boolean before = localDate.isBefore(LocalDate.now()) || localDate.isEqual(LocalDate.now());
             if (before) {
-                long until =localDate.until(LocalDate.now(), ChronoUnit.DAYS);
+                long until = localDate.until(LocalDate.now(), ChronoUnit.DAYS);
                 if (until >= pushMessageRestrictions.getTime()) {
-                    expiredManageRouteNodeIds.add(patientVO.getSignPatientManageRouteNodeId());
+                    expiredManageRouteNodeIds.add(signPatientManageRouteNode.getSignPatientManageRouteNodeId());
                     continue;
                 }
                 signPatientManageRouteNode.setOpenId(patientVO.getOpenId());
@@ -160,12 +158,6 @@ public class subscribeTaskServiceImpl implements SubscribeTaskService {
         //发送失败
         List<Long> failSignPatientManageRouteNodeIds = new ArrayList<>();
         for (PatientVO patientVO : patientVOList) {
-            try {
-                //判断推送内容格式是否符合
-                JSON.parseArray(patientVO.getAppletNodeContent(), TemplateContent.class);
-            } catch (Exception e) {
-                continue;
-            }
             // 开始推送消息
             Integer integer = weChatOfficialAccountUtils.sendAppletTemplateMessage(patientVO);
             SubscribeMessageSendRecord subscribeMessageSendRecord = new SubscribeMessageSendRecord();

From d9a5c415ee4986e24d681cf7e09fb3b762c26d8b Mon Sep 17 00:00:00 2001
From: zhangheng <3226558941@qq.com>
Date: Fri, 2 Aug 2024 16:01:26 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../utils/WeChatOfficialAccountUtils.java     | 25 ++++++++++++-------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/postdischarge-mobile/src/main/java/com/xinelu/mobile/utils/WeChatOfficialAccountUtils.java b/postdischarge-mobile/src/main/java/com/xinelu/mobile/utils/WeChatOfficialAccountUtils.java
index 5bc31629..4e7fc945 100644
--- a/postdischarge-mobile/src/main/java/com/xinelu/mobile/utils/WeChatOfficialAccountUtils.java
+++ b/postdischarge-mobile/src/main/java/com/xinelu/mobile/utils/WeChatOfficialAccountUtils.java
@@ -192,14 +192,21 @@ public class WeChatOfficialAccountUtils {
      */
     public Integer sendAppletTemplateMessage(PatientVO patientVO) {
         //微信模版组装
-        String thing5 = "每日阅读有助于了解当前情况哦";
-        String thing1 = "新入院注意事项指导、术前须知";
-        List<TemplateContent> templateContents = JSON.parseArray(patientVO.getAppletNodeContent(), TemplateContent.class);
-        if (CollectionUtils.isNotEmpty(templateContents)) {
-            TemplateContent templateContent = templateContents.stream().filter(Objects::nonNull).filter(item -> Objects.nonNull(item.getName()) && Objects.nonNull(item.getValue()) && "thing5".equals(item.getName())).findFirst().orElse(new TemplateContent());
-            thing5 = templateContent.getValue();
-            TemplateContent templateContentTwo = templateContents.stream().filter(Objects::nonNull).filter(item -> Objects.nonNull(item.getName()) && Objects.nonNull(item.getValue()) && "thing1".equals(item.getName())).findFirst().orElse(new TemplateContent());
-            thing1 = templateContentTwo.getValue();
+        List<TemplateContent> templateContents = new ArrayList<>();
+        String thing5 = null;
+        String thing1 = null;
+        try {
+            //判断推送内容格式是否符合
+            templateContents = JSON.parseArray(patientVO.getAppletNodeContent(), TemplateContent.class);
+            if (CollectionUtils.isNotEmpty(templateContents)) {
+                TemplateContent templateContent = templateContents.stream().filter(Objects::nonNull).filter(item -> Objects.nonNull(item.getName()) && Objects.nonNull(item.getValue()) && "thing5".equals(item.getName())).findFirst().orElse(new TemplateContent());
+                thing5 = templateContent.getValue();
+                TemplateContent templateContentTwo = templateContents.stream().filter(Objects::nonNull).filter(item -> Objects.nonNull(item.getName()) && Objects.nonNull(item.getValue()) && "thing1".equals(item.getName())).findFirst().orElse(new TemplateContent());
+                thing1 = templateContentTwo.getValue();
+            }
+        } catch (Exception e) {
+            thing5 = "每日阅读有助于了解当前情况哦";
+            thing1 = "新入院注意事项指导、术前须知";
         }
         //获取微信小程序的accessToken
         String accessToken = this.getWeChatAppletAccessToken();
@@ -209,7 +216,7 @@ public class WeChatOfficialAccountUtils {
         paramsMap.put("template_id", weChatAppletChatConfig.getHealthyPropagandaId());
         //跳转小程序类型：developer为开发版；trial为体验版；formal为正式版；默认为正式版
         //paramsMap.put("miniprogram_state", "developer");
-        paramsMap.put("page", "pages/propaganda/propaganda?manageRouteNodeId="+patientVO.getSignPatientManageRouteNodeId());
+        paramsMap.put("page", "pages/pushDetails/pushDetails?manageRouteNodeId=" + patientVO.getSignPatientManageRouteNodeId());
         Map<String, Object> dataMap = new LinkedHashMap<>();
         dataMap.put("thing5", new MessageValueEntity(thing5));
         dataMap.put("thing4", new MessageValueEntity(patientVO.getHospitalAgencyName()));

From 9418e8857c04691cf702b4374151bbf4e33aed53 Mon Sep 17 00:00:00 2001
From: zhangheng <3226558941@qq.com>
Date: Fri, 2 Aug 2024 16:01:41 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/xinelu/mobile/utils/WeChatOfficialAccountUtils.java  | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/postdischarge-mobile/src/main/java/com/xinelu/mobile/utils/WeChatOfficialAccountUtils.java b/postdischarge-mobile/src/main/java/com/xinelu/mobile/utils/WeChatOfficialAccountUtils.java
index 4e7fc945..ee0ac0cf 100644
--- a/postdischarge-mobile/src/main/java/com/xinelu/mobile/utils/WeChatOfficialAccountUtils.java
+++ b/postdischarge-mobile/src/main/java/com/xinelu/mobile/utils/WeChatOfficialAccountUtils.java
@@ -19,10 +19,7 @@ import org.springframework.stereotype.Component;
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
 
 /**