From e58802099839aea076f3e3dc6cc07daa51033cde Mon Sep 17 00:00:00 2001 From: htjcAdmin Date: Tue, 9 Dec 2025 10:36:19 +0800 Subject: [PATCH] =?UTF-8?q?/*=E7=BA=A0=E5=81=8F=E7=AE=97=E6=B3=95=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E5=AE=8C=E6=88=90=EF=BC=9A=E5=9C=A8=E8=BF=9B=E8=A1=8C?= =?UTF-8?q?=E7=AC=AC=E4=B8=80=E6=AD=A5=E8=BD=AC=E5=88=B0=E9=A2=84=E7=BD=AE?= =?UTF-8?q?=E4=BD=8D=E5=92=8C=E7=AC=AC=E4=BA=8C=E9=83=A8=E4=B8=8B=E5=8F=91?= =?UTF-8?q?=E7=BA=A0=E5=81=8F=E6=8C=87=E4=BB=A4=E6=88=90=E5=8A=9F=E4=BB=A5?= =?UTF-8?q?=E5=90=8E=E8=B0=83=E7=94=A8=E7=AC=AC=E4=B8=89=E6=AD=A5=EF=BC=9A?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E9=A2=84=E7=BD=AE=E4=BD=8D=E5=BD=93=E5=89=8D?= =?UTF-8?q?=E7=BA=A0=E5=81=8F=E9=85=8D=E7=BD=AE=E3=80=82*/?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ivs/controller/IvsControlController.java | 21 ++++++++++++++++++- .../com/inspect/ivs/vo/IvsPresetExVo.java | 1 + .../service/impl/PatrolTaskServiceImpl.java | 13 ++++++++++++ 3 files changed, 34 insertions(+), 1 deletion(-) diff --git a/inspect-ivs/src/main/java/com/inspect/ivs/controller/IvsControlController.java b/inspect-ivs/src/main/java/com/inspect/ivs/controller/IvsControlController.java index a9730a2..9a4ff35 100644 --- a/inspect-ivs/src/main/java/com/inspect/ivs/controller/IvsControlController.java +++ b/inspect-ivs/src/main/java/com/inspect/ivs/controller/IvsControlController.java @@ -113,7 +113,26 @@ public class IvsControlController { ivsPresetVo.getCameraCode()); ivsPresetVo.setUUID(uuid); return ivsResourceRetryableDelegate.gotoSnapshotPresetExRetryable(version, ivsPresetVo); - } else { + } else if (command.equals("correctionSet")) { + JSONObject ptzPresetInfo = new JSONObject(); + ptzPresetInfo.put("presetIndex", Integer.parseInt(ivsPresetVo.getPreset())); + ptzPresetInfo.put("presetName", ivsPresetVo.getName()); + + JSONObject paramJsonPreSet = new JSONObject(); + paramJsonPreSet.put("cameraCode", ivsPresetVo.getCode()); + paramJsonPreSet.put("ptzPresetInfo", ptzPresetInfo); + log.info("PRESET_EX CORRECTION_SET cameraCode: {}, preset: {}, name: {}, paramBody: {}", + ivsPresetVo.getCameraCode(), + ivsPresetVo.getPreset(), + ivsPresetVo.getName(), + paramJsonPreSet.toJSONString()); + IvsPresetView ivsPresetView = ivsCommonService.postJson(ivsResourceRetryableDelegate.getLabel(), + paramJsonPreSet, + IvsConst.URI_PRESET_SET, + IvsPresetView.class); + log.info("PRESET_EX CORRECTION_SET RES: {}", ivsPresetView); + return Response.ok(ivsPresetView); + }else { return Response.ok(); } } diff --git a/inspect-ivs/src/main/java/com/inspect/ivs/vo/IvsPresetExVo.java b/inspect-ivs/src/main/java/com/inspect/ivs/vo/IvsPresetExVo.java index 94c9d0e..dff6095 100644 --- a/inspect-ivs/src/main/java/com/inspect/ivs/vo/IvsPresetExVo.java +++ b/inspect-ivs/src/main/java/com/inspect/ivs/vo/IvsPresetExVo.java @@ -7,6 +7,7 @@ import lombok.Setter; @Setter public class IvsPresetExVo extends IvsVo { private String command; + private String preset; private String controlCode; private String controlPara1; private String controlPara2; diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/task/service/impl/PatrolTaskServiceImpl.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/task/service/impl/PatrolTaskServiceImpl.java index 80e1cbd..7f20199 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/task/service/impl/PatrolTaskServiceImpl.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/task/service/impl/PatrolTaskServiceImpl.java @@ -204,6 +204,19 @@ public class PatrolTaskServiceImpl implements IPatrolTaskService { log.info("controller correctionAlgorithm correction param: {}", param); try { HttpClientUtils.get(url, param); + Thread.sleep(5000); + // 保存预置位 + final String url3 = "http://199.199.199.154:9906" + "/api/v1/control/presetEx"; + final String param3 = "command=correctionSet" + + "&code=" + channelCode + + "&preset=" + presetPosCode + + "&name=" + URLEncoder.encode(presetPosName, ("UTF-8")) + ; + try { + HttpClientUtils.get(url3, param3); + } catch (Exception e) { + log.info("controller correctionAlgorithm url3 execute exception: {}", e.getMessage()); + } } catch (Exception e) { log.info("controller correctionAlgorithm HttpClientUtils.get execute exception: {}", e.getMessage()); }