From 63da675bd3d5f80773ec0f3d2476e16ea422d16f Mon Sep 17 00:00:00 2001
From: zhao-meiyu <2970484253@qq.com>
Date: Wed, 24 Jan 2024 11:44:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BB=8F=E7=BA=AC=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/zc/business/domain/DcWarning.java     | 21 +++++++++++++++++++
 .../DcPerceivedEventsWarningMapper.xml        | 11 +++++++---
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/zc-business/src/main/java/com/zc/business/domain/DcWarning.java b/zc-business/src/main/java/com/zc/business/domain/DcWarning.java
index 6762a9e1..c11fac2d 100644
--- a/zc-business/src/main/java/com/zc/business/domain/DcWarning.java
+++ b/zc-business/src/main/java/com/zc/business/domain/DcWarning.java
@@ -2,6 +2,7 @@ package com.zc.business.domain;
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -104,6 +105,26 @@ public class DcWarning extends BaseEntity
     private String type;
     private String sectionId;
 
+    private String longitude;
+
+    private String latitude;
+
+    public String getLongitude() {
+        return longitude;
+    }
+
+    public void setLongitude(String longitude) {
+        this.longitude = longitude;
+    }
+
+    public String getLatitude() {
+        return latitude;
+    }
+
+    public void setLatitude(String latitude) {
+        this.latitude = latitude;
+    }
+
     public String getSectionId() {
         return sectionId;
     }
diff --git a/zc-business/src/main/resources/mapper/business/DcPerceivedEventsWarningMapper.xml b/zc-business/src/main/resources/mapper/business/DcPerceivedEventsWarningMapper.xml
index 630214f9..8c1d3f31 100644
--- a/zc-business/src/main/resources/mapper/business/DcPerceivedEventsWarningMapper.xml
+++ b/zc-business/src/main/resources/mapper/business/DcPerceivedEventsWarningMapper.xml
@@ -15,9 +15,14 @@
     </select>
 
     <select id="selectPerceivedEventsList" resultType="com.zc.business.domain.DcWarning">
-        select `id`,`stake_mark_id`, `direction`,`dept_id`, `warning_state`,`warning_time`,`user_id`,
-               `warning_source`,`warning_level`, `remark`, `create_time`,`update_time`,`warning_type`,
-               `warning_subclass`,`warning_title`,`other_config` from dc_warning
+        SELECT warning.`id`,warning.`stake_mark_id`, warning.`direction`,
+        mark.longitude,mark.latitude,
+        warning.`dept_id`,warning.`warning_state`,warning.`warning_time`,
+        warning.`user_id`, warning.`warning_source`,warning.`warning_level`,
+        warning.`remark`, warning.`create_time`,warning.`update_time`,
+        warning.`warning_type`,warning.`warning_subclass`,warning.`warning_title`,
+        warning.`other_config` FROM dc_warning AS warning
+        LEFT JOIN dc_stake_mark AS mark ON mark.id=warning.stake_mark_id
         <where>
             <if test="warningType != null  and warningType != ''"> and warning_type = #{warningType}</if>
             <if test="warningSubclass != null  and warningSubclass != ''"> and warning_subclass = #{warningSubclass}</if>