Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z

src/main/java/com/glxp/api/service/sync/HeartService.java

@@ -1874,12 +1874,20 @@ public class HeartService {
             });
         }
         if (CollectionUtil.isNotEmpty(productsList)) {
-            BasicProductsEntity basicProductsEntity = productsList.get(0);
+            //过来500 条 数据 过滤掉uuid一样的 100个产品
-            List<BasicProductsEntity> basicProductsEntities = basicProductsDao.selectList(new LambdaQueryWrapper<BasicProductsEntity>().eq(BasicProductsEntity::getUuid, basicProductsEntity.getUuid()));
+            List<BasicProductsEntity> uniqueUuidProducts = productsList.stream()
-            if (CollectionUtil.isNotEmpty(basicProductsEntities)){
+                    .collect(Collectors.groupingBy(BasicProductsEntity::getUuid))
-                for (BasicProductsEntity basicProductsEntity1 : basicProductsEntities){
+                    .values()
-                    if (basicProductsEntity1.getNameCode() == null){
+                    .stream()
-                        basicProductsDao.deleteById(basicProductsEntity1);
+                    .map(list -> list.get(0))
+                    .collect(Collectors.toList());
+            for (BasicProductsEntity basicProductsEntity : uniqueUuidProducts){
+                List<BasicProductsEntity> basicProductsEntities = basicProductsDao.selectList(new LambdaQueryWrapper<BasicProductsEntity>().eq(BasicProductsEntity::getUuid, basicProductsEntity.getUuid()));
+                if (CollectionUtil.isNotEmpty(basicProductsEntities)){
+                    for (BasicProductsEntity basicProductsEntity1 : basicProductsEntities){
+                        if (basicProductsEntity1.getNameCode() == null){
+                            basicProductsDao.deleteById(basicProductsEntity1);
+                        }
                     }
                 }
             }