Merge remote-tracking branch 'origin/dev' into test

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

@@ -5,6 +5,7 @@ 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 org.jfw.apt.annotation.Nullable;
@@ -12,7 +13,6 @@ import org.jfw.apt.orm.annotation.dao.DAO;
import org.jfw.apt.orm.annotation.dao.Dynamic;
import org.jfw.apt.orm.annotation.dao.method.Exclude;
import org.jfw.apt.orm.annotation.dao.method.From;
import org.jfw.apt.orm.annotation.dao.method.Or;
import org.jfw.apt.orm.annotation.dao.method.OrderBy;
import org.jfw.apt.orm.annotation.dao.method.SetSentence;
import org.jfw.apt.orm.annotation.dao.method.Where;
@@ -31,11 +31,11 @@ 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.Like;
import org.jfw.apt.orm.annotation.dao.param.Set;
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.pojo.FindInfo;
import com.ekexiu.portal.pojo.SelfArticle;
@DAO
@@ -476,375 +476,384 @@ public abstract class ArticleDao {
	@OrderBy(" ORDER BY SORT_NUM DESC, PUBLISH_TIME DESC")
	@Where("STATUS = '1'")
	public abstract PageQueryResult<Article> firstPageQuery(Connection con,
			@GroupSqlColumn(isAnd=false, handlerClass = StringHandler.class, value = { "PROFESSOR_ID IN (SELECT ID FROM PROFESSOR WHERE NAME LIKE ?)",
					"ORG_ID IN (SELECT ID FROM ORGANIZATION WHERE NAME LIKE ? OR FOR_SHORT LIKE ?) ",
					 "ARTICLE_TITLE LIKE ?",
					"SUBJECT LIKE ?" },additional=1) @Nullable String key,
			@GroupSqlColumn(isAnd = false, handlerClass = StringHandler.class, value = { "PROFESSOR_ID IN (SELECT ID FROM PROFESSOR WHERE NAME LIKE ?)",
					"ORG_ID IN (SELECT ID FROM ORGANIZATION WHERE NAME LIKE ? OR FOR_SHORT LIKE ?) ", "ARTICLE_TITLE LIKE ?",
					"SUBJECT LIKE ?" }, additional = 1) @Nullable String key,
			int pageSize, int pageNo) throws SQLException;
//	public PageQueryResult<Article> firstPageQuery(Connection con, String key, int pageSize, int pageNo) throws SQLException {
//		int total = 0;
//		PageQueryResult<Article> queryResult = new PageQueryResult<Article>();
//		int index = 1;
//		boolean hasKey = null != key;
//		StringBuilder sql = new StringBuilder();
//		sql.append(" WHERE STATUS = '1'");
//		if (hasKey) {
//			sql.append(" AND (PROFESSOR_ID IN (SELECT ID FROM PROFESSOR WHERE NAME LIKE ?)");
//			sql.append(" OR ORG_ID IN (SELECT ID FROM ORGANIZATION WHERE NAME LIKE ? OR FOR_SHORT LIKE ?)");
//			sql.append(" OR ARTICLE_TITLE LIKE ? OR SUBJECT LIKE ?)");
//		}
//		StringBuilder whereSql = sql;
//		sql = new StringBuilder();
//		sql.append("SELECT COUNT(1) FROM ARTICLE");
//		sql.append(whereSql);
//		PreparedStatement ps = con.prepareStatement(sql.toString());
//		try {
//			if (hasKey) {
//				ps.setString(index++, key);
//				ps.setString(index++, key);
//				ps.setString(index++, key);
//				ps.setString(index++, key);
//				ps.setString(index++, key);
//			}
//			queryResult.setPageSize(pageSize);
//			ResultSet rs = ps.executeQuery();
//			try {
//				rs.next();
//				total = rs.getInt(1);
//			} finally {
//				try {
//					rs.close();
//				} catch (Exception e1) {
//				}
//			}
//		} finally {
//			try {
//				ps.close();
//			} catch (Exception e2) {
//			}
//		}
//		queryResult.setTotal(total);
//		if (0 == total) {
//			queryResult.setPageNo(1);
//			queryResult.setData(Collections.<Article> emptyList());
//			return queryResult;
//		}
//		index = 1;
//		boolean firstPage = (1 == pageNo);
//		if (firstPage) {
//			queryResult.setPageNo(1);
//			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,CREATE_TIME,MODIFY_TIME,SHARE_ID,COL_NUM FROM ARTICLE");
//			sql.append(whereSql);
//			sql.append(" ORDER BY SORT_NUM DESC, PUBLISH_TIME DESC");
//			sql.append(" LIMIT ").append(pageSize);
//		} else {
//			int pageNum = total / pageSize;
//			if (total % pageSize != 0) {
//				++pageNum;
//			}
//			if (pageNo > pageNum) {
//				pageNo = pageNum;
//			}
//			queryResult.setPageNo(pageNo);
//			--pageNo;
//			int offset = (pageNo * pageSize);
//			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,CREATE_TIME,MODIFY_TIME,SHARE_ID,COL_NUM FROM ARTICLE");
//			sql.append(whereSql);
//			sql.append(" ORDER BY SORT_NUM DESC,PUBLISH_TIME DESC");
//			sql.append(" LIMIT ").append(pageSize).append(" OFFSET ").append(offset);
//		}
//		ps = con.prepareStatement(sql.toString());
//		try {
//			if (hasKey) {
//				ps.setString(index++, key);
//				ps.setString(index++, key);
//				ps.setString(index++, key);
//				ps.setString(index++, key);
//				ps.setString(index++, key);
//			}
//			ResultSet rs = ps.executeQuery();
//			try {
//				List<Article> articles = new ArrayList<Article>();
//				queryResult.setData(articles);
//				int size = 0;
//				while ((size < pageSize) && rs.next()) {
//					++size;
//					Article article = new Article();
//					article.setArticleId(rs.getString(1));
//					String professorId = rs.getString(2);
//					if (rs.wasNull()) {
//						professorId = null;
//					}
//					article.setProfessorId(professorId);
//					article.setArticleTitle(rs.getString(3));
//					String articleContent = rs.getString(4);
//					if (rs.wasNull()) {
//						articleContent = null;
//					}
//					article.setArticleContent(articleContent);
//					String subject = rs.getString(5);
//					if (rs.wasNull()) {
//						subject = null;
//					}
//					article.setSubject(subject);
//					String industry = rs.getString(6);
//					if (rs.wasNull()) {
//						industry = null;
//					}
//					article.setIndustry(industry);
//					String publishTime = rs.getString(7);
//					if (rs.wasNull()) {
//						publishTime = null;
//					}
//					article.setPublishTime(publishTime);
//					String articleImg = rs.getString(8);
//					if (rs.wasNull()) {
//						articleImg = null;
//					}
//					article.setArticleImg(articleImg);
//					String orgId = rs.getString(9);
//					if (rs.wasNull()) {
//						orgId = null;
//					}
//					article.setOrgId(orgId);
//					String articleType = rs.getString(10);
//					if (rs.wasNull()) {
//						articleType = null;
//					}
//					article.setArticleType(articleType);
//					article.setArticleAgree(rs.getInt(11));
//					article.setPageViews(rs.getInt(12));
//					String status = rs.getString(13);
//					if (rs.wasNull()) {
//						status = null;
//					}
//					article.setStatus(status);
//					article.setCreateTime(rs.getString(14));
//					article.setModifyTime(rs.getString(15));
//					article.setShareId(rs.getLong(16));
//					article.setColNum(rs.getInt(17));
//					articles.add(article);
//				}
//				return queryResult;
//			} finally {
//				try {
//					rs.close();
//				} catch (Exception e3) {
//				}
//			}
//		} finally {
//			try {
//				ps.close();
//			} catch (Exception e4) {
//			}
//		}
//	}
	@PageQuery
	@Exclude("articleContent")
	@OrderBy(" ORDER BY selfOrderField DESC,SHARE_ID ASC ")
	@Where("STATUS IN ('1','0','2')")
	public abstract PageQueryResult<SelfArticle> queryPageForSelf(Connection con, @Nullable String professorId, @Nullable String orgId,
			@Like @Nullable String articleTitle, int pageSize, int pageNo) throws SQLException;
	// public PageQueryResult<FindInfo> queryPage(Connection con,int
	// pageSize,int pageNo) throws SQLException{
	// public PageQueryResult<Article> firstPageQuery(Connection con, String
	// key, int pageSize, int pageNo) throws SQLException {
	// int total = 0;
	// PageQueryResult<FindInfo> queryResult = new PageQueryResult<FindInfo>();
	// String sql = null;
	// sql = "SELECT SUM(NUM) FROM (SELECT COUNT(1) NUM FROM ARTICLE UNION ALL
	// SELECT COUNT(1) NUM FROM RESOURCE) TBL";
	// PreparedStatement ps = con.prepareStatement(sql);
	// try{
	// PageQueryResult<Article> queryResult = new PageQueryResult<Article>();
	// int index = 1;
	// boolean hasKey = null != key;
	// StringBuilder sql = new StringBuilder();
	// sql.append(" WHERE STATUS = '1'");
	// if (hasKey) {
	// sql.append(" AND (PROFESSOR_ID IN (SELECT ID FROM PROFESSOR WHERE NAME
	// LIKE ?)");
	// sql.append(" OR ORG_ID IN (SELECT ID FROM ORGANIZATION WHERE NAME LIKE ?
	// OR FOR_SHORT LIKE ?)");
	// sql.append(" OR ARTICLE_TITLE LIKE ? OR SUBJECT LIKE ?)");
	// }
	// StringBuilder whereSql = sql;
	// sql = new StringBuilder();
	// sql.append("SELECT COUNT(1) FROM ARTICLE");
	// sql.append(whereSql);
	// PreparedStatement ps = con.prepareStatement(sql.toString());
	// try {
	// if (hasKey) {
	// ps.setString(index++, key);
	// ps.setString(index++, key);
	// ps.setString(index++, key);
	// ps.setString(index++, key);
	// ps.setString(index++, key);
	// }
	// queryResult.setPageSize(pageSize);
	// ResultSet rs = ps.executeQuery();
	// try{
	// try {
	// rs.next();
	// total = rs.getInt(1);
	// }finally{
	// try{rs.close();}catch(Exception e1){}
	// } finally {
	// try {
	// rs.close();
	// } catch (Exception e1) {
	// }
	// }
	// } finally {
	// try {
	// ps.close();
	// } catch (Exception e2) {
	// }
	// }finally{
	// try{ps.close();}catch(Exception e2){}
	// }
	// queryResult.setTotal(total);
	// if(0== total){
	// if (0 == total) {
	// queryResult.setPageNo(1);
	// queryResult.setData(Collections.<FindInfo>emptyList());
	// queryResult.setData(Collections.<Article> emptyList());
	// return queryResult;
	// }
	// index = 1;
	// boolean firstPage = (1 == pageNo);
	// if(firstPage){
	// if (firstPage) {
	// queryResult.setPageNo(1);
	// sql = "SELECT
	// ARTICLE_ID,ARTICLE_TITLE,ARTICLE_IMG,ARTICLE_TYPE,CREATE_TIME,ORG_ID,PROFESSOR_ID
	// FROM ARTICLE"
	// + " UNION ALL SELECT
	// RESOURCE_ID,RESOURCE_NAME,NULL,'3',CREATE_TIME,NULL,PROFESSOR_ID FROM
	// RESOURCE";
	// sql = sql + " ORDER BY CREATE_TIME DESC ";
	// sql = sql + " LIMIT " + pageSize;
	// }else{
	// 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,CREATE_TIME,MODIFY_TIME,SHARE_ID,COL_NUM
	// FROM ARTICLE");
	// sql.append(whereSql);
	// sql.append(" ORDER BY SORT_NUM DESC, PUBLISH_TIME DESC");
	// sql.append(" LIMIT ").append(pageSize);
	// } else {
	// int pageNum = total / pageSize;
	// if(total % pageSize != 0){
	// if (total % pageSize != 0) {
	// ++pageNum;
	// }
	// if(pageNo > pageNum){
	// if (pageNo > pageNum) {
	// pageNo = pageNum;
	// }
	// queryResult.setPageNo(pageNo);
	// --pageNo;
	// int offset = (pageNo * pageSize);
	// sql = "SELECT
	// ARTICLE_ID,ARTICLE_TITLE,ARTICLE_IMG,ARTICLE_TYPE,CREATE_TIME,ORG_ID,PROFESSOR_ID
	// FROM ARTICLE"
	// + " UNION ALL SELECT
	// RESOURCE_ID,RESOURCE_NAME,NULL,'3',CREATE_TIME,NULL,PROFESSOR_ID FROM
	// RESOURCE";
	// sql = sql + " ORDER BY CREATE_TIME DESC ";
	// sql = sql + " LIMIT " + pageSize+ " OFFSET " + offset;
	// }
	// ps = con.prepareStatement(sql);
	// try{
	// 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,CREATE_TIME,MODIFY_TIME,SHARE_ID,COL_NUM
	// FROM ARTICLE");
	// sql.append(whereSql);
	// sql.append(" ORDER BY SORT_NUM DESC,PUBLISH_TIME DESC");
	// sql.append(" LIMIT ").append(pageSize).append(" OFFSET ").append(offset);
	// }
	// ps = con.prepareStatement(sql.toString());
	// try {
	// if (hasKey) {
	// ps.setString(index++, key);
	// ps.setString(index++, key);
	// ps.setString(index++, key);
	// ps.setString(index++, key);
	// ps.setString(index++, key);
	// }
	// ResultSet rs = ps.executeQuery();
	// try{
	// List<FindInfo> findInfos = new ArrayList<FindInfo>();
	// queryResult.setData(findInfos);
	// try {
	// List<Article> articles = new ArrayList<Article>();
	// queryResult.setData(articles);
	// int size = 0;
	// while((size<pageSize) && rs.next()){
	// while ((size < pageSize) && rs.next()) {
	// ++size;
	// FindInfo findInfo = new FindInfo();
	// findInfo.setId(rs.getString(1));
	// findInfo.setName(rs.getString(2));
	// String image = rs.getString(3);
	// if(rs.wasNull()){
	// image = null;
	// }
	// findInfo.setImage(image);
	// findInfo.setType(rs.getString(4));
	// findInfo.setCreateTime(rs.getString(5));
	// String orgId = rs.getString(6);
	// if(rs.wasNull()){
	// findInfo.setOwner(rs.getString(7));
	// }else{
	// findInfo.setOwner(orgId);
	// }
	// findInfos.add(findInfo);
	// }
	// return queryResult;
	// }finally{
	// try{rs.close();}catch(Exception e3){}
	// Article article = new Article();
	// article.setArticleId(rs.getString(1));
	// String professorId = rs.getString(2);
	// if (rs.wasNull()) {
	// professorId = null;
	// }
	// }finally{
	// try{ps.close();}catch(Exception e4){}
	// article.setProfessorId(professorId);
	// article.setArticleTitle(rs.getString(3));
	// String articleContent = rs.getString(4);
	// if (rs.wasNull()) {
	// articleContent = null;
	// }
	// article.setArticleContent(articleContent);
	// String subject = rs.getString(5);
	// if (rs.wasNull()) {
	// subject = null;
	// }
	//
	// public PageQueryResult<FindInfo> queryFindHot(Connection con,int
	// pageSize,int pageNo) throws SQLException{
	// int total = 0;
	// PageQueryResult<FindInfo> queryResult = new PageQueryResult<FindInfo>();
	// String sql = null;
	// sql = "SELECT SUM(NUM) FROM ((SELECT COUNT(1) NUM FROM ARTICLE WHERE
	// STATUS = '1') UNION ALL (SELECT COUNT(1) NUM FROM RESOURCE WHERE STATUS =
	// '1')) TBL";
	// PreparedStatement ps = con.prepareStatement(sql);
	// try{
	// queryResult.setPageSize(pageSize);
	// ResultSet rs = ps.executeQuery();
	// try{
	// rs.next();
	// total = rs.getInt(1);
	// }finally{
	// try{rs.close();}catch(Exception e1){}
	// article.setSubject(subject);
	// String industry = rs.getString(6);
	// if (rs.wasNull()) {
	// industry = null;
	// }
	// }finally{
	// try{ps.close();}catch(Exception e2){}
	// article.setIndustry(industry);
	// String publishTime = rs.getString(7);
	// if (rs.wasNull()) {
	// publishTime = null;
	// }
	// queryResult.setTotal(total);
	// if(0== total){
	// queryResult.setPageNo(1);
	// queryResult.setData(Collections.<FindInfo>emptyList());
	// return queryResult;
	// article.setPublishTime(publishTime);
	// String articleImg = rs.getString(8);
	// if (rs.wasNull()) {
	// articleImg = null;
	// }
	// boolean firstPage = (1 == pageNo);
	// if(firstPage){
	// queryResult.setPageNo(1);
	// sql = "(SELECT
	// ARTICLE_ID,ARTICLE_TITLE,ARTICLE_IMG,ARTICLE_TYPE,PUBLISH_TIME,ORG_ID,PROFESSOR_ID
	// FROM ARTICLE WHERE STATUS = '1')"
	// + " UNION ALL (SELECT RESOURCE_ID,RESOURCE_NAME,NULL,CASE WHEN
	// RESOURCE_TYPE = '1' THEN '3' WHEN RESOURCE_TYPE = '2' THEN '4' ELSE NULL
	// END,"
	// + " PUBLISH_TIME,ORG_ID,PROFESSOR_ID FROM RESOURCE WHERE STATUS = '1')";
	// sql = sql + " ORDER BY PUBLISH_TIME DESC ";
	// sql = sql + " LIMIT " + pageSize;
	// }else{
	// int pageNum = total / pageSize;
	// if(total % pageSize != 0){
	// ++pageNum;
	// article.setArticleImg(articleImg);
	// String orgId = rs.getString(9);
	// if (rs.wasNull()) {
	// orgId = null;
	// }
	// if(pageNo > pageNum){
	// pageNo = pageNum;
	// article.setOrgId(orgId);
	// String articleType = rs.getString(10);
	// if (rs.wasNull()) {
	// articleType = null;
	// }
	// queryResult.setPageNo(pageNo);
	// --pageNo;
	// int offset = (pageNo * pageSize);
	// sql = "(SELECT
	// ARTICLE_ID,ARTICLE_TITLE,ARTICLE_IMG,ARTICLE_TYPE,PUBLISH_TIME,ORG_ID,PROFESSOR_ID
	// FROM ARTICLE WHERE STATUS = '1')"
	// + " UNION ALL (SELECT RESOURCE_ID,RESOURCE_NAME,NULL,CASE WHEN
	// RESOURCE_TYPE = '1' THEN '3' WHEN RESOURCE_TYPE = '2' THEN '4' ELSE NULL
	// END,"
	// + " PUBLISH_TIME,ORG_ID,PROFESSOR_ID FROM RESOURCE WHERE STATUS = '1')";
	// sql = sql + " ORDER BY PUBLISH_TIME DESC ";
	// sql = sql + " LIMIT " + pageSize+ " OFFSET " + offset;
	// }
	// ps = con.prepareStatement(sql);
	// try{
	// ResultSet rs = ps.executeQuery();
	// try{
	// List<FindInfo> findInfos = new ArrayList<FindInfo>();
	// queryResult.setData(findInfos);
	// int size = 0;
	// while((size<pageSize) && rs.next()){
	// ++size;
	// FindInfo findInfo = new FindInfo();
	// findInfo.setId(rs.getString(1));
	// findInfo.setName(rs.getString(2));
	// String image = rs.getString(3);
	// if(rs.wasNull()){
	// image = null;
	// article.setArticleType(articleType);
	// article.setArticleAgree(rs.getInt(11));
	// article.setPageViews(rs.getInt(12));
	// String status = rs.getString(13);
	// if (rs.wasNull()) {
	// status = null;
	// }
	// findInfo.setImage(image);
	// findInfo.setType(rs.getString(4));
	// String createTime = rs.getString(5);
	// if(rs.wasNull()){
	// createTime = null;
	// article.setStatus(status);
	// article.setCreateTime(rs.getString(14));
	// article.setModifyTime(rs.getString(15));
	// article.setShareId(rs.getLong(16));
	// article.setColNum(rs.getInt(17));
	// articles.add(article);
	// }
	// findInfo.setCreateTime(createTime);
	// String orgId = rs.getString(6);
	// if(rs.wasNull()){
	// findInfo.setOwner(rs.getString(7));
	// }else{
	// findInfo.setOwner(orgId);
	// return queryResult;
	// } finally {
	// try {
	// rs.close();
	// } catch (Exception e3) {
	// }
	// findInfos.add(findInfo);
	// }
	// return queryResult;
	// }finally{
	// try{rs.close();}catch(Exception e3){}
	// } finally {
	// try {
	// ps.close();
	// } catch (Exception e4) {
	// }
	// }finally{
	// try{ps.close();}catch(Exception e4){}
	// }
	// }
	//
	@PageQuery
	@Exclude("articleContent")
	@OrderBy(" ORDER BY selfOrderField DESC,SHARE_ID ASC ")
	@Where("STATUS IN ('1','0','2')")
	public abstract PageQueryResult<SelfArticle> queryPageForSelf(Connection con, @Nullable String professorId, @Nullable String orgId,
			@Like @Nullable String articleTitle, int pageSize, int pageNo) throws SQLException;
	public PageQueryResult<FindInfo> queryPage(Connection con, int pageSize, int pageNo) throws SQLException {
		int total = 0;
		PageQueryResult<FindInfo> queryResult = new PageQueryResult<FindInfo>();
		String sql = null;
		sql = "SELECT SUM(NUM) FROM (SELECT COUNT(1) NUM FROM ARTICLE UNION ALL SELECT COUNT(1) NUM FROM RESOURCE) TBL";
		PreparedStatement ps = con.prepareStatement(sql);
		try {
			queryResult.setPageSize(pageSize);
			ResultSet rs = ps.executeQuery();
			try {
				rs.next();
				total = rs.getInt(1);
			} finally {
				try {
					rs.close();
				} catch (Exception e1) {
				}
			}
		} finally {
			try {
				ps.close();
			} catch (Exception e2) {
			}
		}
		queryResult.setTotal(total);
		if (0 == total) {
			queryResult.setPageNo(1);
			queryResult.setData(Collections.<FindInfo> emptyList());
			return queryResult;
		}
		boolean firstPage = (1 == pageNo);
		if (firstPage) {
			queryResult.setPageNo(1);
			sql = "SELECT ARTICLE_ID,ARTICLE_TITLE,ARTICLE_IMG,ARTICLE_TYPE,CREATE_TIME,ORG_ID,PROFESSOR_ID FROM ARTICLE"
					+ " UNION ALL SELECT RESOURCE_ID,RESOURCE_NAME,NULL,'3',CREATE_TIME,NULL,PROFESSOR_ID FROM RESOURCE";
			sql = sql + " ORDER BY CREATE_TIME DESC ";
			sql = sql + " LIMIT " + pageSize;
		} else {
			int pageNum = total / pageSize;
			if (total % pageSize != 0) {
				++pageNum;
			}
			if (pageNo > pageNum) {
				pageNo = pageNum;
			}
			queryResult.setPageNo(pageNo);
			--pageNo;
			int offset = (pageNo * pageSize);
			sql = "SELECT ARTICLE_ID,ARTICLE_TITLE,ARTICLE_IMG,ARTICLE_TYPE,CREATE_TIME,ORG_ID,PROFESSOR_ID FROM ARTICLE"
					+ " UNION ALL SELECT RESOURCE_ID,RESOURCE_NAME,NULL,'3',CREATE_TIME,NULL,PROFESSOR_ID FROM RESOURCE";
			sql = sql + " ORDER BY CREATE_TIME DESC ";
			sql = sql + " LIMIT " + pageSize + " OFFSET " + offset;
		}
		ps = con.prepareStatement(sql);
		try {
			ResultSet rs = ps.executeQuery();
			try {
				List<FindInfo> findInfos = new ArrayList<FindInfo>();
				queryResult.setData(findInfos);
				int size = 0;
				while ((size < pageSize) && rs.next()) {
					++size;
					FindInfo findInfo = new FindInfo();
					findInfo.setId(rs.getString(1));
					findInfo.setName(rs.getString(2));
					String image = rs.getString(3);
					if (rs.wasNull()) {
						image = null;
					}
					findInfo.setImage(image);
					findInfo.setType(rs.getString(4));
					findInfo.setCreateTime(rs.getString(5));
					String orgId = rs.getString(6);
					if (rs.wasNull()) {
						findInfo.setOwner(rs.getString(7));
					} else {
						findInfo.setOwner(orgId);
					}
					findInfos.add(findInfo);
				}
				return queryResult;
			} finally {
				try {
					rs.close();
				} catch (Exception e3) {
				}
			}
		} finally {
			try {
				ps.close();
			} catch (Exception e4) {
			}
		}
	}
	public PageQueryResult<FindInfo> queryFindHot(Connection con, int pageSize, int pageNo) throws SQLException {
		int total = 0;
		PageQueryResult<FindInfo> queryResult = new PageQueryResult<FindInfo>();
		String sql = null;
		sql = "SELECT SUM(NUM) FROM ((SELECT COUNT(1) NUM FROM ARTICLE WHERE STATUS = '1') UNION ALL (SELECT COUNT(1) NUM FROM RESOURCE WHERE STATUS = '1')) TBL";
		PreparedStatement ps = con.prepareStatement(sql);
		try {
			queryResult.setPageSize(pageSize);
			ResultSet rs = ps.executeQuery();
			try {
				rs.next();
				total = rs.getInt(1);
			} finally {
				try {
					rs.close();
				} catch (Exception e1) {
				}
			}
		} finally {
			try {
				ps.close();
			} catch (Exception e2) {
			}
		}
		queryResult.setTotal(total);
		if (0 == total) {
			queryResult.setPageNo(1);
			queryResult.setData(Collections.<FindInfo> emptyList());
			return queryResult;
		}
		boolean firstPage = (1 == pageNo);
		if (firstPage) {
			queryResult.setPageNo(1);
			sql = "(SELECT ARTICLE_ID,ARTICLE_TITLE,ARTICLE_IMG,ARTICLE_TYPE,PUBLISH_TIME,ORG_ID,PROFESSOR_ID FROM ARTICLE WHERE STATUS = '1')"
					+ " UNION ALL (SELECT RESOURCE_ID,RESOURCE_NAME,NULL,CASE WHEN RESOURCE_TYPE = '1' THEN '3' WHEN RESOURCE_TYPE = '2' THEN '4' ELSE NULL END,"
					+ " PUBLISH_TIME,ORG_ID,PROFESSOR_ID FROM RESOURCE WHERE STATUS = '1')";
			sql = sql + " ORDER BY PUBLISH_TIME DESC ";
			sql = sql + " LIMIT " + pageSize;
		} else {
			int pageNum = total / pageSize;
			if (total % pageSize != 0) {
				++pageNum;
			}
			if (pageNo > pageNum) {
				pageNo = pageNum;
			}
			queryResult.setPageNo(pageNo);
			--pageNo;
			int offset = (pageNo * pageSize);
			sql = "(SELECT ARTICLE_ID,ARTICLE_TITLE,ARTICLE_IMG,ARTICLE_TYPE,PUBLISH_TIME,ORG_ID,PROFESSOR_ID FROM ARTICLE WHERE STATUS = '1')"
					+ " UNION ALL (SELECT RESOURCE_ID,RESOURCE_NAME,NULL,CASE WHEN RESOURCE_TYPE = '1' THEN '3' WHEN RESOURCE_TYPE = '2' THEN '4' ELSE NULL END,"
					+ " PUBLISH_TIME,ORG_ID,PROFESSOR_ID FROM RESOURCE WHERE STATUS = '1')";
			sql = sql + " ORDER BY PUBLISH_TIME DESC ";
			sql = sql + " LIMIT " + pageSize + " OFFSET " + offset;
		}
		ps = con.prepareStatement(sql);
		try {
			ResultSet rs = ps.executeQuery();
			try {
				List<FindInfo> findInfos = new ArrayList<FindInfo>();
				queryResult.setData(findInfos);
				int size = 0;
				while ((size < pageSize) && rs.next()) {
					++size;
					FindInfo findInfo = new FindInfo();
					findInfo.setId(rs.getString(1));
					findInfo.setName(rs.getString(2));
					String image = rs.getString(3);
					if (rs.wasNull()) {
						image = null;
					}
					findInfo.setImage(image);
					findInfo.setType(rs.getString(4));
					String createTime = rs.getString(5);
					if (rs.wasNull()) {
						createTime = null;
					}
					findInfo.setCreateTime(createTime);
					String orgId = rs.getString(6);
					if (rs.wasNull()) {
						findInfo.setOwner(rs.getString(7));
					} else {
						findInfo.setOwner(orgId);
					}
					findInfos.add(findInfo);
				}
				return queryResult;
			} finally {
				try {
					rs.close();
				} catch (Exception e3) {
				}
			}
		} finally {
			try {
				ps.close();
			} catch (Exception e4) {
			}
		}
	}
	@SelectOne
	@Nullable
	public abstract Article query(Connection con, long shareId) throws SQLException;
@@ -853,7 +862,8 @@ public abstract class ArticleDao {
	@Exclude("articleContent")
	@OrderBy(" ORDER BY PUBLISH_TIME DESC,SHARE_ID ASC ")
	@Where("STATUS='1'")
	public abstract PageQueryResult<Article> queryFind(Connection con, Integer colNum,@Nullable @In(include=false) String[] articleId, int pageSize, int pageNo) throws SQLException;
	public abstract PageQueryResult<Article> queryFind(Connection con, Integer colNum, @Nullable @In(include = false) String[] articleId, int pageSize,
			int pageNo) throws SQLException;
	@LimitSelect
	@Exclude("articleContent")

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

@@ -44,8 +44,10 @@ import com.ekexiu.portal.po.ArticleAgree;
import com.ekexiu.portal.po.ArticleOrg;
import com.ekexiu.portal.po.ArticlePro;
import com.ekexiu.portal.po.ArticleRes;
import com.ekexiu.portal.po.Image;
import com.ekexiu.portal.pojo.EditOrganization;
import com.ekexiu.portal.pojo.EditProfessor;
import com.ekexiu.portal.pojo.FindInfo;
import com.ekexiu.portal.pojo.SelfArticle;
@Path("/article")
@@ -770,42 +772,42 @@ public class ArticleService {
		return this.articleDao.queryPageForSelf(con, professorId, orgId, articleTitle, pageSize, pageNo);
	}
//	@Get
//	@Path("/pqFind")
//	public PageQueryResult<FindInfo> queryPage(@JdbcConn Connection con, @DefaultValue("10") int pageSize, @DefaultValue("1") int pageNo) throws SQLException {
//		PageQueryResult<FindInfo> queryResult = this.articleDao.queryPage(con, pageSize, pageNo);
//		List<FindInfo> findInfos = queryResult.getData();
//		for (FindInfo findInfo : findInfos) {
//			if ("3".equals(findInfo.getType())) {
//				List<Image> images = this.imagesService.queryRes(con, findInfo.getId());
//				if (images.size() > 0) {
//					findInfo.setImage(findInfo.getId() + ".jpg");
//				}
//			}
//		}
//		queryResult.setData(findInfos);
//		return queryResult;
//	}
//	@Get
//	@Path("/findHot")
//	public PageQueryResult<FindInfo> queryFindHot(@JdbcConn Connection con, @DefaultValue("10") int pageSize, @DefaultValue("1") int pageNo)
//			throws SQLException {
//		PageQueryResult<FindInfo> queryResult = this.articleDao.queryFindHot(con, pageSize, pageNo);
//		List<FindInfo> findInfos = queryResult.getData();
//		if (!findInfos.isEmpty()) {
//			for (FindInfo findInfo : findInfos) {
//				if ("3".equals(findInfo.getType()) || "4".equals(findInfo.getType())) {
//					List<Image> images = this.imagesService.queryRes(con, findInfo.getId());
//					if (images.size() > 0) {
//						findInfo.setImage(images.get(0).getImageSrc());
//					}
//				}
//			}
//			queryResult.setData(findInfos);
//		}
//		return queryResult;
//	}
	@Get
	@Path("/pqFind")
	public PageQueryResult<FindInfo> queryPage(@JdbcConn Connection con, @DefaultValue("10") int pageSize, @DefaultValue("1") int pageNo) throws SQLException {
		PageQueryResult<FindInfo> queryResult = this.articleDao.queryPage(con, pageSize, pageNo);
		List<FindInfo> findInfos = queryResult.getData();
		for (FindInfo findInfo : findInfos) {
			if ("3".equals(findInfo.getType())) {
				List<Image> images = this.imagesService.queryRes(con, findInfo.getId());
				if (images.size() > 0) {
					findInfo.setImage(findInfo.getId() + ".jpg");
				}
			}
		}
		queryResult.setData(findInfos);
		return queryResult;
	}
	@Get
	@Path("/findHot")
	public PageQueryResult<FindInfo> queryFindHot(@JdbcConn Connection con, @DefaultValue("10") int pageSize, @DefaultValue("1") int pageNo)
			throws SQLException {
		PageQueryResult<FindInfo> queryResult = this.articleDao.queryFindHot(con, pageSize, pageNo);
		List<FindInfo> findInfos = queryResult.getData();
		if (!findInfos.isEmpty()) {
			for (FindInfo findInfo : findInfos) {
				if ("3".equals(findInfo.getType()) || "4".equals(findInfo.getType())) {
					List<Image> images = this.imagesService.queryRes(con, findInfo.getId());
					if (images.size() > 0) {
						findInfo.setImage(images.get(0).getImageSrc());
					}
				}
			}
			queryResult.setData(findInfos);
		}
		return queryResult;
	}
	@Get
	@Path("/ralatePro")