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

!103 fix: 别名注解放到 getter 方法上不生效。

Browse Source 
Merge pull request !103 from 王帅/main
This commit is contained in:
Michael Yang 2023-07-02 13:49:41 +00:00 committed by Gitee
commit 84c428c5a7
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 17 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
mybatis-flex-processor/src/main/java/com/mybatisflex/processor/MybatisFlexProcessor.java
View File

@ -16,8 +16,8 @@
package com.mybatisflex.processor;
import com.mybatisflex.annotation.ColumnAlias;
import com.mybatisflex.annotation.Column;
import com.mybatisflex.annotation.ColumnAlias;
import com.mybatisflex.annotation.Table;
import com.mybatisflex.processor.builder.ContentBuilder;
import com.mybatisflex.processor.config.ConfigurationKey;
@ -152,15 +152,12 @@ public class MybatisFlexProcessor extends AbstractProcessor {
List<ColumnInfo> columnInfoList = new LinkedList<>();
// 默认查询的属性，非 isLarge 字段
List<String> defaultColumns = new ArrayList<>();
TypeElement classElement = (TypeElement) entityClassElement;
do {
// 获取类属性和默认查询字段
fillColumnInfoList(columnInfoList, defaultColumns, classElement, table.camelToUnderline());
classElement = (TypeElement) typeUtils.asElement(classElement.getSuperclass());
} while (classElement != null);
classElement = (TypeElement) entityClassElement;
do {
fillColumnInfoList(columnInfoList, defaultColumns, (TypeElement) entityClassElement, classElement, table.camelToUnderline());
classElement = (TypeElement) typeUtils.asElement(classElement.getSuperclass());
} while (classElement != null);
@ -223,11 +220,8 @@ public class MybatisFlexProcessor extends AbstractProcessor {
return SourceVersion.latestSupported();
}
private void fillColumnInfoList(List<ColumnInfo> columnInfoList, List<String> defaultColumns, TypeElement classElement, boolean camelToUnderline) {
List<? extends Element> enclosedElements = classElement.getEnclosedElements();
for (Element fieldElement : enclosedElements) {
private void fillColumnInfoList(List<ColumnInfo> columnInfoList, List<String> defaultColumns, TypeElement baseElement, TypeElement classElement, boolean camelToUnderline) {
for (Element fieldElement : classElement.getEnclosedElements()) {
// all fields
if (ElementKind.FIELD == fieldElement.getKind()) {
@ -290,8 +284,7 @@ public class MybatisFlexProcessor extends AbstractProcessor {
}
}
String[] alias = getColumnAliasByGetterMethod(enclosedElements, property);
String[] alias = getColumnAliasByGetterMethod(baseElement, property);
if (alias == null || alias.length == 0) {
ColumnAlias columnAlias = fieldElement.getAnnotation(ColumnAlias.class);
if (columnAlias != null) {
@ -314,14 +307,14 @@ public class MybatisFlexProcessor extends AbstractProcessor {
}
private String[] getColumnAliasByGetterMethod(List<? extends Element> enclosedElements, String property) {
for (Element enclosedElement : enclosedElements) {
private String[] getColumnAliasByGetterMethod(TypeElement baseElement, String property) {
for (Element enclosedElement : baseElement.getEnclosedElements()) {
if (ElementKind.METHOD == enclosedElement.getKind()) {
String methodName = enclosedElement.toString();
if (StrUtil.isGetterMethod(methodName, property)) {
ColumnAlias asType = enclosedElement.getAnnotation(ColumnAlias.class);
if (asType != null) {
return asType.value();
ColumnAlias columnAlias = enclosedElement.getAnnotation(ColumnAlias.class);
if (columnAlias != null) {
return columnAlias.value();
}
break;
}

4
mybatis-flex-processor/src/main/java/com/mybatisflex/processor/util/StrUtil.java
View File

@ -114,9 +114,9 @@ public class StrUtil {
public static boolean isGetterMethod(String methodName, String property) {
if (methodName.startsWith("get") && methodName.length() > 3) {
return firstCharToUpperCase(property).equals(methodName.substring(3));
return firstCharToUpperCase(property).concat("()").equals(methodName.substring(3));
} else if (methodName.startsWith("is") && methodName.length() > 2) {
return firstCharToUpperCase(property).equals(methodName.substring(2));
return firstCharToUpperCase(property).concat("()").equals(methodName.substring(2));
} else {
return false;
}

6
mybatis-flex-test/mybatis-flex-spring-boot-test/src/main/java/com/mybatisflex/test/entity/Outer.java
View File

@ -31,9 +31,9 @@ public class Outer extends IdEntity<Integer> {
private Inner inner;
@Override
@ColumnAlias("test_id")
public void setId(Integer id) {
super.setId(id);
@ColumnAlias("outer_id")
public Integer getId() {
return super.getId();
}
public String getName() {