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

ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseApplicationController.java

     }
 
     /**
-     * 查询立案信息 todo 必须传version
+     * 查询立案信息
      */
 //     @PreAuthorize("@ss.hasPermi('caseManagement:list:detail')")
     @PostMapping("/selectCaseApplication")
     public AjaxResult selectCaseApplication(@Validated @RequestBody CaseApplication caseApplication) {
-        if(caseApplication.getVersion()==null){
-            return error("参数校验失败");
-        }
+
         CaseApplication caseApplicationselect = caseApplicationService.selectCaseApplication(caseApplication);
         return success(caseApplicationselect);
     }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/VideoController.java

 
         return  videoService.dissolveRoom(reservedConferenceVO.getRoomId());
     }
+    /**
+     * 根据userId查询该用户是否是秘书
+     * @param userId
+     * @return
+     */
+    @Anonymous
+    @GetMapping("secretaryRoleByUserId")
+    public AjaxResult secretaryRoleByUserId(   @RequestParam(value = "userId",required = true) Long userId) {
+
+        return  videoService.secretaryRoleByUserId(userId);
+    }
 
 
 }

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/VideoService.java

      * @return
      */
     AjaxResult dissolveRoom( Long roomId);
+    /**
+     * 根据userId查询该用户是否是秘书
+     * @param userId
+     * @return
+     */
+    AjaxResult secretaryRoleByUserId(Long userId);
 }

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/VideoServiceImpl.java

 import com.ruoyi.common.config.RuoYiConfig;
 import com.ruoyi.common.constant.CacheConstants;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysRole;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.utils.SmsUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.spring.SpringUtils;
+import com.ruoyi.system.mapper.SysRoleMapper;
 import com.ruoyi.system.mapper.SysUserMapper;
+import com.ruoyi.system.mapper.SysUserRoleMapper;
 import com.ruoyi.wisdomarbitrate.domain.CaseApplication;
 import com.ruoyi.wisdomarbitrate.domain.CaseAttach;
 import com.ruoyi.wisdomarbitrate.domain.IdentityAuthentication;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 
+import static com.ruoyi.common.core.domain.AjaxResult.success;
 import static com.ruoyi.common.utils.file.FileUploadUtils.getAbsoluteFile;
 import static com.ruoyi.common.utils.file.FileUploadUtils.getPathFileName;
 
     private CaseApplicationMapper caseApplicationMapper;
     @Autowired
     private CaseAttachMapper caseAttachMapper;
+    @Autowired
+    private SysRoleMapper roleMapper;
 
     /**
      *  功能：第三方回调sign校验
     @Override
     public AjaxResult bindCaseId(Long caseId, String roomId) {
         caseApplicationMapper .bindCaseId(caseId,roomId);
-        return AjaxResult.success();
+        return success();
     }
 
     @Override
         caseApplication.setAnnexType(9);
         List<CaseAttach> caseAttachList = caseAttachMapper.queryCaseAttachList(caseApplication);
         if(CollectionUtil.isEmpty(caseAttachList)){
-            return AjaxResult.success();
+            return success();
         }
         for (CaseAttach caseAttach : caseAttachList) {
             String annexName = caseAttach.getAnnexName();
                 caseAttach.setAnnexName(annexNamenew);
             }
         }
-        return  AjaxResult.success(caseAttachList);
+        return  success(caseAttachList);
     }
 
     /**
             // 返回的resp是一个CreateCloudRecordingResponse的实例，与请求对象对应
             CreateCloudRecordingResponse resp = client.CreateCloudRecording(req);
 
-            return AjaxResult.success((JSONObject) JSON.toJSON(resp));
+            return success((JSONObject) JSON.toJSON(resp));
         } catch (TencentCloudSDKException e) {
             return AjaxResult.error(e.toString());
         }
             // 返回的resp是一个DeleteCloudRecordingResponse的实例，与请求对象对应
             DeleteCloudRecordingResponse resp = client.DeleteCloudRecording(req);
             // 输出json格式的字符串回包
-            return AjaxResult.success((JSONObject) JSON.toJSON(resp));
+            return success((JSONObject) JSON.toJSON(resp));
         } catch (TencentCloudSDKException e) {
             return AjaxResult.error(e.toString());
         }
         req.setRoomId(roomId);
         try {
             DismissRoomResponse resp = client.DismissRoom(req);
-            return AjaxResult.success((JSONObject) JSON.toJSON(resp));
+            return success((JSONObject) JSON.toJSON(resp));
         } catch (TencentCloudSDKException e) {
             return AjaxResult.error("解散房间失败");
         }
 
     }
 
+    @Override
+    public AjaxResult secretaryRoleByUserId(Long userId) {
+        List<SysRole> roles = roleMapper.selectRolePermissionByUserId(userId);
+        JSONObject jsonObject = new JSONObject();
+        boolean isSecretaryRole=false;
+        if(CollectionUtil.isNotEmpty(roles)){
+            for (SysRole role : roles) {
+                if("法律顾问".equals(role.getRoleName()) || "秘书".equals(role.getRoleName())){
+                    isSecretaryRole=true;
+                    break;
+                }
+            }
+        }
+        jsonObject.put("isSecretaryRole",isSecretaryRole);
+        return success(jsonObject);
+    }
+
 
     /**
      *  查询出音视频集合，并下载，在将云点播上面的音视频删除

ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml

         c.hear_date ,c.arbitrat_claims ,
         c.loan_start_date ,c.loan_end_date ,c.claim_princi_owed ,c.claim_interest_owed ,c.claim_liquid_damag ,c.fee_payable ,
         c.begin_video_date ,c.online_video_person ,c.contract_number ,c.create_by ,c.create_time ,c.lock_status,
-        c.update_by ,c.update_time , c.arbitrator_name,ca.application_organ_id applicationOrganId ,ca.application_organ_name as applicantName,c.filearbitra_url
+        c.update_by ,c.update_time , c.arbitrator_name,ca.application_organ_id applicationOrganId ,ca.application_organ_name as applicantName,c.filearbitra_url,c.version
         from case_log_record r
         join case_application c on r.case_appli_id=c.id
          JOIN case_affiliate ca ON ca.case_appli_id = c.id AND ca.identity_type=1
                    END paymentStatusName,c.pay_type,
                CASE c.pay_type when 0 then '线上支付' when 0 then '线下支付' else '' end payTypeName
         from case_application c left join case_payment_record p on c.id  = p.case_id
-        where c.case_status  = 3
-          AND c.id = #{id} and p.payment_status=1 limit 1
+        where  c.id = #{id} and p.payment_status=1 limit 1
 
     </select>
     <select id="selectCaseNumLike" resultType="java.lang.Integer">