Ver código fonte

增加查询

hmy 8 meses atrás
pai
commit
9e6249c0f0

+ 1 - 1
pom.xml

@@ -7,7 +7,7 @@
 
 	<groupId>cn.flowbb.boot</groupId>
 	<artifactId>spring-boot-starter-mybatis</artifactId>
-	<version>0.0.6-SNAPSHOT</version>
+	<version>0.0.7-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>spring-boot-starter-mybatis</name>

+ 10 - 10
src/main/java/cn/flowbb/framework/mybatis/config/YudaoMybatisAutoConfiguration.java

@@ -1,28 +1,28 @@
 package cn.flowbb.framework.mybatis.config;
 
-
-import com.baomidou.mybatisplus.annotation.DbType;
-import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
-import com.baomidou.mybatisplus.core.incrementer.IKeyGenerator;
-import com.baomidou.mybatisplus.extension.incrementer.*;
-import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
-import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
 import org.apache.ibatis.annotations.Mapper;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.core.env.ConfigurableEnvironment;
 
+import com.baomidou.mybatisplus.annotation.DbType;
+import com.baomidou.mybatisplus.core.incrementer.IKeyGenerator;
+import com.baomidou.mybatisplus.extension.incrementer.DmKeyGenerator;
+import com.baomidou.mybatisplus.extension.incrementer.H2KeyGenerator;
+import com.baomidou.mybatisplus.extension.incrementer.KingbaseKeyGenerator;
+import com.baomidou.mybatisplus.extension.incrementer.OracleKeyGenerator;
+import com.baomidou.mybatisplus.extension.incrementer.PostgreKeyGenerator;
+
 /**
  * MyBaits 配置类
  *
  * @author 芋道源码
  */
 @AutoConfiguration
