Explorar o código

fix:修复历史数据接受失败bug

黄渊昊 hai 3 días
pai
achega
d882c120a5

+ 3 - 3
snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/core/renke/listener/JfcloudColdChainRenKeDefaultDataListener.java

@@ -47,12 +47,12 @@ public class JfcloudColdChainRenKeDefaultDataListener implements IDataListener {
     public void receiveStoreData(StoreData data) {
         log.info("======================== 设备ID: {} ========================================", data.getDeviceId());
         log.info("接收到存储数据: 设备ID = {}", data.getDeviceId());
-        StoreData storeData = BeanUtil.copyProperties(data, StoreData.class);
+//        StoreData storeData = BeanUtil.copyProperties(data, StoreData.class);
         data.getNodeList().forEach(nodeData -> log.info("记录ID: {}, 记录时间: {}, 温度: {}, 湿度: {}", nodeData.getNodeId(), nodeData.getRecordTime(), nodeData.getTem(), nodeData.getHum()));
         log.info("*************************************************************************");
         RenKeColdChainMessageData renKeColdChainMessageData = new RenKeColdChainMessageData();
-        renKeColdChainMessageData.setStoreData(storeData);
-        log.info("list大小:{}", storeData.getNodeList().size());
+        renKeColdChainMessageData.setStoreData(data);
+        log.info("list大小:{}", data.getNodeList().size());
         renKeColdChainDataHandler.handleStoreData(renKeColdChainMessageData);
     }
 

+ 1 - 1
snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/core/service/dataprocess/dataclean/impl/AbsRenkeMonitorDataProcessor.java

@@ -132,7 +132,7 @@ public abstract class AbsRenkeMonitorDataProcessor implements MonitorDataProcess
         for (NodeData nodeData : nodeList) {
             Date recordTime = nodeData.getRecordTime();
             int nodeId = nodeData.getNodeId();
-            if (recordTime != null && nodeData.getCoordinateType() == 2) {
+            if (recordTime != null) {
                 SensorData sensorData = new SensorData();
                 sensorData.setType(DataType.HISTORY.getCode());
                 sensorData.setDeviceId(String.valueOf(deviceId));