screen-manage 实时数据message，添加time，datatime，time1等测试数据

kaiyu

2021-07-14 3dbe2c21c05072cdab5a7f75a0bd154bd9207552

 screen-manage/src/main/resources/mapper/DeviceMapper.xml

@@ -49,7 +49,9 @@
        <association property="monitorPoint" javaType="com.moral.api.entity.MonitorPoint">
            <result column="mp_id" property="id"/>
            <result column="mp_name" property="name"/>
            <result column="mp_address" property="address"/>
            <result column="mp_area_code" property="areaCode"/>
            <result column="mp_city_code" property="cityCode"/>
            <result column="mp_province_code" property="provinceCode"/>
        </association>

        <!--型号-->
@@ -63,6 +65,34 @@
            <result column="operate_id" property="id" jdbcType="INTEGER"/>
            <result column="operate_name" property="userName" jdbcType="VARCHAR"/>
        </collection>
    </resultMap>

    <resultMap id="queryDeviceUnitAlarmInfoMap" type="com.moral.api.entity.Device">
        <id column="d.id" property="id"/>
        <result column="d.name" property="name"/>
        <result column="d.mac" property="mac"/>
        <result column="d.address" property="address"/>
        <result column="d.longitude" property="longitude"/>
        <result column="d.latitude" property="latitude"/>
        <result column="d.operate_ids" property="operateIds"/>
        <result column="d.monitor_point_id" property="monitorPointId"/>
        <result column="d.organization_id" property="organizationId"/>
        <result column="oua.version_id" property="deviceVersionId"/>
        <result column="d.profession" property="profession"/>
        <result column="d.tech" property="tech"/>
        <result column="d.detector" property="detector"/>
        <result column="d.purchaser" property="purchaser"/>
        <result column="d.extend" property="extend" javaType="String" />
        <association property="version" column="d.device_version_id" javaType="com.moral.api.entity.Version">
            <id column="v.id" property="id"></id>
            <result column="v.name" property="name"></result>
            <collection column="d.device_version_id" property="sensors" ofType="com.moral.api.entity.Sensor">
                <result column="oua.sensor_code" property="code" ></result>
                <result column="oua.unit_key" property="unitKey"></result>
                <result column="oua.show_unit_key" property="showUnitKey"></result>
                <result column="oua.alarm_level" property="alarmLevel" javaType="String" ></result>
            </collection>
        </association>
    </resultMap>

    <select id="selectDeviceInfoById" resultMap="resultMap">
@@ -82,12 +112,15 @@
            d.detector,
            d.purchaser,
            d.create_time,
            d.install_time,
            d.extend,
            o.id org_id,
            o.`name` org_name,
            mp.id mp_id,
            mp.`name` mp_name,
            mp.address mp_address,
            mp.area_code mp_area_code,
            mp.city_code mp_city_code,
            mp.province_code mp_province_code,
            ma.id operate_id,
            v.id version_id,
            v.`name` version_name,
@@ -150,5 +183,42 @@
        WHERE d.id = #{deviceId}
    </select>

    <select id="queryDeviceUnitAlarmInfo" resultMap="queryDeviceUnitAlarmInfoMap">
        select
            d.id as `d.id`,
            d.mac as `d.mac`,
            d.name as `d.name`,
            d.address as `d.address`,
            d.longitude as `d.longitude`,
            d.latitude as `d.latitude`,
            d.operate_ids as `d.operate_ids`,
            d.monitor_point_id as `d.monitor_point_id`,
            d.organization_id as `d.organization_id`,
            d.profession as `d.profession`,
            d.tech as `d.tech`,
            d.detector as `d.detector`,
            d.purchaser as `d.purchaser`,
            d.extend as `d.extend`,
            oua.version_id as `oua.version_id`,
            oua.sensor_code as `oua.sensor_code`,
            oua.unit_key as `oua.unit_key`,
            oua.show_unit_key as `oua.show_unit_key`,
            oua.alarm_level as `oua.alarm_level`,
            v.id as `v.id`,
            v.name as `v.name`
        from
            device d
        join
            version v
        on
            v.`id` = d.`device_version_id` and v.`is_delete` = 0
        join
            organization_unit_alarm oua
        on
            d.`device_version_id` = oua.`version_id`   and d.`organization_id` = oua.`organization_id` and oua.`is_delete` = 0
        where
            d.`is_delete` = 0;
    </select>


</mapper>