|
@@ -9,7 +9,6 @@ import org.springframework.stereotype.Service;
|
|
|
import java.time.LocalDate;
|
|
import java.time.LocalDate;
|
|
|
import java.time.LocalDateTime;
|
|
import java.time.LocalDateTime;
|
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
-import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
|
|
@Service
|
|
@Service
|
|
|
public class MessageService {
|
|
public class MessageService {
|
|
@@ -37,21 +36,25 @@ public class MessageService {
|
|
|
sendMessage(message);
|
|
sendMessage(message);
|
|
|
|
|
|
|
|
}
|
|
}
|
|
|
- public void noticeLcxm(String type,String phone,String name){
|
|
|
|
|
|
|
+ public void noticeLcxm(String[] type, String phone, String name){
|
|
|
List<MessageTarget> messageTarget = dMSService.query(authService.getTokenOfServiceAccount(), DMSQuery.MESSAGE_TARGET, MessageTarget.class, LocalDate.now());
|
|
List<MessageTarget> messageTarget = dMSService.query(authService.getTokenOfServiceAccount(), DMSQuery.MESSAGE_TARGET, MessageTarget.class, LocalDate.now());
|
|
|
messageTarget.stream()
|
|
messageTarget.stream()
|
|
|
.filter(MessageTarget::getCOpen)
|
|
.filter(MessageTarget::getCOpen)
|
|
|
.filter(m->"lcxm".equals(m.getCGroup()))
|
|
.filter(m->"lcxm".equals(m.getCGroup()))
|
|
|
.forEach(m->{
|
|
.forEach(m->{
|
|
|
if (m.getCPhone()!=null&&!m.getCPhone().isEmpty()){
|
|
if (m.getCPhone()!=null&&!m.getCPhone().isEmpty()){
|
|
|
- phoneMessageSendService.sendNotice(m.getCPhone(),type);
|
|
|
|
|
|
|
+ if (type.length<=2){
|
|
|
|
|
+ phoneMessageSendService.sendNotice(m.getCPhone(),String.join(",",type));
|
|
|
|
|
+ }else {
|
|
|
|
|
+ phoneMessageSendService.sendNotice(m.getCPhone(),type[0]+","+type[1]+"……");
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
if (m.getCUsername()!=null&&!m.getCUsername().isEmpty()){
|
|
if (m.getCUsername()!=null&&!m.getCUsername().isEmpty()){
|
|
|
Message message = new Message();
|
|
Message message = new Message();
|
|
|
message.setCReaded(false);
|
|
message.setCReaded(false);
|
|
|
message.setCUserName(m.getCUsername());
|
|
message.setCUserName(m.getCUsername());
|
|
|
message.setCTitle("业务诉求");
|
|
message.setCTitle("业务诉求");
|
|
|
- message.setCContent(String.format("新业务诉求提交:姓名%s,手机号%s,业务类型:%s,需及时跟进处理",name,phone,type));
|
|
|
|
|
|
|
+ message.setCContent(String.format("新业务诉求提交:姓名%s,手机号%s,业务类型:%s,需及时跟进处理",name,phone,String.join(",",type)));
|
|
|
message.setCTime(LocalDate.now());
|
|
message.setCTime(LocalDate.now());
|
|
|
sendMessage(message);
|
|
sendMessage(message);
|
|
|
}
|
|
}
|