Merge branch 'dev' of http://121.42.53.174:3000/jiapeng/portal-web.git into dev

src/main/java/com/ekexiu/portal/dao/ProfessorDao.java

@@ -15,6 +15,7 @@ import org.jfw.apt.orm.annotation.dao.method.From;
import org.jfw.apt.orm.annotation.dao.method.Or;
import org.jfw.apt.orm.annotation.dao.method.OrderBy;
import org.jfw.apt.orm.annotation.dao.method.Select;
import org.jfw.apt.orm.annotation.dao.method.SetSentence;
import org.jfw.apt.orm.annotation.dao.method.operator.DeleteWith;
import org.jfw.apt.orm.annotation.dao.method.operator.Insert;
import org.jfw.apt.orm.annotation.dao.method.operator.PageSelect;
@@ -57,6 +58,11 @@ public abstract class ProfessorDao {
	public abstract int updateAuthentication(Connection con, String id, @Set Integer authentication, 
			@Set Integer authType, @Set Integer authStatus) throws SQLException;
	
	@UpdateWith
	@From(Professor.class)
	@SetSentence("AUTH_STATUS=1")
	public abstract int updateAuthentication(Connection con, String id, @Set Integer authentication) throws SQLException;
	
	@UpdateWith
	@From(Professor.class)
	public abstract int updateAuthStatus(Connection con, String id, @Set Integer authStatus) throws SQLException;

src/main/java/com/ekexiu/portal/service/AuthApplyService.java

@@ -6,12 +6,14 @@ import java.sql.SQLException;
import java.util.List;
import org.jfw.apt.annotation.Autowrie;
import org.jfw.apt.annotation.Nullable;
import org.jfw.apt.web.annotation.Path;
import org.jfw.apt.web.annotation.operate.Get;
import org.jfw.apt.web.annotation.operate.Post;
import org.jfw.apt.web.annotation.param.JdbcConn;
import org.jfw.apt.web.annotation.param.PathVar;
import org.jfw.util.StringUtil;
import org.jfw.util.exception.JfwBaseException;
import com.ekexiu.portal.dao.AuthApplyDao;
import com.ekexiu.portal.dao.ProfessorDao;
@@ -55,6 +57,7 @@ public class AuthApplyService {
	@Path
	public String insert(@JdbcConn(true) Connection con, AuthApply authApply) throws SQLException, IOException{
		String authApplyId = StringUtil.buildUUID();
		authApply.setSolveStatus(0);
		authApply.setAuthApplyId(authApplyId);
		this.authApplyDao.insert(con, authApply);
		return authApplyId;
@@ -62,7 +65,13 @@ public class AuthApplyService {
	
	@Post
	@Path("/state")
	public void updateState(@JdbcConn(true) Connection con,String id,Integer state)throws SQLException{
	public void updateState(@JdbcConn(true) Connection con,String id,Integer state,@Nullable Integer auth,@Nullable String professorId)throws SQLException, JfwBaseException{
		if(state==2){
			if(auth==null) throw new JfwBaseException(10);
			if(professorId==null) throw new JfwBaseException(10);
			if(auth>4 || auth <1) throw new JfwBaseException(11);
			this.professorDao.updateAuthentication(con, professorId, auth);
		}
		this.authApplyDao.updateSolveStatus(con,state,id);
	}