浏览代码

实现 IRow 接口

James 4 年之前
父节点
当前提交
e7ac99208e

+ 1 - 1
src/main/java/com/jfinal/plugin/activerecord/IRow.java

@@ -11,7 +11,7 @@ public interface IRow<M> {
 
     public Map<String, Object> toMap();
 
-    public M put(Map<String, Object> maps);
+    public M put(Map<String, Object> map);
 
     public M set(String attr, Object value);
 

+ 5 - 1
src/main/java/com/jfinal/plugin/activerecord/Model.java

@@ -45,7 +45,7 @@ import static com.jfinal.plugin.activerecord.DbKit.NULL_PARA_ARRAY;
  * A stupid person makes it.
  */
 @SuppressWarnings({"rawtypes", "unchecked"})
-public abstract class Model<M extends Model> implements Serializable {
+public abstract class Model<M extends Model> implements IRow<M>, Serializable {
 	
 	private static final long serialVersionUID = -990334519496260591L;
 	
@@ -1225,6 +1225,10 @@ public abstract class Model<M extends Model> implements Serializable {
 	public DaoTemplate<M> templateByString(String content, Model model) {
 		return templateByString(content, model.attrs);
 	}
+	
+	public Map<String, Object> toMap() {
+		return attrs;
+	}
 }
 
 

+ 12 - 1
src/main/java/com/jfinal/plugin/activerecord/Record.java

@@ -31,7 +31,7 @@ import java.util.Map.Entry;
 /**
  * Record
  */
-public class Record implements Serializable {
+public class Record implements IRow<Record>, Serializable {
 	
 	private static final long serialVersionUID = 905784513600884082L;
 	
@@ -424,6 +424,17 @@ public class Record implements Serializable {
 	public String toJson() {
 		return com.jfinal.kit.JsonKit.toJson(getColumns());
 	}
+	
+	@Override
+	public Map<String, Object> toMap() {
+		return getColumns();
+	}
+	
+	@Override
+	public Record put(Map<String, Object> map) {
+		getColumns().putAll(map);
+		return this;
+	}
 }