bug 修复

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/gateway/impl/WebGatewayImpl.java

@@ -130,7 +130,16 @@ public class WebGatewayImpl implements WebGateway {
             devInfoImportVoList = devInfoImportVoList.stream().filter(item -> !existClientIds.contains(item.getClientId())).collect(Collectors.toList());
         }
 
+        List<String> importedClientIds = new ArrayList<>();
         devInfoService.saveOrUpdateBatch(devInfoImportVoList.stream().filter(item -> StringUtils.hasText(item.getClientId())).map(item -> {
+
+            if (importedClientIds.contains(item.getClientId())) {
+                existClientIds.add(item.getClientId());
+                return null;
+            } else {
+                importedClientIds.add(item.getClientId());
+            }
+
             DevInfo devInfo = new DevInfo();
             devInfo.setClientId(item.getClientId());
             devInfo.setDevType(item.getDevType());
@@ -142,7 +151,7 @@ public class WebGatewayImpl implements WebGateway {
             devInfo.setY(BigDecimal.ZERO);
             devInfo.setNorthAngle(BigDecimal.ZERO);
             return devInfo;
-        }).collect(Collectors.toList()));
+        }).filter(Objects::nonNull).collect(Collectors.toList()));
 
         UploadRes uploadRes = new UploadRes();
         if (!CollectionUtils.isEmpty(existClientIds)) {

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/service/impl/DevInfoServiceImpl.java

@@ -49,7 +49,7 @@ public class DevInfoServiceImpl extends ServiceImpl<DevInfoMapper, DevInfo> impl
         }
 
         // 关键字查询条件
-        if (Objects.nonNull(keyWord)) {
+        if (StringUtils.hasText(keyWord)) {
             wrapper.and(qw -> qw.like(DevInfo::getDevName, keyWord).or().like(DevInfo::getDevId, keyWord));
         }