From 69fbcd4b4b1974329ca1db761e0a4893a92000eb Mon Sep 17 00:00:00 2001 From: 18792927508 <1322446236@qq.com> Date: Mon, 27 Nov 2023 17:59:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A1=88=E4=BB=B6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CaseApplicationController.java | 6 ++-- .../wisdomarbitrate/VideoController.java | 11 ++++++ .../wisdomarbitrate/service/VideoService.java | 6 ++++ .../service/impl/VideoServiceImpl.java | 35 +++++++++++++++---- .../wisdomarbitrate/CaseApplicationMapper.xml | 5 ++- 5 files changed, 50 insertions(+), 13 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseApplicationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseApplicationController.java index 0b4250b..15bd80f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseApplicationController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseApplicationController.java @@ -122,14 +122,12 @@ public class CaseApplicationController extends BaseController { } /** - * 查询立案信息 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); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/VideoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/VideoController.java index e03b8b9..7e8590a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/VideoController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/VideoController.java @@ -107,6 +107,17 @@ public class VideoController extends BaseController { 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); + } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/VideoService.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/VideoService.java index ec47ed5..253c9ea 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/VideoService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/VideoService.java @@ -33,4 +33,10 @@ public interface VideoService { * @return */ AjaxResult dissolveRoom( Long roomId); + /** + * 根据userId查询该用户是否是秘书 + * @param userId + * @return + */ + AjaxResult secretaryRoleByUserId(Long userId); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/VideoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/VideoServiceImpl.java index c0485f7..7a4cc07 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/VideoServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/VideoServiceImpl.java @@ -9,6 +9,7 @@ import com.alibaba.fastjson.JSONObject; 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; @@ -16,7 +17,9 @@ import com.ruoyi.common.utils.SecurityUtils; 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; @@ -56,6 +59,7 @@ import java.util.concurrent.ExecutorService; 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; @@ -83,6 +87,8 @@ public class VideoServiceImpl implements VideoService { private CaseApplicationMapper caseApplicationMapper; @Autowired private CaseAttachMapper caseAttachMapper; + @Autowired + private SysRoleMapper roleMapper; /** * 功能：第三方回调sign校验 @@ -137,7 +143,7 @@ public class VideoServiceImpl implements VideoService { @Override public AjaxResult bindCaseId(Long caseId, String roomId) { caseApplicationMapper .bindCaseId(caseId,roomId); - return AjaxResult.success(); + return success(); } @Override @@ -147,7 +153,7 @@ public class VideoServiceImpl implements VideoService { caseApplication.setAnnexType(9); List caseAttachList = caseAttachMapper.queryCaseAttachList(caseApplication); if(CollectionUtil.isEmpty(caseAttachList)){ - return AjaxResult.success(); + return success(); } for (CaseAttach caseAttach : caseAttachList) { String annexName = caseAttach.getAnnexName(); @@ -162,7 +168,7 @@ public class VideoServiceImpl implements VideoService { caseAttach.setAnnexName(annexNamenew); } } - return AjaxResult.success(caseAttachList); + return success(caseAttachList); } /** @@ -227,7 +233,7 @@ public class VideoServiceImpl implements VideoService { // 返回的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()); } @@ -259,7 +265,7 @@ public class VideoServiceImpl implements VideoService { // 返回的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()); } @@ -282,13 +288,30 @@ public class VideoServiceImpl implements VideoService { 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 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); + } + /** * 查询出音视频集合，并下载，在将云点播上面的音视频删除 diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml index f55c4ec..2d1d655 100644 --- a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml @@ -471,7 +471,7 @@ 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 @@ -1573,8 +1573,7 @@ order by c.create_time desc limit 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