内容流量查询中文章和资源的查询条件；显示机构发布者

src/main/java/com/ekexiu/console/system/dao/ArticleDao.java

@@ -7,12 +7,10 @@ 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.OrderBy;
import org.jfw.apt.orm.annotation.dao.method.Where;
import org.jfw.apt.orm.annotation.dao.method.operator.PageQuery;
import org.jfw.apt.orm.annotation.dao.method.operator.QueryVal;
import org.jfw.apt.orm.annotation.dao.param.Alias;
import org.jfw.apt.orm.annotation.dao.param.GtEq;
import org.jfw.apt.orm.annotation.dao.param.Like;
import org.jfw.apt.orm.annotation.dao.param.LtEq;
import org.jfw.apt.orm.annotation.dao.param.*;
import org.jfw.apt.orm.core.defaultImpl.StringHandler;
import org.jfw.util.PageQueryResult;
@@ -33,9 +31,11 @@ public interface ArticleDao {
    @PageQuery
    @OrderBy(" ORDER BY create_time DESC NULLS LAST")
    PageQueryResult<ArticleInfo> queryByTime(Connection con, @Nullable @Like String articleTitle, @Nullable @Like String professorName, @Nullable @GtEq @Alias("createTime") String bt, @Nullable @Alias("createTime") @LtEq String et, int pageSize, int pageNo) throws SQLException;
    @Where("status='1'")
    PageQueryResult<ArticleInfo> queryByTime(Connection con, @Nullable @Like String articleTitle, @SqlColumn(value = {"(p.name is null or p.name like ?)", "(o.name is null or o.name like ?)"}, handlerClass = StringHandler.class) String name, @Nullable @GtEq @Alias("createTime") String bt, @Nullable @Alias("createTime") @LtEq String et, int pageSize, int pageNo) throws SQLException;
    @PageQuery
    @OrderBy(" ORDER BY page_views DESC NULLS LAST")
    PageQueryResult<ArticleInfo> queryByPV(Connection con, @Nullable @Like String articleTitle,@Nullable @Like String professorName, @Nullable @GtEq @Alias("createTime") String bt, @Nullable @Alias("createTime") @LtEq String et, int pageSize, int pageNo) throws SQLException;
    @Where("status='1'")
    PageQueryResult<ArticleInfo> queryByPV(Connection con, @Nullable @Like String articleTitle, @SqlColumn(value = {"(p.name is null or p.name like ?)", "(o.name is null or o.name like ?)"}, handlerClass = StringHandler.class) String name, @Nullable @GtEq @Alias("createTime") String bt, @Nullable @Alias("createTime") @LtEq String et, int pageSize, int pageNo) throws SQLException;
}

src/main/java/com/ekexiu/console/system/dao/ResourceDao.java

@@ -7,12 +7,10 @@ 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.OrderBy;
import org.jfw.apt.orm.annotation.dao.method.Where;
import org.jfw.apt.orm.annotation.dao.method.operator.PageQuery;
import org.jfw.apt.orm.annotation.dao.method.operator.QueryVal;
import org.jfw.apt.orm.annotation.dao.param.Alias;
import org.jfw.apt.orm.annotation.dao.param.GtEq;
import org.jfw.apt.orm.annotation.dao.param.Like;
import org.jfw.apt.orm.annotation.dao.param.LtEq;
import org.jfw.apt.orm.annotation.dao.param.*;
import org.jfw.apt.orm.core.defaultImpl.StringHandler;
import org.jfw.util.PageQueryResult;
@@ -32,9 +30,11 @@ public interface ResourceDao {
    @PageQuery
    @OrderBy(" ORDER BY create_time DESC NULLS LAST")
    PageQueryResult<ResourceInfo> queryByTime(Connection con, @Nullable @Like String resourceName, @Nullable @Like String professorName, @Nullable @GtEq @Alias("createTime") String bt, @Nullable @Alias("createTime") @LtEq String et, int pageSize, int pageNo) throws SQLException;
    @Where("status='1'")
    PageQueryResult<ResourceInfo> queryByTime(Connection con, @Nullable @Like String resourceName, @SqlColumn(value = {"(p.name is null or p.name like ?)", "(o.name is null or o.name like ?)"}, handlerClass = StringHandler.class) String name, @Nullable @GtEq @Alias("createTime") String bt, @Nullable @Alias("createTime") @LtEq String et, int pageSize, int pageNo) throws SQLException;
    @PageQuery
    @OrderBy(" ORDER BY page_views DESC NULLS LAST")
    PageQueryResult<ResourceInfo> queryByPV(Connection con, @Nullable @Like String resourceName,@Nullable @Like String professorName, @Nullable @GtEq @Alias("createTime") String bt, @Nullable @Alias("createTime") @LtEq String et, int pageSize, int pageNo) throws SQLException;
    @Where("status='1'")
    PageQueryResult<ResourceInfo> queryByPV(Connection con, @Nullable @Like String resourceName,@SqlColumn(value = {"(p.name is null or p.name like ?)", "(o.name is null or o.name like ?)"}, handlerClass = StringHandler.class) String name, @Nullable @GtEq @Alias("createTime") String bt, @Nullable @Alias("createTime") @LtEq String et, int pageSize, int pageNo) throws SQLException;
}

