|
@@ -8,7 +8,6 @@ import org.apache.ibatis.annotations.Param;
|
|
|
import org.apache.ibatis.logging.Log;
|
|
import org.apache.ibatis.logging.Log;
|
|
|
import org.apache.ibatis.logging.LogFactory;
|
|
import org.apache.ibatis.logging.LogFactory;
|
|
|
import com.baomidou.mybatisplus.core.conditions.Wrapper;
|
|
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.query.QueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
|
|
|
import com.baomidou.mybatisplus.core.enums.SqlMethod;
|
|
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.ClassUtils;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
|
|
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Constants;
|
|
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.Db;
|
|
|
import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
|
|
import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
|
|
|
import com.github.yulichang.base.MPJBaseMapper;
|
|
import com.github.yulichang.base.MPJBaseMapper;
|
|
@@ -205,7 +203,6 @@ public interface BaseMapperX<T> extends MPJBaseMapper<T> {
|
|
|
return selectList(new QueryWrapper<>());
|
|
return selectList(new QueryWrapper<>());
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-
|
|
|
|
|
default List<T> selectList(String field, Object value) {
|
|
default List<T> selectList(String field, Object value) {
|
|
|
return selectList(new QueryWrapper<T>().eq(field, 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));
|
|
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));
|
|
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));
|
|
return delete(new QueryWrapper<T>().eq(field, value));
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-
|
|
|
|
|
default int delete(String field, Collection<?> value) {
|
|
default int delete(String field, Collection<?> value) {
|
|
|
return delete(new QueryWrapper<T>().in(field, 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));
|
|
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);
|
|
return Db.saveOrUpdateBatch(collection);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- default UpdateWrapper<T> getUpdateWrapper(T t) {
|
|
|
|
|
- return new UpdateWrapper<>();
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ UpdateWrapper<T> getUpdateWrapper(T t);
|
|
|
|
|
|
|
|
@SuppressWarnings("deprecation")
|
|
@SuppressWarnings("deprecation")
|
|
|
default boolean updateBatchByColumn(Collection<T> entityList) {
|
|
default boolean updateBatchByColumn(Collection<T> entityList) {
|