From 18dfe6446c8cd9a9d4d734f8b36ead38e09f4c1e Mon Sep 17 00:00:00 2001 From: huangfeng Date: Wed, 26 Jun 2024 10:25:07 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BB=8E=E6=97=A7=E7=89=88=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E6=95=B0=E6=8D=AE=E5=90=8E=E8=BE=93=E5=87=BA=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E8=AE=B0=E5=BD=95=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xydl/cac/service/impl/NSensorServiceImpl.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/xydl/cac/service/impl/NSensorServiceImpl.java b/src/main/java/com/xydl/cac/service/impl/NSensorServiceImpl.java index c28bb1b..d7ecc21 100644 --- a/src/main/java/com/xydl/cac/service/impl/NSensorServiceImpl.java +++ b/src/main/java/com/xydl/cac/service/impl/NSensorServiceImpl.java @@ -25,6 +25,7 @@ import org.springframework.util.CollectionUtils; import javax.annotation.Resource; import javax.persistence.criteria.Predicate; import java.util.*; +import java.util.stream.Collectors; @Service @@ -287,6 +288,7 @@ public class NSensorServiceImpl implements NSensorService { int success = 0; int skip = 0; List list = modevRepository.findAll(); + List warnList = new ArrayList<>(); for (Modev item : list) { NSensor sensor = item.transform(); List i2relations = i2relationRepository.findByEqmid(item.getId()); @@ -295,16 +297,26 @@ public class NSensorServiceImpl implements NSensorService { sensor.setEquipmentId(i2relation.getEquipmentid()); sensor.setSensorCode(i2relation.getSensorid()); sensor.setPhase(i2relation.getPhase()); + if (i2relations.size() > 1) { + String str = "eqmid=" + item.getId() + "的I2relation数据存在多条，需要人工再次校对编号和相位"; + warnList.add(str); + } } List slist = repository.findByDevId(sensor.getDevId()); if (CollectionUtils.isEmpty(slist)) { this.add(sensor); success++; } else { + String str = "eqmid=" + item.getId() + "的已存在跳过"; + warnList.add(str); skip++; } } - return "成功导入" + success + "个，跳过" + skip + "个"; + String str = "成功导入" + success + "个，跳过" + skip + "个。"; + if (warnList.size() > 0) { + str = str + warnList.stream().collect(Collectors.joining(";")); + } + return str; } }