yaowanxin
2 天以前 8f5fed4fbee754b1e22258f8862bdabf518df315
区分数据
已修改3个文件
14 ■■■■■ 文件已修改
cnas-device/src/main/java/com/ruoyi/device/mqtt/MQCallback.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
cnas-device/src/main/java/com/ruoyi/device/service/CollectBridgeService.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cnas-device/src/main/java/com/ruoyi/device/service/impl/CollectBridgeServiceImpl.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cnas-device/src/main/java/com/ruoyi/device/mqtt/MQCallback.java
@@ -76,7 +76,7 @@
                    break;
                case "/ztt/v3/2455221/publish":
                    //耐丝:伸长率数据解析
                    mqCallback.collectBridgeService.addBridgeValueByNS(parse);
                    mqCallback.collectBridgeService.addBridgeValueByNSD(parse);
//                    log.info("伸长率消息体:{}",parse);
                    break;
            }
cnas-device/src/main/java/com/ruoyi/device/service/CollectBridgeService.java
@@ -19,5 +19,7 @@
    void addBridgeValue(JSONObject jsonObject);
    void addBridgeValueByNS(String jsonStr);
    void addBridgeValueByNSD(String jsonStr);
}
cnas-device/src/main/java/com/ruoyi/device/service/impl/CollectBridgeServiceImpl.java
@@ -115,10 +115,20 @@
            //过滤出包含实际电阻值的对象
            // 处理 NSDQCS.DQCS.DZZ 数据
            processSingleValueDataStream(dataList, DCResistanceMqttConstants.NSDQCS_DQCS_DZZ);
        }
    }
    @Override
    public void addBridgeValueByNSD(String jsonStr) {
        Map<String, Object> dataMap = JSONObject.parseObject(jsonStr, new TypeReference<Map<String, Object>>(){}.getType());
        if(CollectionUtil.isNotEmpty(dataMap) && Objects.nonNull(dataMap.get("data"))){
            List<DCResistanceMqttVO> dataList = JSONArray.parseObject(dataMap.get("data").toString(), new TypeReference<List<DCResistanceMqttVO>>(){}.getType());
            //过滤出包含实际电阻值的对象
            // 处理 NSTSSC.TSSC.WY 数据
            processThreeTimesValueDataStream(dataList, ElongationMqttConstants.NSTSSC_TSSC_WY);
        }
    }
    /**
     * 处理单值数据流的数据并保存到 Redis
     * @param dataList 数据列表