From 2e08e3c31fc5dd6dd4891bb1d62205b9d03c3cb1 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Wed, 25 Oct 2023 10:28:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=B3=BB=E7=BB=9F=E5=82=AC?=
 =?UTF-8?q?=E5=8A=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/messageurgeList/MessageUrgeListMapper.xml   |  4 ++--
 .../messageurgeList/ScheduledMessageService.java    | 13 ++++++++++++-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/message-center-biz/src/main/java/com/yxt/messagecenter/biz/messageurgeList/MessageUrgeListMapper.xml b/message-center-biz/src/main/java/com/yxt/messagecenter/biz/messageurgeList/MessageUrgeListMapper.xml
index 1363e64..b6f0cce 100644
--- a/message-center-biz/src/main/java/com/yxt/messagecenter/biz/messageurgeList/MessageUrgeListMapper.xml
+++ b/message-center-biz/src/main/java/com/yxt/messagecenter/biz/messageurgeList/MessageUrgeListMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yxt.messagecenter.biz.messageurgeList.MessageUrgeListMapper">
     <select id="selecct" resultType="com.yxt.messagecenter.api.messageurgeList.MessageUrgeList">
-        select *
+        select msgSid,procInstId,urgeType,urgeName,nodeName,taskId,timeInterval,urgeContent,createTime
         from message_urgelist
-        where taskId = #{taskId}
+        where taskId = #{taskId} order by id desc
     </select>
     <select id="urgeCount" resultType="com.yxt.messagecenter.api.messageurgeList.MessageUrgeListVo">
         SELECT taskId,
diff --git a/message-center-biz/src/main/java/com/yxt/messagecenter/biz/messageurgeList/ScheduledMessageService.java b/message-center-biz/src/main/java/com/yxt/messagecenter/biz/messageurgeList/ScheduledMessageService.java
index ad403dc..f4f4c47 100644
--- a/message-center-biz/src/main/java/com/yxt/messagecenter/biz/messageurgeList/ScheduledMessageService.java
+++ b/message-center-biz/src/main/java/com/yxt/messagecenter/biz/messageurgeList/ScheduledMessageService.java
@@ -1,6 +1,8 @@
 package com.yxt.messagecenter.biz.messageurgeList;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUnit;
+import cn.hutool.core.date.DateUtil;
 import com.yxt.anrui.flowable.api.flow2.FlowFeign;
 import com.yxt.anrui.flowable.api.flow2.FlowableMessageVo;
 import com.yxt.anrui.flowable.api.flowtask.FlowTaskDto;
@@ -21,7 +23,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
+import java.text.DateFormat;
 import java.text.SimpleDateFormat;
+import java.time.Duration;
+import java.time.LocalDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -47,7 +52,7 @@ public class ScheduledMessageService {
     //@Scheduled(cron = "0 0 0 * * ?")
 //    @Scheduled(cron = "0 0/5 16 * * ?")
 //    @Scheduled(cron = "0/30 * * * * ?")   //每30秒执行一次
-    @Scheduled(cron = "0 0/5 * * * ?")  //每300秒（5分钟）执行一次
+    @Scheduled(cron = "0 0/5 * * * ?")
     public void remindMessage() {
         //查询规则
         Date now = new Date();
@@ -78,6 +83,12 @@ public class ScheduledMessageService {
                 messageUrgeListList.removeAll(Collections.singleton(null));
                 if (messageUrgeListList.size() >= 0) {
                     if (num > messageUrgeListList.size()) {
+                        //判断最后一次催办的发送时间，若小于设置的间隔时间则不推送
+                        MessageUrgeList messageUrgeList = messageUrgeListList.get(0);
+                        long minutess = DateUtil.between(now, messageUrgeList.getCreateTime(), DateUnit.MINUTE);
+                        if(minutess<minutes){
+                            continue;
+                        }
                         MessageListDto messageListDto = new MessageListDto();
                         BeanUtil.copyProperties(flowableMessageVo, messageListDto);
                         //===================================================