Thirdparty
/
wvp-GB28181-pro
mirror of https://github.com/648540858/wvp-GB28181-pro
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[RPC 云端录像] 修复时长显示

dev/数据库统合
648540858 2024-12-31 15:13:56 +08:00
parent 08a75d38a8
commit 32e90b2537
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/genersoft/iot/vmp/service/impl/CloudRecordServiceImpl.java
View File

@ -58,7 +58,8 @@ public class CloudRecordServiceImpl implements ICloudRecordService {
private IRedisRpcPlayService redisRpcPlayService; private IRedisRpcPlayService redisRpcPlayService;
@Override @Override
public PageInfo<CloudRecordItem> getList(int page, int count, String query, String app, String stream, String startTime, String endTime, List<MediaServer> mediaServerItems, String callId) { public PageInfo<CloudRecordItem> getList(int page, int count, String query, String app, String stream, String startTime,
String endTime, List<MediaServer> mediaServerItems, String callId) {
// 开始时间和结束时间在数据库中都是以秒为单位的 // 开始时间和结束时间在数据库中都是以秒为单位的
Long startTimeStamp = null; Long startTimeStamp = null;
Long endTimeStamp = null; Long endTimeStamp = null;

2
src/main/java/com/genersoft/iot/vmp/storager/dao/CloudRecordServiceMapper.java
View File

@ -40,7 +40,7 @@ public interface CloudRecordServiceMapper {
@Select(" <script>" + @Select(" <script>" +
"select * " + "select * " +
" from wvp_cloud_record " + " from wvp_cloud_record " +
" where 0 = 0" + " where 1 = 1" +
" <if test='query != null'> AND (app LIKE concat('%',#{query},'%') escape '/' OR stream LIKE concat('%',#{query},'%') escape '/' )</if> " + " <if test='query != null'> AND (app LIKE concat('%',#{query},'%') escape '/' OR stream LIKE concat('%',#{query},'%') escape '/' )</if> " +
" <if test= 'app != null '> and app=#{app}</if>" + " <if test= 'app != null '> and app=#{app}</if>" +
" <if test= 'stream != null '> and stream=#{stream}</if>" + " <if test= 'stream != null '> and stream=#{stream}</if>" +

12
src/main/java/com/genersoft/iot/vmp/vmanager/cloudRecord/CloudRecordController.java
View File

@ -103,12 +103,12 @@ public class CloudRecordController {
List<MediaServer> mediaServers; List<MediaServer> mediaServers;
if (!ObjectUtils.isEmpty(mediaServerId)) { if (!ObjectUtils.isEmpty(mediaServerId)) {
mediaServers = new ArrayList<>(); mediaServers = null;
MediaServer mediaServer = mediaServerService.getOne(mediaServerId); // MediaServer mediaServer = mediaServerService.getOne(mediaServerId);
if (mediaServer == null) { // if (mediaServer == null) {
throw new ControllerException(ErrorCode.ERROR100.getCode(), "未找到流媒体: " + mediaServerId); // throw new ControllerException(ErrorCode.ERROR100.getCode(), "未找到流媒体: " + mediaServerId);
} // }
mediaServers.add(mediaServer); // mediaServers.add(mediaServer);
} else { } else {
mediaServers = mediaServerService.getAllOnlineList(); mediaServers = mediaServerService.getAllOnlineList();
} }

4
web_src/src/components/CloudRecord.vue
View File

@ -65,8 +65,8 @@
</el-table-column> </el-table-column>
<el-table-column label="时长"> <el-table-column label="时长">
<template v-slot:default="scope"> <template v-slot:default="scope">
<el-tag v-if="scope.row.pushing && serverId !== scope.row.serverId" style="border-color: #ecf1af">{{formatTime(scope.row.timeLen)}}</el-tag> <el-tag v-if="serverId !== scope.row.serverId" style="border-color: #ecf1af">{{formatTime(scope.row.timeLen)}}</el-tag>
<el-tag v-if="scope.row.pushing && serverId === scope.row.serverId">{{formatTime(scope.row.timeLen)}}</el-tag> <el-tag v-if="serverId === scope.row.serverId">{{formatTime(scope.row.timeLen)}}</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="fileName" label="文件名称"> <el-table-column prop="fileName" label="文件名称">