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

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

@@ -1,13 +1,9 @@
package com.ekexiu.portal.dao;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import com.ekexiu.portal.po.Article;
import com.ekexiu.portal.po.ArticleWare;
import com.ekexiu.portal.pojo.FindInfo;
import com.ekexiu.portal.pojo.SelfArticle;
import org.jfw.apt.annotation.Nullable;
import org.jfw.apt.orm.annotation.dao.DAO;
import org.jfw.apt.orm.annotation.dao.Dynamic;
@@ -35,10 +31,13 @@ import org.jfw.apt.orm.annotation.dao.param.SqlColumn;
import org.jfw.apt.orm.core.defaultImpl.StringHandler;
import org.jfw.util.PageQueryResult;
import com.ekexiu.portal.po.Article;
import com.ekexiu.portal.po.ArticleWare;
import com.ekexiu.portal.pojo.FindInfo;
import com.ekexiu.portal.pojo.SelfArticle;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@DAO
public abstract class ArticleDao {
@@ -490,6 +489,102 @@ public abstract class ArticleDao {
					"SUBJECT LIKE ?" }, additional = 1) @Nullable String key,
			int pageSize, int pageNo) throws SQLException;
	public List<Article> indexSearch(Connection con, String key, long sortNum, String publishTime, String id, int rows) throws SQLException {
		int index = 1;
		List<Article> result = new ArrayList<>();
		StringBuilder sql = new StringBuilder();
		sql.append("SELECT ARTICLE_ID,PROFESSOR_ID,ARTICLE_TITLE,SUBJECT,INDUSTRY,PUBLISH_TIME,ARTICLE_IMG,ORG_ID,ARTICLE_TYPE,ARTICLE_AGREE,PAGE_VIEWS,STATUS,SHARE_ID,COL_NUM,CREATE_TIME,MODIFY_TIME,SORT_NUM FROM ARTICLE");
		sql.append(" WHERE STATUS = '1' AND ((SORT_NUM < ?) OR (SORT_NUM = ? AND PUBLISH_TIME < ?) OR (SORT_NUM= ? AND PUBLISH_TIME=? AND ARTICLE_ID <?)) ");
		if (key != null) {
			sql.append(" AND ((PROFESSOR_ID IN (SELECT ID FROM PROFESSOR WHERE NAME LIKE ?)) OR (ORG_ID IN (SELECT ID FROM ORGANIZATION WHERE NAME LIKE ? OR FOR_SHORT LIKE ?)) OR (ARTICLE_TITLE LIKE ?) OR (SUBJECT LIKE ?)) ");
		}
		sql.append(" ORDER BY SORT_NUM DESC,PUBLISH_TIME DESC,ARTICLE_ID DESC LIMIT ? ");
		PreparedStatement ps = con.prepareStatement(sql.toString());
		try {
			ps.setLong(index++, sortNum);
			ps.setLong(index++, sortNum);
			ps.setString(index++, publishTime);
			ps.setLong(index++, sortNum);
			ps.setString(index++, publishTime);
			ps.setString(index++, id);
			if (key != null) {
				ps.setString(index++, key);
				ps.setString(index++, key);
				ps.setString(index++, key);
				ps.setString(index++, key);
				ps.setString(index++, key);
			}
			ps.setInt(index++, rows);
			ResultSet rs = ps.executeQuery();
			try {
				while (rs.next()) {
					Article article = new Article();
					article.setArticleId(rs.getString(1));
					java.lang.String _m_12 = rs.getString(2);
					if (rs.wasNull()) {
						_m_12 = null;
					}
					article.setProfessorId(_m_12);
					article.setArticleTitle(rs.getString(3));
					java.lang.String _m_13 = rs.getString(4);
					if (rs.wasNull()) {
						_m_13 = null;
					}
					article.setSubject(_m_13);
					java.lang.String _m_14 = rs.getString(5);
					if (rs.wasNull()) {
						_m_14 = null;
					}
					article.setIndustry(_m_14);
					java.lang.String _m_15 = rs.getString(6);
					if (rs.wasNull()) {
						_m_15 = null;
					}
					article.setPublishTime(_m_15);
					java.lang.String _m_16 = rs.getString(7);
					if (rs.wasNull()) {
						_m_16 = null;
					}
					article.setArticleImg(_m_16);
					java.lang.String _m_17 = rs.getString(8);
					if (rs.wasNull()) {
						_m_17 = null;
					}
					article.setOrgId(_m_17);
					java.lang.String _m_18 = rs.getString(9);
					if (rs.wasNull()) {
						_m_18 = null;
					}
					article.setArticleType(_m_18);
					article.setArticleAgree(rs.getInt(10));
					article.setPageViews(rs.getInt(11));
					java.lang.String _m_19 = rs.getString(12);
					if (rs.wasNull()) {
						_m_19 = null;
					}
					article.setStatus(_m_19);
					article.setShareId(rs.getLong(13));
					article.setColNum(rs.getInt(14));
					article.setCreateTime(rs.getString(15));
					article.setModifyTime(rs.getString(16));
					article.setSortNum(rs.getInt(17));
					result.add(article);
				}
				return result;
			} finally {
				try {
					rs.close();
				} catch (Exception _m_20) {
				}
			}
		} finally {
			try {
				ps.close();
			} catch (Exception _m_21) {
			}
		}
	}
	// public PageQueryResult<Article> firstPageQuery(Connection con, String
	// key, int pageSize, int pageNo) throws SQLException {
	// int total = 0;

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

