数采调整

zouyu

11 小时以前 c17a0d27b6a2e9e0ebda4ee584b6b2fdf4e323ca

 cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceServiceImpl.java

@@ -313,11 +313,11 @@
                        throw new ErrorException("直流电阻数采异常：没有找到委托编号为【"+entrustCode+"】的数据");
                    }
                    list.add(0,1);//测试长度，默认1
                    list.add(1,Objects.isNull(collectBridge.getCollectTemperature())?0.0:collectBridge.getCollectTemperature());//todo:温度，暂时未采集到值
                    list.add(1,Objects.isNull(collectBridge.getCollectTemperature())?0.0:collectBridge.getCollectTemperature());
                    list.add(2,collectBridge.getCollectValue());//实际电阻值
                }else {
                    // 从 Redis 中获取列表数据
                    List<?> objectList = RedisUtil.lGet(refery, 0, -1);
                    Set<Object> objectList = RedisUtil.getZSetRange(refery, 0, -1);
                    list.addAll(objectList);
                }
                numberOfDataEntries.getAndIncrement();