111

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

@@ -23,6 +23,7 @@ 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.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;
@@ -296,101 +297,125 @@ public abstract class ArticleDao {
		}
	}
	
	public List<Article> queryLimit(Connection con,String[] keys,String articleId,int rows) throws SQLException{
		int index = 1;
		boolean hasKeys = null != keys;
		boolean hasArticleId = null != articleId;
		StringBuilder sql = new StringBuilder();
		sql.append("SELECT ARTICLE_ID,PROFESSOR_ID,ARTICLE_TITLE,ARTICLE_CONTENT,SUBJECT,PUBLISH_TIME,ARTICLE_IMG,ORG_ID,ARTICLE_TYPE,ARTICLE_AGREE,PAGE_VIEWS,STATUS,CREATE_TIME,MODIFY_TIME,SHARE_ID FROM ARTICLE");
		sql.append(" WHERE STATUS = '1'");
		if(hasArticleId){
			sql.append(" AND ARTICLE_ID != ?");
		}
		if(hasKeys){
			for (int i = 0; i < keys.length; i++) {
        		if(i == 0){
        			sql.append(" AND (SUBJECT LIKE ?");
        		}else{
        			sql.append(" OR SUBJECT LIKE ?");
        		}
			}
        	sql.append(")");
		}
		sql.append(" ORDER BY PUBLISH_TIME DESC");
        sql.append(" LIMIT ").append(rows);
		PreparedStatement ps = con.prepareStatement(sql.toString());
	public String[] queryArticleIdWithSameKeyWord(Connection con,String id,int rows)throws SQLException{
		List<String> ret = new ArrayList<String>();
		String sql = "select id,count(1) sort from art_key_word where kw in (select kw from art_key_word where id=?) and id <>? group by id order by sort desc limit ?";
		PreparedStatement ps = con.prepareStatement(sql);
		try{
			if(hasArticleId){
				ps.setString(index++, articleId);
			}
			if(hasKeys){
        		for (String key : keys) {
        			ps.setString(index++, "%"+key+"%");
				}
        	}
			ps.setString(1, id);
			ps.setString(2, id);
			ps.setInt(3, rows);
			ResultSet rs = ps.executeQuery();
			try{
				List<Article> articles = new ArrayList<Article>();
				while(rs.next()){
					Article article = new Article();
					article.setArticleId(rs.getString(1));
                    String proId = rs.getString(2);
                    if(rs.wasNull()){
                    	proId = null;
                    }
                    article.setProfessorId(proId);
                    article.setArticleTitle(rs.getString(3));
                    String articleContent = rs.getString(4);
                    if(rs.wasNull()){
                    	articleContent = null;
                    }
                    article.setArticleContent(articleContent);
                    String subject = rs.getString(5);
                    if(rs.wasNull()){
                    	subject = null;
                    }
                    article.setSubject(subject);
                    String publishTime = rs.getString(6);
                    if(rs.wasNull()){
                    	publishTime = null;
                    }
                    article.setPublishTime(publishTime);
                    String articleImg = rs.getString(7);
                    if(rs.wasNull()){
                    	articleImg = null;
                    }
                    article.setArticleImg(articleImg);
                    String org = rs.getString(8);
                    if(rs.wasNull()){
                    	org = null;
                    }
                    article.setOrgId(org);
                    String articleType = rs.getString(9);
                    if(rs.wasNull()){
                    	articleType = null;
                    }
                    article.setArticleType(articleType);
                    article.setArticleAgree(rs.getInt(10));
                    article.setPageViews(rs.getInt(11));
                    String status = rs.getString(12);
                    if(rs.wasNull()){
                    	status = null;
                    }
                    article.setStatus(status);
                    article.setCreateTime(rs.getString(13));
                    article.setModifyTime(rs.getString(14));
                    article.setShareId(rs.getLong(15));
					articles.add(article);
					ret.add(rs.getString(1));
				}
				return articles;
			}finally{
				try{rs.close();}catch(Exception e1){}
			}
		}finally{
			try{ps.close();}catch(Exception e2) {}
			try{ps.close();}catch(Exception e2){}
		}
		return ret.isEmpty()?null:ret.toArray(new String[ret.size()]);		
	}
	
	public abstract List<Article> query(Connection con,@In String[] articleId) throws SQLException;
//	public List<Article> queryLimit(Connection con,String[] keys,String articleId,int rows) throws SQLException{
//		int index = 1;
//		boolean hasKeys = null != keys;
//		boolean hasArticleId = null != articleId;
//		StringBuilder sql = new StringBuilder();
//		sql.append("SELECT ARTICLE_ID,PROFESSOR_ID,ARTICLE_TITLE,ARTICLE_CONTENT,SUBJECT,PUBLISH_TIME,ARTICLE_IMG,ORG_ID,ARTICLE_TYPE,ARTICLE_AGREE,PAGE_VIEWS,STATUS,CREATE_TIME,MODIFY_TIME,SHARE_ID FROM ARTICLE");
//		sql.append(" WHERE STATUS = '1'");
//		if(hasArticleId){
//			sql.append(" AND ARTICLE_ID != ?");
//		}
//		if(hasKeys){
//			for (int i = 0; i < keys.length; i++) {
//        		if(i == 0){
//        			sql.append(" AND (SUBJECT LIKE ?");
//        		}else{
//        			sql.append(" OR SUBJECT LIKE ?");
//        		}
//			}
//        	sql.append(")");
//		}
//		sql.append(" ORDER BY PUBLISH_TIME DESC");
//        sql.append(" LIMIT ").append(rows);
//		PreparedStatement ps = con.prepareStatement(sql.toString());
//		try{
//			if(hasArticleId){
//				ps.setString(index++, articleId);
//			}
//			if(hasKeys){
//        		for (String key : keys) {
//        			ps.setString(index++, "%"+key+"%");
//				}
//        	}
//			ResultSet rs = ps.executeQuery();
//			try{
//				List<Article> articles = new ArrayList<Article>();
//				while(rs.next()){
//					Article article = new Article();
//					article.setArticleId(rs.getString(1));
//                    String proId = rs.getString(2);
//                    if(rs.wasNull()){
//                    	proId = null;
//                    }
//                    article.setProfessorId(proId);
//                    article.setArticleTitle(rs.getString(3));
//                    String articleContent = rs.getString(4);
//                    if(rs.wasNull()){
//                    	articleContent = null;
//                    }
//                    article.setArticleContent(articleContent);
//                    String subject = rs.getString(5);
//                    if(rs.wasNull()){
//                    	subject = null;
//                    }
//                    article.setSubject(subject);
//                    String publishTime = rs.getString(6);
//                    if(rs.wasNull()){
//                    	publishTime = null;
//                    }
//                    article.setPublishTime(publishTime);
//                    String articleImg = rs.getString(7);
//                    if(rs.wasNull()){
//                    	articleImg = null;
//                    }
//                    article.setArticleImg(articleImg);
//                    String org = rs.getString(8);
//                    if(rs.wasNull()){
//                    	org = null;
//                    }
//                    article.setOrgId(org);
//                    String articleType = rs.getString(9);
//                    if(rs.wasNull()){
//                    	articleType = null;
//                    }
//                    article.setArticleType(articleType);
//                    article.setArticleAgree(rs.getInt(10));
//                    article.setPageViews(rs.getInt(11));
//                    String status = rs.getString(12);
//                    if(rs.wasNull()){
//                    	status = null;
//                    }
//                    article.setStatus(status);
//                    article.setCreateTime(rs.getString(13));
//                    article.setModifyTime(rs.getString(14));
//                    article.setShareId(rs.getLong(15));
//					articles.add(article);
//				}
//				return articles;
//			}finally{
//				try{rs.close();}catch(Exception e1){}
//			}
//		}finally{
//			try{ps.close();}catch(Exception e2) {}
//		}
//	}
//	
	@PageSelect
	@OrderBy("ORDER BY PUBLISH_TIME DESC")
	@Where("STATUS = '1'")

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

@@ -27,15 +27,15 @@ public abstract class LeaveWordDao {
	@From(LeaveWord.class)
	@Column(handlerClass=IntHandler.class,value={"COUNT(1)"})
	@DefaultValue("0")
	public abstract int queryCount(Connection con,String articleId)throws SQLException;
	public abstract int queryCount(Connection con,String objId,String category)throws SQLException;
	@LimitSelect
	@OrderBy("ORDER BY CREATE_TIME DESC,ORDER_KEY DESC")
	public abstract List<LeaveWord> query(Connection con,String articleId,@LessThan String createTime,@LessThan long orderKey,int rows) throws SQLException; 
	public abstract List<LeaveWord> query(Connection con,String objId,String category,@LessThan String createTime,@LessThan long orderKey,int rows) throws SQLException; 
	
	@DeleteWith
	@From(LeaveWord.class)
	public abstract int deleteArticle(Connection con,String articleId)throws SQLException;
	public abstract int deleteArticle(Connection con,String objId,String category)throws SQLException;
	
	@DeleteWith
	@From(LeaveWord.class)

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

@@ -1,7 +1,10 @@
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 org.jfw.apt.annotation.Nullable;
@@ -214,6 +217,194 @@ public abstract class OrgDao {
					"(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')" }) String kw,
			int pageSize, int pageNo) throws SQLException;
	
	
	public PageQueryResult<EditOrganization> queryByKwAndIndustryAndAddr(Connection con,String kw,String industry,String addr,int pageSize,int pageNo)throws SQLException{
		  int _m_1 = 0;
	        org.jfw.util.PageQueryResult<com.ekexiu.portal.pojo.EditOrganization> _result = new org.jfw.util.PageQueryResult<com.ekexiu.portal.pojo.EditOrganization>();
	        int _m_2 = 1;
	        String sql = null;
	        sql = "  WHERE INDUSTRY LIKE ? AND ADDR LIKE ? AND ((ID IN (SELECT ORG_ID FROM ARTICLE WHERE ARTICLE_TYPE='2' AND ARTICLE_TITLE LIKE ?) AND IS_JOIN ='1') OR (ID IN (SELECT ORG_ID FROM RESOURCE WHERE RESOURCE_TYPE='2' AND RESOURCE_NAME LIKE ?) AND IS_JOIN ='1') OR (industry LIKE ?  AND IS_JOIN ='1') OR (SUBJECT LIKE ? AND IS_JOIN ='1') OR (DESCP LIKE ?  AND IS_JOIN ='1') OR (FOR_SHORT LIKE ? AND IS_JOIN ='1') OR (NAME LIKE ? AND IS_JOIN ='1'))";
	        String _m_3 = sql;
	        sql = "SELECT COUNT(1) FROM ORGANIZATION";
	        sql = sql + _m_3;
	        java.sql.PreparedStatement ps = con.prepareStatement(sql);
	        try{
	            ps.setString(_m_2++,industry);	
	            ps.setString(_m_2++,addr);	        	
	            ps.setString(_m_2++,kw);
	            ps.setString(_m_2++,kw);
	            ps.setString(_m_2++,kw);
	            ps.setString(_m_2++,kw);
	            ps.setString(_m_2++,kw);
	            ps.setString(_m_2++,kw);
	            ps.setString(_m_2++,kw);
	            _result.setPageSize(pageSize);
	            java.sql.ResultSet _pageRs = ps.executeQuery();
	            try{
	                _pageRs.next();
	                _m_1 = _pageRs.getInt(1);
	            }finally{
	                try{_pageRs.close();}catch(Exception _m_4){}
	            }
	        }finally{
	            try{ps.close();}catch(Exception _m_5){}
	        }
	        _result.setTotal(_m_1);
	        if(0== _m_1){
	            _result.setPageNo(1);
	            _result.setData(java.util.Collections.<com.ekexiu.portal.pojo.EditOrganization>emptyList());
	            return _result;
	        }
	        _m_2 = 1;
	        boolean _m_6 = (1 == pageNo);
	        if(_m_6){
	            _result.setPageNo(1);
	            sql = "SELECT FOR_SHORT,ORG_URL,FOUND_TIME,PROVINCE,CITY,SUBJECT,INDUSTRY,ORG_SIZE,QUALIFICATION,IS_JOIN,AUTH_STATUS,ADDR,EMAIL,CONTACT_NUM,FIELD_OF_CUSTOMER,FIELD_OF_SUPPLIER,SORT_NUM,PAGE_VIEWS,SHARE_ID,ORG_ATTR,ID,NAME,ORG_TYPE,CREATE_TIME,MODIFY_TIME,DESCP FROM ORGANIZATION";
	            sql = sql + _m_3;
	            sql = sql + " ORDER BY SORT_NUM DESC,MODIFY_TIME DESC";
	            sql = sql + " LIMIT " + pageSize;
	        }else{
	            int _m_7 = _m_1 / pageSize;
	            if(_m_1 % pageSize != 0){
	                ++_m_7;
	            }
	            if(pageNo > _m_7){
	                pageNo = _m_7;
	            }
	            _result.setPageNo(pageNo);
	            --pageNo;
	            int _m_8 = (pageNo * pageSize);
	            sql = "SELECT FOR_SHORT,ORG_URL,FOUND_TIME,PROVINCE,CITY,SUBJECT,INDUSTRY,ORG_SIZE,QUALIFICATION,IS_JOIN,AUTH_STATUS,ADDR,EMAIL,CONTACT_NUM,FIELD_OF_CUSTOMER,FIELD_OF_SUPPLIER,SORT_NUM,PAGE_VIEWS,SHARE_ID,ORG_ATTR,ID,NAME,ORG_TYPE,CREATE_TIME,MODIFY_TIME,DESCP FROM ORGANIZATION";
	            sql = sql + _m_3;
	            sql = sql + " ORDER BY SORT_NUM DESC,MODIFY_TIME DESC";
	            sql = sql + " LIMIT " + pageSize+ " OFFSET "+_m_8;
	        }
	        ps = con.prepareStatement(sql);
	        try{
	            ps.setString(_m_2++,industry);	
	            ps.setString(_m_2++,addr);	   
	            ps.setString(_m_2++,kw);
	            ps.setString(_m_2++,kw);
	            ps.setString(_m_2++,kw);
	            ps.setString(_m_2++,kw);
	            ps.setString(_m_2++,kw);
	            ps.setString(_m_2++,kw);
	            ps.setString(_m_2++,kw);
	            java.sql.ResultSet rs = ps.executeQuery();
	            try{
	                java.util.List<com.ekexiu.portal.pojo.EditOrganization> _m_9 = new java.util.ArrayList<com.ekexiu.portal.pojo.EditOrganization>();
	                _result.setData(_m_9);
	                int _m_10 = 0;
	                while((_m_10<pageSize) && rs.next()){
	                    ++_m_10;
	                    com.ekexiu.portal.pojo.EditOrganization _obj =  new com.ekexiu.portal.pojo.EditOrganization();
	                    java.lang.String _m_11 = rs.getString(1);
	                    if(rs.wasNull()){
	                        _m_11 = null;
	                    }
	                    _obj.setForShort(_m_11);
	                    java.lang.String _m_12 = rs.getString(2);
	                    if(rs.wasNull()){
	                        _m_12 = null;
	                    }
	                    _obj.setOrgUrl(_m_12);
	                    java.lang.String _m_13 = rs.getString(3);
	                    if(rs.wasNull()){
	                        _m_13 = null;
	                    }
	                    _obj.setFoundTime(_m_13);
	                    java.lang.String _m_14 = rs.getString(4);
	                    if(rs.wasNull()){
	                        _m_14 = null;
	                    }
	                    _obj.setProvince(_m_14);
	                    java.lang.String _m_15 = rs.getString(5);
	                    if(rs.wasNull()){
	                        _m_15 = null;
	                    }
	                    _obj.setCity(_m_15);
	                    java.lang.String _m_16 = rs.getString(6);
	                    if(rs.wasNull()){
	                        _m_16 = null;
	                    }
	                    _obj.setSubject(_m_16);
	                    java.lang.String _m_17 = rs.getString(7);
	                    if(rs.wasNull()){
	                        _m_17 = null;
	                    }
	                    _obj.setIndustry(_m_17);
	                    java.lang.String _m_18 = rs.getString(8);
	                    if(rs.wasNull()){
	                        _m_18 = null;
	                    }
	                    _obj.setOrgSize(_m_18);
	                    java.lang.String _m_19 = rs.getString(9);
	                    if(rs.wasNull()){
	                        _m_19 = null;
	                    }
	                    _obj.setQualification(_m_19);
	                    _obj.setIsJoin(rs.getString(10));
	                    _obj.setAuthStatus(rs.getString(11));
	                    java.lang.String _m_20 = rs.getString(12);
	                    if(rs.wasNull()){
	                        _m_20 = null;
	                    }
	                    _obj.setAddr(_m_20);
	                    java.lang.String _m_21 = rs.getString(13);
	                    if(rs.wasNull()){
	                        _m_21 = null;
	                    }
	                    _obj.setEmail(_m_21);
	                    java.lang.String _m_22 = rs.getString(14);
	                    if(rs.wasNull()){
	                        _m_22 = null;
	                    }
	                    _obj.setContactNum(_m_22);
	                    java.lang.String _m_23 = rs.getString(15);
	                    if(rs.wasNull()){
	                        _m_23 = null;
	                    }
	                    _obj.setFieldOfCustomer(_m_23);
	                    java.lang.String _m_24 = rs.getString(16);
	                    if(rs.wasNull()){
	                        _m_24 = null;
	                    }
	                    _obj.setFieldOfSupplier(_m_24);
	                    _obj.setSortNum(rs.getLong(17));
	                    _obj.setPageViews(rs.getLong(18));
	                    _obj.setShareId(rs.getLong(19));
	                    java.lang.String _m_25 = rs.getString(20);
	                    if(rs.wasNull()){
	                        _m_25 = null;
	                    }
	                    _obj.setOrgAttr(_m_25);
	                    _obj.setId(rs.getString(21));
	                    _obj.setName(rs.getString(22));
	                    java.lang.String _m_26 = rs.getString(23);
	                    if(rs.wasNull()){
	                        _m_26 = null;
	                    }
	                    _obj.setOrgType(_m_26);
	                    _obj.setCreateTime(rs.getString(24));
	                    _obj.setModifyTime(rs.getString(25));
	                    java.lang.String _m_27 = rs.getString(26);
	                    if(rs.wasNull()){
	                        _m_27 = null;
	                    }
	                    _obj.setDescp(_m_27);
	                    _m_9.add(_obj);
	                }
	                return _result;
	            }finally{
	                try{rs.close();}catch(Exception _m_28){}
	            }
	        }finally{
	            try{ps.close();}catch(Exception _m_29){}
	        }
	    }
	
	
	@PageQuery
	@From(Organization.class)
