kaiyu
2021-05-20 4e07b25ea19699bd34c6ab146432c4348fd68806
Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev
3 files modified
20 ■■■■ changed files
screen-manage/src/main/java/com/moral/api/entity/Sensor.java 2 ●●● patch | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/service/impl/SensorServiceImpl.java 2 ●●● patch | view | raw | blame | history
screen-manage/src/main/resources/mapper/SensorMapper.xml 16 ●●●● patch | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/entity/Sensor.java
@@ -61,7 +61,7 @@
    /**
     * 默认单位
     */
    private String defaultUtil;
    private String defaultUnitKey;
    /**
     * 创建时间
screen-manage/src/main/java/com/moral/api/service/impl/SensorServiceImpl.java
@@ -149,7 +149,7 @@
            if (key.toString().equals("lower")&&updateSensorMap.get(key)!=null){
                content = content+"下限:"+oldSensor.getDesc()+"->"+updateSensorMap.get(key)+";";
            }
            if (key.toString().equals("default_util")&&updateSensorMap.get(key)!=null){
            if (key.toString().equals("default_unit_key")&&updateSensorMap.get(key)!=null){
                content = content+"默认单位:"+oldSensor.getDesc()+"->"+updateSensorMap.get(key)+";";
            }
        }
screen-manage/src/main/resources/mapper/SensorMapper.xml
@@ -10,14 +10,14 @@
                    <result column="code" property="code" />
                    <result column="upper" property="upper" />
                    <result column="lower" property="lower" />
                    <result column="default_util" property="defaultUtil" />
                    <result column="default_unit_key" property="defaultUnitKey" />
                    <result column="create_time" property="createTime" />
                    <result column="update_time" property="updateTime" />
                    <result column="is_delete" property="isDelete" />
        </resultMap>
    <sql id="Base_Column_List">
            s.id,s.name,s.code,s.desc,s.upper,s.lower,s.default_util,s.create_time,s.update_time,s.is_delete
            s.id,s.name,s.code,s.desc,s.upper,s.lower,s.default_unit_key,s.create_time,s.update_time,s.is_delete
    </sql>
    <insert id="insertOne" parameterType="com.moral.api.entity.Sensor">
@@ -38,8 +38,8 @@
            <if test="lower != null">
                lower,
            </if>
            <if test="defaultUtil != null">
                default_util,
            <if test="defaultUnitKey != null">
                default_unit_key,
            </if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -58,8 +58,8 @@
            <if test="lower != null">
                #{lower},
            </if>
            <if test="defaultUtil != null">
                #{defaultUtil},
            <if test="defaultUnitKey != null">
                #{defaultUnitKey},
            </if>
        </trim>
    </insert>
@@ -90,8 +90,8 @@
            <if test="lower != null">
                lower = #{lower},
            </if>
            <if test="default_util != null">
                default_util = #{default_util},
            <if test="default_unit_key != null">
                default_unit_key = #{default_unit_key},
            </if>
            <if test="isDelete != null">
                is_delete = #{isDelete},