jiazx0107@163.com
2023-10-31 e5e40869b53a0e8c9c4e86d3f488dceb08b3b845
四川省网关接口相关11
已修改4个文件
26 ■■■■ 文件已修改
src/main/java/com/fzzy/gateway/hx2023/data/GrainData.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/gateway/hx2023/data/GrainDataDetail.java 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/gateway/hx2023/kafka/KafkaDeviceReport.java 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/gateway/hx2023/data/GrainData.java
@@ -14,7 +14,7 @@
    private String messageId;
    //设备编码
    private String deviceId;
    private String deviceID;
    //整仓平均温度
    private String avgTemperature;
src/main/java/com/fzzy/gateway/hx2023/data/GrainDataDetail.java
@@ -9,13 +9,13 @@
public class GrainDataDetail {
    //根号
    private int cableNum;
    private String cableNum;
    //层号
    private int layerNumber;
    private String layerNumber;
    //索引
    private int position;
    private String position;
    //温度值
    private String temperature;
@@ -24,9 +24,9 @@
    }
    public GrainDataDetail(int cableNum, int layerNumber, int position, String temperature) {
        this.cableNum = cableNum;
        this.layerNumber = layerNumber;
        this.position = position;
        this.cableNum = cableNum + "";
        this.layerNumber = layerNumber + "";
        this.position = position + "";
        this.temperature = temperature;
    }
}
src/main/java/com/fzzy/gateway/hx2023/kafka/KafkaDeviceReport.java
@@ -33,10 +33,11 @@
    public String sendGrainData2Cloud(GrainData data) {
        
        
        log.debug("----推送粮情信息到云端---{}",data);
        String strData = JSONObject.toJSONString(data);
        log.debug("----推送粮情信息到云端---{}", strData);
        //推送信息
        kafkaTemplate.send("TOPIC_ZLJ_GRAIN_TEMPERATURE",JSONObject.toJSONString(data)).addCallback(success -> {
        kafkaTemplate.send("TOPIC_ZLJ_GRAIN_TEMPERATURE", strData).addCallback(success -> {
            // 消息发送到的topic
            String topic = success.getRecordMetadata().topic();
            // 消息发送到的分区
@@ -44,11 +45,10 @@
            // 消息在分区内的offset
            long offset = success.getRecordMetadata().offset();
            log.info("粮情推送成功:" + topic + "-" + partition + "-" + offset);
            log.info("粮情推送成功:{}-{}-{}-{}", topic, partition, offset, data.getDeviceID());
        }, failure -> {
            log.error("粮情推送失败:" + failure.getMessage());
            log.info("粮情推送失败:{}-{}", data.getDeviceID(), failure.getMessage());
        });
        return "SUCCESS";
src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java
@@ -197,7 +197,7 @@
        GrainData result = new GrainData();
        result.setMessageId(ScConstant.getMessageId());
        result.setDeviceId(device.getDeviceId());
        result.setDeviceID(device.getDeviceId());
        result.setAvgTemperature(lastData.getTempAve() + "");
        result.setMinTemperature(lastData.getTempMin() + "");
        result.setMaxTemperature(lastData.getTempMax() + "");