Browse Source

/platform/snapshotList鹭岛站适配中心

master
wangguangyuan 5 months ago
parent
commit
1558fc9e79
3 changed files with 5 additions and 2 deletions
  1. +3
    -0
      inspect-ivs/src/main/java/com/inspect/ivs/controller/IvsDeviceController.java
  2. +1
    -1
      inspect-ivs/src/main/java/com/inspect/ivs/service/IvsCommonService.java
  3. +1
    -1
      inspect-ivs/src/main/java/com/inspect/ivs/vo/IvsChanSnapVo.java

+ 3
- 0
inspect-ivs/src/main/java/com/inspect/ivs/controller/IvsDeviceController.java View File

@ -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");


+ 1
- 1
inspect-ivs/src/main/java/com/inspect/ivs/service/IvsCommonService.java View File

@ -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);
}


+ 1
- 1
inspect-ivs/src/main/java/com/inspect/ivs/vo/IvsChanSnapVo.java View File

@ -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() {}


Loading…
Cancel
Save