18792927508 пре 2 година
родитељ
комит
1b7f380867

+ 1
- 1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/VideoController.java Прегледај датотеку

138
      * @param annexType
138
      * @param annexType
139
      * @return
139
      * @return
140
      */
140
      */
141
-    @Anonymous
141
+
142
     @GetMapping("attachListByCaseId")
142
     @GetMapping("attachListByCaseId")
143
     public AjaxResult attachListByCaseId( @RequestParam("caseAppliId") Long caseAppliId,@RequestParam("annexType") Integer annexType) {
143
     public AjaxResult attachListByCaseId( @RequestParam("caseAppliId") Long caseAppliId,@RequestParam("annexType") Integer annexType) {
144
 
144
 

+ 1
- 1
ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java Прегледај датотеку

142
     }
142
     }
143
     public static String getHtml2PDFPath()
143
     public static String getHtml2PDFPath()
144
     {
144
     {
145
-        return getProfile() + "/upload/html2PDF/";
145
+        return getProfile() + "/upload/html2PDF";
146
     }
146
     }
147
     // https://1304001529.vod-qcloud.com/b78823bbvodcq1304001529/3ce565bf3270835011486046286/f0.mp4
147
     // https://1304001529.vod-qcloud.com/b78823bbvodcq1304001529/3ce565bf3270835011486046286/f0.mp4
148
 }
148
 }

+ 0
- 3
ruoyi-common/src/main/java/com/ruoyi/common/utils/PdfUtils.java Прегледај датотеку

36
         Document document = new Document();
36
         Document document = new Document();
37
         PdfWriter writer = null;
37
         PdfWriter writer = null;
38
         try {
38
         try {
39
-//            if(!new File(pdfFilePath).exists()){
40
-//                new File(pdfFilePath).createNewFile();
41
-//            }
42
             writer = PdfWriter.getInstance(document, new FileOutputStream(pdfFilePath));
39
             writer = PdfWriter.getInstance(document, new FileOutputStream(pdfFilePath));
43
             // 设置底部距离60,解决重叠问题
40
             // 设置底部距离60,解决重叠问题
44
 
41
 

+ 2
- 2
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/VideoServiceImpl.java Прегледај датотеку

331
         }
331
         }
332
         String htmlContent = "<html><body style=\"font-size:12.0pt; font-family:SimSun;\">" +reservedConferenceVO.getHtmlContent()+"</body></html>";
332
         String htmlContent = "<html><body style=\"font-size:12.0pt; font-family:SimSun;\">" +reservedConferenceVO.getHtmlContent()+"</body></html>";
333
         // html转pdf并上传到服务器
333
         // html转pdf并上传到服务器
334
-        boolean convertFlag = PdfUtils.htmlStringConvertToPDF(RuoYiConfig.getHtml2PDFPath() + currentFileName, htmlContent);
334
+        boolean convertFlag = PdfUtils.htmlStringConvertToPDF(RuoYiConfig.getHtml2PDFPath() +"/"+ currentFileName, htmlContent);
335
 
335
 
336
         // 绑定案件
336
         // 绑定案件
337
         if(convertFlag){
337
         if(convertFlag){
338
             CaseAttach caseAttach = CaseAttach.builder().caseAppliId(reservedConferenceVO.getCaseId())
338
             CaseAttach caseAttach = CaseAttach.builder().caseAppliId(reservedConferenceVO.getCaseId())
339
                     .annexName(fileName)
339
                     .annexName(fileName)
340
                     .annexPath(RuoYiConfig.getHtml2PDFPath())
340
                     .annexPath(RuoYiConfig.getHtml2PDFPath())
341
-                    .annexType(11)
341
+                    .annexType(7)
342
                     .build();
342
                     .build();
343
             caseAttachMapper.save(caseAttach);
343
             caseAttachMapper.save(caseAttach);
344
             return AjaxResult.success();
344
             return AjaxResult.success();