本地诺瓦调整

Van333

2022-12-15 5e94332935da62448c17f89a807acf46a5ae3e75

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

@@ -39,6 +39,10 @@
     * @return 是否成功
     */
    public boolean saveReportData(String deviceName, A5AtmosphereHeartbeatReportInnerFrame.HeartBeatDataPackage heartBeatDataPackage) {
        if (heartBeatDataPackage == null) {
            System.out.println("保存大气设备心跳包数据异常，心跳包为空！");
            return false;
        }

        AirData airData = new AirData();
        BeanUtils.copyProperties(heartBeatDataPackage, airData);
@@ -48,7 +52,57 @@
        AirEquipment airEquipment = new AirEquipment();
        airEquipment.setId(airData.getId());
        airEquipment.setMac(airData.getDeviceMac());
        airEquipment.setCreateTime(airData.getCreateTime());
        airEquipment.setDeviceType(heartBeatDataPackage.getDeviceType());
        airEquipment.setModuleWarmUpStatusFlag(heartBeatDataPackage.getModuleWarmUpStatusFlag());
        //温度传感器
        airEquipment.setTemperature(heartBeatDataPackage.getTemperature() != null ? 1 : 0);
        //湿度传感器
        airEquipment.setHumidity(heartBeatDataPackage.getHumidity() != null ? 1 : 0);
        //风速传感器
        airEquipment.setWindSpeed(heartBeatDataPackage.getWindSpeed() != null ? 1 : 0);
        //风向传感器
        if (heartBeatDataPackage.getWindDirection() == null) {
            airEquipment.setWindDirection(0);
        } else if (heartBeatDataPackage.getWindDirection().contains("度")) {
            //360度传感器
            airEquipment.setWindDirection(2);
        } else {
            //八向仪传感器
            airEquipment.setWindDirection(1);
        }
        //风力传感器
        airEquipment.setWindPower(heartBeatDataPackage.getWindPower() != null ? 1 : 0);
        //气压传感器
        airEquipment.setPressure(heartBeatDataPackage.getPressure() != null ? 1 : 0);
        //光强传感器
        airEquipment.setLightIntensity(heartBeatDataPackage.getLightIntensity() != null ? 1 : 0);
        //噪音传感器
        airEquipment.setNoise(heartBeatDataPackage.getNoise() != null ? 1 : 0);
        //PM25传感器
        airEquipment.setPm25(heartBeatDataPackage.getPm25() != null ? 1 : 0);
        //PM10传感器
        airEquipment.setPm10(heartBeatDataPackage.getPm10() != null ? 1 : 0);
        //TSP传感器
        airEquipment.setTsp(heartBeatDataPackage.getTsp() != null ? 1 : 0);
        //雨量传感器
        airEquipment.setRain(heartBeatDataPackage.getRain() != null ? 1 : 0);
        //SO2传感器
        airEquipment.setSo2(heartBeatDataPackage.getSo2() != null ? 1 : 0);
        //甲醛传感器
        airEquipment.setEch2o(heartBeatDataPackage.getEch2o() != null ? 1 : 0);
        //NO2传感器
        airEquipment.setNo2(heartBeatDataPackage.getNo2() != null ? 1 : 0);
        //TVOC传感器
        airEquipment.setTvoc(heartBeatDataPackage.getTvoc() != null ? 1 : 0);
        //CO传感器
        airEquipment.setCo(heartBeatDataPackage.getCo() != null ? 1 : 0);
        //CO2传感器
        airEquipment.setCo2(heartBeatDataPackage.getCo2() != null ? 1 : 0);
        //03传感器
        airEquipment.setO3(heartBeatDataPackage.getO3() != null ? 1 : 0);
        //氟化物传感器
        airEquipment.setFluoride(heartBeatDataPackage.getFluoride() != null ? 1 : 0);

        airEquipmentService.addAirEquipment(airEquipment);

        //存缓存心跳包
@@ -107,7 +161,7 @@
            code = baseMapper.getCodeByPoleId(poleId, null);
        }
        A5AtmosphereHeartbeatReportInnerFrame.HeartBeatDataPackage heartBeatDataPackage
                = RedisUtils.getBean().get(AtmoFunctionCode.AIR_HEARTBEAT.getCode() + code, A5AtmosphereHeartbeatReportInnerFrame.HeartBeatDataPackage.class);
                = RedisUtils.getBean().get(AtmoFunctionCode.AIR_HEARTBEAT_NONG_GENG.getCode() + code, A5AtmosphereHeartbeatReportInnerFrame.HeartBeatDataPackage.class);
        if (heartBeatDataPackage == null) {
            return null;
        }