From ee92b7a9427f44f5a88c250eeeff49cbc7b4b66f Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Sat, 18 May 2024 11:36:04 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/zhgd/xmgl/call/HikvisionCall.java | 6 +++++- .../modules/video/service/impl/VideoItemServiceImpl.java | 8 ++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java b/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java index d67527d58..93510693b 100644 --- a/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java +++ b/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java @@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; +import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; @@ -161,7 +162,10 @@ public class HikvisionCall { * @return */ 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 path = ARTEMIS_PATH + "/api/video/v1/events/picture"; String host = "https://" + artemisConfigHost; diff --git a/src/main/java/com/zhgd/xmgl/modules/video/service/impl/VideoItemServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/video/service/impl/VideoItemServiceImpl.java index 40736413a..34439e0ed 100644 --- a/src/main/java/com/zhgd/xmgl/modules/video/service/impl/VideoItemServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/video/service/impl/VideoItemServiceImpl.java @@ -1,5 +1,6 @@ package com.zhgd.xmgl.modules.video.service.impl; +import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 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.mapper.UserDevAuthorityMapper; import com.zhgd.xmgl.modules.worker.service.IUserDevAuthorityService; -import com.zhgd.xmgl.util.DateUtils; -import com.zhgd.xmgl.util.HikVideoUtil; -import com.zhgd.xmgl.util.MessageUtil; -import com.zhgd.xmgl.util.YsVideoUtil; +import com.zhgd.xmgl.util.*; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.MapUtils; @@ -636,6 +634,8 @@ public class VideoItemServiceImpl extends ServiceImpl map) { + MapUtil.putIfNotBlank(map, "beginTime", "2000-01-01 00:00:00"); + MapUtil.putIfNotBlank(map, "endTime", DateUtil.now()); String cameraIndexCode = MapUtils.getString(map, "serialNumber"); Integer recordLocation = MapUtils.getInteger(map, "recordLocation"); String protocol = MapUtils.getString(map, "protocol");