优化测温协议

vince

2024-09-19 1346ece340481c2489dbc4ada7ddd73971991d44

 src/main/java/com/fzzy/gateway/hx2023/service/DeviceReportServiceImpl.java

@@ -108,7 +108,7 @@
            weightInfo.setNetWeight(reqData.getWeight());
            weightInfo.setWeightUnit("KG");
            JSONObject jsonObject = new JSONObject();
            jsonObject.put("weightInfo", weightInfo);
            jsonObject.put("weightInfo", JSON.toJSONString(weightInfo));

            packet.setProperties(jsonObject);

@@ -640,13 +640,17 @@
        //仓温度信息
        KafkaGrainTH grainTH = new KafkaGrainTH();
        List<GrainTH> ths= output.getTemperatureAndhumidity();
        grainTH.setHumidity(ths.get(0).getHumidity());
        grainTH.setTemperature(ths.get(0).getTemperature() );
        if(ths != null && ths.size() > 0){
            grainTH.setHumidity(ths.get(0).getHumidity());
            grainTH.setTemperature(ths.get(0).getTemperature() );
        }


        GrainWeather weather = JSON.parseObject(grainData.getWeatherStation(),GrainWeather.class);
        grainTH.setAirHumidity(weather.getHumidity());
        grainTH.setAirTemperature(weather.getTemperature() );

        if (weather!=null){
            grainTH.setAirHumidity(weather.getHumidity());
            grainTH.setAirTemperature(weather.getTemperature() );
        }
        List<KafkaGrainTH> temperatureAndhumidity = new ArrayList<>();
        temperatureAndhumidity.add(grainTH);