资源搜索页面添加搜索条件(搜专家姓名和专家所属机构可以搜到资源)。

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

@@ -246,65 +246,12 @@ public abstract class ResourceDao {
            try{ps.close();}catch(Exception _m_17){}
        }
    }
	
//	public List<Resource> query(Connection con) throws SQLException{
//        String sql = "SELECT RESOURCE_ID,RESOURCE_NAME,RESOURCE.SUBJECT,RESOURCE.INDUSTRY,SUPPORTED_SERVICES,RESOURCE.DESCP,PROFESSOR_ID,ASCRIPTION,HOPE_PAY_METHOD,COOPERATION_NOTES,RESOURCE.CREATE_TIME,RESOURCE.MODIFY_TIME,PROFESSOR.NAME FROM RESOURCE LEFT JOIN PROFESSOR ON PROFESSOR_ID = PROFESSOR.ID ORDER BY RESOURCE_NAME ";
//        PreparedStatement ps = con.prepareStatement(sql);
//        try{
//            ResultSet rs = ps.executeQuery();
//            try{
//                List<Resource> _result = new ArrayList<Resource>();
//                while(rs.next()){
//                    Resource _obj =  new Resource();
//                    _obj.setResourceId(rs.getString(1));
//                    _obj.setResourceName(rs.getString(2));
//                    String _m_1 = rs.getString(3);
//                    if(rs.wasNull()){
//                        _m_1 = null;
//                    }
//                    _obj.setSubject(_m_1);
//                    String _m_2 = rs.getString(4);
//                    if(rs.wasNull()){
//                        _m_2 = null;
//                    }
//                    _obj.setIndustry(_m_2);
//                    _obj.setSupportedServices(rs.getString(5));
//                    String _m_3 = rs.getString(6);
//                    if(rs.wasNull()){
//                        _m_3 = null;
//                    }
//                    _obj.setDescp(_m_3);
//                    Professor professor = new Professor();
//                    professor.setId(rs.getString(7));
//                    _obj.setAscription(rs.getString(8));
//                    _obj.setHopePayMethod(rs.getString(9));
//                    String _m_4 = rs.getString(10);
//                    if(rs.wasNull()){
//                        _m_4 = null;
//                    }
//                    _obj.setCooperationNotes(_m_4);
//                    _obj.setCreateTime(rs.getString(11));
//                    _obj.setModifyTime(rs.getString(12));
//                    professor.setName(rs.getString(13));
//                    _obj.setProfessor(professor);
//                    List<Image> images = this.imageDao.queryRes(con, _obj.getResourceId());
//                    _obj.setImages(images);
//                    _result.add(_obj);
//                }
//                return _result;
//            }finally{
//                try{rs.close();}catch(Exception _m_5){}
//            }
//        }finally{
//            try{ps.close();}catch(Exception _m_6){}
//        }
//    }
	
		
	/**
	 * APP涓撳鎼滅储鍒楄〃閲屾樉绀轰笓瀹剁殑鎵€鏈夎祫婧愶紙鍙渶瑕佽祫婧怚D鍜屽悕绉帮級
	 * @param con 
	 * @param professorId 涓撳ID
	 * @return 杩斿洖褰撳墠涓撳鍙戝竷鐨勬墍鏈夎祫婧愶紝骞舵寜鎺掑簭
	 * APP专家搜索页面显示该专家所发布的资源信息
	 * @param con
	 * @param professorId 专家ID
	 * @return 返回该专家所发布的所有资源 按发布时间倒序
	 * @throws SQLException
	 */
	public List<Resource> queryList(Connection con,String professorId) throws SQLException{
@@ -331,10 +278,10 @@ public abstract class ResourceDao {
    }
	
	/**
	 * 鏌ヨ褰撳墠鐧诲綍涓撳鍙戝竷鐨勬墍鏈夎祫婧?
	 * 按专家ID查询发布的所有资源
	 * @param con
	 * @param professorId 涓撳ID
	 * @return 杩斿洖褰撳墠涓撳鍙戝竷鐨勬墍鏈夎祫婧愰泦鍚?
	 * @param professorId 专家ID
	 * @return 返回该专家发布的所有资源 按发布时间倒序
	 * @throws SQLException
	 */
	public List<Resource> queryPro(Connection con,String professorId) throws SQLException{
@@ -404,14 +351,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{
@@ -428,7 +375,9 @@ public abstract class ResourceDao {
            _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 ?))) ");
            		+ " OR (RESOURCE.PROFESSOR_ID IN (SELECT PROFESSOR.ID FROM PROFESSOR WHERE PROFESSOR.ADDRESS LIKE ? OR PROFESSOR.NAME LIKE ?))"
            		+ " OR (RESOURCE.PROFESSOR_ID IN (SELECT PROFESSOR.ID FROM PROFESSOR WHERE ORG_ID "
            		+ " IN(SELECT ORGANIZATION.ID FROM ORGANIZATION WHERE ORGANIZATION.NAME LIKE ?) )) ) ");
        }
        if(!_m_4){
            if(_m_7){
@@ -468,6 +417,8 @@ public abstract class ResourceDao {
                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);
@@ -535,6 +486,8 @@ public abstract class ResourceDao {
                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);
@@ -597,14 +550,14 @@ 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
	 * @return 按搜索条件返回资源列表
	 * @throws SQLException
	 */
	public PageQueryResult<Resource> queryPage(Connection con,String key,String subject,String industry,String address,int pageSize,int pageNo) throws SQLException{

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

@@ -107,12 +107,6 @@ public class ResourceService {
	public PageQueryResult<Resource> queryPageAll(@JdbcConn Connection con, @DefaultValue("10") int pageSize, @DefaultValue("1") int pageNo) throws SQLException {
		return this.resourceDao.queryPageAll(con, pageSize, pageNo);
	}
//	@Get
//	@Path("/qa")
//	public List<Resource> queryAll(@JdbcConn Connection con) throws SQLException {
//		return this.resourceDao.query(con);
//	}
	
	@Get
	@Path("/qapro")