changes

liuhaonan

2022-10-10 3d34f39838f12fa69f088b229e91dfe3febe4185

changes

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

@@ -4,16 +4,17 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import lombok.Data;

import java.io.Serializable;
import java.time.LocalDateTime;

/**
 * å†œè€•å¤§æ°”监测数据
 *
 * @TableName air_data_nong_geng
 */
@TableName(value ="air_data_nong_geng")
@TableName(value = "air_data_nong_geng")
@Data
public class AirDataNongGeng implements Serializable {
    /**
@@ -30,82 +31,102 @@
    /**
     * å™ªå£°
     */
    private BigDecimal noise;
    private String noise;

    /**
     * ç¡«åŒ–æ°¢
     * voc挥发性有机物
     */
    private BigDecimal hydrogenSulfide;
    private String voc;

    /**
     * SO2 æµ“度
     */
    private BigDecimal so2;
    private String so2;

    /**
     * NO2 æµ“度
     */
    private BigDecimal no2;
    private String no2;

    /**
     * CO æµ“度
     */
    private BigDecimal co;
    private String co;

    /**
     * äºŒæ°§åŒ–碳
     */
    private String co2;

    /**
     * o3 æµ“度
     */
    private BigDecimal o3;
    private String o3;

    /**
     * pm2.5 æµ“度
     */
    private BigDecimal pm2point5;
    private String pm2point5;

    /**
     * pm10
     */
    private BigDecimal pm10;
    private String pm10;

    /**
     * ç©ºæ°”温度
     */
    private BigDecimal airTemperature;
    private String airTemperature;

    /**
     * ç©ºæ°”湿度
     */
    private BigDecimal airHumidity;
    private String airHumidity;

    /**
     * å¤§æ°”压强
     */
    private BigDecimal airPressure;
    private String airPressure;

    /**
     * é£Žå‘
     */
    private BigDecimal windDirection;
    private String windDirection;

    /**
     * é£Žé€Ÿ
     */
    private BigDecimal windSpeed;
    private String windSpeed;

    /**
     * ååˆ†é’Ÿé›¨é‡
     * é™é›¨é‡
     */
    private BigDecimal tenRainfallMin;
    private String rainfall;

    /**
     * è¾å°„
     * ç¿»æ–—雨量
     */
    private BigDecimal radiation;
    private String tippingBucketRainfall;

    /**
     * å…‰ç…§
     */
    private BigDecimal illumination;
    private String illumination;

    /**
     * çƒ­ç”µæ€»è¾å°„
     */
    private String thermalRadiation;

    /**
     * ç´«å¤–线
     */
    private String ultravioletRay;

    /**
     * è®¾å¤‡ç±»åž‹  AirNongGengEnums
     */
    private String type;

    /**
     * åˆ›å»ºæ—¶é—´

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

@@ -4,20 +4,20 @@
import com.baomidou.mybatisplus.annotation.TableField;
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;

/**
 * 
 * @TableName air_equipment_nong_geng
 */
@TableName(value = "air_equipment_nong_geng")
@TableName(value ="air_equipment_nong_geng")
@Data
public class AirEquipmentNongGeng implements Serializable {
    /**
     *
     * 
     */
    @TableId
    private Long id;
@@ -28,6 +28,11 @@
    private String mac;

    /**
     * è®¾å¤‡ç±»åž‹  AirNongGengEnums
     */
    private String type;

    /**
     * æŽ¥å…¥æ—¶é—´
     */
    private LocalDateTime createTime;

 dao/src/main/java/com/sandu/ximon/dao/enums/AirNongGengEnums.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,110 @@
package com.sandu.ximon.dao.enums;

/**
 * @author LiuHaoNan
 * @date 2022/10/9
 * å¤§æ°”设备分类枚举
 */
public class AirNongGengEnums {

    /**
     * RY-G/W
     */
    public static final String RY_GW = "1";

    /**
     * RY-CPM2510
     */
    public static final String RY_CPM2510 = "2";

    /**
     * RY-CPM2516
     */
    public static final String RY_CPM2516 = "3";

    /**
     * RY-CPM2512
     */
    public static final String RY_CPM2512 = "4";

    /**
     * HCD6815
     */
    public static final String HCD_6815 = "5";

    /**
     * HCD6816Z
     */
    public static final String HCD_6816Z_1 = "6";

    /**
     * HCD6817Z
     */
    public static final String HCD_6817Z = "7";

    /**
     * HCD6816Z
     */
    public static final String HCD_6816Z_2 = "8";

    /**
     *HCD6817
     */
    public static final String HCD_6817 = "9";

    /**
     * HCD6817B
     */
    public static final String HCD_6817B = "10";

    /**
     * HCD6818A
     */
    public static final String HCD_6818A = "16";

    /**
     * HCD6818N
     */
    public static final String HCD_6818N = "18";

    /**
     * HCD6818D
     */
    public static final String HCD_6818D = "19";

