From bc8074c56893eac3eb5002dcefeacd644d827a29 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期日, 21 一月 2024 20:54:27 +0800
Subject: [PATCH] 优化

---
 ycl-platform/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java |   65 +++++++++++++++++++++-----------
 1 files changed, 42 insertions(+), 23 deletions(-)

diff --git a/ycl-platform/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java
index b6a1a7e..31d76d6 100644
--- a/ycl-platform/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java
@@ -82,18 +82,37 @@
     RestTemplate restTemplate;
 
     @Override
+    @SneakyThrows
+    @Transactional(rollbackFor = Exception.class)
+    public void sendSMS(Message message) {
+        Integer messageStatus = sendMessages(message);
+
+        if (messageStatus == 2) {
+            message.setStatus(2);
+            message.setRespondResult("鍙戦�佹垚鍔�");
+        }
+        if (messageStatus == 3) {
+            message.setStatus(3);
+            message.setRespondResult("鍙戦�佸け璐�");
+        }
+        message.setUpdateTime(new Date());
+        message.setSendTime(new Date());
+        messageMapper.updateById(message);
+    }
+
+    @Override
     @Transactional(rollbackFor = Exception.class)
     public void sendMessage(Message message) {
 
-        Message savedMessage = messageMapper.selectOne(new LambdaQueryWrapper<Message>()
-                .eq(Message::getTargetTo, message.getTargetTo())
-                .eq(Message::getTargetFrom, message.getTargetFrom())
-                .eq(Message::getBody, message.getBody())
-                .eq(Message::getStatus, 1)
-                .eq(Message::getHead, message.getHead()));
-        if (savedMessage != null) {
-            messageMapper.deleteById(savedMessage);
-        }
+//        Message savedMessage = messageMapper.selectOne(new LambdaQueryWrapper<Message>()
+//                .eq(Message::getTargetTo, message.getTargetTo())
+//                .eq(Message::getTargetFrom, message.getTargetFrom())
+//                .eq(Message::getBody, message.getBody())
+//                .eq(Message::getStatus, 1)
+//                .eq(Message::getHead, message.getHead()));
+//        if (savedMessage != null) {
+//            messageMapper.deleteById(savedMessage);
+//        }
 
         ArrayList<Message> ids = new ArrayList<>();
         message.setTargetFrom(umsAdminMapper.selectById(message.getCreateUser()).getUsername());
@@ -114,20 +133,20 @@
                 ids.add(sendMessage);
             }
         }
-        switch (message.getChannelCode()) {
-            //閭欢鍙戦��
-            case ChannelCode.SMS:
-                sendSMS(message, ids);
-                break;
-            //鐭俊鍙戦��
-            case ChannelCode.MAIL:
-                sendMail(message);
-                break;
-            case ChannelCode.INNER:
-                break;
-            default:
-                throw new ApiException("鏈尮閰嶅埌璇ョ被鍨�");
-        }
+//        switch (message.getChannelCode()) {
+//            //鐭俊鍙戦��
+//            case ChannelCode.SMS:
+//                sendSMS(message, ids);
+//                break;
+//            //閭欢鍙戦��
+//            case ChannelCode.MAIL:
+//                sendMail(message);
+//                break;
+//            case ChannelCode.INNER:
+//                break;
+//            default:
+//                throw new ApiException("鏈尮閰嶅埌璇ョ被鍨�");
+//        }
     }
 
     @SneakyThrows

--
Gitblit v1.8.0