ZhouXY108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-05-09 23:51:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix code

Browse Source
This commit is contained in:
Looly 2024-11-07 10:59:16 +08:00
parent 525866e9e7
commit 8e45c1f4fd
7 changed files with 154 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hutool-core/src/main/java/org/dromara/hutool/core/map/Dict.java
View File

@ -47,7 +47,7 @@ public class Dict extends CustomKeyMap<String, Object> implements TypeGetter<Str
/**
* 是否大小写不敏感
*/
private boolean caseInsensitive;
protected boolean caseInsensitive;
// --------------------------------------------------------------- Static method start

4
hutool-db/src/main/java/org/dromara/hutool/db/ActiveEntity.java
View File

@ -19,8 +19,6 @@ package org.dromara.hutool.db;
import org.dromara.hutool.core.func.SerSupplier;
import org.dromara.hutool.core.map.MapUtil;
import java.util.Collection;
/**
* 动态实体类<br>
* 提供了针对自身实体的增删改方法
@ -145,7 +143,7 @@ public class ActiveEntity extends Entity {
}
@Override
public ActiveEntity setFieldNames(final Collection<String> fieldNames) {
public ActiveEntity setFieldNames(final Iterable<String> fieldNames) {
return (ActiveEntity) super.setFieldNames(fieldNames);
}

173
hutool-db/src/main/java/org/dromara/hutool/db/Entity.java
View File

@ -17,6 +17,7 @@
package org.dromara.hutool.db;
import org.dromara.hutool.core.collection.CollUtil;
import org.dromara.hutool.core.collection.iter.ArrayIter;
import org.dromara.hutool.core.collection.set.SetUtil;
import org.dromara.hutool.core.func.SerSupplier;
import org.dromara.hutool.core.map.Dict;
@ -33,10 +34,7 @@ import java.sql.Clob;
import java.sql.RowId;
import java.sql.Time;
import java.sql.Timestamp;
import java.util.Collection;
import java.util.Collections;
import java.util.Date;
import java.util.Set;
import java.util.*;
/**
* 数据实体对象<br>
@ -49,7 +47,7 @@ import java.util.Set;
public class Entity extends Dict {
private static final long serialVersionUID = -1951012511464327448L;
// --------------------------------------------------------------- Static method start
// region ----- of
/**
* 创建Entity
@ -70,6 +68,17 @@ public class Entity extends Dict {
return new Entity(tableName);
}
/**
* 将PO对象转为Entity,并采用下划线法转换字段
*
* @param <T> Bean对象类型
* @param bean Bean对象
* @return Entity
*/
public static <T> Entity ofWithUnderlineCase(final T bean) {
return of(null).parseBean(bean, true, true);
}
/**
* 将PO对象转为Entity
*
@ -77,7 +86,7 @@ public class Entity extends Dict {
* @param bean Bean对象
* @return Entity
*/
public static <T> Entity parse(final T bean) {
public static <T> Entity of(final T bean) {
return of(null).parseBean(bean);
}
@ -90,28 +99,15 @@ public class Entity extends Dict {
* @param ignoreNullValue 是否忽略值为空的字段
* @return Entity
*/
public static <T> Entity parse(final T bean, final boolean isToUnderlineCase, final boolean ignoreNullValue) {
public static <T> Entity of(final T bean, final boolean isToUnderlineCase, final boolean ignoreNullValue) {
return of(null).parseBean(bean, isToUnderlineCase, ignoreNullValue);
}
// endregion
/**
* 将PO对象转为Entity,并采用下划线法转换字段
*
* @param <T> Bean对象类型
* @param bean Bean对象
* @return Entity
*/
public static <T> Entity parseWithUnderlineCase(final T bean) {
return of(null).parseBean(bean, true, true);
}
// --------------------------------------------------------------- Static method end
/* 表名 */
private String tableName;
/* 字段名列表，用于限制加入的字段的值 */
private Set<String> fieldNames;
private Meta meta;
// region ----- Constructor
/**
* 构造
*/
@ -125,7 +121,7 @@ public class Entity extends Dict {
*/
public Entity(final String tableName) {
this.tableName = tableName;
this(tableName, false);
}
/**
@ -136,18 +132,48 @@ public class Entity extends Dict {
* @since 4.5.16
*/
public Entity(final String tableName, final boolean caseInsensitive) {
this(new Meta(tableName, null), caseInsensitive);
}
/**
* 构造
*
* @param meta 元信息
* @param caseInsensitive 是否大小写不敏感
*/
public Entity(final Meta meta, final boolean caseInsensitive) {
super(caseInsensitive);
this.tableName = tableName;
this.meta = meta;
}
// endregion
// --------------------------------------------------------------- Getters and Setters start
/**
* 获得元信息
*
* @return 元信息
*/
public Meta getMeta() {
return this.meta;
}
/**
* 设置元信息
*
* @param meta 元信息
* @return 本身
*/
public Entity setMeta(final Meta meta) {
this.meta = meta;
return this;
}
/**
* @return 获得表名
*/
public String getTableName() {
return tableName;
return null == this.meta ? null : this.meta.getTableName();
}
/**
@ -157,7 +183,11 @@ public class Entity extends Dict {
* @return 本身
*/
public Entity setTableName(final String tableName) {
this.tableName = tableName;
if (null == this.meta) {
this.meta = new Meta(tableName, null);
} else {
this.meta.setTableName(tableName);
}
return this;
}
@ -165,7 +195,7 @@ public class Entity extends Dict {
* @return 字段集合
*/
public Set<String> getFieldNames() {
return this.fieldNames;
return null == this.meta ? null : this.meta.getFieldNames();
}
/**
@ -174,9 +204,14 @@ public class Entity extends Dict {
* @param fieldNames 字段列表
* @return 自身
*/
public Entity setFieldNames(final Collection<String> fieldNames) {
public Entity setFieldNames(final Iterable<String> fieldNames) {
if (CollUtil.isNotEmpty(fieldNames)) {
this.fieldNames = SetUtil.of(true, fieldNames);
final HashSet<String> fieldNameSet = SetUtil.of(true, fieldNames);
if (null == this.meta) {
this.meta = new Meta(null, fieldNameSet);
} else {
this.meta.setFieldNames(fieldNameSet);
}
}
return this;
}
@ -189,13 +224,14 @@ public class Entity extends Dict {
*/
public Entity setFieldNames(final String... fieldNames) {
if (ArrayUtil.isNotEmpty(fieldNames)) {
this.fieldNames = SetUtil.ofLinked(fieldNames);
setFieldNames(new ArrayIter<>(fieldNames));
}
return this;
}
/**
* 通过lambda批量设置值
*
* @param fields lambda,不能为空
* @return this
*/
@ -212,10 +248,10 @@ public class Entity extends Dict {
*/
public Entity addFieldNames(final String... fieldNames) {
if (ArrayUtil.isNotEmpty(fieldNames)) {
if (null == this.fieldNames) {
if (null == this.meta || CollUtil.isEmpty(this.meta.fieldNames)) {
return setFieldNames(fieldNames);
} else {
Collections.addAll(this.fieldNames, fieldNames);
Collections.addAll(this.meta.fieldNames, fieldNames);
}
}
return this;
@ -233,7 +269,7 @@ public class Entity extends Dict {
*/
@Override
public <T> Entity parseBean(final T bean) {
if (StrUtil.isBlank(this.tableName)) {
if (null == this.meta || StrUtil.isBlank(this.meta.tableName)) {
this.setTableName(StrUtil.lowerFirst(bean.getClass().getSimpleName()));
}
return (Entity) super.parseBean(bean);
@ -251,7 +287,7 @@ public class Entity extends Dict {
*/
@Override
public <T> Entity parseBean(final T bean, final boolean isToUnderlineCase, final boolean ignoreNullValue) {
if (StrUtil.isBlank(this.tableName)) {
if (null == this.meta || StrUtil.isBlank(this.meta.tableName)) {
final String simpleName = bean.getClass().getSimpleName();
this.setTableName(isToUnderlineCase ? StrUtil.toUnderlineCase(simpleName) : StrUtil.lowerFirst(simpleName));
}
@ -267,9 +303,7 @@ public class Entity extends Dict {
*/
@Override
public Entity filterNew(final String... keys) {
final Entity result = new Entity(this.tableName);
result.setFieldNames(this.fieldNames);
final Entity result = new Entity(this.meta, this.caseInsensitive);
for (final String key : keys) {
if (this.containsKey(key)) {
result.put(key, this.get(key));
@ -427,6 +461,67 @@ public class Entity extends Dict {
@Override
public String toString() {
return "Entity {tableName=" + tableName + ", fieldNames=" + fieldNames + ", fields=" + super.toString() + "}";
return "Entity {meta=" + meta + ", fields=" + super.toString() + "}";
}
/**
* Entity元数据
*
* @author Looly
*/
public static class Meta {
private String tableName;
private Set<String> fieldNames;
/**
* 构造
*
* @param tableName 表名
* @param fieldNames 字段名
*/
public Meta(final String tableName, final Set<String> fieldNames) {
this.tableName = tableName;
this.fieldNames = fieldNames;
}
/**
* 获得表名
*
* @return 表名
*/
public String getTableName() {
return tableName;
}
/**
* 设置表名
*
* @param tableName 表名
* @return this
*/
public Meta setTableName(final String tableName) {
this.tableName = tableName;
return this;
}
/**
* 获得字段名
*
* @return 字段名
*/
public Set<String> getFieldNames() {
return fieldNames;
}
/**
* 设置字段名，用于限制加入的字段的值
*
* @param fieldNames 字段名
* @return this
*/
public Meta setFieldNames(final Set<String> fieldNames) {
this.fieldNames = fieldNames;
return this;
}
}
}

15
hutool-db/src/main/java/org/dromara/hutool/db/handler/EntityListHandler.java
View File

@ -65,14 +65,21 @@ public class EntityListHandler implements RsHandler<List<Entity>> {
@Override
public List<Entity> handle(final ResultSet rs) throws SQLException {
final ResultSetMetaData meta = rs.getMetaData();
final EntityRowHandler rowHandler = new EntityRowHandler(meta, caseInsensitive, true);
final List<Entity> result = ListUtil.of();
while (rs.next()) {
// 首行获取元信息
final ResultSetMetaData meta = rs.getMetaData();
EntityRowHandler rowHandler = new EntityRowHandler(meta, caseInsensitive, true);
if(rs.next()){
result.add(rowHandler.handle(rs));
}
// 后续行共享元数据
rowHandler = new EntityRowHandler(meta, caseInsensitive, false);
while (rs.next()) {
result.add(rowHandler.handle(rs).setMeta(result.get(0).getMeta()));
}
return result;
}
}

2
hutool-db/src/main/java/org/dromara/hutool/db/handler/row/EntityRowHandler.java
View File

@ -49,7 +49,7 @@ public class EntityRowHandler extends AbsRowHandler<Entity> {
@Override
public Entity handle(final ResultSet rs) throws SQLException {
final Entity entity = new Entity(null, caseInsensitive);
final Entity entity = new Entity((Entity.Meta)null, caseInsensitive);
return fillEntity(entity, rs);
}

6
hutool-db/src/test/java/org/dromara/hutool/db/CRUDTest.java
View File

@ -184,9 +184,9 @@ public class CRUDTest {
user2.setBirthday("19890512");
user2.setGender(false);
final Entity data1 = Entity.parse(user1);
final Entity data1 = Entity.of(user1);
data1.put("name", null);
final Entity data2 = Entity.parse(user2);
final Entity data2 = Entity.of(user2);
Console.log(data1);
Console.log(data2);
@ -204,7 +204,7 @@ public class CRUDTest {
user1.setBirthday("19900112");
user1.setGender(true);
final Entity data1 = Entity.parse(user1);
final Entity data1 = Entity.of(user1);
Console.log(data1);

6
hutool-db/src/test/java/org/dromara/hutool/db/EntityTest.java
View File

@ -29,7 +29,7 @@ import org.junit.jupiter.api.Test;
public class EntityTest {
@Test
public void parseTest() {
public void ofTest() {
final User user = new User();
user.setId(1);
user.setName("test");
@ -40,7 +40,7 @@ public class EntityTest {
}
@Test
public void parseTest2() {
public void ofTest2() {
final User user = new User();
user.setId(1);
user.setName("test");
@ -52,7 +52,7 @@ public class EntityTest {
}
@Test
public void parseTest3() {
public void ofTest3() {
final User user = new User();
user.setName("test");