From 47cdca1cb179da3326cca0c93cdf72d11cbb57b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=87=A7=E8=87=A7?= <2556450572@qq.com> Date: Sun, 30 Oct 2022 15:50:35 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8Din=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E6=9E=84=E9=80=A0=E6=9C=AA=E8=BF=9B=E8=A1=8C=E5=8E=BB=E9=87=8D?= =?UTF-8?q?=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../stream/plugin/mybatisplus/BaseQueryHelper.java | 3 ++- .../vampireachao/stream/plugin/mybatisplus/OneToManyToOne.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/stream-plugin/stream-plugin-mybatis-plus/src/main/java/io/github/vampireachao/stream/plugin/mybatisplus/BaseQueryHelper.java b/stream-plugin/stream-plugin-mybatis-plus/src/main/java/io/github/vampireachao/stream/plugin/mybatisplus/BaseQueryHelper.java index e3653433..02d365b7 100644 --- a/stream-plugin/stream-plugin-mybatis-plus/src/main/java/io/github/vampireachao/stream/plugin/mybatisplus/BaseQueryHelper.java +++ b/stream-plugin/stream-plugin-mybatis-plus/src/main/java/io/github/vampireachao/stream/plugin/mybatisplus/BaseQueryHelper.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.toolkit.support.SFunction; import io.github.vampireachao.stream.core.lambda.function.SerCons; import io.github.vampireachao.stream.core.lambda.function.SerFunc; import io.github.vampireachao.stream.core.optional.Sf; +import io.github.vampireachao.stream.core.stream.Steam; import java.io.Serializable; import java.util.Collection; @@ -41,7 +42,7 @@ public abstract class BaseQueryHelper< } public TR in(Collection dataList) { - wrapper = Sf.mayColl(dataList).mayLet(values -> wrapper.in(keyFunction, values)).orGet(() -> Database.notActive(wrapper)); + wrapper = Sf.mayColl(Steam.of(dataList).distinct().toList()).mayLet(values -> wrapper.in(keyFunction, values)).orGet(() -> Database.notActive(wrapper)); return (TR) this; } diff --git a/stream-plugin/stream-plugin-mybatis-plus/src/main/java/io/github/vampireachao/stream/plugin/mybatisplus/OneToManyToOne.java b/stream-plugin/stream-plugin-mybatis-plus/src/main/java/io/github/vampireachao/stream/plugin/mybatisplus/OneToManyToOne.java index f2044a2f..82c404b5 100644 --- a/stream-plugin/stream-plugin-mybatis-plus/src/main/java/io/github/vampireachao/stream/plugin/mybatisplus/OneToManyToOne.java +++ b/stream-plugin/stream-plugin-mybatis-plus/src/main/java/io/github/vampireachao/stream/plugin/mybatisplus/OneToManyToOne.java @@ -53,7 +53,7 @@ public class OneToManyToOne, V extends } public OneToManyToOne in(Collection dataList) { - middleWrapper = Sf.mayColl(dataList).mayLet(values -> middleWrapper.in(middleKey, values)).orGet(() -> Database.notActive(middleWrapper)); + middleWrapper = Sf.mayColl(Steam.of(dataList).distinct().toList()).mayLet(values -> middleWrapper.in(middleKey, values)).orGet(() -> Database.notActive(middleWrapper)); return this; } -- Gitee From f2c2b0ac377125b9063375cace1724057be8b32a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=87=A7=E8=87=A7?= <2556450572@qq.com> Date: Mon, 31 Oct 2022 21:04:31 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BD=BF=E7=94=A8set=E8=BF=9B=E8=A1=8C?= =?UTF-8?q?=E5=8E=BB=E9=87=8D=E4=BF=AE=E5=A4=8Din=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E6=9E=84=E9=80=A0=E6=9C=AA=E8=BF=9B=E8=A1=8C=E5=8E=BB=E9=87=8D?= =?UTF-8?q?=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../stream/plugin/mybatisplus/OneToManyToOne.java | 2 +- .../vampireachao/stream/plugin/mybatisplus/ManyTest.java | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/stream-plugin/stream-plugin-mybatis-plus/src/main/java/io/github/vampireachao/stream/plugin/mybatisplus/OneToManyToOne.java b/stream-plugin/stream-plugin-mybatis-plus/src/main/java/io/github/vampireachao/stream/plugin/mybatisplus/OneToManyToOne.java index 82c404b5..593127fc 100644 --- a/stream-plugin/stream-plugin-mybatis-plus/src/main/java/io/github/vampireachao/stream/plugin/mybatisplus/OneToManyToOne.java +++ b/stream-plugin/stream-plugin-mybatis-plus/src/main/java/io/github/vampireachao/stream/plugin/mybatisplus/OneToManyToOne.java @@ -53,7 +53,7 @@ public class OneToManyToOne, V extends } public OneToManyToOne in(Collection dataList) { - middleWrapper = Sf.mayColl(Steam.of(dataList).distinct().toList()).mayLet(values -> middleWrapper.in(middleKey, values)).orGet(() -> Database.notActive(middleWrapper)); + middleWrapper = Sf.mayColl(new HashSet<>(dataList)).mayLet(values -> middleWrapper.in(middleKey, values)).orGet(() -> Database.notActive(middleWrapper)); return this; } diff --git a/stream-plugin/stream-plugin-mybatis-plus/src/test/java/io/github/vampireachao/stream/plugin/mybatisplus/ManyTest.java b/stream-plugin/stream-plugin-mybatis-plus/src/test/java/io/github/vampireachao/stream/plugin/mybatisplus/ManyTest.java index 4a2c9cfe..de0beb2d 100644 --- a/stream-plugin/stream-plugin-mybatis-plus/src/test/java/io/github/vampireachao/stream/plugin/mybatisplus/ManyTest.java +++ b/stream-plugin/stream-plugin-mybatis-plus/src/test/java/io/github/vampireachao/stream/plugin/mybatisplus/ManyTest.java @@ -5,6 +5,7 @@ import io.github.vampireachao.stream.plugin.mybatisplus.pojo.po.UserInfo; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; +import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -20,7 +21,13 @@ class ManyTest { @Test void testQuery() { - List userInfoList = Many.of(UserInfo::getId).eq(1L).parallel().query(); + List list = new ArrayList<>(); + list.add(1L); + list.add(2L); + list.add(2L); + list.add(2L); + list.add(2L); + List userInfoList = Many.of(UserInfo::getId).in(list).parallel().query(); List nameList = Many.of(UserInfo::getId).eq(1L).value(UserInfo::getName).sequential().query(); List leAgeNameList = Many.of(UserInfo::getId).eq(1L).value(UserInfo::getName) .condition(w -> w.le(UserInfo::getAge, 20)) -- Gitee From b491e93a58c824fc30405bb3aceddf2456ed929f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=87=A7=E8=87=A7?= <2556450572@qq.com> Date: Mon, 31 Oct 2022 21:05:15 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BD=BF=E7=94=A8set=E8=BF=9B=E8=A1=8C?= =?UTF-8?q?=E5=8E=BB=E9=87=8D=E4=BF=AE=E5=A4=8Din=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E6=9E=84=E9=80=A0=E6=9C=AA=E8=BF=9B=E8=A1=8C=E5=8E=BB=E9=87=8D?= =?UTF-8?q?=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../stream/plugin/mybatisplus/BaseQueryHelper.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stream-plugin/stream-plugin-mybatis-plus/src/main/java/io/github/vampireachao/stream/plugin/mybatisplus/BaseQueryHelper.java b/stream-plugin/stream-plugin-mybatis-plus/src/main/java/io/github/vampireachao/stream/plugin/mybatisplus/BaseQueryHelper.java index 02d365b7..fa86b1f3 100644 --- a/stream-plugin/stream-plugin-mybatis-plus/src/main/java/io/github/vampireachao/stream/plugin/mybatisplus/BaseQueryHelper.java +++ b/stream-plugin/stream-plugin-mybatis-plus/src/main/java/io/github/vampireachao/stream/plugin/mybatisplus/BaseQueryHelper.java @@ -5,10 +5,10 @@ import com.baomidou.mybatisplus.core.toolkit.support.SFunction; import io.github.vampireachao.stream.core.lambda.function.SerCons; import io.github.vampireachao.stream.core.lambda.function.SerFunc; import io.github.vampireachao.stream.core.optional.Sf; -import io.github.vampireachao.stream.core.stream.Steam; import java.io.Serializable; import java.util.Collection; +import java.util.HashSet; import java.util.function.UnaryOperator; @@ -42,7 +42,7 @@ public abstract class BaseQueryHelper< } public TR in(Collection dataList) { - wrapper = Sf.mayColl(Steam.of(dataList).distinct().toList()).mayLet(values -> wrapper.in(keyFunction, values)).orGet(() -> Database.notActive(wrapper)); + wrapper = Sf.mayColl(new HashSet<>(dataList)).mayLet(values -> wrapper.in(keyFunction, values)).orGet(() -> Database.notActive(wrapper)); return (TR) this; } -- Gitee From 1fbc2ae0fc3f6323b76ca1b508007501a3ae09e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=87=A7=E8=87=A7?= <2556450572@qq.com> Date: Mon, 31 Oct 2022 21:07:31 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BD=BF=E7=94=A8set=E8=BF=9B=E8=A1=8C?= =?UTF-8?q?=E5=8E=BB=E9=87=8D=E4=BF=AE=E5=A4=8Din=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E6=9E=84=E9=80=A0=E6=9C=AA=E8=BF=9B=E8=A1=8C=E5=8E=BB=E9=87=8D?= =?UTF-8?q?=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vampireachao/stream/plugin/mybatisplus/ManyTest.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/stream-plugin/stream-plugin-mybatis-plus/src/test/java/io/github/vampireachao/stream/plugin/mybatisplus/ManyTest.java b/stream-plugin/stream-plugin-mybatis-plus/src/test/java/io/github/vampireachao/stream/plugin/mybatisplus/ManyTest.java index de0beb2d..19f01da4 100644 --- a/stream-plugin/stream-plugin-mybatis-plus/src/test/java/io/github/vampireachao/stream/plugin/mybatisplus/ManyTest.java +++ b/stream-plugin/stream-plugin-mybatis-plus/src/test/java/io/github/vampireachao/stream/plugin/mybatisplus/ManyTest.java @@ -21,13 +21,8 @@ class ManyTest { @Test void testQuery() { - List list = new ArrayList<>(); - list.add(1L); - list.add(2L); - list.add(2L); - list.add(2L); - list.add(2L); - List userInfoList = Many.of(UserInfo::getId).in(list).parallel().query(); + + List userInfoList = Many.of(UserInfo::getId).eq(1L).parallel().query(); List nameList = Many.of(UserInfo::getId).eq(1L).value(UserInfo::getName).sequential().query(); List leAgeNameList = Many.of(UserInfo::getId).eq(1L).value(UserInfo::getName) .condition(w -> w.le(UserInfo::getAge, 20)) -- Gitee