From c1138d8dab180db29485c3083499890cd368713a Mon Sep 17 00:00:00 2001 From: htjcAdmin Date: Wed, 23 Jul 2025 14:46:25 +0800 Subject: [PATCH] =?UTF-8?q?/*=E9=87=91=E5=8D=8E=E7=AB=99=E8=B7=91=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E8=BF=87=E7=A8=8B=E4=B8=AD=E5=8F=91=E7=8E=B0=E5=A6=82?= =?UTF-8?q?=E4=B8=8B=E9=97=AE=E9=A2=98=EF=BC=9A=E4=BB=BB=E5=8A=A1=E4=B8=AD?= =?UTF-8?q?=E6=9C=89=E4=B8=80=E4=B8=AA=E7=82=B9=E9=85=8D=E7=BD=AE=E6=88=90?= =?UTF-8?q?=E4=BA=86ir=E7=BA=A2=E5=A4=96=EF=BC=8C=E4=BD=86=E6=98=AF?= =?UTF-8?q?=E7=AE=97=E6=B3=95=E9=85=8D=E7=BD=AE=E6=88=90=E4=BA=86jsxs?= =?UTF-8?q?=EF=BC=9B=E6=9C=89=E4=B8=A4=E4=B8=AA=E7=82=B9=E4=BD=8D=E5=9C=A8?= =?UTF-8?q?patrol=5Ftask=5Finfo=E4=B8=AD=20=E6=9C=89=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=EF=BC=8C=E4=BD=86=E6=98=AF=E5=9C=A8patrol=5Fpreset=5Fpos?= =?UTF-8?q?=E8=A1=A8=E4=B8=AD=E6=B2=A1=E6=9C=89=E5=AF=B9=E5=BA=94=E7=9A=84?= =?UTF-8?q?=E9=A2=84=E7=BD=AE=E4=BD=8D=E8=AE=B0=E5=BD=95=EF=BC=8C=E4=BC=9A?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E7=A8=8B=E5=BA=8F=E5=BC=82=E5=B8=B8=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E9=97=AD=E7=8E=AF=E3=80=82=E4=BF=AE=E8=A1=A5=E8=AF=A5?= =?UTF-8?q?=E6=BC=8F=E6=B4=9E=EF=BC=8C=E8=AE=A9=E6=B5=81=E7=A8=8B=E8=83=BD?= =?UTF-8?q?=E5=A4=9F=E7=BB=A7=E7=BB=AD=E8=BF=9B=E8=A1=8C=E3=80=82*/?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/inspect/job/task/JobMainTask.java | 46 ++++++++++++++++--- 1 file changed, 39 insertions(+), 7 deletions(-) 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 28d7033..c2fe8cb 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 @@ -459,8 +459,10 @@ public class JobMainTask { if (presetPosSlim == null) { presetPosSlim = PatrolPresetPosSlim.builder() - .presetPosId("99999999") + .presetPosId(patrolPointId) .channelType("vl") + .patrolPointId(Long.valueOf(patrolPointId)) + .presetPosName("EMPTY_POS_V_INFO_DEVICE_ID_" + patrolPointId) .channelCode("ffffffffffffffffff#ffffffffffffffffffffffffffffffff") .videoNvrCode("ffffffffffffffffffffffffffffffff") .build(); @@ -503,7 +505,12 @@ public class JobMainTask { fileTypes.append("ir".equals(chanType) ? "1" : "vl".equals(chanType) ? "2" : "").append(","); //boolean bOk = false; try { - log.info("PHOTO PresetType uuid: {}, chanType: {}, videoNvrCode: {}, channelCode: {}, patrolPointId: {}", uuid, chanType, presetPos.getVideoNvrCode(), presetPos.getChannelCode(), presetPos.getPatrolPointId()); + log.info("PHOTO_PRESET_TYPE uuid: {}, chanType: {}, patrolPointId: {}, channelCode: {}, videoNvrCode: {}", + uuid, + chanType, + presetPos.getPatrolPointId(), + presetPos.getChannelCode(), + presetPos.getVideoNvrCode()); if ("vl".equals(chanType)) { String paramUrl = liveIVS_URL + "/api/v1/device/channelsnap?serial=" + presetPos.getVideoNvrCode() @@ -522,6 +529,8 @@ public class JobMainTask { //bOk = ftpResult.isOk(); filePaths.append("/" + ftpResult.getFilepath()); } + + recordPersist(taskExecRecord, infoListSize, patrolTaskInfo, presetPos, fileTypes, filePaths); } else if ("ir".equals(chanType)) { Map algSubtypeIdMap = taskExecClient.getAlgTypeListByPatrolPointId(String.valueOf(presetPos.getPatrolPointId())); String paramUrl = liveIVS_URL @@ -561,6 +570,14 @@ public class JobMainTask { + "&password=" + presetPos.getPassword() + "&address=" + presetPos.getAddress(); log.info("INFRARED_PROC INFRA_CAMERA prePointExec paramUrl: {}", paramUrl); + } else if (algSubtypeCode.contains(AlgConstants.INFRA_CAMERA_REVERSE)) { + paramUrl = paramUrl + + "&host=" + presetPos.getHost() + + "&port=" + presetPos.getPort() + + "&username=" + presetPos.getUsername() + + "&password=" + presetPos.getPassword() + + "&address=" + presetPos.getAddress(); + log.info("INFRARED_PROC INFRA_CAMERA_REVERSE prePointExec paramUrl: {}", paramUrl); } String paramFileDir = basePath + "CCD"; @@ -570,7 +587,12 @@ public class JobMainTask { log.info("INFRARED_PROC: filePath: {}", ftpResult.getFilepath()); filePaths.append("/" + ftpResult.getFilepath()); } + recordPersist(taskExecRecord, infoListSize, patrolTaskInfo, presetPos, fileTypes, filePaths); } else { // 古老的红外处理流程，保留勿删除 + log.info("INFRARED_PROC_OLD Failed to Cover id: {}, patrolPointId: {}: cameraCode: {}", + presetPos.getPresetPosId(), + presetPos.getPatrolPointId(), + presetPos.getChannelCode()); InfraredModel infraredModel = new InfraredModel(); infraredModel.setChannelSerial(presetPos.getChannelCode()); infraredModel.setPresetId(Integer.parseInt(presetPos.getPresetPosCode())); @@ -587,26 +609,36 @@ public class JobMainTask { log.info("INFRA:{}", taskExecRecord.getTaskName() + " path : " + path); } } + } else { + log.error("PATROL_POINT_NO_CHAN_TYPE id: {}, patrolPointId: {}: cameraCode: {}", + presetPos.getPresetPosId(), + presetPos.getPatrolPointId(), + presetPos.getChannelCode()); } } catch (Exception e) { log.error("error", e); } - recordPersist(taskExecRecord, infoListSize, patrolTaskInfo, presetPos, fileTypes, filePaths); + // recordPersist(taskExecRecord, infoListSize, patrolTaskInfo, presetPos, fileTypes, filePaths); } else if (PresetAction.VIDEO.getCode().equals(presetAction.getActionType())) { - log.info("VIDEO PresetType videoNvrCode: {}, channelCode: {}", presetPos.getVideoNvrCode(), presetPos.getChannelCode()); + log.info("VIDEO_PRESET_TYPE uuid: {}, chanType: {}, patrolPointId: {}, channelCode: {}, videoNvrCode: {}", + uuid, + presetPos.getChannelType(), + presetPos.getPatrolPointId(), + presetPos.getChannelCode(), + presetPos.getVideoNvrCode()); fileTypes.append(4).append(","); String jsonStr = HttpClientUtil.getHttpResultJson(liveIVS_URL + "/api/v1/stream/start?serial=" + presetPos.getVideoNvrCode() + "&code=" + presetPos.getChannelCode()); - log.info("先调用直播开始，获取流对象：/api/v1/stream/start?serial= :{} ", presetPos.getVideoNvrCode() + "&code=" + presetPos.getChannelCode()); + log.info("先调用直播开始, 获取流对象: /api/v1/stream/start?serial= :{} ", presetPos.getVideoNvrCode() + "&code=" + presetPos.getChannelCode()); log.info("/api/v1/stream/start 返回 json 字符串{} ", jsonStr); JSONObject UserInfoReturn = JSON.parseObject(jsonStr); Stream stream = JSON.toJavaObject(UserInfoReturn, Stream.class); try { String rel = HttpClientUtils.get(liveIVS_URL + "/api/v1/record/start", "streamid=" + stream.getStreamID() + "&code=" + presetPos.getChannelCode()); - log.info("视频录像开始：/api/v1/record/start streamid={} ", stream.getStreamID() + "，code=" + presetPos.getChannelCode() + "， 调用 /api/v1/record/start 返回值=" + rel); + log.info("视频录像开始: /api/v1/record/start streamid={} ", stream.getStreamID() + "，code=" + presetPos.getChannelCode() + "， 调用 /api/v1/record/start 返回值=" + rel); if (rel.isEmpty()) { rel = HttpClientUtils.get(liveIVS_URL + "/api/v1/record/start", "streamid=" + stream.getStreamID() + "&code=" + presetPos.getChannelCode()); - log.info("一次调用失败，第二次调用 视频录像开始：/api/v1/record/start streamid={} ", stream.getStreamID() + "，code=" + presetPos.getChannelCode() + "， 调用 /api/v1/record/start 返回值=" + rel); + log.info("一次调用失败，第二次调用 视频录像开始: /api/v1/record/start streamid={} ", stream.getStreamID() + "，code=" + presetPos.getChannelCode() + "， 调用 /api/v1/record/start 返回值=" + rel); } } catch (Exception e) { log.error("error", e);