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 2844c3d..9bba616 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 @@ -481,7 +481,7 @@ public class JobMainTask { if(algSubtypeCode.contains(AlgConstants.INFRA_1800)) { final String temperUrl = liveIVS_URL + "/api/v1/device/temper"; JSONObject temperParam = new JSONObject(); - temperParam.put("presetId", 0); + temperParam.put("presetId", Integer.parseInt(presetPos.getPresetPosCode())); temperParam.put("cameraCode", presetPos.getChannelCode()); final String temperUrlRes = HttpClientUtils.sendPostAgain(temperUrl, temperParam.toString()); log.info("[infra_1800] prePointExec temperUrlRes: {}", temperUrlRes); diff --git a/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolResultMapper.xml b/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolResultMapper.xml index 5f76dc7..a1a23bd 100644 --- a/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolResultMapper.xml +++ b/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolResultMapper.xml @@ -1016,10 +1016,11 @@ WHEN ra.image_normal_url_path IS NOT NULL THEN CONCAT('/', ra.image_normal_url_path) ELSE ra.image_normal_url_path END base_file_path, - pr.rectangle, + ra.res_pos rectangle, pr.valid valid, ra.filter filter, - ra.result_type result_type + ra.result_type result_type, + ra.description content FROM patrol_result pr LEFT JOIN basedata_patrolpoint bp on bp.patrol_point_id = pr.device_id LEFT JOIN patrol_preset_pos bpp ON bp.patrol_point_id = bpp.patrol_point_id diff --git a/inspect-metadata/src/main/resources/mapper/patrolpointmnt/BasedataPatrolPointMapper.xml b/inspect-metadata/src/main/resources/mapper/patrolpointmnt/BasedataPatrolPointMapper.xml index 81fee16..c1dfd16 100644 --- a/inspect-metadata/src/main/resources/mapper/patrolpointmnt/BasedataPatrolPointMapper.xml +++ b/inspect-metadata/src/main/resources/mapper/patrolpointmnt/BasedataPatrolPointMapper.xml @@ -389,7 +389,7 @@ WHEN ra.image_normal_url_path IS NOT NULL THEN CONCAT('/', ra.image_normal_url_path) ELSE ra.image_normal_url_path END base_file_path, - latest_pr.rectangle, + ra.res_pos rectangle, latest_pr.valid, ra.filter FROM (SELECT pr.*