SH-Arbitrate
/
Arbitrate-Backend
Seguir 1
Destacar 0
Cuchillo 0
Código Incidencias 0 Peticiones pull -2 Lanzamientos 0 Wiki Activity
Explorar el Código

Merge branch 'qtz3' of SH-Arbitrate/Arbitrate-Backend into dev

qtz hace 2 años
padre
0d96ba00b8 9e16fc1b1a
commit
99b7649364
Se han modificado 5 ficheros con 54 adiciones y 21 borrados
Dividir vista Mostrar estadísticas de diff
  1. 12
    0
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/SendMailRecordController.java
  2. 5
    1
      ruoyi-common/src/main/java/com/ruoyi/common/utils/EmailOutUtil.java
  3. 4
    0
      ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ISendMailRecordService.java
  4. 26
    20
      ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/AdjudicationServiceImpl.java
  5. 7
    0
      ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/SignAward.java

+ 12
- 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/SendMailRecordController.java Ver fichero 

@@ -30,6 +30,18 @@ public class SendMailRecordController  extends BaseController {
30 30 
     }
31 31
32 32
33 
+//    /**
34 
+//     * 新增立案数据
35 
+//     */
36 
+//    @Log(title = "新增立案数据", businessType = BusinessType.INSERT)
37 
+//    @PostMapping("/addSendMailRecord")
38 
+//    public AjaxResult addSendMailRecord(@Validated @RequestBody SendMailRecord sendMailRecord)
39 
+//    {
40 
+//
41 
+//        return toAjax(sendMailRecordService.addSendMailRecord(sendMailRecord));
42 
+//    }
43 
+
44 
+
33 45
34 46
35 47

+ 5
- 1
ruoyi-common/src/main/java/com/ruoyi/common/utils/EmailOutUtil.java Ver fichero 

