Browse Source

印尼-易达需要接口增加content

master
王寅 7 months ago
parent
commit
d490324d2e
3 changed files with 5 additions and 4 deletions
  1. +1
    -1
      inspect-job/src/main/java/com/inspect/job/task/JobMainTask.java
  2. +3
    -2
      inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolResultMapper.xml
  3. +1
    -1
      inspect-metadata/src/main/resources/mapper/patrolpointmnt/BasedataPatrolPointMapper.xml

+ 1
- 1
inspect-job/src/main/java/com/inspect/job/task/JobMainTask.java View File

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


+ 3
- 2
inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolResultMapper.xml View File

@ -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


+ 1
- 1
inspect-metadata/src/main/resources/mapper/patrolpointmnt/BasedataPatrolPointMapper.xml View File

@ -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.*


Loading…
Cancel
Save