kaiyu
2021-05-27 d7e7a651810d74e1d0d474090cb9fd78ffd5427b
screen-manage/src/main/resources/mapper/VersionMapper.xml
@@ -22,7 +22,6 @@
        <collection property="sensors" column="id" ofType="com.moral.api.entity.Sensor">
            <id property="id" column="sid"></id>
            <result property="name" column="sname"></result>
            <result property="code" column="scode"></result>
            <result property="unitKey" column="dataKey"></result>
            <result property="unit" column="dataValue"></result>
            <result property="maxValue" column="max_value"></result>
@@ -32,7 +31,7 @@
    <select id="queryVersionsAndSensorUnitByIds" resultMap="VersionSensorUnitMap">
    SELECT
     v.`id`,v.`name`,v.`desc`,v.`create_time`,v.`update_time`,s.`id` AS sid,s.`code` as scode,s.`name` AS sname ,u.dataKey,u.dataValue,vsu.`max_value` ,vsu.`min_value`
     v.`id`,v.`name`,v.`desc`,v.`create_time`,v.`update_time`,s.`id` AS sid,s.`name` AS sname ,u.dataKey,u.dataValue,vsu.`max_value` ,vsu.`min_value`
    FROM
     `version` v
    LEFT JOIN
@@ -42,7 +41,7 @@
    LEFT JOIN
     sensor s
    ON
     s.`code` = vsu.`sensor_code` AND s.`is_delete` = 0
     s.`id` = vsu.`sensor_id` AND s.`is_delete` = 0
    LEFT JOIN
   (
     SELECT