Merge remote-tracking branch 'origin/master'

zss

2024-08-10 b9d6c39b0bc0b65cbd943dfaedadb6a343bf799e

Merge remote-tracking branch 'origin/master'

 cnas-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java

@@ -182,8 +182,9 @@
                .orderBy(false, false, DataConfig::getId));
            list1.addAll(list);
        });
        List<DataConfig> collect = list1.stream().distinct().collect(Collectors.toList());
        // 3、采集，取数据
        Map<String, Object> map = DataAcquisition.dataAcquisitionEntrance(list1, device.get(0), entrustCode, sampleCode, ip);
        Map<String, Object> map = DataAcquisition.dataAcquisitionEntrance(collect, device.get(0), entrustCode, sampleCode, ip);
        // 4、造循环次数，参与公式计算
        if (ObjectUtils.isNotEmpty(map)) {
            Map<String, Object> frequency = DataAcquisition.createFrequency(entrustCode, sampleCode, map);