粮情协议优化

vince

2024-04-26 b1c572949997a5d82d9b609163ff280a1c49627d

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

@@ -43,12 +43,7 @@
     */
    public void analysis(InetAddress address, int port, String strMsg) {

        if (strMsg.startsWith("FE")) {

            //DO NOTHING
        } else {
            this.analysisGrainStep1(address, strMsg);
        }
    }

    /**
@@ -99,7 +94,7 @@
                points.add(-100.00);
                continue;
            }
            temp = BytesUtil.hexToInt(BytesUtil.tran_LH(tag)) * 0.0625;
            temp = BytesUtil.hexToInt(tag) * 0.0625;
            temp = NumberUtil.keepPrecision(temp, 1);
            points.add(temp);
        }
@@ -186,11 +181,15 @@


        JSONObject properties = new JSONObject();
        properties.put("data", outPut);
        properties.put("timestamp", grain.getTimestamp());

        properties.put("timestamp", grain.getTimestamp());
        outPut.setDetectTime( grain.getTimestamp());
        if (StringUtils.isEmpty(height+"")) height = 0.0;
        properties.put("liquidHeight", height);

        outPut.setLiquidHeight(height+"");
        grain.setOutput(JSONObject.toJSONString(outPut));
        properties.put("output", outPut);
        grain.setProperties(properties);

        //封装好的数据
@@ -198,17 +197,18 @@

        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);
    }
}