diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/SendMailRecordController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/SendMailRecordController.java index fdd2cab..cc9ac35 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/SendMailRecordController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/SendMailRecordController.java @@ -30,6 +30,18 @@ public class SendMailRecordController extends BaseController { } +// /** +// * 新增立案数据 +// */ +// @Log(title = "新增立案数据", businessType = BusinessType.INSERT) +// @PostMapping("/addSendMailRecord") +// public AjaxResult addSendMailRecord(@Validated @RequestBody SendMailRecord sendMailRecord) +// { +// +// return toAjax(sendMailRecordService.addSendMailRecord(sendMailRecord)); +// } + + diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/EmailOutUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/EmailOutUtil.java index 4ad8ce4..37cf259 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/EmailOutUtil.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/EmailOutUtil.java @@ -95,6 +95,9 @@ public class EmailOutUtil { */ public void sendEmil(String to, String message, String subject, List fileList, File file) { try { + String messageContent = "

"+message+"。

"; + MimeBodyPart messageBodyPart = new MimeBodyPart(); + messageBodyPart.setContent(messageContent, "text/html;charset=utf-8"); Security.addProvider(new com.sun.net.ssl.internal.ssl.Provider()); final String SSL_FACTORY = "javax.net.ssl.SSLSocketFactory"; //设置邮件会话参数 @@ -125,13 +128,14 @@ public class EmailOutUtil { //设置邮件消息 msg.setSubject(subject); msg.setText(message); + msg.setDescription("messageutf-8html"); //设置发送的日期 msg.setSentDate(new Date()); // 创建邮件正文 MimeMultipart multipart = new MimeMultipart(); // MimeBodyPart bodyPart = new MimeBodyPart(); // bodyPart.setContent("This is the body of the email", "text/html"); -// multipart.addBodyPart(bodyPart); + multipart.addBodyPart(messageBodyPart); // 添加附件 if (file != null) { MimeBodyPart attachmentPart = new MimeBodyPart(); diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ISendMailRecordService.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ISendMailRecordService.java index 00f1411..b0564a6 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ISendMailRecordService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ISendMailRecordService.java @@ -8,4 +8,8 @@ public interface ISendMailRecordService { List selectSendMailRecordList(SendMailRecord sendMailRecord); + + + + } diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/AdjudicationServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/AdjudicationServiceImpl.java index 5171cb4..507632d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/AdjudicationServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/AdjudicationServiceImpl.java @@ -341,28 +341,11 @@ public class AdjudicationServiceImpl implements IAdjudicationService { if (appEmail != null) { emailOutUtil.sendMessageCarryFile(appEmail, "案件裁决书", "您的裁决书已送达,详情请查阅附件", file , "hjbjava@163.com", javaMailSender); - - SendMailRecord sendMailRecord = new SendMailRecord(); - sendMailRecord.setCaseId(id); - sendMailRecord.setMailAddress(appEmail); - sendMailRecord.setMailContent("您的裁决书已送达,详情请查阅附件"); - sendMailRecord.setMailName("案件裁决书"); - sendMailRecord.setSendTime(new Date()); - sendMailRecord.setCreateBy(getUsername()); - sendMailRecordMapper.saveSendMailRecord(sendMailRecord); } if (resEmail != null) { emailOutUtil.sendMessageCarryFile(resEmail, "案件裁决书", "您的裁决书已送达,详情请查阅附件", file , "hjbjava@163.com", javaMailSender); - SendMailRecord sendMailRecord = new SendMailRecord(); - sendMailRecord.setCaseId(id); - sendMailRecord.setMailAddress(resEmail); - sendMailRecord.setMailContent("您的裁决书已送达,详情请查阅附件"); - sendMailRecord.setMailName("案件裁决书"); - sendMailRecord.setSendTime(new Date()); - sendMailRecord.setCreateBy(getUsername()); - sendMailRecordMapper.saveSendMailRecord(sendMailRecord); } //修改案件状态 caseApplication1.setCaseStatus(CaseApplicationConstants.CASE_FILING); @@ -480,6 +463,7 @@ public class AdjudicationServiceImpl implements IAdjudicationService { } @Override + @Transactional public AjaxResult service(Long id, String appEmail, String resEmail, String apptrackingNum, String restrackingNum) { CaseApplication caseApplication = new CaseApplication(); caseApplication.setId(id); @@ -509,6 +493,25 @@ public class AdjudicationServiceImpl implements IAdjudicationService { } //发送邮件 sendCaseEmail(caseApplication1, appEmail, resEmail); + + SendMailRecord sendMailRecord = new SendMailRecord(); + sendMailRecord.setCaseId(id); + sendMailRecord.setMailAddress(appEmail); + sendMailRecord.setMailContent("您好，审核后的裁决书在附件中请查阅"); + sendMailRecord.setMailName("签署后的裁决书"); + sendMailRecord.setSendTime(new Date()); + sendMailRecord.setCreateBy(getUsername()); + sendMailRecordMapper.saveSendMailRecord(sendMailRecord); + + SendMailRecord sendMailRecord1 = new SendMailRecord(); + sendMailRecord1.setCaseId(id); + sendMailRecord1.setMailAddress(resEmail); + sendMailRecord1.setMailContent("您好，审核后的裁决书在附件中请查阅"); + sendMailRecord1.setMailName("签署后的裁决书"); + sendMailRecord1.setSendTime(new Date()); + sendMailRecord1.setCreateBy(getUsername()); + sendMailRecordMapper.saveSendMailRecord(sendMailRecord1); + // 新增日志 CaseLogUtils.insertCaseLog(caseApplication.getId(), CaseApplicationConstants.CASE_FILING, ""); @@ -525,12 +528,15 @@ public class AdjudicationServiceImpl implements IAdjudicationService { private void sendCaseEmail(CaseApplication caseApplication1, String appEmail, String resEmail) { List fileList = new ArrayList<>(); File file = null; - List caseAttachList = caseApplication1.getCaseAttachList(); + + List caseAttachList = caseAttachMapper.queryCaseAttachList(caseApplication1); if (caseAttachList != null && caseAttachList.size() > 0) { for (CaseAttach caseAttach : caseAttachList) { if (caseAttach.getAnnexType() == 3) { - String annexPath = caseAttach.getAnnexPath(); - String path = "/home/ruoyi/" + annexPath; + String annexName = caseAttach.getAnnexName(); + String prefix = "/profile/upload/"; + int startIndex = prefix.length(); + String path = caseAttach.getAnnexPath() + annexName.substring(startIndex); file = new File(path); fileList.add(file); System.out.println("文件长度==================:" + file.length()); diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/SignAward.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/SignAward.java index 70a00d7..c260992 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/SignAward.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/SignAward.java @@ -91,6 +91,13 @@ public class SignAward { // System.out.println(signFlowDetailJsonObject); + String annexName = "/profile/upload/2023/10/26/1f6fe04f5f984e8ab5bbaf70dd47100a.docx"; + String prefix = "/profile/upload/"; + int startIndex = prefix.length(); + String annexPath = "/home/ruoyi/uploadPath/upload/"; + String annexPathnew = annexPath + annexName.substring(startIndex); + System.out.println(annexPathnew); + }