Sfoglia il codice sorgente

部分功能实现

18792927508 2 anni fa
parent
commit
3316e61824

+ 2
- 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java Vedi File

250
      * @return
250
      * @return
251
      */
251
      */
252
     @Anonymous
252
     @Anonymous
253
-    @GetMapping("/generateUserSign")
254
-    public AjaxResult generateUserSign(@RequestParam(required = true) Long userId){
253
+    @GetMapping("/selectUserById")
254
+    public AjaxResult selectUserById(@RequestParam(required = true) Long userId){
255
         return AjaxResult.success(userService.selectUserById(userId));
255
         return AjaxResult.success(userService.selectUserById(userId));
256
     }
256
     }
257
 }
257
 }

+ 10
- 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseApplicationController.java Vedi File

388
         caseApplicationService.destroyRoomBack(body,request);
388
         caseApplicationService.destroyRoomBack(body,request);
389
         return success();
389
         return success();
390
     }
390
     }
391
+    /**
392
+     * 根据案件id查询已预约的会议
393
+     * @param caseId
394
+     * @return
395
+     */
396
+    @GetMapping("/reserveConferenceList")
397
+    public AjaxResult reserveConferenceList(  @RequestParam("caseId") Long caseId) {
398
+
399
+        return  success(caseApplicationService.reserveConferenceList(caseId));
400
+    }
391
 }
401
 }

+ 7
- 0
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ICaseApplicationService.java Vedi File

103
      * @return
103
      * @return
104
      */
104
      */
105
     void destroyRoomBack(String body, HttpServletRequest request);
105
     void destroyRoomBack(String body, HttpServletRequest request);
106
+
107
+    /**
108
+     * 根据案件id查询已预约的会议
109
+     * @param caseId
110
+     * @return
111
+     */
112
+    List<ReservedConference> reserveConferenceList(Long caseId);
106
 }
113
 }

+ 15
- 3
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java Vedi File

20
 import com.ruoyi.common.utils.file.SaaSAPIFileUtils;
20
 import com.ruoyi.common.utils.file.SaaSAPIFileUtils;
21
 import com.ruoyi.common.core.domain.entity.SysUser;
21
 import com.ruoyi.common.core.domain.entity.SysUser;
22
 import com.ruoyi.system.domain.SysUserRole;
22
 import com.ruoyi.system.domain.SysUserRole;
23
+import com.ruoyi.system.mapper.SysDeptMapper;
23
 import com.ruoyi.system.mapper.SysRoleMapper;
24
 import com.ruoyi.system.mapper.SysRoleMapper;
24
 import com.ruoyi.system.mapper.SysUserMapper;
25
 import com.ruoyi.system.mapper.SysUserMapper;
25
 import com.ruoyi.system.mapper.SysUserRoleMapper;
26
 import com.ruoyi.system.mapper.SysUserRoleMapper;
26
 import com.ruoyi.wisdomarbitrate.domain.vo.ReservedConferenceVO;
27
 import com.ruoyi.wisdomarbitrate.domain.vo.ReservedConferenceVO;
27
 import com.ruoyi.wisdomarbitrate.domain.vo.ToDoCount;
28
 import com.ruoyi.wisdomarbitrate.domain.vo.ToDoCount;
28
 import com.ruoyi.wisdomarbitrate.utils.CaseLogUtils;
29
 import com.ruoyi.wisdomarbitrate.utils.CaseLogUtils;
29
-import com.ruoyi.system.mapper.SysDeptMapper;
30
 import com.ruoyi.wisdomarbitrate.domain.*;
30
 import com.ruoyi.wisdomarbitrate.domain.*;
31
 import com.ruoyi.wisdomarbitrate.domain.vo.SendRoomNoMessageVO;
31
 import com.ruoyi.wisdomarbitrate.domain.vo.SendRoomNoMessageVO;
32
 import com.ruoyi.wisdomarbitrate.mapper.*;
32
 import com.ruoyi.wisdomarbitrate.mapper.*;
1881
         request.setTemplateId("1952136");
1881
         request.setTemplateId("1952136");
1882
         for (CaseAffiliate caseAffiliate : caseAffiliates) {
1882
         for (CaseAffiliate caseAffiliate : caseAffiliates) {
1883
             request.setPhone(caseAffiliate.getContactTelphone());
1883
             request.setPhone(caseAffiliate.getContactTelphone());
1884
-            request.setTemplateParamSet(new String[]{caseAffiliate.getName(), caseApplicationselect.getCaseNum(), messageVO.getRoomNo()+caseAffiliate.getUserId()});
1884
+            String userId = (null==caseAffiliate.getUserId()?"" : caseAffiliate.getUserId());
1885
+            request.setTemplateParamSet(new String[]{caseAffiliate.getName(), caseApplicationselect.getCaseNum(), messageVO.getRoomNo()+userId});
1885
             // 1952136 普通短信 尊敬的{1}用户,您的{2}仲裁案件,开庭审理房间号为{3},请在浏览器打开https://miniapp-3gpama6l759911ef-1321289474.tcloudbaseapp.com/jump-mp.html 请知晓,如非本人操作,请忽略本短信。
1886
             // 1952136 普通短信 尊敬的{1}用户,您的{2}仲裁案件,开庭审理房间号为{3},请在浏览器打开https://miniapp-3gpama6l759911ef-1321289474.tcloudbaseapp.com/jump-mp.html 请知晓,如非本人操作,请忽略本短信。
1886
             Boolean aBoolean = SmsUtils.sendSms(request);
1887
             Boolean aBoolean = SmsUtils.sendSms(request);
1887
             //保存短信发送记录
1888
             //保存短信发送记录
1890
             smsSendRecord.setCaseNum(caseApplicationselect.getCaseNum());
1891
             smsSendRecord.setCaseNum(caseApplicationselect.getCaseNum());
1891
             smsSendRecord.setPhone(request.getPhone());
1892
             smsSendRecord.setPhone(request.getPhone());
1892
             smsSendRecord.setSendTime(new Date());
1893
             smsSendRecord.setSendTime(new Date());
1893
-            String content = "尊敬的" + caseAffiliate.getName() + "用户,您的" + caseApplicationselect.getCaseNum() + "仲裁案件,开庭审理房间号为" + messageVO.getRoomNo()+caseAffiliate.getUserId() + ",请在微信内打开https://miniapp-3gpama6l759911ef-1321289474.tcloudbaseapp.com/jump-mp.html 请知晓,如非本人操作,请忽略本短信。";
1894
+            String content = "尊敬的" + caseAffiliate.getName() + "用户,您的" + caseApplicationselect.getCaseNum() + "仲裁案件,开庭审理房间号为" + messageVO.getRoomNo()+userId + ",https://txroom.xayunmei.com/#/home, 请知晓,如非本人操作,请忽略本短信。";
1894
             smsSendRecord.setSendContent(content);
1895
             smsSendRecord.setSendContent(content);
1895
 
1896
 
1896
             String userName;
1897
             String userName;
2555
 
2556
 
2556
     }
2557
     }
2557
 
2558
 
2559
+    /**
2560
+     * 根据案件id查询已预约的会议
2561
+     * @param caseId
2562
+     * @return
2563
+     */
2564
+    @Override
2565
+    public List<ReservedConference> reserveConferenceList(Long caseId) {
2566
+
2567
+        return reservedConferenceMapper.selectListByCaseId(caseId);
2568
+    }
2569
+
2558
 
2570
 
2559
 }
2571
 }
2560
 
2572