1.应急处置

amos-boot-module/amos-boot-module-api/amos-boot-module-ccs-api/src/main/java/com/yeejoin/amos/boot/module/ccs/api/dto/FireEquipmentSignalLogDto.java

@@ -89,11 +89,11 @@ public class FireEquipmentSignalLogDto extends BaseDto {
     @ApiModelProperty(value = "纬度")
     private String lat;
 
-    @ApiModelProperty(value = "换流站经度")
-    private String stationLng;
+    @ApiModelProperty(value = "位置经度")
+    private String sourceLng;
 
-    @ApiModelProperty(value = "换流站纬度")
-    private String stationLat;
+    @ApiModelProperty(value = "位置纬度")
+    private String sourceLat;
 
     @ApiModelProperty(value = "告警日期（冗余查询，为create_date的日期部分,如：2021-11-15")
     private String signalReportDate;

amos-boot-module/amos-boot-module-api/amos-boot-module-ccs-api/src/main/resources/mapper/FireEquipmentSignalLogMapper.xml

@@ -12,20 +12,21 @@
             a.signal_type_name,
             a.create_date,
             s.name as station_name,
-            a.station_code,
             a.location,
             <choose>
                 <when test="stationCode != null and stationCode != ''">
                     a.lat,
                     a.lng,
+                    null as station_code,
                 </when>
                 <otherwise>
                     s.lng,
                     s.lat,
+                    a.station_code,
                 </otherwise>
             </choose>
-            s.lat as stationLat,
-            s.lng as stationLng
+            a.lat as sourceLat,
+            a.lng as sourceLng
         from
             asf_fire_equipment_signal_log a,
             asf_fire_station_info s
@@ -44,6 +45,9 @@
         <if test="endDate != null and endDate != ''">
             and DATEDIFF(a.create_date,#{endDate}) <![CDATA[<=]]> 0
         </if>
+        <if test="sourceId != null and sourceId != ''">
+            and a.id = #{sourceId}
+        </if>
         order by a.create_date desc
         <if test="top != null">
          limit ${top}