@@ -222,6 +413,14 @@ public abstract class OrgDao {
	@Where("IS_JOIN ='1'")
	public abstract PageQueryResult<EditOrganization> query(Connection con, int pageSize, int pageNo) throws SQLException;
	
	
	@PageQuery
	@From(Organization.class)
	@OrderBy("ORDER BY SORT_NUM DESC,MODIFY_TIME DESC")
	@Select(Organization.class)
	@Where("IS_JOIN ='1'")
	public abstract PageQueryResult<EditOrganization> queryByIndustryAndAddr(Connection con,@Like String industry,@Like String addr,  int pageSize, int pageNo) throws SQLException;
	
	@QueryList
	@From(Organization.class)
	@Select(Organization.class)
@@ -234,4 +433,25 @@ public abstract class OrgDao {
	@Or
	public abstract List<EditOrganization> relateQuery(Connection con,@Nullable @SqlColumn(value={"(IS_JOIN='1' AND NAME LIKE ?)","(IS_JOIN='1' AND FOR_SHORT LIKE ?)"},handlerClass=StringHandler.class) String kw,int rows)throws SQLException;
	public String[] queryOrgIdWithSameKeyWord(Connection con,String id,int rows)throws SQLException{
		List<String> ret = new ArrayList<String>();
		String sql = "select id,count(1) sort from org_key_word where kw in (select kw from org_key_word where id=?) and id <>? group by id order by sort desc limit ?";
		PreparedStatement ps = con.prepareStatement(sql);
		try{
			ps.setString(1, id);
			ps.setString(2, id);
			ps.setInt(3, 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/PpaperDao.java

@@ -1,7 +1,10 @@
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 org.jfw.apt.annotation.Nullable;
@@ -27,28 +30,28 @@ import com.ekexiu.portal.po.Ppaper;
import com.ekexiu.portal.pojo.AssedPaper;
@DAO
public interface PpaperDao {
public abstract class PpaperDao {
	@SelectOne
	@Nullable
	Ppaper query(Connection con, String id) throws SQLException;
	public abstract	Ppaper query(Connection con, String id) throws SQLException;
	@SelectList
	List<Ppaper> query(Connection con, @In String[] id) throws SQLException;
	public abstract List<Ppaper> query(Connection con, @In String[] id) throws SQLException;
	@UpdateWith
	@From(Ppaper.class)
	int update(Connection con, String id, @Set @Nullable String keywords) throws SQLException;
	public abstract int update(Connection con, String id, @Set @Nullable String keywords) throws SQLException;
	@PageQuery
	@OrderBy(" ORDER BY ASS_TIME DESC,ID ASC")
	PageQueryResult<AssedPaper> pageQueryWithProfessor(Connection con,
	public abstract PageQueryResult<AssedPaper> pageQueryWithProfessor(Connection con,
			@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;
	@PageQuery
	@OrderBy(" ORDER BY ASS_TIME DESC,ID ASC")
	PageQueryResult<AssedPaper> pageQueryWithAuthor(Connection con,
	public abstract PageQueryResult<AssedPaper> 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 = { "P.NAME LIKE ?" }) String name, int pageSize, int pageNo) throws SQLException;
@@ -56,20 +59,42 @@ public interface PpaperDao {
	@From(Ppaper.class)
	@UpdateWith
	@SetSentence("PAGE_VIEWS = PAGE_VIEWS + 1")
	 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")
	PageQueryResult<Ppaper> query(Connection con,int pageSize,int pageNo) throws SQLException;
	public abstract PageQueryResult<Ppaper> query(Connection con,int pageSize,int pageNo) throws SQLException;
	
	@PageSelect
	@OrderBy(" ORDER BY SORT_NUM DESC,CREATE_TIME DESC,ID DESC")
	@Or
	PageQueryResult<Ppaper> query(Connection con,@Alias({"name","authors","keywords"}) @Like String cnt,int pageSize,int pageNo) throws SQLException;
	public abstract PageQueryResult<Ppaper> query(Connection con,@Alias({"name","authors","keywords"}) @Like String cnt,int pageSize,int pageNo) throws SQLException;
	
	
	@SelectOne
	@Nullable
	Ppaper query(Connection con,long shareId)throws SQLException;
	public abstract Ppaper query(Connection con,long shareId)throws SQLException;
	
	public String[] queryPaperIdWithSameKeyWord(Connection con,String id,int rows)throws SQLException{
		List<String> ret = new ArrayList<String>();
		String sql = "select id,count(1) sort from pap_key_word where kw in (select kw from pap_key_word where id=?) and id <>? group by id order by sort desc limit ?";
		PreparedStatement ps = con.prepareStatement(sql);
		try{
			ps.setString(1, id);
			ps.setString(2, id);
			ps.setInt(3, 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

@@ -1,7 +1,10 @@
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 org.jfw.apt.annotation.Nullable;
@@ -27,27 +30,27 @@ import com.ekexiu.portal.po.Ppatent;
import com.ekexiu.portal.pojo.AssedPatent;
@DAO
public interface PpatentDao {
public abstract class PpatentDao {
	@SelectOne
	@Nullable
	Ppatent query(Connection con, String id) throws SQLException;
	public abstract Ppatent query(Connection con, String id) throws SQLException;
	@SelectList
	List<Ppatent> query(Connection con, @In String[] id) throws SQLException;
	public abstract List<Ppatent> query(Connection con, @In String[] id) throws SQLException;
	@UpdateWith
	@From(Ppatent.class)
	int update(Connection con, String id, @Set String keywords) throws SQLException;
	public abstract int update(Connection con, String id, @Set String keywords) throws SQLException;
	@PageQuery
	@OrderBy(" ORDER BY ASS_TIME DESC,ID ASC")
	PageQueryResult<AssedPatent> pageQueryWithProfessor(Connection con,
	public abstract PageQueryResult<AssedPatent> pageQueryWithProfessor(Connection con,
			@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;
	@PageQuery
	@OrderBy(" ORDER BY ASS_TIME DESC,ID ASC")
	PageQueryResult<AssedPatent> pageQueryWithAuthor(Connection con,
	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 = { "P.NAME LIKE ?" }) String name, int pageSize, int pageNo) throws SQLException;
@@ -55,19 +58,41 @@ public interface PpatentDao {
	@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")
	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
	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
	Ppatent query(Connection con,long shareId)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{
			ps.setString(1, id);
			ps.setString(2, id);
			ps.setInt(3, 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/ProfessorDao.java

@@ -27,6 +27,7 @@ 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.In;
import org.jfw.apt.orm.annotation.dao.param.LessThan;
import org.jfw.apt.orm.annotation.dao.param.Set;
import org.jfw.apt.orm.annotation.dao.param.SqlColumn;
@@ -1952,5 +1953,27 @@ public abstract class ProfessorDao {
			}
		}
	}
	
	public String[] queryProfessorIdWithSameKeyWord(Connection con,String id,int rows)throws SQLException{
		List<String> ret = new ArrayList<String>();
		String sql = "select id,count(1) sort from pro_key_word where kw in (select kw from pro_key_word where id=?) and id <>? group by id order by sort desc limit ?";
		PreparedStatement ps = con.prepareStatement(sql);
		try{
			ps.setString(1, id);
			ps.setString(2, id);
			ps.setInt(3, 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()]);		
	}
	@SelectList
	public abstract List<Professor> query(Connection con,@In String[] id)throws SQLException; 
}

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

@@ -24,6 +24,7 @@ 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.In;
import org.jfw.apt.orm.annotation.dao.param.Like;
import org.jfw.apt.orm.annotation.dao.param.Set;
import org.jfw.util.PageQueryResult;
@@ -1778,4 +1779,29 @@ public abstract class ResourceDao {
	@SelectOne
	@Nullable
	public abstract Resource query(Connection con,long shareId)throws SQLException;
	
	@SelectList
	public abstract List<Resource> query(Connection con,@In String[] resourceId)throws SQLException;
	
	public String[] queryResourceIdWithSameKeyWord(Connection con,String id,int rows)throws SQLException{
		List<String> ret = new ArrayList<String>();
		String sql = "select id,count(1) sort from res_key_word where kw in (select kw from res_key_word where id=?) and id <>? group by id order by sort desc limit ?";
		PreparedStatement ps = con.prepareStatement(sql);
		try{
			ps.setString(1, id);
			ps.setString(2, id);
			ps.setInt(3, 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/po/LeaveWord.java

@@ -14,9 +14,10 @@ public class LeaveWord implements CreateTimeSupported {
	private String id;
	private String content;
	private String sender;
	private String articleId;
	private String objId;
	private String createTime;
	private long orderKey;
	private String category;
	private EditProfessor professor;
	
	public EditProfessor getProfessor() {
@@ -47,11 +48,11 @@ public class LeaveWord implements CreateTimeSupported {
		this.sender = sender;
	}
	@Column(DE.id_32)
	public String getArticleId() {
		return articleId;
	public String getObjId() {
		return objId;
	}
	public void setArticleId(String articleId) {
		this.articleId = articleId;
	public void setObjId(String objId) {
		this.objId = objId;
	}
	public String getCreateTime() {
		return createTime;
@@ -66,5 +67,13 @@ public class LeaveWord implements CreateTimeSupported {
	public void setOrderKey(long orderKey) {
		this.orderKey = orderKey;
	}
	@Column(DE.singleChar)
	public String getCategory() {
		return category;
	}
	public void setCategory(String category) {
		this.category = category;
	}
	
	
}

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

@@ -10,7 +10,7 @@ import java.io.InputStream;
import java.sql.Connection;
import java.sql.SQLException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
import java.util.List;
@@ -829,30 +829,35 @@ public class ArticleService {
	@Path("/ralateArticles")
	public List<Article> ralateArticles(@JdbcConn Connection con,@Nullable String[] keys,@Nullable String professorId,
			@Nullable String orgId,String articleId,@DefaultValue("10") int rows)throws SQLException{
		List<Article> articles = new ArrayList<Article>();
		if(keys != null){
			articles = this.articleDao.queryLimit(con, keys, articleId, rows);
		String[] ids = this.articleDao.queryArticleIdWithSameKeyWord(con, articleId, rows);
		if(ids!=null){
			return this.articleDao.query(con,ids);
		}
		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);
		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);
	}
		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);
//	}
	
	@Path("/byShareId")
	@Get

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

@@ -20,6 +20,11 @@ import com.ekexiu.portal.pojo.EditProfessor;
@Path("/leaveWord")
public class LeaveWordService {
	public static final String MAX_CREATETIME="9";
	
	public static final String ARTICLE="1";
	public static final String PAPER="2";
	public static final String PATENT="3";
	
	@Autowrie
	private LeaveWordDao leaveWordDao;
@@ -54,10 +59,45 @@ public class LeaveWordService {
	@Post
	@Path
	public String insert(@JdbcConn(true) Connection con,LeaveWord word) throws SQLException{
	public String insert(@JdbcConn(true) Connection con,String content,String sender,String articleId) throws SQLException{
		String id = StringUtil.buildUUID();
		LeaveWord word = new LeaveWord();
		word.setId(id);
		word.setOrderKey(System.nanoTime());
		word.setObjId(articleId);
		word.setCategory(ARTICLE);
		word.setContent(content);
		word.setSender(sender);
		this.leaveWordDao.insert(con, word);
		return id;
	}
	
	@Post
	@Path("/paper")
	public String paper(@JdbcConn(true) Connection con,String paperId,String content,String sender) throws SQLException{
		String id = StringUtil.buildUUID();
		LeaveWord word = new LeaveWord();
		word.setId(id);
		word.setOrderKey(System.nanoTime());
		word.setObjId(paperId);
		word.setCategory(PAPER);
		word.setContent(content);
		word.setSender(sender);
		this.leaveWordDao.insert(con, word);
		return id;
	}
	
	@Post
	@Path("/patent")
	public String patent(@JdbcConn(true) Connection con,String patentId,String content,String sender) throws SQLException{
		String id = StringUtil.buildUUID();
		LeaveWord word = new LeaveWord();
		word.setId(id);
		word.setOrderKey(System.nanoTime());
		word.setObjId(patentId);
		word.setCategory(PATENT);
		word.setContent(content);
		word.setSender(sender);
		this.leaveWordDao.insert(con, word);
		return id;
	}
@@ -65,13 +105,56 @@ public class LeaveWordService {
	@Get
	@Path("/lwCount")
	public int queryCount(@JdbcConn Connection con,String articleId)throws SQLException{
		return this.leaveWordDao.queryCount(con, articleId);
		return this.leaveWordDao.queryCount(con, articleId,ARTICLE);
	}
	@Get
	@Path("/lwCount/paper")
	public int queryCountByPaper(@JdbcConn Connection con,String paperId)throws SQLException{
		return this.leaveWordDao.queryCount(con, paperId,PAPER);
	}
	@Get
	@Path("/lwCount/patent")
	public int queryCountByPatent(@JdbcConn Connection con,String patentId)throws SQLException{
		return this.leaveWordDao.queryCount(con, patentId,PATENT);
	}
	
	
	
	@Get
	@Path("/ql")
	public List<LeaveWord> query(@JdbcConn Connection con,String articleId,@DefaultValue("com.ekexiu.portal.service.LeaveWordService.MAX_CREATETIME")  String createTime,@DefaultValue("Long.MAX_VALUE") long orderKey,@DefaultValue("10") int rows) throws SQLException{
		List<LeaveWord> leaveWords = this.leaveWordDao.query(con, articleId, createTime, orderKey, rows);
		List<LeaveWord> leaveWords = this.leaveWordDao.query(con, articleId,ARTICLE, createTime, orderKey, rows);
		if(!leaveWords.isEmpty()){
			for (LeaveWord leaveWord : leaveWords) {
				EditProfessor professor = this.professorDao.queryBaseInfo(con, leaveWord.getSender());
				if(professor != null){
					professor.setHasHeadImage(this.imageService.hasProfessorImage(leaveWord.getSender()));
				}
				leaveWord.setProfessor(professor);
			}
		}
		return leaveWords;
	}
	
	@Get
	@Path("/ql/paper")
	public List<LeaveWord> queryWithPaper(@JdbcConn Connection con,String paperId,@DefaultValue("com.ekexiu.portal.service.LeaveWordService.MAX_CREATETIME")  String createTime,@DefaultValue("Long.MAX_VALUE") long orderKey,@DefaultValue("10") int rows) throws SQLException{
		List<LeaveWord> leaveWords = this.leaveWordDao.query(con, paperId,PAPER, createTime, orderKey, rows);
		if(!leaveWords.isEmpty()){
			for (LeaveWord leaveWord : leaveWords) {
				EditProfessor professor = this.professorDao.queryBaseInfo(con, leaveWord.getSender());
				if(professor != null){
					professor.setHasHeadImage(this.imageService.hasProfessorImage(leaveWord.getSender()));
				}
				leaveWord.setProfessor(professor);
			}
		}
		return leaveWords;
	}	@Get
	@Path("/ql/patent")
	public List<LeaveWord> queryWithPatent(@JdbcConn Connection con,String patentId,@DefaultValue("com.ekexiu.portal.service.LeaveWordService.MAX_CREATETIME")  String createTime,@DefaultValue("Long.MAX_VALUE") long orderKey,@DefaultValue("10") int rows) throws SQLException{
		List<LeaveWord> leaveWords = this.leaveWordDao.query(con, patentId,PATENT, createTime, orderKey, rows);
		if(!leaveWords.isEmpty()){
			for (LeaveWord leaveWord : leaveWords) {
				EditProfessor professor = this.professorDao.queryBaseInfo(con, leaveWord.getSender());
@@ -89,5 +172,4 @@ public class LeaveWordService {
	public void delete(@JdbcConn(true) Connection con,String id)throws SQLException{
		this.leaveWordDao.delete(con, id);
	}
	
}

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

@@ -3,6 +3,7 @@ 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 org.jfw.apt.annotation.Autowrie;
@@ -20,6 +21,7 @@ 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.po.Professor;
import com.ekexiu.portal.pojo.EditOrganization;
@Path("/org")
@@ -219,9 +221,24 @@ public class OrgService {
	
	@Get
	@Path("/find/pq")
	public PageQueryResult<EditOrganization> pageQuery(@JdbcConn Connection con,@Nullable String kw,@DefaultValue("20") int pageSize,@DefaultValue("1") int pageNo)throws SQLException
	public PageQueryResult<EditOrganization> pageQuery(@JdbcConn Connection con,@Nullable String kw,@Nullable String industry,
			@Nullable String city, @DefaultValue("20") int pageSize,@DefaultValue("1") int pageNo)throws SQLException
	{
		PageQueryResult<EditOrganization> pqr = kw==null?this.orgDao.query(con, pageSize, pageNo):this.orgDao.query(con,"%"+kw+"%", pageSize, pageNo);
		PageQueryResult<EditOrganization> pqr =null;
		if(kw==null && industry==null && city ==null)
		{
			pqr = this.orgDao.query(con, pageSize, pageNo);
		}else if(kw != null && industry==null && city ==null){
			pqr =this.orgDao.query(con,"%"+kw+"%", pageSize, pageNo);
		}else if(kw == null){
			industry = industry==null?"%":("%"+industry+"%");			
			city = city==null?"%":("%"+city+"%");			
			pqr = this.orgDao.queryByIndustryAndAddr(con, industry, city, pageSize, pageNo);
		}else{
			industry = industry==null?"%":("%"+industry+"%");			
			city = city==null?"%":("%"+city+"%");		
			pqr = this.orgDao.queryByKwAndIndustryAndAddr(con, "%"+kw+"%", industry, city, pageSize, pageNo);
		}
		for (EditOrganization organization : pqr.getData()) {
			organization.setHasOrgLogo(this.imageService.hasOrgLogo(organization.getId()));
		}
@@ -245,6 +262,19 @@ public class OrgService {
			organization.setHasOrgLogo(this.imageService.hasOrgLogo(organization.getId()));
		}
		return ret;
		
	}
	
	@Get
	@Path("/ralateOrgs")
	public List<EditOrganization> ralateArticles(@JdbcConn Connection con,String orgId,@DefaultValue("10") int rows)throws SQLException{
		String[] ids = this.orgDao.queryOrgIdWithSameKeyWord(con, orgId, rows);
		if(ids!=null){
			List<EditOrganization> ret = this.orgDao.query(con,ids);
			for (EditOrganization organization :ret) {
				organization.setHasOrgLogo(this.imageService.hasOrgLogo(organization.getId()));
			}
			return ret;
		}
		return Collections.<EditOrganization>emptyList();
	}
}

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

@@ -2,6 +2,7 @@ package com.ekexiu.portal.service;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.Collections;
import java.util.List;
import org.jfw.apt.annotation.Autowrie;
@@ -17,6 +18,7 @@ import com.ekexiu.portal.dao.PaperAuthorDao;
import com.ekexiu.portal.dao.PpaperDao;
import com.ekexiu.portal.po.PaperAuthor;
import com.ekexiu.portal.po.Ppaper;
import com.ekexiu.portal.po.Resource;
import com.ekexiu.portal.pojo.AssedPaper;
@Path("/ppaper")
@@ -157,4 +159,13 @@ public class PpaperService {
	public Ppaper query(@JdbcConn Connection con,long id) throws SQLException{
		return this.ppaperDao.query(con,id);
	}
	@Get
	@Path("/ralatePapers")
	public List<Ppaper> ralatePapers(@JdbcConn Connection con,String paperId,@DefaultValue("10") int rows)throws SQLException{
		String[] ids = this.ppaperDao.queryPaperIdWithSameKeyWord(con, paperId, rows);
		if(ids!=null){
			return this.ppaperDao.query(con,ids);
		}
		return Collections.<Ppaper>emptyList();
	}
}

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

@@ -2,6 +2,7 @@ package com.ekexiu.portal.service;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.Collections;
import java.util.List;
import org.jfw.apt.annotation.Autowrie;
@@ -16,6 +17,7 @@ import org.jfw.util.PageQueryResult;
import com.ekexiu.portal.dao.PatentAuthorDao;
import com.ekexiu.portal.dao.PpatentDao;
import com.ekexiu.portal.po.PatentAuthor;
import com.ekexiu.portal.po.Ppaper;
import com.ekexiu.portal.po.Ppatent;
import com.ekexiu.portal.pojo.AssedPatent;
@@ -152,4 +154,13 @@ public class PpatentServcie {
	public Ppatent query(@JdbcConn Connection con,long id)throws SQLException{
		return this.ppatentDao.query(con,id);
	}
	@Get
	@Path("/ralatePatent")
	public List<Ppatent> ralatePatents(@JdbcConn Connection con,String patentId,@DefaultValue("10") int rows)throws SQLException{
		String[] ids = this.ppatentDao.queryPatentIdWithSameKeyWord(con, patentId, rows);
		if(ids!=null){
			return this.ppatentDao.query(con,ids);
		}
		return Collections.<Ppatent>emptyList();
	}
}

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

@@ -6,6 +6,7 @@ import java.net.URLEncoder;
import java.sql.Connection;
import java.sql.SQLException;
import java.text.DecimalFormat;
import java.util.Collections;
import java.util.List;
import org.jfw.apt.annotation.Autowrie;
@@ -38,6 +39,7 @@ 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;
@@ -736,6 +738,17 @@ public class ProfessorService {
	public void incPageViews(@JdbcConn(true) Connection con, String id) throws SQLException {
		this.professorDao.incPageViews(con, id);
	}
	
	@Get
	@Path("/ralateProfessors")
	public List<Professor> ralateArticles(@JdbcConn Connection con,String professorId,@DefaultValue("10") int rows)throws SQLException{
		String[] ids = this.professorDao.queryProfessorIdWithSameKeyWord(con, professorId, rows);
		if(ids!=null){
			return this.professorDao.query(con,ids);
		}
		return Collections.<Professor>emptyList();
	}
	
	public static void main(String[] args) throws Exception {
		// Connection con =

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

@@ -5,6 +5,7 @@ import java.sql.Connection;
import java.sql.SQLException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
import java.util.List;
@@ -647,76 +648,76 @@ public class ResourceService {
		return queryResult;
	}
	
	@Get
	@Path("/ralateRes")
	public List<Resource> queryLimit(@JdbcConn Connection con,@Nullable String[] keys,String resourceId,
			String professorId,@DefaultValue("10") int rows)throws SQLException{
		List<Resource> resources = new ArrayList<Resource>();
		if(keys != null){
			resources = this.resourceDao.queryLimit(con, keys, resourceId, rows);
		}
		if(resources.isEmpty()){
			resources = this.resourceDao.queryByProId(con, professorId, resourceId, rows);
			if(resources.isEmpty()){
				resources = this.resourceDao.queryByProId(con, null, resourceId, 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("/orgRalateRes")
	public List<Resource> queryOrgRalateRes(@JdbcConn Connection con,@Nullable String[] keys,String resourceId,
			String orgId,@DefaultValue("10") int rows)throws SQLException{
		List<Resource> resources = new ArrayList<Resource>();
		if(keys != null){
			resources = this.resourceDao.queryLimit(con, keys, resourceId, rows);
		}
		if(resources.isEmpty()){
			resources = this.resourceDao.queryByOrgId(con, orgId, resourceId, rows);
			if(resources.isEmpty()){
				resources = this.resourceDao.queryByOrgId(con, null, resourceId, 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("/ralateRes")
//	public List<Resource> queryLimit(@JdbcConn Connection con,@Nullable String[] keys,String resourceId,
//			String professorId,@DefaultValue("10") int rows)throws SQLException{
//		List<Resource> resources = new ArrayList<Resource>();
//		if(keys != null){
//			resources = this.resourceDao.queryLimit(con, keys, resourceId, rows);
//		}
//		if(resources.isEmpty()){
//			resources = this.resourceDao.queryByProId(con, professorId, resourceId, rows);
//			if(resources.isEmpty()){
//				resources = this.resourceDao.queryByProId(con, null, resourceId, 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("/orgRalateRes")
//	public List<Resource> queryOrgRalateRes(@JdbcConn Connection con,@Nullable String[] keys,String resourceId,
//			String orgId,@DefaultValue("10") int rows)throws SQLException{
//		List<Resource> resources = new ArrayList<Resource>();
//		if(keys != null){
//			resources = this.resourceDao.queryLimit(con, keys, resourceId, rows);
//		}
//		if(resources.isEmpty()){
//			resources = this.resourceDao.queryByOrgId(con, orgId, resourceId, rows);
//			if(resources.isEmpty()){
//				resources = this.resourceDao.queryByOrgId(con, null, resourceId, 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("/articles")
	public List<ArticleRes> queryArticles(@JdbcConn Connection con, String resourceId, @DefaultValue("5") int rows) throws SQLException{
@@ -991,4 +992,14 @@ public class ResourceService {
	public Resource query(@JdbcConn Connection con,long id)throws SQLException{
		return this.resourceDao.query(con,id);
	}
	
	@Get
	@Path("/ralateResources")
	public List<Resource> ralateResources(@JdbcConn Connection con,String resourceId,@DefaultValue("5") int rows)throws SQLException{
		String[] ids = this.resourceDao.queryResourceIdWithSameKeyWord(con, resourceId, rows);
		if(ids!=null){
			return this.resourceDao.query(con,ids);
		}
		return Collections.<Resource>emptyList();
	}
}

src/main/resources/database.sql

@@ -1547,6 +1547,17 @@ COMMENT ON TABLE pat_key_word IS '专利关键字';
COMMENT ON COLUMN pat_key_word.id IS '专利ID';
COMMENT ON COLUMN pat_key_word.kw IS '关键字';
CREATE TABLE ARTICLE_ORG (ARTICLE_ID CHAR(32) NOT NULL,ORG_ID CHAR(32) NOT NULL,CREATE_TIME CHAR(14) NOT NULL);
ALTER TABLE ARTICLE_ORG ADD UNIQUE (ARTICLE_ID,ORG_ID);
COMMENT ON COLUMN ARTICLE_ORG.ARTICLE_ID IS '文章ID';
COMMENT ON COLUMN ARTICLE_ORG.ORG_ID IS '企业ID';
alter table leave_word add column  category char(1) not null default '1';
comment on column leave_word.category is '留言分类  1： 文章  2：论文   3：专利';
ALTER TABLE leave_word RENAME article_id TO obj_id;
comment on column leave_word.obj_id is '留言对象ID';