admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug修复

Browse Source
This commit is contained in:
guoshengxiong 2024-05-18 11:36:04 +08:00
parent 020bcebc57
commit ee92b7a942
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/zhgd/xmgl/call/HikvisionCall.java
View File

@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.convert.Convert; import cn.hutool.core.convert.Convert;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
@ -161,7 +162,10 @@ public class HikvisionCall {
* @return * @return
*/ */
public static String getHikvisionEventsPicture(HikvisionEventsPictureRq rq, String artemisConfigHost, String public static String getHikvisionEventsPicture(HikvisionEventsPictureRq rq, String artemisConfigHost, String
artemisConfigAppKey, String artemisConfigAppSecret) throws Exception {//获取视频事件的图片 artemisConfigAppKey, String artemisConfigAppSecret) throws Exception {
if (StrUtil.isBlank(rq.getPicUri()) || StrUtil.isBlank(rq.getSvrIndexCode())) {
return null;
}
final String ARTEMIS_PATH = "/artemis"; final String ARTEMIS_PATH = "/artemis";
final String path = ARTEMIS_PATH + "/api/video/v1/events/picture"; final String path = ARTEMIS_PATH + "/api/video/v1/events/picture";
String host = "https://" + artemisConfigHost; String host = "https://" + artemisConfigHost;

8
src/main/java/com/zhgd/xmgl/modules/video/service/impl/VideoItemServiceImpl.java
View File

@ -1,5 +1,6 @@
package com.zhgd.xmgl.modules.video.service.impl; package com.zhgd.xmgl.modules.video.service.impl;
import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@ -25,10 +26,7 @@ import com.zhgd.xmgl.modules.video.service.IVideoItemService;
import com.zhgd.xmgl.modules.worker.entity.UserDevAuthority; import com.zhgd.xmgl.modules.worker.entity.UserDevAuthority;
import com.zhgd.xmgl.modules.worker.mapper.UserDevAuthorityMapper; import com.zhgd.xmgl.modules.worker.mapper.UserDevAuthorityMapper;
import com.zhgd.xmgl.modules.worker.service.IUserDevAuthorityService; import com.zhgd.xmgl.modules.worker.service.IUserDevAuthorityService;
import com.zhgd.xmgl.util.DateUtils; import com.zhgd.xmgl.util.*;
import com.zhgd.xmgl.util.HikVideoUtil;
import com.zhgd.xmgl.util.MessageUtil;
import com.zhgd.xmgl.util.YsVideoUtil;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.collections.MapUtils; import org.apache.commons.collections.MapUtils;
@ -636,6 +634,8 @@ public class VideoItemServiceImpl extends ServiceImpl<VideoItemMapper, VideoItem
@Override @Override
public JSONObject callPostPlaybackURLsV2(Map<String, Object> map) { public JSONObject callPostPlaybackURLsV2(Map<String, Object> map) {
MapUtil.putIfNotBlank(map, "beginTime", "2000-01-01 00:00:00");
MapUtil.putIfNotBlank(map, "endTime", DateUtil.now());
String cameraIndexCode = MapUtils.getString(map, "serialNumber"); String cameraIndexCode = MapUtils.getString(map, "serialNumber");
Integer recordLocation = MapUtils.getInteger(map, "recordLocation"); Integer recordLocation = MapUtils.getInteger(map, "recordLocation");
String protocol = MapUtils.getString(map, "protocol"); String protocol = MapUtils.getString(map, "protocol");