000

jfwAptOrm/src/main/java/org/jfw/apt/orm/annotation/dao/method/Exclude.java

@@ -0,0 +1,12 @@
package org.jfw.apt.orm.annotation.dao.method;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
@Target(ElementType.METHOD)
@Retention(RetentionPolicy.SOURCE)
public @interface Exclude {
	String[] value();
}

jfwAptOrm/src/main/java/org/jfw/apt/orm/daoHandler/BaseQueryHandler.java

@@ -6,6 +6,7 @@ import java.util.ListIterator;
import org.jfw.apt.Util;
import org.jfw.apt.exception.AptException;
import org.jfw.apt.orm.annotation.dao.method.Exclude;
import org.jfw.apt.orm.annotation.dao.method.OrderBy;
import org.jfw.apt.orm.core.model.CalcColumn;
import org.jfw.apt.orm.core.model.DataEntry;
@@ -15,6 +16,7 @@ import org.jfw.apt.orm.core.model.where.WhereFactory;
import org.jfw.apt.orm.core.model.where.WherePart;
public abstract class BaseQueryHandler extends BaseDaoHandler {
	private static final String[] EMPTY_STRING_ARRAY = new String[0];
	public static final String PAGE_PREFIX = "org.jfw.util.PageQueryResult<";
	public static final int PAGE_RCN_INDEX = PAGE_PREFIX.length();
@@ -90,6 +92,25 @@ public abstract class BaseQueryHandler extends BaseDaoHandler {
		cw.l("}finally{").writeClosing("ps").l("}");
	}
	
	protected void handleExclude(){
		Exclude exclude =  ref.getAnnotation(Exclude.class);
		
		if(null!= exclude && exclude.value().length>0){
			String[] excludeColumns =exclude.value();
			for (ListIterator<CalcColumn> it = this.fields.listIterator(); it.hasNext();) {
				CalcColumn cc = it.next();
				for(String ec:excludeColumns){
					if(ec.equals(cc.getJavaName())){
						it.remove();
						break;
					}
				}
			}
			
		}
	}
	protected void prepareDataEntry() throws AptException {
		String drc = this.getDefReturnClassName();
@@ -129,9 +150,12 @@ public abstract class BaseQueryHandler extends BaseDaoHandler {
			}
		}
		for (ListIterator<CalcColumn> it = this.fields.listIterator(); it.hasNext();) {
			if (!it.next().isQueryable())
			CalcColumn cc = it.next();
			if (!cc.isQueryable()){
				it.remove();
			}
		}
		this.handleExclude();
	}
	protected void buildWhere() throws AptException {

jfwAptOrm/src/main/java/org/jfw/apt/orm/daoHandler/BaseSelectHandler.java

@@ -22,6 +22,8 @@ public abstract class BaseSelectHandler extends BaseQueryHandler{
			if (!it.next().isQueryable())
				it.remove();
		}
		this.handleExclude();
		
	}
	
	@Override