APP专家搜索接口

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

@@ -63,6 +63,14 @@ public abstract class ProfessorDao {
	@From(Professor.class)
	public abstract int updateAddress(Connection con, String id, @Set String address) throws SQLException;
	
	@UpdateWith
	@From(Professor.class)
	public abstract int updateProvince(Connection con, String id, @Set String province) throws SQLException;
	
	@UpdateWith
	@From(Professor.class)
	public abstract int updateStarAvg(Connection con, String id, @Set BigDecimal starAvg) throws SQLException;
	
	/**
	 * 查询专家基本信息接口
	 * @param con
@@ -216,7 +224,10 @@ public abstract class ProfessorDao {
//	public abstract List<Professor> query(Connection con) throws SQLException;
	
	public List<Professor> query(Connection con) throws SQLException{
        String sql = "SELECT OFFICE,SUBJECT,INDUSTRY,ADDRESS,DEPARTMENT,ORG_ID,organization.NAME AS ONAME,TITLE,AUTHENTICATION,professor.ID,professor.NAME AS PNAME,professor.DESCP,professor.CREATE_TIME,professor.MODIFY_TIME FROM PROFESSOR LEFT JOIN ORGANIZATION ON professor.ORG_ID=organization.ID ORDER BY ONAME";
        String sql = "SELECT OFFICE,SUBJECT,INDUSTRY,ADDRESS,DEPARTMENT,ORG_ID,organization.NAME AS ONAME,"
        		+ " TITLE,AUTHENTICATION,professor.ID,professor.NAME AS PNAME,professor.DESCP,"
        		+ " professor.CREATE_TIME,professor.MODIFY_TIME FROM PROFESSOR "
        		+ " LEFT JOIN ORGANIZATION ON professor.ORG_ID=organization.ID ORDER BY ONAME";
        PreparedStatement ps = con.prepareStatement(sql);
        try{
            ResultSet rs = ps.executeQuery();
@@ -267,6 +278,123 @@ public abstract class ProfessorDao {
        }
    }
	
	/**
	 * 查询所有专家的咨询星级和咨询完成次数
	 * @param con
	 * @return
	 * @throws SQLException
	 */
	public List<Professor> queryStar(Connection con) throws SQLException{
		String sql = "SELECT ID,STAR_LEVEL,CONSULT_COUNT FROM PROFESSOR ";
        PreparedStatement ps = con.prepareStatement(sql);
        try{
            ResultSet rs = ps.executeQuery();
            try{
                List<Professor> _result = new ArrayList<Professor>();
                while(rs.next()){
                    Professor professor =  new Professor();
                    professor.setId(rs.getString(1));
                    professor.setStarLevel(rs.getBigDecimal(2));
                    professor.setConsultCount(rs.getInt(3));
                    _result.add(professor);
                }
                return _result;
            }finally{
                try{rs.close();}catch(Exception _m_5){}
            }
        }finally{
            try{ps.close();}catch(Exception _m_6){}
        }
	}
	/**
	 * 查询所有专家咨询星级的最大值
	 * @param con
	 * @return
	 * @throws SQLException
	 */
	public BigDecimal queryBigStar(Connection con) throws SQLException{
		String sql = "SELECT MAX(STAR_LEVEL) FROM PROFESSOR ";
        PreparedStatement ps = con.prepareStatement(sql);
        try{
            ResultSet rs = ps.executeQuery();
            rs.next();
            try{
            	return rs.getBigDecimal(1);
            }finally{
                try{rs.close();}catch(Exception e1){}
            }
        }finally{
            try{ps.close();}catch(Exception e2){}
        }
	}
	
	/**
	 * 查询所有专家咨询星级的最小值
	 * @param con
	 * @return
	 * @throws SQLException
	 */
	public BigDecimal querySmallStar(Connection con) throws SQLException{
		String sql = "SELECT MIN(STAR_LEVEL) FROM PROFESSOR ";
        PreparedStatement ps = con.prepareStatement(sql);
        try{
            ResultSet rs = ps.executeQuery();
            rs.next();
            try{
            	return rs.getBigDecimal(1);
            }finally{
                try{rs.close();}catch(Exception e1){}
            }
        }finally{
            try{ps.close();}catch(Exception e2){}
        }
	}
	
	/**
	 * 查询所有专家咨询次数的最大值
	 * @param con
	 * @return
	 * @throws SQLException
	 */
	public BigDecimal queryBigConsult(Connection con) throws SQLException{
		String sql = "SELECT MAX(CONSULT_COUNT) FROM PROFESSOR ";
        PreparedStatement ps = con.prepareStatement(sql);
        try{
            ResultSet rs = ps.executeQuery();
            rs.next();
            try{
            	return new BigDecimal(rs.getInt(1));
            }finally{
                try{rs.close();}catch(Exception e1){}
            }
        }finally{
            try{ps.close();}catch(Exception e2){}
        }
	}
	
	/**
	 * 查询所有专家咨询次数的最小值
	 * @param con
	 * @return
	 * @throws SQLException
	 */
	public BigDecimal querySmallConsult(Connection con) throws SQLException{
		String sql = "SELECT MIN(CONSULT_COUNT) FROM PROFESSOR ";
        PreparedStatement ps = con.prepareStatement(sql);
        try{
            ResultSet rs = ps.executeQuery();
            rs.next();
            try{
            	return new BigDecimal(rs.getInt(1));
            }finally{
                try{rs.close();}catch(Exception e1){}
            }
        }finally{
            try{ps.close();}catch(Exception e2){}
        }
	}
	
	@Nullable
	@QueryOne
	@From(Professor.class)
@@ -285,6 +413,200 @@ public abstract class ProfessorDao {
					"" + "ORG_ID IN(SELECT ID FROM ORGANIZATION WHERE NAME LIKE ?)", "NAME LIKE ?" }, handlerClass = StringHandler.class) String key,
			int pageSize, int pageNo) throws SQLException;
	/**
	 * APP专家搜索列表分页多条件查询
	 * @param con
	 * @param key
	 * @param subject 学术领域
	 * @param industry 应用行业
	 * @param province 所在省份
	 * @param address 所在城市
	 * @param authentication 是否认证
	 * @param pageSize 
	 * @param pageNo
	 * @return 按搜索条件返回专家列表
	 * @throws SQLException
	 */
	public PageQueryResult<EditProfessor> queryAPP(Connection con, @Nullable String key, String subject, String industry, 
			String province, String address, @Nullable Integer authentication, int pageSize, int pageNo) throws SQLException {
		PageQueryResult<EditProfessor> _result = new PageQueryResult<EditProfessor>();
		StringBuilder sql = new StringBuilder();
		boolean hasKey = null != key;
		if (hasKey) {
			sql.append(" WHERE (( PROFESSOR.ID IN (SELECT PROFESSOR_ID FROM RESEARCH_AREA WHERE CAPTION LIKE ?)) "
					+ " OR (ORG_ID IN(SELECT ORGANIZATION.ID FROM ORGANIZATION WHERE ORGANIZATION.NAME LIKE ?)) "
					+ " OR ( PROFESSOR.NAME LIKE ?) OR (SUBJECT LIKE ?) OR (INDUSTRY LIKE ?) OR (PROVINCE LIKE ?) OR (ADDRESS LIKE ?) "
					+ " OR PROFESSOR.ID IN (SELECT PROFESSOR_ID FROM RESOURCE WHERE RESOURCE_NAME LIKE ?))");
		}
		boolean hasSubject = null != subject;
		boolean hasIndustry = null != industry;
		boolean hasProvince = null != province;
		boolean hasAddress = null != address;
		boolean hasAuth = null != authentication;
		if (hasSubject) {
			sql.append(sql.length() > 0 ? " AND " : " WHERE ").append("(SUBJECT LIKE ?)");
		}
		if (hasIndustry) {
			sql.append(sql.length() > 0 ? " AND " : " WHERE ").append("(INDUSTRY LIKE ?)");
		}
		if (hasProvince) {
			sql.append(sql.length() > 0 ? " AND " : " WHERE ").append("(PROVINCE LIKE ?)");
		}
		if (hasAddress) {
			sql.append(sql.length() > 0 ? " AND " : " WHERE ").append("(ADDRESS LIKE ?)");
		}
		if (hasAuth) {
			if(0 == authentication){
				sql.append(sql.length() > 0 ? " AND " : " WHERE ").append("(AUTHENTICATION = '0')");
			}else if(1 == authentication){
				sql.append(sql.length() > 0 ? " AND " : " WHERE ").append("(AUTHENTICATION = '1')");
			}
		}
		StringBuilder whereSql = sql;
		sql = new StringBuilder();
		sql.append("SELECT COUNT(1) FROM PROFESSOR");
		if (whereSql.length() > 0) {
			sql.append(whereSql);
		}
		PreparedStatement ps = con.prepareStatement(sql.toString());
		int paramIndex = 1;
		int totalSize = 0;
		try {
			if (hasKey) {
				ps.setString(paramIndex++, key);
				ps.setString(paramIndex++, key);
				ps.setString(paramIndex++, key);
				ps.setString(paramIndex++, key);
				ps.setString(paramIndex++, key);
				ps.setString(paramIndex++, key);
				ps.setString(paramIndex++, key);
				ps.setString(paramIndex++, key);
			}
			if (hasSubject) {
				ps.setString(paramIndex++, subject);
			}
			if (hasIndustry) {
				ps.setString(paramIndex++, industry);
			}
			if (hasProvince) {
				ps.setString(paramIndex++, province);
			}
			if (hasAddress) {
				ps.setString(paramIndex++, address);
			}
			_result.setPageSize(pageSize);
			ResultSet _pageRs = ps.executeQuery();
			try {
				_pageRs.next();
				totalSize = _pageRs.getInt(1);
			} finally {
				try {
					_pageRs.close();
				} catch (Exception _m_6) {
				}
			}
		} finally {
			try {
				ps.close();
			} catch (Exception _m_7) {
			}
		}
		_result.setTotal(totalSize);
		if (0 == totalSize) {
			_result.setPageNo(1);
			_result.setData(Collections.<EditProfessor> emptyList());
			return _result;
		}
		paramIndex = 1;
		if (1 == pageNo) {
			_result.setPageNo(1);
			sql = new StringBuilder();
			sql.append("SELECT OFFICE,ADDRESS,TITLE,AUTHENTICATION,PROFESSOR.ID,PROFESSOR.NAME,ORG_ID,ORGANIZATION.NAME"
	        		+ " FROM PROFESSOR LEFT JOIN ORGANIZATION ON PROFESSOR.ORG_ID=ORGANIZATION.ID ");
			if (whereSql.length() > 0) {
				sql.append(whereSql);
			}
			sql.append(" ORDER BY STAR_LEVEL DESC ");
			sql.append(" LIMIT ").append(pageSize);
		} else {
			int _pageSize = totalSize / pageSize;
			if (totalSize % pageSize != 0) {
				++_pageSize;
			}
			if (pageNo > _pageSize) {
				pageNo = _pageSize;
			}
			_result.setPageNo(pageNo);
			--pageNo;
			int _m_10 = (pageNo * pageSize);
			sql = new StringBuilder();
			sql.append("SELECT OFFICE,ADDRESS,TITLE,AUTHENTICATION,PROFESSOR.ID,PROFESSOR.NAME,ORG_ID,ORGANIZATION.NAME"
	        		+ " FROM PROFESSOR LEFT JOIN ORGANIZATION ON PROFESSOR.ORG_ID=ORGANIZATION.ID ");
			if (whereSql.length() > 0) {
				sql.append(whereSql);
			}
			sql.append(" ORDER BY STAR_LEVEL DESC ");
			sql.append(" LIMIT ").append(pageSize).append(" OFFSET ").append(_m_10);
		}
		ps = con.prepareStatement(sql.toString());
		try {
			if (hasKey) {
				ps.setString(paramIndex++, key);
				ps.setString(paramIndex++, key);
				ps.setString(paramIndex++, key);
				ps.setString(paramIndex++, key);
				ps.setString(paramIndex++, key);
				ps.setString(paramIndex++, key);
				ps.setString(paramIndex++, key);
				ps.setString(paramIndex++, key);
			}
			if (hasSubject) {
				ps.setString(paramIndex++, subject);
			}
			if (hasIndustry) {
				ps.setString(paramIndex++, industry);
			}
			if (hasProvince) {
				ps.setString(paramIndex++, province);
			}
			if (hasAddress) {
				ps.setString(paramIndex++, address);
			}
			java.sql.ResultSet rs = ps.executeQuery();
			try {
				List<EditProfessor> _m_11 = new ArrayList<EditProfessor>();
				_result.setData(_m_11);
				while (rs.next()) {
					EditProfessor professor =  new EditProfessor();
                    String _m_1 = rs.getString(1);
                    if(rs.wasNull()){
                        _m_1 = null;
                    }
                    professor.setOffice(_m_1);
                    professor.setAddress(rs.getString(2));
                    professor.setTitle(rs.getString(3));
                    professor.setAuthentication("1".equals(rs.getString(4)));
                    professor.setId(rs.getString(5));
                    professor.setName(rs.getString(6));
                    professor.setOrgId(rs.getString(7));
                    professor.setOrgName(rs.getString(8));
					_m_11.add(professor);
				}
				return _result;
			} finally {
				try {
					rs.close();
				} catch (Exception e1) {
				}
			}
		} finally {
			try {
				ps.close();
			} catch (Exception e2) {
			}
		}
	}
	
	/**
	 * 分页查询专家基础信息，多条件查询专家列表。
	 * @param con

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

@@ -297,10 +297,40 @@ public abstract class ResourceDao {
//    }
	
	/**
	 * 查询当前登录专家发布的所有资源
	 * APP涓撳鎼滅储鍒楄〃閲屾樉绀轰笓瀹剁殑鎵€鏈夎祫婧愶紙鍙渶瑕佽祫婧怚D鍜屽悕绉帮級
	 * @param con 
	 * @param professorId 涓撳ID
	 * @return 杩斿洖褰撳墠涓撳鍙戝竷鐨勬墍鏈夎祫婧愶紝骞舵寜鎺掑簭
	 * @throws SQLException
	 */
	public List<Resource> queryList(Connection con,String professorId) throws SQLException{
        String sql = "SELECT RESOURCE_ID,RESOURCE_NAME FROM RESOURCE WHERE PROFESSOR_ID = ? ORDER BY CREATE_TIME DESC";
        PreparedStatement ps = con.prepareStatement(sql);
        try{
            ps.setString(1,professorId);
            ResultSet rs = ps.executeQuery();
            try{
                List<Resource> resources = new ArrayList<Resource>();
                while(rs.next()){
                    Resource resource =  new Resource();
                    resource.setResourceId(rs.getString(1));
                    resource.setResourceName(rs.getString(2));
                    resources.add(resource);
                }
                return resources;
            }finally{
                try{rs.close();}catch(Exception e){}
            }
        }finally{
            try{ps.close();}catch(Exception e){}
        }
    }
	
	/**
	 * 鏌ヨ褰撳墠鐧诲綍涓撳鍙戝竷鐨勬墍鏈夎祫婧?
	 * @param con
	 * @param professorId 专家ID
	 * @return 返回当前专家发布的所有资源集合
	 * @param professorId 涓撳ID
	 * @return 杩斿洖褰撳墠涓撳鍙戝竷鐨勬墍鏈夎祫婧愰泦鍚?
	 * @throws SQLException
	 */
	public List<Resource> queryPro(Connection con,String professorId) throws SQLException{
@@ -370,14 +400,14 @@ public abstract class ResourceDao {
	public abstract int delete(Connection con, String resourceId) throws SQLException;
	
	/**
	 * 分页查找所有资源(附带资源所有者基本信息)，按资源名称排序
	 * @param key 查询内容（搜索框搜索内容-模糊查询）
	 * @param subject 学术领域
	 * @param industry 研究方向
	 * @param address 专家所在地
	 * 鍒嗛〉鏌ユ壘鎵€鏈夎祫婧?闄勫甫璧勬簮鎵€鏈夎€呭熀鏈俊鎭?锛屾寜璧勬簮鍚嶇О鎺掑簭
	 * @param key 鏌ヨ鍐呭锛堟悳绱㈡鎼滅储鍐呭-妯＄硦鏌ヨ锛?
	 * @param subject 瀛︽湳棰嗗煙
	 * @param industry 鐮旂┒鏂瑰悜
	 * @param address 涓撳鎵€鍦ㄥ湴
	 * @param pageSize 
	 * @param pageNo
	 * @return 返回要查找的所有资源(附带资源所有者基本信息)
	 * @return 杩斿洖瑕佹煡鎵剧殑鎵€鏈夎祫婧?闄勫甫璧勬簮鎵€鏈夎€呭熀鏈俊鎭?
	 * @throws SQLException
	 */
	public PageQueryResult<Resource> queryPageRes(Connection con,String key,String subject,String industry,String address,int pageSize,int pageNo) throws SQLException{
@@ -563,11 +593,11 @@ public abstract class ResourceDao {
    }
	
	/**
	 * 分页查找所有资源，按资源名称排序
	 * @param key 查询内容（搜索框搜索内容-模糊查询）
	 * @param subject 学术领域
	 * @param industry 研究方向
	 * @param address 专家所在地
	 * 鍒嗛〉鏌ユ壘鎵€鏈夎祫婧愶紝鎸夎祫婧愬悕绉版帓搴?
	 * @param key 鏌ヨ鍐呭锛堟悳绱㈡鎼滅储鍐呭-妯＄硦鏌ヨ锛?
	 * @param subject 瀛︽湳棰嗗煙
	 * @param industry 鐮旂┒鏂瑰悜
	 * @param address 涓撳鎵€鍦ㄥ湴
	 * @param pageSize 
	 * @param pageNo
	 * @return

src/main/java/com/ekexiu/portal/po/Professor.java

@@ -1,6 +1,7 @@
package com.ekexiu.portal.po;
import java.math.BigDecimal;
import java.util.List;
import org.jfw.apt.orm.annotation.entry.Column;
import org.jfw.apt.orm.annotation.entry.PrimaryKey;
@@ -36,13 +37,16 @@ public class Professor implements CreateTimeSupported, ModifyTimeSupported{
	 * 应用行业
	 */
	private String industry;
	private String province;
	private String address;
	private String descp;
	private String createTime;
	private String modifyTime;
	private BigDecimal starLevel;
	private Integer consultCount;
	private BigDecimal starAvg;
	private Organization organization;
	private List<Resource> resources;
	
	public Organization getOrganization() {
		return organization;
@@ -52,6 +56,14 @@ public class Professor implements CreateTimeSupported, ModifyTimeSupported{
		this.organization = organization;
	}
	public List<Resource> getResources() {
		return resources;
	}
	public void setResources(List<Resource> resources) {
		this.resources = resources;
	}
	@Column(value=DE.String_de,dbType="TEXT")
	public String getOffice() {
		return office;
@@ -78,6 +90,23 @@ public class Professor implements CreateTimeSupported, ModifyTimeSupported{
		this.industry = industry;
	}
	
	/**
	 * 所在省份
	 * @return
	 */
	@Column(DE.String_de)
	public String getProvince() {
		return province;
	}
	public void setProvince(String province) {
		this.province = province;
	}
	/**
	 * 所在城市
	 * @return
	 */
	@Column(DE.String_de)
	public String getAddress() {
		return address;
@@ -180,7 +209,7 @@ public class Professor implements CreateTimeSupported, ModifyTimeSupported{
		this.modifyTime = modifyTime;
	}
	@Column(handlerClass=BigDecimalHandler.class,dbType="DECIMAL",insertable=false,nullable=true,renewable=true,queryable=true)
	@Column(handlerClass=BigDecimalHandler.class,dbType="DECIMAL",insertable=false,nullable=false,renewable=true,queryable=true)
	public BigDecimal getStarLevel() {
		return starLevel;
	}
@@ -198,4 +227,13 @@ public class Professor implements CreateTimeSupported, ModifyTimeSupported{
		this.consultCount = consultCount;
	}
	@Column(handlerClass=BigDecimalHandler.class,dbType="DECIMAL",insertable=false,nullable=false,renewable=true,queryable=true)
	public BigDecimal getStarAvg() {
		return starAvg;
	}
	public void setStarAvg(BigDecimal starAvg) {
		this.starAvg = starAvg;
	}
}

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

@@ -119,6 +119,7 @@ public class ConsultService {
				professor.setHasHeadImage(this.imageService.hasProfessorImage(consult.getConsultantId()));
				consult.setProfessor(professor);
			}
			queryResult.setData(consults);
		}
		return queryResult;
	}
@@ -177,6 +178,7 @@ public class ConsultService {
				int hasHeadImage = this.imageService.hasProfessorImage(consult.getConsultantId());
				consult.getProfessor().setHasHeadImage(hasHeadImage);
			}
			queryResult.setData(consults);
		}
		return queryResult;
	}	
@@ -201,6 +203,7 @@ public class ConsultService {
				int hasHeadImage = this.imageService.hasProfessorImage(consult.getProfessorId());
				consult.getProfessor().setHasHeadImage(hasHeadImage);
			}
			queryResult.setData(consults);
		}
		return queryResult;
	}

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

