changes

liuhaonan

2022-08-03 f9539232edd1b23b29a2fb3d44732877400602f2

changes

 dao/src/main/java/com/sandu/ximon/dao/domain/AirData.java

@@ -5,7 +5,7 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.Date;
import lombok.Data;

/**
@@ -39,102 +39,112 @@
    /**
     * 温度值
     */
    private Double temperature;
    private String temperature;

    /**
     * 湿度值
     */
    private Double humidity;
    private String humidity;

    /**
     * 风速
     */
    private Double windSpeed;
    private String windSpeed;

    /**
     * 风向
     */
    private Double windDirection;
    private String windDirection;

    /**
     * 风力
     */
    private String windPower;

    /**
     * 大气压
     */
    private Integer pressure;
    private String pressure;

    /**
     * 光强
     */
    private Integer lightIntensity;
    private String lightIntensity;

    /**
     * 噪音
     */
    private Integer noise;
    private String noise;

    /**
     * PM2.5
     */
    private Integer pm25;
    private String pm25;

    /**
     *  PM10
     */
    private Integer pm10;
    private String pm10;

    /**
     * 总悬浮颗粒物（TSP）
     */
    private Integer tsp;
    private String tsp;

    /**
     * SO2二氧化硫相对值
     * 雨量
     */
    private Integer so2;
    private String rain;

    /**
     * 甲醛相对值
     */
    private Integer ech2o;

    /**
     * NO2二氧化氮
     */
    private Integer no2;
    private String ech2o;

    /**
     * TVOC
     */
    private Integer tvoc;

    /**
     * CO一氧化碳
     */
    private Integer co;
    private String tvoc;

    /**
     * 二氧化碳
     */
    private Integer co2;
    private String co2;

    /**
     * SO2二氧化硫相对值
     */
    private String so2;

    /**
     * NO2二氧化氮
     */
    private String no2;

    /**
     * CO一氧化碳
     */
    private String co;

    /**
     * O3臭氧
     */
    private Integer o3;
    private String o3;

    /**
     * F氟化物
     */
    private Integer fluoride;
    private String fluoride;

    /**
     * 
     */
    private LocalDateTime createTime;
    private Date createTime;

    /**
     * 
     */
    private LocalDateTime updateTime;
    private Date updateTime;

    @TableField(exist = false)
    private static final long serialVersionUID = 1L;

 dao/src/main/java/com/sandu/ximon/dao/mapper/AirDataMapper.java

@@ -1,6 +1,5 @@
package com.sandu.ximon.dao.mapper;

import com.sandu.common.object.BaseConditionVO;
import com.sandu.ximon.dao.bo.AirDataBo;
import com.sandu.ximon.dao.domain.AirData;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -9,8 +8,11 @@
import java.util.List;

/**
 * @Entity com.sandu.ximon.dao.domain.AirData
 */
* @author Administrator
* @description 针对表【air_data】的数据库操作Mapper
* @createDate 2022-08-03 14:19:02
* @Entity com.sandu.ximon.dao.domain.AirData
*/
@Mapper
public interface AirDataMapper extends BaseMapper<AirData> {


 dao/src/main/resources/mapper/AirDataMapper.xml

@@ -5,30 +5,32 @@
<mapper namespace="com.sandu.ximon.dao.mapper.AirDataMapper">

