四川网关-提交测试

jiazx0107@163.com

2023-10-31 3f0b65b6b8af5c8c0aa2efa57be3adf2398cd62c

 src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java

@@ -196,6 +196,7 @@
        KafaGrainData result = new KafaGrainData();

        result.setMessageId(ScConstant.getMessageId());
        result.setMessgeId(result.getMessageId());
        result.setDeviceID(device.getDeviceId());
        result.setAvgTemperature(lastData.getTempAve() + "");
        result.setMinTemperature(lastData.getTempMin() + "");
@@ -245,20 +246,20 @@

            //判断最大
            if (curTemp.equals(result.getMaxTemperature())) {
                result.setMaxX(x);
                result.setMaxY(y);
                result.setMaxZ(position);
                result.setMaxX(x+"");
                result.setMaxY(y+"");
                result.setMaxZ(position+"");
            }


            //判断最小
            if (curTemp.equals(result.getMinTemperature())) {
                result.setMinX(x);
                result.setMinY(y);
                result.setMinZ(position);
                result.setMinX(x+"");
                result.setMinY(y+"");
                result.setMinZ(position+"");
            }

            temperature.add(new KafkaGrainDataDetail1(cableNum + "", z + "", curTemp, position + "", x, y));
            temperature.add(new KafkaGrainDataDetail1(cableNum + "", z + "", curTemp, position + "", x+"", y+""));
        }

        //粮温信息
@@ -278,8 +279,8 @@
        List<KafkaGrainTH> temperatureAndhumidity = new ArrayList<>();
        temperatureAndhumidity.add(grainTH);

      //  trhInfo.setTemperatureAndhumidity(temperatureAndhumidity);
        trhInfo.put("temperatureAndhumidity",temperatureAndhumidity);
        //trhInfo.put("temperatureAndhumidity",grainTH);

        JSONObject params = new JSONObject();
        params.put("TRHInfo", trhInfo);