Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Arbitrate-Backend into qtz3

2023-10-30 20:07:00 +08:00
parent 0cda870fbd 5d91ed144f
commit 3a7687b31c
13 changed files with 550 additions and 94 deletions
@@ -1,6 +1,7 @@
 package com.ruoyi.web.controller.wisdomarbitrate;

 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
 import com.ruoyi.common.annotation.Anonymous;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
@@ -8,6 +9,7 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.exception.EsignDemoException;
+import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.WxAppletNotifyUtils;
 import com.ruoyi.wisdomarbitrate.domain.*;
 import com.ruoyi.wisdomarbitrate.domain.vo.SendRoomNoMessageVO;
@@ -37,6 +39,9 @@ public class CaseApplicationController extends BaseController {
 //    @PreAuthorize("@ss.hasPermi('caseManagement:list')")
    @GetMapping("/list")
    public TableDataInfo list(CaseApplication caseApplication) {
+        if(StrUtil.isEmpty(caseApplication.getSelectCaseStatus())){
+          caseApplication.setSelectCaseStatus("0");
+        }
        startPage();
        List<CaseApplication> list = caseApplicationService.selectCaseApplicationListByRole(caseApplication);
 //        List<CaseApplication> list = caseApplicationService.selectCaseApplicationList(caseApplication);
@@ -0,0 +1,62 @@
+package com.ruoyi.web.controller.wisdomarbitrate;
+
+import cn.hutool.core.util.StrUtil;
+import com.ruoyi.common.annotation.Anonymous;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.wisdomarbitrate.domain.IdentityAuthentication;
+import com.ruoyi.wisdomarbitrate.domain.vo.SendRoomNoMessageVO;
+import com.ruoyi.wisdomarbitrate.domain.vo.WeChatUserVO;
+import com.ruoyi.wisdomarbitrate.service.VideoService;
+import com.ruoyi.wisdomarbitrate.service.WeChatUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.validation.Valid;
+
+/**
+ * @author wangqiong
+ * @description 视频录制
+ * @date 2023-10-26 11:25
+ */
+@RestController
+@RequestMapping("/video")
+public class VideoController extends BaseController {
+    @Autowired
+    private VideoService videoService;
+
+    /**
+     * 从腾讯云下载文件到本地
+     * @param
+     * @return
+     */
+    @Anonymous
+    @PostMapping("/videoRollBack")
+    public AjaxResult videoRollBack(  @RequestBody String body, HttpServletRequest request) {
+        videoService.videoRollBack(body,request);
+       return success();
+    }
+    /**
+     * 根据房间号绑定案件ID
+     * @param
+     * @return
+     */
+    @Anonymous
+    @PostMapping("/bindCaseId")
+    public AjaxResult bindCaseId(@Valid @RequestBody SendRoomNoMessageVO vo) {
+
+        return videoService.bindCaseId(vo.getId(),vo.getRoomNo());
+    }
+    /**
+     * 根据案件ID查询视频
+     * @param caseId 案件id
+     * @return
+     */
+    @GetMapping("/videoList")
+    public AjaxResult videoList(  @RequestParam Long caseId) {
+
+        return videoService.videoList(caseId);
+    }
+}
@@ -55,6 +55,7 @@ public class WeChatUserController extends BaseController {
        ){
            return warn("参数校验失败");
        }
+        logger.info("调用小程序注册==="+ientityAuthentication.toString());
        return weChatUserService.registerUser(ientityAuthentication);
    }