监测列表增加字段-地址

sms_water/src/main/java/com/huaxu/dto/OnlineDataDto.java

@@ -28,6 +28,9 @@ public class OnlineDataDto {
     @ApiModelProperty("所属场景")
     private String sceneName;
 
+    @ApiModelProperty("场景地址")
+    private String address;
+
     @ApiModelProperty("今日供水量、今日出水量")
     private Double yieldWaterUsage;
 

sms_water/src/main/resources/mapper/OnlineMonitorMapper.xml

@@ -66,8 +66,8 @@
     <select id="selectAlarmDetails" resultType="com.huaxu.dto.AlarmDetailsDto">
         select
         t1.scene_name as "sceneName",
-        t5.alarm_content as "alarmContent",
-        t5.alarm_start_time as "alarmStartTime"
+        t6.alarm_content as "alarmContent",
+        t6.alarm_start_time as "alarmStartTime"
         from sms_scene t1
         <include refid="sceneDeviceJoins"/>
         <include refid="alarmDetailsJoins"/>
@@ -146,7 +146,7 @@
     </select>
     <!--查询实时数据列表-->
     <select id="selectPage" resultType="com.huaxu.dto.OnlineDataDto">
-        select t1.id scene_id,t1.scene_name
+        select t1.id scene_id,t1.scene_name,t1.address
         from sms_scene t1
         inner join sms_scene_type t3 on t3.id = t1.scene_type_id and t3. status = 1
         where t1.parent_scene_id = 0 and t1. status = 1 and t3.scene_type_name = #{onlineDataDto.sceneTypeName}