11

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

@@ -320,6 +320,12 @@ public abstract class ArticleDao {
	}
	@SelectList
	public abstract List<Article> query(Connection con,@In String[] articleId) throws SQLException;
	
	@LimitSelect
	@Where("STATUS ='1'")
	@OrderBy("ORDER BY PAGE_VIEWS DESC")
	public abstract List<Article> limitQueryPublish(Connection con,@In String[] articleId,int rows) throws SQLException;
	
//	public List<Article> queryLimit(Connection con,String[] keys,String articleId,int rows) throws SQLException{
//		int index = 1;

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

@@ -18,9 +18,12 @@ public interface ArticleOrgDao {
	@Insert
	int insert(Connection con,ArticleOrg org) throws SQLException;
	@SelectList
	public abstract List<ArticleOrg> query(Connection con, String articleId) throws SQLException;
	List<ArticleOrg> query(Connection con, String articleId) throws SQLException;
	@DeleteWith
	@From(ArticleOrg.class)
	public abstract int delete(Connection con, String articleId) throws SQLException;
	int delete(Connection con, String articleId) throws SQLException;
	
	@SelectList
	List<ArticleOrg> queryByOrgId(Connection con,String orgId) throws SQLException;
	
}

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

@@ -29,5 +29,7 @@ public abstract class ArticleProDao {
	@DeleteWith
	@From(ArticlePro.class)
	public abstract int delete(Connection con, String articleId) throws SQLException;
	@SelectList
	public abstract List<ArticlePro> queryByProfessorId(Connection con,String professorId) throws SQLException;
}

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

@@ -11,6 +11,7 @@ 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.operator.DeleteWith;
import org.jfw.apt.orm.annotation.dao.method.operator.Insert;
import org.jfw.apt.orm.annotation.dao.method.operator.SelectList;
import com.ekexiu.portal.po.ArticleRes;
@@ -80,4 +81,7 @@ public abstract class ArticleResDao {
	@From(ArticleRes.class)
	public abstract int delete(Connection con, String articleId) throws SQLException;
	
	@SelectList
	public abstract List<ArticleRes> queryByResourceId(Connection con,String resourceId) throws SQLException;
}

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

@@ -21,9 +21,9 @@ public interface PaperAgreeDao {
	@Insert
	int insert(Connection con,PaperAgree pa) throws SQLException;
	
	@DeleteWith
	@From(PaperAgree.class)
	int delete(Connection con,String opId,String paperId) throws SQLException;
//	@DeleteWith
//	@From(PaperAgree.class)
//	int delete(Connection con,String opId,String paperId) throws SQLException;
	
	@DeleteWith
	@From(PaperAgree.class)

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

@@ -21,9 +21,9 @@ public interface PatentAgreeDao {
	@Insert
	int insert(Connection con,PatentAgree pa) throws SQLException;
	
	@DeleteWith
	@From(PatentAgree.class)
	int delete(Connection con,String opId,String patentId) throws SQLException;
//	@DeleteWith
//	@From(PatentAgree.class)
//	int delete(Connection con,String opId,String patentId) throws SQLException;
	
	@DeleteWith
	@From(PatentAgree.class)

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

@@ -96,5 +96,40 @@ public abstract class PpaperDao {
		}
		return ret.isEmpty()?null:ret.toArray(new String[ret.size()]);		
	}
	
	public String[] queryPatentIdWithKeyWord(Connection con, String[] kws, int rows) throws SQLException {
		List<String> ret = new ArrayList<String>();
		StringBuilder sql = new StringBuilder();
		sql.append("select id,count(1) sort from pap_key_word where kw in (");
		for (int i = 0; i < kws.length; ++i) {
			sql.append("?,");
		}
		sql.delete(sql.length() - 1, sql.length());
		sql.append(") group by id order by sort desc limit ?");
		PreparedStatement ps = con.prepareStatement(sql.toString());
		try {
			int idx = 1;
			for (String kw : kws) {
				ps.setString(idx++, kw);
			}
			ps.setInt(idx++, rows);
			ResultSet rs = ps.executeQuery();
			try {
				while (rs.next()) {
					ret.add(rs.getString(1));
				}
			} finally {
				try {
					rs.close();
				} catch (Exception e1) {
				}
			}
		} finally {
			try {
				ps.close();
			} catch (Exception e2) {
			}
		}
		return ret.isEmpty() ? null : ret.toArray(new String[ret.size()]);
	}
}

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

