完善PC端首页搜索过滤条件。

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

@@ -863,7 +863,8 @@ public abstract class ProfessorDao {
			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 (professor.SUBJECT LIKE ?) "
					+ " OR (professor.INDUSTRY LIKE ?) OR (professor.ADDRESS LIKE ?))");
					+ " OR (professor.INDUSTRY LIKE ?) OR (professor.ADDRESS LIKE ?)"
					+ " OR (PROFESSOR.ID IN (SELECT PROFESSOR_ID FROM RESOURCE WHERE RESOURCE_NAME LIKE ?)) )");
		}
		boolean hasSubject = null != subject;
		boolean hasIndustry = null != industry;
@@ -899,6 +900,7 @@ public abstract class ProfessorDao {
				ps.setString(paramIndex++, key);
				ps.setString(paramIndex++, key);
				ps.setString(paramIndex++, key);
				ps.setString(paramIndex++, key);
			}
			if (hasSubject) {
				ps.setString(paramIndex++, subject);
@@ -977,6 +979,7 @@ public abstract class ProfessorDao {
				ps.setString(paramIndex++, key);
				ps.setString(paramIndex++, key);
				ps.setString(paramIndex++, key);
				ps.setString(paramIndex++, key);
			}
			if (hasSubject) {
				ps.setString(paramIndex++, subject);

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

@@ -123,7 +123,6 @@ public abstract class ResourceDao {
    }
	
	public Resource query(Connection con,String resourceId) throws SQLException{
        List<Image> images = this.imageDao.queryRes(con, resourceId);
		int _m_1 = 1;
        String sql = "SELECT RESOURCE_ID,RESOURCE_NAME,RESOURCE.SUBJECT,RESOURCE.INDUSTRY,"
        		+ " SUPPORTED_SERVICES,RESOURCE.DESCP,PROFESSOR_ID,ASCRIPTION,HOPE_PAY_METHOD,"
@@ -171,7 +170,6 @@ public abstract class ResourceDao {
                    _result.setModifyTime(rs.getString(12));
                    professor.setName(rs.getString(13));
                    _result.setProfessor(professor);
                    _result.setImages(images);
                    return _result;
                }else{
                    return null;
@@ -192,7 +190,6 @@ public abstract class ResourceDao {
	 * @throws SQLException
	 */
	public Resource queryInfo(Connection con,String resourceId) throws SQLException{
        List<Image> images = this.imageDao.queryRes(con, resourceId);
		int _m_1 = 1;
        String sql = "SELECT RESOURCE_ID,RESOURCE_NAME,SUBJECT,INDUSTRY,SUPPORTED_SERVICES,DESCP,PROFESSOR_ID,"
        		+ " ASCRIPTION,HOPE_PAY_METHOD,COOPERATION_NOTES,CREATE_TIME,MODIFY_TIME "
@@ -236,7 +233,6 @@ public abstract class ResourceDao {
                    _result.setCooperationNotes(_m_5);
                    _result.setCreateTime(rs.getString(11));
                    _result.setModifyTime(rs.getString(12));
                    _result.setImages(images);
                    return _result;
                }else{
                    return null;
@@ -349,8 +345,6 @@ public abstract class ResourceDao {
                    _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);
                    _m_8.add(_obj);
                }
                return _result;
@@ -448,8 +442,6 @@ public abstract class ResourceDao {
                    _obj.setCooperationNotes(_m_7);
                    _obj.setCreateTime(rs.getString(11));
                    _obj.setModifyTime(rs.getString(12));
                    List<Image> images = this.imageDao.queryRes(con, _obj.getResourceId());
                    _obj.setImages(images);
                    _result.add(_obj);
                }
                return _result;
@@ -511,8 +503,8 @@ public abstract class ResourceDao {
        	append("(RESOURCE.PROFESSOR_ID IN (SELECT PROFESSOR.ID FROM PROFESSOR WHERE PROFESSOR.ADDRESS LIKE ?))");
        }
        if(!_m7){
				sql.append(sql.length() > 0 ? " AND " : " WHERE ").
				append("(RESOURCE.PROFESSOR_ID IN (SELECT PROFESSOR.ID FROM PROFESSOR WHERE PROFESSOR.AUTH_TYPE = ?))");
			sql.append(sql.length() > 0 ? " AND " : " WHERE ").
			append("(RESOURCE.PROFESSOR_ID IN (SELECT PROFESSOR.ID FROM PROFESSOR WHERE PROFESSOR.AUTH_TYPE = ?))");
		}
        StringBuilder _m_6 = sql;
        sql = new StringBuilder();
@@ -681,7 +673,8 @@ public abstract class ResourceDao {
	 * @return 按搜索条件返回资源列表
	 * @throws SQLException
	 */
	public 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,Integer authType,int pageSize,int pageNo) throws SQLException{
        int _m_1 = 0;
        PageQueryResult<Resource> _result = new PageQueryResult<Resource>();
        int _m_3 = 1;
@@ -689,13 +682,17 @@ public abstract class ResourceDao {
        boolean _m_4 = null == subject;
        boolean _m_5 = null == industry;
        boolean _m6 = null == address;
        boolean _m7 = null == authType;
        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 ?))) ");
            		+ " 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){
@@ -721,6 +718,14 @@ public abstract class ResourceDao {
        		sql.append(" AND (RESOURCE.PROFESSOR_ID IN (SELECT PROFESSOR.ID FROM PROFESSOR WHERE PROFESSOR.ADDRESS LIKE ?)) ");
        	}
        }
        if(!_m7){
        	if(_m_7){
                _m_7 =  false;
                sql.append(" WHERE (RESOURCE.PROFESSOR_ID IN (SELECT PROFESSOR.ID FROM PROFESSOR WHERE PROFESSOR.AUTH_TYPE = ?)) ");
            }else{
                sql.append(" AND (RESOURCE.PROFESSOR_ID IN (SELECT PROFESSOR.ID FROM PROFESSOR WHERE PROFESSOR.AUTH_TYPE = ?)) ");
            }
		}
        StringBuilder _m_6 = sql;
        sql = new StringBuilder();
        sql.append(" SELECT COUNT(1) FROM RESOURCE ");
@@ -735,6 +740,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);
@@ -745,6 +752,9 @@ public abstract class ResourceDao {
            if(!_m6){
            	ps.setString(_m_3++,address);
            }
            if(!_m7){
            	ps.setInt(_m_3++, authType);
            }
            _result.setPageSize(pageSize);
            ResultSet _pageRs = ps.executeQuery();
            try{
@@ -810,6 +820,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);
@@ -820,6 +832,9 @@ public abstract class ResourceDao {
            if(!_m6){
            	ps.setString(_m_3++,address);
            }
            if(!_m7){
            	ps.setInt(_m_3++, authType);
            }
            ResultSet rs = ps.executeQuery();
            try{
                List<Resource> _m_13 = new ArrayList<Resource>();

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

@@ -153,7 +153,11 @@ public class ResourceService {
	@Get
	@Path("/{resourceId}")
	public Resource query(@JdbcConn Connection con, @PathVar String resourceId) throws SQLException {
		return this.resourceDao.query(con, resourceId);
		Resource resource = this.resourceDao.query(con, resourceId);
		if(resource != null){
			resource.setImages(this.imageDao.queryRes(con, resourceId));
		}
		return resource;
	}
	
	@Get
@@ -165,19 +169,34 @@ public class ResourceService {
			professor.setHasHeadImage(this.imageService.hasProfessorImage(professor.getId()));
		}
		resource.setProfessor(professor);
		resource.setImages(this.imageDao.queryRes(con, resourceId));
		return resource;
	}
	
	@Get
	@Path("/pqall")
	public PageQueryResult<Resource> queryPageAll(@JdbcConn Connection con, @DefaultValue("10") int pageSize, @DefaultValue("1") int pageNo) throws SQLException {
		return this.resourceDao.queryPageAll(con, pageSize, pageNo);
		PageQueryResult<Resource> queryResult = this.resourceDao.queryPageAll(con, pageSize, pageNo);
		List<Resource> resources = queryResult.getData();
		if(resources != null){
			for (Resource resource : resources) {
				resource.setImages(this.imageDao.queryRes(con, resource.getResourceId()));
			}
		}
		queryResult.setData(resources);
		return queryResult;
	}
	
	@Get
	@Path("/qapro")
	public List<Resource> queryPro(@JdbcConn Connection con, String professorId) throws SQLException {
		return this.resourceDao.queryPro(con, professorId);
		List<Resource> resources = this.resourceDao.queryPro(con, professorId);
		if(resources != null) {
			for (Resource resource : resources) {
				resource.setImages(this.imageDao.queryRes(con, resource.getResourceId()));
			}
		}
		return resources;
	}
	
	@Post
@@ -255,13 +274,13 @@ public class ResourceService {
	@Get
	@Path("/pq")
	public PageQueryResult<Resource> queryPage(@JdbcConn(false) Connection con, @Nullable String key, 
			@Nullable String subject, @Nullable String industry, @Nullable String address, 
			@Nullable String subject, @Nullable String industry, @Nullable String address,@Nullable Integer authType, 
			@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+"%";
		if(address!=null)address="%"+address+"%";
		PageQueryResult<Resource> queryResult = this.resourceDao.queryPage(con, key, subject, industry, address, pageSize, pageNo);
		PageQueryResult<Resource> queryResult = this.resourceDao.queryPage(con, key, subject, industry, address, authType, pageSize, pageNo);
		List<Resource> resources = queryResult.getData();
		if(resources != null){
			for (Resource resource : resources) {