screen-manage 型号查询功能完善

kaiyu

2021-05-20 ea81424035cc84d97cd114b82918bcbda73d7460

screen-manage
                      型号查询功能完善

 screen-manage/src/main/java/com/moral/api/entity/Sensor.java

@@ -84,4 +84,10 @@
    @TableField(exist = false)
    private String unitKey;

    @TableField(exist = false)
    private Integer maxValue;

    @TableField(exist = false)
    private Integer minValue;

}

 screen-manage/src/main/java/com/moral/api/pojo/vo/Version/VersionQueryVO.java

@@ -89,6 +89,8 @@
        vo.setName(sensor.getName());
        vo.setCode(sensor.getCode());
        vo.setUnit(sensor.getUnit());
        vo.setMaxValue(sensor.getMaxValue());
        vo.setMinValue(sensor.getMinValue());
        vo.getUnitKey();
        return vo;
    }

 screen-manage/src/main/java/com/moral/api/pojo/vo/sensor/SensorVO.java

@@ -31,4 +31,8 @@

    private String unitKey;

    private Integer maxValue;

    private Integer minValue;

}

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

@@ -25,12 +25,14 @@
            <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>
        </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.`code` as scode,s.`name` AS sname ,u.dataKey,u.dataValue,vsu.`max_value` ,vsu.`min_value`
    FROM
      `version` v
    JOIN