From b79cf76f01142520c1f467733dd7c4b41fcc88cd Mon Sep 17 00:00:00 2001 From: htjcAdmin Date: Tue, 19 Aug 2025 16:56:41 +0800 Subject: [PATCH] =?UTF-8?q?/*=E4=BF=AE=E6=94=B9=E7=BA=A2=E5=A4=96=E5=9C=B0?= =?UTF-8?q?=E5=9D=80=E9=87=8C=E9=A2=84=E7=BD=AE=E4=BD=8D=E9=80=82=E9=85=8D?= =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E6=A0=B9=E6=8D=AE=E4=B8=8D=E5=90=8C?= =?UTF-8?q?=E7=82=B9=E4=BD=8D=E5=BE=97=E9=A2=84=E7=BD=AE=E4=BD=8Dcode?= =?UTF-8?q?=E6=9D=A5=E4=BF=AE=E6=AD=A3=E7=BA=A2=E5=A4=96=E5=9C=B0=E5=9D=80?= =?UTF-8?q?=E4=BF=A1=E6=81=AF*/?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/inspect/job/task/JobMainTask.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/inspect-job/src/main/java/com/inspect/job/task/JobMainTask.java b/inspect-job/src/main/java/com/inspect/job/task/JobMainTask.java index 7a1db61..d5ac566 100644 --- a/inspect-job/src/main/java/com/inspect/job/task/JobMainTask.java +++ b/inspect-job/src/main/java/com/inspect/job/task/JobMainTask.java @@ -472,9 +472,27 @@ public class JobMainTask { return presetPosSlim; } + private String getInfraredAddress(final int index, final PatrolPresetPosSlim presetPosSlim) { + String address = presetPosSlim.getAddress(); + String[] parts = address.split(StringUtils.COLON); + if (index >= 0 && index < parts.length) { + parts[index] = presetPosSlim.getPresetPosCode(); + return String.join(StringUtils.COLON, parts); + } + + log.info("getInfraredAddress invalid infrared address: {}, posId: {}", presetPosSlim.getAddress(), presetPosSlim.getPresetPosId()); + return address; + } + private PatrolTaskExecRecord prePointExec(PatrolTaskExecRecord taskExecRecord, PatrolTaskInfo patrolTaskInfo, int infoListSize) { String uuid = UUID.randomUUID().toString().trim().replaceAll(StringUtils.DASH, StringUtils.EMPTY); final PatrolPresetPosSlim presetPos = queryPatrolPresetPos(uuid, patrolTaskInfo.getDeviceId()); + if(StringUtils.isNotEmpty(presetPos.getAddress())) { + log.info("prePointExec remake infrared address: raw: {}", presetPos.getAddress()); + String infraredAddress = getInfraredAddress(3, presetPos); + presetPos.setAddress(infraredAddress); + log.info("prePointExec remake infrared address: cooked: {}", presetPos.getAddress()); + } boolean noError = ivsOperateRetryableDelegate.setCameraToPreset(uuid, presetPos); if (!testMode && noError) { log.info("setCameraToPreset no error, delay 20 seconds");