diff --git a/src/main/java/com/genersoft/iot/vmp/aiot/bean/AiAlert.java b/src/main/java/com/genersoft/iot/vmp/aiot/bean/AiAlert.java index 81f6fac7b..624e87f93 100644 --- a/src/main/java/com/genersoft/iot/vmp/aiot/bean/AiAlert.java +++ b/src/main/java/com/genersoft/iot/vmp/aiot/bean/AiAlert.java @@ -16,6 +16,9 @@ public class AiAlert { @Schema(description = "摄像头ID") private String cameraId; + @Schema(description = "摄像头名称(关联查询)") + private String cameraName; + @Schema(description = "ROI区域ID") private String roiId; diff --git a/src/main/java/com/genersoft/iot/vmp/aiot/dao/AiAlertMapper.java b/src/main/java/com/genersoft/iot/vmp/aiot/dao/AiAlertMapper.java index 5ce51a849..34d8d0ac8 100644 --- a/src/main/java/com/genersoft/iot/vmp/aiot/dao/AiAlertMapper.java +++ b/src/main/java/com/genersoft/iot/vmp/aiot/dao/AiAlertMapper.java @@ -15,17 +15,20 @@ public interface AiAlertMapper { @Options(useGeneratedKeys = true, keyProperty = "id", keyColumn = "id") int add(AiAlert alert); - @Select("SELECT a.*, r.name AS roi_name FROM wvp_ai_alert a " + + @Select("SELECT a.*, r.name AS roi_name, sp.gb_name AS camera_name FROM wvp_ai_alert a " + "LEFT JOIN wvp_ai_roi r ON a.roi_id = r.roi_id " + + "LEFT JOIN wvp_stream_proxy sp ON a.camera_id = sp.camera_code " + "WHERE a.alert_id=#{alertId}") @Results({ - @Result(property = "roiName", column = "roi_name") + @Result(property = "roiName", column = "roi_name"), + @Result(property = "cameraName", column = "camera_name") }) AiAlert queryByAlertId(@Param("alertId") String alertId); @Select(value = {""}) @Results({ - @Result(property = "roiName", column = "roi_name") + @Result(property = "roiName", column = "roi_name"), + @Result(property = "cameraName", column = "camera_name") }) List queryList(@Param("cameraId") String cameraId, @Param("alertType") String alertType,