@@ -31,12 +31,18 @@ import com.ekexiu.portal.dao.ProfessorEduBgDao;
import com.ekexiu.portal.dao.ProjectDao;
import com.ekexiu.portal.dao.ResearchAreaDao;
import com.ekexiu.portal.dao.ResearchAreaLogDao;
import com.ekexiu.portal.dao.ResourceDao;
import com.ekexiu.portal.po.Professor;
import com.ekexiu.portal.pojo.EditProfessor;
import com.ekexiu.portal.pojo.ProfessorInfo;
import com.ekexiu.portal.util.Calculate;
@Path("/professor")
public class ProfessorService {
	@Autowrie
	private Calculate calculate;
	@Autowrie
	private ResourceDao resourceDao;
	@Autowrie
	private ImageService imageService;
	@Autowrie
@@ -63,8 +69,22 @@ public class ProfessorService {
	private ProjectDao projectDao;
	
	
	
	public Calculate getCalculate() {
		return calculate;
	}
	public void setCalculate(Calculate calculate) {
		this.calculate = calculate;
	}
	public ResourceDao getResourceDao() {
		return resourceDao;
	}
	public void setResourceDao(ResourceDao resourceDao) {
		this.resourceDao = resourceDao;
	}
	public ImageService getImageService() {
		return imageService;
	}
@@ -223,10 +243,51 @@ public class ProfessorService {
	}
	@Get
	@Path("/qa")
	public List<Professor> queryAll(@JdbcConn Connection con)throws SQLException {
	public List<Professor> queryAll(@JdbcConn Connection con) throws SQLException {
		return this.professorDao.query(con);
	}
	
	@Post
	@Path("/updateStarAvg")
	public boolean updateStarAvg(@JdbcConn(true) Connection con) throws SQLException {
		List<Professor> professors = this.professorDao.queryStar(con);
		BigDecimal bigStar = this.professorDao.queryBigStar(con);
		BigDecimal smallStar = this.professorDao.querySmallStar(con);
		BigDecimal bigConsult = this.professorDao.queryBigConsult(con);
		BigDecimal smallConsult = this.professorDao.querySmallConsult(con);
		for (Professor professor : professors) {
			BigDecimal star = professor.getStarLevel();
			BigDecimal consult = new BigDecimal(professor.getConsultCount());
			BigDecimal avgStar = this.calculate.calcAvgStar(bigStar, smallStar, bigConsult, smallConsult, star, consult);
			this.professorDao.updateStarAvg(con, professor.getId(), avgStar);
		}
		return true;
	}
	
	@Get
	@Path("/pqAPP")
	public PageQueryResult<EditProfessor> queryAPP(@JdbcConn Connection con, @Nullable String key,
			@Nullable String subject,@Nullable String industry,@Nullable String province,
			@Nullable String address, @Nullable Integer authentication, 
			@DefaultValue("10") int pageSize,@DefaultValue("1") int pageNo) throws SQLException{
		if(key!=null) {key="%"+key+"%";}
		if(subject!=null) {subject ="%"+subject+"%";}
		if(null!=industry) {industry="%"+industry+"%";}
		if(null!=province) {province="%"+province+"%";}
		if(null!=address) {address="%"+address+"%";}
		PageQueryResult<EditProfessor> queryResult = this.professorDao.queryAPP(con,key,subject,industry,province,address,authentication,pageSize,pageNo);
		List<EditProfessor> editProfessors = queryResult.getData();
		if(editProfessors != null) {
			for (EditProfessor editProfessor : editProfessors) {
				editProfessor.setHasHeadImage(this.imageService.hasProfessorImage(editProfessor.getId()));
				editProfessor.setResearchAreas(this.researchAreaDao.query(con, editProfessor.getId()));
				editProfessor.setResources(this.resourceDao.queryList(con, editProfessor.getId()));
			}
			queryResult.setData(editProfessors);
		}
		return queryResult;
	}
	
	@Post
	@Path("/starLevel")
	public void updateStarLevel(@JdbcConn(true) Connection con, String id, BigDecimal starLevel) throws SQLException{
@@ -246,7 +307,8 @@ public class ProfessorService {
	}
	@Post
	@Path("/address")
	public void updateAddress(@JdbcConn(true) Connection con, String id, String address) throws SQLException{
	public void updateAddress(@JdbcConn(true) Connection con, String id, String province, String address) throws SQLException{
		this.professorDao.updateProvince(con, id, province);
		this.professorDao.updateAddress(con, id, address);
	}
	@Post
@@ -275,10 +337,10 @@ public class ProfessorService {
	PageQueryResult<EditProfessor> queryEditBaseInfo(@JdbcConn(false) Connection con,@Nullable String key,
			@Nullable String subject,@Nullable String industry,@Nullable String address,@Nullable Integer authentication, 
			@DefaultValue("10") int pageSize,@DefaultValue("1") int pageNo)throws SQLException{
		if(key!=null) key="%"+key+"%";
		if(subject!=null) subject ="%"+subject+"%";
		if(null!=industry) industry="%"+industry+"%";
		if(null!=address) address="%"+address+"%";
		if(key!=null) {key="%"+key+"%";}
		if(subject!=null) {subject ="%"+subject+"%";}
		if(null!=industry) {industry="%"+industry+"%";}
		if(null!=address) {address="%"+address+"%";}
		PageQueryResult<EditProfessor> queryResult = this.professorDao.queryEditBaseInfo(con, key, subject, industry, address, authentication, pageSize, pageNo);
		List<EditProfessor> editProfessors = queryResult.getData();
		if(editProfessors != null){
@@ -286,6 +348,7 @@ public class ProfessorService {
				editProfessor.setHasHeadImage(this.imageService.hasProfessorImage(editProfessor.getId()));
				editProfessor.setResearchAreas(this.researchAreaDao.query(con, editProfessor.getId()));
			}
			queryResult.setData(editProfessors);
		}
		return queryResult;
	}
@@ -330,7 +393,7 @@ public class ProfessorService {
//		ProfessorService service = new ProfessorService();
//		ProfessorDao dao = new ProfessorDaoExtend();
//		service.setProfessorDao(dao);
//		PageQueryResult<Professor> result =service.query(con,"杨", "材料", "金属", 10, 2);
//		PageQueryResult<Professor> result =service.query(con,"鏉?, "鏉愭枡", "閲戝睘", 10, 2);
//		System.out.println(result.getTotal());
//		for(Professor p:result.getData()){
//			System.out.println("======");
@@ -339,6 +402,6 @@ public class ProfessorService {
//		}finally{
//			con.close();
//		}
		System.out.println(URLEncoder.encode("有", "UTF-8"));
		System.out.println(URLEncoder.encode("输出中文", "UTF-8"));
	}
}