Quellcode durchsuchen

整合最新的代码

gy b vor 2 Jahren
Ursprung
Commit
edfd847318

+ 2
- 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseApplicationController.java Datei anzeigen

101
     /**
101
     /**
102
      * 查询签名链接
102
      * 查询签名链接
103
      */
103
      */
104
-    @PreAuthorize("@ss.hasPermi('caseManagement:list:selectSignUrl')")
104
+//    @PreAuthorize("@ss.hasPermi('caseManagement:list:selectSignUrl')")
105
     @PostMapping("/selectSignUrl")
105
     @PostMapping("/selectSignUrl")
106
     public AjaxResult selectSignUrl(@Validated @RequestBody CaseApplication caseApplication) throws EsignDemoException {
106
     public AjaxResult selectSignUrl(@Validated @RequestBody CaseApplication caseApplication) throws EsignDemoException {
107
         SealSignRecord sealSignRecordselect = caseApplicationService.selectSignUrl(caseApplication);
107
         SealSignRecord sealSignRecordselect = caseApplicationService.selectSignUrl(caseApplication);
111
     /**
111
     /**
112
      * 查询用印链接
112
      * 查询用印链接
113
      */
113
      */
114
-    @PreAuthorize("@ss.hasPermi('caseManagement:list:selectSealUrl')")
114
+//    @PreAuthorize("@ss.hasPermi('caseManagement:list:selectSealUrl')")
115
     @PostMapping("/selectSealUrl")
115
     @PostMapping("/selectSealUrl")
116
     public AjaxResult selectSealUrl(@Validated @RequestBody CaseApplication caseApplication) throws EsignDemoException {
116
     public AjaxResult selectSealUrl(@Validated @RequestBody CaseApplication caseApplication) throws EsignDemoException {
117
         SealSignRecord sealUrlRecordselect = caseApplicationService.selectSealUrl(caseApplication);
117
         SealSignRecord sealUrlRecordselect = caseApplicationService.selectSealUrl(caseApplication);

+ 1
- 1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseArbitrateController.java Datei anzeigen

23
      * @return
23
      * @return
24
      */
24
      */
25
     @PutMapping("/method")
25
     @PutMapping("/method")
26
-    @PreAuthorize("@ss.hasPermi('caseManagement:list:checkarbitrationway')")
26
+//    @PreAuthorize("@ss.hasPermi('caseManagement:list:checkarbitrationway')")
27
     public AjaxResult examineArbitrateMethod(@Validated @RequestBody CaseApplication caseApplication
27
     public AjaxResult examineArbitrateMethod(@Validated @RequestBody CaseApplication caseApplication
28
             ,Integer opinion){
28
             ,Integer opinion){
29
         return caseArbitrateService.examineArbitrateMethod(caseApplication,opinion);
29
         return caseArbitrateService.examineArbitrateMethod(caseApplication,opinion);

+ 1
- 1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseLogRecordController.java Datei anzeigen

22
     /**
22
     /**
23
      * 查询案件日志列表
23
      * 查询案件日志列表
24
      */
24
      */
25
-    @PreAuthorize("@ss.hasPermi('caseLog:list')")
25
+//    @PreAuthorize("@ss.hasPermi('caseLog:list')")
26
     @GetMapping("/list")
26
     @GetMapping("/list")
27
     public TableDataInfo list(CaseLogRecord caseLogRecord)
27
     public TableDataInfo list(CaseLogRecord caseLogRecord)
28
     {
28
     {

+ 14
- 14
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/AdjudicationServiceImpl.java Datei anzeigen

364
     private void sendCaseEmail(CaseApplication caseApplication1, String appEmail, String resEmail) {
364
     private void sendCaseEmail(CaseApplication caseApplication1, String appEmail, String resEmail) {
365
         List<File> fileList = new ArrayList<>();
365
         List<File> fileList = new ArrayList<>();
366
         File file = null;
366
         File file = null;
367
-//        List<CaseAttach> caseAttachList = caseApplication1.getCaseAttachList();
368
-//        if (caseAttachList != null && caseAttachList.size() > 0) {
369
-//            for (CaseAttach caseAttach : caseAttachList) {
370
-//                if (caseAttach.getAnnexType() == 3) {
371
-//                    String annexPath = caseAttach.getAnnexPath();
372
-//                    String path = "/home/ruoyi/" + annexPath;
367
+        List<CaseAttach> caseAttachList = caseApplication1.getCaseAttachList();
368
+        if (caseAttachList != null && caseAttachList.size() > 0) {
369
+            for (CaseAttach caseAttach : caseAttachList) {
370
+                if (caseAttach.getAnnexType() == 3) {
371
+                    String annexPath = caseAttach.getAnnexPath();
372
+                    String path = "/home/ruoyi/" + annexPath;
373
 //        String path = "/home/ruoyi/uploadPath/upload/2023/10/12/裁决书测试20231012test.docx";
373
 //        String path = "/home/ruoyi/uploadPath/upload/2023/10/12/裁决书测试20231012test.docx";
374
-        String path = "E:/WorkDoc/SH/裁决书测试20231012test.docx";
375
-        file = new File(path);
376
-        fileList.add(file);
377
-        System.out.println("文件长度:" + file.length());
378
-//                }
379
-//            }
380
-//        }
374
+//        String path = "E:/WorkDoc/SH/裁决书测试20231012test.docx";
375
+                    file = new File(path);
376
+                    fileList.add(file);
377
+                    System.out.println("文件长度:" + file.length());
378
+                }
379
+            }
380
+        }
381
         if (file != null) {
381
         if (file != null) {
382
             JavaMailSender javaMailSender = emailOutUtil.rebuildMailSender();
382
             JavaMailSender javaMailSender = emailOutUtil.rebuildMailSender();
383
             try {
383
             try {
431
         try {
431
         try {
432
 //            List<File> fileList = new ArrayList<>();
432
 //            List<File> fileList = new ArrayList<>();
433
 //            fileList.add(new File("D:\\home\\ruoyi\\uploadPath\\upload\\2023\\10\\7\\b442880179844a848f1f8b08c29e3d0c.docx"));
433
 //            fileList.add(new File("D:\\home\\ruoyi\\uploadPath\\upload\\2023\\10\\7\\b442880179844a848f1f8b08c29e3d0c.docx"));
434
- //           File file = fileList.get(0);//System.out.println("这是文件"+file);
434
+            //           File file = fileList.get(0);//System.out.println("这是文件"+file);
435
             //电子邮件送达
435
             //电子邮件送达
436
 //            EmailOutUtil emailOutUtil = new EmailOutUtil();
436
 //            EmailOutUtil emailOutUtil = new EmailOutUtil();
437
 //            JavaMailSender javaMailSender = emailOutUtil.rebuildMailSender();
437
 //            JavaMailSender javaMailSender = emailOutUtil.rebuildMailSender();

+ 290
- 258
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java
Datei-Diff unterdrückt, da er zu groß ist
Datei anzeigen