From a5b1bad21ba279ade3954852a5e281e9086042f0 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 26 十一月 2024 15:22:52 +0800
Subject: [PATCH] 前端联调修改2.0
---
cnas-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java | 9 ++-------
1 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java b/cnas-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java
index e7e22a0..aa71fa0 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java
@@ -182,17 +182,12 @@
.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);
--
Gitblit v1.9.3