From 03caaa85a0da44ff710f1f40b6d784093c2677d0 Mon Sep 17 00:00:00 2001
From: haungxing <1203316822@qq.com>
Date: Tue, 20 Feb 2024 09:12:13 +0800
Subject: [PATCH] =?UTF-8?q?#=20=E6=B6=88=E6=81=AF=E4=B8=AD=E5=BF=83?=
 =?UTF-8?q?=E5=8D=B3=E6=97=B6=E6=8E=A8=E9=80=81=E9=80=BB=E8=BE=91=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/hnac/hzims/message/schedule/MessagePushSchedule.java  | 1 +
 .../hzims/message/service/impl/MessagePushRecordServiceImpl.java   | 7 +------
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/hzims-service/message/src/main/java/com/hnac/hzims/message/schedule/MessagePushSchedule.java b/hzims-service/message/src/main/java/com/hnac/hzims/message/schedule/MessagePushSchedule.java
index 0990bda..9e31568 100644
--- a/hzims-service/message/src/main/java/com/hnac/hzims/message/schedule/MessagePushSchedule.java
+++ b/hzims-service/message/src/main/java/com/hnac/hzims/message/schedule/MessagePushSchedule.java
@@ -115,6 +115,7 @@ public class MessagePushSchedule {
 							}
 							else {
 								updateWrapper.set(MessagePushRecordEntity::getStatus, MessageConstants.PUSH_SUCCESS);
+								updateWrapper.set(MessagePushRecordEntity::getPushTime, LocalDateTime.now());
 							}
 							updateWrapper.set(MessagePushRecordEntity::getFaultResult,faultResult);
 							recordService.update(updateWrapper);
diff --git a/hzims-service/message/src/main/java/com/hnac/hzims/message/service/impl/MessagePushRecordServiceImpl.java b/hzims-service/message/src/main/java/com/hnac/hzims/message/service/impl/MessagePushRecordServiceImpl.java
index ad2b1dd..3ced72c 100644
--- a/hzims-service/message/src/main/java/com/hnac/hzims/message/service/impl/MessagePushRecordServiceImpl.java
+++ b/hzims-service/message/src/main/java/com/hnac/hzims/message/service/impl/MessagePushRecordServiceImpl.java
@@ -353,11 +353,7 @@ public class MessagePushRecordServiceImpl extends BaseServiceImpl<MessagePushRec
                 this.updateById(record);
             }
             else {
-                if(pushService.send(record)) {
-                    record.setStatus(MessageConstants.PUSH_SUCCESS);
-                    record.setPushTime(LocalDateTime.now());
-                }
-                else {
+                if(!pushService.send(record)) {
                     record.setStatus(MessageConstants.PUSH_FAILED);
                 }
             }
@@ -413,7 +409,6 @@ public class MessagePushRecordServiceImpl extends BaseServiceImpl<MessagePushRec
                  if(MessageConstants.APP_PUSH.equals(record.getType())) {
                      // APP消息存入redis中进行消费
                      this.sendAppImmediatelyMsg(record,request.isEmergent());
-                     redisTemplate.opsForList().leftPush(appPushRedisKey.concat(":").concat(record.getPusher()), record);
                  } else if (MessageConstants.WS_PUSH.equals(record.getType())) {
                      // WEB消息调用接口直接进行推送
                      if(wsMessageService.send(record)) {