Merge remote-tracking branch 'origin/test'

Conflicts:
	src/main/java/com/ekexiu/portal/ware/WareDao.java
	src/main/java/com/ekexiu/portal/ware/WareService.java

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

@@ -1,18 +1,16 @@
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.DefaultValue;
import org.jfw.apt.annotation.Nullable;
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.LimitColumn;
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;
@@ -21,6 +19,7 @@ import org.jfw.apt.orm.annotation.dao.method.operator.Insert;
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;
import org.jfw.apt.orm.annotation.dao.method.operator.QueryVal;
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;
@@ -32,13 +31,18 @@ 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;
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 {
@@ -51,11 +55,11 @@ public abstract class ArticleDao {
	@Insert
	public abstract int insert(Connection con,ArticleWare ware)throws SQLException;
	
	@DeleteWith
	@From(ArticleWare.class)
	public abstract int deleteWare(Connection con,String id)throws SQLException;
	
	@UpdateWith
	@From(Article.class)
	@SetSentence("PAGE_VIEWS = PAGE_VIEWS + 1")
@@ -117,6 +121,24 @@ public abstract class ArticleDao {
	@Where("STATUS = '1'")
	public abstract PageQueryResult<Article> pageQueryProPublish(Connection con, String professorId, int pageSize, int pageNo) throws SQLException;
	//@LimitSelect
	//@Exclude("articleContent")
	//@OrderBy(cols = {@LimitColumn(value = "publishTime", asc = false), @LimitColumn(value = "shareId",asc = false, handlerClass = LongHandler.class)}, value = "")
	//@Where("STATUS = '1'")
	//public abstract List<Article> proPublish(Connection con, String professorId, String publishTime, long shareId, int rows)throws SQLException;
    //
	//@LimitSelect
	//@Exclude("articleContent")
	//@OrderBy(cols = {@LimitColumn(value = "publishTime", asc = false), @LimitColumn(value = "shareId",asc = false, handlerClass = LongHandler.class)}, value = "")
	//@Where("STATUS = '1'")
	//public abstract List<Article> orgPublish(Connection con, String orgId, String publishTime, long shareId, int rows)throws SQLException;
	@LimitSelect
	@Exclude("articleContent")
	@OrderBy(cols = {@LimitColumn(value = "publishTime", asc = false), @LimitColumn(value = "shareId",asc = false, handlerClass = LongHandler.class)}, value = "")
	@Where("STATUS = '1'")
	public abstract List<Article> publish(Connection con,String articleType,@GroupSqlColumn(handlerClass = StringHandler.class,value ={"PROFESSOR_ID = ?","ORG_ID = ?"},isAnd = false) String owner, String publishTime, long shareId, int rows)throws SQLException;
	@Exclude("articleContent")
	@SelectList
	@OrderBy(" ORDER BY MODIFY_TIME DESC ")
@@ -149,6 +171,9 @@ public abstract class ArticleDao {
	@Nullable
	public abstract Article queryOne(Connection con, String articleId) throws SQLException;
	@SelectList
	public abstract List<ArticleWare> queryWares(Connection con,String id)throws SQLException;
	public List<Article> queryByPageViews(Connection con, String articleId, int rows) throws SQLException {
		int index = 1;
		boolean hasArticleId = null != articleId;
@@ -366,6 +391,7 @@ public abstract class ArticleDao {
	}
	@SelectList
	@Exclude("articleContent")
	public abstract List<Article> query(Connection con, @In String[] articleId) throws SQLException;
	@Exclude("articleContent")
@@ -490,6 +516,12 @@ public abstract class ArticleDao {
					"SUBJECT LIKE ?" }, additional = 1) @Nullable String key,
			int pageSize, int pageNo) throws SQLException;
	@LimitSelect
	@Exclude("articleContent")
	@Where("STATUS = '1'")
	@OrderBy(cols = {@LimitColumn(value = "sortNum", asc = false, handlerClass = LongHandler.class), @LimitColumn(value = "publishTime", asc = false), @LimitColumn(value = "articleId", asc = false)}, value = "")
	public abstract List<Article> indexSearch(Connection con,@Nullable @GroupSqlColumn(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, isAnd = false) String key, long sortNum, String publishTime, String articleId, int rows) throws SQLException;
	// public PageQueryResult<Article> firstPageQuery(Connection con, String
	// key, int pageSize, int pageNo) throws SQLException {
	// int total = 0;
@@ -882,5 +914,13 @@ public abstract class ArticleDao {
	@LimitSelect
	@OrderBy( " ORDER BY PAGE_VIEWS DESC")
	public abstract List<Article> queryByWareId(Connection con,@SqlColumn(handlerClass = StringHandler.class, value = { "ARTICLE_ID IN (SELECT ID FROM ARTICLE_WARE WHERE WARE =?))" }) String ware,int rows) throws SQLException;
	public abstract List<Article> queryByWareId(Connection con,@SqlColumn(handlerClass = StringHandler.class, value = { "ARTICLE_ID IN (SELECT ID FROM ARTICLE_WARE WHERE WARE =?)" }) String ware,int rows) throws SQLException;
	@DefaultValue("0")
	@QueryVal
	@Where("STATUS = '1'")
	@Column(value = "COUNT(1)", handlerClass = LongHandler.class)
	@From(Article.class)
	public abstract long countPublish(Connection con, String articleType,@GroupSqlColumn(handlerClass = StringHandler.class,value = {"PROFESSOR_ID = ?","ORG_ID = ?"},isAnd = false) String owner) throws SQLException;
}

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

@@ -1,16 +1,13 @@
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;
import org.jfw.apt.orm.annotation.dao.method.From;
import org.jfw.apt.orm.annotation.dao.method.LimitColumn;
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.Select;
@@ -33,12 +30,16 @@ import org.jfw.apt.orm.annotation.dao.param.In;
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.LongHandler;
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 +220,14 @@ 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;
	@LimitQuery
	@Select(Organization.class)
	@From(Organization.class)
	@OrderBy(cols = {@LimitColumn(value = "sortNum", asc = false, handlerClass = LongHandler.class), @LimitColumn(value = "modifyTime", asc = false), @LimitColumn(value = "id", asc = false)}, value = "")
	public abstract List<EditOrganization> indexSearch(Connection con, @Nullable @GroupSqlColumn(handlerClass = StringHandler.class, value = {"NAME LIKE ? AND IS_JOIN ='1'", "FOR_SHORT LIKE ? AND IS_JOIN ='1'", "DESCP LIKE ?  AND IS_JOIN ='1'", "SUBJECT LIKE ? AND IS_JOIN ='1' ", "industry LIKE ?  AND IS_JOIN ='1'",
			"ID IN (SELECT ORG_ID FROM RESOURCE WHERE RESOURCE_TYPE='2' AND RESOURCE_NAME LIKE ?) AND IS_JOIN ='1'",
			"ID IN (SELECT ORG_ID FROM ARTICLE WHERE ARTICLE_TYPE='2' AND ARTICLE_TITLE LIKE ?) AND IS_JOIN ='1'"},isAnd = false) String kw, long sortNum, String modifyTime, String id, int rows) throws SQLException;
	@PageQuery
	@Select(Organization.class)
	@From(Organization.class)

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

@@ -1,34 +1,42 @@
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.DefaultValue;
import org.jfw.apt.annotation.Nullable;
import org.jfw.apt.orm.annotation.dao.DAO;
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.LimitColumn;
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.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;
import org.jfw.apt.orm.annotation.dao.method.operator.QueryVal;
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.UpdateWith;
import org.jfw.apt.orm.annotation.dao.param.Alias;
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.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.FixLenStringHandler;
import org.jfw.apt.orm.core.defaultImpl.LongHandler;
import org.jfw.apt.orm.core.defaultImpl.StringHandler;
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 {
@@ -52,6 +60,11 @@ public abstract class PpaperDao {
			@SqlColumn(handlerClass = FixLenStringHandler.class, value = { "A.PROFESSOR_ID=?" })  String professorId,
			@SqlColumn(handlerClass = FixLenStringHandler.class, value = { "P.NAME LIKE ?" }) String name, int pageSize, int pageNo) throws SQLException;
	@Exclude("summary")
	@LimitQuery
	@OrderBy(cols = {@LimitColumn(value = "assTime", asc = false), @LimitColumn(value = "id", asc = false)}, value = "")
	public abstract List<AssedPaper> queryProfessor(Connection con,@SqlColumn(handlerClass = FixLenStringHandler.class, value = { "A.PROFESSOR_ID = ?" }) String professorId,@Nullable @SqlColumn(handlerClass = StringHandler.class,value = {"P.NAME LIKE ?"}) String name, String assTime, String id, int rows) throws SQLException;
	@Exclude("summary")
	@PageQuery
	@OrderBy(" ORDER BY ASS_TIME DESC,ID ASC")
@@ -76,8 +89,12 @@ 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;
	
	
	@LimitSelect
	@Exclude("summary")
	@OrderBy(cols = {@LimitColumn(value = "sortNum", asc = false, handlerClass = LongHandler.class), @LimitColumn(value = "createTime", asc = false), @LimitColumn(value = "id", asc = false)}, value = "")
	public abstract List<Ppaper> indexSearch(Connection con,@Nullable @GroupSqlColumn(handlerClass = StringHandler.class, value = {"EN4PERIODICAL LIKE ?", "CN4PERIODICAL LIKE ?", "KEYWORDS LIKE ?", "AUTHORS LIKE ?", "NAME LIKE ?"}, isAnd = false) String key, long sortNum, String createTime, String id, int rows) throws SQLException;
	@SelectOne
	@Nullable
	public abstract Ppaper query(Connection con,long shareId)throws SQLException;
@@ -139,4 +156,11 @@ public abstract class PpaperDao {
		}
		return ret.isEmpty() ? null : ret.toArray(new String[ret.size()]);
	}
	@DefaultValue("0")
	@QueryVal
	@Column(value = "count(1)", handlerClass = LongHandler.class)
	@From(AssedPaper.class)
	public abstract long countPublish(Connection con,@SqlColumn(handlerClass = FixLenStringHandler.class, value = { "A.PROFESSOR_ID=?" })String professorId) throws SQLException;
}

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

@@ -1,34 +1,42 @@
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.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.Exclude;
import org.jfw.apt.orm.annotation.dao.method.From;
import org.jfw.apt.orm.annotation.dao.method.LimitColumn;
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.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;
import org.jfw.apt.orm.annotation.dao.method.operator.QueryVal;
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.UpdateWith;
import org.jfw.apt.orm.annotation.dao.param.Alias;
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.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.FixLenStringHandler;
import org.jfw.apt.orm.core.defaultImpl.LongHandler;
import org.jfw.apt.orm.core.defaultImpl.StringHandler;
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 {
@@ -53,6 +61,11 @@ public abstract class PpatentDao {
			@SqlColumn(handlerClass = FixLenStringHandler.class, value = { "A.PROFESSOR_ID=?" }) String professId,
			@SqlColumn(handlerClass = FixLenStringHandler.class, value = { "P.NAME LIKE ?" }) String name, int pageSize, int pageNo) throws SQLException;
	@Exclude("summary")
	@LimitQuery
	@OrderBy(cols = {@LimitColumn(value = "assTime", asc = false), @LimitColumn(value = "id", asc = false)}, value = "")
	public abstract List<AssedPatent> queryProfessor(Connection con,@SqlColumn(handlerClass = FixLenStringHandler.class, value = { "A.PROFESSOR_ID=?" }) String professorId, @Nullable @SqlColumn(handlerClass = StringHandler.class,value = {"P.NAME LIKE ?"}) String name, String assTime, String id, int rows) throws SQLException;
	@Exclude("summary")
	@PageQuery
	@OrderBy(" ORDER BY ASS_TIME DESC,ID ASC")
@@ -79,6 +92,11 @@ 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;
	@Exclude("summary")
	@LimitSelect
	@OrderBy(cols = {@LimitColumn(value = "sortNum", handlerClass = LongHandler.class, asc = false), @LimitColumn(value = "createTime", asc = false), @LimitColumn(value = "id", asc = false)}, value = "")
	public abstract List<Ppatent> indexSearch(Connection con, @Nullable @GroupSqlColumn(handlerClass = StringHandler.class, value = {"REQ_PERSON LIKE ?", "KEYWORDS LIKE ?", "NAME LIKE ?", "AUTHORS LIKE ?", "CODE LIKE ?"},isAnd = false) String key, long sortNum, String createTime, String id, int rows) throws SQLException;
	@SelectOne
	@Nullable
	public abstract Ppatent query(Connection con, long shareId) throws SQLException;
@@ -147,4 +165,10 @@ public abstract class PpatentDao {
		return ret.isEmpty() ? null : ret.toArray(new String[ret.size()]);
	}
	@DefaultValue("0")
	@QueryVal
	@Column(value = "count(1)", handlerClass = LongHandler.class)
	@From(AssedPatent.class)
	public abstract long countPublish(Connection con,@SqlColumn(handlerClass = FixLenStringHandler.class, value = { "A.PROFESSOR_ID=?" }) String professorId) throws SQLException;
}

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

@@ -1,14 +1,12 @@
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 com.ekexiu.portal.ware.Ware;
import org.jfw.apt.annotation.DefaultValue;
import org.jfw.apt.annotation.Nullable;
import org.jfw.apt.orm.annotation.dao.Column;
@@ -20,15 +18,19 @@ 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.QueryList;
import org.jfw.apt.orm.annotation.dao.method.operator.QueryOne;
import org.jfw.apt.orm.annotation.dao.method.operator.QueryVal;
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.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.BigDecimalHandler;
@@ -37,11 +39,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 {
@@ -386,7 +391,7 @@ public abstract class ProfessorDao {
	public List<EditProfessor> queryByName(Connection con, String name, int total) throws SQLException {
		int index = 1;
		String sql = "SELECT P.OFFICE,P.DEPARTMENT,P.TITLE,AUTHENTICATION,AUTH_TYPE,P.AUTH_STATUS,P.ID,P.NAME,P.ADDRESS,P.ORG_AUTH,ORGANIZATION.NAME,P.ORG_ID,P.SCORE_PERCENT,P.SHARE_ID "
				+ " FROM PROFESSOR P LEFT JOIN ORGANIZATION ON P.ORG_ID = ORGANIZATION.ID WHERE P.NAME LIKE ? ORDER BY P.SCORE_PERCENT DESC LIMIT " + total;
				+ " FROM PROFESSOR P LEFT JOIN ORGANIZATION ON P.ORG_ID = ORGANIZATION.ID WHERE P.NAME LIKE ? ORDER BY P.NAME ASC LIMIT " + total;
		PreparedStatement ps = con.prepareStatement(sql);
		try {
			ps.setString(index++, name);
@@ -470,7 +475,7 @@ public abstract class ProfessorDao {
	public EditProfessor queryEditBaseInfo(Connection con, String id) throws SQLException {
		int index = 1;
		String sql = "SELECT P.OFFICE,P.DEPARTMENT,P.TITLE,AUTHENTICATION,AUTH_TYPE,P.AUTH_STATUS,"
				+ " P.ID,P.NAME,P.ADDRESS,P.STAR_LEVEL,P.CONSULT_COUNT,P.ORG_AUTH,ORGANIZATION.NAME,P.SHARE_ID,P.PHONE,P.EMAIL,P.PROVINCE "
				+ " P.ID,P.NAME,P.ADDRESS,P.STAR_LEVEL,P.CONSULT_COUNT,P.ORG_AUTH,ORGANIZATION.NAME,P.SHARE_ID,P.PHONE,P.EMAIL,P.PROVINCE,P.SEX,P.BIRTHDAY "
				+ " FROM PROFESSOR P LEFT JOIN ORGANIZATION ON P.ORG_ID = ORGANIZATION.ID WHERE P.ID = ?";
		PreparedStatement ps = con.prepareStatement(sql);
		try {
@@ -520,6 +525,8 @@ public abstract class ProfessorDao {
					professor.setPhone(rs.getString(15));
					professor.setEmail(rs.getString(16));
					professor.setProvince(rs.getString(17));
					professor.setSex(rs.getString(18));
					professor.setBirthday(rs.getString(19));
					return professor;
				} else {
					return null;
@@ -1386,6 +1393,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 @Like String subject, @Nullable @Like String industry, @Nullable @Like String address, @Nullable Integer authType, int rows) throws SQLException;
	/**
	 * 分页查询专家基础信息，多条件查询专家列表。
	 * 
@@ -2090,4 +2104,9 @@ public abstract class ProfessorDao {
	@SelectList
	public abstract List<Professor> query(Connection con, @In String[] id) throws SQLException;
	@QueryList
	@Select(Professor.class)
	@From(Professor.class)
	public abstract List<EditProfessor> queryPro(Connection con, @In String[] id) throws SQLException;
}

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

@@ -1,18 +1,17 @@
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.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.From;
import org.jfw.apt.orm.annotation.dao.method.LimitColumn;
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;
@@ -20,19 +19,26 @@ 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.LimitSelect;
import org.jfw.apt.orm.annotation.dao.method.operator.PageSelect;
import org.jfw.apt.orm.annotation.dao.method.operator.QueryVal;
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.Like;
import org.jfw.apt.orm.annotation.dao.param.Set;
import org.jfw.apt.orm.core.defaultImpl.LongHandler;
import org.jfw.apt.orm.core.defaultImpl.StringHandler;
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 {
@@ -117,6 +123,15 @@ public abstract class ResourceDao {
	@Nullable
	public abstract Resource queryOne(Connection con, String resourceId) throws SQLException;
	
	@LimitSelect
	@OrderBy("ORDER BY RESOURCE_NAME ASC")
	@Where("STATUS ='1'")
	public abstract List<Resource> publishByProfessor(Connection con,String professorId,@Like String resourceName, int rows)throws SQLException;
	@LimitSelect
	@OrderBy("ORDER BY RESOURCE_NAME ASC")
	@Where("STATUS ='1'")
	public abstract List<Resource> publishByOrg(Connection con,String orgId,@Like String resourceName, int rows)throws SQLException;
	
	public PageQueryResult<Resource> queryForSelf(Connection con,String professorId,@Nullable String key,int pageSize,int pageNo) throws SQLException{
        int total = 0;
        PageQueryResult<Resource> queryResult = new PageQueryResult<Resource>();
@@ -1086,7 +1101,22 @@ public abstract class ResourceDao {
	@OrderBy("ORDER BY PUBLISH_TIME DESC")
	@Where("STATUS = '1'")
	public abstract PageQueryResult<Resource> pageQueryProPublish(Connection con,String professorId,int pageSize,int pageNo) throws SQLException;
	
    //@LimitSelect
    //@OrderBy(cols = {@LimitColumn(value = "publishTime", asc = false), @LimitColumn(value = "shareId",asc = false,handlerClass = LongHandler.class)}, value = "")
    //@Where("STATUS='1'")
    //public abstract List<Resource> proPublish(Connection con, String professorId, String publishTime, long shareId, int rows) throws SQLException;
    //
    //@LimitSelect
    //@OrderBy(cols = {@LimitColumn(value = "publishTime", asc = false), @LimitColumn(value = "shareId",asc = false, handlerClass = LongHandler.class)}, value = "")
    //@Where("STATUS='1'")
    //public abstract List<Resource> orgPublish(Connection con, String orgId, String publishTime, long shareId, int rows) throws SQLException;
    @LimitSelect
    @OrderBy(cols = {@LimitColumn(value = "publishTime", asc = false), @LimitColumn(value = "shareId",asc = false, handlerClass = LongHandler.class)}, value = "")
    @Where("STATUS='1'")
    public abstract List<Resource> publish(Connection con,String resourceType,@GroupSqlColumn(handlerClass = StringHandler.class,value ={"PROFESSOR_ID = ?","ORG_ID = ?"},isAnd = false) String owner, String publishTime, long shareId, int rows) throws SQLException;
	@SelectList
	@OrderBy("ORDER BY PUBLISH_TIME DESC")
	@Where("STATUS IN ('0','1')")
@@ -1324,8 +1354,13 @@ public abstract class ResourceDao {
            try{ps.close();}catch(Exception e4){}
        }
    }
	
	/**
    @LimitSelect
    @Where("STATUS='1'")
    @OrderBy(cols = {@LimitColumn(value = "sortNum", asc = false, handlerClass = LongHandler.class), @LimitColumn(value = "publishTime", asc = false, handlerClass = StringHandler.class), @LimitColumn(value = "resourceId", asc = false, handlerClass = StringHandler.class)}, value = "")
    public abstract List<Resource> indexSearch(Connection con, @Nullable @GroupSqlColumn(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 ?)", "RESOURCE_NAME LIKE ?", "SUBJECT LIKE ?", "SUPPORTED_SERVICES LIKE ?", "ORG_NAME LIKE ?", "SPEC LIKE ?"}, additional = 1, isAnd = false, force = true) String key, long sortNum, String publishTime, String resourceId, int rows) throws SQLException;
    /**
	 * 资源搜索页面接口，添加资源拥有者基本信息
	 * @param key 搜索条件
	 * @param subject 学术领域
@@ -1804,4 +1839,11 @@ public abstract class ResourceDao {
		}
		return ret.isEmpty()?null:ret.toArray(new String[ret.size()]);		
	}
    @DefaultValue("0")
    @QueryVal
    @Where("STATUS = '1'")
    @Column(value = "COUNT(1)", handlerClass = LongHandler.class)
    @From(Resource.class)
    public abstract long countPublish(Connection con, String resourceType, @GroupSqlColumn(handlerClass = StringHandler.class, value = {"PROFESSOR_ID = ?", "ORG_ID = ?"}, isAnd = false) String owner) throws SQLException;
}

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

@@ -1,17 +1,16 @@
package com.ekexiu.portal.dao;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.List;
import com.ekexiu.portal.po.Watch;
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.LimitColumn;
import org.jfw.apt.orm.annotation.dao.method.OrderBy;
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.LimitSelect;
import org.jfw.apt.orm.annotation.dao.method.operator.PageSelect;
import org.jfw.apt.orm.annotation.dao.method.operator.QueryVal;
import org.jfw.apt.orm.annotation.dao.method.operator.SelectList;
@@ -19,7 +18,9 @@ import org.jfw.apt.orm.annotation.dao.method.operator.SelectOne;
import org.jfw.apt.orm.core.defaultImpl.IntHandler;
import org.jfw.util.PageQueryResult;
import com.ekexiu.portal.po.Watch;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.List;
@DAO
public abstract class WatchDao {
@@ -46,10 +47,19 @@ public abstract class WatchDao {
	@OrderBy(" ORDER BY CREATE_TIME DESC ")
	public abstract PageQueryResult<Watch> queryPro(Connection con, String professorId, short watchType, int pageSize, int pageNo) throws SQLException;
	@LimitSelect
	@OrderBy(cols = {@LimitColumn(value = "createTime", asc = false), @LimitColumn(value = "watchObject", asc = false)}, value = "")
	public abstract List<Watch> proList(Connection con, String professorId, short watchType, String createTime, String watchObject, int rows) throws SQLException;
	@SelectList
	@OrderBy(" ORDER BY CREATE_TIME DESC ")
	public abstract List<Watch> queryWatch(Connection con, String watchObject) throws SQLException;
	@LimitSelect
	@OrderBy(cols = {@LimitColumn(value = "createTime", asc = false), @LimitColumn(value = "professorId", asc = false)}, value = "")
	public abstract List<Watch> watchList(Connection con, String createTime, String professorId, String watchObject,int rows) throws SQLException;
	@QueryVal
	@From(Watch.class)
	@Column(value = "COUNT(1)", handlerClass = IntHandler.class)

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/question/QuestionDao.java

@@ -1,9 +1,5 @@
package com.ekexiu.portal.question;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.List;
import org.jfw.apt.annotation.DefaultValue;
import org.jfw.apt.annotation.Nullable;
import org.jfw.apt.orm.annotation.dao.Batch;
@@ -29,6 +25,10 @@ import org.jfw.apt.orm.annotation.dao.param.SqlColumn;
import org.jfw.apt.orm.core.defaultImpl.LongHandler;
import org.jfw.apt.orm.core.defaultImpl.StringHandler;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.List;
@DAO
public interface QuestionDao {
@@ -134,7 +134,7 @@ public interface QuestionDao {
	@LimitQuery
	@OrderBy("ORDER BY SCORE_DESC DESC")
	@Where("STATE='1'")
	List<SortedAnswwer> byQesScore(Connection con, String qid, @SqlColumn(handlerClass = StringHandler.class, value = { "(case when ballot=0 then '00000'  else  TO_CHAR(10000 *AGREE / BALLOT,'00009') end  || ID) < ?  " })  String score, int rows) throws SQLException;
	List<SortedAnswwer> byQesScore(Connection con, String qid, @SqlColumn(handlerClass = StringHandler.class, value = { "(case when ballot=0 then '00000'  else  TO_CHAR(10000 *AGREE / BALLOT,'00009') end || TO_CHAR(AGREE,'00000000000000000009') || ID) < ?  " })  String score, int rows) throws SQLException;
	@Insert
	int insert(Connection con,AnswerAgreeRec aar)throws SQLException;
@@ -182,4 +182,11 @@ public interface QuestionDao {
	@Column(value="COUNT(1)",handlerClass=LongHandler.class)
	@From(Answer.class)
	long answerCount(Connection con,@Nullable String uid,@Nullable String qid, @Nullable String state)throws SQLException;
	@DefaultValue("0")
	@QueryVal
	@Column(value = "COUNT(1)", handlerClass = LongHandler.class)
	@From(Answer.class)
	@Where("QID IN(SELECT ID FROM QUESTION WHERE STATE='1') AND STATE='1'")
	long answerSelfCount(Connection con, String uid)throws SQLException;
}

src/main/java/com/ekexiu/portal/question/Service.java

@@ -1,21 +1,9 @@
package com.ekexiu.portal.question;
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
import com.ekexiu.portal.notify.NotifyService;
import com.ekexiu.portal.notify.NotifyType;
import com.ekexiu.portal.service.GrowthLogService;
import com.ekexiu.portal.util.SqlUtil;
import org.jfw.apt.annotation.Autowrie;
import org.jfw.apt.annotation.DefaultValue;
import org.jfw.apt.annotation.Nullable;
@@ -38,10 +26,21 @@ import org.jfw.util.jdbc.PreparedStatementConfig;
import org.jfw.util.web.fileupload.Item;
import org.jfw.util.web.fileupload.UploadItemIterator;
import com.ekexiu.portal.notify.NotifyService;
import com.ekexiu.portal.notify.NotifyType;
import com.ekexiu.portal.service.GrowthLogService;
import com.ekexiu.portal.util.SqlUtil;
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
@Path("/question")
public class Service {
@@ -585,10 +584,11 @@ public class Service {
	 */
	@Get
	@Path("/answer/qes/byScore")
	public List<SortedAnswwer> byQes(@JdbcConn Connection con, String qid, @DefaultValue("99999") int score, @DefaultValue("\"Z\"") String id,
	public List<SortedAnswwer> byQes(@JdbcConn Connection con, String qid, @DefaultValue("99999") int score, @DefaultValue("\"Z\"") String id,@DefaultValue("0") long agree,
			@DefaultValue("10000000") int rows) throws SQLException {
		String p = "000000" + score;
		p = p.substring(p.length() - 5) + id;
		String a = "00000000000000000000"+agree;
		p = p.substring(p.length() - 5) + a.substring(a.length()-20) + id;
		return questionDao.byQesScore(con, qid, p, rows);
	}
@@ -738,6 +738,12 @@ public class Service {
		}
	}
	@Get
	@Path("/answer/bySelf/count")
	public long answerSelfCount(@JdbcConn Connection con,String uid)throws SQLException {
		return this.questionDao.answerSelfCount(con, uid);
	}
	public QetKeyWord[] build(String id, List<String> ss) {
		List<QetKeyWord> qKws = new ArrayList<>(ss.size());
		for (String s : ss) {

src/main/java/com/ekexiu/portal/question/SortedAnswwer.java

@@ -11,7 +11,7 @@ public class SortedAnswwer extends Answer {
	private transient String scoreDesc;
	
	
	@CalcColumn(nullable=false,handlerClass=StringHandler.class,column=" case when ballot=0 then '00000' else  TO_CHAR(10000 *AGREE / BALLOT,'00009') end  || ID SCORE_DESC")
	@CalcColumn(nullable=false,handlerClass=StringHandler.class,column=" case when ballot=0 then '00000' else  TO_CHAR(10000 *AGREE / BALLOT,'00009') end ||  TO_CHAR(AGREE,'00000000000000000009') || ID SCORE_DESC")
	public String getScoreDesc() {
		return scoreDesc;
	}

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

@@ -885,6 +885,12 @@ public class ArticleService {
		return this.articleDao.pageQueryProPublish(con, professorId, pageSize, pageNo);
	}
	@Get
	@Path("/publish")
	public List<Article> proPublish(@JdbcConn Connection con, String category, String owner, @DefaultValue("\"9\"") String publishTime,@DefaultValue("Long.MAX_VALUE")long shareId, int rows)throws SQLException {
			return this.articleDao.publish(con,category, owner, publishTime,shareId, rows);
	}
	@Get
	@Path("/qaForDesk")
	public List<Article> queryForDesk(@JdbcConn Connection con, String professorId) throws SQLException {
@@ -962,6 +968,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,
@@ -1118,6 +1151,23 @@ public class ArticleService {
	public List<Article> byWare(@JdbcConn Connection con,String ware,int rows) throws SQLException{
		return articleDao.queryByWareId(con, ware, rows);
	}
	@Get
	@Path("/ware")
	public List<ArticleWare> queryWares(@JdbcConn Connection con,String id)throws SQLException{
		return articleDao.queryWares(con, id);
	}
	@Get
	@Path("/count/publish")
	public long countPublish(@JdbcConn Connection con,String category,String owner)throws SQLException {
		return articleDao.countPublish(con, category, owner);
	}
	@Get
	@Path("/qm")
	public List<Article> query(@JdbcConn Connection con,String[] id)throws SQLException {
		return this.articleDao.query(con, id);
	}
	public static void main(String[] args) {
		System.out.println(DateUtil.formatDate(System.currentTimeMillis() - 7 * 24 * 60 * 60 * 1000));

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

@@ -118,6 +118,17 @@ public class PpaperService {
		return this.ppaperDao.pageQueryWithProfessor(con, id, name, pageSize, pageNo);
	}
	@Get
	@Path("/professor")
	public List<AssedPaper> queryProfessor(@JdbcConn Connection con,String owner,@Nullable String name,@DefaultValue("\"9\"")String assTime,@DefaultValue("\"Z\"")String id,int rows)throws SQLException {
		if (name == null) {
			name = "%";
		} else {
			name = "%" + name + "%";
		}
		return this.ppaperDao.queryProfessor(con, owner, name, assTime, id,rows);
	}
	@Get
	@Path("/byAuthor")
	public PageQueryResult<AssedPaper> queryByAuthor(@JdbcConn Connection con, String author, String id, @Nullable String name,
@@ -143,6 +154,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
@@ -257,4 +277,10 @@ public class PpaperService {
			return Collections.<Ppaper> emptyList();
		return this.ppaperDao.query(con, ids);
	}
	@Get
	@Path("/count/publish")
	public long countPublish(@JdbcConn Connection con,String owner)throws SQLException {
		return this.ppaperDao.countPublish(con, owner);
	}
}

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

@@ -123,6 +123,18 @@ public class PpatentServcie {
		}
		return this.ppatentDao.pageQueryWithProfessor(con, id, name, pageSize, pageNo);
	}
	@Get
	@Path("/professor")
	public List<AssedPatent> queryProfessor(@JdbcConn Connection con, String owner, @Nullable String name, @DefaultValue("\"9\"")String assTime, @DefaultValue("\"Z\"")String id, int rows)throws SQLException {
		if (name == null) {
			name = "%";
		} else {
			name = "%" + name + "%";
		}
		return this.ppatentDao.queryProfessor(con, owner, name, assTime, id,rows);
	}
	@Get
	@Path("/byAuthor")
	public PageQueryResult<AssedPatent> queryByAuthor(@JdbcConn Connection con,String author,String id,@Nullable String name,@DefaultValue("10") int pageSize,@DefaultValue("1") int pageNo)throws SQLException{
@@ -145,6 +157,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
@@ -254,5 +275,11 @@ public class PpatentServcie {
		if(ids==null || ids.length==0) return Collections.<Ppatent>emptyList();
		return this.ppatentDao.query(con, ids);		
	}
	@Get
	@Path("/count/publish")
	public long countPublish(@JdbcConn Connection con,String owner)throws SQLException {
		return this.ppatentDao.countPublish(con, owner);
	}
	
}

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;
@@ -49,14 +19,45 @@ import com.ekexiu.portal.dao.ResearchAreaLogDao;
import com.ekexiu.portal.dao.ResourceDao;
import com.ekexiu.portal.dao.UserDao;
import com.ekexiu.portal.dao.WatchDao;
import com.ekexiu.portal.po.Organization;
import com.ekexiu.portal.po.Professor;
import com.ekexiu.portal.po.Resource;
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 {
@@ -380,7 +381,7 @@ public class ProfessorService {
	@Put
	@Path
	public void update(@JdbcConn(true) Connection con, @RequestBody EditProfessor professor) throws SQLException, IOException {
	public void update(@JdbcConn(true) Connection con,final @RequestBody EditProfessor professor) throws SQLException, IOException {
		if (professor.getOrgName() != null)
			if (null != this.orgDao.queryByName(con, professor.getOrgName())) {
				professor.setOrgId(this.orgDao.queryByName(con, professor.getOrgName()));
@@ -401,6 +402,12 @@ public class ProfessorService {
				this.professorDao.updateOrgAuth(con, op.getId(), "0");
				this.demandDao.closeByCreator(con, op.getId(), op.getId());
				this.orgResStaffDao.deletePro(con, op.getId());
				JdbcUtil.execute(con,"DELETE FROM WARE_PRO WHERE PROFESSOR=?",new PreparedStatementConfig() {
					@Override
					public void config(PreparedStatement ps) throws SQLException {
						ps.setString(1, professor.getId());
					}
				});
			}
		}
		;
@@ -761,6 +768,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,
@@ -922,6 +960,24 @@ public class ProfessorService {
		}
	}
	@Get
	@Path("/qm")
	public List<EditProfessor> query(@JdbcConn Connection con,String[] id)throws SQLException {
		List<EditProfessor> editProfessors= this.professorDao.queryPro(con, id);
		if (!editProfessors.isEmpty()) {
			for (EditProfessor editProfessor : editProfessors) {
				editProfessor.setHasHeadImage(this.imageService.hasProfessorImage(editProfessor.getId()));
				if(editProfessor.getOrgId() != null) {
					Organization organization = this.orgDao.query(con, editProfessor.getOrgId());
					if(organization != null) {
						editProfessor.setOrgName(organization.getName());
					}
				}
			}
		}
		return hiddenPrivacyInfo(editProfessors);
	}
	public static <T extends Professor> T hiddenPrivacyInfo(T p) {
		if (null != p) {
			p.setPhone(null);

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 {
@@ -647,6 +646,12 @@ public class ResourceService {
		return queryResult;
	}
	
	@Get
	@Path("/lq/publish/org")
	public List<Resource> publishByOrg(@JdbcConn Connection con,String resourceName,String orgid,int rows)throws SQLException{
		return this.resourceDao.publishByOrg(con, orgid,"%"+resourceName+"%", rows);
	}
//	@Get
//	@Path("/ralateRes")
//	public List<Resource> queryLimit(@JdbcConn Connection con,@Nullable String[] keys,String resourceId,
@@ -827,7 +832,21 @@ public class ResourceService {
		}
		return resources;
	}
	
	@Get
	@Path("/publish")
	List<Resource> queryPublish(@JdbcConn Connection con, String category, String owner, @DefaultValue("\"9\"") String publishTime,@DefaultValue("Long.MAX_VALUE")long shareId, int rows) throws SQLException {
		List<Resource> resources = this.resourceDao.publish(con, category, owner, publishTime, shareId, rows);
		if (resources != null && resources.size() > 0) {
			for (Resource resource : resources) {
				resource.setImages(this.imageDao.queryRes(con, resource.getResourceId()));
			}
			return resources;
		} else {
			return Collections.emptyList();
		}
	}
	@Get
	@Path("/qaForDesk")
	public List<Resource> queryForDesk(@JdbcConn Connection con, String professorId) throws SQLException {
@@ -946,6 +965,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")
@@ -1005,4 +1052,21 @@ public class ResourceService {
		}
		return Collections.<Resource>emptyList();
	}
	@Get
	@Path("/count/publish")
	public long countPublish(@JdbcConn Connection con, String category, String owner) throws SQLException {
		return this.resourceDao.countPublish(con, category, owner);
	}
	@Get
	@Path("/qm")
	public List<Resource> query(@JdbcConn Connection con,String[] id)throws SQLException {
		List<Resource> ret = this.resourceDao.query(con,id);
		for(Resource res:ret){
			res.setImages(this.imageDao.queryRes(con, res.getResourceId()));
		}
		return ret;
	}
}

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

@@ -193,6 +193,12 @@ public class WatchService {
		return queryResult;
	}
	@Get
	@Path("/proList")
	public List<Watch> proList(@JdbcConn Connection con,String professorId,short watchType,@DefaultValue("\"9\"")String createTime,@DefaultValue("\"Z\"")String watchObject,int rows)throws SQLException {
		return this.watchDao.proList(con, professorId, watchType, createTime, watchObject, rows);
	}
	@Get
	@Path("/qaWatch")
	public List<Watch> queryWatch(@JdbcConn Connection con, String watchObject) throws SQLException {
@@ -209,6 +215,12 @@ public class WatchService {
		return watchs;
	}
	@Get
	@Path("/watchList")
	public List<Watch> watchList(@JdbcConn Connection con,String watchObject,@DefaultValue("\"9\"")String createTime,@DefaultValue("\"Z\"")String professorId,int rows) throws SQLException {
		return this.watchDao.watchList(con, createTime, professorId, watchObject, rows);
	}
	@Get
	@Path("/countObject")
	public int countObject(@JdbcConn Connection con, String id, short type) throws SQLException {

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

@@ -1,17 +1,16 @@
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.Exclude;
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.LimitColumn;
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,11 +32,8 @@ 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;
@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,
@@ -135,105 +131,40 @@ public abstract class WareDao {
	public abstract List<CountWare> queryByOwner(Connection con,
			@Nullable @GroupSqlColumn(handlerClass = StringHandler.class, value = { "NAME LIKE ?", "CNT LIKE ?", "KEYWORDS LIKE ?" }, isAnd = false) String key,
			String owner) throws SQLException;
	
	@LimitSelect
	@OrderBy(" ORDER BY PAGE_VIEWS DESC")
	@Where("STATE='1'")
	public abstract List<Ware> queryByOwnerWithPageViews(Connection con,String category,String owner,@Nullable @UnEquals String id, int rows)throws SQLException;
	
	public abstract List<Ware> queryByOwnerWithPageViews(Connection con, String category, String owner, @Nullable @UnEquals String id, int rows)
			throws SQLException;
	@LimitSelect
	@OrderBy("ORDER BY MODIFY_TIME DESC")
	@Where("STATE='1'")
	public abstract List<Ware> queryByResource(Connection con,@SqlColumn(handlerClass=StringHandler.class, value = { "ID IN (SELECT ID FROM WARE_RES WHERE RESOURCE=?)" }) String id,int rows)throws SQLException;
	public abstract List<Ware> queryByResource(Connection con,
			@SqlColumn(handlerClass = StringHandler.class, value = { "ID IN (SELECT ID FROM WARE_RES WHERE RESOURCE=?)" }) String id, int rows)
			throws SQLException;
	@LimitSelect
	@OrderBy("ORDER BY MODIFY_TIME DESC")
	@Where("STATE='1'")
	public abstract List<Ware> queryByArticle(Connection con,@SqlColumn(handlerClass=StringHandler.class, value = { "ID IN (SELECT WARE FROM ARTICLE_WARE WHERE ID=?)" }) String id,int rows) throws SQLException;
	
	
	public List<Ware> indexSeach(Connection con, String key, long sortFirst, String modifyTime, String id, int rows) throws SQLException {
		List<Ware> result = new ArrayList<Ware>(rows);
		StringBuilder sb = new StringBuilder();
		sb.append("SELECT PAGE_VIEWS,ID,NAME,KEYWORDS,CNT,COOPERATION,DESCP,CATEGORY,OWNER,IMAGES,STATE,SHARE_ID,SORT_FIRST,CREATE_TIME,MODIFY_TIME FROM WARE")
				.append(" WHERE STATE='1' AND ((SORT_FIRST<?) OR (SORT_FIRST=? AND MODIFY_TIME < ?) OR ( SORT_FIRST=? AND MODIFY_TIME = ? AND ID < ?)");
		if (key != null) {
			sb.append(" AND (NAME LIKE ? OR CNT LIKE ? OR KEYWORDS LIKE ?  OR(CATEGORY='1' AND OWNER IN(SELECT ID FROM PROFESSOR WHERE NAME LIKE ?))")
					.append(" OR (CATEGORY ='2' AND OWNER IN(SELECT ID FROM ORGANIZATION WHERE NAME LIKE ? OR FOR_SHORT LIKE ?))");
		}
		sb.append(" ORDER BY SORT_FIRST DESC,MODIFY_TIME DESC,ID DESC LIMIT ?");
		PreparedStatement ps = con.prepareStatement(sb.toString());
		try {
			int idx = 1;
			ps.setLong(idx++, sortFirst);
			ps.setLong(idx++, sortFirst);
			ps.setString(idx++, modifyTime);
			ps.setLong(idx++, sortFirst);
			ps.setString(idx++, modifyTime);
			ps.setString(idx++, id);
			if (key != null) {
				ps.setString(idx++, key);
				ps.setString(idx++, key);
				ps.setString(idx++, key);
				ps.setString(idx++, key);
				ps.setString(idx++, key);
				ps.setString(idx++, key);
			}
			ps.setInt(idx++, rows);
			java.sql.ResultSet rs = ps.executeQuery();
			try {
				while (rs.next()) {
					Ware _obj = new Ware();
					_obj.setPageViews(rs.getLong(1));
					_obj.setId(rs.getString(2));
					_obj.setName(rs.getString(3));
					java.lang.String _m_3 = rs.getString(4);
					if (rs.wasNull()) {
						_m_3 = null;
					}
					_obj.setKeywords(_m_3);
					java.lang.String _m_4 = rs.getString(5);
					if (rs.wasNull()) {
						_m_4 = null;
					}
					_obj.setCnt(_m_4);
					java.lang.String _m_5 = rs.getString(6);
					if (rs.wasNull()) {
						_m_5 = null;
					}
					_obj.setCooperation(_m_5);
					java.lang.String _m_6 = rs.getString(7);
					if (rs.wasNull()) {
						_m_6 = null;
					}
					_obj.setDescp(_m_6);
					_obj.setCategory(rs.getString(8));
					_obj.setOwner(rs.getString(9));
					java.lang.String _m_7 = rs.getString(10);
					if (rs.wasNull()) {
						_m_7 = null;
					}
					_obj.setImages(_m_7);
					_obj.setState(rs.getString(11));
					_obj.setShareId(rs.getLong(12));
					_obj.setSortFirst(rs.getLong(13));
					_obj.setCreateTime(rs.getString(14));
					_obj.setModifyTime(rs.getString(15));
					result.add(_obj);
				}
				return result;
			} finally {
				try {
					rs.close();
				} catch (Exception _m_8) {
				}
			}
		} finally {
			try {
				ps.close();
			} catch (Exception _m_9) {
			}
		}
	}
	public abstract List<Ware> queryByArticle(Connection con,
			@SqlColumn(handlerClass = StringHandler.class, value = { "ID IN (SELECT WARE FROM ARTICLE_WARE WHERE ID=?)" }) String id, int rows)
			throws SQLException;
	@LimitSelect
	@Where("STATE='1'")
	@OrderBy(cols = { @LimitColumn(value = "sortFirst", asc = false, handlerClass = LongHandler.class), @LimitColumn(value = "modifyTime", asc = false),
			@LimitColumn(value = "id", asc = false) }, value = "")
	public abstract List<Ware> indexSearch(Connection con,
			@Nullable @GroupSqlColumn(handlerClass = StringHandler.class, value = { "NAME LIKE ?", "CNT LIKE ?", "KEYWORDS LIKE ?",
					"CATEGORY='1' AND OWNER IN(SELECT ID FROM PROFESSOR WHERE NAME LIKE ?)",
					"CATEGORY ='2' AND OWNER IN(SELECT ID FROM ORGANIZATION WHERE NAME LIKE ? OR FOR_SHORT LIKE ?)" }, additional = 1, isAnd = false, force = true) String key,
			long sortFirst, String modifyTime, String id, int rows) throws SQLException;
	@Update
	@Exclude("modifyTime")
	public abstract int conUpdate(Connection con, Ware ware) throws SQLException;
}

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

@@ -1,24 +1,7 @@
package com.ekexiu.portal.ware;
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
import com.ekexiu.portal.service.GrowthLogService;
import com.ekexiu.portal.service.KeyWordService;
import org.jfw.apt.annotation.Autowrie;
import org.jfw.apt.annotation.DefaultValue;
import org.jfw.apt.annotation.Nullable;
@@ -39,8 +22,24 @@ import org.jfw.util.jdbc.ResultSetExtractor;
import org.jfw.util.web.fileupload.Item;
import org.jfw.util.web.fileupload.UploadItemIterator;
import com.ekexiu.portal.service.GrowthLogService;
import com.ekexiu.portal.service.KeyWordService;
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
@Path("/ware")
public class WareService {
@@ -231,8 +230,9 @@ public class WareService {
	 */
	@Post
	@Path("/draft")
	public String draft(@JdbcConn(true) Connection con, @RequestParam(excludeFields = { "category", "id", "state", "createTime", "modifyTime", 
			"shareId", "pageViews", "sortFirst" }) Ware ware, @Nullable String[] resource) throws SQLException, IOException {
	public String draft(@JdbcConn(true) Connection con,
			@RequestParam(excludeFields = { "category", "id", "state", "createTime", "modifyTime", "shareId", "pageViews", "sortFirst" }) Ware ware,
			@Nullable String[] resource) throws SQLException, IOException {
		ware.setState("2");
		ware.setCategory("1");
		return insert(con, ware, null, resource);
@@ -251,8 +251,10 @@ public class WareService {
	 */
	@Post
	@Path("/draft/org")
	public String draft(@JdbcConn(true) Connection con, @RequestParam(excludeFields = { "category", "id", "state", "createTime", "modifyTime", 
			"shareId", "pageViews", "sortFirst" }) Ware ware, String[] resource, String[] professor) throws SQLException, IOException {
	public String draft(@JdbcConn(true) Connection con,
			@RequestParam(excludeFields = { "category", "id", "state", "createTime", "modifyTime", "shareId", "pageViews", "sortFirst" }) Ware ware,
			@Nullable String[] resource, @Nullable String[] professor) throws SQLException, IOException {
		ware.setState("2");
		ware.setCategory("2");
		return insert(con, ware, professor, resource);
@@ -270,8 +272,9 @@ public class WareService {
	 */
	@Post
	@Path("/publish")
	public String publish(@JdbcConn(true) Connection con, @RequestParam(excludeFields = { "category", "id", "state", "createTime", "modifyTime", 
			"shareId", "pageViews", "sortFirst" }) Ware ware, String[] resource) throws SQLException, IOException {
	public String publish(@JdbcConn(true) Connection con,
			@RequestParam(excludeFields = { "category", "id", "state", "createTime", "modifyTime", "shareId", "pageViews", "sortFirst" }) Ware ware,
			@Nullable String[] resource) throws SQLException, IOException {
		ware.setState("1");
		ware.setCategory("1");
		return insert(con, ware, null, resource);
@@ -290,8 +293,9 @@ public class WareService {
	 */
	@Post
	@Path("/publish/org")
	public String publish(@JdbcConn(true) Connection con, @RequestParam(excludeFields = { "category", "id", "state", "createTime", "modifyTime", 
			"shareId", "pageViews", "sortFirst" }) Ware ware, String[] resource, String[] professor) throws SQLException, IOException {
	public String publish(@JdbcConn(true) Connection con,
			@RequestParam(excludeFields = { "category", "id", "state", "createTime", "modifyTime", "shareId", "pageViews", "sortFirst" }) Ware ware,
			@Nullable String[] resource, @Nullable String[] professor) throws SQLException, IOException {
		ware.setState("1");
		ware.setCategory("2");
		return insert(con, ware, professor, resource);
@@ -309,8 +313,9 @@ public class WareService {
	 */
	@Post
	@Path("/draft/update")
	public boolean updateDraft(@JdbcConn(true) Connection con, @RequestParam(excludeFields = { "category", "state", "createTime", "modifyTime",
			"shareId", "pageViews", "sortFirst" }) Ware ware, @Nullable String[] resource) throws SQLException, IOException {
	public boolean updateDraft(@JdbcConn(true) Connection con,
			@RequestParam(excludeFields = { "category", "state", "createTime", "modifyTime", "shareId", "pageViews", "sortFirst" }) Ware ware,
			@Nullable String[] resource) throws SQLException, IOException {
		ware.setState("2");
		ware.setCategory("1");
		return update(con, ware, null, resource);
@@ -329,8 +334,9 @@ public class WareService {
	 */
	@Post
	@Path("/draft/org/update")
	public boolean updateDraft(@JdbcConn(true) Connection con, @RequestParam(excludeFields = { "category", "state", "createTime", "modifyTime",
			"shareId", "pageViews", "sortFirst" }) Ware ware, String[] resource, String[] professor) throws SQLException, IOException {
	public boolean updateDraft(@JdbcConn(true) Connection con,
			@RequestParam(excludeFields = { "category", "state", "createTime", "modifyTime", "shareId", "pageViews", "sortFirst" }) Ware ware,
			@Nullable String[] resource, @Nullable String[] professor) throws SQLException, IOException {
		ware.setState("2");
		ware.setCategory("2");
		return update(con, ware, professor, resource);
@@ -348,11 +354,13 @@ public class WareService {
	 */
	@Post
	@Path("/publish/update")
	public String updatePublish(@JdbcConn(true) Connection con, @RequestParam(excludeFields = { "category", "state", "createTime", "modifyTime",
		 "shareId", "pageViews", "sortFirst" }) Ware ware, String[] resource) throws SQLException, IOException {
	public boolean updatePublish(@JdbcConn(true) Connection con,
			@RequestParam(excludeFields = { "category", "state", "createTime", "modifyTime", "shareId", "pageViews", "sortFirst" }) Ware ware,
			@Nullable String[] resource) throws SQLException, IOException {
		ware.setState("1");
		ware.setCategory("1");
		return insert(con, ware, null, resource);
		return update(con, ware, null, resource);
	}
	/**
@@ -368,11 +376,12 @@ public class WareService {
	 */
	@Post
	@Path("/publish/org/update")
	public String updatePublish(@JdbcConn(true) Connection con, @RequestParam(excludeFields = { "category", "state", "createTime", "modifyTime",
		"shareId", "pageViews", "sortFirst" }) Ware ware, String[] resource, String[] professor) throws SQLException, IOException {
	public boolean updatePublish(@JdbcConn(true) Connection con,
			@RequestParam(excludeFields = { "category", "state", "createTime", "modifyTime", "shareId", "pageViews", "sortFirst" }) Ware ware,
			@Nullable String[] resource, @Nullable String[] professor) throws SQLException, IOException {
		ware.setState("1");
		ware.setCategory("2");
		return insert(con, ware, professor, resource);
		return update(con, ware, professor, resource);
	}
	/**
@@ -454,7 +463,7 @@ public class WareService {
	 * @throws SQLException
	 */
	@Get
	@Path("/pq/org/seach")
	@Path("/pq/org/search")
	public PageQueryResult<CountWare> pageQueryOrg(@JdbcConn Connection con, @Nullable String key, String oid, int pageSize, int pageNo) throws SQLException {
		if (key != null) {
			key = "%" + key + "%";
@@ -539,7 +548,7 @@ public class WareService {
	 * @throws SQLException
	 */
	@Get
	@Path("/pg/seach")
	@Path("/pq/search")
	public PageQueryResult<Ware> pageQuery(@JdbcConn Connection con, @Nullable String key, String pid, int pageSize, int pageNo) throws SQLException {
		if (key != null) {
			key = "%" + key + "%";
@@ -557,7 +566,7 @@ public class WareService {
	 */
	@Post
	@Path("/delete")
	public int delete(@JdbcConn Connection con, String id) throws SQLException {
	public int delete(@JdbcConn(true) Connection con, String id) throws SQLException {
		return wareDao.logicDelete(con, id);
	}
@@ -596,7 +605,7 @@ public class WareService {
	@Post
	@Path("/incPageViews")
	public int incPageViews(@JdbcConn Connection con, String id) throws SQLException {
	public int incPageViews(@JdbcConn(true) Connection con, String id) throws SQLException {
		return wareDao.incPageViews(con, id);
	}
@@ -607,19 +616,20 @@ public class WareService {
		if (key != null) {
			key = "%" + key + "%";
		}
		return wareDao.indexSeach(con, key, sortFirst, time, id, rows);
		return wareDao.indexSearch(con, key, sortFirst, time, id, rows);
	}
	@Get
	@Path("/ralateWare")
	public List<Map<String, Object>> queryRalateWare(@JdbcConn Connection con, final String id, final int rows) throws SQLException {
		return JdbcUtil.queryList(con,
				"SELECT ID,NUM FROM (SELECT ID,COUNT(1) NUM FROM WRE_KEY_WORD WEHRE ID <> ? AND KW IN (SELECT KW FROM WRE_KEY_WORD WHERE ID=?)) T ORDER BY NUM DESC LIMIT ?",
				"SELECT ID,NUM FROM (SELECT ID,COUNT(1) NUM FROM WRE_KEY_WORD WHERE ID <> ? AND KW IN (SELECT KW FROM WRE_KEY_WORD WHERE ID = ?) AND ID IN (SELECT ID FROM WARE WHERE STATE = '1') GROUP BY ID ) T ORDER BY NUM DESC LIMIT ?",
				new ResultSetExtractor<Map<String, Object>>() {
					@Override
					public Map<String, Object> extractData(ResultSet rs) throws SQLException {
						Map<String, Object> map = new HashMap<String, Object>();
						map.put(rs.getString(1), rs.getLong(2));
						map.put("id", rs.getString(1));
						map.put("num", rs.getLong(2));
						return map;
					}
				}, new PreparedStatementConfig() {
@@ -632,22 +642,25 @@ public class WareService {
					}
				});
	}
	@Get
	@Path("/byOwnerWithPageViews")
	public List<Ware> queryBySameKwWithPageViews(@JdbcConn Connection con,String category,String owner,@Nullable String id,int rows) throws SQLException{
	public List<Ware> queryBySameKwWithPageViews(@JdbcConn Connection con, String category, String owner, @Nullable String id, int rows) throws SQLException {
		return wareDao.queryByOwnerWithPageViews(con, category, owner, id, rows);
	}
	@Get
	@Path("/byResourceWithModifyTime")
	public List<Ware> queryByResourceWithModifyTime(@JdbcConn Connection con,String id,int rows) throws SQLException{
	public List<Ware> queryByResourceWithModifyTime(@JdbcConn Connection con, String id, int rows) throws SQLException {
		return wareDao.queryByResource(con, id, rows);
	}
	@Get
	@Path("/byArticle")
	public List<Ware> queryByArticle(@JdbcConn Connection con,String id,@DefaultValue("Integer.MAX_VALUE" ) int rows) throws SQLException{
	public List<Ware> queryByArticle(@JdbcConn Connection con, String id, @DefaultValue("Integer.MAX_VALUE") int rows) throws SQLException {
		return wareDao.queryByArticle(con, id, rows);
	}
	
	//
	// @Post
	// @Path("/update")
@@ -774,4 +787,53 @@ public class WareService {
			this.size = size;
		}
	}
	/**
	 * 后台管理系统中使用
	 */
	public boolean conUpdate(Connection con, Ware ware, String[] professor, String[] resource) throws SQLException, IOException {
		String id = ware.getId();
		if (wareDao.conUpdate(con, ware) > 0) {
			this.saveSmallImg(ware.getImages());
			String[] kws = null;
			if (ware.getKeywords() != null) {
				kws = ListUtil.splitTrimExcludeEmpty(ware.getKeywords(), ',').toArray(new String[0]);
			}
			if (ware.getState().equals("1")) {
				keyWordService.refreshWrae(con, id, kws);
			} else {
				keyWordService.deleteWare(con, id);
			}
			wareDao.deleteWareRes(con, id);
			if (resource != null && resource.length > 0) {
				for (String rid : resource) {
					WareRes wr = new WareRes();
					wr.setId(id);
					wr.setResource(rid);
					wareDao.insert(con, wr);
				}
			}
			wareDao.deleteWarePro(con, id);
			if (professor != null && professor.length > 0) {
				for (String pid : professor) {
					WarePro wp = new WarePro();
					wp.setId(id);
					wp.setProfessor(pid);
					wareDao.insert(con, wp);
				}
			}
			return true;
		}
		return false;
	}
	@Post
	@Path("/publish/conUpdate")
	public boolean conUpdatePublish(@JdbcConn(true) Connection con,
			@RequestParam(excludeFields = { "category", "state", "createTime", "modifyTime", "shareId", "pageViews", "sortFirst" }) Ware ware,
			@Nullable String[] resource, @Nullable String[] professor) throws SQLException, IOException {
		ware.setState("1");
		// ware.setCategory("1");
		return conUpdate(con, ware, professor, resource);
	}
}