1.修改隐患返回的lng lag为隐患的位置信息

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

@@ -65,10 +65,10 @@ public class FireLatentDangerDto extends BaseDto {
     @ApiModelProperty(value = "纬度")
     private String lat;
 
-    @ApiModelProperty(value ="隐患经度")
-    private String sourceLng;
+    @ApiModelProperty(value = "换流站经度")
+    private String stationLng;
 
-    @ApiModelProperty(value = "隐患纬度")
-    private String sourceLat;
+    @ApiModelProperty(value = "换流站纬度")
+    private String stationLat;
 
 }

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

@@ -13,18 +13,10 @@
         s.name as station_name,
         d.station_code,
         d.discovery_date,
-        <choose>
-            <when test="stationCode != null and stationCode != ''">
-                d.lat,
-                d.lng,
-            </when>
-            <otherwise>
-                s.lng,
-                s.lat,
-            </otherwise>
-        </choose>
-        d.lng as sourceLng,
-        d.lat as sourceLat
+        d.lng,
+        d.lat,
+        s.lng as stationLng,
+        s.lat as stationLat
         from
         asf_fire_latent_danger d,
         asf_fire_station_info s