Browse Source

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

hanchaobo 2 years ago
parent
commit
8d1190ce28

+ 1
- 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/VideoController.java View File

51
     }
51
     }
52
     /**
52
     /**
53
      * 根据案件ID查询视频
53
      * 根据案件ID查询视频
54
-     * @param
54
+     * @param caseId 案件id
55
      * @return
55
      * @return
56
      */
56
      */
57
-    @Anonymous
58
     @GetMapping("/videoList")
57
     @GetMapping("/videoList")
59
     public AjaxResult videoList(  @RequestParam Long caseId) {
58
     public AjaxResult videoList(  @RequestParam Long caseId) {
60
 
59
 

+ 3
- 0
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/VideoServiceImpl.java View File

215
     @Transactional
215
     @Transactional
216
     public  String downloadImage(String fileId,String fileUrl,String roomId) throws IOException {
216
     public  String downloadImage(String fileId,String fileUrl,String roomId) throws IOException {
217
         String staticAndMksDir = null;
217
         String staticAndMksDir = null;
218
+        log.info("fileUrl========");
218
         if (fileUrl != null) {
219
         if (fileUrl != null) {
219
             //下载时文件名称
220
             //下载时文件名称
220
             String fileName = fileUrl.substring(fileUrl.lastIndexOf("/"));
221
             String fileName = fileUrl.substring(fileUrl.lastIndexOf("/"));
223
                 String absPath = getAbsoluteFile(RuoYiConfig.getVideoUploadPath(), fileName).getAbsolutePath();
224
                 String absPath = getAbsoluteFile(RuoYiConfig.getVideoUploadPath(), fileName).getAbsolutePath();
224
                 staticAndMksDir = Paths.get(absPath).toFile().toString();
225
                 staticAndMksDir = Paths.get(absPath).toFile().toString();
225
                 HttpUtil.downloadFile(fileUrl, staticAndMksDir );
226
                 HttpUtil.downloadFile(fileUrl, staticAndMksDir );
227
+            log.info("selectCaseIdByRoomId========");
226
             Long caseId= caseApplicationMapper.selectCaseIdByRoomId(roomId);
228
             Long caseId= caseApplicationMapper.selectCaseIdByRoomId(roomId);
227
             String annexName = getPathFileName(RuoYiConfig.getVideoUploadPath(), fileName);
229
             String annexName = getPathFileName(RuoYiConfig.getVideoUploadPath(), fileName);
228
             // 存入数据库
230
             // 存入数据库
231
                     .annexPath(RuoYiConfig.getVideoUploadPath())
233
                     .annexPath(RuoYiConfig.getVideoUploadPath())
232
                     .annexType(9)
234
                     .annexType(9)
233
                     .build();
235
                     .build();
236
+            log.info("视频保存========");
234
              caseAttachMapper.save(caseAttach);
237
              caseAttachMapper.save(caseAttach);
235
             return annexName;
238
             return annexName;
236
         }
239
         }