admin/mybatis-flex
1
0
Fork 0
mirror of https://gitee.com/mybatis-flex/mybatis-flex.git synced 2025-12-07 00:58:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of gitee.com:mybatis-flex/mybatis-flex into main

Browse Source 
Signed-off-by: 王帅 <1474983351@qq.com>
This commit is contained in:
王帅 2023-07-12 02:30:23 +00:00 committed by Gitee
commit 302e884d67
3 changed files with 103 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

132
mybatis-flex-core/src/main/java/com/mybatisflex/core/relation/RelationManager.java
View File

@ -28,9 +28,7 @@ import com.mybatisflex.core.util.StringUtil;
import org.apache.ibatis.util.MapUtil; import org.apache.ibatis.util.MapUtil;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.util.ArrayList; import java.util.*;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
/** /**
@ -50,74 +48,84 @@ public class RelationManager {
private static List<AbstractRelation> doGetRelations(Class<?> entityClass) { private static List<AbstractRelation> doGetRelations(Class<?> entityClass) {
List<Field> allFields = ClassUtil.getAllFields(entityClass); List<Field> allFields = ClassUtil.getAllFields(entityClass);
List<AbstractRelation> relations = new ArrayList<>(); List<AbstractRelation> relations = new ArrayList<>();
for (Field field : allFields) { for (Field field : allFields) {
RelationManyToMany manyToManyAnnotation = field.getAnnotation(RelationManyToMany.class); RelationManyToMany manyToManyAnnotation = field.getAnnotation(RelationManyToMany.class);
if (manyToManyAnnotation != null) { if (manyToManyAnnotation != null) {
relations.add(new ManyToMany<>(manyToManyAnnotation, entityClass, field)); relations.add(new ManyToMany<>(manyToManyAnnotation, entityClass, field));
} }
RelationManyToOne manyToOneAnnotation = field.getAnnotation(RelationManyToOne.class); RelationManyToOne manyToOneAnnotation = field.getAnnotation(RelationManyToOne.class);
if (manyToOneAnnotation != null) { if (manyToOneAnnotation != null) {
relations.add(new ManyToOne<>(manyToOneAnnotation, entityClass, field)); relations.add(new ManyToOne<>(manyToOneAnnotation, entityClass, field));
} }
RelationOneToMany oneToManyAnnotation = field.getAnnotation(RelationOneToMany.class); RelationOneToMany oneToManyAnnotation = field.getAnnotation(RelationOneToMany.class);
if (oneToManyAnnotation != null) { if (oneToManyAnnotation != null) {
relations.add(new OneToMany<>(oneToManyAnnotation, entityClass, field)); relations.add(new OneToMany<>(oneToManyAnnotation, entityClass, field));
} }
RelationOneToOne oneToOneAnnotation = field.getAnnotation(RelationOneToOne.class); RelationOneToOne oneToOneAnnotation = field.getAnnotation(RelationOneToOne.class);
if (oneToOneAnnotation != null) { if (oneToOneAnnotation != null) {
relations.add(new OneToOne<>(oneToOneAnnotation, entityClass, field)); relations.add(new OneToOne<>(oneToOneAnnotation, entityClass, field));
} }
} }
return relations; return relations;
} }
@SuppressWarnings({"rawtypes", "unchecked"}) public static <Entity> void queryRelations(BaseMapper<?> mapper, List<Entity> entities) {
public static <Entity> void queryRelations(BaseMapper<?> mapper, List<Entity> entities) { doQueryRelations(mapper, entities, new HashSet<>());
if (CollectionUtil.isEmpty(entities)) { }
return;
}
Class<Entity> objectClass = (Class<Entity>) entities.get(0).getClass();
List<AbstractRelation> relations = getRelations(objectClass);
if (relations.isEmpty()) {
return;
}
String currentDsKey = DataSourceKey.get(); @SuppressWarnings({"rawtypes", "unchecked"})
private static <Entity> void doQueryRelations(BaseMapper<?> mapper, List<Entity> entities, Set<Class<?>> queriedClass) {
if (CollectionUtil.isEmpty(entities)) {
return;
}
Class<Entity> objectClass = (Class<Entity>) entities.get(0).getClass();
if (queriedClass.contains(objectClass)) {
return;
} else {
queriedClass.add(objectClass);
}
List<AbstractRelation> relations = getRelations(objectClass);
if (relations.isEmpty()) {
return;
}
String currentDsKey = DataSourceKey.get();
try {
relations.forEach(relation -> {
try { QueryWrapper queryWrapper = relation.toQueryWrapper(entities);
relations.forEach(relation -> { Class<?> mappingType = relation.getMappingType();
QueryWrapper queryWrapper = relation.toQueryWrapper(entities); String dataSource = relation.getDataSource();
Class<?> mappingType = relation.getMappingType(); if (StringUtil.isBlank(dataSource) && currentDsKey != null) {
dataSource = currentDsKey;
}
String dataSource = relation.getDataSource(); try {
if (StringUtil.isBlank(dataSource) && currentDsKey != null) { if (StringUtil.isNotBlank(dataSource)) {
dataSource = currentDsKey; DataSourceKey.use(dataSource);
} }
try { List<?> targetObjectList = mapper.selectListByQueryAs(queryWrapper, mappingType);
if (StringUtil.isNotBlank(dataSource)) { doQueryRelations(mapper, targetObjectList, queriedClass);
DataSourceKey.use(dataSource);
} if (CollectionUtil.isNotEmpty(targetObjectList)) {
List<?> targetObjectList = mapper.selectListByQueryAs(queryWrapper, mappingType); relation.join(entities, targetObjectList, mapper);
if (CollectionUtil.isNotEmpty(targetObjectList)) { }
relation.join(entities, targetObjectList, mapper); } finally {
} if (StringUtil.isNotBlank(dataSource)) {
} finally { DataSourceKey.clear();
if (StringUtil.isNotBlank(dataSource)) { }
DataSourceKey.clear(); }
} });
} } finally {
}); if (currentDsKey != null) {
} finally { DataSourceKey.use(currentDsKey);
if (currentDsKey != null) { }
DataSourceKey.use(currentDsKey); }
} }
}
}
} }

10
mybatis-flex-core/src/main/java/com/mybatisflex/core/update/UpdateWrapper.java
View File

@ -20,6 +20,7 @@ import com.mybatisflex.core.query.QueryCondition;
import com.mybatisflex.core.query.QueryWrapper; import com.mybatisflex.core.query.QueryWrapper;
import com.mybatisflex.core.util.LambdaGetter; import com.mybatisflex.core.util.LambdaGetter;
import com.mybatisflex.core.util.LambdaUtil; import com.mybatisflex.core.util.LambdaUtil;
import com.mybatisflex.core.util.UpdateEntity;
import org.apache.ibatis.javassist.util.proxy.ProxyObject; import org.apache.ibatis.javassist.util.proxy.ProxyObject;
import java.io.Serializable; import java.io.Serializable;
@ -79,4 +80,13 @@ public interface UpdateWrapper extends Serializable {
return this; return this;
} }
static UpdateWrapper of(Object entity) {
if (entity instanceof UpdateWrapper) {
return (UpdateWrapper) entity;
} else {
return (UpdateWrapper) UpdateEntity.ofNotNull(entity);
}
}
} }

23
mybatis-flex-test/mybatis-flex-native-test/src/main/java/com/mybatisflex/test/AccountTester.java
View File

@ -21,6 +21,8 @@ import com.mybatisflex.core.audit.ConsoleMessageCollector;
import com.mybatisflex.core.audit.MessageCollector; import com.mybatisflex.core.audit.MessageCollector;
import com.mybatisflex.core.query.If; import com.mybatisflex.core.query.If;
import com.mybatisflex.core.query.QueryWrapper; import com.mybatisflex.core.query.QueryWrapper;
import com.mybatisflex.core.update.UpdateWrapper;
import com.mybatisflex.core.util.UpdateEntity;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import org.junit.Test; import org.junit.Test;
import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder;
@ -85,4 +87,25 @@ public class AccountTester {
} }
@Test
public void testUpdate() {
List<Account> accounts = accountMapper.selectAll();
System.out.println(accounts);
Account account = UpdateEntity.of(Account.class,1);
account.setUserName("lisi");
UpdateWrapper.of(account)
.setRaw("age","age + 1");
accountMapper.update(account);
accounts = accountMapper.selectAll();
System.out.println(accounts);
}
} }