资源搜索页面返回字段增加专家基础信息。

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

@@ -27,6 +27,8 @@ import com.ekexiu.portal.pojo.EditProfessor;
public abstract class ResourceDao {
	@Autowrie
	private ImageDao imageDao;
	@Autowrie
	private ProfessorDao professorDao;
	
	public ImageDao getImageDao() {
		return imageDao;
@@ -36,6 +38,14 @@ public abstract class ResourceDao {
		this.imageDao = imageDao;
	}
	public ProfessorDao getProfessorDao() {
		return professorDao;
	}
	public void setProfessorDao(ProfessorDao professorDao) {
		this.professorDao = professorDao;
	}
	@Insert
	public abstract int insert(Connection con,Resource resource) throws SQLException;
	
@@ -286,6 +296,13 @@ public abstract class ResourceDao {
//        }
//    }
	
	/**
	 * 查询当前登录专家发布的所有资源
	 * @param con
	 * @param professorId 专家ID
	 * @return 返回当前专家发布的所有资源集合
	 * @throws SQLException
	 */
	public List<Resource> queryPro(Connection con,String professorId) throws SQLException{
        int _m_1 = 1;
        String sql = "SELECT RESOURCE_ID,RESOURCE_NAME,SUBJECT,INDUSTRY,SUPPORTED_SERVICES,DESCP,"
@@ -352,6 +369,199 @@ public abstract class ResourceDao {
	@From(Resource.class)
	public abstract int delete(Connection con, String resourceId) throws SQLException;
	
	/**
	 * 分页查找所有资源(附带资源所有者基本信息)，按资源名称排序
	 * @param key 查询内容（搜索框搜索内容-模糊查询）
	 * @param subject 学术领域
	 * @param industry 研究方向
	 * @param address 专家所在地
	 * @param pageSize 
	 * @param pageNo
	 * @return 返回要查找的所有资源(附带资源所有者基本信息)
	 * @throws SQLException
	 */
	public PageQueryResult<Resource> queryPageRes(Connection con,String key,String subject,String industry,String address,int pageSize,int pageNo) throws SQLException{
        int _m_1 = 0;
        PageQueryResult<Resource> _result = new PageQueryResult<Resource>();
        int _m_3 = 1;
        boolean _m_2 = null == key;
        boolean _m_4 = null == subject;
        boolean _m_5 = null == industry;
        boolean _m6 = null == address;
        StringBuilder sql = new StringBuilder();
        boolean _m_7 = true;
        if(!_m_2){
            _m_7 =  false;
            sql.append(" WHERE ((RESOURCE_NAME LIKE ?) OR (SUPPORTED_SERVICES LIKE ?) "
            		+ " OR (RESOURCE.SUBJECT LIKE ?) OR (RESOURCE.INDUSTRY LIKE ?) "
            		+ " OR (RESOURCE.PROFESSOR_ID IN (SELECT PROFESSOR.ID FROM PROFESSOR WHERE PROFESSOR.ADDRESS LIKE ?))) ");
        }
        if(!_m_4){
            if(_m_7){
                _m_7 =  false;
                sql.append(" WHERE (RESOURCE.SUBJECT LIKE ?) ");
            }else{
                sql.append(" AND (RESOURCE.SUBJECT LIKE ?) ");
            }
        }
        if(!_m_5){
            if(_m_7){
                _m_7 =  false;
                sql.append(" WHERE (RESOURCE.INDUSTRY LIKE ?) ");
            }else{
                sql.append(" AND (RESOURCE.INDUSTRY LIKE ?) ");
            }
        }
        if(!_m6){
        	if(_m_7){
        		_m_7 =  false;
        		sql.append(" WHERE (RESOURCE.PROFESSOR_ID IN (SELECT PROFESSOR.ID FROM PROFESSOR WHERE PROFESSOR.ADDRESS LIKE ?)) ");
        	}else{
        		sql.append(" AND (RESOURCE.PROFESSOR_ID IN (SELECT PROFESSOR.ID FROM PROFESSOR WHERE PROFESSOR.ADDRESS LIKE ?)) ");
        	}
        }
        StringBuilder _m_6 = sql;
        sql = new StringBuilder();
        sql.append(" SELECT COUNT(1) FROM RESOURCE ");
        if(_m_6.length()>0){
            sql.append(_m_6);
        }
        PreparedStatement ps = con.prepareStatement(sql.toString());
        try{
            if(!_m_2){
                ps.setString(_m_3++,key);
                ps.setString(_m_3++,key);
                ps.setString(_m_3++,key);
                ps.setString(_m_3++,key);
                ps.setString(_m_3++,key);
            }
            if(!_m_4){
                ps.setString(_m_3++,subject);
            }
            if(!_m_5){
                ps.setString(_m_3++,industry);
            }
            if(!_m6){
            	ps.setString(_m_3++,address);
            }
            _result.setPageSize(pageSize);
            ResultSet _pageRs = ps.executeQuery();
            try{
                _pageRs.next();
                _m_1 = _pageRs.getInt(1);
            }finally{
                try{_pageRs.close();}catch(Exception _m_8){}
            }
        }finally{
            try{ps.close();}catch(Exception _m_9){}
        }
        _result.setTotal(_m_1);
        if(0== _m_1){
            _result.setPageNo(1);
            _result.setData(Collections.<Resource>emptyList());
            return _result;
        }
        _m_3 = 1;
        boolean _m_10 = (1 == pageNo);
        if(_m_10){
            _result.setPageNo(1);
            sql = new StringBuilder();
            sql.append("SELECT RESOURCE_ID,RESOURCE_NAME,SUBJECT,INDUSTRY,SUPPORTED_SERVICES,DESCP,PROFESSOR_ID,"
            		+ " ASCRIPTION,HOPE_PAY_METHOD,COOPERATION_NOTES,CREATE_TIME,MODIFY_TIME FROM RESOURCE ");
            if(_m_6.length()>0){
                sql.append(_m_6);
            }
            sql.append(" ORDER BY RESOURCE_NAME");
            sql.append(" LIMIT ").append(pageSize);
        }else{
            int _m_11 = _m_1 / pageSize;
            if(_m_1 % pageSize != 0){
                ++_m_11;
            }
            if(pageNo > _m_11){
                pageNo = _m_11;
            }
            _result.setPageNo(pageNo);
            --pageNo;
            int _m_12 = (pageNo * pageSize);
            sql = new StringBuilder();
            sql.append("SELECT RESOURCE_ID,RESOURCE_NAME,SUBJECT,INDUSTRY,SUPPORTED_SERVICES,DESCP,PROFESSOR_ID,"
            		+ " ASCRIPTION,HOPE_PAY_METHOD,COOPERATION_NOTES,CREATE_TIME,MODIFY_TIME FROM RESOURCE ");
            if(_m_6.length()>0){
                sql.append(_m_6);
            }
            sql.append(" ORDER BY RESOURCE_NAME");
            sql.append(" LIMIT ").append(pageSize).append(" OFFSET ").append(_m_12);
        }
        ps = con.prepareStatement(sql.toString());
        try{
            if(!_m_2){
                ps.setString(_m_3++,key);
                ps.setString(_m_3++,key);
                ps.setString(_m_3++,key);
                ps.setString(_m_3++,key);
                ps.setString(_m_3++,key);
            }
            if(!_m_4){
                ps.setString(_m_3++,subject);
            }
            if(!_m_5){
                ps.setString(_m_3++,industry);
            }
            if(!_m6){
            	ps.setString(_m_3++,address);
            }
            ResultSet rs = ps.executeQuery();
            try{
                List<Resource> _m_13 = new ArrayList<Resource>();
                _result.setData(_m_13);
                int _m_14 = 0;
                while((_m_14<pageSize) && rs.next()){
                    ++_m_14;
                    Resource _obj =  new Resource();
                    _obj.setResourceId(rs.getString(1));
                    _obj.setResourceName(rs.getString(2));
                    String _m_15 = rs.getString(3);
                    if(rs.wasNull()){
                        _m_15 = null;
                    }
                    _obj.setSubject(_m_15);
                    String _m_16 = rs.getString(4);
                    if(rs.wasNull()){
                        _m_16 = null;
                    }
                    _obj.setIndustry(_m_16);
                    _obj.setSupportedServices(rs.getString(5));
                    String _m_17 = rs.getString(6);
                    if(rs.wasNull()){
                        _m_17 = null;
                    }
                    _obj.setDescp(_m_17);
                    _obj.setProfessorId(rs.getString(7));
                    _obj.setAscription(rs.getString(8));
                    _obj.setHopePayMethod(rs.getString(9));
                    String _m_18 = rs.getString(10);
                    if(rs.wasNull()){
                        _m_18 = null;
                    }
                    _obj.setCooperationNotes(_m_18);
                    _obj.setCreateTime(rs.getString(11));
                    _obj.setModifyTime(rs.getString(12));
                    List<Image> images = this.imageDao.queryRes(con, _obj.getResourceId());
                    _obj.setImages(images);
                    EditProfessor professor = this.professorDao.queryBaseInfo(con, _obj.getProfessorId());
                    _obj.setProfessor(professor);
                    _m_13.add(_obj);
                }
                return _result;
            }finally{
                try{rs.close();}catch(Exception _m_19){}
            }
        }finally{
            try{ps.close();}catch(Exception _m_20){}
        }
    }
	
	/**
	 * 分页查找所有资源，按资源名称排序
	 * @param key 查询内容（搜索框搜索内容-模糊查询）
@@ -363,9 +573,9 @@ public abstract class ResourceDao {
	 * @return
	 * @throws SQLException
	 */
	public org.jfw.util.PageQueryResult<Resource> queryPage(Connection con,String key,String subject,String industry,String address,int pageSize,int pageNo) throws SQLException{
	public PageQueryResult<Resource> queryPage(Connection con,String key,String subject,String industry,String address,int pageSize,int pageNo) throws SQLException{
        int _m_1 = 0;
        org.jfw.util.PageQueryResult<Resource> _result = new org.jfw.util.PageQueryResult<Resource>();
        PageQueryResult<Resource> _result = new PageQueryResult<Resource>();
        int _m_3 = 1;
        boolean _m_2 = null == key;
        boolean _m_4 = null == subject;

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

@@ -157,6 +157,15 @@ public class ResourceService {
		}
	}
	
	@Get
	@Path("/pqRes")
	public PageQueryResult<Resource> queryPageRes(@JdbcConn(false) Connection con, @Nullable String key, @Nullable String subject, @Nullable String industry, @Nullable String address, @DefaultValue("10") int pageSize, @DefaultValue("1") int pageNo) throws SQLException {
		if(key!=null) key="%"+key+"%";
		if(subject!=null) subject ="%"+subject+"%";
		if(industry!=null)industry="%"+industry+"%";
		return this.resourceDao.queryPageRes(con, key, subject, industry, address, pageSize, pageNo);
	}
	
	@Get
	@Path("/pq")
	public PageQueryResult<Resource> queryPage(@JdbcConn(false) Connection con, @Nullable String key, @Nullable String subject, @Nullable String industry, @Nullable String address, @DefaultValue("10") int pageSize, @DefaultValue("1") int pageNo) throws SQLException {