screen-manage 更新查询型号接口

kaiyu

2021-05-27 2c210559d8a1664129cfc8b05c89691f091224a4

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

@@ -22,17 +22,16 @@
        <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>
            <result property="minValue" column="min_value"></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,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.`upper` AS vupper ,vsu.`lower` AS vlower
    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