@@ -1,12 +1,8 @@
package com.ekexiu.portal.dao;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
import com.ekexiu.portal.basepo.BaseOrganization;
import com.ekexiu.portal.po.Organization;
import com.ekexiu.portal.pojo.EditOrganization;
import org.jfw.apt.annotation.Nullable;
import org.jfw.apt.orm.annotation.dao.Column;
import org.jfw.apt.orm.annotation.dao.DAO;
@@ -36,9 +32,12 @@ import org.jfw.apt.orm.annotation.dao.param.SqlColumn;
import org.jfw.apt.orm.core.defaultImpl.StringHandler;
import org.jfw.util.PageQueryResult;
import com.ekexiu.portal.basepo.BaseOrganization;
import com.ekexiu.portal.po.Organization;
import com.ekexiu.portal.pojo.EditOrganization;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
@DAO
public abstract class OrgDao {
@@ -219,6 +218,152 @@ public abstract class OrgDao {
					"(ID IN (SELECT ORG_ID FROM ARTICLE WHERE ARTICLE_TYPE='2' AND ARTICLE_TITLE LIKE ?) AND IS_JOIN ='1')" }) String kw,
			int pageSize, int pageNo) throws SQLException;
	public List<EditOrganization> indexSearch(Connection con, String kw,long sortNum,String modifyTime,String id,int rows)throws SQLException {
		int index = 1;
		StringBuilder sql = new StringBuilder();
		sql.append("SELECT FOR_SHORT,ORG_URL,FOUND_TIME,PROVINCE,CITY,SUBJECT,INDUSTRY,ORG_SIZE,QUALIFICATION,IS_JOIN,AUTH_STATUS,ADDR,EMAIL,CONTACT_NUM,FIELD_OF_CUSTOMER,FIELD_OF_SUPPLIER,SORT_NUM,PAGE_VIEWS,SHARE_ID,COL_MGR,RES_MGR,ORG_ATTR,ID,NAME,ORG_TYPE,CREATE_TIME,MODIFY_TIME,DESCP FROM ORGANIZATION");
		sql.append(" WHERE (SORT_NUM < ? OR (SORT_NUM = ? AND MODIFY_TIME < ?) OR (SORT_NUM = ? AND MODIFY_TIME = ? AND ID < ?)) ");
		if (kw != null) {
			sql.append(" AND ((ID IN (SELECT ORG_ID FROM ARTICLE WHERE ARTICLE_TYPE='2' AND ARTICLE_TITLE LIKE ?) AND IS_JOIN ='1') OR (ID IN (SELECT ORG_ID FROM RESOURCE WHERE RESOURCE_TYPE='2' AND RESOURCE_NAME LIKE ?) AND IS_JOIN ='1') OR (industry LIKE ?  AND IS_JOIN ='1') OR (SUBJECT LIKE ? AND IS_JOIN ='1') OR (DESCP LIKE ?  AND IS_JOIN ='1') OR (FOR_SHORT LIKE ? AND IS_JOIN ='1') OR (NAME LIKE ? AND IS_JOIN ='1')) ");
		}
		sql.append(" ORDER BY SORT_NUM DESC, MODIFY_TIME DESC LIMIT ? ");
		PreparedStatement ps = con.prepareStatement(sql.toString());
		try {
			ps.setLong(index++, sortNum);
			ps.setLong(index++, sortNum);
			ps.setString(index++, modifyTime);
			ps.setLong(index++, sortNum);
			ps.setString(index++, modifyTime);
			ps.setString(index++, id);
			if (kw != null) {
				ps.setString(index++, kw);
				ps.setString(index++, kw);
				ps.setString(index++, kw);
				ps.setString(index++, kw);
				ps.setString(index++, kw);
				ps.setString(index++, kw);
				ps.setString(index++, kw);
			}
			ps.setInt(index++, rows);
			ResultSet resultSet = ps.executeQuery();
			try {
				List<EditOrganization> orgs = new ArrayList<>();
				while (resultSet.next()) {
					EditOrganization organization = new EditOrganization();
					String forshort = resultSet.getString(1);
					if(resultSet.wasNull()){
						forshort = null;
					}
					organization.setForShort(forshort);
					String orgUrl = resultSet.getString(2);
					if(resultSet.wasNull()){
						orgUrl = null;
					}
					organization.setOrgUrl(orgUrl);
					String foundTime = resultSet.getString(3);
					if(resultSet.wasNull()){
						foundTime = null;
					}
					organization.setFoundTime(foundTime);
					String province = resultSet.getString(4);
					if(resultSet.wasNull()){
						province = null;
					}
					organization.setProvince(province);
					String city = resultSet.getString(5);
					if(resultSet.wasNull()){
						city = null;
					}
					organization.setCity(city);
					String subject = resultSet.getString(6);
					if(resultSet.wasNull()){
						subject = null;
					}
					organization.setSubject(subject);
					String industry = resultSet.getString(7);
					if(resultSet.wasNull()){
						industry = null;
					}
					organization.setIndustry(industry);
					String orgSize = resultSet.getString(8);
					if(resultSet.wasNull()){
						orgSize = null;
					}
					organization.setOrgSize(orgSize);
					String qualification = resultSet.getString(9);
					if(resultSet.wasNull()){
						qualification = null;
					}
					organization.setQualification(qualification);
					organization.setIsJoin(resultSet.getString(10));
					organization.setAuthStatus(resultSet.getString(11));
					String addr = resultSet.getString(12);
					if(resultSet.wasNull()){
						addr = null;
					}
					organization.setAddr(addr);
					String email = resultSet.getString(13);
					if(resultSet.wasNull()){
						email = null;
					}
					organization.setEmail(email);
					String contactNum = resultSet.getString(14);
					if(resultSet.wasNull()){
						contactNum = null;
					}
					organization.setContactNum(contactNum);
					String fieldOfCustomer = resultSet.getString(15);
					if(resultSet.wasNull()){
						fieldOfCustomer = null;
					}
					organization.setFieldOfCustomer(fieldOfCustomer);
					String fieldOfSupplier = resultSet.getString(16);
					if(resultSet.wasNull()){
						fieldOfSupplier = null;
					}
					organization.setFieldOfSupplier(fieldOfSupplier);
					organization.setSortNum(resultSet.getLong(17));
					organization.setPageViews(resultSet.getLong(18));
					organization.setShareId(resultSet.getLong(19));
					organization.setColMgr("1".equals(resultSet.getString(20)));
					organization.setResMgr("1".equals(resultSet.getString(21)));
					String orgAttr = resultSet.getString(22);
					if(resultSet.wasNull()){
						orgAttr = null;
					}
					organization.setOrgAttr(orgAttr);
					organization.setId(resultSet.getString(23));
					organization.setName(resultSet.getString(24));
					String orgType = resultSet.getString(25);
					if(resultSet.wasNull()){
						orgType = null;
					}
					organization.setOrgType(orgType);
					organization.setCreateTime(resultSet.getString(26));
					organization.setModifyTime(resultSet.getString(27));
					String descp = resultSet.getString(28);
					if(resultSet.wasNull()){
						descp = null;
					}
					organization.setDescp(descp);
					orgs.add(organization);
				}
				return orgs;
			} finally {
				try {
					resultSet.close();
				} catch (Exception e1) {
				}
			}
		} finally {
			try {
				ps.close();
			} catch (Exception e2) {
			}
		}
	}
	@PageQuery
	@Select(Organization.class)
	@From(Organization.class)

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

