Merge branch 'cjl' into dev

cjl

2023-08-26 6d4ee331b8fa5fc65a7a875a54b32118e9cd903f

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

@@ -22,26 +22,28 @@
        <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="code" column="code"></result>
            <result property="unit" column="dataValue"></result>
            <result property="upper" column="vupper"></result>
            <result property="lower" column="vlower"></result>
        </collection>
    </resultMap>

    <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
     v.`id`,v.`name`,v.`desc`,v.`create_time`,v.`update_time`,s.`id` AS sid,s.`name` AS sname ,s.`code`,u.dataKey,u.dataValue,vsu.`upper` AS vupper ,vsu.`lower` AS vlower
    FROM
     `version` v
    JOIN
    LEFT JOIN
     version_sensor_unit vsu
    ON
     v.`id` = vsu.`version_id` AND vsu.`is_delete` = 0
    JOIN
    LEFT JOIN
     sensor s
    ON
     s.`code` = vsu.`sensor_code` AND s.`is_delete` = 0
    JOIN
    LEFT JOIN
   (
     SELECT
      sdd.datakey,sdd.dataValue,sdd.is_delete