@@ -95,6 +95,9 @@ public class EmailOutUtil {
95 95 
      */
96 96 
     public  void sendEmil(String to, String message, String subject, List<File> fileList, File file) {
97 97 
         try {
98 
+            String messageContent = "<html><body><p style=\"font-family: Arial, sans-serif; font-size: 18px;\">"+message+"。</p></body></html>";
99 
+            MimeBodyPart messageBodyPart = new MimeBodyPart();
100 
+            messageBodyPart.setContent(messageContent, "text/html;charset=utf-8");
98 101 
             Security.addProvider(new com.sun.net.ssl.internal.ssl.Provider());
99 102 
             final String SSL_FACTORY = "javax.net.ssl.SSLSocketFactory";
100 103 
             //设置邮件会话参数
 
@@ -125,13 +128,14 @@ public class EmailOutUtil {
125 128 
             //设置邮件消息
126 129 
             msg.setSubject(subject);
127 130 
             msg.setText(message);
131 
+            msg.setDescription("messageutf-8html");
128 132 
             //设置发送的日期
129 133 
             msg.setSentDate(new Date());
130 134 
             // 创建邮件正文
131 135 
             MimeMultipart multipart = new MimeMultipart();
132 136 
 //            MimeBodyPart bodyPart = new MimeBodyPart();
133 137 
 //            bodyPart.setContent("This is the body of the email", "text/html");
134 
-//            multipart.addBodyPart(bodyPart);
138 
+            multipart.addBodyPart(messageBodyPart);
135 139 
             // 添加附件
136 140 
             if (file != null) {
137 141 
                 MimeBodyPart attachmentPart = new MimeBodyPart();

+ 4
- 0
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ISendMailRecordService.java Ver fichero 

@@ -8,4 +8,8 @@ public interface ISendMailRecordService {
8 8
9 9
10 10 
     List<SendMailRecord> selectSendMailRecordList(SendMailRecord sendMailRecord);
11 
+
12 
+
13 
+
14 
+
11 15 
 }

+ 26
- 20
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/AdjudicationServiceImpl.java Ver fichero 

@@ -341,28 +341,11 @@ public class AdjudicationServiceImpl implements IAdjudicationService {
341 341 
             if (appEmail != null) {
342 342 
                 emailOutUtil.sendMessageCarryFile(appEmail, "案件裁决书", "您的裁决书已送达,详情请查阅附件", file
343 343 
                         , "hjbjava@163.com", javaMailSender);
344 
-
345 
-                SendMailRecord sendMailRecord = new SendMailRecord();
346 
-                sendMailRecord.setCaseId(id);
347 
-                sendMailRecord.setMailAddress(appEmail);
348 
-                sendMailRecord.setMailContent("您的裁决书已送达,详情请查阅附件");
349 
-                sendMailRecord.setMailName("案件裁决书");
350 
-                sendMailRecord.setSendTime(new Date());
351 
-                sendMailRecord.setCreateBy(getUsername());
352 
-                sendMailRecordMapper.saveSendMailRecord(sendMailRecord);
353 344 
             }
354 345 
             if (resEmail != null) {
355 346 
                 emailOutUtil.sendMessageCarryFile(resEmail, "案件裁决书", "您的裁决书已送达,详情请查阅附件", file
356 347 
                         , "hjbjava@163.com", javaMailSender);
357 348
358 
-                SendMailRecord sendMailRecord = new SendMailRecord();
359 
-                sendMailRecord.setCaseId(id);
360 
-                sendMailRecord.setMailAddress(resEmail);
361 
-                sendMailRecord.setMailContent("您的裁决书已送达,详情请查阅附件");
362 
-                sendMailRecord.setMailName("案件裁决书");
363 
-                sendMailRecord.setSendTime(new Date());
364 
-                sendMailRecord.setCreateBy(getUsername());
365 
-                sendMailRecordMapper.saveSendMailRecord(sendMailRecord);
366 349 
             }
367 350 
             //修改案件状态
368 351 
             caseApplication1.setCaseStatus(CaseApplicationConstants.CASE_FILING);
 
@@ -480,6 +463,7 @@ public class AdjudicationServiceImpl implements IAdjudicationService {
480 463 
     }
481 464
482 465 
     @Override
466 
+    @Transactional
483 467 
     public AjaxResult service(Long id, String appEmail, String resEmail, String apptrackingNum, String restrackingNum) {
484 468 
         CaseApplication caseApplication = new CaseApplication();
485 469 
         caseApplication.setId(id);
 
@@ -509,6 +493,25 @@ public class AdjudicationServiceImpl implements IAdjudicationService {
509 493 
         }
510 494 
         //发送邮件
511 495 
         sendCaseEmail(caseApplication1, appEmail, resEmail);
496 
+
497 
+        SendMailRecord sendMailRecord = new SendMailRecord();
498 
+        sendMailRecord.setCaseId(id);
499 
+        sendMailRecord.setMailAddress(appEmail);
500 
+        sendMailRecord.setMailContent("您好，审核后的裁决书在附件中请查阅");
501 
+        sendMailRecord.setMailName("签署后的裁决书");
502 
+        sendMailRecord.setSendTime(new Date());
503 
+        sendMailRecord.setCreateBy(getUsername());
504 
+        sendMailRecordMapper.saveSendMailRecord(sendMailRecord);
505 
+
506 
+        SendMailRecord sendMailRecord1 = new SendMailRecord();
507 
+        sendMailRecord1.setCaseId(id);
508 
+        sendMailRecord1.setMailAddress(resEmail);
509 
+        sendMailRecord1.setMailContent("您好，审核后的裁决书在附件中请查阅");
510 
+        sendMailRecord1.setMailName("签署后的裁决书");
511 
+        sendMailRecord1.setSendTime(new Date());
512 
+        sendMailRecord1.setCreateBy(getUsername());
513 
+        sendMailRecordMapper.saveSendMailRecord(sendMailRecord1);
514 
+
512 515 
         // 新增日志
513 516 
         CaseLogUtils.insertCaseLog(caseApplication.getId(), CaseApplicationConstants.CASE_FILING, "");
514 517 
 
@@ -525,12 +528,15 @@ public class AdjudicationServiceImpl implements IAdjudicationService {
525 528 
     private void sendCaseEmail(CaseApplication caseApplication1, String appEmail, String resEmail) {
526 529 
         List<File> fileList = new ArrayList<>();
527 530 
         File file = null;
528 
-        List<CaseAttach> caseAttachList = caseApplication1.getCaseAttachList();
531 
+
532 
+        List<CaseAttach> caseAttachList = caseAttachMapper.queryCaseAttachList(caseApplication1);
529 533 
         if (caseAttachList != null && caseAttachList.size() > 0) {
530 534 
             for (CaseAttach caseAttach : caseAttachList) {
531 535 
                 if (caseAttach.getAnnexType() == 3) {
532 
-                    String annexPath = caseAttach.getAnnexPath();
533 
-                    String path = "/home/ruoyi/" + annexPath;
536 
+                    String annexName = caseAttach.getAnnexName();
537 
+                    String prefix = "/profile/upload/";
538 
+                    int startIndex = prefix.length();
539 
+                    String path = caseAttach.getAnnexPath() + annexName.substring(startIndex);
534 540 
                     file = new File(path);
535 541 
                     fileList.add(file);
536 542 
                     System.out.println("文件长度==================:" + file.length());

+ 7
- 0
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/SignAward.java Ver fichero 

@@ -91,6 +91,13 @@ public class SignAward {
91 91
92 92 
 //        System.out.println(signFlowDetailJsonObject);
93 93
94 
+        String annexName = "/profile/upload/2023/10/26/1f6fe04f5f984e8ab5bbaf70dd47100a.docx";
95 
+        String prefix = "/profile/upload/";
96 
+        int startIndex = prefix.length();
97 
+        String annexPath = "/home/ruoyi/uploadPath/upload/";
98 
+        String annexPathnew = annexPath + annexName.substring(startIndex);
99 
+        System.out.println(annexPathnew);
100 
+
94 101
95 102 
     }
96 103