修改测温

vince

2024-07-03 69e8acc5dd1f760eb60e914472c151bfa8126a52

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

@@ -1,5 +1,6 @@
package com.fzzy.gateway.hx2023.service;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.fzzy.api.data.DepotType;
import com.fzzy.api.data.GatewayDeviceType;
@@ -220,7 +221,7 @@
        weightInfo.setWeightUnit("KG");

        JSONObject jsonObject = new JSONObject();
        jsonObject.put("weightInfo", weightInfo);
        jsonObject.put("weightInfo", JSON.toJSONString(weightInfo));

        packet.setProperties(jsonObject);

@@ -342,7 +343,7 @@
        outPut.setTemperature(temperature);
        List<GrainTH> ths = new ArrayList<>();

        ths.add(new GrainTH(weather.getTem() != null ? weather.getTem() + "" : "", weather.getHumidity() != null ? weather.getHumidity() + "" : "", "1"));
        ths.add(new GrainTH(weather.getTem() != null ? weather.getTem() + "" : "", weather.getHumidity() != null ? weather.getHumidity().replaceAll("%","") + "" : "", "1"));
        outPut.setTemperatureAndhumidity(ths);

        grain.setOutput(JSONObject.toJSONString(outPut));
@@ -361,7 +362,7 @@
            weatherStation.setId(device.getDeviceId());
        }
        weatherStation.setAirPressure(weather.getPressure());
        weatherStation.setHumidity(weather.getHumidity());
        weatherStation.setHumidity(weather.getHumidity().replaceAll("%",""));
        weatherStation.setPm(weather.getAir_pm25());
        weatherStation.setRadiation("0");
        weatherStation.setRainfallAmount(weather.getWea());