From 1558fc9e79056914e7935f3c70696b8b50939088 Mon Sep 17 00:00:00 2001 From: wangguangyuan Date: Thu, 17 Jul 2025 15:29:58 +0800 Subject: [PATCH] =?UTF-8?q?/platform/snapshotList=E9=B9=AD=E5=B2=9B?= =?UTF-8?q?=E7=AB=99=E9=80=82=E9=85=8D=E4=B8=AD=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/inspect/ivs/controller/IvsDeviceController.java | 3 +++ .../main/java/com/inspect/ivs/service/IvsCommonService.java | 2 +- .../src/main/java/com/inspect/ivs/vo/IvsChanSnapVo.java | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/inspect-ivs/src/main/java/com/inspect/ivs/controller/IvsDeviceController.java b/inspect-ivs/src/main/java/com/inspect/ivs/controller/IvsDeviceController.java index 074eb4c..efad434 100644 --- a/inspect-ivs/src/main/java/com/inspect/ivs/controller/IvsDeviceController.java +++ b/inspect-ivs/src/main/java/com/inspect/ivs/controller/IvsDeviceController.java @@ -338,10 +338,12 @@ public class IvsDeviceController { final String presetName = ivsDevChanSnapVo.getName(); final String patrolPointId = ivsDevChanSnapVo.getId(); final String uuid = ivsResourceRetryableDelegate.getLabel(); + //http://199.199.199.154:9906/api/v1/device/channelsnap?serial=null&realtime=true&code=zx010500066194#xmludao&name=da&id=2074119 log.info(com.inspect.base.core.constant.Color.MAGENTA + "[IVS] CHANNEL_SNAPSHOT: {}" + com.inspect.base.core.constant.Color.END, ivsDevChanSnapVo.getCameraCode()); IvsSnapshotView ivsSnapshotView; try { ivsDevChanSnapVo.setUUID(uuid); + // 这里会向摄像机发送拍照指令 ivsSnapshotView = ivsResourceRetryableDelegate.getSnapshotRetryable(ivsDevChanSnapVo); } catch (IOException e) { log.info("ivsSnapshotView {}", e.getMessage() + " final fail"); @@ -365,6 +367,7 @@ public class IvsDeviceController { ivsChanSnapVo.setCameraCode(ivsDevChanSnapVo.getCameraCode()); ivsChanSnapVo.setDomainCode(ivsDevChanSnapVo.getDomainCode()); ivsChanSnapVo.setTaskID(ivsSnapshotView.getTaskID()); + // 这里会从摄像机获取拍照结果 snapShotView = ivsResourceRetryableDelegate.getSnapshotListRetryable(ivsChanSnapVo); } catch (IOException e) { log.info("snapShotView {}", e.getMessage() + " final fail"); diff --git a/inspect-ivs/src/main/java/com/inspect/ivs/service/IvsCommonService.java b/inspect-ivs/src/main/java/com/inspect/ivs/service/IvsCommonService.java index f868085..0d8706b 100644 --- a/inspect-ivs/src/main/java/com/inspect/ivs/service/IvsCommonService.java +++ b/inspect-ivs/src/main/java/com/inspect/ivs/service/IvsCommonService.java @@ -91,7 +91,7 @@ public class IvsCommonService { .cookie(HTTP_JSESSIONID_SESSION_NAME.concat("=").concat(cookie)) .execute() .body(); - log.info("[IVS] GET ADDRESS: {} URI: {}, RES: {}", address, uri, res); + log.info("[IVS] GET ADDRESS: {} URL: {}, RES: {}", address, url, res); return checkResultCodeAndConvertResult(label, uri, JSONObject.parseObject(res), clazz); } diff --git a/inspect-ivs/src/main/java/com/inspect/ivs/vo/IvsChanSnapVo.java b/inspect-ivs/src/main/java/com/inspect/ivs/vo/IvsChanSnapVo.java index 4b34a3f..dfc3b8a 100644 --- a/inspect-ivs/src/main/java/com/inspect/ivs/vo/IvsChanSnapVo.java +++ b/inspect-ivs/src/main/java/com/inspect/ivs/vo/IvsChanSnapVo.java @@ -4,7 +4,7 @@ import java.util.Objects; public class IvsChanSnapVo extends IvsVo { private String taskID; - private boolean encrypted = true; + private boolean encrypted = false; public IvsChanSnapVo() {}