SH-Arbitrate/Arbitrate-Backend
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Arbitrate-Backend into qtz5

Browse Source
This commit is contained in:
qitz
2024-01-19 17:26:09 +08:00
parent 5c434e576f 6b5e91c4d7
commit ff175c98df
2 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java
+1 -1
View File
@@ -3704,7 +3704,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
// 查询最大房间号
Long maxRoomId = caseApplicationMapper.selectMaxRoomId();
if (null == maxRoomId || maxRoomId > 4294967294L) {
if (null == maxRoomId || maxRoomId > 4294967294L/2) {
return 1L;
} else {
return maxRoomId + 1;
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/VideoServiceImpl.java
+15 -1
View File
@@ -3,6 +3,7 @@ package com.ruoyi.wisdomarbitrate.service.impl;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.http.HttpUtil;
import cn.hutool.json.JSONUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
@@ -134,7 +135,20 @@ public class VideoServiceImpl implements VideoService {
String mediaId = jsonObject3.getString("MediaId");
// 建立相关的数据库用来存储音视频录制地址并和相关的业务ID绑定，用于后续下载
try {
downloadImage(fileId,videoUrl,roomId);
// 调解系统roomId>4294967294L/2
if(StrUtil.isNotEmpty(roomId)) {
if (Integer.getInteger(roomId) > 4294967294L / 2) {
// 调用调解系统
cn.hutool.json.JSONObject params = JSONUtil.createObj();
params.set("roomId",roomId);
params.set("fileId",fileId);
params.set("videoUrl",videoUrl);
HttpUtil.post("http://172.16.1.14:6001/video/videoRollBack",params.toJSONString(2));
} else {
downloadImage(fileId, videoUrl, roomId);
}
}
} catch (IOException e) {
throw new RuntimeException(e);