优化测温协议

vince

2025-01-08 caf2599a9869244ded811018811c37a2aabac3fc

 src/main/java/com/fzzy/protocol/youxian1/analysis/AnalysisService.java

@@ -228,12 +228,15 @@

            temperature.add(new GrainTemp(cableNum + "", z + "", curTemp + "", position + ""));

            sumT += curTemp;
            if (curTemp > max) {
            if (curTemp > max  && curTemp < 40) {
                max = curTemp;
            }
            if (curTemp < min) {
            if (curTemp < min && curTemp > 3) {
                min = curTemp;
            }
            if(curTemp > 3 &&  curTemp < 40){
                sumT += curTemp;
                sumNum++;
            }
        }

@@ -279,7 +282,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());
@@ -295,19 +298,20 @@

        reqData.setData(JSONObject.toJSONString(grain));

        doPushGrain(reqData);
        doPushGrain(reqData,grain);
    }


    private void doPushGrain(BaseReqData reqData) {
    private void doPushGrain(BaseReqData reqData,GrainData grainData) {

        GatewayDeviceReportService reportService = gatewayRemoteManager.getDeviceReportService(reqData.getDevice().getPushProtocol());
        if (null == reportService) {
            log.error("------------粮情推送失败，系统不存在当前协议执行类----{}", reqData.getDevice().getDeviceName());
            return;
        }

        reportService.reportGrainData(reqData);
        reqData.setData(reportService.grainData2GatewayApiInfoKafka(grainData,reqData.getDevice()).getData());
        reportService.reportGrainDataByKafka(reqData);
    }