lyq 3 月之前
父節點
當前提交
335e102891

+ 1 - 1
src/main/java/com/sooka/sponest/monitor/remoteapi/service/event/domain/CentereventTDownloads.java

@@ -1,4 +1,4 @@
-package com.sooka.sponest.monitor.remoteapi.service.event.domain;
+package com.sooka.sponest.event.download.domain;
 
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.web.domain.BaseEntity;

+ 4 - 1
src/main/java/com/sooka/sponest/monitor/dahua/service/DahuaService.java

@@ -4,6 +4,9 @@ package com.sooka.sponest.monitor.dahua.service;
 import com.dahuatech.hutool.http.Method;
 import com.dahuatech.hutool.json.JSONObject;
 import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.sooka.sponest.monitor.dahua.domain.PlayBackProperties;
+
+import java.util.List;
 
 
 public interface DahuaService {
@@ -12,7 +15,7 @@ public interface DahuaService {
      * 摄像头获取回放
      * @return
      */
-    AjaxResult getPlaybackByTime(String properties);
+    AjaxResult getPlaybackByTime(List<PlayBackProperties> propertiesList);
 
     Long getTimeSeconds(String time);
 

+ 2 - 3
src/main/java/com/sooka/sponest/monitor/dahua/service/impl/DahuaServiceImpl.java

@@ -22,6 +22,7 @@ import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.redis.service.RedisService;
 import com.ruoyi.system.api.domain.SysFile;
+import com.sooka.sponest.event.download.domain.CentereventTDownloads;
 import com.sooka.sponest.monitor.base.service.impl.BaseService;
 import com.sooka.sponest.monitor.camera.domain.CentermonitorTCamera;
 import com.sooka.sponest.monitor.camera.mapper.CentermonitorTCameraMapper;
@@ -33,7 +34,6 @@ import com.sooka.sponest.monitor.dahua.utils.HttpEnum;
 import com.sooka.sponest.monitor.dahua.utils.HttpTestUtils;
 import com.sooka.sponest.monitor.remoteapi.service.data.RemoteDataBaseService;
 import com.sooka.sponest.monitor.remoteapi.service.event.RemoteEventBaseService;
-import com.sooka.sponest.monitor.remoteapi.service.event.domain.CentereventTDownloads;
 import com.sooka.sponest.monitor.remoteapi.service.file.RemoteFileBaseService;
 import com.sooka.sponest.monitor.util.Mp4ParserUtils;
 import org.apache.commons.collections4.CollectionUtils;
@@ -77,9 +77,8 @@ public class DahuaServiceImpl extends BaseService implements DahuaService {
 
 
 
-    public AjaxResult getPlaybackByTime(String properties) {
+    public AjaxResult getPlaybackByTime(List<PlayBackProperties> propertiesList) {
         log.info("**GetPlaybackByTime->"+new Date()+"->start**");
-        List<PlayBackProperties> propertiesList = JSON.parseArray(properties, PlayBackProperties.class);
         for (PlayBackProperties property: propertiesList) {
             //下载并上传视频
             AjaxResult ajaxResult = getPlaybackByTime(property);