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

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -250,8 +250,8 @@ public class SysUserController extends BaseController
      * @return
      */
     @Anonymous
-    @GetMapping("/generateUserSign")
-    public AjaxResult generateUserSign(@RequestParam(required = true) Long userId){
+    @GetMapping("/selectUserById")
+    public AjaxResult selectUserById(@RequestParam(required = true) Long userId){
         return AjaxResult.success(userService.selectUserById(userId));
     }
 }

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

@@ -388,4 +388,14 @@ public class CaseApplicationController extends BaseController {
         caseApplicationService.destroyRoomBack(body,request);
         return success();
     }
+    /**
+     * 根据案件id查询已预约的会议
+     * @param caseId
+     * @return
+     */
+    @GetMapping("/reserveConferenceList")
+    public AjaxResult reserveConferenceList(  @RequestParam("caseId") Long caseId) {
+
+        return  success(caseApplicationService.reserveConferenceList(caseId));
+    }
 }

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

@@ -103,4 +103,11 @@ public interface ICaseApplicationService {
      * @return
      */
     void destroyRoomBack(String body, HttpServletRequest request);
+
+    /**
+     * 根据案件id查询已预约的会议
+     * @param caseId
+     * @return
+     */
+    List<ReservedConference> reserveConferenceList(Long caseId);
 }

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

@@ -20,13 +20,13 @@ import com.ruoyi.common.utils.*;
 import com.ruoyi.common.utils.file.SaaSAPIFileUtils;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.system.domain.SysUserRole;
+import com.ruoyi.system.mapper.SysDeptMapper;
 import com.ruoyi.system.mapper.SysRoleMapper;
 import com.ruoyi.system.mapper.SysUserMapper;
 import com.ruoyi.system.mapper.SysUserRoleMapper;
 import com.ruoyi.wisdomarbitrate.domain.vo.ReservedConferenceVO;
 import com.ruoyi.wisdomarbitrate.domain.vo.ToDoCount;
 import com.ruoyi.wisdomarbitrate.utils.CaseLogUtils;
-import com.ruoyi.system.mapper.SysDeptMapper;
 import com.ruoyi.wisdomarbitrate.domain.*;
 import com.ruoyi.wisdomarbitrate.domain.vo.SendRoomNoMessageVO;
 import com.ruoyi.wisdomarbitrate.mapper.*;
@@ -1881,7 +1881,8 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
         request.setTemplateId("1952136");
         for (CaseAffiliate caseAffiliate : caseAffiliates) {
             request.setPhone(caseAffiliate.getContactTelphone());
-            request.setTemplateParamSet(new String[]{caseAffiliate.getName(), caseApplicationselect.getCaseNum(), messageVO.getRoomNo()+caseAffiliate.getUserId()});
+            String userId = (null==caseAffiliate.getUserId()?"" : caseAffiliate.getUserId());
+            request.setTemplateParamSet(new String[]{caseAffiliate.getName(), caseApplicationselect.getCaseNum(), messageVO.getRoomNo()+userId});
             // 1952136 普通短信 尊敬的{1}用户，您的{2}仲裁案件，开庭审理房间号为{3}，请在浏览器打开https://miniapp-3gpama6l759911ef-1321289474.tcloudbaseapp.com/jump-mp.html 请知晓，如非本人操作，请忽略本短信。
             Boolean aBoolean = SmsUtils.sendSms(request);
             //保存短信发送记录
@@ -1890,7 +1891,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
             smsSendRecord.setCaseNum(caseApplicationselect.getCaseNum());
             smsSendRecord.setPhone(request.getPhone());
             smsSendRecord.setSendTime(new Date());
-            String content = "尊敬的" + caseAffiliate.getName() + "用户，您的" + caseApplicationselect.getCaseNum() + "仲裁案件，开庭审理房间号为" + messageVO.getRoomNo()+caseAffiliate.getUserId() + "，请在微信内打开https://miniapp-3gpama6l759911ef-1321289474.tcloudbaseapp.com/jump-mp.html 请知晓，如非本人操作，请忽略本短信。";
+            String content = "尊敬的" + caseAffiliate.getName() + "用户，您的" + caseApplicationselect.getCaseNum() + "仲裁案件，开庭审理房间号为" + messageVO.getRoomNo()+userId + "，https://txroom.xayunmei.com/#/home, 请知晓，如非本人操作，请忽略本短信。";
             smsSendRecord.setSendContent(content);
 
             String userName;
@@ -2555,6 +2556,17 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
 
     }
 
+    /**
+     * 根据案件id查询已预约的会议
+     * @param caseId
+     * @return
+     */
+    @Override
+    public List<ReservedConference> reserveConferenceList(Long caseId) {
+
+        return reservedConferenceMapper.selectListByCaseId(caseId);
+    }
+
 
 }