    <resultMap id="BaseResultMap" type="com.sandu.ximon.dao.domain.AirData">
        <id property="id" column="id" jdbcType="BIGINT"/>
        <result property="deviceMac" column="device_mac" jdbcType="VARCHAR"/>
        <result property="deviceType" column="device_type" jdbcType="VARCHAR"/>
        <result property="moduleWarmUpStatusFlag" column="module_warm_up_status_flag" jdbcType="VARCHAR"/>
        <result property="temperature" column="temperature" jdbcType="DOUBLE"/>
        <result property="humidity" column="humidity" jdbcType="DOUBLE"/>
        <result property="windSpeed" column="wind_speed" jdbcType="DOUBLE"/>
        <result property="windDirection" column="wind_direction" jdbcType="DOUBLE"/>
        <result property="pressure" column="pressure" jdbcType="INTEGER"/>
        <result property="lightIntensity" column="light_intensity" jdbcType="INTEGER"/>
        <result property="noise" column="noise" jdbcType="INTEGER"/>
        <result property="pm25" column="pm25" jdbcType="INTEGER"/>
        <result property="pm10" column="pm10" jdbcType="INTEGER"/>
        <result property="tsp" column="tsp" jdbcType="INTEGER"/>
        <result property="so2" column="so2" jdbcType="INTEGER"/>
        <result property="ech2o" column="ech2o" jdbcType="INTEGER"/>
        <result property="no2" column="no2" jdbcType="INTEGER"/>
        <result property="tvoc" column="tvoc" jdbcType="INTEGER"/>
        <result property="co" column="co" jdbcType="INTEGER"/>
        <result property="co2" column="co2" jdbcType="INTEGER"/>
        <result property="o3" column="o3" jdbcType="INTEGER"/>
        <result property="fluoride" column="fluoride" jdbcType="INTEGER"/>
        <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
        <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
            <id property="id" column="id" jdbcType="BIGINT"/>
            <result property="deviceMac" column="device_mac" jdbcType="VARCHAR"/>
            <result property="deviceType" column="device_type" jdbcType="VARCHAR"/>
            <result property="moduleWarmUpStatusFlag" column="module_warm_up_status_flag" jdbcType="VARCHAR"/>
            <result property="temperature" column="temperature" jdbcType="VARCHAR"/>
            <result property="humidity" column="humidity" jdbcType="VARCHAR"/>
            <result property="windSpeed" column="wind_speed" jdbcType="VARCHAR"/>
            <result property="windDirection" column="wind_direction" jdbcType="VARCHAR"/>
            <result property="windPower" column="wind_power" jdbcType="VARCHAR"/>
            <result property="pressure" column="pressure" jdbcType="VARCHAR"/>
            <result property="lightIntensity" column="light_intensity" jdbcType="VARCHAR"/>
            <result property="noise" column="noise" jdbcType="VARCHAR"/>
            <result property="pm25" column="pm25" jdbcType="VARCHAR"/>
            <result property="pm10" column="pm10" jdbcType="VARCHAR"/>
            <result property="tsp" column="tsp" jdbcType="VARCHAR"/>
            <result property="rain" column="rain" jdbcType="VARCHAR"/>
            <result property="ech2o" column="ech2o" jdbcType="VARCHAR"/>
            <result property="tvoc" column="tvoc" jdbcType="VARCHAR"/>
            <result property="co2" column="co2" jdbcType="VARCHAR"/>
            <result property="so2" column="so2" jdbcType="VARCHAR"/>
            <result property="no2" column="no2" jdbcType="VARCHAR"/>
            <result property="co" column="co" jdbcType="VARCHAR"/>
            <result property="o3" column="o3" jdbcType="VARCHAR"/>
            <result property="fluoride" column="fluoride" jdbcType="VARCHAR"/>
            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
    </resultMap>

    <select id="listAirId" resultType="java.lang.Long">
@@ -93,4 +95,4 @@
        WHERE  t1.device_mac = #{deviceMac}
        ORDER BY t1.create_time DESC
    </select>
</mapper>
</mapper>

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirDataService.java

@@ -48,7 +48,7 @@
        AirEquipment airEquipment = new AirEquipment();
        airEquipment.setId(airData.getId());
        airEquipment.setMac(airData.getDeviceMac());
        airEquipment.setCreateTime(airData.getCreateTime());
//        airEquipment.setCreateTime(airData.getCreateTime());
        airEquipmentService.addAirEquipment(airEquipment);

        //存缓存心跳包