@@ -1,12 +1,7 @@
package com.ekexiu.portal.dao;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
import com.ekexiu.portal.po.Ppaper;
import com.ekexiu.portal.pojo.AssedPaper;
import org.jfw.apt.annotation.Nullable;
import org.jfw.apt.orm.annotation.dao.DAO;
import org.jfw.apt.orm.annotation.dao.method.Exclude;
@@ -27,8 +22,12 @@ import org.jfw.apt.orm.annotation.dao.param.SqlColumn;
import org.jfw.apt.orm.core.defaultImpl.FixLenStringHandler;
import org.jfw.util.PageQueryResult;
import com.ekexiu.portal.po.Ppaper;
import com.ekexiu.portal.pojo.AssedPaper;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
@DAO
public abstract class PpaperDao {
@@ -76,8 +75,88 @@ public abstract class PpaperDao {
	@OrderBy(" ORDER BY SORT_NUM DESC,CREATE_TIME DESC,ID DESC")
	@Or
	public abstract PageQueryResult<Ppaper> query(Connection con,@Alias({"name","authors","keywords","cn4periodical","en4periodical"}) @Like String cnt,int pageSize,int pageNo) throws SQLException;
	
	
	public List<Ppaper> indexSearch(Connection con, String key, long sortNum, String createTime, String id, int rows) throws SQLException {
		List<Ppaper> result = new ArrayList<>();
		StringBuilder sql = new StringBuilder();
		sql.append("SELECT AUTHORS,SORT_NUM,ID,NAME,PAGE_VIEWS,CN4PERIODICAL,EN4PERIODICAL,PERIODICALTYPE,PUB_DAY,KEYWORDS,REF_PARAM,SHARE_ID,CREATE_TIME FROM PPAPER");
		sql.append(" WHERE (SORT_NUM < ? OR (SORT_NUM = ? AND CREATE_TIME < ?) OR (SORT_NUM=? AND CREATE_TIME = ? AND ID < ?)) ");
		if (key != null) {
			sql.append(" AND (EN4PERIODICAL LIKE ? OR CN4PERIODICAL LIKE ? OR KEYWORDS LIKE ? OR AUTHORS LIKE ? OR NAME LIKE ?) ");
		}
		sql.append(" ORDER BY SORT_NUM DESC,CREATE_TIME DESC,ID DESC LIMIT ? ");
		PreparedStatement ps = con.prepareStatement(sql.toString());
		try {
			int index = 1;
			ps.setLong(index++, sortNum);
			ps.setLong(index++, sortNum);
			ps.setString(index++, createTime);
			ps.setLong(index++, sortNum);
			ps.setString(index++, createTime);
			ps.setString(index++, id);
			if (key != null) {
				ps.setString(index++, key);
				ps.setString(index++, key);
				ps.setString(index++, key);
				ps.setString(index++, key);
				ps.setString(index++, key);
			}
			ps.setInt(index++, rows);
			ResultSet rs = ps.executeQuery();
			try {
				while (rs.next()) {
					Ppaper ppaper = new Ppaper();
					ppaper.setAuthors(rs.getString(1));
					ppaper.setSortNum(rs.getLong(2));
					ppaper.setId(rs.getString(3));
					ppaper.setName(rs.getString(4));
					ppaper.setPageViews(rs.getLong(5));
					String cn4periodical = rs.getString(6);
					if (rs.wasNull()) {
						cn4periodical = null;
					}
					ppaper.setCn4periodical(cn4periodical);
					String en4periodical = rs.getString(7);
					if (rs.wasNull()) {
						en4periodical = null;
					}
					ppaper.setEn4periodical(en4periodical);
					String periodicaltype = rs.getString(8);
					if (rs.wasNull()) {
						periodicaltype = null;
					}
					ppaper.setPeriodicaltype(periodicaltype);
					ppaper.setPubDay(rs.getString(9));
					String keywords = rs.getString(10);
					if (rs.wasNull()) {
						keywords = null;
					}
					ppaper.setKeywords(keywords);
					String refParam = rs.getString(11);
					if (rs.wasNull()) {
						refParam = null;
					}
					ppaper.setRef_param(refParam);
					ppaper.setShareId(rs.getLong(12));
					ppaper.setCreateTime(rs.getString(13));
					result.add(ppaper);
				}
				return result;
			} finally {
				try {
					rs.close();
				} catch (Exception _m_16) {
				}
			}
		} finally {
			try {
				ps.close();
			} catch (Exception _m_17) {
			}
		}
	}
	@SelectOne
	@Nullable
	public abstract Ppaper query(Connection con,long shareId)throws SQLException;

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

@@ -1,12 +1,7 @@
package com.ekexiu.portal.dao;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
import com.ekexiu.portal.po.Ppatent;
import com.ekexiu.portal.pojo.AssedPatent;
import org.jfw.apt.annotation.Nullable;
import org.jfw.apt.orm.annotation.dao.DAO;
import org.jfw.apt.orm.annotation.dao.method.Exclude;
@@ -27,8 +22,12 @@ import org.jfw.apt.orm.annotation.dao.param.SqlColumn;
import org.jfw.apt.orm.core.defaultImpl.FixLenStringHandler;
import org.jfw.util.PageQueryResult;
import com.ekexiu.portal.po.Ppatent;
import com.ekexiu.portal.pojo.AssedPatent;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
@DAO
public abstract class PpatentDao {
@@ -79,6 +78,97 @@ public abstract class PpatentDao {
	public abstract PageQueryResult<Ppatent> query(Connection con, @Alias({ "code", "authors", "name", "keywords","reqPerson" }) @Like String cnt, int pageSize, int pageNo)
			throws SQLException;
	public List<Ppatent> indexSearch(Connection con, String key, long sortNum, String createTime, String id, int rows) throws SQLException {
		List<Ppatent> result = new ArrayList<>();
		StringBuilder sql = new StringBuilder();
		sql.append("SELECT AUTHORS,SORT_NUM,ID,NAME,PAGE_VIEWS,CODE,REQ_CODE,REQ_PERSON,REQ_DAY,PUB_DAY,REF_PARAM,KEYWORDS,SHARE_ID,CREATE_TIME FROM PPATENT");
		sql.append(" WHERE (SORT_NUM < ? OR (SORT_NUM = ? AND CREATE_TIME < ?) OR (SORT_NUM=? AND CREATE_TIME = ? AND ID < ?)) ");
		if (key != null) {
			sql.append(" AND (REQ_PERSON LIKE ? OR KEYWORDS LIKE ? OR NAME LIKE ? OR AUTHORS LIKE ? OR CODE LIKE ?) ");
		}
		sql.append("ORDER BY SORT_NUM DESC,CREATE_TIME DESC,ID DESC LIMIT ?");
		PreparedStatement ps = con.prepareStatement(sql.toString());
		try {
			int index = 1;
			ps.setLong(index++, sortNum);
			ps.setLong(index++, sortNum);
			ps.setString(index++, createTime);
			ps.setLong(index++, sortNum);
			ps.setString(index++, createTime);
			ps.setString(index++, id);
			if (key != null) {
				ps.setString(index++, key);
				ps.setString(index++, key);
				ps.setString(index++, key);
				ps.setString(index++, key);
				ps.setString(index++, key);
			}
			ps.setInt(index++, rows);
			ResultSet rs = ps.executeQuery();
			try {
				while (rs.next()) {
					Ppatent ppatent = new Ppatent();
					ppatent.setAuthors(rs.getString(1));
					ppatent.setSortNum(rs.getLong(2));
					ppatent.setId(rs.getString(3));
					ppatent.setName(rs.getString(4));
					ppatent.setPageViews(rs.getLong(5));
					String code = rs.getString(6);
					if (rs.wasNull()) {
						code = null;
					}
					ppatent.setCode(code);
					String reqCode = rs.getString(7);
					if (rs.wasNull()) {
						reqCode = null;
					}
					ppatent.setReqCode(reqCode);
					String reqPerson = rs.getString(8);
					if (rs.wasNull()) {
						reqPerson = null;
					}
					ppatent.setReqPerson(reqPerson);
					String reqDay = rs.getString(9);
					if (rs.wasNull()) {
						reqDay = null;
					}
					ppatent.setReqDay(reqDay);
					String pubDay = rs.getString(10);
					if (rs.wasNull()) {
						pubDay = null;
					}
					ppatent.setPubDay(pubDay);
					String refParam = rs.getString(11);
					if (rs.wasNull()) {
						refParam = null;
					}
					ppatent.setRef_param(refParam);
					String keyWords = rs.getString(12);
					if (rs.wasNull()) {
						keyWords = null;
					}
					ppatent.setKeywords(keyWords);
					ppatent.setShareId(rs.getLong(13));
					ppatent.setCreateTime(rs.getString(14));
					result.add(ppatent);
				}
				return result;
			} finally {
				try {
					rs.close();
				} catch (Exception _m_18) {
				}
			}
		} finally {
			try {
				ps.close();
			} catch (Exception _m_19) {
			}
		}
	}
	@SelectOne
	@Nullable
	public abstract Ppatent query(Connection con, long shareId) throws SQLException;

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

@@ -1,14 +1,11 @@
package com.ekexiu.portal.dao;
import java.math.BigDecimal;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import com.ekexiu.portal.po.Organization;
import com.ekexiu.portal.po.Professor;
import com.ekexiu.portal.pojo.EditProfessor;
import com.ekexiu.portal.pojo.ProfessorInfo;
import com.ekexiu.portal.pojo.SortedPro;
import com.ekexiu.portal.pojo.UserInfo;
import org.jfw.apt.annotation.DefaultValue;
import org.jfw.apt.annotation.Nullable;
import org.jfw.apt.orm.annotation.dao.Column;
@@ -20,6 +17,7 @@ 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.LimitQuery;
import org.jfw.apt.orm.annotation.dao.method.operator.PageSelect;
import org.jfw.apt.orm.annotation.dao.method.operator.QueryOne;
import org.jfw.apt.orm.annotation.dao.method.operator.QueryVal;
@@ -27,6 +25,7 @@ import org.jfw.apt.orm.annotation.dao.method.operator.SelectList;
import org.jfw.apt.orm.annotation.dao.method.operator.SelectOne;
import org.jfw.apt.orm.annotation.dao.method.operator.Update;
import org.jfw.apt.orm.annotation.dao.method.operator.UpdateWith;
import org.jfw.apt.orm.annotation.dao.param.GroupSqlColumn;
import org.jfw.apt.orm.annotation.dao.param.In;
import org.jfw.apt.orm.annotation.dao.param.LessThan;
import org.jfw.apt.orm.annotation.dao.param.Set;
@@ -37,11 +36,14 @@ import org.jfw.apt.orm.core.defaultImpl.StringHandler;
import org.jfw.util.PageQueryResult;
import org.jfw.util.exception.JfwBaseException;
import com.ekexiu.portal.po.Organization;
import com.ekexiu.portal.po.Professor;
import com.ekexiu.portal.pojo.EditProfessor;
import com.ekexiu.portal.pojo.ProfessorInfo;
import com.ekexiu.portal.pojo.UserInfo;
import java.math.BigDecimal;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@DAO
public abstract class ProfessorDao {
@@ -1386,6 +1388,13 @@ public abstract class ProfessorDao {
		}
	}
	@LimitQuery
	@OrderBy("ORDER BY sort_desc DESC ")
	public abstract List<SortedPro> indexSearch(Connection con,
											  @SqlColumn(handlerClass = StringHandler.class, value = {"(case when sort_first=0 then '00000' else TO_CHAR(sort_first,'00009') end || TO_CHAR(CEIL(star_level * 100),'0009') || p.id )< ? "}) String sortDesc, @Nullable @GroupSqlColumn(value = {
			"P.NAME LIKE ?", "O.NAME LIKE ?", "P.DEPARTMENT LIKE ?", "P.DESCP LIKE ?", "P.SUBJECT LIKE ?", "P.INDUSTRY LIKE ?", "P.ID IN (SELECT DISTINCT PROFESSOR_ID FROM RESEARCH_AREA WHERE CAPTION LIKE ?)", "P.ID IN (SELECT DISTINCT PROFESSOR_ID FROM RESOURCE WHERE RESOURCE_NAME LIKE ?)", "P.ID IN (SELECT DISTINCT PROFESSOR_ID FROM ARTICLE WHERE ARTICLE_TITLE LIKE ?)", "P.ID IN (SELECT DISTINCT PROFESSOR_ID FROM PAPER_AUTHOR WHERE PAPER_ID IN (SELECT ID FROM PPAPER WHERE NAME LIKE ?))", "P.ID IN (SELECT DISTINCT PROFESSOR_ID FROM PATENT_AUTHOR WHERE PATENT_ID IN (SELECT ID FROM PPATENT WHERE NAME LIKE ?))"
	}, handlerClass = StringHandler.class, isAnd = false) String key, @Nullable String subject, @Nullable String industry, @Nullable String address, @Nullable Integer authType, int rows) throws SQLException;
	/**
	 * 分页查询专家基础信息，多条件查询专家列表。
	 * 

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

@@ -1,13 +1,9 @@
package com.ekexiu.portal.dao;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import com.ekexiu.portal.po.Image;
import com.ekexiu.portal.po.Professor;
import com.ekexiu.portal.po.Resource;
import com.ekexiu.portal.pojo.EditProfessor;
import org.jfw.apt.annotation.Autowrie;
import org.jfw.apt.annotation.Nullable;
import org.jfw.apt.orm.annotation.dao.DAO;
@@ -29,10 +25,13 @@ import org.jfw.apt.orm.annotation.dao.param.Like;
import org.jfw.apt.orm.annotation.dao.param.Set;
import org.jfw.util.PageQueryResult;
import com.ekexiu.portal.po.Image;
import com.ekexiu.portal.po.Professor;
import com.ekexiu.portal.po.Resource;
import com.ekexiu.portal.pojo.EditProfessor;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@DAO
public abstract class ResourceDao {
@@ -1324,8 +1323,142 @@ public abstract class ResourceDao {
            try{ps.close();}catch(Exception e4){}
        }
    }
	
	/**
    public List<Resource> indexSearch(Connection con, String key, long sortNum, String modifyTime, String id, int rows)throws SQLException {
        List<Resource> result = new ArrayList<>();
        StringBuilder sql = new StringBuilder();
        sql.append("SELECT RESOURCE_ID,RESOURCE_NAME,SUBJECT,INDUSTRY,SUPPORTED_SERVICES,ORG_NAME,SPEC,PARAMETER,STATUS,DESCP,PROFESSOR_ID,ASCRIPTION,HOPE_PAY_METHOD,COOPERATION_NOTES,PUBLISH_TIME,PAGE_VIEWS,COMP,RESOURCE_TYPE,ORG_ID,SHARE_ID,CREATE_TIME,MODIFY_TIME,SORT_NUM FROM RESOURCE");
        sql.append(" WHERE STATUS='1' AND ((SORT_NUM < ?) OR (SORT_NUM = ? AND PUBLISH_TIME < ?) OR (SORT_NUM=? AND PUBLISH_TIME = ? AND RESOURCE_ID < ?)) ");
        if (key != null) {
            sql.append(" AND (PROFESSOR_ID IN (SELECT ID FROM PROFESSOR WHERE NAME LIKE ?) OR ORG_ID IN (SELECT ID FROM ORGANIZATION WHERE NAME LIKE ? OR FOR_SHORT LIKE ?) OR RESOURCE_NAME LIKE ? OR SUBJECT LIKE ? OR SUPPORTED_SERVICES LIKE ? OR ORG_NAME LIKE ? OR SPEC LIKE ?) ");
        }
        sql.append(" ORDER BY SORT_NUM DESC,PUBLISH_TIME DESC,RESOURCE_ID DESC LIMIT ? ");
        PreparedStatement ps = con.prepareStatement(sql.toString());
        try {
            int index = 1;
            ps.setLong(index++,sortNum);
            ps.setLong(index++,sortNum);
            ps.setString(index++, modifyTime);
            ps.setLong(index++, sortNum);
            ps.setString(index++, modifyTime);
            ps.setString(index++, id);
            if (key != null) {
                ps.setString(index++,key);
                ps.setString(index++,key);
                ps.setString(index++,key);
                ps.setString(index++,key);
                ps.setString(index++,key);
                ps.setString(index++,key);
                ps.setString(index++,key);
                ps.setString(index++,key);
            }
            ps.setInt(index++,rows);
            ResultSet rs = ps.executeQuery();
            try {
                while (rs.next()) {
                    Resource resource =  new Resource();
                    resource.setResourceId(rs.getString(1));
                    resource.setResourceName(rs.getString(2));
                    String subject = rs.getString(3);
                    if(rs.wasNull()){
                        subject = null;
                    }
                    resource.setSubject(subject);
                    String indeustry = rs.getString(4);
                    if(rs.wasNull()){
                        indeustry = null;
                    }
                    resource.setIndustry(indeustry);
                    resource.setSupportedServices(rs.getString(5));
                    String orgName = rs.getString(6);
                    if(rs.wasNull()){
                        orgName = null;
                    }
                    resource.setOrgName(orgName);
                    String spec = rs.getString(7);
                    if(rs.wasNull()){
                        spec = null;
                    }
                    resource.setSpec(spec);
                    String parameter = rs.getString(8);
                    if(rs.wasNull()){
                        parameter = null;
                    }
                    resource.setParameter(parameter);
                    String status = rs.getString(9);
                    if(rs.wasNull()){
                        status = null;
                    }
                    resource.setStatus(status);
                    String descp = rs.getString(10);
                    if(rs.wasNull()){
                        descp = null;
                    }
                    resource.setDescp(descp);
                    String professorId = rs.getString(11);
                    if(rs.wasNull()){
                        professorId = null;
                    }
                    resource.setProfessorId(professorId);
                    String ascription = rs.getString(12);
                    if(rs.wasNull()){
                        ascription = null;
                    }
                    resource.setAscription(ascription);
                    String payMethod = rs.getString(13);
                    if(rs.wasNull()){
                        payMethod = null;
                    }
                    resource.setHopePayMethod(payMethod);
                    String cooperationNotes = rs.getString(14);
                    if(rs.wasNull()){
                        cooperationNotes = null;
                    }
                    resource.setCooperationNotes(cooperationNotes);
                    String publishTime = rs.getString(15);
                    if(rs.wasNull()){
                        publishTime = null;
                    }
                    resource.setPublishTime(publishTime);
                    resource.setPageViews(rs.getInt(16));
                    String comp = rs.getString(17);
                    if(rs.wasNull()){
                        comp = null;
                    }
                    resource.setComp(comp);
                    String resourceType = rs.getString(18);
                    if(rs.wasNull()){
                        resourceType = null;
                    }
                    resource.setResourceType(resourceType);
                    String orgId = rs.getString(19);
                    if(rs.wasNull()){
                        orgId = null;
                    }
                    resource.setOrgId(orgId);
                    resource.setShareId(rs.getLong(20));
                    resource.setCreateTime(rs.getString(21));
                    resource.setModifyTime(rs.getString(22));
                    resource.setSortNum(rs.getInt(23));
                    result.add(resource);
                }
                return result;
            }finally {
                try {
                    rs.close();
                } catch (Exception _m_8) {
                }
            }
        }finally {
            try {
                ps.close();
            } catch (Exception _m_9) {
            }
        }
    }
    /**
	 * 资源搜索页面接口，添加资源拥有者基本信息
	 * @param key 搜索条件
	 * @param subject 学术领域

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

@@ -5,6 +5,7 @@ import org.jfw.apt.orm.annotation.entry.PrimaryKey;
import org.jfw.apt.orm.annotation.entry.Table;
import org.jfw.apt.orm.core.defaultImpl.FixLenStringHandler;
import org.jfw.apt.orm.core.defaultImpl.IntHandler;
import org.jfw.apt.orm.core.defaultImpl.LongHandler;
import org.jfw.apt.orm.core.enums.DE;
import com.ekexiu.portal.basepo.CreateTimeSupported;
@@ -35,6 +36,10 @@ public class Article implements CreateTimeSupported, ModifyTimeSupported {
	private Organization organization;
	private EditOrganization editOrganization;
	private int colNum;
	/**
	 * 排序字段
	 */
	private long sortNum;
	
	public EditProfessor getProfessor() {
		return professor;
@@ -171,4 +176,11 @@ public class Article implements CreateTimeSupported, ModifyTimeSupported {
	public void setColNum(int colNum) {
		this.colNum = colNum;
	}
	@Column(handlerClass=LongHandler.class,dbType="BIGINT",fixSqlValueWithInsert="0",insertable=true,renewable=false,nullable=false,queryable=true)
	public long getSortNum() {
		return sortNum;
	}
	public void setSortNum(long sortNum) {
		this.sortNum = sortNum;
	}
}

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

@@ -1,19 +1,19 @@
package com.ekexiu.portal.po;
import java.util.List;
import com.ekexiu.portal.basepo.CreateTimeSupported;
import com.ekexiu.portal.basepo.ModifyTimeSupported;
import com.ekexiu.portal.pojo.EditOrganization;
import com.ekexiu.portal.pojo.EditProfessor;
import org.jfw.apt.orm.annotation.entry.Column;
import org.jfw.apt.orm.annotation.entry.PrimaryKey;
import org.jfw.apt.orm.annotation.entry.Table;
import org.jfw.apt.orm.core.defaultImpl.FixLenStringHandler;
import org.jfw.apt.orm.core.defaultImpl.IntHandler;
import org.jfw.apt.orm.core.defaultImpl.LongHandler;
import org.jfw.apt.orm.core.defaultImpl.StringHandler;
import org.jfw.apt.orm.core.enums.DE;
import com.ekexiu.portal.basepo.CreateTimeSupported;
import com.ekexiu.portal.basepo.ModifyTimeSupported;
import com.ekexiu.portal.pojo.EditOrganization;
import com.ekexiu.portal.pojo.EditProfessor;
import java.util.List;
@PrimaryKey("resourceId")
@Table
@@ -78,6 +78,10 @@ public class Resource implements CreateTimeSupported, ModifyTimeSupported{
	private String orgId;
	
	private long shareId;
	/**
	 * 排序字段
	 */
	private long sortNum;
	
	public List<Image> getImages() {
		return images;
@@ -278,6 +282,14 @@ public class Resource implements CreateTimeSupported, ModifyTimeSupported{
	public void setShareId(long shareId) {
		this.shareId = shareId;
	}
	@Column(handlerClass=LongHandler.class,dbType="BIGINT",fixSqlValueWithInsert="0",insertable=true,renewable=false,nullable=false,queryable=true)
	public long getSortNum() {
		return sortNum;
	}
	public void setSortNum(long sortNum) {
		this.sortNum = sortNum;
	}
	
	
}

src/main/java/com/ekexiu/portal/pojo/SortedPro.java

@@ -0,0 +1,55 @@
package com.ekexiu.portal.pojo;
import com.ekexiu.portal.po.Professor;
import com.ekexiu.portal.po.ResearchArea;
import org.jfw.apt.orm.annotation.entry.CalcColumn;
import org.jfw.apt.orm.annotation.entry.ExtendView;
import org.jfw.apt.orm.core.defaultImpl.StringHandler;
import java.util.List;
/**
 * Created by TT on 2018/3/8.
 */
@ExtendView(fromSentence = "Professor p left join organization o on p.org_id = o.id",tableAlias = "p")
public class SortedPro extends Professor {
    private String sortDesc;
    private String orgName;
    private Integer hasHeadImage;
    private List<ResearchArea> researchAreas;
    @CalcColumn(nullable = false,handlerClass = StringHandler.class,column = "case when sort_first = 0 then '00000' else TO_CHAR(sort_first,'00009') end || TO_CHAR(CEIL(star_level * 100),'0009') || p.id sort_desc ")
    public String getSortDesc() {
        return sortDesc;
    }
    public void setSortDesc(String sortDesc) {
        this.sortDesc = sortDesc;
    }
    @CalcColumn(handlerClass = StringHandler.class, column = "o.name")
    public String getOrgName() {
        return orgName;
    }
    public void setOrgName(String orgName) {
        this.orgName = orgName;
    }
    public Integer getHasHeadImage() {
        return hasHeadImage;
    }
    public void setHasHeadImage(Integer hasHeadImage) {
        this.hasHeadImage = hasHeadImage;
    }
    public List<ResearchArea> getResearchAreas() {
        return researchAreas;
    }
    public void setResearchAreas(List<ResearchArea> researchAreas) {
        this.researchAreas = researchAreas;
    }
}

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

@@ -962,6 +962,33 @@ public class ArticleService {
		return queryResult;
	}
	@Get
	@Path("/index/search")
	public List<Article> indexSearch(@JdbcConn Connection con, @Nullable String key, @DefaultValue("Long.MAX_VALUE") long sortNum, @DefaultValue("\"9\"") String publishTime, @DefaultValue("\"G\"") String id, @DefaultValue("10000000") int rows) throws SQLException {
		if (key != null) {
			key = "%" + key + "%";
		}
		List<Article> articles = this.articleDao.indexSearch(con, key, sortNum, publishTime, id, rows);
		if (!articles.isEmpty()) {
			for (Article article : articles) {
				if ("1".equals(article.getArticleType())) {
					EditProfessor professor = this.professorDao.queryBaseInfo(con, article.getProfessorId());
					if (professor != null) {
						professor.setHasHeadImage(this.imageService.hasProfessorImage(professor.getId()));
					}
					article.setProfessor(professor);
				} else if ("2".equals(article.getArticleType())) {
					EditOrganization organization = this.orgDao.queryEditOrg(con, article.getOrgId());
					if (organization != null) {
						organization.setHasOrgLogo(this.imageService.hasOrgLogo(organization.getId()));
					}
					article.setEditOrganization(organization);
				}
			}
		}
		return articles;
	}
	@Get
	@Path("/pqself")
	public PageQueryResult<SelfArticle> queryPageSelf(@JdbcConn Connection con, @Nullable String professorId, @Nullable String orgId,

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

@@ -1,11 +1,10 @@
package com.ekexiu.portal.service;
import java.io.IOException;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.Collections;
import java.util.List;
import com.ekexiu.portal.dao.OrgDao;
import com.ekexiu.portal.dao.OrgRegInfoDao;
import com.ekexiu.portal.po.OrgRegInfo;
import com.ekexiu.portal.po.Organization;
import com.ekexiu.portal.pojo.EditOrganization;
import org.jfw.apt.annotation.Autowrie;
import org.jfw.apt.annotation.DefaultValue;
import org.jfw.apt.annotation.Nullable;
@@ -17,11 +16,11 @@ import org.jfw.apt.web.annotation.param.PathVar;
import org.jfw.util.PageQueryResult;
import org.jfw.util.StringUtil;
import com.ekexiu.portal.dao.OrgDao;
import com.ekexiu.portal.dao.OrgRegInfoDao;
import com.ekexiu.portal.po.OrgRegInfo;
import com.ekexiu.portal.po.Organization;
import com.ekexiu.portal.pojo.EditOrganization;
import java.io.IOException;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.Collections;
import java.util.List;
@Path("/org")
public class OrgService {
@@ -245,6 +244,19 @@ public class OrgService {
		}
		return pqr;
	}
	@Get
	@Path("/index/search")
	public List<EditOrganization> indexSearch(@JdbcConn Connection con, @Nullable String key, @DefaultValue("Long.MAX_VALUE") long sortNum, @DefaultValue("\"9\"") String modifyTime,@DefaultValue("\"Z\"")String id, @DefaultValue("10000000") int rows)throws SQLException {
		if (key != null) {
			key = "%" + key + "%";
		}
		List<EditOrganization> orgs = this.orgDao.indexSearch(con,key,sortNum,modifyTime,id,rows);
		for (EditOrganization organization : orgs) {
			organization.setHasOrgLogo(this.imageService.hasOrgLogo(organization.getId()));
		}
		return orgs;
	}
	@Get
	@Path("/qm")
	public List<EditOrganization> query(@JdbcConn Connection con,String[] id)throws SQLException{

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

@@ -143,6 +143,15 @@ public class PpaperService {
		return null == qw ? this.ppaperDao.query(con, pageSize, pageNo) : this.ppaperDao.query(con, "%" + qw + "%", pageSize, pageNo);
	}
	@Get
	@Path("/index/search")
	public List<Ppaper> indexSearch(@JdbcConn Connection con, @Nullable String key, @DefaultValue("Long.MAX_VALUE") long sortNum, @DefaultValue("\"9\"") String createTime,@DefaultValue("\"G\"")String id, @DefaultValue("10000000") int rows)throws SQLException {
		if (key != null) {
			key = "%" + key + "%";
		}
		return this.ppaperDao.indexSearch(con, key, sortNum, createTime, id, rows);
	}
	/**
	 * 
	 * @param con

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

@@ -145,6 +145,15 @@ public class PpatentServcie {
			throws SQLException {
		return null == qw ? this.ppatentDao.query(con, pageSize, pageNo) : this.ppatentDao.query(con, "%" + qw + "%", pageSize, pageNo);
	}
	@Get
	@Path("/index/search")
	public List<Ppatent> indexSearch(@JdbcConn Connection con, @Nullable String key, @DefaultValue("Long.MAX_VALUE") long sortNum, @DefaultValue("\"9\"") String createTime,@DefaultValue("\"G\"")String id, @DefaultValue("10000000") int rows)throws SQLException {
		if (key != null) {
			key = "%" + key + "%";
		}
		return this.ppatentDao.indexSearch(con, key, sortNum, createTime,id, rows);
	}
	/**
	 * 
	 * @param con

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

@@ -1,35 +1,5 @@
package com.ekexiu.portal.service;
import java.io.IOException;
import java.math.BigDecimal;
import java.net.URLEncoder;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.jfw.apt.annotation.Autowrie;
import org.jfw.apt.annotation.DefaultValue;
import org.jfw.apt.annotation.Nullable;
import org.jfw.apt.web.annotation.Path;
import org.jfw.apt.web.annotation.operate.Delete;
import org.jfw.apt.web.annotation.operate.Get;
import org.jfw.apt.web.annotation.operate.Post;
import org.jfw.apt.web.annotation.operate.Put;
import org.jfw.apt.web.annotation.param.JdbcConn;
import org.jfw.apt.web.annotation.param.PathVar;
import org.jfw.apt.web.annotation.param.RequestBody;
import org.jfw.util.PageQueryResult;
import org.jfw.util.StringUtil;
import org.jfw.util.jdbc.JdbcUtil;
import org.jfw.util.jdbc.PreparedStatementConfig;
import com.ekexiu.portal.dao.ArticleDao;
import com.ekexiu.portal.dao.DemandDao;
import com.ekexiu.portal.dao.HonorDao;
@@ -55,8 +25,38 @@ import com.ekexiu.portal.po.User;
import com.ekexiu.portal.pojo.EditProfessor;
import com.ekexiu.portal.pojo.EditResearchAreaLog;
import com.ekexiu.portal.pojo.ProfessorInfo;
import com.ekexiu.portal.pojo.SortedPro;
import com.ekexiu.portal.pojo.UserInfo;
import com.ekexiu.portal.util.Calculate;
import org.jfw.apt.annotation.Autowrie;
import org.jfw.apt.annotation.DefaultValue;
import org.jfw.apt.annotation.Nullable;
import org.jfw.apt.web.annotation.Path;
import org.jfw.apt.web.annotation.operate.Delete;
import org.jfw.apt.web.annotation.operate.Get;
import org.jfw.apt.web.annotation.operate.Post;
import org.jfw.apt.web.annotation.operate.Put;
import org.jfw.apt.web.annotation.param.JdbcConn;
import org.jfw.apt.web.annotation.param.PathVar;
import org.jfw.apt.web.annotation.param.RequestBody;
import org.jfw.util.PageQueryResult;
import org.jfw.util.StringUtil;
import org.jfw.util.jdbc.JdbcUtil;
import org.jfw.util.jdbc.PreparedStatementConfig;
import java.io.IOException;
import java.math.BigDecimal;
import java.net.URLEncoder;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@Path("/professor")
public class ProfessorService {
@@ -761,6 +761,37 @@ public class ProfessorService {
		return queryResult;
	}
	@Get
	@Path("/index/search")
	public List<SortedPro> searchPro(@JdbcConn(false) Connection con, @Nullable String key, @Nullable String subject,
									 @Nullable String industry, @Nullable String address, @Nullable Integer authType, @DefaultValue("99999") int sortFirst, @DefaultValue("\"Z\"")String id, @DefaultValue("0")double starLevel, @DefaultValue("10000000") int rows)
			throws SQLException {
		if (key != null) {
			key = "%" + key + "%";
		}
		if (subject != null) {
			subject = "%" + subject + "%";
		}
		if (null != industry) {
			industry = "%" + industry + "%";
		}
		if (null != address) {
			address = "%" + address + "%";
		}
		String sortDesc = "000000"+ sortFirst;
		String a =  "0000" + (int)(starLevel*100);
		sortDesc = sortDesc.substring(sortDesc.length()-5)+a.substring(a.length()-4)+id;
		List<SortedPro> queryResult = this.professorDao.indexSearch(con,sortDesc, key, subject, industry, address, authType,rows );
		if (!queryResult.isEmpty()) {
			for (SortedPro editProfessor : queryResult) {
				editProfessor.setHasHeadImage(this.imageService.hasProfessorImage(editProfessor.getId()));
				editProfessor.setResearchAreas(this.researchAreaDao.query(con, editProfessor.getId()));
			}
			hiddenPrivacyInfo(queryResult);
		}
		return queryResult;
	}
	@Get
	@Path("/pqUserInfo")
	public PageQueryResult<UserInfo> queryUserInfo(@JdbcConn(false) Connection con, @Nullable String key, @Nullable String address, @Nullable String orgName,

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

@@ -1,26 +1,5 @@
package com.ekexiu.portal.service;
import java.io.IOException;
import java.sql.Connection;
import java.sql.SQLException;
import java.text.SimpleDateFormat;
import java.util.Collections;
import java.util.Date;
import java.util.List;
import org.jfw.apt.annotation.Autowrie;
import org.jfw.apt.annotation.DefaultValue;
import org.jfw.apt.annotation.Nullable;
import org.jfw.apt.web.annotation.Path;
import org.jfw.apt.web.annotation.operate.Delete;
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.PageQueryResult;
import org.jfw.util.StringUtil;
import org.jfw.util.exception.JfwBaseException;
import com.ekexiu.portal.dao.ArticleDao;
import com.ekexiu.portal.dao.ArticleResDao;
import com.ekexiu.portal.dao.ImageDao;
@@ -39,6 +18,26 @@ import com.ekexiu.portal.po.Resource;
import com.ekexiu.portal.po.ResourceTmpLog;
import com.ekexiu.portal.pojo.EditOrganization;
import com.ekexiu.portal.pojo.EditProfessor;
import org.jfw.apt.annotation.Autowrie;
import org.jfw.apt.annotation.DefaultValue;
import org.jfw.apt.annotation.Nullable;
import org.jfw.apt.web.annotation.Path;
import org.jfw.apt.web.annotation.operate.Delete;
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.PageQueryResult;
import org.jfw.util.StringUtil;
import org.jfw.util.exception.JfwBaseException;
import java.io.IOException;
import java.sql.Connection;
import java.sql.SQLException;
import java.text.SimpleDateFormat;
import java.util.Collections;
import java.util.Date;
import java.util.List;
@Path("/resource")
public class ResourceService {
@@ -946,6 +945,34 @@ public class ResourceService {
		}
		return queryResult;
	}
	@Get
	@Path("/index/search")
	public List<Resource> indexSearch(@JdbcConn Connection con, @Nullable String key, @DefaultValue("Long.MAX_VALUE") long sortNum, @DefaultValue("\"9\"") String publishTime,@DefaultValue("\"G\"")String id, @DefaultValue("10000000") int rows)throws SQLException {
		if (key != null) {
			key = "%" + key + "%";
		}
		List<Resource> resources =  this.resourceDao.indexSearch(con, key, sortNum, publishTime,id, rows);
		if(!resources.isEmpty()){
			for (Resource resource : resources) {
				resource.setImages(this.imagesService.queryRes(con, resource.getResourceId()));
				if(resource.getProfessorId() != null){
					EditProfessor professor = this.professorDao.queryBaseInfo(con, resource.getProfessorId());
					if(professor != null){
						professor.setHasHeadImage(this.imageService.hasProfessorImage(professor.getId()));
					}
					resource.setEditProfessor(professor);
				}else if(resource.getOrgId() != null){
					EditOrganization organization = this.orgDao.queryEditOrg(con, resource.getOrgId());
					if(organization != null){
						organization.setHasOrgLogo(this.imageService.hasOrgLogo(organization.getId()));
					}
					resource.setOrganization(organization);
				}
			}
		}
		return resources;
	}
	
	@Get
	@Path("/pqRes")

src/main/java/com/ekexiu/portal/ware/WareDao.java

@@ -1,17 +1,10 @@
package com.ekexiu.portal.ware;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
import org.jfw.apt.annotation.DefaultValue;
import org.jfw.apt.annotation.Nullable;
import org.jfw.apt.orm.annotation.dao.Column;
import org.jfw.apt.orm.annotation.dao.DAO;
import org.jfw.apt.orm.annotation.dao.method.From;
import org.jfw.apt.orm.annotation.dao.method.IncludeFixSet;
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;
@@ -33,10 +26,13 @@ import org.jfw.apt.orm.annotation.dao.param.SqlColumn;
import org.jfw.apt.orm.annotation.dao.param.UnEquals;
import org.jfw.apt.orm.core.defaultImpl.LongHandler;
import org.jfw.apt.orm.core.defaultImpl.StringHandler;
import org.jfw.apt.web.annotation.method.SetCookie;
import org.jfw.util.PageQueryResult;
import com.ekexiu.portal.question.Answer;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
@DAO
public abstract class WareDao {
@@ -122,7 +118,7 @@ public abstract class WareDao {
	public abstract List<Ware> queryPublish(Connection con, String category, String owner, @LessThan String modifyTime, int rows) throws SQLException;
	@PageSelect
	@OrderBy("OrderBy STATE DESC,MODIFY_TIMDE DESC")
	@OrderBy("ORDER By STATE DESC,MODIFY_TIME DESC")
	@Where("(STATE='1' OR STATE ='2') AND CATEGORY='1'")
	public abstract PageQueryResult<Ware> pageQuery(Connection con,
			@Nullable @GroupSqlColumn(handlerClass = StringHandler.class, value = { "NAME LIKE ?", "CNT LIKE ?", "KEYWORDS LIKE ?" }, isAnd = false) String key,