From f0e9261c22bcb793ae7b5de715daf58657a0578c Mon Sep 17 00:00:00 2001 From: hejinbo Date: Mon, 6 Nov 2023 11:16:54 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=82=AE=E4=BB=B6=E5=8F=91=E9=80=81?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=A2=9E=E5=8A=A0=E5=8F=91=E9=80=81=E7=8A=B6?= =?UTF-8?q?=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/common/utils/EmailOutUtil.java | 5 +- .../domain/SendMailRecord.java | 16 ++++++ .../service/impl/AdjudicationServiceImpl.java | 54 +++++++++++-------- .../wisdomarbitrate/SendMailRecordMapper.xml | 5 +- 4 files changed, 56 insertions(+), 24 deletions(-) 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 37cf259..bafb463 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 @@ -93,7 +93,7 @@ public class EmailOutUtil { * @param subject 邮件主题 * @param fileList 邮件附件 */ - public void sendEmil(String to, String message, String subject, List fileList, File file) { + public Boolean sendEmil(String to, String message, String subject, List fileList, File file) { try { String messageContent = "

"+message+"。

"; MimeBodyPart messageBodyPart = new MimeBodyPart(); @@ -160,8 +160,9 @@ public class EmailOutUtil { Transport.send(msg); } catch (Exception e) { e.printStackTrace(); + return Boolean.FALSE; } - + return Boolean.TRUE; } /** diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/SendMailRecord.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/SendMailRecord.java index e994e3b..de3e11e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/SendMailRecord.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/SendMailRecord.java @@ -34,6 +34,22 @@ public class SendMailRecord extends BaseEntity { /** 案件编号 */ private String caseNum; + + + /** 发送状态 */ + private Integer sendStatus; + + + + public Integer getSendStatus() { + return sendStatus; + } + + public void setSendStatus(Integer sendStatus) { + this.sendStatus = sendStatus; + } + + public String getCaseNum() { return caseNum; } 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 3e371b6..206e199 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 @@ -105,10 +105,10 @@ public class AdjudicationServiceImpl implements IAdjudicationService { datas.put("resName", affiliate.getName()); datas.put("resAddress", affiliate.getResidenAffili()); String responSex = affiliate.getResponSex(); - if (responSex.equals("0")){ - datas.put("resSex","男"); - }else{ - datas.put("resSex","女"); + if (responSex.equals("0")) { + datas.put("resSex", "男"); + } else { + datas.put("resSex", "女"); } Date responBirth = affiliate.getResponBirth(); if (responBirth != null) { @@ -264,7 +264,7 @@ public class AdjudicationServiceImpl implements IAdjudicationService { String annexName = caseAttach.getAnnexName(); boolean isImageFile = Pattern.matches(".*\\.(jpg|png|gif|bmp)$", annexName); if (isImageFile) { - String annexPath = "/home/ruoyi"+caseAttach.getAnnexPath(); + String annexPath = "/home/ruoyi" + caseAttach.getAnnexPath(); System.out.println("路径是===========" + annexPath); PictureRenderData pictureRenderData = WordUtil .rebuildImageContent(100, 100, null, annexPath); @@ -274,7 +274,7 @@ public class AdjudicationServiceImpl implements IAdjudicationService { String annexName = caseAttach.getAnnexName(); boolean isImageFile = Pattern.matches(".*\\.(jpg|png|gif|bmp)$", annexName); if (isImageFile) { - String annexPath = "/home/ruoyi"+caseAttach.getAnnexPath(); + String annexPath = "/home/ruoyi" + caseAttach.getAnnexPath(); System.out.println("路径是===========" + annexPath); PictureRenderData pictureRenderData = WordUtil .rebuildImageContent(100, 100, null, annexPath); @@ -326,10 +326,10 @@ public class AdjudicationServiceImpl implements IAdjudicationService { .build(); //保存到附件表里,先判断之前有没有,有的话更新,没有的话新增 List caseAttachList = caseAttachMapper.getCaseAttachByCaseIdAndType(caseAttach); - if (caseAttachList != null && caseAttachList.size()>0) { + if (caseAttachList != null && caseAttachList.size() > 0) { //之前已经生成过了,更新 int i = caseAttachMapper.updateCaseAttachBycaseid(caseAttach); - }else { + } else { //之前没生成过,新增 int i = caseAttachMapper.save(caseAttach); if (i > 0) { @@ -540,8 +540,7 @@ public class AdjudicationServiceImpl implements IAdjudicationService { } } //发送邮件 - sendCaseEmail(caseApplication1, appEmail, resEmail); - + boolean b = sendCaseEmail(caseApplication1, appEmail, resEmail); SendMailRecord sendMailRecord = new SendMailRecord(); sendMailRecord.setCaseId(id); sendMailRecord.setMailAddress(appEmail); @@ -549,8 +548,12 @@ public class AdjudicationServiceImpl implements IAdjudicationService { sendMailRecord.setMailName("签署后的裁决书"); sendMailRecord.setSendTime(new Date()); sendMailRecord.setCreateBy(getUsername()); + if (b) { + sendMailRecord.setSendStatus(1); + } else { + sendMailRecord.setSendStatus(0); + } sendMailRecordMapper.saveSendMailRecord(sendMailRecord); - SendMailRecord sendMailRecord1 = new SendMailRecord(); sendMailRecord1.setCaseId(id); sendMailRecord1.setMailAddress(resEmail); @@ -558,6 +561,11 @@ public class AdjudicationServiceImpl implements IAdjudicationService { sendMailRecord1.setMailName("签署后的裁决书"); sendMailRecord1.setSendTime(new Date()); sendMailRecord1.setCreateBy(getUsername()); + if (b) { + sendMailRecord1.setSendStatus(1); + } else { + sendMailRecord1.setSendStatus(0); + } sendMailRecordMapper.saveSendMailRecord(sendMailRecord1); // 新增日志 @@ -573,7 +581,7 @@ public class AdjudicationServiceImpl implements IAdjudicationService { * @param appEmail * @param resEmail */ - private void sendCaseEmail(CaseApplication caseApplication1, String appEmail, String resEmail) { + private boolean sendCaseEmail(CaseApplication caseApplication1, String appEmail, String resEmail) { List fileList = new ArrayList<>(); File file = null; @@ -593,14 +601,18 @@ public class AdjudicationServiceImpl implements IAdjudicationService { } if (file != null) { try { - emailOutUtil.sendEmil(appEmail, "您好，审核后的裁决书在附件中请查阅", "签署后的裁决书", fileList, null); - emailOutUtil.sendEmil(resEmail, "您好，审核后的裁决书在附件中请查阅", "签署后的裁决书", fileList, null); + Boolean aBoolean = emailOutUtil.sendEmil(appEmail, "您好，审核后的裁决书在附件中请查阅", "签署后的裁决书", fileList, null); + Boolean aBoolean1 = emailOutUtil.sendEmil(resEmail, "您好，审核后的裁决书在附件中请查阅", "签署后的裁决书", fileList, null); + if (aBoolean && aBoolean1){ + return Boolean.TRUE; + } } catch (Exception e) { System.out.println("邮件发送失败++++++++++++++++++++++++++++++++"); System.out.println(e.toString()); + return Boolean.FALSE; } } - + return Boolean.FALSE; } @Override @@ -678,10 +690,10 @@ public class AdjudicationServiceImpl implements IAdjudicationService { datas.put("resName", affiliate.getName()); datas.put("resAddress", affiliate.getResidenAffili()); String responSex = affiliate.getResponSex(); - if (responSex.equals("0")){ - datas.put("resSex","男"); - }else{ - datas.put("resSex","女"); + if (responSex.equals("0")) { + datas.put("resSex", "男"); + } else { + datas.put("resSex", "女"); } Date responBirth = affiliate.getResponBirth(); if (responBirth != null) { @@ -838,7 +850,7 @@ public class AdjudicationServiceImpl implements IAdjudicationService { String annexName = caseAttach.getAnnexName(); boolean isImageFile = Pattern.matches(".*\\.(jpg|png|gif|bmp)$", annexName); if (isImageFile) { - String annexPath = "/home/ruoyi"+caseAttach.getAnnexPath(); + String annexPath = "/home/ruoyi" + caseAttach.getAnnexPath(); System.out.println("路径是===========" + annexPath); PictureRenderData pictureRenderData = WordUtil .rebuildImageContent(100, 100, null, annexPath); @@ -848,7 +860,7 @@ public class AdjudicationServiceImpl implements IAdjudicationService { String annexName = caseAttach.getAnnexName(); boolean isImageFile = Pattern.matches(".*\\.(jpg|png|gif|bmp)$", annexName); if (isImageFile) { - String annexPath = "/home/ruoyi"+caseAttach.getAnnexPath(); + String annexPath = "/home/ruoyi" + caseAttach.getAnnexPath(); System.out.println("路径是===========" + annexPath); PictureRenderData pictureRenderData = WordUtil .rebuildImageContent(100, 100, null, annexPath); diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/SendMailRecordMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/SendMailRecordMapper.xml index f6c3d23..b93e36d 100644 --- a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/SendMailRecordMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/SendMailRecordMapper.xml @@ -12,12 +12,13 @@ +