联调

2024-01-23 14:06:12 +08:00
parent 986127f7ca
commit 74766cd4ee
6 changed files with 129 additions and 90 deletions
@@ -1,18 +1,5 @@
 package com.ruoyi.web.controller.system;

-import java.util.List;
-import org.apache.commons.lang3.ArrayUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.controller.BaseController;
@@ -21,6 +8,13 @@ import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.system.service.ISysDeptService;
+import org.apache.commons.lang3.ArrayUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;

 /**
 * 部门信息
@@ -44,6 +38,15 @@ public class SysDeptController extends BaseController
        List<SysDept> depts = deptService.selectDeptList(dept);
        return success(depts);
    }
+    /**
+     * 获取部门列表
+     */
+    @GetMapping("/selectList")
+    public AjaxResult selectList(SysDept dept)
+    {
+        List<SysDept> depts = deptService.selectDeptList(dept);
+        return success(depts);
+    }

    /**
     * 查询部门列表（排除节点）
@@ -3,17 +3,18 @@ package com.ruoyi.web.controller.wisdomarbitrate.mscase;

 import cn.hutool.core.collection.CollectionUtil;
 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.common.core.page.TableDataInfo;
 import com.ruoyi.common.exception.EsignDemoException;
 import com.ruoyi.wisdomarbitrate.domain.entity.mscase.MsCaseApplication;
 import com.ruoyi.wisdomarbitrate.domain.entity.mscase.MsCaseAttach;
-import com.ruoyi.wisdomarbitrate.domain.vo.mscase.BookingVO;
-import com.ruoyi.wisdomarbitrate.domain.vo.mscase.MsCaseApplicationReq;
-import com.ruoyi.wisdomarbitrate.domain.vo.mscase.MsCaseApplicationVO;
-import com.ruoyi.wisdomarbitrate.domain.vo.mscase.MsCaseAttachVO;
+import com.ruoyi.wisdomarbitrate.domain.vo.mscase.*;
 import com.ruoyi.wisdomarbitrate.service.mscase.MsCaseApplicationService;
+import com.ruoyi.wisdomarbitrate.service.mscase.VideoConferenceService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;

@@ -31,6 +32,8 @@ import java.util.List;
 public class MsCaseApplicationController extends BaseController {
    @Resource
    private MsCaseApplicationService caseApplicationService;
+    @Autowired
+    private VideoConferenceService videoService;

    /**
     * 分页查询案件列表
@@ -243,4 +246,48 @@ public class MsCaseApplicationController extends BaseController {

        return caseApplicationService.confirmMediation(attach);
    }
+    /**
+     * 获取userSign
+     * @param userId
+     * @return
+     */
+    @Anonymous
+    @GetMapping("/generateUserSign")
+    public AjaxResult generateUserSign(@RequestParam(required = true) String userId){
+        if(StrUtil.isEmpty(userId)){
+            error("参数校验失败");
+        }
+        return AjaxResult.success(videoService.generateUserSign(userId));
+    }
+    /**
+     * 生成房间号
+     * @return
+     */
+    @Anonymous
+    @GetMapping("/createRoomId")
+    public AjaxResult createRoomId(@RequestParam("caseId") Long caseId) {
+
+        return  success(videoService.createRoomId(caseId));
+    }
+    /**
+     * 预约会议
+     * @param reservedConferenceVO
+     * @return
+     */
+    @PostMapping("/reservedConference")
+    public AjaxResult reservedConference(@Validated @RequestBody MsReservedConferenceVO reservedConferenceVO) throws Exception {
+
+        return videoService.reservedConference(reservedConferenceVO);
+    }
+    /**
+     * 根据案件id查询已预约的会议
+     * @param caseId
+     * @return
+     */
+    @Anonymous
+    @GetMapping("/reserveConferenceList")
+    public AjaxResult reserveConferenceList(  @RequestParam("caseId") Long caseId) {
+
+        return  success(videoService.reserveConferenceList(caseId));
+    }
 }
@@ -9,7 +9,6 @@ import com.ruoyi.wisdomarbitrate.domain.vo.mscase.SendRoomNoMessageVO;
 import com.ruoyi.wisdomarbitrate.domain.vo.mscase.VideoCallBackVO;
 import com.ruoyi.wisdomarbitrate.service.mscase.VideoConferenceService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;

 import javax.validation.Valid;
@@ -35,50 +34,8 @@ public class MsVideoConferenceController extends BaseController {

        return videoService.videoList(caseId);
    }
-    /**
-     * 获取userSign
-     * @param userId
-     * @return
-     */
-    @Anonymous
-    @GetMapping("/generateUserSign")
-    public AjaxResult generateUserSign(@RequestParam(required = true) String userId){
-        if(StrUtil.isEmpty(userId)){
-            error("参数校验失败");
-        }
-        return AjaxResult.success(videoService.generateUserSign(userId));
-    }
-    /**
-     * 生成房间号
-     * @return
-     */
-    @Anonymous
-    @GetMapping("/createRoomId")
-    public AjaxResult createRoomId(@RequestParam("caseId") Long caseId) {

-        return  success(videoService.createRoomId(caseId));
-    }
-    /**
-     * 根据案件id查询已预约的会议
-     * @param caseId
-     * @return
-     */
-    @Anonymous
-    @GetMapping("/reserveConferenceList")
-    public AjaxResult reserveConferenceList(  @RequestParam("caseId") Long caseId) {

-        return  success(videoService.reserveConferenceList(caseId));
-    }
-    /**
-     * 预约会议
-     * @param reservedConferenceVO
-     * @return
-     */
-    @PostMapping("/reservedConference")
-    public AjaxResult reservedConference(@Validated @RequestBody MsReservedConferenceVO reservedConferenceVO) throws Exception {
-
-        return videoService.reservedConference(reservedConferenceVO);
-    }
    /**
     * 从腾讯云下载文件到本地
     * @param