From fcfb870e7f0076a0ca07330cce65d21847298372 Mon Sep 17 00:00:00 2001 From: lijiuwei Date: Wed, 13 Aug 2025 13:51:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E6=A8=A1=E5=9E=8B=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=AD=97=E6=AE=B5=E5=8C=B9=E9=85=8D=E8=A7=84=E8=8C=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/vo/DevicePointModelItem.java | 8 +++++ .../impl/BasedataPatrolPointServiceImpl.java | 36 +++++++++++++++---- 2 files changed, 37 insertions(+), 7 deletions(-) diff --git a/inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/domain/vo/DevicePointModelItem.java b/inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/domain/vo/DevicePointModelItem.java index a66743f..073d141 100644 --- a/inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/domain/vo/DevicePointModelItem.java +++ b/inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/domain/vo/DevicePointModelItem.java @@ -112,5 +112,13 @@ public class DevicePointModelItem implements Serializable { name = "video_pos" ) private String video_pos; + @XmlAttribute( + name = "point_type" + ) + private String point_type; + @XmlAttribute( + name = "label_attri" + ) + private String label_attri; } diff --git a/inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/service/impl/BasedataPatrolPointServiceImpl.java b/inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/service/impl/BasedataPatrolPointServiceImpl.java index 7943b40..40ad4e0 100644 --- a/inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/service/impl/BasedataPatrolPointServiceImpl.java +++ b/inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/service/impl/BasedataPatrolPointServiceImpl.java @@ -253,25 +253,47 @@ public class BasedataPatrolPointServiceImpl implements IBasedataPatrolPointServi BasedataPatrolPointPreset basedataPatrolpointPreset = new BasedataPatrolPointPreset(); basedataPatrolpointPreset.setPatrolPointId(patrolPoint.getPatrolPointId()); JSONArray presetJsonArray = this.modelPatrolPointPresetHandle(basedataPatrolpointPreset); + String video_pos = null; if (!presetJsonArray.isEmpty()) { - String presetJson = presetJsonArray.toJSONString(); - modelItem.setVideo_pos(presetJson); + String presetData = presetJsonArray.getJSONObject(0).getString("device_code"); + if(presetData == null || presetData.indexOf("#") == -1) { + video_pos = ""; + } else { + video_pos = presetData.substring(0, presetData.indexOf("#")); + } + } else { + video_pos = ""; } - modelItem.setStation_id(station_id); modelItem.setStation_name(station_name); + modelItem.setStation_code(station_id); + modelItem.setArea_id(areaId.toString()); + modelItem.setArea_name(area_name); + modelItem.setBay_id(""); + modelItem.setBay_name(""); modelItem.setMain_device_id(main_device_id); modelItem.setMain_device_name(main_device_name); modelItem.setComponent_id(component_id); modelItem.setComponent_name(component_name); modelItem.setDevice_id(device_id); modelItem.setDevice_name(device_name); - modelItem.setDevice_info(device_info); - modelItem.setPhase(phase); modelItem.setDevice_type(device_type); - modelItem.setArea_id(area_id); - modelItem.setArea_name(area_name); + modelItem.setMeter_type(""); + modelItem.setAppearance_type(""); + modelItem.setSave_type_list(""); modelItem.setRecognition_type_list(algSubtypeIds); + modelItem.setPhase(phase); + modelItem.setDevice_info(device_info); + modelItem.setData_type(""); + modelItem.setLower_value(""); + modelItem.setUpper_value(""); + modelItem.setVideo_pos(video_pos); + modelItem.setPoint_type(""); + modelItem.setLabel_attri(""); + + if(device_type == null || device_type.equals("10000")){ + continue; + } items.add(modelItem); }