111

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

@@ -6,6 +6,7 @@ import com.ekexiu.portal.pojo.FindInfo;
import com.ekexiu.portal.pojo.SelfArticle;
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.Dynamic;
import org.jfw.apt.orm.annotation.dao.method.Exclude;
@@ -16,6 +17,7 @@ import org.jfw.apt.orm.annotation.dao.method.SetSentence;
import org.jfw.apt.orm.annotation.dao.method.Where;
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.LimitSelect;
import org.jfw.apt.orm.annotation.dao.method.operator.PageQuery;
import org.jfw.apt.orm.annotation.dao.method.operator.PageSelect;
@@ -31,7 +33,6 @@ 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.annotation.dao.Column;
import org.jfw.apt.orm.core.defaultImpl.LongHandler;
import org.jfw.apt.orm.core.defaultImpl.StringHandler;
import org.jfw.util.PageQueryResult;
@@ -178,6 +179,25 @@ public abstract class ArticleDao {
					"OWNER_ID IN (SELECT ID FROM ORGANIZATION WHERE NAME LIKE ? OR FOR_SHORT LIKE)" }, additional = 1, isAnd = false) String key,
			int pageSize, int pageNo) throws SQLException;
	@Exclude("articleContent")
	@PageSelect
	@OrderBy(" ORDER BY PUBLISH_TIME DESC,SHARE_ID ASC")
	@Where("STATUS = '1'")
	public abstract PageQueryResult<Article> pageQueryPublish(Connection con, String ownerId,String articleType, @Nullable @GroupSqlColumn(handlerClass = StringHandler.class, value = { "OWNER_ID IN (SELECT ID FROM PROFESSOR WHERE NAME LIKE ?)",
			"OWNER_ID IN (SELECT ID FROM ORGANIZATION WHERE NAME LIKE ? OR FOR_SHORT LIKE ?)", "ARTICLE_TITLE LIKE ?",
			"SUBJECT LIKE ?" }, additional = 1, isAnd = false) String key,int pageSize, int pageNo) throws SQLException;
	@LimitQuery
	@OrderBy(cols = { @LimitColumn(value = "publishTime", column = "PUBLISH_TIME", handlerClass = StringHandler.class, asc = false),
			@LimitColumn(value = "articleId", column = "ARTICLE_ID", asc = false, handlerClass = StringHandler.class) }, value = "")
	@Where("STATUS = '1'")
	@Exclude({ "descp" })
	public abstract List<Article> queryPublish(Connection con,String ownerId, String publishTime, String articleId,
											  @SqlColumn(handlerClass = StringHandler.class, value = { "STATUS=?" }) String articleType,@Nullable @GroupSqlColumn(handlerClass = StringHandler.class, value = { "OWNER_ID IN (SELECT ID FROM PROFESSOR WHERE NAME LIKE ?)",
			"OWNER_ID IN (SELECT ID FROM ORGANIZATION WHERE NAME LIKE ? OR FOR_SHORT LIKE ?)", "ARTICLE_TITLE LIKE ?",
			"SUBJECT LIKE ?" }, additional = 1, isAnd = false) String key,
											  int rows) throws SQLException;
	@Exclude("articleContent")
	@SelectList
	@OrderBy(" ORDER BY MODIFY_TIME DESC ")

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

@@ -904,7 +904,19 @@ public class ArticleService {
	public PageQueryResult<Article> pgPublishNotInPlatform(@JdbcConn Connection con,String pid,@Nullable String key,@DefaultValue("10") int pageSize,@DefaultValue("1") int pageNo)throws SQLException {
			return this.articleDao.publishInPlatform(con,pid,key,pageSize,pageNo);
	}
	
	@Get
	@Path("/pqPublish")
	public PageQueryResult<Article> pageQueryPublish(@JdbcConn Connection con, String ownerId,String articleType,@Nullable String key, @DefaultValue("10") int pageSize,
														@DefaultValue("1") int pageNo) throws SQLException {
		return this.articleDao.pageQueryPublish(con, ownerId,articleType,key, pageSize, pageNo);
	}
	@Get
	@Path("/pqPublish")
	public List<Article> queryPublish(@JdbcConn Connection con, String ownerId, @DefaultValue("\"z\"")String publishTime, @DefaultValue("\"z\"") String articleId,String articleType,@Nullable String key, int rows) throws SQLException {
		return this.articleDao.queryPublish(con, ownerId, publishTime, articleId, articleType,key, rows);
	}
	@Get
	@Path("/qaForDesk")