修改消息的状态

msgpush-module-push/msgpush-module-push-server/src/main/java/com/njcn/msgpush/module/push/client/sender/impl/AliyunEmailSender.java

@@ -11,6 +11,7 @@ import com.aliyun.teautil.models.RuntimeOptions;
 import com.njcn.msgpush.module.push.client.sender.EmailSender;
 import com.njcn.msgpush.module.push.client.sender.Sender;
 import com.njcn.msgpush.module.push.client.setting.impl.AliYunMailSetting;
+import com.njcn.msgpush.module.push.constant.MessageStatusConstant;
 import com.njcn.msgpush.module.push.constant.MsgPushConstant;
 import com.njcn.msgpush.module.push.dal.dataobject.channel.ProviderErrorCodeMappingDO;
 import com.njcn.msgpush.module.push.dal.dataobject.message.MessageRecordDO;
@@ -20,6 +21,8 @@ import org.springframework.http.HttpStatus;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.util.Map;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
 
 import static com.aliyun.teautil.Common.toJSONString;
 
@@ -62,6 +65,8 @@ public class AliyunEmailSender implements EmailSender {
 
     @Override
     public boolean sendEmail(MessageRecordDO message, Map<String, Object> params) {
+        Future<Boolean> future = this.sender.MSG_PUSH_THREAD_POOL_EXECUTOR.submit(() -> {
+            message.setStatus(MessageStatusConstant.SENDING);
             RuntimeOptions runtimeOptions = new RuntimeOptions();
             runtimeOptions.autoretry = true;
 
@@ -86,9 +91,11 @@ public class AliyunEmailSender implements EmailSender {
                 message.setCostTime((int) (end.atZone(ZoneId.systemDefault()).toInstant().toEpochMilli() - start));
                 System.out.println(toJSONString(response));
                 if (HttpStatus.OK.value() == response.getStatusCode()) {
+                    message.setStatus(MessageStatusConstant.SUCCESS);
                     this.sender.channelProviderConfigService.successUpdate(message.getProviderType(), message.getChannel());
                     return true;
                 } else {
+                    message.setStatus(MessageStatusConstant.FAILED);
                     message.setErrorCode(response.getStatusCode() + "");
                     ProviderErrorCodeMappingDO providerErrorCode = this.sender.providerErrorCodeMappingService.getByProviderErrorCode(message.getProviderType(), message.getChannel(), response.getStatusCode() + "");
                     if (ObjectUtil.isNotNull(providerErrorCode)) {
@@ -103,5 +110,14 @@ public class AliyunEmailSender implements EmailSender {
             } catch (Exception e) {
                 throw new RuntimeException(e);
             }
+        });
+        Boolean b = null;
+        try {
+            b = future.get(3, TimeUnit.SECONDS);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+
+        return b;
     }
 }

msgpush-module-push/msgpush-module-push-server/src/main/java/com/njcn/msgpush/module/push/client/sender/impl/AliyunSmsSender.java

@@ -82,10 +82,12 @@ public class AliyunSmsSender implements SmsSender {
                 message.setCostTime((int) (end.atZone(ZoneId.systemDefault()).toInstant().toEpochMilli() - start));
                 System.out.println(toJSONString(response));
                 if (HttpStatus.OK.value() == response.getStatusCode()) {
+                    message.setStatus(MessageStatusConstant.SUCCESS);
                     this.getDownInfo(response.body.bizId, message);
                     this.sender.channelProviderConfigService.successUpdate(message.getProviderType(), message.getChannel());
                     return true;
                 } else {
+                    message.setStatus(MessageStatusConstant.FAILED);
                     message.setErrorCode(response.body.code);
                     message.setErrorMsg(response.body.message);
                     this.sender.messageRetryQueueService.saveOrUpdateRetryMessage(message);

msgpush-module-push/msgpush-module-push-server/src/main/java/com/njcn/msgpush/module/push/client/sender/impl/TelecomSmsSender.java

@@ -136,6 +136,7 @@ public class TelecomSmsSender implements SmsSender {
                 return true;
             } else {
                 ProviderErrorCodeMappingDO providerErrorCodeMappingDO = this.sender.providerErrorCodeMappingService.getByProviderErrorCode(message.getProviderType(), message.getChannel(), telecomSmsSendResponse.list.get(0).result + "");
+                message.setStatus(MessageStatusConstant.FAILED);
                 message.setErrorCode(telecomSmsSendResponse.list.get(0).result + "");
                 message.setErrorMsg(providerErrorCodeMappingDO.getOriginalMessage());
                 this.sender.messageRetryQueueService.saveOrUpdateRetryMessage(message);
@@ -260,6 +261,7 @@ public class TelecomSmsSender implements SmsSender {
             TelecomSmsSelectResponse telecomSmsSelectResponse = JSON.parseObject(response.getBody(), TelecomSmsSelectResponse.class);
             TelecomSmsSelectDetailRes telecomSmsSelectDetailRes = telecomSmsSelectResponse.list.get(0);
             if (telecomSmsSelectDetailRes.getStatus() == 5) {
+                message.setStatus(MessageStatusConstant.FAILED);
                 ProviderErrorCodeMappingDO providerErrorCodeMappingDO = this.sender.providerErrorCodeMappingService.getByProviderErrorCode(message.getProviderType(), message.getChannel(), telecomSmsSelectDetailRes.getStat());
                 message.setErrorCode(telecomSmsSelectDetailRes.getStat());
                 if (ObjectUtil.isNotNull(providerErrorCodeMappingDO)) {
@@ -269,6 +271,9 @@ public class TelecomSmsSender implements SmsSender {
                 }
                 this.sender.messageRetryQueueService.saveOrUpdateRetryMessage(message);
             }
+            if (telecomSmsSelectDetailRes.getStatus() == 4) {
+                message.setStatus(MessageStatusConstant.SUCCESS);
+            }
 //            }
             this.scheduledExecutorService.shutdown();
             this.scheduledExecutorService = null;