-@MapperScan(value = "${yudao.info.base-package}", annotationClass = Mapper.class, lazyInitialization = "${mybatis.lazy-initialization:false}") // Mapper																												// 懒加载,目前仅用于单元测试
+// Mapper																										
+// 懒加载,目前仅用于单元测试
 public class YudaoMybatisAutoConfiguration {
 
 //	@Bean

+ 30 - 16
src/main/java/cn/flowbb/framework/mybatis/core/mapper/BaseMapperX.java

@@ -8,7 +8,6 @@ import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.logging.Log;
 import org.apache.ibatis.logging.LogFactory;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.enums.SqlMethod;
@@ -18,7 +17,6 @@ import com.baomidou.mybatisplus.core.metadata.TableInfo;
 import com.baomidou.mybatisplus.core.toolkit.ClassUtils;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
-import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
 import com.baomidou.mybatisplus.extension.toolkit.Db;
 import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
 import com.github.yulichang.base.MPJBaseMapper;
@@ -205,7 +203,6 @@ public interface BaseMapperX<T> extends MPJBaseMapper<T> {
 		return selectList(new QueryWrapper<>());
 	}
 
-
 	default List<T> selectList(String field, Object value) {
 		return selectList(new QueryWrapper<T>().eq(field, value));
 	}
@@ -230,7 +227,8 @@ public interface BaseMapperX<T> extends MPJBaseMapper<T> {
 		return selectList(new QueryWrapper<T>().in(field1, value1).eq(field2, value2));
 	}
 
-	default List<T> selectList(String field1, Object value1, String field2, Object value2, String field3, Object value3) {
+	default List<T> selectList(String field1, Object value1, String field2, Object value2, String field3,
+			Object value3) {
 		return selectList(new QueryWrapper<T>().eq(field1, value1).eq(field2, value2).eq(field3, value3));
 	}
 
@@ -266,7 +264,6 @@ public interface BaseMapperX<T> extends MPJBaseMapper<T> {
 		return delete(new QueryWrapper<T>().eq(field, value));
 	}
 
-	 
 	default int delete(String field, Collection<?> value) {
 		return delete(new QueryWrapper<T>().in(field, value));
 	}
@@ -316,20 +313,39 @@ public interface BaseMapperX<T> extends MPJBaseMapper<T> {
 		return delete(new QueryWrapper<T>().in(field1, value1).eq(field2, value2).eq(field3, value3));
 	}
 
-	// -------按照-----Lambda表达式查询----------------------------------------------------------------
-	default T selectOne(SFunction<T, ?> field, Object value) {
-		return selectOne(new LambdaQueryWrapper<T>().eq(field, value));
+	// 更新操作开始
+	default int update(String field, Object value, String setField, Object setValue) {
+		UpdateWrapper<T> entity = new UpdateWrapper<>();
+		entity.set(setField, setValue);
+		entity.eq(field, value);
+		return update(entity);
+	}
 
+	default int update(String field, Object value, String setField1, Object setValue1, String setField2,
+			Object setValue2) {
+		UpdateWrapper<T> entity = new UpdateWrapper<>();
+		entity.set(setField1, setValue1);
+		entity.set(setField2, setValue2);
+		entity.eq(field, value);
+		return update(entity);
 	}
 
-	default T selectOne(SFunction<T, ?> field1, Object value1, SFunction<T, ?> field2, Object value2) {
-		return selectOne(new LambdaQueryWrapper<T>().eq(field1, value1).eq(field2, value2));
+	default int update(String field, Collection<?> value, String setField, Object setValue) {
+		UpdateWrapper<T> entity = new UpdateWrapper<>();
+		entity.set(setField, setValue);
+		entity.in(field, value);
+		return update(entity);
 	}
 
-	default T selectOne(SFunction<T, ?> field1, Object value1, SFunction<T, ?> field2, Object value2,
-			SFunction<T, ?> field3, Object value3) {
-		return selectOne(new LambdaQueryWrapper<T>().eq(field1, value1).eq(field2, value2).eq(field3, value3));
+	default int update(String field, Collection<?> value, String setField1, Object setValue1, String setField2,
+			Object setValue2) {
+		UpdateWrapper<T> entity = new UpdateWrapper<>();
+		entity.set(setField1, setValue1);
+		entity.set(setField2, setValue2);
+		entity.in(field, value);
+		return update(entity);
 	}
+	// 更新操作结束
 
 	// -----------------------------------------------------------------------
 
@@ -369,9 +385,7 @@ public interface BaseMapperX<T> extends MPJBaseMapper<T> {
 		return Db.saveOrUpdateBatch(collection);
 	}
 
-	default UpdateWrapper<T> getUpdateWrapper(T t) {
-		return new UpdateWrapper<>();
-	}
+	UpdateWrapper<T> getUpdateWrapper(T t);
 
 	@SuppressWarnings("deprecation")
 	default boolean updateBatchByColumn(Collection<T> entityList) {

+ 10 - 3
src/main/java/cn/flowbb/framework/mybatis/core/mapper/PlusBaseMapperX.java

@@ -1,4 +1,5 @@
 package cn.flowbb.framework.mybatis.core.mapper;
+
 import java.beans.PropertyDescriptor;
 import java.lang.reflect.Method;
 import java.util.Collection;
@@ -23,9 +24,14 @@ import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
 import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 
-
+/**
+ * 对实体类的操作
+ * 
+ * @param <T>
+ */
 public interface PlusBaseMapperX<T> extends BaseMapperX<T> {
 	static final Log logger = LogFactory.getLog(PlusBaseMapperX.class);
+
 	/**
 	 * 博客地址:https://blog.csdn.net/qq_19266669/article/details/114369195
 	 * 查看AbstractLambdaWrapper通过方法得到字段名称
@@ -125,7 +131,6 @@ public interface PlusBaseMapperX<T> extends BaseMapperX<T> {
 	 * @throws NoSuchFieldException
 	 */
 	default boolean update(T entity, Map<String, Object> columns) {
-
 		UpdateWrapper<T> updateWrapper = new UpdateWrapper<>();
 		for (String key : columns.keySet()) {
 			updateWrapper.eq(key, columns.get(key));
@@ -294,7 +299,8 @@ public interface PlusBaseMapperX<T> extends BaseMapperX<T> {
 		}
 		return null;
 	}
-   //select join
+
+	// select join
 	/**
 	 * 查询对象 连表查询返回记录集合
 	 *
@@ -378,4 +384,5 @@ public interface PlusBaseMapperX<T> extends BaseMapperX<T> {
 		wrapper = QueryLambdaUtil.convertQuery(wrapper, param);
 		return this.selectJoinMapsPage(page, wrapper);
 	}
+
 }

+ 0 - 1
src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1,2 +1 @@
-cn.flowbb.framework.mybatis.datasource.config.YudaoDataSourceAutoConfiguration
 cn.flowbb.framework.mybatis.config.YudaoMybatisAutoConfiguration