bug修改

2021-10-09 16:26:56 +08:00
parent 39c0a8eada
commit 676cb9265b
7 changed files with 42 additions and 266 deletions
@@ -76,12 +76,14 @@ public class SendMessageServiceImpl implements SendMessageService {
                content = content.replace(str, entry.getValue());
            }
        }
-
        // 1短信 2邮件 3系统
        // 发送邮件 true
        String fromUser = sendMessageDTO.getFromUser();
        LoginUser loginUser = sysBaseAPI.getUserByName(fromUser);
-        if(templateType.contains(ProjectCommon.MESSAGE_TYPE2) && Objects.nonNull(loginUser)){
+        if(templateType.contains(ProjectCommon.MESSAGE_TYPE2)){
+            if(StringUtils.isEmpty(sendMessageDTO.getEmail())){
+                throw new JeroBootException("发送邮件，邮箱地址不能为空！");
+            }
            try {
                String email = loginUser.getEmail();
                String emailPassword = loginUser.getEmailPassword();
@@ -102,10 +104,14 @@ public class SendMessageServiceImpl implements SendMessageService {
                }
            }catch (Exception e){
                log.error("发送邮件异常",e);
+                throw new JeroBootException("邮件发送失败！");
            }
        }
        // 发送消息
-        if(templateType.contains(ProjectCommon.MESSAGE_TYPE3) && !StringUtils.isEmpty(sendMessageDTO.getToUser())){
+        if(templateType.contains(ProjectCommon.MESSAGE_TYPE3)){
+            if(StringUtils.isEmpty(sendMessageDTO.getToUser())){
+                throw new JeroBootException("发送消息，账号不能为空！");
+            }
            try {
                String toUser = sendMessageDTO.getToUser();
                String busId = sendMessageDTO.getBusId();
@@ -161,10 +167,14 @@ public class SendMessageServiceImpl implements SendMessageService {
                }
            }catch (Exception e){
                log.error("发送消息异常",e);
+                throw new JeroBootException("消息发送失败！");
            }
        }
        // todo 发送短信 待完成
-        if(templateType.contains(ProjectCommon.MESSAGE_TYPE1) && !StringUtils.isEmpty(sendMessageDTO.getPhone())){
+        if(templateType.contains(ProjectCommon.MESSAGE_TYPE1)){
+            if(StringUtils.isEmpty(sendMessageDTO.getPhone())){
+                throw new JeroBootException("发送短信，手机号不能为空！");
+            }
            try {
                String sender = "";
                String signature = "";
@@ -334,242 +344,8 @@ public class SendMessageServiceImpl implements SendMessageService {
                sysBaseAPI.sendMessage(sendMessageDTO.getPhone(),sender,templateId,signature,templateParas);
            }catch (Exception e){
                log.error("发送短信异常",e);
+                throw new JeroBootException("短信发送失败！");
            }
        }
    }
-
-    void sendEmail(SendMessageDTO sendMessageDTO, LoginUser loginUser, String title, String content){
-        String email = loginUser.getEmail();
-        String emailPassword = loginUser.getEmailPassword();
-        //如果发件人没有邮箱或邮箱密码则使用admin账户的邮箱密码
-        if (StringUtils.isBlank(email) || StringUtils.isBlank(emailPassword)) {
-            loginUser = sysBaseAPI.getUserByName("admin");
-            email = loginUser.getEmail();
-            emailPassword = loginUser.getEmailPassword();
-        }
-        email = PasswordUtil.decrypt(email);
-        emailPassword = PasswordUtil.decrypt(emailPassword);
-        EmailSendMsgHandle emailHandle = new EmailSendMsgHandle(email,emailPassword);
-        // 发送带附件邮箱
-        if(!CollectionUtils.isEmpty(sendMessageDTO.getListFile())){
-            emailHandle.SendMsgAndFile(sendMessageDTO.getEmail(), title, content,sendMessageDTO.getListFile());
-        }else{
-            emailHandle.SendMsg(sendMessageDTO.getEmail(), title, content);
-        }
-    }
-    void sendMessage(SendMessageDTO sendMessageDTO, SysMessageTemplate sysSmsTemplate, String content, String fromUser, String title){
-        String toUser = sendMessageDTO.getToUser();
-        String busId = sendMessageDTO.getBusId();
-        String busType = sendMessageDTO.getBusType();
-
-        SysAnnouncement announcement = new SysAnnouncement();
-        announcement.setTitile(sysSmsTemplate.getTemplateName());
-        announcement.setMsgContent(content);
-        announcement.setSender(fromUser);
-        announcement.setPriority(CommonConstant.PRIORITY_M);
-        announcement.setMsgType(CommonConstant.MSG_TYPE_UESR);
-        announcement.setSendStatus(CommonConstant.HAS_SEND);
-        announcement.setSendTime(new Date());
-        announcement.setMsgCategory(CommonConstant.MSG_CATEGORY_2);
-        announcement.setDelFlag(String.valueOf(CommonConstant.DEL_FLAG_0));
-        announcement.setBusId(busId);
-        announcement.setBusType(busType);
-        if(!StringUtils.isEmpty(busType)){
-            announcement.setOpenType(MessageUrlEnums.getByType(busType).getOpenType());
-            announcement.setOpenPage(MessageUrlEnums.getByType(busType).getOpenPage());
-        }
-        announcement.setTemplateCode(sendMessageDTO.getTemplateCode());
-        sysAnnouncementService.save(announcement);
-        // 2.插入用户通告阅读标记表记录
-        String userId = toUser;
-        String[] userIds = userId.split(",");
-        String anntId = announcement.getId();
-        for(int i=0;i<userIds.length;i++) {
-            if(oConvertUtils.isNotEmpty(userIds[i])) {
-                SysUser sysUser = sysUserService.getUserByName(userIds[i]);
-                if(Objects.isNull(sysUser)) {
-                    continue;
-                }
-                SysAnnouncementSend announcementSend = new SysAnnouncementSend();
-                announcementSend.setAnntId(anntId);
-                announcementSend.setUserId(sysUser.getId());
-                announcementSend.setReadFlag(CommonConstant.NO_READ_FLAG);
-                sysAnnouncementSendService.save(announcementSend);
-                JSONObject obj = new JSONObject();
-                obj.put(WebsocketConst.MSG_CMD, WebsocketConst.CMD_USER);
-                obj.put(WebsocketConst.MSG_USER_ID, sysUser.getId());
-                obj.put(WebsocketConst.MSG_ID, announcement.getId());
-                obj.put(WebsocketConst.MSG_TXT, title);
-                webSocket.sendMessage(sysUser.getId(), obj.toJSONString());
-            }
-        }
-    }
-    void sendSMS(SendMessageDTO sendMessageDTO, HashMap<String, String> map){
-        String sender = "";
-        String signature = "";
-        String templateId = "";
-        String codeType = sendMessageDTO.getTemplateCode();
-        switch (codeType) {
-            case "GL_1_HTTZ_CREATE_PROJECT":
-                //中汽中心标准所-管理端-项目通知-1
-                sender = "8821092414406";
-                signature = "中汽中心标准所";
-                templateId = "7ffc2ce832a1408383b933702277f866";
-                //通知类短信，不需要存redis
-                break;
-            case "GL_2_HTTZ_SUBMIT":
-                //中汽中心标准所-管理端-合同通知-2
-                sender = "8821092414406";
-                signature = "中汽中心标准所";
-                templateId = "8f080f2c0b334f93af5219f76c0b5dc3";
-                break;
-            case "GL_3_HTTZ_AUDIT":
-                //中汽中心标准所-管理端-合同通知-3
-                sender = "8821092414406";
-                signature = "中汽中心标准所";
-                templateId = "488e5a176aca4eea8472a6a7b8cd2911";
-                break;
-            case "GL_4_HTTZ_NOT_AUDIT":
-                //中汽中心标准所-管理端-合同通知-4
-                sender = "8821092414406";
-                signature = "中汽中心标准所";
-                templateId = "0596842946244aa9b5c5a1d16d9a1d0a";
-                //通知类短信，不需要存redis
-                break;
-            case "GL_5_HYTZ_SIGN_UP_UPLOAD":
-                //	中汽中心标准所-管理端-会议通知-5
-                sender = "8821092414406";
-                signature = "中汽中心标准所";
-                templateId = "ef7374b862e3442e9ea6f84c3e626e9c";
-                break;
-            case "GL_6_DBTZ_ADD":
-                //	中汽中心标准所-管理端-打包通知-6
-                sender = "8821092414406";
-                signature = "中汽中心标准所";
-                templateId = "0f62447b46ed4dcb88f3b8d9fa38a549";
-                break;
-            case "GL_7_DBTZ_CONTRACT":
-                //中汽中心标准所-管理端-打包通知-7
-                sender = "8821092414406";
-                signature = "中汽中心标准所";
-                templateId = "7705a7180c644b028839af77fc51d371";
-                //通知类短信，不需要存redis
-                break;
-            case "GL_8_HYTZ_ON_ACCESS_UPDATE":
-                //	中汽中心标准所-管理端-会议通知-8
-                sender = "8821092414406";
-                signature = "中汽中心标准所";
-                templateId = "bfc6abc5bf3347029e9079214eb54868";
-                break;
-            case "GL_9_QYTZ_CREATE":
-                //中汽中心标准所-管理端-企业通知-9
-                sender = "8821092414406";
-                signature = "中汽中心标准所";
-                templateId = "1b9dd79bb217420fa25725feb1ffaef4";
-                break;
-            case "QY_1_HYTZ_WORK_GROUP_CREATE":
-                //中汽中心标准所-企业端-会议通知-1
-                sender = "8821092414406";
-                signature = "中汽中心标准所";
-                templateId = "b477be3ced93438a930675b2998d841d";
-                //通知类短信，不需要存redis
-                break;
-            case "QY_2_HYTZ_WORK_GROUP_SIGN_UP":
-                //中汽中心标准所-企业端-会议通知-2
-                sender = "8821092414406";
-                signature = "中汽中心标准所";
-                templateId = ""; //todo 审核不通过
-                break;
-            case "QY_3_HYTZ_WORK_GROUP_UPLOAD":
-                //中汽中心标准所-企业端-会议通知-3
-                sender = "8821092414406";
-                signature = "中汽中心标准所";
-                templateId = "";//todo 审核不通过
-                break;
-            case "QY_4_HYTZ_WORK_GROUP_NOT_UPLOAD":
-                //中汽中心标准所-企业端-会议通知-4
-                sender = "8821092414406";
-                signature = "中汽中心标准所";
-                templateId = "";//todo 审核不通过
-                //通知类短信，不需要存redis
-                break;
-            case "QY_5_HYTZ_NOT_AUDIT":
-                //中汽中心标准所-企业端-会议通知-5
-                sender = "8821092414406";
-                signature = "中汽中心标准所";
-                templateId = "b564769d75ea43bda281ba4e26936fb6";
-                break;
-            case "QY_6_HYTZ_AUDIT":
-                //中汽中心标准所-企业端-会议通知-6
-                sender = "8821092414406";
-                signature = "中汽中心标准所";
-                templateId = "";//todo 审核不通过
-                break;
-            case "QY_7_WJTZ_MEETING_SEND":
-                //中汽中心标准所-企业端-文件通知-7
-                sender = "8821092414406";
-                signature = "中汽中心标准所";
-                templateId = "";//todo 审核不通过
-                //通知类短信，不需要存redis
-                break;
-            case "QY_8_HTTZ_PHASE":
-                //中汽中心标准所-企业端-合同通知-8
-                sender = "8821092414406";
-                signature = "中汽中心标准所";
-                templateId = "891d3236a8034a0c8ef266bb287a9ffa";
-                break;
-            case "QY_9_YJTZ_MAIL":
-                //中汽中心标准所-企业端-邮寄通知-9
-                sender = "8821092414406";
-                signature = "中汽中心标准所";
-                templateId = "1003b89133e04cd7922cee64451813d4";
-                break;
-            case "QY_10_YJTZ_MAIL_CONTRACT":
-                //	中汽中心标准所-企业端-邮寄通知-10
-                sender = "8821092414406";
-                signature = "中汽中心标准所";
-                templateId = "203aa025094e401b9f144b9a66e3c52e";
-                //通知类短信，不需要存redis
-                break;
-            case "QY_11_CKTZ_PAY":
-                //	中汽中心标准所-企业端-催款通知-1
-                sender = "8821092414406";
-                signature = "中汽中心标准所";
-                templateId = "c139886b751943feb6fd8aad46a3abbe";
-                break;
-            case "QY_12_WJTZ_WORK_GROUP_SEND":
-                //中汽中心标准所-企业端-文件通知-12
-                sender = "8821092414406";
-                signature = "中汽中心标准所";
-                templateId = "077964a02a814149bb01900e43c9a04e";
-                break;
-            default:
-                throw new JeroBootException("codeType flase.");
-        }
-
-        String str = "";
-        // 管理端
-        if(Objects.equals(sendMessageDTO.getTemplateCode().substring(0,2),"GL")){
-            str = ManagementMessageEnums.getByCode(sendMessageDTO.getTemplateCode()).getField();
-        }
-        // 企业端
-        if(Objects.equals(sendMessageDTO.getTemplateCode().substring(0,2),"QY")){
-            str = CompanyMessageEnums.getByCode(sendMessageDTO.getTemplateCode()).getField();
-        }
-        String templateParas = "";
-        if(!StringUtils.isEmpty(str)){
-            StringBuilder sb = new StringBuilder();
-            sb.append("[");
-            String[] s = str.split(",");
-            for (int i = 0; i < s.length; i++) {
-                sb.append("\"" + map.get(s[i]) + "\"");
-                if(i < (s.length - 1)){
-                    sb.append(",");
-                }
-            }
-            sb.append("]");
-            templateParas = sb.toString();
-        }
-        sysBaseAPI.sendMessage(sendMessageDTO.getPhone(),sender,templateId,signature,templateParas);
-    }
 }