@@ -52,47 +52,91 @@ public abstract class PpatentDao {
	@OrderBy(" ORDER BY ASS_TIME DESC,ID ASC")
	public abstract PageQueryResult<AssedPatent> pageQueryWithAuthor(Connection con,
			@SqlColumn(handlerClass = FixLenStringHandler.class, value = { "A.NAME=?" }) String author,
			@SqlColumn(handlerClass = FixLenStringHandler.class, value = { "((A.PROFESSOR_ID=?)  OR  (A.PROFESSOR_ID='################################'))" }) String id,
			@SqlColumn(handlerClass = FixLenStringHandler.class, value = {
					"((A.PROFESSOR_ID=?)  OR  (A.PROFESSOR_ID='################################'))" }) String id,
			@SqlColumn(handlerClass = FixLenStringHandler.class, value = { "P.NAME LIKE ?" }) String name, int pageSize, int pageNo) throws SQLException;
	
	@From(Ppatent.class)
	@UpdateWith
	@SetSentence("PAGE_VIEWS = PAGE_VIEWS + 1")
    public abstract int incPageViews(Connection con,String id)throws SQLException;
	
	
	public abstract int incPageViews(Connection con, String id) throws SQLException;
	@PageSelect
	@OrderBy(" ORDER BY SORT_NUM DESC,CREATE_TIME DESC,ID DESC")
	public abstract PageQueryResult<Ppatent> query(Connection con,int pageSize,int pageNo) throws SQLException;
	
	public abstract PageQueryResult<Ppatent> query(Connection con, int pageSize, int pageNo) throws SQLException;
	@PageSelect
	@OrderBy(" ORDER BY SORT_NUM DESC,CREATE_TIME DESC,ID DESC")
	@Or
	public abstract PageQueryResult<Ppatent> query(Connection con,@Alias({"code","authors","name","keywords"}) @Like String cnt,int pageSize,int pageNo) throws SQLException;
	public abstract PageQueryResult<Ppatent> query(Connection con, @Alias({ "code", "authors", "name", "keywords" }) @Like String cnt, int pageSize, int pageNo)
			throws SQLException;
	@SelectOne
	@Nullable
	public abstract Ppatent query(Connection con,long shareId)throws SQLException;
	
	public String[] queryPatentIdWithSameKeyWord(Connection con,String id,int rows)throws SQLException{
	public abstract Ppatent query(Connection con, long shareId) throws SQLException;
	public String[] queryPatentIdWithSameKeyWord(Connection con, String id, int rows) throws SQLException {
		List<String> ret = new ArrayList<String>();
		String sql = "select id,count(1) sort from pat_key_word where kw in (select kw from pat_key_word where id=?) and id <>? group by id order by sort desc limit ?";
		PreparedStatement ps = con.prepareStatement(sql);
		try{
		try {
			ps.setString(1, id);
			ps.setString(2, id);
			ps.setInt(3, rows);
			ResultSet rs = ps.executeQuery();
			try{
				while(rs.next()){
			try {
				while (rs.next()) {
					ret.add(rs.getString(1));
				}
			}finally{
				try{rs.close();}catch(Exception e1){}
			} finally {
				try {
					rs.close();
				} catch (Exception e1) {
				}
			}
		} finally {
			try {
				ps.close();
			} catch (Exception e2) {
			}
		}finally{
			try{ps.close();}catch(Exception e2){}
		}
		return ret.isEmpty()?null:ret.toArray(new String[ret.size()]);		
		return ret.isEmpty() ? null : ret.toArray(new String[ret.size()]);
	}
	public String[] queryPatentIdWithKeyWord(Connection con, String[] kws, int rows) throws SQLException {
		List<String> ret = new ArrayList<String>();
		StringBuilder sql = new StringBuilder();
		sql.append("select id,count(1) sort from pat_key_word where kw in (");
		for (int i = 0; i < kws.length; ++i) {
			sql.append("?,");
		}
		sql.delete(sql.length() - 1, sql.length());
		sql.append(") group by id order by sort desc limit ?");
		PreparedStatement ps = con.prepareStatement(sql.toString());
		try {
			int idx = 1;
			for (String kw : kws) {
				ps.setString(idx++, kw);
			}
			ps.setInt(idx++, rows);
			ResultSet rs = ps.executeQuery();
			try {
				while (rs.next()) {
					ret.add(rs.getString(1));
				}
			} finally {
				try {
					rs.close();
				} catch (Exception e1) {
				}
			}
		} finally {
			try {
				ps.close();
			} catch (Exception e2) {
			}
		}
		return ret.isEmpty() ? null : ret.toArray(new String[ret.size()]);
	}
}

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

@@ -54,7 +54,7 @@ public class ArticleService {
	private File articlePath;
	private String dateFormat = "yyyyMMdd";
	private String timeFormat = "yyyyMMddHHmmss";
	private int artMaxLen=70;
	private int artMaxLen = 70;
	private static final String JPG = "jpg";
	public static final String MAX_MODIFYTIME = "9";
	@Autowrie
@@ -81,14 +81,12 @@ public class ArticleService {
	private ArticleProDao articleProDao;
	@Autowrie
	private ArticleResDao articleResDao;
	
	@Autowrie
	private ArticleOrgDao articleOrgDao;
	
	@Autowrie
	private KeyWordService keyWordService;
	
	
	public KeyWordService getKeyWordService() {
		return keyWordService;
@@ -153,7 +151,7 @@ public class ArticleService {
	public void setArticleDao(ArticleDao articleDao) {
		this.articleDao = articleDao;
	}
	
	public ArticleAgreeDao getArticleAgreeDao() {
		return articleAgreeDao;
	}
@@ -249,7 +247,7 @@ public class ArticleService {
		out.flush();
		return out.toByteArray();
	}
	
	private byte[] readTmpFile(String fn) throws JfwBaseException {
		File file = new File(this.tmpPath, fn);
		if (!file.exists())
@@ -263,8 +261,8 @@ public class ArticleService {
			throw new JfwBaseException(91, "read temp resource image error", e);
		}
	}
	
	private void saveArtImg(String fn, String id) throws JfwBaseException, IOException{
	private void saveArtImg(String fn, String id) throws JfwBaseException, IOException {
		byte[] src = this.readTmpFile(fn);
		src = JpgUtil.read(src);
		byte[] shareResImage = this.resImage(src, this.artMaxLen);
@@ -277,69 +275,68 @@ public class ArticleService {
		IoUtil.saveStream(new FileOutputStream(new File(dateFile, id + "." + JPG)), src, true);
		IoUtil.saveStream(new FileOutputStream(new File(dateFile, id + "_s." + JPG)), shareResImage, true);
	}
	
	private String createDate(){
	private String createDate() {
		SimpleDateFormat df = new SimpleDateFormat(this.dateFormat);
		String date = df.format(new Date());
		return date;
	}
	
	private String publishTime(){
	private String publishTime() {
		SimpleDateFormat df = new SimpleDateFormat(this.timeFormat);
		String publishTime = df.format(new Date());
		return publishTime;
	}
	
	@Post
	@Path
	public String insert(@JdbcConn(true) Connection con, Article article) 
			throws SQLException, IOException, JfwBaseException{
	public String insert(@JdbcConn(true) Connection con, Article article) throws SQLException, IOException, JfwBaseException {
		String articleId = StringUtil.buildUUID();
		if(article.getArticleImg() != null){
		if (article.getArticleImg() != null) {
			this.saveArtImg(article.getArticleImg(), articleId);
			article.setArticleImg(this.createDate()+"/"+articleId+"."+JPG);
			article.setArticleImg(this.createDate() + "/" + articleId + "." + JPG);
		}
		article.setArticleId(articleId);
		article.setArticleAgree(0);
		article.setPageViews(0);
		article.setStatus("1");
		article.setPublishTime(this.publishTime());
		if(article.getProfessorId() != null && article.getOrgId() == null){
		if (article.getProfessorId() != null && article.getOrgId() == null) {
			article.setArticleType("1");
		}else if(article.getProfessorId() == null && article.getOrgId() != null){
		} else if (article.getProfessorId() == null && article.getOrgId() != null) {
			article.setArticleType("2");
		}else{
		} else {
			throw new JfwBaseException(-1, "错误参数：文章发布者ID");
		}
		this.articleDao.insert(con, article);
		return articleId;
	}
	
	@Post
	@Path("/save")
	public String saveArticle(@JdbcConn(true) Connection con,Article article,@Nullable String[] professors,
			@Nullable String[] resources,@Nullable String[] orgs) throws SQLException, IOException, JfwBaseException{
		if(article.getArticleId() == null){
	public String saveArticle(@JdbcConn(true) Connection con, Article article, @Nullable String[] professors, @Nullable String[] resources,
			@Nullable String[] orgs) throws SQLException, IOException, JfwBaseException {
		if (article.getArticleId() == null) {
			String articleId = StringUtil.buildUUID();
			if(article.getArticleImg() != null){
			if (article.getArticleImg() != null) {
				this.saveArtImg(article.getArticleImg(), articleId);
				article.setArticleImg(this.createDate()+"/"+articleId+"."+JPG);
				article.setArticleImg(this.createDate() + "/" + articleId + "." + JPG);
			}
			article.setArticleId(articleId);
			article.setArticleAgree(0);
			article.setPageViews(0);
			article.setStatus("1");
			article.setPublishTime(this.publishTime());
			if(article.getProfessorId() != null && article.getOrgId() == null){
			if (article.getProfessorId() != null && article.getOrgId() == null) {
				article.setArticleType("1");
			}else if(article.getProfessorId() == null && article.getOrgId() != null){
			} else if (article.getProfessorId() == null && article.getOrgId() != null) {
				article.setArticleType("2");
			}else{
			} else {
				throw new JfwBaseException(-1, "错误参数：文章发布者ID");
			}
			this.articleDao.insert(con, article);
			this.keyWordService.refreshArticle(con,articleId, KeyWordService.splitKeyWord(article.getSubject()));
			if(professors != null){
			this.keyWordService.refreshArticle(con, articleId, KeyWordService.splitKeyWord(article.getSubject()));
			if (professors != null) {
				for (String professor : professors) {
					ArticlePro articlePro = new ArticlePro();
					articlePro.setArticleId(articleId);
@@ -347,7 +344,7 @@ public class ArticleService {
					this.articleProDao.insert(con, articlePro);
				}
			}
			if(resources != null){
			if (resources != null) {
				for (String resource : resources) {
					ArticleRes articleRes = new ArticleRes();
					articleRes.setArticleId(articleId);
@@ -355,8 +352,8 @@ public class ArticleService {
					this.articleResDao.insert(con, articleRes);
				}
			}
			if(orgs!=null && orgs.length>0){
				for(String org:orgs){
			if (orgs != null && orgs.length > 0) {
				for (String org : orgs) {
					ArticleOrg articleOrg = new ArticleOrg();
					articleOrg.setArticleId(articleId);
					articleOrg.setOrgId(org);
@@ -364,18 +361,18 @@ public class ArticleService {
				}
			}
			return articleId;
		}else if(article.getArticleId().trim().length() == 32){
			if(article.getArticleImg() != null){
		} else if (article.getArticleId().trim().length() == 32) {
			if (article.getArticleImg() != null) {
				this.saveArtImg(article.getArticleImg(), article.getArticleId());
				article.setArticleImg(this.createDate()+"/"+article.getArticleId()+"."+JPG);
				article.setArticleImg(this.createDate() + "/" + article.getArticleId() + "." + JPG);
			}
			this.articleDao.update(con, article);
			this.articleDao.updatePublishTime(con, article.getArticleId(), "1", this.publishTime());
			this.keyWordService.refreshArticle(con,article.getArticleId(), KeyWordService.splitKeyWord(article.getSubject()));
			this.keyWordService.refreshArticle(con, article.getArticleId(), KeyWordService.splitKeyWord(article.getSubject()));
			this.articleProDao.delete(con, article.getArticleId());
			this.articleResDao.delete(con, article.getArticleId());
			this.articleOrgDao.delete(con, article.getArticleId());
			if(professors != null){
			if (professors != null) {
				for (String professor : professors) {
					ArticlePro articlePro = new ArticlePro();
					articlePro.setArticleId(article.getArticleId());
@@ -383,7 +380,7 @@ public class ArticleService {
					this.articleProDao.insert(con, articlePro);
				}
			}
			if(resources != null){
			if (resources != null) {
				for (String resource : resources) {
					ArticleRes articleRes = new ArticleRes();
					articleRes.setArticleId(article.getArticleId());
@@ -391,8 +388,8 @@ public class ArticleService {
					this.articleResDao.insert(con, articleRes);
				}
			}
			if(orgs!=null && orgs.length>0){
				for(String org:orgs){
			if (orgs != null && orgs.length > 0) {
				for (String org : orgs) {
					ArticleOrg articleOrg = new ArticleOrg();
					articleOrg.setArticleId(article.getArticleId());
					articleOrg.setOrgId(org);
@@ -400,35 +397,35 @@ public class ArticleService {
				}
			}
			return article.getArticleId();
		}else{
		} else {
			throw new JfwBaseException(-2, "bad parameter:articleId");
		}
	}
	
	@Post
	@Path("/draft")
	public String draft(@JdbcConn(true) Connection con,Article article,@Nullable String[] professors,
			@Nullable String[] resources,@Nullable String[] orgs) throws SQLException, IOException, JfwBaseException{
		if(article.getArticleId() == null){
	public String draft(@JdbcConn(true) Connection con, Article article, @Nullable String[] professors, @Nullable String[] resources, @Nullable String[] orgs)
			throws SQLException, IOException, JfwBaseException {
		if (article.getArticleId() == null) {
			String articleId = StringUtil.buildUUID();
			if(article.getArticleImg() != null){
			if (article.getArticleImg() != null) {
				this.saveArtImg(article.getArticleImg(), articleId);
				article.setArticleImg(this.createDate()+"/"+articleId+"."+JPG);
				article.setArticleImg(this.createDate() + "/" + articleId + "." + JPG);
			}
			article.setArticleId(articleId);
			article.setArticleAgree(0);
			article.setPageViews(0);
			article.setStatus("0");
			if(article.getProfessorId() != null && article.getOrgId() == null){
			if (article.getProfessorId() != null && article.getOrgId() == null) {
				article.setArticleType("1");
			}else if(article.getProfessorId() == null && article.getOrgId() != null){
			} else if (article.getProfessorId() == null && article.getOrgId() != null) {
				article.setArticleType("2");
			}else{
			} else {
				throw new JfwBaseException(-1, "错误参数：文章发布者ID");
			}
			this.articleDao.insert(con, article);
			this.keyWordService.refreshArticle(con,articleId, null);
			if(professors != null){
			this.keyWordService.refreshArticle(con, articleId, null);
			if (professors != null) {
				for (String professor : professors) {
					ArticlePro articlePro = new ArticlePro();
					articlePro.setArticleId(articleId);
@@ -436,7 +433,7 @@ public class ArticleService {
					this.articleProDao.insert(con, articlePro);
				}
			}
			if(resources != null){
			if (resources != null) {
				for (String resource : resources) {
					ArticleRes articleRes = new ArticleRes();
					articleRes.setArticleId(articleId);
@@ -444,8 +441,8 @@ public class ArticleService {
					this.articleResDao.insert(con, articleRes);
				}
			}
			if(orgs!=null && orgs.length>0){
				for(String org:orgs){
			if (orgs != null && orgs.length > 0) {
				for (String org : orgs) {
					ArticleOrg articleOrg = new ArticleOrg();
					articleOrg.setArticleId(articleId);
					articleOrg.setOrgId(org);
@@ -453,10 +450,10 @@ public class ArticleService {
				}
			}
			return articleId;
		}else if(article.getArticleId().trim().length() == 32){
			if(article.getArticleImg() != null){
		} else if (article.getArticleId().trim().length() == 32) {
			if (article.getArticleImg() != null) {
				this.saveArtImg(article.getArticleImg(), article.getArticleId());
				article.setArticleImg(this.createDate()+"/"+article.getArticleId()+"."+JPG);
				article.setArticleImg(this.createDate() + "/" + article.getArticleId() + "." + JPG);
			}
			this.articleDao.update(con, article);
			this.articleDao.updateStatus(con, article.getArticleId(), "0");
@@ -464,7 +461,7 @@ public class ArticleService {
			this.articleProDao.delete(con, article.getArticleId());
			this.articleResDao.delete(con, article.getArticleId());
			this.articleOrgDao.delete(con, article.getArticleId());
			if(professors != null){
			if (professors != null) {
				for (String professor : professors) {
					ArticlePro articlePro = new ArticlePro();
					articlePro.setArticleId(article.getArticleId());
@@ -472,7 +469,7 @@ public class ArticleService {
					this.articleProDao.insert(con, articlePro);
				}
			}
			if(resources != null){
			if (resources != null) {
				for (String resource : resources) {
					ArticleRes articleRes = new ArticleRes();
					articleRes.setArticleId(article.getArticleId());
@@ -480,8 +477,8 @@ public class ArticleService {
					this.articleResDao.insert(con, articleRes);
				}
			}
			if(orgs!=null && orgs.length>0){
				for(String org:orgs){
			if (orgs != null && orgs.length > 0) {
				for (String org : orgs) {
					ArticleOrg articleOrg = new ArticleOrg();
					articleOrg.setArticleId(article.getArticleId());
					articleOrg.setOrgId(org);
@@ -489,37 +486,37 @@ public class ArticleService {
				}
			}
			return article.getArticleId();
		}else{
		} else {
			throw new JfwBaseException(-2, "bad parameter:articleId");
		}
	}
	
	@Post
	@Path("/timing")
	public String timingPublish(@JdbcConn(true) Connection con,Article article,@Nullable String[] professors,
			@Nullable String[] resources,@Nullable String[] orgs) throws SQLException, IOException, JfwBaseException{
		if(article.getPublishTime() == null){
	public String timingPublish(@JdbcConn(true) Connection con, Article article, @Nullable String[] professors, @Nullable String[] resources,
			@Nullable String[] orgs) throws SQLException, IOException, JfwBaseException {
		if (article.getPublishTime() == null) {
			throw new JfwBaseException(-3, "no parameter found:publishTime");
		}
		if(article.getArticleId() == null){
		if (article.getArticleId() == null) {
			String articleId = StringUtil.buildUUID();
			if(article.getArticleImg() != null){
			if (article.getArticleImg() != null) {
				this.saveArtImg(article.getArticleImg(), articleId);
				article.setArticleImg(this.createDate()+"/"+articleId+"."+JPG);
				article.setArticleImg(this.createDate() + "/" + articleId + "." + JPG);
			}
			article.setArticleId(articleId);
			article.setArticleAgree(0);
			article.setPageViews(0);
			article.setStatus("2");
			if(article.getProfessorId() != null && article.getOrgId() == null){
			if (article.getProfessorId() != null && article.getOrgId() == null) {
				article.setArticleType("1");
			}else if(article.getProfessorId() == null && article.getOrgId() != null){
			} else if (article.getProfessorId() == null && article.getOrgId() != null) {
				article.setArticleType("2");
			}else{
			} else {
				throw new JfwBaseException(-1, "错误参数：文章发布者ID");
			}
			this.articleDao.insert(con, article);
			if(professors != null){
			if (professors != null) {
				for (String professor : professors) {
					ArticlePro articlePro = new ArticlePro();
					articlePro.setArticleId(articleId);
@@ -527,7 +524,7 @@ public class ArticleService {
					this.articleProDao.insert(con, articlePro);
				}
			}
			if(resources != null){
			if (resources != null) {
				for (String resource : resources) {
					ArticleRes articleRes = new ArticleRes();
					articleRes.setArticleId(articleId);
@@ -535,8 +532,8 @@ public class ArticleService {
					this.articleResDao.insert(con, articleRes);
				}
			}
			if(orgs!=null && orgs.length>0){
				for(String org:orgs){
			if (orgs != null && orgs.length > 0) {
				for (String org : orgs) {
					ArticleOrg articleOrg = new ArticleOrg();
					articleOrg.setArticleId(articleId);
					articleOrg.setOrgId(org);
@@ -544,19 +541,19 @@ public class ArticleService {
				}
			}
			return articleId;
		}else if(article.getArticleId().trim().length() == 32){
			if(article.getArticleImg() != null){
		} else if (article.getArticleId().trim().length() == 32) {
			if (article.getArticleImg() != null) {
				this.saveArtImg(article.getArticleImg(), article.getArticleId());
				article.setArticleImg(this.createDate()+"/"+article.getArticleId()+"."+JPG);
				article.setArticleImg(this.createDate() + "/" + article.getArticleId() + "." + JPG);
			}
			this.articleDao.update(con, article);
			this.articleDao.updatePublishTime(con, article.getArticleId(), "2", article.getPublishTime());
			this.keyWordService.refreshArticle(con,article.getArticleId(), null);
			this.keyWordService.refreshArticle(con, article.getArticleId(), null);
			this.articleResDao.delete(con, article.getArticleId());
			this.articleProDao.delete(con, article.getArticleId());
			this.articleOrgDao.delete(con, article.getArticleId());
			
			if(professors != null){
			if (professors != null) {
				for (String professor : professors) {
					ArticlePro articlePro = new ArticlePro();
					articlePro.setArticleId(article.getArticleId());
@@ -564,7 +561,7 @@ public class ArticleService {
					this.articleProDao.insert(con, articlePro);
				}
			}
			if(resources != null){
			if (resources != null) {
				for (String resource : resources) {
					ArticleRes articleRes = new ArticleRes();
					articleRes.setArticleId(article.getArticleId());
@@ -572,8 +569,8 @@ public class ArticleService {
					this.articleResDao.insert(con, articleRes);
				}
			}
			if(orgs!=null && orgs.length>0){
				for(String org:orgs){
			if (orgs != null && orgs.length > 0) {
				for (String org : orgs) {
					ArticleOrg articleOrg = new ArticleOrg();
					articleOrg.setArticleId(article.getArticleId());
					articleOrg.setOrgId(org);
@@ -581,177 +578,179 @@ public class ArticleService {
				}
			}
			return article.getArticleId();
		}else{
		} else {
			throw new JfwBaseException(-2, "bad parameter:articleId");
		}
	}
	
	@Post
	@Path("/updateArt")
	public void update(@JdbcConn(true) Connection con, Article article) 
			throws SQLException, JfwBaseException, IOException{
		if(article.getArticleImg() != null){
	public void update(@JdbcConn(true) Connection con, Article article) throws SQLException, JfwBaseException, IOException {
		if (article.getArticleImg() != null) {
			this.saveArtImg(article.getArticleImg(), article.getArticleId());
			article.setArticleImg(this.createDate()+"/"+article.getArticleId()+"."+JPG);
			article.setArticleImg(this.createDate() + "/" + article.getArticleId() + "." + JPG);
		}
		this.articleDao.update(con, article);
	}
	
	@Post
	@Path("/pageViews")
	public void pageViews(@JdbcConn(true) Connection con,String articleId) throws SQLException{
	public void pageViews(@JdbcConn(true) Connection con, String articleId) throws SQLException {
		this.articleDao.incPageViews(con, articleId);
	}
	
	@Post
	@Path("/updateDraft")
	public void updateDraft(@JdbcConn(true) Connection con, String articleId) throws SQLException{
		//修改文章状态为草稿
	public void updateDraft(@JdbcConn(true) Connection con, String articleId) throws SQLException {
		// 修改文章状态为草稿
		this.articleDao.updateStatus(con, articleId, "0");
		this.keyWordService.refreshArticle(con,articleId,null);
		this.keyWordService.refreshArticle(con, articleId, null);
	}
	
	@Post
	@Path("/publish")
	public void publish(@JdbcConn(true) Connection con,String articleId) throws SQLException{
		//修改文章状态为发布
	public void publish(@JdbcConn(true) Connection con, String articleId) throws SQLException {
		// 修改文章状态为发布
		this.articleDao.updateStatus(con, articleId, "1");
		Article a = this.articleDao.queryOne(con, articleId);
		if(a!=null){
			this.keyWordService.refreshArticle(con,articleId,KeyWordService.splitKeyWord(a.getSubject()));
		if (a != null) {
			this.keyWordService.refreshArticle(con, articleId, KeyWordService.splitKeyWord(a.getSubject()));
		}
	}
	
	@Post
	@Path("/deleteArticle")
	public void deleteArticle(@JdbcConn(true) Connection con,String articleId) throws SQLException{
		//修改文章状态为删除
	public void deleteArticle(@JdbcConn(true) Connection con, String articleId) throws SQLException {
		// 修改文章状态为删除
		this.articleDao.updateStatus(con, articleId, "3");
		this.keyWordService.refreshArticle(con, articleId,null);
		this.keyWordService.refreshArticle(con, articleId, null);
	}
	
	@Post
	@Path("/close")
	public void closeArticle(@JdbcConn(true) Connection con,String articleId) throws SQLException{
		//修改文章状态为关闭
	public void closeArticle(@JdbcConn(true) Connection con, String articleId) throws SQLException {
		// 修改文章状态为关闭
		this.articleDao.updateStatus(con, articleId, "4");
	}
	
	@Post
	@Path("/agree")
	public void agree(@JdbcConn(true) Connection con,String operateId,String articleId)throws SQLException{
		if(this.articleDao.incAgree(con, articleId) > 0){
	public void agree(@JdbcConn(true) Connection con, String operateId, String articleId) throws SQLException {
		if (this.articleDao.incAgree(con, articleId) > 0) {
			ArticleAgree articleAgree = new ArticleAgree();
			articleAgree.setOperateId(operateId);
			articleAgree.setArticleId(articleId);
			this.articleAgreeDao.insert(con, articleAgree);
		}
	}
	
	@Post
	@Path("/unAgree")
	public void unAgree(@JdbcConn(true) Connection con,String operateId,String articleId)throws SQLException{
		if(this.articleDao.decAgree(con, articleId) > 0){
	public void unAgree(@JdbcConn(true) Connection con, String operateId, String articleId) throws SQLException {
		if (this.articleDao.decAgree(con, articleId) > 0) {
			this.articleAgreeDao.deleteAgree(con, operateId, articleId);
		}
	}
	
	@Get
	@Path("/isAgree")
	public ArticleAgree queryAgree(@JdbcConn Connection con,String operateId,String articleId)throws SQLException{
	public ArticleAgree queryAgree(@JdbcConn Connection con, String operateId, String articleId) throws SQLException {
		return this.articleAgreeDao.queryOne(con, operateId, articleId);
	}
	
	@Get
	@Path("/agreeList")
	public List<ArticleAgree> queryAgreeList(@JdbcConn Connection con,String articleId)throws SQLException{
	public List<ArticleAgree> queryAgreeList(@JdbcConn Connection con, String articleId) throws SQLException {
		return this.articleAgreeDao.query(con, articleId);
	}
	
	@Get
	@Path("/qaPro")
	public List<Article> queryPro(@JdbcConn Connection con, String professorId) throws SQLException{
	public List<Article> queryPro(@JdbcConn Connection con, String professorId) throws SQLException {
		return this.articleDao.queryPro(con, professorId);
	}
	
	@Get
	@Path("/qaProPublish")
	public List<Article> queryProPublish(@JdbcConn Connection con, String professorId) throws SQLException{
	public List<Article> queryProPublish(@JdbcConn Connection con, String professorId) throws SQLException {
		return this.articleDao.queryProPublish(con, professorId);
	}
	
	@Get
	@Path("/pqProPublish")
	public PageQueryResult<Article> pageQueryProPublish(@JdbcConn Connection con, String professorId,@DefaultValue("10") int pageSize,@DefaultValue("1") int pageNo) throws SQLException{
		return this.articleDao.pageQueryProPublish(con, professorId,pageSize,pageNo);
	public PageQueryResult<Article> pageQueryProPublish(@JdbcConn Connection con, String professorId, @DefaultValue("10") int pageSize,
			@DefaultValue("1") int pageNo) throws SQLException {
		return this.articleDao.pageQueryProPublish(con, professorId, pageSize, pageNo);
	}
	
	@Get
	@Path("/qaForDesk")
	public List<Article> queryForDesk(@JdbcConn Connection con, String professorId) throws SQLException{
	public List<Article> queryForDesk(@JdbcConn Connection con, String professorId) throws SQLException {
		return this.articleDao.queryForDesk(con, professorId);
	}
	
	@Get
	@Path("/qaOrg")
	public List<Article> queryOrg(@JdbcConn Connection con,String orgId)throws SQLException{
	public List<Article> queryOrg(@JdbcConn Connection con, String orgId) throws SQLException {
		return this.articleDao.queryOrg(con, orgId);
	}
	
	@Get
	@Path("/qaOrgPublish")
	public List<Article> queryOrgPublish(@JdbcConn Connection con,String orgId)throws SQLException{
	public List<Article> queryOrgPublish(@JdbcConn Connection con, String orgId) throws SQLException {
		return this.articleDao.queryOrgPublish(con, orgId);
	}
	
	@Get
	@Path("/pqOrgPublish")
	public PageQueryResult<Article> pageQueryOrgPublish(@JdbcConn Connection con,String orgId,@DefaultValue("10") int pageSize,@DefaultValue("1") int pageNo)throws SQLException{
		return this.articleDao.pageQueryOrgPublish(con, orgId,pageSize,pageNo);
	public PageQueryResult<Article> pageQueryOrgPublish(@JdbcConn Connection con, String orgId, @DefaultValue("10") int pageSize, @DefaultValue("1") int pageNo)
			throws SQLException {
		return this.articleDao.pageQueryOrgPublish(con, orgId, pageSize, pageNo);
	}
	
	@Get
	@Path("/qlOrg")
	public List<Article> queryLimitOrg(@JdbcConn Connection con,String orgId,@DefaultValue("com.ekexiu.portal.service.ArticleService.MAX_MODIFYTIME") String modifyTime,@DefaultValue("20") int rows)throws SQLException{
	public List<Article> queryLimitOrg(@JdbcConn Connection con, String orgId,
			@DefaultValue("com.ekexiu.portal.service.ArticleService.MAX_MODIFYTIME") String modifyTime, @DefaultValue("20") int rows) throws SQLException {
		return this.articleDao.queryLimit(con, orgId, modifyTime, rows);
	}
	
	@Get
	@Path("/query")
	public Article queryOne(@JdbcConn Connection con, String articleId) throws SQLException{
	public Article queryOne(@JdbcConn Connection con, String articleId) throws SQLException {
		return this.articleDao.queryOne(con, articleId);
	}
	
	@Get
	@Path("/pqpublish")
	public PageQueryResult<Article> queryPagePublish(@JdbcConn Connection con,@Nullable String articleTitle,
			@DefaultValue("10") int pageSize,@DefaultValue("1") int pageNo)throws SQLException{
		if(articleTitle != null){
	public PageQueryResult<Article> queryPagePublish(@JdbcConn Connection con, @Nullable String articleTitle, @DefaultValue("10") int pageSize,
			@DefaultValue("1") int pageNo) throws SQLException {
		if (articleTitle != null) {
			articleTitle = "%" + articleTitle + "%";
		}
		return this.articleDao.queryPageForPublish(con, articleTitle, pageSize, pageNo);
	}
	
	@Get
	@Path("/firstpq")
	public PageQueryResult<Article> firstPageQuery(@JdbcConn Connection con,@Nullable String key,
			@DefaultValue("20") int pageSize,@DefaultValue("1") int pageNo)throws SQLException{
		if(key != null){
	public PageQueryResult<Article> firstPageQuery(@JdbcConn Connection con, @Nullable String key, @DefaultValue("20") int pageSize,
			@DefaultValue("1") int pageNo) throws SQLException {
		if (key != null) {
			key = "%" + key + "%";
		}
		PageQueryResult<Article> queryResult = this.articleDao.firstPageQuery(con, key, pageSize, pageNo);
		List<Article> articles = queryResult.getData();
		if(!articles.isEmpty()){
		if (!articles.isEmpty()) {
			for (Article article : articles) {
				if("1".equals(article.getArticleType())){
				if ("1".equals(article.getArticleType())) {
					EditProfessor professor = this.professorDao.queryBaseInfo(con, article.getProfessorId());
					if(professor != null){
					if (professor != null) {
						professor.setHasHeadImage(this.imageService.hasProfessorImage(professor.getId()));
					}
					article.setProfessor(professor);
				}else if("2".equals(article.getArticleType())){
				} else if ("2".equals(article.getArticleType())) {
					EditOrganization organization = this.orgDao.queryEditOrg(con, article.getOrgId());
					if(organization != null){
					if (organization != null) {
						organization.setHasOrgLogo(this.imageService.hasOrgLogo(organization.getId()));
					}
					article.setEditOrganization(organization);
@@ -760,44 +759,45 @@ public class ArticleService {
		}
		return queryResult;
	}
	
	@Get
	@Path("/pqself")
	public PageQueryResult<Article> queryPageSelf(@JdbcConn Connection con,@Nullable String professorId,@Nullable String orgId,
			@Nullable String articleTitle,@DefaultValue("10") int pageSize,@DefaultValue("1") int pageNo)throws SQLException{
		if(articleTitle != null){
	public PageQueryResult<Article> queryPageSelf(@JdbcConn Connection con, @Nullable String professorId, @Nullable String orgId, @Nullable String articleTitle,
			@DefaultValue("10") int pageSize, @DefaultValue("1") int pageNo) throws SQLException {
		if (articleTitle != null) {
			articleTitle = "%" + articleTitle + "%";
		}
		return this.articleDao.queryPageForSelf(con, professorId, orgId, articleTitle, pageSize, pageNo);
	}
	
	@Get
	@Path("/pqFind")
	public PageQueryResult<FindInfo> queryPage(@JdbcConn Connection con,@DefaultValue("10") int pageSize,@DefaultValue("1") int pageNo)throws SQLException{
	public PageQueryResult<FindInfo> queryPage(@JdbcConn Connection con, @DefaultValue("10") int pageSize, @DefaultValue("1") int pageNo) throws SQLException {
		PageQueryResult<FindInfo> queryResult = this.articleDao.queryPage(con, pageSize, pageNo);
		List<FindInfo> findInfos = queryResult.getData();
		for (FindInfo findInfo : findInfos) {
			if("3".equals(findInfo.getType())){
			if ("3".equals(findInfo.getType())) {
				List<Image> images = this.imagesService.queryRes(con, findInfo.getId());
				if(images.size() > 0){
					findInfo.setImage(findInfo.getId()+".jpg");
				if (images.size() > 0) {
					findInfo.setImage(findInfo.getId() + ".jpg");
				}
			}
		}
		queryResult.setData(findInfos);
		return queryResult;
	}
	
	@Get
	@Path("/findHot")
	public PageQueryResult<FindInfo> queryFindHot(@JdbcConn Connection con,@DefaultValue("10") int pageSize,@DefaultValue("1") int pageNo)throws SQLException{
	public PageQueryResult<FindInfo> queryFindHot(@JdbcConn Connection con, @DefaultValue("10") int pageSize, @DefaultValue("1") int pageNo)
			throws SQLException {
		PageQueryResult<FindInfo> queryResult = this.articleDao.queryFindHot(con, pageSize, pageNo);
		List<FindInfo> findInfos = queryResult.getData();
		if(!findInfos.isEmpty()){
		if (!findInfos.isEmpty()) {
			for (FindInfo findInfo : findInfos) {
				if("3".equals(findInfo.getType()) || "4".equals(findInfo.getType())){
				if ("3".equals(findInfo.getType()) || "4".equals(findInfo.getType())) {
					List<Image> images = this.imagesService.queryRes(con, findInfo.getId());
					if(images.size() > 0){
					if (images.size() > 0) {
						findInfo.setImage(images.get(0).getImageSrc());
					}
				}
@@ -806,62 +806,117 @@ public class ArticleService {
		}
		return queryResult;
	}
	
	@Get
	@Path("/ralatePro")
	public List<ArticlePro> ralatePro(@JdbcConn Connection con,String articleId) throws SQLException{
	public List<ArticlePro> ralatePro(@JdbcConn Connection con, String articleId) throws SQLException {
		return this.articleProDao.query(con, articleId);
	}
	
	@Get
	@Path("/ralateRes")
	public List<ArticleRes> ralateRes(@JdbcConn Connection con,String articleId) throws SQLException{
	public List<ArticleRes> ralateRes(@JdbcConn Connection con, String articleId) throws SQLException {
		return this.articleResDao.query(con, articleId);
	}
	@Get
	@Path("/ralateOrg")
	public List<ArticleOrg> ralateOrg(@JdbcConn Connection con,String articleId) throws SQLException{
	public List<ArticleOrg> ralateOrg(@JdbcConn Connection con, String articleId) throws SQLException {
		return this.articleOrgDao.query(con, articleId);
	}	
	
	
	}
	@Get
	@Path("/ralateArticles")
	public List<Article> ralateArticles(@JdbcConn Connection con,@Nullable String[] keys,@Nullable String professorId,
			@Nullable String orgId,String articleId,@DefaultValue("5") int rows)throws SQLException{
	public List<Article> ralateArticles(@JdbcConn Connection con, @Nullable String[] keys, @Nullable String professorId, @Nullable String orgId,
			String articleId, @DefaultValue("5") int rows) throws SQLException {
		String[] ids = this.articleDao.queryArticleIdWithSameKeyWord(con, articleId, rows);
		if(ids!=null){
			return this.articleDao.query(con,ids);
		if (ids != null) {
			return this.articleDao.query(con, ids);
		}
		return Collections.<Article>emptyList();
//		List<Article> articles = new ArrayList<Article>();
//		if(keys != null){
//			articles = this.articleDao.queryLimit(con, keys, articleId, rows);
//		}
//		if(articles.isEmpty()){
//			articles = this.articleDao.queryByAuthor(con, professorId, orgId, articleId, rows);
//			if(articles.isEmpty()){
//				articles = this.articleDao.queryByPageViews(con, articleId, rows);
//			}
//		}
//		return articles;
		return Collections.<Article> emptyList();
		// List<Article> articles = new ArrayList<Article>();
		// if(keys != null){
		// articles = this.articleDao.queryLimit(con, keys, articleId, rows);
		// }
		// if(articles.isEmpty()){
		// articles = this.articleDao.queryByAuthor(con, professorId, orgId,
		// articleId, rows);
		// if(articles.isEmpty()){
		// articles = this.articleDao.queryByPageViews(con, articleId, rows);
		// }
		// }
		// return articles;
	}
	// @Post
	// @Path("/delete")
	// public void delete(@JdbcConn(true) Connection con, String articleId)
	// throws SQLException{
	// this.articleDao.delete(con, articleId);
	// this.leaveWordDao.deleteArticle(con, articleId,LeaveWordService.ARTICLE);
	// this.articleAgreeDao.delete(con, articleId);
	// this.watchDao.deleteWatch(con, articleId);
	// this.articleOrgDao.delete(con, articleId);
	// this.articleProDao.delete(con, articleId);
	// this.articleProDao.delete(con, articleId);
	// }
	@Get
	@Path("/byAssProfessor")
	public List<Article> byAssProfessor(@JdbcConn Connection con, String id, @DefaultValue("5") int rows) throws SQLException {
		List<ArticlePro> pros = this.articleProDao.queryByProfessorId(con, id);
		if (pros == null || pros.isEmpty()) {
			return Collections.<Article> emptyList();
		}
		String[] ids = new String[pros.size()];
		int i = 0;
		for (ArticlePro ar : pros) {
			ids[i++] = ar.getArticleId();
		}
		return this.articleDao.limitQueryPublish(con, ids, rows);
	}
	
//	@Post
//	@Path("/delete")
//	public void delete(@JdbcConn(true) Connection con, String articleId) throws SQLException{
//		this.articleDao.delete(con, articleId);
//		this.leaveWordDao.deleteArticle(con, articleId,LeaveWordService.ARTICLE);
//		this.articleAgreeDao.delete(con, articleId);
//		this.watchDao.deleteWatch(con, articleId);
//		this.articleOrgDao.delete(con, articleId);
//		this.articleProDao.delete(con, articleId);
//		this.articleProDao.delete(con, articleId);
//	}
	
	@Get
	@Path("/byAssOrg")
	public List<Article> byAssOrg(@JdbcConn Connection con, String id, @DefaultValue("5") int rows) throws SQLException {
		List<ArticleOrg> pros = this.articleOrgDao.queryByOrgId(con, id);
		if (pros == null || pros.isEmpty()) {
			return Collections.<Article> emptyList();
		}
		String[] ids = new String[pros.size()];
		int i = 0;
		for (ArticleOrg ar : pros) {
			ids[i++] = ar.getArticleId();
		}
		return this.articleDao.limitQueryPublish(con, ids, rows);
	}
	@Get
	@Path("/byAssResource")
	public List<Article> byAssResource(@JdbcConn Connection con, String id, @DefaultValue("5") int rows) throws SQLException {
		List<ArticleRes> pros = this.articleResDao.queryByResourceId(con, id);
		if (pros == null || pros.isEmpty()) {
			return Collections.<Article> emptyList();
		}
		String[] ids = new String[pros.size()];
		int i = 0;
		for (ArticleRes ar : pros) {
			ids[i++] = ar.getArticleId();
		}
		return this.articleDao.limitQueryPublish(con, ids, rows);
	}
	@Path("/byShareId")
	@Get
	public Article query(@JdbcConn Connection con,long id) throws SQLException{
	public Article query(@JdbcConn Connection con, long id) throws SQLException {
		return this.articleDao.query(con, id);
	}

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

@@ -20,6 +20,7 @@ import com.ekexiu.portal.dao.PpaperDao;
import com.ekexiu.portal.po.PaperAgree;
import com.ekexiu.portal.po.PaperAuthor;
import com.ekexiu.portal.po.Ppaper;
import com.ekexiu.portal.po.Ppatent;
import com.ekexiu.portal.pojo.AssedPaper;
@Path("/ppaper")
@@ -192,11 +193,11 @@ public class PpaperService {
		this.paperAgreeDao.insert(con, pa);		
	}
	
	@Post
	@Path("/unAgree")
	public void unAgree(@JdbcConn(true) Connection con,String id,String uid)throws SQLException{
		this.paperAgreeDao.delete(con,uid, id);
	}
//	@Post
//	@Path("/unAgree")
//	public void unAgree(@JdbcConn(true) Connection con,String id,String uid)throws SQLException{
//		this.paperAgreeDao.delete(con,uid, id);
//	}
	
	@Get
	@Path("/agree")
@@ -208,4 +209,13 @@ public class PpaperService {
	public int agreeCount(@JdbcConn(false) Connection con,String id)throws SQLException{
		return this.paperAgreeDao.query(con,id);
	}
	
	@Get
	@Path("/assPapers")
	public List<Ppaper> assPapers(@JdbcConn Connection con,String[] kws,@DefaultValue("5") int rows) throws SQLException{
		if(kws==null || kws.length==0) return Collections.<Ppaper>emptyList();		
		String[] ids = this.ppaperDao.queryPatentIdWithKeyWord(con, kws, rows);
		if(ids==null || ids.length==0) return Collections.<Ppaper>emptyList();
		return this.ppaperDao.query(con, ids);		
	}
}

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

@@ -14,9 +14,11 @@ import org.jfw.apt.web.annotation.operate.Post;
import org.jfw.apt.web.annotation.param.JdbcConn;
import org.jfw.util.PageQueryResult;
import com.ekexiu.portal.dao.PaperAuthorDao;
import com.ekexiu.portal.dao.PatentAgreeDao;
import com.ekexiu.portal.dao.PatentAuthorDao;
import com.ekexiu.portal.dao.PpatentDao;
import com.ekexiu.portal.po.PaperAuthor;
import com.ekexiu.portal.po.PatentAgree;
import com.ekexiu.portal.po.PatentAuthor;
import com.ekexiu.portal.po.Ppatent;
@@ -185,11 +187,11 @@ public class PpatentServcie {
		this.patentAgreeDao.insert(con, pa);		
	}
	
	@Post
	@Path("/unAgree")
	public void unAgree(@JdbcConn(true) Connection con,String id,String uid)throws SQLException{
		this.patentAgreeDao.delete(con,uid, id);
	}
//	@Post
//	@Path("/unAgree")
//	public void unAgree(@JdbcConn(true) Connection con,String id,String uid)throws SQLException{
//		this.patentAgreeDao.delete(con,uid, id);
//	}
	
	@Get
	@Path("/agree")
@@ -201,4 +203,14 @@ public class PpatentServcie {
	public int agreeCount(@JdbcConn(false) Connection con,String id)throws SQLException{
		return this.patentAgreeDao.query(con,id);
	}
	
	@Get
	@Path("/assPatents")
	public List<Ppatent> assPatent(@JdbcConn Connection con,String[] kws,@DefaultValue("5") int rows)throws SQLException{
		if(kws==null || kws.length==0) return Collections.<Ppatent>emptyList();		
		String[] ids = this.ppatentDao.queryPatentIdWithKeyWord(con, kws, rows);
		if(ids==null || ids.length==0) return Collections.<Ppatent>emptyList();
		return this.ppatentDao.query(con, ids);		
	}
	
}

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

@@ -4,10 +4,15 @@ 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;
@@ -22,6 +27,7 @@ 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 com.ekexiu.portal.dao.ArticleDao;
import com.ekexiu.portal.dao.HonorDao;
@@ -39,7 +45,6 @@ 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.Article;
import com.ekexiu.portal.po.Professor;
import com.ekexiu.portal.po.Resource;
import com.ekexiu.portal.po.User;
@@ -749,6 +754,41 @@ public class ProfessorService {
		}
		return Collections.<Professor>emptyList();
	}
	
	@Get
	@Path("/coadjutant")
	public List<Map<String,Object>> queryCoadjutant(@JdbcConn Connection con,String id,@DefaultValue("5") int rows)throws SQLException{
		PreparedStatement ps = con.prepareStatement("SELECT professor_id,SUM (patent_count) patent_count,	SUM (paper_count) paper_count, "+
	    "SUM (tc) tc FROM ((SELECT professor_id,COUNT (1) patent_count,0 paper_count,COUNT (1) tc FROM patent_author WHERE patent_id IN ("+
		"SELECT DISTINCT patent_id FROM patent_author WHERE professor_id = ? ) AND professor_id <> ? AND professor_id <> '################################' "+
		"GROUP BY professor_id) UNION ALL (SELECT professor_id,0 patent_count,COUNT (1) paper_count,COUNT (1) tc	FROM paper_author WHERE paper_id IN (	SELECT DISTINCT "+
		"paper_id FROM paper_author WHERE professor_id = ? ) AND professor_id <>?  AND professor_id <> '################################' GROUP BY professor_id ) "
		+") _T_ GROUP BY professor_id ORDER BY tc DESC LIMIT ?");
		try{
			ps.setString(1,id);
			ps.setString(2,id);
			ps.setString(3,id);
			ps.setString(4,id);
			ps.setInt(5,rows);
			ResultSet rs = ps.executeQuery();
			try{
				List<Map<String,Object>> ret = new ArrayList<Map<String,Object>>();
				while(rs.next()){
					Map<String,Object> row = new HashMap<String,Object>();
					ret.add(row);
					row.put("professorId",rs.getString(1));
					row.put("patentCount",rs.getInt(2));
					row.put("paperCount",rs.getInt(3));
				}
				return ret;
			}finally{
				JdbcUtil.close(rs);
			}
		}finally{
			JdbcUtil.close(ps);
		}
	}
	
//	
//	
//	@Get