From c775c6953d9759e70f08acbfa8f6d7490aaae3d1 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 26 九月 2024 21:13:53 +0800
Subject: [PATCH] 1
---
ycl-platform/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java | 78 +++++++++++++++++++++++++--------------
1 files changed, 50 insertions(+), 28 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..31c5f28 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
@@ -213,12 +232,15 @@
HttpEntity<String> stringHttpEntity = new HttpEntity<>(Base64Utils.encodeToString(objectMapper.writeValueAsBytes(mac)), httpHeaders);
ResponseEntity<String> response = restTemplate.postForEntity(url + "/sms/submit", sendReq, String.class);
- SendRes sendRes = objectMapper.readValue(response.getBody(), SendRes.class);
- if (sendRes.getRspcod().equals("success")) {
- return 2;
- } else {
- return 3;
+ if(com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotBlank( response.getBody())) {
+ SendRes sendRes = objectMapper.readValue(response.getBody(), SendRes.class);
+ if (sendRes.getRspcod().equals("success")) {
+ return 2;
+ } else {
+ return 3;
+ }
}
+ return 3;
}
//鍙戦�侀偖浠�
--
Gitblit v1.8.0