Browse Source

添加消息

lihui001 3 years ago
parent
commit
3fcb60c05f

+ 20 - 16
zoniot-water/zoniot-water-core/src/main/java/com/bz/zoneiot/water/core/mapper/OnlineMonitorMapper.xml

@@ -50,22 +50,26 @@
         <result property="sceneId" column="scene_id" jdbcType="INTEGER"/>
         <result property="sceneName" column="scene_name" jdbcType="VARCHAR"/>
         <result property="sceneTypeName" column="scene_type_name" jdbcType="VARCHAR"/>
-        <collection property="deviceDataList" ofType="com.bz.zoneiot.water.api.vo.MonitorDataCollectVo" javaType="list">
-            <result property="deviceId" column="device_id" jdbcType="INTEGER"/>
-            <result property="deviceCode" column="device_code" jdbcType="VARCHAR"/>
-            <result property="deviceName" column="device_name" jdbcType="VARCHAR"/>
-            <result property="pointX" column="point_x" jdbcType="VARCHAR"/>
-            <result property="pointY" column="point_y" jdbcType="VARCHAR"/>
-            <result property="address" column="address" jdbcType="VARCHAR"/>
-            <result property="deviceState" column="device_state" jdbcType="INTEGER"/>
-            <collection property="monitorDataEntities" ofType="com.bz.zoneiot.water.api.vo.MonitorDataVo" javaType="list">
-                <result property="attributeId" column="attribute_id" jdbcType="INTEGER"/>
-                <result property="attributeName" column="attribute_name" jdbcType="VARCHAR"/>
-                <result property="unit" column="unit" jdbcType="VARCHAR"/>
-                <result property="isAlarm" column="is_Alarm" jdbcType="VARCHAR"/>
-                <result property="alarmRange" column="alarm_range" jdbcType="VARCHAR"/>
-            </collection>
-        </collection>
+        <collection property="deviceDataList"  resultMap="dataCollectVoMap"></collection>
+    </resultMap>
+
+    <resultMap id="dataCollectVoMap" type="com.bz.zoneiot.water.api.vo.MonitorDataCollectVo">
+        <result property="deviceId" column="device_id" jdbcType="INTEGER"/>
+        <result property="deviceCode" column="device_code" jdbcType="VARCHAR"/>
+        <result property="deviceName" column="device_name" jdbcType="VARCHAR"/>
+        <result property="pointX" column="point_x" jdbcType="VARCHAR"/>
+        <result property="pointY" column="point_y" jdbcType="VARCHAR"/>
+        <result property="address" column="address" jdbcType="VARCHAR"/>
+        <result property="deviceState" column="device_state" jdbcType="INTEGER"/>
+        <collection property="monitorDataEntities"  resultMap="monitorDataVoMap"></collection>
+    </resultMap>
+
+    <resultMap id="monitorDataVoMap" type="com.bz.zoneiot.water.api.vo.MonitorDataVo">
+        <result property="attributeId" column="attribute_id" jdbcType="INTEGER"/>
+        <result property="attributeName" column="attribute_name" jdbcType="VARCHAR"/>
+        <result property="unit" column="unit" jdbcType="VARCHAR"/>
+        <result property="isAlarm" column="is_Alarm" jdbcType="VARCHAR"/>
+        <result property="alarmRange" column="alarm_range" jdbcType="VARCHAR"/>
     </resultMap>
 
     <sql id="Base_Column_List">