完善ManyToOne的懒加载

Author: lsjwzh

src/net/tsz/afinal/FinalDb.java

@@ -25,6 +25,7 @@
 
 import net.tsz.afinal.db.sqlite.CursorUtils;
 import net.tsz.afinal.db.sqlite.DbModel;
+import net.tsz.afinal.db.sqlite.ManyToOneLazyLoader;
 import net.tsz.afinal.db.sqlite.OneToManyLazyLoader;
 import net.tsz.afinal.db.sqlite.SqlBuilder;
 import net.tsz.afinal.db.sqlite.SqlInfo;
@@ -373,7 +374,7 @@ public <T> T findWithManyToOneById(Object id ,Class<T> clazz){
 		DbModel dbModel = findDbModelBySQL(sql);
 		if(dbModel!=null){
 			T entity = CursorUtils.dbModel2Entity(dbModel, clazz);
-            return loadManyToOne(entity,clazz);
+            return loadManyToOne(dbModel,entity,clazz);
 		}
 
 		return null;
@@ -393,24 +394,33 @@ public <T> T findWithManyToOneById(Object id ,Class<T> clazz,Class<?> ... findCl
 		DbModel dbModel = findDbModelBySQL(sql);
 		if(dbModel!=null){
 			T entity = CursorUtils.dbModel2Entity(dbModel, clazz);
-			return loadManyToOne(entity,clazz,findClass);
+			return loadManyToOne(dbModel,entity,clazz,findClass);
 		}
 		return null;
 	}
 
     /**
      * 将entity中的“多对一”的数据填充满
+     * 如果是懒加载填充，则dbModel参数可为null
      * @param clazz
      * @param entity
      * @param <T>
      * @return
      */
-    public <T> T loadManyToOne(T entity,Class<T> clazz,Class<?> ... findClass) {
+    public <T> T loadManyToOne(DbModel dbModel,T entity,Class<T> clazz,Class<?> ... findClass) {
         if(entity!=null){
             try {
                 Collection<ManyToOne> manys = TableInfo.get(clazz).manyToOneMap.values();
                 for(ManyToOne many : manys){
-                    Object id = many.getValue(entity);
+
+                    Object id = null;
+                    if(dbModel!=null){
+                        dbModel.get(many.getColumn());
+                    }else if(many.getValue(entity).getClass()== ManyToOneLazyLoader.class
+                            &&many.getValue(entity)!=null){
+                        id = ((ManyToOneLazyLoader)many.getValue(entity)).getFieldValue();
+                    }
+
                     if(id!=null){
                         boolean isFind = false;
                         if(findClass == null || findClass.length==0){
@@ -423,10 +433,19 @@ public <T> T loadManyToOne(T entity,Class<T> clazz,Class<?> ... findClass) {
                             }
                         }
                         if(isFind){
+
                             @SuppressWarnings("unchecked")
-                            T manyEntity = (T) findById(Integer.valueOf(id.toString()), many.getDataType());
+                            T manyEntity = (T) findById(Integer.valueOf(id.toString()), many.getManyClass());
                             if(manyEntity!=null){
-                                many.setValue(entity, manyEntity);
+                                if(many.getValue(entity).getClass()== ManyToOneLazyLoader.class){
+                                    if(many.getValue(entity)==null){
+                                        many.setValue(entity,new ManyToOneLazyLoader(entity,clazz,many.getManyClass(),this));
+                                    }
+                                    ((ManyToOneLazyLoader)many.getValue(entity)).set(manyEntity);
+                                }else{
+                                    many.setValue(entity, manyEntity);
+                                }
+
                             }
                         }
                     }

src/net/tsz/afinal/db/sqlite/CursorUtils.java

@@ -66,6 +66,7 @@ public static <T> T getEntity(Cursor cursor, Class<T> clazz,FinalDb db){
                     for(ManyToOne manyToOneProp : table.manyToOneMap.values()){
                         if(manyToOneProp.getDataType()==ManyToOneLazyLoader.class){
                             ManyToOneLazyLoader manyToOneLazyLoader = new ManyToOneLazyLoader(entity,clazz,manyToOneProp.getManyClass(),db);
+                            manyToOneLazyLoader.setFieldValue(cursor.getInt(cursor.getColumnIndex(manyToOneProp.getColumn())));
                             manyToOneProp.setValue(entity,manyToOneLazyLoader);
                         }
                     }

src/net/tsz/afinal/db/sqlite/ManyToOneLazyLoader.java

@@ -17,6 +17,10 @@ public class ManyToOneLazyLoader<M,O> {
     Class<M> manyClazz;
     Class<O> oneClazz;
     FinalDb db;
+    /**
+     * 用于
+     */
+    private Object fieldValue;
     public ManyToOneLazyLoader(M manyEntity, Class<M> manyClazz, Class<O> oneClazz, FinalDb db){
         this.manyEntity = manyEntity;
         this.manyClazz = manyClazz;
@@ -32,7 +36,7 @@ public ManyToOneLazyLoader(M manyEntity, Class<M> manyClazz, Class<O> oneClazz,
      */
     public O get(){
         if(oneEntity==null && !hasLoaded){
-            this.db.loadManyToOne(this.manyEntity,this.manyClazz,this.oneClazz);
+            this.db.loadManyToOne(null,this.manyEntity,this.manyClazz,this.oneClazz);
             hasLoaded = true;
         }
         return oneEntity;
@@ -41,4 +45,11 @@ public void set(O value){
         oneEntity = value;
     }
 
+    public Object getFieldValue() {
+        return fieldValue;
+    }
+
+    public void setFieldValue(Object fieldValue) {
+        this.fieldValue = fieldValue;
+    }
 }

src/net/tsz/afinal/db/sqlite/SqlBuilder.java

@@ -32,7 +32,6 @@ public class SqlBuilder {
 
 	/**
 	 * 获取插入的sql语句
-	 * @param tableInfo
 	 * @return
 	 */
 	public static SqlInfo buildInsertSql(Object entity){
@@ -370,7 +369,7 @@ private static KeyValue manyToOne2KeyValue(ManyToOne many , Object entity){
 		if(manyobject!=null){
 			Object manyvalue;
             if(manyobject.getClass()==ManyToOneLazyLoader.class){
-                manyvalue = TableInfo.get(many.getManyClass()).getId().getValue(manyobject);
+                manyvalue = TableInfo.get(many.getManyClass()).getId().getValue(((ManyToOneLazyLoader)manyobject).get());
             }else{
                 manyvalue = TableInfo.get(manyobject.getClass()).getId().getValue(manyobject);
             }