src/main/java/com/ekexiu/console/system/pojo/ArticleInfo.java

@@ -8,9 +8,10 @@ import org.jfw.apt.orm.core.defaultImpl.StringHandler;
/**
 * Created by TT on 2017/7/27.
 */
@ExtendView(fromSentence = "article a LEFT JOIN professor p on p.id = a.professor_id ", tableAlias = "a")
@ExtendView(fromSentence = "article a LEFT JOIN professor p on p.id = a.professor_id LEFT JOIN organization o on o.id = a.org_id ", tableAlias = "a")
public class ArticleInfo extends Article{
    private String professorName;
    private String organizationName;
    @CalcColumn(handlerClass = StringHandler.class, column = "p.name")
    public String getProfessorName() {
@@ -20,4 +21,14 @@ public class ArticleInfo extends Article{
    public void setProfessorName(String professorName) {
        this.professorName = professorName;
    }
    @CalcColumn(handlerClass = StringHandler.class, column = "o.name")
    public String getOrganizationName() {
        return organizationName;
    }
    public void setOrganizationName(String organizationName) {
        this.organizationName = organizationName;
    }
}

src/main/java/com/ekexiu/console/system/pojo/ResourceInfo.java

@@ -8,9 +8,10 @@ import org.jfw.apt.orm.core.defaultImpl.StringHandler;
/**
 * Created by TT on 2017/7/27.
 */
@ExtendView(fromSentence = "resource r LEFT JOIN professor p on p.id = r.professor_id ", tableAlias = "r")
@ExtendView(fromSentence = "resource r LEFT JOIN professor p on p.id = r.professor_id LEFT JOIN organization o on o.id = r.org_id ", tableAlias = "r")
public class ResourceInfo extends Resource{
    private String professorName;
    private String organizationName;
    @CalcColumn(handlerClass = StringHandler.class, column = "p.name")
    public String getProfessorName() {
@@ -20,4 +21,13 @@ public class ResourceInfo extends Resource{
    public void setProfessorName(String professorName) {
        this.professorName = professorName;
    }
    @CalcColumn(handlerClass = StringHandler.class, column = "o.name")
    public String getOrganizationName() {
        return organizationName;
    }
    public void setOrganizationName(String organizationName) {
        this.organizationName = organizationName;
    }
}

src/main/java/com/ekexiu/console/system/service/ContentService.java

@@ -94,18 +94,18 @@ public class ContentService {
    public Object pageQuery(@JdbcConn Connection con, int contentType, @Nullable String title, @Nullable String name, int orderBy, @Nullable String bt, @Nullable String et, @DefaultValue("1") int pageNo, @DefaultValue("10") int pageSize)throws SQLException{
        if (contentType == 3){
            if (orderBy == 1) {
                return this.articleDao.queryByTime(con, title == null ? null : "%" + title + "%",  name == null ? null : "%" + name + "%", bt == null ? null : bt + "000000", et == null ? null : et + "235959", pageSize, pageNo);
                return this.articleDao.queryByTime(con, title == null ? null : "%" + title + "%",  name == null ? "%" : "%" + name + "%", bt == null ? null : bt + "000000", et == null ? null : et + "235959", pageSize, pageNo);
            }
            if (orderBy == 2) {
                return this.articleDao.queryByPV(con, title == null ? null : "%" + title + "%",  name == null ? null : "%" + name + "%", bt == null ? null : bt + "000000", et == null ? null : et + "235959", pageSize, pageNo);
                return this.articleDao.queryByPV(con, title == null ? null : "%" + title + "%",  name == null ? "%" : "%" + name + "%", bt == null ? null : bt + "000000", et == null ? null : et + "235959", pageSize, pageNo);
            }
        }
        if (contentType == 2){
            if (orderBy == 1){
                return this.resourceDao.queryByTime(con, title == null ? null : "%" + title + "%",  name == null ? null : "%" + name + "%", bt == null ? null : bt + "000000", et == null ? null : et + "235959", pageSize, pageNo);
                return this.resourceDao.queryByTime(con, title == null ? null : "%" + title + "%",  name == null ? "%" : "%" + name + "%", bt == null ? null : bt + "000000", et == null ? null : et + "235959", pageSize, pageNo);
            }
            if (orderBy == 2) {
                return this.resourceDao.queryByPV(con, title == null ? null : "%" + title + "%",  name == null ? null : "%" + name + "%", bt == null ? null : bt + "000000", et == null ? null : et + "235959", pageSize, pageNo);
                return this.resourceDao.queryByPV(con, title == null ? null : "%" + title + "%",  name == null ? "%" : "%" + name + "%", bt == null ? null : bt + "000000", et == null ? null : et + "235959", pageSize, pageNo);
            }
        }
        if (contentType == 5){