| | |
|---|
| | | .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)) { |
|---|
| | | Object result; |
|---|
| | | Map<String, Object> frequency = DataAcquisition.createFrequency(entrustCode, sampleCode, map); |
|---|
| | | // if (ObjectUtils.isEmpty(device.get(0).getEntrustCode()) && ObjectUtils.isEmpty(device.get(0).getSampleCode())) { |
|---|
| | | // result = formulaCalculation(frequency, true); |
|---|
| | | // } else { |
|---|
| | | // result = formulaCalculation(frequency, false); |
|---|
| | | // } |
|---|
| | | return Result.success(frequency); |
|---|
| | | } else { |
|---|
| | | return Result.success(null); |
|---|
