标签增加场景

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

@@ -1,5 +1,6 @@
 package com.huaxu.dto;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -18,4 +19,8 @@ public class SceneDeviceAttributeDto {
     @ApiModelProperty("设备属性ID")
     private String attributeId;
 
+    @ApiModelProperty(value = "属性类型标记",hidden = true)
+    @JsonIgnore
+    private String attributeType;
+
 }

sms_water/src/main/java/com/huaxu/entity/MonitorInfoEntity.java

@@ -66,6 +66,10 @@ public class MonitorInfoEntity{
     @TableField(exist = false)
     private String monitorValue;
 
+    /** 标签值 */
+    @ApiModelProperty(value = "调转场景信息")
+    private Long monitorSceneId;
+
     /** 位置左 */
     @ApiModelProperty(value = "位置左")
     private Double pointLeft;

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

@@ -22,6 +22,7 @@
         <result property="createBy" column="create_by"/>
         <result property="dateUpdate" column="date_update"/>
         <result property="updateBy" column="update_by"/>
+        <result property="monitorSceneId" column="monitor_scene_id"/>
     </resultMap>
     <!--  实体栏位  -->
     <sql id="monitorInfoColumns">
@@ -43,7 +44,8 @@
          a.create_by as "createBy" ,
          a.date_update as "dateUpdate" ,
          a.update_by as "updateBy" ,
-         b.DEVICE_CODE as "deviceCode"
+         b.DEVICE_CODE as "deviceCode",
+         a.monitor_scene_id as "monitorSceneId"
      </sql>
     <sql id="leftJoins">
           LEFT JOIN sms_device b on a.DEVICE_ID=b.ID