SH-Arbitrate/Arbitrate-Backend
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit was merged in pull request #265.
This commit is contained in:
wangqiong123
2023-11-30 15:17:57 +08:00
committed by Gitea
parent 8acb479047 1b7f380867
commit cee39d271a
4 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/VideoController.java
+1 -1
View File
@@ -138,7 +138,7 @@ public class VideoController extends BaseController {
* @param annexType * @param annexType
* @return * @return
*/ */
@Anonymous
@GetMapping("attachListByCaseId") @GetMapping("attachListByCaseId")
public AjaxResult attachListByCaseId( @RequestParam("caseAppliId") Long caseAppliId,@RequestParam("annexType") Integer annexType) { public AjaxResult attachListByCaseId( @RequestParam("caseAppliId") Long caseAppliId,@RequestParam("annexType") Integer annexType) {
ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java
+1 -1
View File
@@ -142,7 +142,7 @@ public class RuoYiConfig
} }
public static String getHtml2PDFPath() public static String getHtml2PDFPath()
{ {
return getProfile() + "/upload/html2PDF/"; return getProfile() + "/upload/html2PDF";
} }
// https://1304001529.vod-qcloud.com/b78823bbvodcq1304001529/3ce565bf3270835011486046286/f0.mp4 // https://1304001529.vod-qcloud.com/b78823bbvodcq1304001529/3ce565bf3270835011486046286/f0.mp4
} }
ruoyi-common/src/main/java/com/ruoyi/common/utils/PdfUtils.java
-3
View File
@@ -36,9 +36,6 @@ public class PdfUtils {
Document document = new Document(); Document document = new Document();
PdfWriter writer = null; PdfWriter writer = null;
try { try {
// if(!new File(pdfFilePath).exists()){
// new File(pdfFilePath).createNewFile();
// }
writer = PdfWriter.getInstance(document, new FileOutputStream(pdfFilePath)); writer = PdfWriter.getInstance(document, new FileOutputStream(pdfFilePath));
// 设置底部距离60，解决重叠问题 // 设置底部距离60，解决重叠问题
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/VideoServiceImpl.java
+2 -2
View File
@@ -331,14 +331,14 @@ public class VideoServiceImpl implements VideoService {
} }
String htmlContent = "<html><body style=\"font-size:12.0pt; font-family:SimSun;\">" +reservedConferenceVO.getHtmlContent()+"</body></html>"; String htmlContent = "<html><body style=\"font-size:12.0pt; font-family:SimSun;\">" +reservedConferenceVO.getHtmlContent()+"</body></html>";
// html转pdf并上传到服务器 // html转pdf并上传到服务器
boolean convertFlag = PdfUtils.htmlStringConvertToPDF(RuoYiConfig.getHtml2PDFPath() + currentFileName, htmlContent); boolean convertFlag = PdfUtils.htmlStringConvertToPDF(RuoYiConfig.getHtml2PDFPath() +"/"+ currentFileName, htmlContent);
// 绑定案件 // 绑定案件
if(convertFlag){ if(convertFlag){
CaseAttach caseAttach = CaseAttach.builder().caseAppliId(reservedConferenceVO.getCaseId()) CaseAttach caseAttach = CaseAttach.builder().caseAppliId(reservedConferenceVO.getCaseId())
.annexName(fileName) .annexName(fileName)
.annexPath(RuoYiConfig.getHtml2PDFPath()) .annexPath(RuoYiConfig.getHtml2PDFPath())
.annexType(11) .annexType(7)
.build(); .build();
caseAttachMapper.save(caseAttach); caseAttachMapper.save(caseAttach);
return AjaxResult.success(); return AjaxResult.success();