lxy/redkale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
Redkale
2017-01-16 14:11:35 +08:00
parent 4b5749bc60
commit eda9d1c780
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/org/redkale/boot/ApiDocs.java
View File

@@ -11,7 +11,7 @@ import java.util.*;
import javax.persistence.*; import javax.persistence.*;
import org.redkale.convert.json.JsonConvert; import org.redkale.convert.json.JsonConvert;
import org.redkale.net.http.*; import org.redkale.net.http.*;
import org.redkale.source.FilterBean; import org.redkale.source.*;
import org.redkale.util.*; import org.redkale.util.*;
/** /**
@@ -100,10 +100,13 @@ public class ApiDocs extends HttpBaseServlet {
Comment comment = field.getAnnotation(Comment.class); Comment comment = field.getAnnotation(Comment.class);
Column col = field.getAnnotation(Column.class); Column col = field.getAnnotation(Column.class);
FilterColumn fc = field.getAnnotation(FilterColumn.class);
if (comment != null) { if (comment != null) {
fieldmap.put("comment", comment.value()); fieldmap.put("comment", comment.value());
} else if (col != null) { } else if (col != null) {
fieldmap.put("comment", col.comment()); fieldmap.put("comment", col.comment());
} else if (fc != null) {
fieldmap.put("comment", fc.comment());
} }
fieldmap.put("primary", !filter && (field.getAnnotation(Id.class) != null)); fieldmap.put("primary", !filter && (field.getAnnotation(Id.class) != null));
fieldmap.put("updatable", (filter || col == null || col.updatable())); fieldmap.put("updatable", (filter || col == null || col.updatable()));
@@ -144,11 +147,14 @@ public class ApiDocs extends HttpBaseServlet {
fieldmap.put("type", field.getType().isArray() ? (field.getType().getComponentType().getName() + "[]") : field.getGenericType().getTypeName()); fieldmap.put("type", field.getType().isArray() ? (field.getType().getComponentType().getName() + "[]") : field.getGenericType().getTypeName());
Column col = field.getAnnotation(Column.class); Column col = field.getAnnotation(Column.class);
FilterColumn fc = field.getAnnotation(FilterColumn.class);
Comment comment = field.getAnnotation(Comment.class); Comment comment = field.getAnnotation(Comment.class);
if (comment != null) { if (comment != null) {
fieldmap.put("comment", comment.value()); fieldmap.put("comment", comment.value());
} else if (col != null) { } else if (col != null) {
fieldmap.put("comment", col.comment()); fieldmap.put("comment", col.comment());
} else if (fc != null) {
fieldmap.put("comment", fc.comment());
} }
fieldmap.put("primary", !filter && (field.getAnnotation(Id.class) != null)); fieldmap.put("primary", !filter && (field.getAnnotation(Id.class) != null));
fieldmap.put("updatable", (filter || col == null || col.updatable())); fieldmap.put("updatable", (filter || col == null || col.updatable()));