四川网关-提交测试

jiazx0107@163.com

2023-10-31 902506299d0cfef195cdbd8322fdd1d175792102

四川网关-提交测试

 src/main/java/com/fzzy/gateway/hx2023/data/KafkaGrainDataDetail1.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,47 @@
package com.fzzy.gateway.hx2023.data;

import lombok.Data;

/**
 * ç²®æƒ…信息详细
 */
@Data
public class KafkaGrainDataDetail1 {

    //根号
    private String cableNum;

    //层号
    private String layerNumber;

    //温度值
    private String temperature;

    //索引，从0开始
    private String position;

    //该温度点所在的列,平方仓、地下仓必填
    private int linex;

    //该温度点所在的行,平方仓、地下仓必填
    private int rowy;

    //浅圆仓、筒仓必填，示例：{\"totalCircle\":3,\"smallCircle\":\"4,10,16\"}，totalCircle：总圈数，smallCircle：每圈有几根缆
   // private int total_circle;


    //具体圈数--浅圆仓、筒仓必填
   // private int circle;

    public KafkaGrainDataDetail1() {
    }

    public KafkaGrainDataDetail1(String cableNum, String layerNumber, String temperature, String position, int linex, int rowy) {
        this.cableNum = cableNum;
        this.layerNumber = layerNumber;
        this.temperature = temperature;
        this.position = position;
        this.linex = linex;
        this.rowy = rowy;
    }
}

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

@@ -13,10 +13,7 @@
import com.fzzy.gateway.api.GatewayRemoteManager;
import com.fzzy.gateway.entity.GatewayDevice;
import com.fzzy.gateway.hx2023.ScConstant;
import com.fzzy.gateway.hx2023.data.KafaGrainData;
import com.fzzy.gateway.hx2023.data.KafkaGrainDataDetail;
import com.fzzy.gateway.hx2023.data.KafkaGrainTH;
import com.fzzy.gateway.hx2023.data.TRHInfo;
import com.fzzy.gateway.hx2023.data.*;
import com.fzzy.gateway.service.repository.GatewayDeviceRep;

import lombok.extern.slf4j.Slf4j;
@@ -225,7 +222,7 @@
        int cableNum = 1, position = 0;

        String curTemp;
        List<KafkaGrainDataDetail> temperature = new ArrayList<>();
        List<KafkaGrainDataDetail1> temperature = new ArrayList<>();

        int x = 0, y = 0, z = 0;
        for (int i = 0; i < attr.length; i++) {
@@ -261,12 +258,14 @@
                result.setMinZ(position);
            }

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

        //粮温信息
        TRHInfo trhInfo = new TRHInfo();
        trhInfo.setTemperature(temperature);

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


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

        trhInfo.setTemperatureAndhumidity(temperatureAndhumidity);

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

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