SH-Arbitrate
/
Arbitrate-Backend
关注 1
点赞 0
派生 0
代码 工单 0 合并请求 -2 版本发布 0 百科 动态
浏览代码

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

wangqiong123 2 年前
父节点
8acb479047 1b7f380867
当前提交
cee39d271a
共有 4 个文件被更改，包括 4 次插入 和 7 次删除
分列视图 显示文件统计
  1. 1
    1
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/VideoController.java
  2. 1
    1
      ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java
  3. 0
    3
      ruoyi-common/src/main/java/com/ruoyi/common/utils/PdfUtils.java
  4. 2
    2
      ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/VideoServiceImpl.java

+ 1
- 1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/VideoController.java 查看文件 

@@ -138,7 +138,7 @@ public class VideoController extends BaseController {
138 138 
      * @param annexType
139 139 
      * @return
140 140 
      */
141 
-    @Anonymous
141 
+
142 142 
     @GetMapping("attachListByCaseId")
143 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,7 +142,7 @@ public class RuoYiConfig
142 142 
     }
143 143 
     public static String getHtml2PDFPath()
144 144 
     {
145 
-        return getProfile() + "/upload/html2PDF/";
145 
+        return getProfile() + "/upload/html2PDF";
146 146 
     }
147 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,9 +36,6 @@ public class PdfUtils {
36 36 
         Document document = new Document();
37 37 
         PdfWriter writer = null;
38 38 
         try {
39 
-//            if(!new File(pdfFilePath).exists()){
40 
-//                new File(pdfFilePath).createNewFile();
41 
-//            }
42 39 
             writer = PdfWriter.getInstance(document, new FileOutputStream(pdfFilePath));
43 40 
             // 设置底部距离60，解决重叠问题
44 41

+ 2
- 2
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/VideoServiceImpl.java 查看文件 

@@ -331,14 +331,14 @@ public class VideoServiceImpl implements VideoService {
331 331 
         }
332 332 
         String htmlContent = "<html><body style=\"font-size:12.0pt; font-family:SimSun;\">" +reservedConferenceVO.getHtmlContent()+"</body></html>";
333 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 337 
         if(convertFlag){
338 338 
             CaseAttach caseAttach = CaseAttach.builder().caseAppliId(reservedConferenceVO.getCaseId())
339 339 
                     .annexName(fileName)
340 340 
                     .annexPath(RuoYiConfig.getHtml2PDFPath())
341 
-                    .annexType(11)
341 
+                    .annexType(7)
342 342 
                     .build();
343 343 
             caseAttachMapper.save(caseAttach);
344 344 
             return AjaxResult.success();