Browse Source

修改删除消息

hmy 1 year ago
parent
commit
21dbfd3ac9

+ 2 - 2
pom.xml

@@ -89,11 +89,11 @@
 	<distributionManagement>
 		<repository>
 			<id>nexus</id>
-			<url>https://nexus.flowbb.cn/repository/maven-releases/</url>
+			<url>https://nexus.flowbb.top/repository/maven-releases/</url>
 		</repository>
 		<snapshotRepository>
 			<id>nexus</id>
-			<url>https://nexus.flowbb.cn/repository/maven-snapshots/</url>
+			<url>https://nexus.flowbb.top/repository/maven-snapshots/</url>
 		</snapshotRepository>
 	</distributionManagement>
 	<build>

+ 9 - 1
src/main/java/cn/flowbb/framework/mybatis/core/mapper/BaseMapperX.java

@@ -189,7 +189,7 @@ public interface BaseMapperX<T> extends MPJBaseMapper<T> {
 	// 查询selectList----------------end----------------------
 
 	// 删除条件-----------------------start--------------------------------
-	default int delete(String field, String value) {
+	default int delete(String field, Object value) {
 		return delete(new QueryWrapper<T>().eq(field, value));
 	}
 
@@ -197,6 +197,14 @@ public interface BaseMapperX<T> extends MPJBaseMapper<T> {
 		return delete(new LambdaQueryWrapper<T>().eq(field, value));
 	}
 
+	default int delete(String field, Collection<?> values) {
+		return delete(new QueryWrapper<T>().in(field, values));
+	}
+
+	default int delete(SFunction<T, ?> field, Collection<?> values) {
+		return delete(new LambdaQueryWrapper<T>().in(field, values));
+	}
+
 	// 删除条件-----------------------end--------------------------------
 	/**
 	 * 批量插入,适合大量数据插入

+ 28 - 43
src/main/java/cn/flowbb/framework/mybatis/core/service/AbstractService.java

@@ -14,7 +14,6 @@ import com.github.yulichang.wrapper.MPJLambdaWrapper;
 
 import cn.flowbb.framework.mybatis.core.mapper.PlusBaseMapperX;
 import cn.flowbb.framework.mybatis.core.mapper.QueryWrapperUtil;
-import cn.hutool.core.collection.CollUtil;
 
 public interface AbstractService<T> extends MPJBaseService<T> {
 
@@ -117,39 +116,6 @@ public interface AbstractService<T> extends MPJBaseService<T> {
 	 * @param queryWrapper 实体对象封装操作类
 	 *                     {@link com.baomidou.mybatisplus.core.conditions.query.QueryWrapper}
 	 */
-	default List<T> list(T t) {
-		return getBaseMapper().selectList(t);
-	}
-
-	default List<T> list(String field, Object value) {
-		return getBaseMapper().selectList(new QueryWrapper<T>().eq(field, value));
-	}
-
-	default List<T> list(SFunction<T, ?> field, Object value) {
-		return getBaseMapper().selectList(new LambdaQueryWrapper<T>().eq(field, value));
-	}
-
-	default List<T> list(String field, Collection<?> values) {
-		if (CollUtil.isEmpty(values)) {
-			return CollUtil.newArrayList();
-		}
-		return getBaseMapper().selectList(new QueryWrapper<T>().in(field, values));
-	}
-
-	default List<T> list(SFunction<T, ?> field, Collection<?> values) {
-		if (CollUtil.isEmpty(values)) {
-			return CollUtil.newArrayList();
-		}
-		return getBaseMapper().selectList(new LambdaQueryWrapper<T>().in(field, values));
-	}
-
-	default List<T> list(String field, Object value, String field1, Object value2) {
-		return getBaseMapper().selectList(new QueryWrapper<T>().eq(field, value).eq(field, value));
-	}
-
-	default List<T> list(SFunction<T, ?> field1, Object value1, SFunction<T, ?> field2, Object value2) {
-		return getBaseMapper().selectList(new LambdaQueryWrapper<T>().eq(field1, value1).eq(field2, value2));
-	}
 
 	/**
 	 * 查询列表
@@ -212,45 +178,64 @@ public interface AbstractService<T> extends MPJBaseService<T> {
 
 	// 查询得到一个结果得值--------------end----------------------------------------------
 	// 查询selectList----------------start----------------------
-	default List<T> selectList() {
+	default List<T> list() {
 		return getBaseMapper().selectList();
 	}
 
-	default List<T> selectList(String field, Object value) {
+	default List<T> list(String field, Object value) {
 		return getBaseMapper().selectList(field, value);
 	}
 
-	default List<T> selectList(SFunction<T, ?> field, Object value) {
+	default List<T> list(SFunction<T, ?> field, Object value) {
 		return getBaseMapper().selectList(field, value);
 	}
 
-	default List<T> selectList(String field1, Object value1, String field2, Object value2) {
+	default List<T> list(String field1, Object value1, String field2, Object value2) {
 		return getBaseMapper().selectList(field1, value1, field2, value2);
 	}
 
-	default List<T> selectList(SFunction<T, ?> field1, Object value1, SFunction<T, ?> field2, Object value2) {
+	default List<T> list(SFunction<T, ?> field1, Object value1, SFunction<T, ?> field2, Object value2) {
 		return getBaseMapper().selectList(field1, value1, field2, value2);
 	}
 	// 查询集合
 
-	default List<T> selectList(String field, Collection<?> values) {
+	default List<T> list(String field, Collection<?> values) {
 		return getBaseMapper().selectList(field, values);
 	}
 
-	default List<T> selectList(SFunction<T, ?> field, Collection<?> values) {
+	default List<T> list(SFunction<T, ?> field, Collection<?> values) {
 		return getBaseMapper().selectList(field, values);
 	}
 
-	default List<T> selectList(String field1, Object value1, String field2, Collection<?> values2) {
+	default List<T> list(String field1, Object value1, String field2, Collection<?> values2) {
 		return getBaseMapper().selectList(field1, value1, field2, values2);
 	}
 
-	default List<T> selectList(SFunction<T, ?> field1, Object value1, SFunction<T, ?> field2, Collection<?> value2) {
+	default List<T> list(SFunction<T, ?> field1, Object value1, SFunction<T, ?> field2, Collection<?> value2) {
 		return getBaseMapper().selectList(field1, value1, field2, value2);
 	}
 
 	// 查询selectList----------------end----------------------
 
+	// 查询remove----------------start----------------------
+	default int remove(String field, Object value) {
+		return getBaseMapper().delete(field, value);
+	}
+
+	default int remove(SFunction<T, ?> field, Object value) {
+		return getBaseMapper().delete(field, value);
+	}
+
+	default int remove(String field, Collection<?> values) {
+		return getBaseMapper().delete(field, values);
+	}
+
+	default int remove(SFunction<T, ?> field, Collection<?> values) {
+		return getBaseMapper().delete(field, values);
+	}
+
+	// 查询remove----------------end----------------------
+
 	// select
 	// join------------------------------------------------------------------------------
 	// 带参数得查询