dao/src/main/java/com/sandu/ximon/dao/domain/AirDataNongGeng.java
@@ -4,17 +4,15 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import java.io.Serializable; import java.time.LocalDateTime; import java.util.Date; import lombok.Data; /** * 农耕大气监测数据 * * @TableName air_data_nong_geng */ @TableName(value = "air_data_nong_geng") @TableName(value ="air_data_nong_geng") @Data public class AirDataNongGeng implements Serializable { /** @@ -34,9 +32,9 @@ private String noise; /** * voc挥发性有机物 * 硫化氢 */ private String voc; private String hydrogenSulfide; /** * SO2 浓度 @@ -52,11 +50,6 @@ * CO 浓度 */ private String co; /** * 二氧化碳 */ private String co2; /** * o3 浓度 @@ -99,14 +92,14 @@ private String windSpeed; /** * 降雨量 * 十分钟雨量 */ private String rainfall; private String tenRainfallMin; /** * 翻斗雨量 * 辐射 */ private String tippingBucketRainfall; private String radiation; /** * 光照 @@ -114,24 +107,29 @@ private String illumination; /** * 热电总辐射 */ private String thermalRadiation; /** * 紫外线 */ private String ultravioletRay; private String ultraviolet; /** * 设备类型 AirNongGengEnums * co2 二氧化碳 */ private String co2; /** * 氧气 */ private String o2; /** * 设备类型 */ private String type; /** * 创建时间 */ private LocalDateTime createTime; private Date createTime; @TableField(exist = false) private static final long serialVersionUID = 1L; dao/src/main/java/com/sandu/ximon/dao/mapper/AirDataNongGengMapper.java
@@ -10,7 +10,7 @@ /** * @author Administrator * @description 针对表【air_data_nong_geng(农耕大气监测数据)】的数据库操作Mapper * @createDate 2022-10-10 10:00:03 * @createDate 2022-10-14 15:01:06 * @Entity com.sandu.ximon.dao.domain.AirDataNongGeng */ @Mapper dao/src/main/resources/mapper/AirDataNongGengMapper.xml
@@ -8,11 +8,10 @@ <id property="id" column="id" jdbcType="BIGINT"/> <result property="mac" column="mac" jdbcType="VARCHAR"/> <result property="noise" column="noise" jdbcType="VARCHAR"/> <result property="voc" column="voc" jdbcType="VARCHAR"/> <result property="hydrogenSulfide" column="hydrogen_sulfide" 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="co2" column="co2" jdbcType="VARCHAR"/> <result property="o3" column="o3" jdbcType="VARCHAR"/> <result property="pm2point5" column="pm2point5" jdbcType="VARCHAR"/> <result property="pm10" column="pm10" jdbcType="VARCHAR"/> @@ -21,23 +20,24 @@ <result property="airPressure" column="air_pressure" jdbcType="VARCHAR"/> <result property="windDirection" column="wind_direction" jdbcType="VARCHAR"/> <result property="windSpeed" column="wind_speed" jdbcType="VARCHAR"/> <result property="rainfall" column="rainfall" jdbcType="VARCHAR"/> <result property="tippingBucketRainfall" column="tipping_bucket_rainfall" jdbcType="VARCHAR"/> <result property="tenRainfallMin" column="ten_rainfall_min" jdbcType="VARCHAR"/> <result property="radiation" column="radiation" jdbcType="VARCHAR"/> <result property="illumination" column="illumination" jdbcType="VARCHAR"/> <result property="thermalRadiation" column="thermal_radiation" jdbcType="VARCHAR"/> <result property="ultravioletRay" column="ultraviolet_ray" jdbcType="VARCHAR"/> <result property="ultraviolet" column="ultraviolet" jdbcType="VARCHAR"/> <result property="co2" column="co2" jdbcType="VARCHAR"/> <result property="o2" column="o2" jdbcType="VARCHAR"/> <result property="type" column="type" jdbcType="VARCHAR"/> <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/> </resultMap> <sql id="Base_Column_List"> id,mac,noise, voc,so2,no2, co,co2,o3, pm2point5,pm10,air_temperature, air_humidity,air_pressure,wind_direction, wind_speed,rainfall,tipping_bucket_rainfall, illumination,thermal_radiation,ultraviolet_ray, hydrogen_sulfide,so2,no2, co,o3,pm2point5, pm10,air_temperature,air_humidity, air_pressure,wind_direction,wind_speed, ten_rainfall_min,radiation,illumination, ultraviolet,co2,o2, type,create_time </sql> <select id="listAirId" resultType="java.lang.Long"> ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java
@@ -882,7 +882,7 @@ } String deviceName = byId.getDeviceCode(); if (deviceName.isEmpty()) { throw new BusinessException("该灯杆Mca为空"); throw new BusinessException("该灯杆Mac为空"); } IRequestFrame build = FrameBuilder.builderA5().orderType(A5OrderEnum.REQUEST_LIGHT_DATA.getCode()).innerFrame(new A5LightResetReqInnerFrame()).build(); CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(deviceName, build);
