Merge branch 'dev' of http://121.42.53.174:3000/jiapeng/jFrameWork.git

into dev

jfwAptOrm/src/main/java/org/jfw/apt/orm/annotation/dao/param/In.java

@@ -0,0 +1,12 @@
package org.jfw.apt.orm.annotation.dao.param;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
@Target(ElementType.PARAMETER)
@Retention(RetentionPolicy.SOURCE)
public @interface In {
	String value() default "";
}

jfwAptOrm/src/main/java/org/jfw/apt/orm/core/ColumnWriterCache.java

@@ -6,13 +6,16 @@ import java.util.Map;
import org.jfw.apt.out.ClassWriter;
public class ColumnWriterCache {
	private String valEl;
	private boolean useTmpVar;
	private boolean nullable;
	private ClassWriter cw;
	private String checkNullVar;
	private String cacheValVar;
	private ColumnHandler ch;
	protected String valEl;
	protected boolean useTmpVar;
	protected boolean nullable;
	protected ClassWriter cw;
	protected String checkNullVar;
	protected String cacheValVar;
	protected ColumnHandler ch;
	
	
	
	private Map<Object, Object> attributes;
@@ -37,8 +40,6 @@ public class ColumnWriterCache {
		return this.ch;
	}
	private ColumnWriterCache() {
	}
	
