From cc7f335315c8439a6341c999fdffde0c772394af Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期六, 24 六月 2023 11:05:43 +0800
Subject: [PATCH] bug修改
---
ycl-platform/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 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 bcf472d..6c5e7e1 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
@@ -23,6 +23,7 @@
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
import org.springframework.mail.javamail.JavaMailSenderImpl;
import org.springframework.mail.javamail.MimeMessageHelper;
import org.springframework.stereotype.Service;
@@ -32,6 +33,7 @@
import javax.annotation.Resource;
import javax.mail.internet.MimeMessage;
+import javax.xml.ws.Response;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -102,6 +104,10 @@
sendMessage.setSendTime(new Date());
sendMessage.setTargetTo(receive);
sendMessage.setSendTime(new Date());
+ sendMessage.setPhoneNumber(umsAdminMapper.selectById(receive).getMobile());
+ if (ChannelCode.INNER.equals(message.getChannelCode())) {
+ sendMessage.setIsView(0);
+ }
this.save(sendMessage);
ids.add(sendMessage.getId());
}
@@ -158,7 +164,7 @@
sendMessage.setCreateTime(new Date());
sendMessage.setSendTime(new Date());
sendMessage.setSendTime(new Date());
- message.setTargetFrom(umsAdminMapper.selectById(message.getCreateUser()).getUsername());
+ sendMessage.setTargetFrom(umsAdminMapper.selectById(message.getCreateUser()).getUsername());
this.save(sendMessage);
Integer messageStatus = sendMessages(message);
Message messaged = new Message();
@@ -203,8 +209,8 @@
ObjectMapper objectMapper = new ObjectMapper();
HttpEntity<String> stringHttpEntity = new HttpEntity<>(Base64Utils.encodeToString(objectMapper.writeValueAsBytes(mac)), httpHeaders);
-
- SendRes sendRes = objectMapper.readValue(restTemplate.postForEntity(url, stringHttpEntity, String.class).getBody(), SendRes.class);
+ 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 {
--
Gitblit v1.8.0