From 58f247a92a8217ee053b1b86cf7dcc84cbc5a9aa Mon Sep 17 00:00:00 2001 From: htjcAdmin Date: Tue, 22 Apr 2025 14:06:57 +0800 Subject: [PATCH] =?UTF-8?q?/*=E6=97=A0=E4=BA=BA=E6=9C=BA=E7=BA=A2=E5=A4=96?= =?UTF-8?q?=E6=A1=86=E6=9E=B6=E6=B5=81=E7=A8=8B=E9=97=AD=E7=8E=AF=E3=80=82?= =?UTF-8?q?*/?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/result/PatrolPresetPos.java | 71 ++++++++++++++ .../mapper/PatrolPresetPosMapper.java | 12 +++ .../service/impl/AlgorithmServiceImpl.java | 49 +++++++--- .../mapper/PatrolPresetPosMapper.xml | 95 +++++++++++++++++++ .../resources/mapper/PatrolResultMapper.xml | 12 +-- 5 files changed, 218 insertions(+), 21 deletions(-) create mode 100644 src/main/java/com/inspect/simulator/domain/result/PatrolPresetPos.java create mode 100644 src/main/java/com/inspect/simulator/mapper/PatrolPresetPosMapper.java create mode 100644 src/main/resources/mapper/PatrolPresetPosMapper.xml diff --git a/src/main/java/com/inspect/simulator/domain/result/PatrolPresetPos.java b/src/main/java/com/inspect/simulator/domain/result/PatrolPresetPos.java new file mode 100644 index 0000000..7781dd4 --- /dev/null +++ b/src/main/java/com/inspect/simulator/domain/result/PatrolPresetPos.java @@ -0,0 +1,71 @@ +package com.inspect.simulator.domain.result; + +import com.inspect.simulator.domain.BaseEntity; +import lombok.*; + +import java.util.Objects; + +@Getter +@Setter +public class PatrolPresetPos extends BaseEntity { + private static final long serialVersionUID = 1L; + private String presetPosId; + private String presetPosCode; + private String presetPosName; + private Long patrolPointId; + private String channelId; + private String coordinateType; + private Long stopTime; + private String channelImg; + private String description; + private String isEnable; + private String algSubtypeCode; + private String eqpBookId; + private String channelCode; + private String channelType; + private String patrolDeviceCode; + private String stdParolPointId; + private String deviceId; + private String patrolDeviceName; + private String videoNvrCode; + private String channelContent; + + @Override + public boolean equals(Object object) { + if (this == object) return true; + if (object == null || getClass() != object.getClass()) return false; + PatrolPresetPos that = (PatrolPresetPos) object; + return Objects.equals(presetPosId, that.presetPosId) && Objects.equals(presetPosCode, that.presetPosCode) && Objects.equals(presetPosName, that.presetPosName) && Objects.equals(patrolPointId, that.patrolPointId) && Objects.equals(channelId, that.channelId) && Objects.equals(coordinateType, that.coordinateType) && Objects.equals(stopTime, that.stopTime) && Objects.equals(channelImg, that.channelImg) && Objects.equals(description, that.description) && Objects.equals(isEnable, that.isEnable) && Objects.equals(algSubtypeCode, that.algSubtypeCode) && Objects.equals(eqpBookId, that.eqpBookId) && Objects.equals(channelCode, that.channelCode) && Objects.equals(channelType, that.channelType) && Objects.equals(patrolDeviceCode, that.patrolDeviceCode) && Objects.equals(stdParolPointId, that.stdParolPointId) && Objects.equals(deviceId, that.deviceId) && Objects.equals(patrolDeviceName, that.patrolDeviceName) && Objects.equals(videoNvrCode, that.videoNvrCode) && Objects.equals(channelContent, that.channelContent); + } + + @Override + public int hashCode() { + return Objects.hash(presetPosId, presetPosCode, presetPosName, patrolPointId, channelId, coordinateType, stopTime, channelImg, description, isEnable, algSubtypeCode, eqpBookId, channelCode, channelType, patrolDeviceCode, stdParolPointId, deviceId, patrolDeviceName, videoNvrCode, channelContent); + } + + @Override + public String toString() { + return "PatrolPresetPos{" + + "presetPosId='" + presetPosId + '\'' + + ", presetPosCode='" + presetPosCode + '\'' + + ", presetPosName='" + presetPosName + '\'' + + ", patrolPointId=" + patrolPointId + + ", channelId='" + channelId + '\'' + + ", coordinateType='" + coordinateType + '\'' + + ", stopTime=" + stopTime + + ", channelImg='" + channelImg + '\'' + + ", description='" + description + '\'' + + ", isEnable='" + isEnable + '\'' + + ", algSubtypeCode='" + algSubtypeCode + '\'' + + ", eqpBookId='" + eqpBookId + '\'' + + ", channelCode='" + channelCode + '\'' + + ", channelType='" + channelType + '\'' + + ", patrolDeviceCode='" + patrolDeviceCode + '\'' + + ", stdParolPointId='" + stdParolPointId + '\'' + + ", deviceId='" + deviceId + '\'' + + ", patrolDeviceName='" + patrolDeviceName + '\'' + + ", videoNvrCode='" + videoNvrCode + '\'' + + ", channelContent='" + channelContent + '\'' + + '}'; + } +} diff --git a/src/main/java/com/inspect/simulator/mapper/PatrolPresetPosMapper.java b/src/main/java/com/inspect/simulator/mapper/PatrolPresetPosMapper.java new file mode 100644 index 0000000..195a76a --- /dev/null +++ b/src/main/java/com/inspect/simulator/mapper/PatrolPresetPosMapper.java @@ -0,0 +1,12 @@ +package com.inspect.simulator.mapper; + +import com.inspect.simulator.domain.result.PatrolPresetPos; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface PatrolPresetPosMapper { + List selectPatrolPresetPosByPatrolPointId(String patrolPointId); + +} diff --git a/src/main/java/com/inspect/simulator/service/impl/AlgorithmServiceImpl.java b/src/main/java/com/inspect/simulator/service/impl/AlgorithmServiceImpl.java index c283af0..cf9a851 100644 --- a/src/main/java/com/inspect/simulator/service/impl/AlgorithmServiceImpl.java +++ b/src/main/java/com/inspect/simulator/service/impl/AlgorithmServiceImpl.java @@ -8,6 +8,8 @@ import com.inspect.simulator.domain.algorithm.in.AnalyseRequest; import com.inspect.simulator.domain.algorithm.out.AnalyseResItem; import com.inspect.simulator.domain.algorithm.out.AnalyseResPoint; import com.inspect.simulator.domain.algorithm.out.AnalyseResult; +import com.inspect.simulator.domain.result.PatrolPresetPos; +import com.inspect.simulator.mapper.PatrolPresetPosMapper; import com.inspect.simulator.service.AlgorithmService; import com.inspect.simulator.service.remote.AnalysisRemoteService; import com.inspect.simulator.utils.HttpClientUtils; @@ -33,6 +35,9 @@ public class AlgorithmServiceImpl implements AlgorithmService { @Resource private AnalysisRemoteService analysisRemoteService; + @Resource + private PatrolPresetPosMapper patrolPresetPosMapper; + @Override public String filterPicAnalyse(String analyseRequestStr) { log.info(Color.MAGENTA + "[FILTER] filterPicAnalyse: analyseRequestStr={}" + Color.END, analyseRequestStr); @@ -126,21 +131,6 @@ public class AlgorithmServiceImpl implements AlgorithmService { return "{\"code\":\"200\"}"; } - @Override - public String bigModelPicAnalyseRetNotify(final String picAnalyseResult) { - AnalyseResult analyseResult = new Gson().fromJson(picAnalyseResult, AnalyseResult.class); - log.info(Color.MAGENTA + "[BIG MODEL] bigModelPicAnalyseRetNotify: picAnalyseResultStr={}, picAnalyseResult: {}" + Color.END, picAnalyseResult, analyseResult); - try { - Call call = analysisRemoteService.picAnalyseRetNotify(analyseResult); - Response response = call.execute(); - Object result = response.body(); - System.out.println("result: " + result); - } catch (Exception e) { - e.printStackTrace(); - } - return ""; - } - @Override public String infraredPicAnalyse(String analyseRequestStr) { log.info(Color.MAGENTA + "[INFRARED] irPicAnalyse: analyseRequestStr={}" + Color.END, analyseRequestStr); @@ -166,6 +156,20 @@ public class AlgorithmServiceImpl implements AlgorithmService { if (typeList != null && typeList.length != 0) { algType = typeList[0]; } + + final String patrolPointId = analyseReqItem.getObjectId(); + // 根据patrol_point_id查询数据表patrol_preset_pos，得到channel_id,根据channel_id查询数据表basedata_eqpbook_channel，得到channel_content + List patrolPresetPosList = patrolPresetPosMapper.selectPatrolPresetPosByPatrolPointId(patrolPointId); + if(patrolPresetPosList == null || patrolPresetPosList.isEmpty()) { + log.error("[INFRARED] irPicAnalyse: patrolPresetPosList empty!"); + return "{\"code\":\"203\"}"; + } + PatrolPresetPos patrolPresetPos = patrolPresetPosList.get(0); + final String channelContent = patrolPresetPos.getChannelContent(); + log.info(Color.MAGENTA + "[INFRARED] irPicAnalyse: channelContent={}" + Color.END, channelContent); + + // 调用红外算法 + final String feedBackHostIp = analyseRequest.getRequestHostIp(); final String feedBackPort = analyseRequest.getRequestHostPort(); final String feedbackUrl = "http://" + feedBackHostIp + ":" + feedBackPort + "/simu/bigModel/picAnalyseRetNotify"; @@ -201,4 +205,19 @@ public class AlgorithmServiceImpl implements AlgorithmService { return "{\"code\":\"200\"}"; } + @Override + public String bigModelPicAnalyseRetNotify(final String picAnalyseResult) { + AnalyseResult analyseResult = new Gson().fromJson(picAnalyseResult, AnalyseResult.class); + log.info(Color.MAGENTA + "[BIG MODEL] bigModelPicAnalyseRetNotify: picAnalyseResultStr={}, picAnalyseResult: {}" + Color.END, picAnalyseResult, analyseResult); + try { + Call call = analysisRemoteService.picAnalyseRetNotify(analyseResult); + Response response = call.execute(); + Object result = response.body(); + System.out.println("result: " + result); + } catch (Exception e) { + e.printStackTrace(); + } + return ""; + } + } diff --git a/src/main/resources/mapper/PatrolPresetPosMapper.xml b/src/main/resources/mapper/PatrolPresetPosMapper.xml new file mode 100644 index 0000000..2c25f35 --- /dev/null +++ b/src/main/resources/mapper/PatrolPresetPosMapper.xml @@ -0,0 +1,95 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + select preset_pos_id, + preset_pos_code, + preset_pos_name, + patrol_point_id, + channel_id, + coordinate_type, + stop_time, + channel_img, + description, + is_enable, + create_time, + alg_subtype_code, + eqp_book_id, + channel_code, + channel_type, + patrol_device_code, + video_nvr_code + from patrol_preset_pos + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/mapper/PatrolResultMapper.xml b/src/main/resources/mapper/PatrolResultMapper.xml index 312364a..f046f57 100644 --- a/src/main/resources/mapper/PatrolResultMapper.xml +++ b/src/main/resources/mapper/PatrolResultMapper.xml @@ -6,8 +6,8 @@ - - + + @@ -330,7 +330,7 @@ - + @@ -464,7 +464,7 @@ - + @@ -629,8 +629,8 @@ - - + +