	public static String getMethodTempVarName(ClassWriter cw,String key,String secKey){
		String flagKey =ColumnWriterCache.class.getName()+"###"+key+"$$$"+ secKey;

jfwAptOrm/src/main/java/org/jfw/apt/orm/core/model/where/WhereFactory.java

@@ -20,6 +20,7 @@ import org.jfw.apt.orm.annotation.dao.method.Or;
import org.jfw.apt.orm.annotation.dao.param.Equals;
import org.jfw.apt.orm.annotation.dao.param.GreaterThan;
import org.jfw.apt.orm.annotation.dao.param.GtEq;
import org.jfw.apt.orm.annotation.dao.param.In;
import org.jfw.apt.orm.annotation.dao.param.LessThan;
import org.jfw.apt.orm.annotation.dao.param.Like;
import org.jfw.apt.orm.annotation.dao.param.LtEq;
@@ -39,14 +40,53 @@ public final class WhereFactory {
	public static Map<Class<? extends Annotation>, String> classEls = new HashMap<Class<? extends Annotation>, String>();
	public static boolean build(MethodParamEntry mpe, DataEntry entry, LinkedList<WhereColumn> result)
			throws AptException {
		boolean ret = false;
	public static boolean buildIn(MethodParamEntry mpe, DataEntry entry, LinkedList<WhereColumn> result) throws AptException {
		VariableElement ref = mpe.getRef();
		In in = ref.getAnnotation(In.class);
		if (in != null) {
			String tn = mpe.getTypeName();
			Class<? extends ColumnHandler> handlerClass = null;
			String javaname = Util.emptyToNull(in.value());
			if (javaname == null) {
				javaname = mpe.getName();
			}
			if (!tn.endsWith("[]")) {
				throw new AptException(ref, "param type must is Array");
			}
			tn = tn.substring(0, tn.length() - 2);
			CalcColumn c = entry.getCalcColumnByJavaName(javaname);
			if (c == null) {
				throw new AptException(ref, "not found annotation:@" + In.class.getName() + " or invlaid param name with column javaname");
			}
			handlerClass = c.getHandlerClass();
			String sn = ColumnHandlerFactory.get(handlerClass).supportsClass();
			if (!tn.equals(sn)) {
				throw new AptException(ref, "param Type unEquals ColumnHandler.supportClass");
			}
			WhereInColumn wc = new WhereInColumn();
			wc.setColumnName(c.getSqlName());
			wc.setHandlerClass(handlerClass);
			wc.setName(mpe.getName());
			wc.setNullable(true);
			wc.setCacheValue(false);
			result.addLast(wc);
			return true;
		}
		return false;
	}
	public static boolean build(MethodParamEntry mpe, DataEntry entry, LinkedList<WhereColumn> result) throws AptException {
		
		
		boolean ret = buildIn(mpe, entry, result);
		if(ret ) return ret;
		VariableElement ref = mpe.getRef();
		List<ParamColumn> paramColumns = null;
		Class<? extends ColumnHandler> handlerClass = null;
		boolean nullable = Util.isPrimitive(mpe.getTypeName()) ? false : (null != ref.getAnnotation(Nullable.class));
		for(ParamSqlColumn psc: ParamSqlColumn.build(mpe, entry)){
		for (ParamSqlColumn psc : ParamSqlColumn.build(mpe, entry)) {
			ret = true;
			handlerClass = psc.getHandlerClass();
			String tn = mpe.getTypeName();
@@ -71,10 +111,9 @@ public final class WhereFactory {
				result.addLast(wc);
			else
				result.addFirst(wc);
			
		}
		
		
		for (Class<? extends Annotation> cls : supportedClass) {
			Annotation anObj = mpe.getRef().getAnnotation(cls);
			if (anObj == null)
@@ -114,8 +153,7 @@ public final class WhereFactory {
	}
	public static void buildWithEq(MethodParamEntry mpe, DataEntry entry, LinkedList<WhereColumn> result)
			throws AptException {
	public static void buildWithEq(MethodParamEntry mpe, DataEntry entry, LinkedList<WhereColumn> result) throws AptException {
		VariableElement ref = mpe.getRef();
		boolean nullable = Util.isPrimitive(mpe.getTypeName()) ? false : (null != ref.getAnnotation(Nullable.class));
		List<ParamColumn> pcs = ParamColumn.build(mpe, entry);
@@ -146,8 +184,7 @@ public final class WhereFactory {
		}
	}
	public static void handlePrimaryKey(Table table, List<WhereColumn> list, Element methodRef, String paramName)
			throws AptException {
	public static void handlePrimaryKey(Table table, List<WhereColumn> list, Element methodRef, String paramName) throws AptException {
		DbUniqu du = table.getPrimaryKey();
		if (du == null)
			throw new AptException(methodRef, "not found primary key in table[" + table.getFromSentence() + "]");
@@ -178,8 +215,7 @@ public final class WhereFactory {
		return wherePart;
	}
	public static WherePart build(MethodEntry method, DataEntry entry, boolean excludeSet,
			List<String> excludeParamName) throws AptException {
	public static WherePart build(MethodEntry method, DataEntry entry, boolean excludeSet, List<String> excludeParamName) throws AptException {
		WherePart result = new WherePart();
		result.setStaticSentence(getStaticWhereSql(method.getRef()));
		result.setAnd(isAnd(method.getRef()));
@@ -201,8 +237,7 @@ public final class WhereFactory {
	}
	public static String getStaticWhereSql(Element methodRef) {
		org.jfw.apt.orm.annotation.dao.method.Where ws = methodRef
				.getAnnotation(org.jfw.apt.orm.annotation.dao.method.Where.class);
		org.jfw.apt.orm.annotation.dao.method.Where ws = methodRef.getAnnotation(org.jfw.apt.orm.annotation.dao.method.Where.class);
		if (ws == null)
			return null;
		return Util.emptyToNull(ws.value());

jfwAptOrm/src/main/java/org/jfw/apt/orm/core/model/where/WhereInColumn.java

@@ -0,0 +1,100 @@
package org.jfw.apt.orm.core.model.where;
import org.jfw.apt.orm.core.ColumnHandler;
import org.jfw.apt.orm.core.ColumnHandlerFactory;
import org.jfw.apt.orm.core.ColumnWriterCache;
import org.jfw.apt.out.ClassWriter;
public class WhereInColumn extends WhereColumn {
	private String sqlVarName;
	private String nullableVarName;
	private String loopVarName;
	private String columnName;
	private ColumnHandler ch;
	// private String arrayLenVarName;
	public String getColumnName() {
		return columnName;
	}
	public void setColumnName(String columnName) {
		this.columnName = columnName;
	}
	@Override
	public void prepare(ClassWriter cw) {
		sqlVarName = cw.getMethodTempVarName();
		nullableVarName = cw.getMethodTempVarName();
		// arrayLenVarName = cw.getMethodTempVarName();
		loopVarName = cw.getMethodTempVarName();
		cw.bL("boolean ").w(nullableVarName).w(" = (null == ").w(this.getName()).w(") || (0 == ").w(this.getName()).el(".length);");
		cw.bL("int ").w(loopVarName).el(" = 0 ;");
		cw.bL("StringBuilder ").w(sqlVarName).el(" = null;");
		cw.bL("if(!").w(nullableVarName).el("){");
		cw.bL(sqlVarName).el(" = new StringBuilder();");
		cw.bL(sqlVarName).w(".append(\"").w(this.columnName).w(" IN (").el("\");");
		cw.bL("for( ").w(loopVarName).w(" = 0 ; ").w(loopVarName).w(" < ").w(this.getName()).w(".length; ++").w(loopVarName).el("){");
		cw.bL(sqlVarName).el(".append(\"?,\");");
		cw.l("}");
		// cw.bL("int ").w(arrayLenVarName).w(" = ").w(loopVarName).el(" ;");
		cw.bL(sqlVarName).w(".setCharAt(").w(sqlVarName).el(".length()-1,')');");
		cw.l("}");
		this.setNullable(true);
		InColumnWriterCache icwc = new InColumnWriterCache();
		this.ch = ColumnHandlerFactory.get(this.getHandlerClass());
		icwc.setColumnHandler(this.ch);
		icwc.setCw(cw);
		icwc.setCheckNullVar(nullableVarName);
		icwc.setCacheValVar(this.getName() + "[" + loopVarName + "]");
		icwc.setNullable(true);
		this.setCwc(icwc);
	}
	@Override
	public String getWhereSql() {
		ClassWriter cw = this.getCwc().getCw();
		cw.w("\").append(").w(sqlVarName).w(".toString()).append(\"");
		return "";
	}
	@Override
	public void writeValue() {
		((InColumnWriterCache) this.getCwc()).setNullable(false);
		ClassWriter cw = this.getCwc().getCw();
		cw.bL("if(!").w(this.nullableVarName).el("){");
		cw.bL("for( ").w(loopVarName).w(" = 0 ; ").w(loopVarName).w(" < ").w(this.getName()).w(".length; ++").w(loopVarName).el("){");
		this.ch.writeValue(this.getCwc(), false);
		cw.l("}");
		cw.l("}");
	}
	public static class InColumnWriterCache extends ColumnWriterCache {
		public void setColumnHandler(ColumnHandler ch) {
			this.ch = ch;
		}
		public void setCw(ClassWriter cw) {
			this.cw = cw;
		}
		public void setCheckNullVar(String v) {
			this.checkNullVar = v;
		}
		public void setCacheValVar(String v) {
			this.cacheValVar = v;
		}
		@Override
		public boolean isUseTmpVar() {
			return true;
		}
		public void setNullable(boolean v) {
			this.nullable = v;
		}
	}
}

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

@@ -78,7 +78,7 @@ public class QueryValListHandler extends BaseQueryHandler {
	protected void buildResult() {
		cw.bL(LIST_PREFIX).w(this.returnClassName).w(LIST_SUFFIX).w(" _result = new java.util.ArrayList<")
				.w(this.returnClassName).el(">();");
		cw.l("while(rs.next(){");
		cw.l("while(rs.next()){");
			ColumnHandlerFactory.get(valColumn.getHandlerClass()).readValue(cw, "_result.add(", ");", 1,
					valColumn.isNullable());

jfwUtil/src/main/java/org/jfw/util/exception/JfwBaseException.java

@@ -73,7 +73,10 @@ public class JfwBaseException extends Exception {
	
	static{
		reasons.put(0,"UnDefine Exception");
		reasons.put(1, "No Logined");		
		reasons.put(1, "No Logined");
		reasons.put(2, "orgUser has exists");
		reasons.put(3, "orgUser has authentication");
		reasons.put(4, "orgUser is Auditing");
		reasons.put(10,"paramter null or empty");
		reasons.put(11,"paramter format error");
		reasons.put(90,"resource not exists");

jfwWebUtil/src/main/java/org/jfw/web/servlet/fileupload/cached/CachedUploadServlet.java

@@ -96,17 +96,18 @@ public class CachedUploadServlet extends HttpServlet {
		Integer cLimit = CachedUploadServlet.parseInt(map.get("countLimit"));
		Long sLimit = CachedUploadServlet.parseLong(map.get("sizeLimit"));
		String jsonpContent = null;
		String[] jces = map.get("function");
		if (jces != null) {
			jsonpContent = jces[0];
		}
		String[] hasText = map.get("text");
		boolean textJson = hasText != null && hasText.length > 0 && "1".equals(hasText[0]);
		int countLimit = this.config.getRealCountLimit(cLimit);
		long sizeLimit = this.config.getRealSizeLimit(sLimit);
		List<CachedItem> items = null;
		boolean byJsonp = null != jsonpContent;
		this.initResponse(resp, byJsonp);
		this.initResponse(resp, byJsonp || textJson);
		PrintWriter out = resp.getWriter();
		try {
			items = this.upload(req, countLimit, sizeLimit);