    /**
     * HCD6818B
     */
    public static final String HCD_6818B = "11";

    /**
     * HCD6818E
     */
    public static final String HCD_6818E = "12";

    /**
     * HCD6818C
     */
    public static final String HCD_6818C = "13";

    /**
     * HCD6818
     */
    public static final String HCD_6818 = "14";

    /**
     * HCD6820
     */
    public static final String HCD_6820 = "15";

    /**
     * HCD6820（高配版）
     */
    public static final String HCD_6820_Pro = "17";

    /**
     * HCD6818V型网格化空气质量变送器（户外型）
     */
    public static final String HCD_6818V_Out = "20";

}

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

@@ -1,14 +1,16 @@
package com.sandu.ximon.dao.mapper;

import com.sandu.ximon.dao.bo.AirDataBo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.sandu.ximon.dao.bo.AirDataNongGengBo;
import com.sandu.ximon.dao.domain.AirDataNongGeng;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;

import java.util.List;

/**
 * @author Administrator
 * @description é’ˆå¯¹è¡¨ã€air_data_nong_geng(农耕大气监测数据)】的数据库操作Mapper
 * @createDate 2022-10-10 10:00:03
 * @Entity com.sandu.ximon.dao.domain.AirDataNongGeng
 */
@Mapper

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

@@ -1,13 +1,16 @@
package com.sandu.ximon.dao.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.sandu.ximon.dao.bo.AirEquipmentNongGengBo;
import com.sandu.ximon.dao.domain.AirEquipmentNongGeng;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;

import java.util.List;

/**
 * @author Administrator
 * @description é’ˆå¯¹è¡¨ã€air_equipment_nong_geng】的数据库操作Mapper
 * @createDate 2022-10-10 09:58:08
 * @Entity com.sandu.ximon.dao.domain.AirEquipmentNongGeng
 */
@Mapper

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

@@ -5,35 +5,40 @@
<mapper namespace="com.sandu.ximon.dao.mapper.AirDataNongGengMapper">

    <resultMap id="BaseResultMap" type="com.sandu.ximon.dao.domain.AirDataNongGeng">
        <id property="id" column="id" jdbcType="BIGINT"/>
        <result property="mac" column="mac" jdbcType="VARCHAR"/>
        <result property="noise" column="noise" jdbcType="DECIMAL"/>
        <result property="hydrogenSulfide" column="hydrogen_sulfide" jdbcType="DECIMAL"/>
        <result property="so2" column="so2" jdbcType="DECIMAL"/>
        <result property="no2" column="no2" jdbcType="DECIMAL"/>
        <result property="co" column="co" jdbcType="DECIMAL"/>
        <result property="o3" column="o3" jdbcType="DECIMAL"/>
        <result property="pm2point5" column="pm2point5" jdbcType="DECIMAL"/>
        <result property="pm10" column="pm10" jdbcType="DECIMAL"/>
        <result property="airTemperature" column="air_temperature" jdbcType="DECIMAL"/>
        <result property="airHumidity" column="air_humidity" jdbcType="DECIMAL"/>
        <result property="airPressure" column="air_pressure" jdbcType="DECIMAL"/>
        <result property="windDirection" column="wind_direction" jdbcType="DECIMAL"/>
        <result property="windSpeed" column="wind_speed" jdbcType="DECIMAL"/>
        <result property="tenRainfallMin" column="ten_rainfall_min" jdbcType="DECIMAL"/>
        <result property="radiation" column="radiation" jdbcType="DECIMAL"/>
        <result property="illumination" column="illumination" jdbcType="DECIMAL"/>
        <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
            <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="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"/>
            <result property="airTemperature" column="air_temperature" jdbcType="VARCHAR"/>
            <result property="airHumidity" column="air_humidity" jdbcType="VARCHAR"/>
            <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="illumination" column="illumination" jdbcType="VARCHAR"/>
            <result property="thermalRadiation" column="thermal_radiation" jdbcType="VARCHAR"/>
            <result property="ultravioletRay" column="ultraviolet_ray" 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,
        hydrogen_sulfide,so2,no2,
        co,o3,pm2point5,
        pm10,air_temperature,air_humidity,
        air_pressure,wind_direction,wind_speed,
        ten_rainfall_min,radiation,illumination,
        create_time
        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,
        type,create_time
    </sql>
    <select id="listAirId" resultType="java.lang.Long">
        SELECT

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

@@ -5,13 +5,15 @@
<mapper namespace="com.sandu.ximon.dao.mapper.AirEquipmentNongGengMapper">

