Merge branch 'usky-zyj' of uskycloud/usky-modules into server-165

service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/service/impl/MeetingInfoServiceImpl.java

@@ -549,29 +549,35 @@ public class MeetingInfoServiceImpl extends AbstractCrudService<MeetingInfoMappe
     }
 
     public void send(DmMeetingDto resources) throws ClientException {
+
         if (StringUtils.isNotBlank(resources.getSendType())) {
-            if (resources.getSendType().equals("短信")) {
-                for (SysUser dmUser : resources.getUsers()) {
-                    SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-                    String sj = resources.getStartDate();
-                    DefaultProfile profile = DefaultProfile.getProfile("cn-beijing", "LTAI5tH3VvRL5BUkovCokHJX", "SaaWUouNqvcA0C746gcNOH9m6SRYN4");
-                    IAcsClient client = new DefaultAcsClient(profile);
-                    SendSmsRequest request = new SendSmsRequest();
-                    request.setPhoneNumbers(dmUser.getPhonenumber());//接收短信的手机号码
-                    request.setSignName("上海永天科技股份有限公司");//短信签名名称
-                    request.setTemplateCode("SMS_465362899");//短信模板CODE
-                    request.setTemplateParam("{\"meet\":\""+resources.getMeetingName()+"\","+"\"time\":\""+resources.getStartDate()+"\","+
-                            "\"room\":\""+resources.getRoomName()+"\"}");
-                    SendSmsResponse code = client.getAcsResponse(request);
-                    if(code.getCode() != null && code.getCode().equals("OK")) {
-                        //请求成功
-                    }else {
-                        throw new BusinessException("发送短信失败");
-                    }
-                }
+            String[] typeList = resources.getSendType().split(",");
+            if(typeList.length > 0){
+                for (int i = 0; i < typeList.length; i++) {
+                    String sendType = typeList[i];
+
+                    if (sendType.equals("短信")) {
+                        for (SysUser dmUser : resources.getUsers()) {
+                            SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                            String sj = resources.getStartDate();
+                            DefaultProfile profile = DefaultProfile.getProfile("cn-beijing", "LTAI5tH3VvRL5BUkovCokHJX", "SaaWUouNqvcA0C746gcNOH9m6SRYN4");
+                            IAcsClient client = new DefaultAcsClient(profile);
+                            SendSmsRequest request = new SendSmsRequest();
+                            request.setPhoneNumbers(dmUser.getPhonenumber());//接收短信的手机号码
+                            request.setSignName("上海永天科技股份有限公司");//短信签名名称
+                            request.setTemplateCode("SMS_465362899");//短信模板CODE
+                            request.setTemplateParam("{\"meet\":\""+resources.getMeetingName()+"\","+"\"time\":\""+resources.getStartDate()+"\","+
+                                    "\"room\":\""+resources.getRoomName()+"\"}");
+                            SendSmsResponse code = client.getAcsResponse(request);
+                            if(code.getCode() != null && code.getCode().equals("OK")) {
+                                //请求成功
+                            }else {
+                                throw new BusinessException("发送短信失败");
+                            }
+                        }
 
 
-            } else if (resources.getSendType().equals("Email")) {
+                    } else if (sendType.equals("Email")) {
 //                List<String> emailList = new ArrayList<>();
 //                if (!ObjectUtils.isEmpty(resources.getUserList())) {
 //                    for (DmUserDto dmUserDto : resources.getUserList()) {
@@ -591,6 +597,8 @@ public class MeetingInfoServiceImpl extends AbstractCrudService<MeetingInfoMappe
 //                String sj = sf.format(resources.getStartDate());
 //                String sendContent2 = "您已受邀参加会议：" + resources.getMeetingName() + "，该会议将于" + sj + " 在" + resources.getRoomName() + "举行。请您及时准备相关参会材料，并请准时出席。";
 //                sendEmail(user.getEmail(), emailList, "会议预约通知", sendContent2);
+                    }
+                }
             }
         }
     }