    <resultMap id="BaseResultMap" type="com.sandu.ximon.dao.domain.AirEquipmentNongGeng">
        <id property="id" column="id" jdbcType="BIGINT"/>
        <result property="mac" column="mac" jdbcType="VARCHAR"/>
        <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
            <id property="id" column="id" jdbcType="BIGINT"/>
            <result property="mac" column="mac" 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,create_time
        id,mac,type,
        create_time
    </sql>
    <select id="listAirEquipmentByIds" resultType="com.sandu.ximon.dao.bo.AirEquipmentNongGengBo">
        SELECT

 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirDataNongGengController.java

@@ -74,12 +74,12 @@
     * @param keyword å…³é”®å­—
     * @return
     */
    @GetMapping("/listAirData")
    public ResponseVO<Object> listAirDataByKeyword(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
        if (!permissionConfig.check(MenuEnum.AIR_DATA__NONG_GENG_LIST.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        List<AirDataNongGengBo> list = airDataNongGengService.listAirDataByKeyword(baseConditionVO, keyword);
        return ResponseUtil.successPage(list);
    }
//    @GetMapping("/listAirData")
//    public ResponseVO<Object> listAirDataByKeyword(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
//        if (!permissionConfig.check(MenuEnum.AIR_DATA__NONG_GENG_LIST.getCode())) {
//            return ResponseUtil.fail("缺少对应用户权限");
//        }
//        List<AirDataNongGengBo> list = airDataNongGengService.listAirDataByKeyword(baseConditionVO, keyword);
//        return ResponseUtil.successPage(list);
//    }
}

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

@@ -57,23 +57,23 @@

        return save(airDataNongGeng);
    }

    /**
     * æŸ¥è¯¢å¤§æ°”数据(模糊查询)
     */
    public List<AirDataNongGengBo> listAirDataByKeyword(BaseConditionVO baseConditionVO, String keyword) {
        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
        List<Long> listAirId;
        if (SecurityUtils.getClientId() == null) {
            listAirId = baseMapper.listAirId(keyword, null);
        } else {
            listAirId = baseMapper.listAirId(keyword, SecurityUtils.getUserId());
        }
        if (CollUtil.isEmpty(listAirId)) {
            return CollUtil.newArrayList();
        }
        List<AirDataNongGengBo> airDataBos = baseMapper.listAirDataByIds(listAirId);
        return airDataBos;

    }
//
//    /**
//     * æŸ¥è¯¢å¤§æ°”数据(模糊查询)
//     */
//    public List<AirDataNongGengBo> listAirDataByKeyword(BaseConditionVO baseConditionVO, String keyword) {
//        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
//        List<Long> listAirId;
//        if (SecurityUtils.getClientId() == null) {
//            listAirId = baseMapper.listAirId(keyword, null);
//        } else {
//            listAirId = baseMapper.listAirId(keyword, SecurityUtils.getUserId());
//        }
//        if (CollUtil.isEmpty(listAirId)) {
//            return CollUtil.newArrayList();
//        }
//        List<AirDataNongGengBo> airDataBos = baseMapper.listAirDataByIds(listAirId);
//        return airDataBos;
//
//    }
}

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

@@ -6,7 +6,6 @@
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.ximon.admin.manager.iot.rrpc.enums.AtmoFunctionCode;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.utils.RedisUtils;
import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
import com.sandu.ximon.dao.bo.AirEquipmentNongGengBo;
@@ -61,27 +60,29 @@
            PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
        }
        List<AirEquipmentNongGengBo> airEquipmentBos;
        if (SecurityUtils.getClientId() == null) {
            airEquipmentBos = airEquipmentNongGengMapper.listAirEquipmentByIds(keyword, null);
        } else {
            airEquipmentBos = airEquipmentNongGengMapper.listAirEquipmentByIds(keyword, SecurityUtils.getUserId());
        }
//        if (SecurityUtils.getClientId() == null) {
//            airEquipmentBos = airEquipmentNongGengMapper.listAirEquipmentByIds(keyword, null);
//        } else {
//            airEquipmentBos = airEquipmentNongGengMapper.listAirEquipmentByIds(keyword, SecurityUtils.getUserId());
//        }

        return airEquipmentBos;
        return null;
//        return airEquipmentBos;
    }

    /**
     * å¤§æ°”设备列表（农耕，用于首页数据统计）
     */
    public List<AirEquipmentNongGengBo> listAirEquipmentOnHome() {
        List<AirEquipmentNongGengBo> airEquipmentBos;
        if (SecurityUtils.getClientId() == null) {
            airEquipmentBos = airEquipmentNongGengMapper.listAirEquipmentByIds(null, null);
        } else {
            airEquipmentBos = airEquipmentNongGengMapper.listAirEquipmentByIds(null, SecurityUtils.getUserId());
        }
//        List<AirEquipmentNongGengBo> airEquipmentBos;
//        if (SecurityUtils.getClientId() == null) {
//            airEquipmentBos = airEquipmentNongGengMapper.listAirEquipmentByIds(null, null);
//        } else {
//            airEquipmentBos = airEquipmentNongGengMapper.listAirEquipmentByIds(null, SecurityUtils.getUserId());
//        }

        return airEquipmentBos;
//        return airEquipmentBos;
        return null;
    }

    /**