Merge remote-tracking branch 'origin/dev' into test

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

@@ -0,0 +1,23 @@
package com.ekexiu.portal.dao;
import java.sql.Connection;
import java.sql.SQLException;
import org.jfw.apt.orm.annotation.dao.Batch;
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 com.ekexiu.portal.po.ArtKeyWord;
@DAO
public interface ArtKeyWordDao {
	@Insert
	@Batch
	int[] insert(Connection con,ArtKeyWord[] okws)throws SQLException;
	
	@DeleteWith
	@From(ArtKeyWord.class)
	int delete(Connection con,String id)throws SQLException;
}

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,131 @@ 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()]);		
	}
	@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;
//		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/ArticleOrgDao.java

@@ -0,0 +1,29 @@
package com.ekexiu.portal.dao;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.List;
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.ArticleOrg;
@DAO
public interface ArticleOrgDao {
	
	@Insert
	int insert(Connection con,ArticleOrg org) throws SQLException;
	@SelectList
	List<ArticleOrg> query(Connection con, String articleId) throws SQLException;
	@DeleteWith
	@From(ArticleOrg.class)
	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

@@ -4,15 +4,11 @@ import java.sql.Connection;
import java.sql.SQLException;
import java.util.List;
import org.jfw.apt.annotation.DefaultValue;
import org.jfw.apt.orm.annotation.dao.Column;
import org.jfw.apt.orm.annotation.dao.DAO;
import org.jfw.apt.orm.annotation.dao.method.From;
import org.jfw.apt.orm.annotation.dao.method.operator.DeleteWith;
import org.jfw.apt.orm.annotation.dao.method.operator.Insert;
import org.jfw.apt.orm.annotation.dao.method.operator.QueryVal;
import org.jfw.apt.orm.annotation.dao.method.operator.SelectList;
import org.jfw.apt.orm.core.defaultImpl.IntHandler;
import com.ekexiu.portal.po.ArticlePro;
@@ -21,11 +17,11 @@ public abstract class ArticleProDao {
	@Insert
	public abstract int insert(Connection con, ArticlePro articlePro) throws SQLException;
	@QueryVal
	@From(ArticlePro.class)
	@Column(handlerClass = IntHandler.class, value = "COUNT(1)")
	@DefaultValue("0")
	public abstract int queryByArticleId(Connection con, String articleId) throws SQLException;
//	@QueryVal
//	@From(ArticlePro.class)
//	@Column(handlerClass = IntHandler.class, value = "COUNT(1)")
//	@DefaultValue("0")
//	public abstract int queryByArticleId(Connection con, String articleId) throws SQLException;
	@SelectList
	public abstract List<ArticlePro> query(Connection con, String articleId) throws SQLException;
@@ -33,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

@@ -7,16 +7,12 @@ import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
import org.jfw.apt.annotation.DefaultValue;
import org.jfw.apt.orm.annotation.dao.Column;
import org.jfw.apt.orm.annotation.dao.DAO;
import org.jfw.apt.orm.annotation.dao.method.From;
import org.jfw.apt.orm.annotation.dao.method.operator.DeleteWith;
import org.jfw.apt.orm.annotation.dao.method.operator.Insert;
import org.jfw.apt.orm.annotation.dao.method.operator.QueryVal;
import org.jfw.apt.orm.core.defaultImpl.IntHandler;
import org.jfw.apt.orm.annotation.dao.method.operator.SelectList;
import com.ekexiu.portal.po.ArticlePro;
import com.ekexiu.portal.po.ArticleRes;
@DAO
@@ -24,11 +20,11 @@ public abstract class ArticleResDao {
	@Insert
	public abstract int insert(Connection con, ArticleRes articleRes) throws SQLException;
	@QueryVal
	@From(ArticlePro.class)
	@Column(handlerClass = IntHandler.class, value = "COUNT(1)")
	@DefaultValue("0")
	public abstract int queryByArticleId(Connection con, String articleId) throws SQLException;
//	@QueryVal
//	@From(ArticlePro.class)
//	@Column(handlerClass = IntHandler.class, value = "COUNT(1)")
//	@DefaultValue("0")
//	public abstract int queryByArticleId(Connection con, String articleId) throws SQLException;
	public List<ArticleRes> query(Connection con, String articleId) throws SQLException{
        int index = 1;
@@ -85,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/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,9 +413,45 @@ 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)
	public abstract List<EditOrganization> query(Connection con,@In String[] id) throws SQLException;
	
	@LimitQuery
	@Select(Organization.class)
	@From(Organization.class)
	@OrderBy(" ORDER BY SORT_NUM DESC,PAGE_VIEWS DESC,SHARE_ID ASC")
	@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/OrgKeyWordDao.java

@@ -0,0 +1,23 @@
package com.ekexiu.portal.dao;
import java.sql.Connection;
import java.sql.SQLException;
import org.jfw.apt.orm.annotation.dao.Batch;
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 com.ekexiu.portal.po.OrgKeyWord;
@DAO
public interface OrgKeyWordDao {
	@Insert
	@Batch
	int[] insert(Connection con,OrgKeyWord[] okws)throws SQLException;
	
	@DeleteWith
	@From(OrgKeyWord.class)
	int delete(Connection con,String id)throws SQLException;
}

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

@@ -0,0 +1,23 @@
package com.ekexiu.portal.dao;
import java.sql.Connection;
import java.sql.SQLException;
import org.jfw.apt.orm.annotation.dao.Batch;
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 com.ekexiu.portal.po.PapKeyWord;
@DAO
public interface PapKeyWordDao {
	@Insert
	@Batch
	int[] insert(Connection con,PapKeyWord[] okws)throws SQLException;
	
	@DeleteWith
	@From(PapKeyWord.class)
	int delete(Connection con,String id)throws SQLException;
}

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

@@ -0,0 +1,43 @@
package com.ekexiu.portal.dao;
import java.sql.Connection;
import java.sql.SQLException;
import org.jfw.apt.annotation.DefaultValue;
import org.jfw.apt.annotation.Nullable;
import org.jfw.apt.orm.annotation.dao.Column;
import org.jfw.apt.orm.annotation.dao.DAO;
import org.jfw.apt.orm.annotation.dao.method.From;
import org.jfw.apt.orm.annotation.dao.method.operator.DeleteWith;
import org.jfw.apt.orm.annotation.dao.method.operator.Insert;
import org.jfw.apt.orm.annotation.dao.method.operator.QueryVal;
import org.jfw.apt.orm.annotation.dao.method.operator.SelectOne;
import org.jfw.apt.orm.core.defaultImpl.IntHandler;
import com.ekexiu.portal.po.PaperAgree;
@DAO
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 paperId) throws SQLException;
	
	@Nullable
	@SelectOne
	PaperAgree query(Connection con,String opId,String paperId) throws SQLException;
	
	
	@QueryVal
	@From(PaperAgree.class)
	@Column(handlerClass = IntHandler.class, value = "COUNT(1)")
	@DefaultValue("0")
	int query(Connection con,String paperId) throws SQLException;
}

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

@@ -0,0 +1,23 @@
package com.ekexiu.portal.dao;
import java.sql.Connection;
import java.sql.SQLException;
import org.jfw.apt.orm.annotation.dao.Batch;
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 com.ekexiu.portal.po.PatKeyWord;
@DAO
public interface PatKeyWordDao {
	@Insert
	@Batch
	int[] insert(Connection con,PatKeyWord[] okws)throws SQLException;
	
	@DeleteWith
	@From(PatKeyWord.class)
	int delete(Connection con,String id)throws SQLException;
}

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

@@ -0,0 +1,42 @@
package com.ekexiu.portal.dao;
import java.sql.Connection;
import java.sql.SQLException;
import org.jfw.apt.annotation.DefaultValue;
import org.jfw.apt.annotation.Nullable;
import org.jfw.apt.orm.annotation.dao.Column;
import org.jfw.apt.orm.annotation.dao.DAO;
import org.jfw.apt.orm.annotation.dao.method.From;
import org.jfw.apt.orm.annotation.dao.method.operator.DeleteWith;
import org.jfw.apt.orm.annotation.dao.method.operator.Insert;
import org.jfw.apt.orm.annotation.dao.method.operator.QueryVal;
import org.jfw.apt.orm.annotation.dao.method.operator.SelectOne;
import org.jfw.apt.orm.core.defaultImpl.IntHandler;
import com.ekexiu.portal.po.PatentAgree;
@DAO
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 patentId) throws SQLException;
	
	@Nullable
	@SelectOne
	PatentAgree query(Connection con,String opId,String patentId) throws SQLException;
	
	
	@QueryVal
	@From(PatentAgree.class)
	@Column(handlerClass = IntHandler.class, value = "COUNT(1)")
	@DefaultValue("0")
	int query(Connection con,String patentId) throws SQLException;
}

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,77 @@ 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()]);		
	}
	
	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

@@ -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,47 +30,113 @@ 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 = {
					"((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")
	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()]);
	}
	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/dao/ProKeyWordDao.java

@@ -0,0 +1,25 @@
package com.ekexiu.portal.dao;
import java.sql.Connection;
import java.sql.SQLException;
import org.jfw.apt.orm.annotation.dao.Batch;
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 com.ekexiu.portal.po.ProKeyWord;
@DAO
public interface ProKeyWordDao {
	@Insert
	@Batch
	int[] insert(Connection con,ProKeyWord[] pkw)throws SQLException;
	
	@DeleteWith
	@From(ProKeyWord.class)
	int delete(Connection con,String id)throws SQLException;
	
}

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

@@ -17,6 +17,7 @@ import org.jfw.apt.orm.annotation.dao.method.From;
import org.jfw.apt.orm.annotation.dao.method.Or;
import org.jfw.apt.orm.annotation.dao.method.OrderBy;
import org.jfw.apt.orm.annotation.dao.method.Select;
import org.jfw.apt.orm.annotation.dao.method.SetSentence;
import org.jfw.apt.orm.annotation.dao.method.operator.DeleteWith;
import org.jfw.apt.orm.annotation.dao.method.operator.Insert;
import org.jfw.apt.orm.annotation.dao.method.operator.PageSelect;
@@ -26,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;
@@ -45,6 +47,11 @@ import com.ekexiu.portal.pojo.UserInfo;
public abstract class ProfessorDao {
	@Insert
	public abstract int insert(Connection con, Professor professor) throws SQLException;
	
	@UpdateWith
	@From(Professor.class)
	@SetSentence("PAGE_VIEWS = PAGE_VIEWS + 1")
	public abstract int incPageViews(Connection con,String id)throws SQLException;
	@Update
	public abstract int update(Connection con, Professor professor) throws SQLException;
@@ -1946,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/ResKeyWordDao.java

@@ -0,0 +1,23 @@
package com.ekexiu.portal.dao;
import java.sql.Connection;
import java.sql.SQLException;
import org.jfw.apt.orm.annotation.dao.Batch;
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 com.ekexiu.portal.po.ResKeyWord;
@DAO
public interface ResKeyWordDao {
	@Insert
	@Batch
	int[] insert(Connection con,ResKeyWord[] okws)throws SQLException;
	
	@DeleteWith
	@From(ResKeyWord.class)
	int delete(Connection con,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/job/ArticleTaskJobEntry.java

@@ -13,6 +13,7 @@ import org.jfw.apt.annotation.Bean;
import com.ekexiu.portal.dao.ArticleDao;
import com.ekexiu.portal.po.Article;
import com.ekexiu.portal.service.ArticleService;
@Bean
public class ArticleTaskJobEntry implements Runnable {
@@ -23,6 +24,16 @@ public class ArticleTaskJobEntry implements Runnable {
	private DataSource dataSource;
	@Autowrie
	private ArticleDao articleDao;
	@Autowrie
	private ArticleService articleService;
	
	
	public ArticleService getArticleService() {
		return articleService;
	}
	public void setArticleService(ArticleService articleService) {
		this.articleService = articleService;
	}
	public long getDelayTime() {
		return delayTime;
	}
@@ -50,7 +61,7 @@ public class ArticleTaskJobEntry implements Runnable {
				SimpleDateFormat df = new SimpleDateFormat(this.dateFormat);
				List<Article> articles = this.articleDao.queryTiming(con, df.format(new Date()));
				for (Article article : articles) {
					this.articleDao.updateStatus(con, article.getArticleId(), "1");
					this.articleService.publish(con,article.getArticleId());
					logger.info("定时发布文章："+article.getArticleId()+"--"+df.format(new Date()));
				}
                con.commit();

src/main/java/com/ekexiu/portal/job/HotKeyJobEntry.java

@@ -1,13 +1,20 @@
package com.ekexiu.portal.job;
import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
import java.util.ArrayList;
import java.util.List;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.Map;
import javax.sql.DataSource;
import org.jfw.apt.annotation.Autowrie;
import org.jfw.apt.annotation.Bean;
import org.jfw.util.jdbc.JdbcUtil;
import com.ekexiu.portal.pojo.DataDictCode;
import com.ekexiu.portal.service.DataDictService;
@@ -53,41 +60,68 @@ public class HotKeyJobEntry extends DictTaskJobEntry implements Runnable {
		this.dataDictService = dataDictService;
	}
	private void addEntry(String caption, Map<String, DataDictCode> map) {
		DataDictCode item = map.get(caption);
		if (item == null) {
			item = new DataDictCode();
			item.setCaption(caption);
			item.setCount(1);
			map.put(caption, item);
		} else {
			item.setCount(1 + item.getCount());
		}
	}
	private void addEntrys(Connection con, String sql, Map<String, DataDictCode> map) throws SQLException {
		Statement st = con.createStatement();
		try {
			ResultSet rs = st.executeQuery(sql);
			try {
				while (rs.next()) {
					addEntry(rs.getString(1), map);
				}
			} finally {
				JdbcUtil.close(rs);
			}
		} finally {
			JdbcUtil.close(st);
		}
	}
	@Override
	public void run() {
		Map<String, DataDictCode> tmpMap = new HashMap<String, DataDictCode>();
		try {
			Connection con = this.dataSource.getConnection();
			try {
				Items items = fillSetValue(con,
						"SELECT SUBJECT FROM PROFESSOR UNION ALL SELECT INDUSTRY FROM PROFESSOR UNION ALL SELECT SUBJECT FROM ARTICLE UNION ALL SELECT SUBJECT FROM RESOURCE");
				List<Item> list = items.getItemByDescSort();
				List<DataDictCode> codes = new ArrayList<DataDictCode>();
				for (Item item : list) {
					if (item.getValue() > 1) {
						DataDictCode code = new DataDictCode();
						code.setCount(item.getValue());
						code.setCaption(item.getCaption());
						codes.add(code);
				addEntrys(con, "SELECT KW FROM ART_KEY_WORD", tmpMap);
				addEntrys(con, "SELECT KW FROM PRO_KEY_WORD", tmpMap);
				addEntrys(con, "SELECT KW FROM ORG_KEY_WORD", tmpMap);
				addEntrys(con, "SELECT KW FROM RES_KEY_WORD", tmpMap);
				addEntrys(con, "SELECT KW FROM PAP_KEY_WORD", tmpMap);
				addEntrys(con, "SELECT KW FROM PAT_KEY_WORD", tmpMap);
				ArrayList<DataDictCode> list = new ArrayList<DataDictCode>(tmpMap.size());
				list.addAll(tmpMap.values());
				Collections.sort(list, new Comparator<DataDictCode>() {
					public int compare(DataDictCode o1, DataDictCode o2) {
						long l = o2.getCount() - o1.getCount();
						if (l == 0)
							return 0;
						else if (l > 0)
							return 1;
						else
							return -1;
					}
				}
				this.dataDictService.setHotKey(codes);
				});
				this.dataDictService.setHotKey(list);
			} catch (Exception e) {
				try {
					con.rollback();
				} catch (Exception e1) {
					e1.printStackTrace();
				}
			} finally {
				try {
					con.close();
				} catch (Exception e) {
					e.printStackTrace();
				}
			} finally {
				JdbcUtil.close(con);
			}
		} catch (Exception e) {
			e.printStackTrace();
		}
	}
}

src/main/java/com/ekexiu/portal/po/ArtKeyWord.java

@@ -0,0 +1,26 @@
package com.ekexiu.portal.po;
import org.jfw.apt.orm.annotation.entry.Column;
import org.jfw.apt.orm.annotation.entry.Table;
import org.jfw.apt.orm.core.enums.DE;
@Table
public class ArtKeyWord {
	private String id;
	private String kw;
	
	@Column(DE.id_32)
	public String getId() {
		return id;
	}
	public void setId(String id) {
		this.id = id;
	}
	@Column(DE.text_de)
	public String getKw() {
		return kw;
	}
	public void setKw(String kw) {
		this.kw = kw;
	}
}

src/main/java/com/ekexiu/portal/po/ArticleOrg.java

@@ -0,0 +1,45 @@
package com.ekexiu.portal.po;
import org.jfw.apt.orm.annotation.entry.Column;
import org.jfw.apt.orm.annotation.entry.Table;
import org.jfw.apt.orm.annotation.entry.Unique;
import org.jfw.apt.orm.annotation.entry.Uniques;
import org.jfw.apt.orm.core.enums.DE;
import com.ekexiu.portal.basepo.CreateTimeSupported;
@Table
@Uniques(@Unique(clolumns = { "articleId", "orgId" }, name = "ARTICLE_ORG_UQ"))
public class ArticleOrg implements CreateTimeSupported {
	private String articleId;
	private String orgId;
	private String createTime;
	private Article article;
	@Override
	public String getCreateTime() {
		return this.createTime;
	}
	@Override
	public void setCreateTime(String createTime) {
		this.createTime = createTime;
	}
	@Column(DE.id_32)
	public String getArticleId() {
		return articleId;
	}
	public void setArticleId(String articleId) {
		this.articleId = articleId;
	}
	@Column(DE.id_32)
	public String getOrgId() {
		return orgId;
	}
	public void setOrgId(String orgId) {
		this.orgId = orgId;
	}
	public Article getArticle() {
		return article;
	}
	public void setArticle(Article article) {
		this.article = article;
	}
}

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/po/OrgKeyWord.java

@@ -0,0 +1,26 @@
package com.ekexiu.portal.po;
import org.jfw.apt.orm.annotation.entry.Column;
import org.jfw.apt.orm.annotation.entry.Table;
import org.jfw.apt.orm.core.enums.DE;
@Table
public class OrgKeyWord {
	private String id;
	private String kw;
	
	@Column(DE.id_32)
	public String getId() {
		return id;
	}
	public void setId(String id) {
		this.id = id;
	}
	@Column(DE.text_de)
	public String getKw() {
		return kw;
	}
	public void setKw(String kw) {
		this.kw = kw;
	}
}

src/main/java/com/ekexiu/portal/po/PapKeyWord.java

@@ -0,0 +1,26 @@
package com.ekexiu.portal.po;
import org.jfw.apt.orm.annotation.entry.Column;
import org.jfw.apt.orm.annotation.entry.Table;
import org.jfw.apt.orm.core.enums.DE;
@Table
public class PapKeyWord {
	private String id;
	private String kw;
	
	@Column(DE.id_32)
	public String getId() {
		return id;
	}
	public void setId(String id) {
		this.id = id;
	}
	@Column(DE.text_de)
	public String getKw() {
		return kw;
	}
	public void setKw(String kw) {
		this.kw = kw;
	}
}

src/main/java/com/ekexiu/portal/po/PaperAgree.java

@@ -0,0 +1,37 @@
package com.ekexiu.portal.po;
import org.jfw.apt.orm.annotation.entry.Column;
import org.jfw.apt.orm.annotation.entry.PrimaryKey;
import org.jfw.apt.orm.annotation.entry.Table;
import org.jfw.apt.orm.core.enums.DE;
import com.ekexiu.portal.basepo.CreateTimeSupported;
@PrimaryKey({"paperId","opId"})
@Table
public class PaperAgree implements CreateTimeSupported {
	private String opId;
	private String paperId;
	private String createTime;
	@Column(DE.id_32)
	public String getOpId() {
		return opId;
	}
	public void setOpId(String opId) {
		this.opId = opId;
	}
	@Column(DE.id_32)
	public String getPaperId() {
		return paperId;
	}
	public void setPaperId(String paperId) {
		this.paperId = paperId;
	}
	public String getCreateTime() {
		return createTime;
	}
	public void setCreateTime(String createTime) {
		this.createTime = createTime;
	}
	
}

src/main/java/com/ekexiu/portal/po/PatKeyWord.java

@@ -0,0 +1,26 @@
package com.ekexiu.portal.po;
import org.jfw.apt.orm.annotation.entry.Column;
import org.jfw.apt.orm.annotation.entry.Table;
import org.jfw.apt.orm.core.enums.DE;
@Table
public class PatKeyWord {
	private String id;
	private String kw;
	
	@Column(DE.id_32)
	public String getId() {
		return id;
	}
	public void setId(String id) {
		this.id = id;
	}
	@Column(DE.text_de)
	public String getKw() {
		return kw;
	}
	public void setKw(String kw) {
		this.kw = kw;
	}
}

src/main/java/com/ekexiu/portal/po/PatentAgree.java

@@ -0,0 +1,37 @@
package com.ekexiu.portal.po;
import org.jfw.apt.orm.annotation.entry.Column;
import org.jfw.apt.orm.annotation.entry.PrimaryKey;
import org.jfw.apt.orm.annotation.entry.Table;
import org.jfw.apt.orm.core.enums.DE;
import com.ekexiu.portal.basepo.CreateTimeSupported;
@PrimaryKey({"patentId","opId"})
@Table
public class PatentAgree implements CreateTimeSupported {
	private String opId;
	private String patentId;
	private String createTime;
	@Column(DE.id_32)
	public String getOpId() {
		return opId;
	}
	public void setOpId(String opId) {
		this.opId = opId;
	}
	@Column(DE.id_32)
	public String getPatentId() {
		return patentId;
	}
	public void setPatentId(String patentId) {
		this.patentId = patentId;
	}
	public String getCreateTime() {
		return createTime;
	}
	public void setCreateTime(String createTime) {
		this.createTime = createTime;
	}
	
}

src/main/java/com/ekexiu/portal/po/ProKeyWord.java

@@ -0,0 +1,28 @@
package com.ekexiu.portal.po;
import org.jfw.apt.orm.annotation.entry.Column;
import org.jfw.apt.orm.annotation.entry.Table;
import org.jfw.apt.orm.core.enums.DE;
@Table
public class ProKeyWord {
	private String id;
	private String kw;
	
	@Column(DE.id_32)
	public String getId() {
		return id;
	}
	public void setId(String id) {
		this.id = id;
	}
	@Column(DE.text_de)
	public String getKw() {
		return kw;
	}
	public void setKw(String kw) {
		this.kw = kw;
	}
	
}

src/main/java/com/ekexiu/portal/po/Professor.java

@@ -55,6 +55,7 @@ public class Professor implements CreateTimeSupported, ModifyTimeSupported{
	private Integer growthValue;
	private String scorePercent;
	private long shareId;
	private long pageViews;
	
	private Organization organization;
	private List<Resource> resources;
@@ -342,5 +343,12 @@ public class Professor implements CreateTimeSupported, ModifyTimeSupported{
		this.shareId = shareId;
	}
	
	@Column(DE.bigSerial)
	public long getPageViews() {
		return pageViews;
	}
	public void setPageViews(long pageViews) {
		this.pageViews = pageViews;
	}
}

src/main/java/com/ekexiu/portal/po/ResKeyWord.java

@@ -0,0 +1,26 @@
package com.ekexiu.portal.po;
import org.jfw.apt.orm.annotation.entry.Column;
import org.jfw.apt.orm.annotation.entry.Table;
import org.jfw.apt.orm.core.enums.DE;
@Table
public class ResKeyWord {
	private String id;
	private String kw;
	
	@Column(DE.id_32)
	public String getId() {
		return id;
	}
	public void setId(String id) {
		this.id = id;
	}
	@Column(DE.text_de)
	public String getKw() {
		return kw;
	}
	public void setKw(String kw) {
		this.kw = kw;
	}
}

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;
@@ -29,6 +29,7 @@ import org.jfw.util.io.IoUtil;
import com.ekexiu.portal.dao.ArticleAgreeDao;
import com.ekexiu.portal.dao.ArticleDao;
import com.ekexiu.portal.dao.ArticleOrgDao;
import com.ekexiu.portal.dao.ArticleProDao;
import com.ekexiu.portal.dao.ArticleResDao;
import com.ekexiu.portal.dao.LeaveWordDao;
@@ -39,6 +40,7 @@ import com.ekexiu.portal.dao.ResourceDao;
import com.ekexiu.portal.dao.WatchDao;
import com.ekexiu.portal.po.Article;
import com.ekexiu.portal.po.ArticleAgree;
import com.ekexiu.portal.po.ArticleOrg;
import com.ekexiu.portal.po.ArticlePro;
import com.ekexiu.portal.po.ArticleRes;
import com.ekexiu.portal.po.Image;
@@ -52,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
@@ -80,6 +82,28 @@ public class ArticleService {
	@Autowrie
	private ArticleResDao articleResDao;
	@Autowrie
	private ArticleOrgDao articleOrgDao;
	@Autowrie
	private KeyWordService keyWordService;
	public KeyWordService getKeyWordService() {
		return keyWordService;
	}
	public void setKeyWordService(KeyWordService keyWordService) {
		this.keyWordService = keyWordService;
	}
	public ArticleOrgDao getArticleOrgDao() {
		return articleOrgDao;
	}
	public void setArticleOrgDao(ArticleOrgDao articleOrgDao) {
		this.articleOrgDao = articleOrgDao;
	}
	public String getDateFormat() {
		return dateFormat;
	}
@@ -127,7 +151,7 @@ public class ArticleService {
	public void setArticleDao(ArticleDao articleDao) {
		this.articleDao = articleDao;
	}
	
	public ArticleAgreeDao getArticleAgreeDao() {
		return articleAgreeDao;
	}
@@ -223,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())
@@ -237,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);
@@ -251,68 +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) 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);
			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);
@@ -320,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);
@@ -328,17 +352,27 @@ public class ArticleService {
					this.articleResDao.insert(con, articleRes);
				}
			}
			if (orgs != null && orgs.length > 0) {
				for (String org : orgs) {
					ArticleOrg articleOrg = new ArticleOrg();
					articleOrg.setArticleId(articleId);
					articleOrg.setOrgId(org);
					this.articleOrgDao.insert(con, articleOrg);
				}
			}
			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.articleProDao.delete(con, article.getArticleId());
			this.articleResDao.delete(con, article.getArticleId());
			if(professors != null){
			this.articleOrgDao.delete(con, article.getArticleId());
			if (professors != null) {
				for (String professor : professors) {
					ArticlePro articlePro = new ArticlePro();
					articlePro.setArticleId(article.getArticleId());
@@ -346,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());
@@ -354,35 +388,44 @@ public class ArticleService {
					this.articleResDao.insert(con, articleRes);
				}
			}
			if (orgs != null && orgs.length > 0) {
				for (String org : orgs) {
					ArticleOrg articleOrg = new ArticleOrg();
					articleOrg.setArticleId(article.getArticleId());
					articleOrg.setOrgId(org);
					this.articleOrgDao.insert(con, articleOrg);
				}
			}
			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) 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);
			if(professors != null){
			this.keyWordService.refreshArticle(con, articleId, null);
			if (professors != null) {
				for (String professor : professors) {
					ArticlePro articlePro = new ArticlePro();
					articlePro.setArticleId(articleId);
@@ -390,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);
@@ -398,17 +441,27 @@ public class ArticleService {
					this.articleResDao.insert(con, articleRes);
				}
			}
			if (orgs != null && orgs.length > 0) {
				for (String org : orgs) {
					ArticleOrg articleOrg = new ArticleOrg();
					articleOrg.setArticleId(articleId);
					articleOrg.setOrgId(org);
					this.articleOrgDao.insert(con, articleOrg);
				}
			}
			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");
			this.keyWordService.refreshArticle(con, article.getArticleId(), null);
			this.articleProDao.delete(con, article.getArticleId());
			this.articleResDao.delete(con, article.getArticleId());
			if(professors != null){
			this.articleOrgDao.delete(con, article.getArticleId());
			if (professors != null) {
				for (String professor : professors) {
					ArticlePro articlePro = new ArticlePro();
					articlePro.setArticleId(article.getArticleId());
@@ -416,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());
@@ -424,38 +477,46 @@ public class ArticleService {
					this.articleResDao.insert(con, articleRes);
				}
			}
			if (orgs != null && orgs.length > 0) {
				for (String org : orgs) {
					ArticleOrg articleOrg = new ArticleOrg();
					articleOrg.setArticleId(article.getArticleId());
					articleOrg.setOrgId(org);
					this.articleOrgDao.insert(con, articleOrg);
				}
			}
			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) 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);
@@ -463,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);
@@ -471,18 +532,28 @@ public class ArticleService {
					this.articleResDao.insert(con, articleRes);
				}
			}
			if (orgs != null && orgs.length > 0) {
				for (String org : orgs) {
					ArticleOrg articleOrg = new ArticleOrg();
					articleOrg.setArticleId(articleId);
					articleOrg.setOrgId(org);
					this.articleOrgDao.insert(con, articleOrg);
				}
			}
			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.articleResDao.delete(con, article.getArticleId());
			this.articleProDao.delete(con, article.getArticleId());
			this.articleResDao.delete(con, article.getArticleId());
			if(professors != null){
			this.articleOrgDao.delete(con, article.getArticleId());
			if (professors != null) {
				for (String professor : professors) {
					ArticlePro articlePro = new ArticlePro();
					articlePro.setArticleId(article.getArticleId());
@@ -490,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());
@@ -498,172 +569,188 @@ public class ArticleService {
					this.articleResDao.insert(con, articleRes);
				}
			}
			if (orgs != null && orgs.length > 0) {
				for (String org : orgs) {
					ArticleOrg articleOrg = new ArticleOrg();
					articleOrg.setArticleId(article.getArticleId());
					articleOrg.setOrgId(org);
					this.articleOrgDao.insert(con, articleOrg);
				}
			}
			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);
	}
	
	@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()));
		}
	}
	
	@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);
	}
	
	@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);
@@ -672,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());
					}
				}
@@ -718,48 +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 {
		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("10") int rows)throws SQLException{
		List<Article> articles = new ArrayList<Article>();
		if(keys != null){
			articles = this.articleDao.queryLimit(con, keys, articleId, rows);
	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(articles.isEmpty()){
			articles = this.articleDao.queryByAuthor(con, professorId, orgId, articleId, rows);
			if(articles.isEmpty()){
				articles = this.articleDao.queryByPageViews(con, articleId, rows);
			}
		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 articles;
		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);
		this.articleAgreeDao.delete(con, articleId);
		this.watchDao.deleteWatch(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/KeyWordService.java

@@ -0,0 +1,198 @@
package com.ekexiu.portal.service;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.ArrayList;
import org.jfw.apt.annotation.Autowrie;
import org.jfw.apt.annotation.Bean;
import com.ekexiu.portal.dao.ArtKeyWordDao;
import com.ekexiu.portal.dao.OrgKeyWordDao;
import com.ekexiu.portal.dao.PapKeyWordDao;
import com.ekexiu.portal.dao.PatKeyWordDao;
import com.ekexiu.portal.dao.ProKeyWordDao;
import com.ekexiu.portal.dao.ResKeyWordDao;
import com.ekexiu.portal.po.ArtKeyWord;
import com.ekexiu.portal.po.OrgKeyWord;
import com.ekexiu.portal.po.PapKeyWord;
import com.ekexiu.portal.po.PatKeyWord;
import com.ekexiu.portal.po.ProKeyWord;
import com.ekexiu.portal.po.ResKeyWord;
@Bean
public class KeyWordService {
	@Autowrie
	private ProKeyWordDao proKeyWordDao;
	@Autowrie
	private OrgKeyWordDao orgKeyWordDao;
	@Autowrie
	private ResKeyWordDao resKeyWordDao;
	@Autowrie
	private ArtKeyWordDao artKeyWordDao;
	@Autowrie
	private PatKeyWordDao patKeyWordDao;
	@Autowrie
	private PapKeyWordDao papKeyWordDao;
	public ProKeyWordDao getProKeyWordDao() {
		return proKeyWordDao;
	}
	public void setProKeyWordDao(ProKeyWordDao proKeyWordDao) {
		this.proKeyWordDao = proKeyWordDao;
	}
	public OrgKeyWordDao getOrgKeyWordDao() {
		return orgKeyWordDao;
	}
	public void setOrgKeyWordDao(OrgKeyWordDao orgKeyWordDao) {
		this.orgKeyWordDao = orgKeyWordDao;
	}
	public ResKeyWordDao getResKeyWordDao() {
		return resKeyWordDao;
	}
	public void setResKeyWordDao(ResKeyWordDao resKeyWordDao) {
		this.resKeyWordDao = resKeyWordDao;
	}
	public ArtKeyWordDao getArtKeyWordDao() {
		return artKeyWordDao;
	}
	public void setArtKeyWordDao(ArtKeyWordDao artKeyWordDao) {
		this.artKeyWordDao = artKeyWordDao;
	}
	public PatKeyWordDao getPatKeyWordDao() {
		return patKeyWordDao;
	}
	public void setPatKeyWordDao(PatKeyWordDao patKeyWordDao) {
		this.patKeyWordDao = patKeyWordDao;
	}
	public PapKeyWordDao getPapKeyWordDao() {
		return papKeyWordDao;
	}
	public void setPapKeyWordDao(PapKeyWordDao papKeyWordDao) {
		this.papKeyWordDao = papKeyWordDao;
	}
	public void refreshProfessor(Connection con, String id, String[] kws) throws SQLException {
		proKeyWordDao.delete(con, id);
		if (kws != null && kws.length > 0) {
			ProKeyWord[] okws = new ProKeyWord[kws.length];
			for (int i = 0; i < kws.length; ++i) {
				ProKeyWord okw = new ProKeyWord();
				okw.setId(id);
				okw.setKw(kws[i]);
				okws[i] = okw;
			}
			proKeyWordDao.insert(con, okws);
		}
	}
	public void refreshOrg(Connection con, String id, String[] kws) throws SQLException {
		orgKeyWordDao.delete(con, id);
		if (kws != null && kws.length > 0) {
			OrgKeyWord[] okws = new OrgKeyWord[kws.length];
			for (int i = 0; i < kws.length; ++i) {
				OrgKeyWord okw = new OrgKeyWord();
				okw.setId(id);
				okw.setKw(kws[i]);
				okws[i] = okw;
			}
			orgKeyWordDao.insert(con, okws);
		}
	}
	public void refreshArticle(Connection con, String id, String[] kws) throws SQLException {
		artKeyWordDao.delete(con, id);
		if (kws != null && kws.length > 0) {
			ArtKeyWord[] okws = new ArtKeyWord[kws.length];
			for (int i = 0; i < kws.length; ++i) {
				ArtKeyWord okw = new ArtKeyWord();
				okw.setId(id);
				okw.setKw(kws[i]);
				okws[i] = okw;
			}
			artKeyWordDao.insert(con, okws);
		}
	}
	public void refreshResource(Connection con, String id, String[] kws) throws SQLException {
		resKeyWordDao.delete(con, id);
		if (kws != null && kws.length > 0) {
			ResKeyWord[] okws = new ResKeyWord[kws.length];
			for (int i = 0; i < kws.length; ++i) {
				ResKeyWord okw = new ResKeyWord();
				okw.setId(id);
				okw.setKw(kws[i]);
				okws[i] = okw;
			}
			resKeyWordDao.insert(con, okws);
		}
	}
	public void refreshPaper(Connection con, String id, String[] kws) throws SQLException {
		papKeyWordDao.delete(con, id);
		if (kws != null && kws.length > 0) {
			PapKeyWord[] okws = new PapKeyWord[kws.length];
			for (int i = 0; i < kws.length; ++i) {
				PapKeyWord okw = new PapKeyWord();
				okw.setId(id);
				okw.setKw(kws[i]);
				okws[i] = okw;
			}
			papKeyWordDao.insert(con, okws);
		}
	}
	public void refreshPatent(Connection con, String id, String[] kws) throws SQLException {
		patKeyWordDao.delete(con, id);
		if (kws != null && kws.length > 0) {
			PatKeyWord[] okws = new PatKeyWord[kws.length];
			for (int i = 0; i < kws.length; ++i) {
				PatKeyWord okw = new PatKeyWord();
				okw.setId(id);
				okw.setKw(kws[i]);
				okws[i] = okw;
			}
			patKeyWordDao.insert(con, okws);
		}
	}
	public static String[] splitKeyWord(String kws) {
		if (kws == null || kws.trim().length() == 0)
			return null;
		kws = kws.trim();
		ArrayList<String> result = new ArrayList<String>();
		char[] cs = kws.toCharArray();
		int mi = cs.length;
		if (mi > 0) {
			int begin = 0;
			for (int i = 0; i < mi; ++i) {
				char c = cs[i];
				if (c == ',') {
					if (i != begin) {
						String kw = new String(cs, begin, i - begin);
						if (!result.contains(kw)) {
							result.add(new String(cs, begin, i - begin));
						}
					}
					begin = i + 1;
				}
			}
			if (begin != mi)
				result.add(new String(cs, begin, mi - begin));
		}
		return result.isEmpty() ? null : result.toArray(new String[result.size()]);
	}
}

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")
@@ -39,8 +41,18 @@ public class OrgService {
	@Autowrie
	private OrgRegInfoDao orgRegInfoDao;
	
	@Autowrie
	private KeyWordService keyWordService;
	
	
	public KeyWordService getKeyWordService() {
		return keyWordService;
	}
	public void setKeyWordService(KeyWordService keyWordService) {
		this.keyWordService = keyWordService;
	}
	public OrgRegInfoDao getOrgRegInfoDao() {
		return orgRegInfoDao;
	}
@@ -88,6 +100,18 @@ public class OrgService {
		organization.setId(StringUtil.buildUUID());
		if(organization.getOrgType()== null) organization.setOrgType(this.defaultOrgType);
		this.orgDao.insert(con, organization);
		Organization no = this.orgDao.query(con, organization.getId());
		if(no!=null && no.getIsJoin().equals("1")){
			String s = no.getSubject();
			String in = no.getIndustry();
			String kw = s==null?"":s.trim();
			kw = kw + (in==null?"":(","+in.trim()));
			
			this.keyWordService.refreshOrg(con,organization.getId(),KeyWordService.splitKeyWord(kw));
		}else{
			this.keyWordService.refreshOrg(con,organization.getId(),null);
		}
		
	}
	
	
@@ -98,6 +122,17 @@ public class OrgService {
			this.imageService.saveOrgLogo(organization.getId(), fn);
		}
		this.orgDao.update(con, organization);
		Organization no = this.orgDao.query(con, organization.getId());
		if(no!=null && no.getIsJoin().equals("1")){
			String s = no.getSubject();
			String in = no.getIndustry();
			String kw = s==null?"":s.trim();
			kw = kw + (in==null?"":(","+in.trim()));
			
			this.keyWordService.refreshOrg(con,organization.getId(),KeyWordService.splitKeyWord(kw));
		}else{
			this.keyWordService.refreshOrg(con,organization.getId(),null);
		}
	}
	
	@Get
@@ -186,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()));
		}
@@ -203,4 +253,28 @@ public class OrgService {
		}
		return ret;
	}
	
	@Get
	@Path("/qr")
	public List<EditOrganization> relateQuery(@JdbcConn Connection con,@Nullable String kw,@DefaultValue("3") int limit) throws SQLException{
		List<EditOrganization> ret = this.orgDao.relateQuery(con, kw==null?"%":("%"+kw+"%"), limit);
		for (EditOrganization organization :ret) {
			organization.setHasOrgLogo(this.imageService.hasOrgLogo(organization.getId()));
		}
		return ret;
	}
	
	@Get
	@Path("/ralateOrgs")
	public List<EditOrganization> ralateArticles(@JdbcConn Connection con,String orgId,@DefaultValue("5") 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;
@@ -13,10 +14,13 @@ 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.PaperAgreeDao;
import com.ekexiu.portal.dao.PaperAuthorDao;
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")
@@ -26,6 +30,31 @@ public class PpaperService {
	private PpaperDao ppaperDao;
	@Autowrie
	private PaperAuthorDao paperAuthorDao;
	
	@Autowrie
	private KeyWordService keyWordService;
	
	@Autowrie
	private PaperAgreeDao paperAgreeDao;
	
	
	
	public PaperAgreeDao getPaperAgreeDao() {
		return paperAgreeDao;
	}
	public void setPaperAgreeDao(PaperAgreeDao paperAgreeDao) {
		this.paperAgreeDao = paperAgreeDao;
	}
	public KeyWordService getKeyWordService() {
		return keyWordService;
	}
	public void setKeyWordService(KeyWordService keyWordService) {
		this.keyWordService = keyWordService;
	}
	public PpaperDao getPpaperDao() {
		return ppaperDao;
@@ -136,6 +165,7 @@ public class PpaperService {
	@Path("/kw")
	public void update(@JdbcConn(true) Connection con, String id, @Nullable String keywords) throws SQLException {
		this.ppaperDao.update(con, id, keywords);
		this.keyWordService.refreshPaper(con, id, KeyWordService.splitKeyWord(keywords));		
	}
	@Get
@@ -143,4 +173,49 @@ 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("5") 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();
	}
	
	
	@Post
	@Path("/agree")
	public void agree(@JdbcConn(true) Connection con,String id,String uid)throws SQLException{
		PaperAgree pa = new PaperAgree();
		pa.setOpId(uid);
		pa.setPaperId(id);
		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);
//	}
	
	@Get
	@Path("/agree")
	public boolean hasAgree(@JdbcConn(false) Connection con,String id,String uid)throws SQLException{
		return null!= this.paperAgreeDao.query(con,uid, id);
	}
	@Get
	@Path("/agreeCount")
	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

@@ -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;
@@ -13,8 +14,12 @@ 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;
import com.ekexiu.portal.pojo.AssedPatent;
@@ -27,7 +32,29 @@ public class PpatentServcie {
	@Autowrie
	private PatentAuthorDao patentAuthorDao;
	
	@Autowrie
	private KeyWordService keyWordService;
	
	@Autowrie
	private PatentAgreeDao patentAgreeDao;
	
	
	public PatentAgreeDao getPatentAgreeDao() {
		return patentAgreeDao;
	}
	public void setPatentAgreeDao(PatentAgreeDao patentAgreeDao) {
		this.patentAgreeDao = patentAgreeDao;
	}
	public KeyWordService getKeyWordService() {
		return keyWordService;
	}
	public void setKeyWordService(KeyWordService keyWordService) {
		this.keyWordService = keyWordService;
	}
	
	public PpatentDao getPpatentDao() {
		return ppatentDao;
@@ -134,10 +161,56 @@ public class PpatentServcie {
	@Path("/kw")
	public void update(@JdbcConn(true) Connection con,String id,@Nullable String keywords)throws SQLException{
		this.ppatentDao.update(con, id, keywords);
		this.keyWordService.refreshPatent(con, id, KeyWordService.splitKeyWord(keywords));		
	}
	@Get
	@Path("/byShareId")
	public Ppatent query(@JdbcConn Connection con,long id)throws SQLException{
		return this.ppatentDao.query(con,id);
	}
	@Get
	@Path("/ralatePatents")
	public List<Ppatent> ralatePatents(@JdbcConn Connection con,String patentId,@DefaultValue("5") 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();
	}
	
	@Post
	@Path("/agree")
	public void agree(@JdbcConn(true) Connection con,String id,String uid)throws SQLException{
		PatentAgree pa = new PatentAgree();
		pa.setOpId(uid);
		pa.setPatentId(id);
		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);
//	}
	
	@Get
	@Path("/agree")
	public boolean hasAgree(@JdbcConn(false) Connection con,String id,String uid)throws SQLException{
		return null!= this.patentAgreeDao.query(con,uid, id);
	}
	@Get
	@Path("/agreeCount")
	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,9 +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;
@@ -21,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;
@@ -92,6 +99,17 @@ public class ProfessorService {
	@Autowrie
	private OrgResStaffDao orgResStaffDao;
	@Autowrie
	private KeyWordService keyWordService;
	public KeyWordService getKeyWordService() {
		return keyWordService;
	}
	public void setKeyWordService(KeyWordService keyWordService) {
		this.keyWordService = keyWordService;
	}
	public GrowthLogService getGrowthLogService() {
		return growthLogService;
	}
@@ -243,7 +261,6 @@ public class ProfessorService {
	public void setOrgDao(OrgDao orgDao) {
		this.orgDao = orgDao;
	}
	
	public ImageDao getImageDao() {
		return imageDao;
@@ -263,37 +280,36 @@ public class ProfessorService {
	@Post
	@Path
	public String insert(@JdbcConn(true) Connection con, Professor professor, @Nullable String orgName)
			throws SQLException, IOException {
		if(professor.getId() == null ) {
	public String insert(@JdbcConn(true) Connection con, Professor professor, @Nullable String orgName) throws SQLException, IOException {
		if (professor.getId() == null) {
			professor.setId(StringUtil.buildUUID());
		}
		if (professor.getOrgId() == null && orgName != null) {
			if(null != this.orgDao.queryByName(con, orgName)){
			if (null != this.orgDao.queryByName(con, orgName)) {
				professor.setOrgId(this.orgDao.queryByName(con, orgName));
			} else {
				professor.setOrgId(this.orgService.createOrganization(con, orgName));
			}
		}
		if(professor.getOrgAuth() == null){
		if (professor.getOrgAuth() == null) {
			professor.setOrgAuth("0");
		}
		User user = this.userDao.query(con, professor.getId());
		if(user != null){
		if (user != null) {
			int value = 0;
			if(user.getMobilePhone() != null && user.getMobilePhone().trim().length() == 11){
			if (user.getMobilePhone() != null && user.getMobilePhone().trim().length() == 11) {
				professor.setPhone(user.getMobilePhone());
				value = value + this.rule.getBindMobile();
				this.growthLogService.firstBindMobile(con, professor.getId());
			}
			if(user.getEmail() != null && !"".equals(user.getEmail())){
			if (user.getEmail() != null && !"".equals(user.getEmail())) {
				professor.setEmail(user.getEmail());
				value = value + this.rule.getBindEmail();
				this.growthLogService.firstBindEmail(con, professor.getId());
			}
			professor.setScoreValue(value);
			professor.setGrowthValue(value);
		}else{
		} else {
			professor.setScoreValue(0);
			professor.setGrowthValue(0);
		}
@@ -304,30 +320,30 @@ public class ProfessorService {
	@Put
	@Path
	public void update(@JdbcConn(true) Connection con, @RequestBody EditProfessor professor) throws SQLException, IOException {
		if(professor.getOrgName()!=null)
			if(null != this.orgDao.queryByName(con, professor.getOrgName())){
		if (professor.getOrgName() != null)
			if (null != this.orgDao.queryByName(con, professor.getOrgName())) {
				professor.setOrgId(this.orgDao.queryByName(con, professor.getOrgName()));
			} else {
				professor.setOrgId(this.orgService.createOrganization(con, professor.getOrgName()));
			}
		this.professorDao.update(con, professor);
	}
	
	@Post
	@Path("/updatePro")
	public void updatePro(@JdbcConn(true) Connection con,EditProfessor professor)throws SQLException, IOException{
		if(professor.getOrgName()!=null)
			if(null != this.orgDao.queryByName(con, professor.getOrgName())){
	public void updatePro(@JdbcConn(true) Connection con, EditProfessor professor) throws SQLException, IOException {
		if (professor.getOrgName() != null)
			if (null != this.orgDao.queryByName(con, professor.getOrgName())) {
				professor.setOrgId(this.orgDao.queryByName(con, professor.getOrgName()));
			} else {
				professor.setOrgId(this.orgService.createOrganization(con, professor.getOrgName()));
			}
		this.professorDao.update(con, professor);
	}
	
	@Get
	@Path("/queryInvite")
	public List<EditProfessor> queryInvite(@JdbcConn Connection con, String id) throws SQLException{
	public List<EditProfessor> queryInvite(@JdbcConn Connection con, String id) throws SQLException {
		List<EditProfessor> professors = this.professorDao.queryInvite(con, id);
		for (EditProfessor professor : professors) {
			professor.setHasHeadImage(this.imageService.hasProfessorImage(professor.getId()));
@@ -336,27 +352,27 @@ public class ProfessorService {
		}
		return professors;
	}
	
	@Get
	@Path("/auth")
	public Professor queryAuth(@JdbcConn Connection con, String id) throws SQLException{
	public Professor queryAuth(@JdbcConn Connection con, String id) throws SQLException {
		return this.professorDao.queryAuth(con, id);
	}
	
	@Get
	@Path("/baseInfo/{id}")
	public EditProfessor queryBaseInfo(@JdbcConn Connection con, @PathVar String id) throws SQLException {
		EditProfessor professor = this.professorDao.queryBaseInfo(con, id);
		if(null != professor){
		if (null != professor) {
			professor.setHasHeadImage(this.imageService.hasProfessorImage(id));
		}
		return professor;
	}
	
	@Get
	@Path("/qaByName")
	public List<EditProfessor> queryByName(@JdbcConn Connection con,@Nullable String name,@DefaultValue("3") int total)throws SQLException {
		if(name != null){
	public List<EditProfessor> queryByName(@JdbcConn Connection con, @Nullable String name, @DefaultValue("3") int total) throws SQLException {
		if (name != null) {
			name = "%" + name + "%";
		}
		List<EditProfessor> professors = this.professorDao.queryByName(con, name, total);
@@ -365,35 +381,36 @@ public class ProfessorService {
		}
		return professors;
	}
	
	@Get
	@Path("/editBaseInfo/{id}")
	public EditProfessor queryEditBaseInfo(@JdbcConn Connection con, @PathVar String id) throws SQLException {
		EditProfessor professor = this.professorDao.queryEditBaseInfo(con, id);
		if(null != professor){
		if (null != professor) {
			professor.setHasHeadImage(this.imageService.hasProfessorImage(id));
		}
		return professor;
	}
	
	@Get
	@Path("/{id}")
	public Professor query(@JdbcConn Connection con, @PathVar String id) throws SQLException {
		return this.professorDao.query(con, id);
	}
	@Get
	@Path("/qa")
	public List<Professor> queryAll(@JdbcConn Connection con) throws SQLException {
		return this.professorDao.query(con);
	}
	
	@Get
	@Path("/pqOrgAuth")
	public PageQueryResult<EditProfessor> queryPageOrgAuth(@JdbcConn Connection con,String orgId,@Nullable String orgAuth,
			@DefaultValue("10") int pageSize,@DefaultValue("1") int pageNo)throws SQLException{
	public PageQueryResult<EditProfessor> queryPageOrgAuth(@JdbcConn Connection con, String orgId, @Nullable String orgAuth, @DefaultValue("10") int pageSize,
			@DefaultValue("1") int pageNo) throws SQLException {
		PageQueryResult<EditProfessor> queryResult = this.professorDao.queryPage(con, orgId, orgAuth, pageSize, pageNo);
		List<EditProfessor> professors = queryResult.getData();
		if(!professors.isEmpty()){
		if (!professors.isEmpty()) {
			for (EditProfessor professor : professors) {
				professor.setHasHeadImage(this.imageService.hasProfessorImage(professor.getId()));
				professor.setResearchAreas(this.researchAreaDao.query(con, professor.getId()));
@@ -402,10 +419,10 @@ public class ProfessorService {
		}
		return queryResult;
	}
	
	@Get
	@Path("/qaOrgAuth")
	public List<EditProfessor> queryOrgAuth(@JdbcConn Connection con,String orgId,@Nullable String orgAuth)throws SQLException{
	public List<EditProfessor> queryOrgAuth(@JdbcConn Connection con, String orgId, @Nullable String orgAuth) throws SQLException {
		List<EditProfessor> professors = this.professorDao.queryByOrg(con, orgId, orgAuth);
		for (EditProfessor professor : professors) {
			professor.setHasHeadImage(this.imageService.hasProfessorImage(professor.getId()));
@@ -413,7 +430,7 @@ public class ProfessorService {
		}
		return professors;
	}
	
	public void updateStarAvg(Connection con) throws SQLException {
		try {
			List<Professor> professors = this.professorDao.queryStar(con);
@@ -432,7 +449,7 @@ public class ProfessorService {
			e.printStackTrace();
		}
	}
	
	public void updateScorePercent(Connection con) throws SQLException {
		List<Professor> professors = this.professorDao.queryList(con);
		int count = this.professorDao.queryCount(con);
@@ -440,8 +457,8 @@ public class ProfessorService {
			for (Professor professor : professors) {
				int lessThan = this.professorDao.queryCountLessThan(con, professor.getScoreValue());
				double value = 0;
				if(count != 0){
					value = (double)lessThan/(double)count;
				if (count != 0) {
					value = (double) lessThan / (double) count;
				}
				DecimalFormat df = new DecimalFormat("#%");
				this.professorDao.updateScorePercent(con, professor.getId(), df.format(value));
@@ -451,13 +468,14 @@ public class ProfessorService {
			e.printStackTrace();
		}
	}
	
	@Get
	@Path("/pqHot")
	public PageQueryResult<EditProfessor> queryHot(@JdbcConn Connection con,@DefaultValue("8") int pageSize,@DefaultValue("1") int pageNo) throws SQLException {
	public PageQueryResult<EditProfessor> queryHot(@JdbcConn Connection con, @DefaultValue("8") int pageSize, @DefaultValue("1") int pageNo)
			throws SQLException {
		PageQueryResult<EditProfessor> queryResult = this.professorDao.queryHot(con, pageSize, pageNo);
		List<EditProfessor> professors = queryResult.getData();
		if(!professors.isEmpty()){
		if (!professors.isEmpty()) {
			for (EditProfessor editProfessor : professors) {
				editProfessor.setHasHeadImage(this.imageService.hasProfessorImage(editProfessor.getId()));
				editProfessor.setResearchAreas(this.researchAreaDao.query(con, editProfessor.getId()));
@@ -466,21 +484,30 @@ public class ProfessorService {
		}
		return queryResult;
	}
	
	@Get
	@Path("/pqAPP")
	public PageQueryResult<EditProfessor> queryAPP(@JdbcConn Connection con, @Nullable String key,
			@Nullable String subject,@Nullable String industry,@Nullable String province,
			@Nullable String address, @DefaultValue("1") Integer authType, 
			@DefaultValue("10") int pageSize,@DefaultValue("1") int pageNo) throws SQLException{
		if(key!=null) {key="%"+key+"%";}
		if(subject!=null) {subject ="%"+subject+"%";}
		if(null!=industry) {industry="%"+industry+"%";}
		if(null!=province) {province="%"+province+"%";}
		if(null!=address) {address="%"+address+"%";}
		PageQueryResult<EditProfessor> queryResult = this.professorDao.queryAPP(con,key,subject,industry,province,address,authType,pageSize,pageNo);
	public PageQueryResult<EditProfessor> queryAPP(@JdbcConn Connection con, @Nullable String key, @Nullable String subject, @Nullable String industry,
			@Nullable String province, @Nullable String address, @DefaultValue("1") Integer authType, @DefaultValue("10") int pageSize,
			@DefaultValue("1") int pageNo) throws SQLException {
		if (key != null) {
			key = "%" + key + "%";
		}
		if (subject != null) {
			subject = "%" + subject + "%";
		}
		if (null != industry) {
			industry = "%" + industry + "%";
		}
		if (null != province) {
			province = "%" + province + "%";
		}
		if (null != address) {
			address = "%" + address + "%";
		}
		PageQueryResult<EditProfessor> queryResult = this.professorDao.queryAPP(con, key, subject, industry, province, address, authType, pageSize, pageNo);
		List<EditProfessor> editProfessors = queryResult.getData();
		if(!editProfessors.isEmpty()) {
		if (!editProfessors.isEmpty()) {
			for (EditProfessor editProfessor : editProfessors) {
				editProfessor.setHasHeadImage(this.imageService.hasProfessorImage(editProfessor.getId()));
				editProfessor.setResearchAreas(this.researchAreaDao.query(con, editProfessor.getId()));
@@ -490,82 +517,97 @@ public class ProfessorService {
		}
		return queryResult;
	}
	
	@Post
	@Path("/sortFirst")
	public void updateSortFirst(@JdbcConn(true) Connection con, String id, Integer sortFirst) throws SQLException{
	public void updateSortFirst(@JdbcConn(true) Connection con, String id, Integer sortFirst) throws SQLException {
		this.professorDao.updateSortFirst(con, id, sortFirst);
	}
	
	@Post
	@Path("/authentication")
	public void updateAuthentication(@JdbcConn(true) Connection con, String id, Integer authentication, 
			Integer authType, Integer authStatus) throws SQLException{
	public void updateAuthentication(@JdbcConn(true) Connection con, String id, Integer authentication, Integer authType, Integer authStatus)
			throws SQLException {
		this.professorDao.updateAuthentication(con, id, authentication, authType, authStatus);
	}
	
	@Post
	@Path("/authType")
	public void updateAuthType(@JdbcConn(true) Connection con,String id,Integer authType)throws SQLException{
	public void updateAuthType(@JdbcConn(true) Connection con, String id, Integer authType) throws SQLException {
		this.professorDao.updateAuthType(con, id, authType);
	}
	
	@Post
	@Path("/authen")
	public void updateAuthen(@JdbcConn(true) Connection con,String id,Integer authentication)throws SQLException{
	public void updateAuthen(@JdbcConn(true) Connection con, String id, Integer authentication) throws SQLException {
		this.professorDao.updateAuthentication(con, id, authentication);
	}
	
	@Post
	@Path("/authStatus")
	public void updateAuthStatus(@JdbcConn(true) Connection con, String id, Integer authStatus) throws SQLException{
	public void updateAuthStatus(@JdbcConn(true) Connection con, String id, Integer authStatus) throws SQLException {
		this.professorDao.updateAuthStatus(con, id, authStatus);
	}
	
	@Post
	@Path("/passOrgAuth")
	public void passOrgAuth(@JdbcConn(true) Connection con,String id)throws SQLException{
	public void passOrgAuth(@JdbcConn(true) Connection con, String id) throws SQLException {
		this.professorDao.updateOrgAuth(con, id, "1");
		//通过企业认证给用户增加积分
		// 通过企业认证给用户增加积分
		this.growthLogService.authOrg(con, id);
	}
	
	@Post
	@Path("/removeOrgAuth")
	public void removeOrgAuth(@JdbcConn(true) Connection con,String id)throws SQLException{
	public void removeOrgAuth(@JdbcConn(true) Connection con, String id) throws SQLException {
		this.professorDao.updateOrgAuth(con, id, "0");
	}
	
	@Post
	@Path("/starLevel")
	public void updateStarLevel(@JdbcConn(true) Connection con, String id, BigDecimal starLevel) throws SQLException{
	public void updateStarLevel(@JdbcConn(true) Connection con, String id, BigDecimal starLevel) throws SQLException {
		this.professorDao.updateStarLevel(con, id, starLevel);
	}
	
	@Post
	@Path("/subject")
	public void updateSubject(@JdbcConn(true) Connection con,String id,@Nullable String subject) throws SQLException{
	public void updateSubject(@JdbcConn(true) Connection con, String id, @Nullable String subject) throws SQLException {
		this.professorDao.updateSubject(con, id, subject);
		Professor p = this.professorDao.query(con, id);
		// String subject = p.getSubject();
		if (subject == null)
			subject = "";
		String industry = p.getIndustry();
		if (industry == null)
			industry = "";
		this.keyWordService.refreshProfessor(con, id, KeyWordService.splitKeyWord(subject + "," + industry));
	}
	
	@Post
	@Path("/industry")
	public void updateIndustry(@JdbcConn(true) Connection con,String id,@Nullable String industry) throws SQLException{
	public void updateIndustry(@JdbcConn(true) Connection con, String id, @Nullable String industry) throws SQLException {
		this.professorDao.updateIndustry(con, id, industry);
		Professor p = this.professorDao.query(con, id);
		String subject = p.getSubject();
		if (subject == null)
			subject = "";
		if (industry == null)
			industry = "";
		this.keyWordService.refreshProfessor(con, id, KeyWordService.splitKeyWord(subject + "," + industry));
	}
	@Post
	@Path("/address")
	public void updateAddress(@JdbcConn(true) Connection con, String id,
			@Nullable String province,@Nullable String address) throws SQLException{
	public void updateAddress(@JdbcConn(true) Connection con, String id, @Nullable String province, @Nullable String address) throws SQLException {
		this.professorDao.updateProvince(con, id, province);
		this.professorDao.updateAddress(con, id, address);
	}
	@Post
	@Path("/descp")
	public void updateDescp(@JdbcConn(true) Connection con,String id,@Nullable String descp) throws SQLException{
	public void updateDescp(@JdbcConn(true) Connection con, String id, @Nullable String descp) throws SQLException {
		this.professorDao.updateDescp(con, id, descp);
	}
	
	@Delete
	@Path("/{id}")
@@ -583,20 +625,29 @@ public class ProfessorService {
		this.watchDao.deleteWatch(con, id);
		this.resourceDao.deletePro(con, id);
		this.articleDao.deletePro(con, id);
		this.keyWordService.refreshProfessor(con, id, null);
	}
	
	@Get
	@Path("/pqBaseInfo")
	PageQueryResult<EditProfessor> queryEditBaseInfo(@JdbcConn(false) Connection con,@Nullable String key,
			@Nullable String subject,@Nullable String industry,@Nullable String address,@DefaultValue("1") Integer authType, 
			@DefaultValue("10") int pageSize,@DefaultValue("1") int pageNo)throws SQLException{
		if(key!=null) {key="%"+key+"%";}
		if(subject!=null) {subject ="%"+subject+"%";}
		if(null!=industry) {industry="%"+industry+"%";}
		if(null!=address) {address="%"+address+"%";}
	PageQueryResult<EditProfessor> queryEditBaseInfo(@JdbcConn(false) Connection con, @Nullable String key, @Nullable String subject, @Nullable String industry,
			@Nullable String address, @DefaultValue("1") Integer authType, @DefaultValue("10") int pageSize, @DefaultValue("1") int pageNo)
			throws SQLException {
		if (key != null) {
			key = "%" + key + "%";
		}
		if (subject != null) {
			subject = "%" + subject + "%";
		}
		if (null != industry) {
			industry = "%" + industry + "%";
		}
		if (null != address) {
			address = "%" + address + "%";
		}
		PageQueryResult<EditProfessor> queryResult = this.professorDao.queryEditBaseInfo(con, key, subject, industry, address, authType, pageSize, pageNo);
		List<EditProfessor> editProfessors = queryResult.getData();
		if(!editProfessors.isEmpty()){
		if (!editProfessors.isEmpty()) {
			for (EditProfessor editProfessor : editProfessors) {
				editProfessor.setHasHeadImage(this.imageService.hasProfessorImage(editProfessor.getId()));
				editProfessor.setResearchAreas(this.researchAreaDao.query(con, editProfessor.getId()));
@@ -605,39 +656,47 @@ public class ProfessorService {
		}
		return queryResult;
	}
	
	@Get
	@Path("/pqUserInfo")
	PageQueryResult<UserInfo> queryUserInfo(@JdbcConn(false) Connection con,@Nullable String key,
			@Nullable String address,@Nullable String orgName,@Nullable Integer activeState,@Nullable Integer authType, 
			@DefaultValue("20") int pageSize,@DefaultValue("1") int pageNo)throws SQLException{
		if(key!=null) {key="%"+key+"%";}
		if(null!=address) {address="%"+address+"%";}
		if(orgName!=null) {orgName ="%"+orgName+"%";}
	PageQueryResult<UserInfo> queryUserInfo(@JdbcConn(false) Connection con, @Nullable String key, @Nullable String address, @Nullable String orgName,
			@Nullable Integer activeState, @Nullable Integer authType, @DefaultValue("20") int pageSize, @DefaultValue("1") int pageNo) throws SQLException {
		if (key != null) {
			key = "%" + key + "%";
		}
		if (null != address) {
			address = "%" + address + "%";
		}
		if (orgName != null) {
			orgName = "%" + orgName + "%";
		}
		return this.professorDao.queryUserInfo(con, key, address, authType, orgName, activeState, pageSize, pageNo);
	}
	
	@Get
	@Path("/pq")
	PageQueryResult<Professor> query(@JdbcConn(false) Connection con,@Nullable String key,
			@Nullable String subject,@Nullable String industry,@Nullable String address, 
			@DefaultValue("10") int pageSize,@DefaultValue("1") int pageNo)throws SQLException{
	//	System.out.println("key==["+(key==null?"":key)+"]");
	//	System.out.println("subject==["+(subject==null?"":subject)+"]");
	//	System.out.println("industry==["+(industry==null?"":industry)+"]");
		if(key!=null) key="%"+key+"%";
		if(subject!=null) subject ="%"+subject+"%";
		if(null!=industry) industry="%"+industry+"%";
		if(null!=address) address="%"+address+"%";
	PageQueryResult<Professor> query(@JdbcConn(false) Connection con, @Nullable String key, @Nullable String subject, @Nullable String industry,
			@Nullable String address, @DefaultValue("10") int pageSize, @DefaultValue("1") int pageNo) throws SQLException {
		// System.out.println("key==["+(key==null?"":key)+"]");
		// System.out.println("subject==["+(subject==null?"":subject)+"]");
		// System.out.println("industry==["+(industry==null?"":industry)+"]");
		if (key != null)
			key = "%" + key + "%";
		if (subject != null)
			subject = "%" + subject + "%";
		if (null != industry)
			industry = "%" + industry + "%";
		if (null != address)
			address = "%" + address + "%";
		return this.professorDao.query(con, key, subject, industry, address, pageSize, pageNo);
	}
	
	@Get
	@Path("/info/{id}")
	public ProfessorInfo qinfo(@JdbcConn(false) Connection con,@PathVar String id) throws SQLException{
	public ProfessorInfo qinfo(@JdbcConn(false) Connection con, @PathVar String id) throws SQLException {
		ProfessorInfo info = this.professorDao.queryInfo(con, id);
		if(info!=null){
			if(info.getOrgId() != null){
		if (info != null) {
			if (info.getOrgId() != null) {
				info.setOrgName(this.orgDao.query(con, info.getOrgId()).getName());
			}
			info.setHasHeadImage(this.imageService.hasProfessorImage(id));
@@ -648,7 +707,7 @@ public class ProfessorService {
			info.setPatents(this.patentDao.query(con, id));
			info.setProjects(this.projectDao.query(con, id));
			List<EditResearchAreaLog> logs = this.researchAreaLogDao.query(con, id);
			if(!logs.isEmpty()){
			if (!logs.isEmpty()) {
				for (EditResearchAreaLog log : logs) {
					log.setHasHeadImage(this.imageService.hasProfessorImage(log.getOpreteProfessorId()));
				}
@@ -656,7 +715,7 @@ public class ProfessorService {
			info.setEditResearchAreaLogs(logs);
			info.setResearchAreas(this.researchAreaDao.query(con, id));
			List<Resource> resources = this.resourceDao.queryPro(con, id);
			if(!resources.isEmpty()){
			if (!resources.isEmpty()) {
				for (Resource resource : resources) {
					resource.setImages(this.imageDao.queryRes(con, resource.getResourceId()));
				}
@@ -664,29 +723,95 @@ public class ProfessorService {
			info.setResources(resources);
		}
		return info;
		
	}
	@Get
	@Path("/byShareId")
	public Professor query(@JdbcConn Connection con,long id)throws SQLException{
		return this.professorDao.query(con,id);
	public Professor query(@JdbcConn Connection con, long id) throws SQLException {
		return this.professorDao.query(con, id);
	}
	/**
	 * 增加用户浏览量
	 * @param con
	 * @param id
	 * @throws SQLException
	 */
	@Post
	@Path("/incPageViews")
	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("5") int rows)throws SQLException{
		String[] ids = this.professorDao.queryProfessorIdWithSameKeyWord(con, professorId, rows);
		if(ids!=null){
			 List<Professor> ret = this.professorDao.query(con,ids);
			 return ret;
		}
		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);
		}
	}
	
	public static void main(String[] args)throws Exception{
//		Connection con = DriverManager.getConnection("jdbc:postgresql://121.42.53.174:5432/ekexiu", "postgres",  "postgres");
//		try{
//		ProfessorService service = new ProfessorService();
//		ProfessorDao dao = new ProfessorDaoExtend();
//		service.setProfessorDao(dao);
//		PageQueryResult<Professor> result =service.query(con,"鏉?, "鏉愭枡", "閲戝睘", 10, 2);
//		System.out.println(result.getTotal());
//		for(Professor p:result.getData()){
//			System.out.println("======");
//			JsonService.toJson(p,System.out);
//		}
//		}finally{
//			con.close();
//		}
//	
//	
//	@Get
//	@Path("/articleRef")
	public static void main(String[] args) throws Exception {
		// Connection con =
		// DriverManager.getConnection("jdbc:postgresql://121.42.53.174:5432/ekexiu",
		// "postgres", "postgres");
		// try{
		// ProfessorService service = new ProfessorService();
		// ProfessorDao dao = new ProfessorDaoExtend();
		// service.setProfessorDao(dao);
		// PageQueryResult<Professor> result =service.query(con,"鏉?, "鏉愭枡",
		// "閲戝睘", 10, 2);
		// System.out.println(result.getTotal());
		// for(Professor p:result.getData()){
		// System.out.println("======");
		// JsonService.toJson(p,System.out);
		// }
		// }finally{
		// con.close();
		// }
		System.out.println(URLEncoder.encode("输出中文", "UTF-8"));
	}
}

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

@@ -4,7 +4,7 @@ import java.io.IOException;
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;
@@ -69,6 +69,20 @@ public class ResourceService {
	private OrgDao orgDao;
	@Autowrie
	private ResourceTmpLogDao resourceTmpLogDao;
	
	
	@Autowrie
	private KeyWordService keyWordService;
	
	
	public KeyWordService getKeyWordService() {
		return keyWordService;
	}
	public void setKeyWordService(KeyWordService keyWordService) {
		this.keyWordService = keyWordService;
	}
	public String getTimeFormat() {
		return timeFormat;
@@ -199,6 +213,7 @@ public class ResourceService {
		resource.setResourceId(resourceId);
		this.resourceDao.insert(con, resource);
		//this.growthLogService.addResource(con, resource.getProfessorId());
		this.keyWordService.refreshResource(con,resourceId, KeyWordService.splitKeyWord(resource.getSubject()));
		return resourceId;
	}
	
@@ -223,6 +238,7 @@ public class ResourceService {
			throw new JfwBaseException(-1, "bad parameter:ownerId");
		}
		this.resourceDao.insert(con, resource);
		this.keyWordService.refreshResource(con,resourceId,KeyWordService.splitKeyWord(resource.getSubject()));
		this.resourceTmpLogDao.insert(con, log);
		if(imgSrc != null){
			Image image = new Image();
@@ -260,6 +276,7 @@ public class ResourceService {
			resource.setPublishTime(this.publishTime());
			resource.setResourceType("1");
			this.resourceDao.insert(con, resource);
			this.keyWordService.refreshResource(con,resourceId,KeyWordService.splitKeyWord(resource.getSubject()));
			//this.growthLogService.addResource(con, resource.getProfessorId());
			return resourceId;
		}else if(resource.getResourceId().trim().length() == 32){
@@ -285,12 +302,23 @@ public class ResourceService {
			}
			this.resourceDao.update(con, resource);
			this.resourceDao.updatePublishTime(con, resource.getResourceId(), "1", this.publishTime());
			this.keyWordService.refreshResource(con,resource.getResourceId(),KeyWordService.splitKeyWord(resource.getSubject()));
			return resource.getResourceId();
		}else{
			throw new JfwBaseException(-1, "bad parameter:resourceId");
		}
	}
	
	/**
	 * 保存划稿
	 * @param con
	 * @param resource
	 * @param fns
	 * @param imageIds
	 * @return
	 * @throws SQLException
	 * @throws IOException
	 * @throws JfwBaseException
	 */
	@Post
	@Path("/draft")
	public String draft(@JdbcConn(true) Connection con, Resource resource, @Nullable String[] fns, @Nullable String[] imageIds) 
@@ -305,6 +333,7 @@ public class ResourceService {
			resource.setPageViews(0);
			resource.setResourceType("1");
			this.resourceDao.insert(con, resource);
			this.keyWordService.refreshResource(con,resourceId,null);
			return resourceId;
		}else if(resource.getResourceId().trim().length() == 32){
			int imageLength = 0;
@@ -329,6 +358,7 @@ public class ResourceService {
			}
			this.resourceDao.update(con, resource);
			this.resourceDao.updateStatus(con, resource.getResourceId(), "0");
			this.keyWordService.refreshResource(con,resource.getResourceId(),null);
			return resource.getResourceId();
		}else{
			throw new JfwBaseException(-1, "bad parameter:resourceId");
@@ -349,6 +379,7 @@ public class ResourceService {
			resource.setPageViews(0);
			resource.setResourceType("1");
			this.resourceDao.insert(con, resource);
			this.keyWordService.refreshResource(con,resourceId,null);
			return resourceId;
		}else if(resource.getResourceId().trim().length() == 32){
			int imageLength = 0;
@@ -373,6 +404,7 @@ public class ResourceService {
			}
			this.resourceDao.update(con, resource);
			this.resourceDao.updatePublishTime(con, resource.getResourceId(), "2", resource.getPublishTime());
			this.keyWordService.refreshResource(con,resource.getResourceId(),null);
			return resource.getResourceId();
		}else{
			throw new JfwBaseException(-1, "bad parameter:resourceId");
@@ -394,6 +426,7 @@ public class ResourceService {
			resource.setPublishTime(this.publishTime());
			resource.setResourceType("2");
			this.resourceDao.insert(con, resource);
			this.keyWordService.refreshResource(con,resourceId,KeyWordService.splitKeyWord(resource.getSubject()));
			if(professorIds != null){
				for (String professorId : professorIds) {
					OrgResStaff orgResStaff = new OrgResStaff();
@@ -426,6 +459,7 @@ public class ResourceService {
			}
			this.resourceDao.update(con, resource);
			this.resourceDao.updatePublishTime(con, resource.getResourceId(), "1", this.publishTime());
			this.keyWordService.refreshResource(con,resource.getResourceId(),null);
			this.orgResStaffDao.delete(con, resource.getResourceId());
			if(professorIds != null){
				for (String professorId : professorIds) {
@@ -455,6 +489,7 @@ public class ResourceService {
			resource.setPageViews(0);
			resource.setResourceType("2");
			this.resourceDao.insert(con, resource);
			this.keyWordService.refreshResource(con,resourceId,null);
			if(professorIds != null){
				for (String professorId : professorIds) {
					OrgResStaff orgResStaff = new OrgResStaff();
@@ -487,6 +522,7 @@ public class ResourceService {
			}
			this.resourceDao.update(con, resource);
			this.resourceDao.updateStatus(con, resource.getResourceId(), "0");
			this.keyWordService.refreshResource(con,resource.getResourceId(),null);
			this.orgResStaffDao.delete(con, resource.getResourceId());
			if(professorIds != null){
				for (String professorId : professorIds) {
@@ -507,6 +543,7 @@ public class ResourceService {
	public void deleteRes(@JdbcConn(true) Connection con, String resourceId) throws SQLException{
		//修改资源状态为删除
		this.resourceDao.updateStatus(con, resourceId, "3");
		this.keyWordService.refreshResource(con,resourceId,null);
	}
	
	@Post
@@ -519,6 +556,7 @@ public class ResourceService {
		}
		resource.setResourceId(resourceId);
		this.resourceDao.insert(con, resource);
		this.keyWordService.refreshResource(con,resourceId,KeyWordService.splitKeyWord(resource.getSubject()));
		//this.growthLogService.addResource(con, resource.getProfessorId());
		return resourceId;
	}
@@ -531,6 +569,7 @@ public class ResourceService {
			this.imagesService.insert(con, resource.getResourceId(), fn);
		}
		this.resourceDao.update(con, resource);
		this.keyWordService.refreshResource(con,resource.getResourceId(),KeyWordService.splitKeyWord(resource.getSubject()));
	}
	
	@Post
@@ -608,76 +647,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{
@@ -952,4 +991,18 @@ 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){
			List<Resource> ret = this.resourceDao.query(con,ids);
			for(Resource res:ret){
				res.setImages(this.imageDao.queryRes(con, res.getResourceId()));
			}
			return ret;
		}
		return Collections.<Resource>emptyList();
	}
}

src/main/resources/database.sql

@@ -1518,7 +1518,72 @@ ALTER TABLE  organization ADD COLUMN linkman text;
COMMENT ON COLUMN  organization.linkman IS '联系人';
--begin v1.9.1
ALTER TABLE professor ADD COLUMN page_views  int8 default 0 not null;
COMMENT ON COLUMN professor.page_views IS '浏览量';
CREATE TABLE art_key_word (id char(32) NOT NULL,kw text not null);
COMMENT ON TABLE art_key_word IS '文章关键字';
COMMENT ON COLUMN art_key_word.id IS '文章ID';
COMMENT ON COLUMN art_key_word.kw IS '关键字';
CREATE TABLE res_key_word (id char(32) NOT NULL,kw text not null);
COMMENT ON TABLE res_key_word IS '资源关键字';
COMMENT ON COLUMN res_key_word.id IS '资源ID';
COMMENT ON COLUMN res_key_word.kw IS '关键字';
CREATE TABLE pro_key_word (id char(32) NOT NULL,kw text not null);
COMMENT ON TABLE pro_key_word IS '用户关键字';
COMMENT ON COLUMN pro_key_word.id IS '用户ID';
COMMENT ON COLUMN pro_key_word.kw IS '关键字';
CREATE TABLE org_key_word (id char(32) NOT NULL,kw text not null);
COMMENT ON TABLE org_key_word IS '企业关键字';
COMMENT ON COLUMN org_key_word.id IS '企业ID';
COMMENT ON COLUMN org_key_word.kw IS '关键字';
CREATE TABLE pap_key_word (id char(32) NOT NULL,kw text not null);
COMMENT ON TABLE pap_key_word IS '论文关键字';
COMMENT ON COLUMN pap_key_word.id IS '论文ID';
COMMENT ON COLUMN pap_key_word.kw IS '关键字';
CREATE TABLE pat_key_word (id char(32) NOT NULL,kw text not null);
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';
CREATE TABLE paper_agree (
	op_id char(32) NOT NULL,
	paper_id char(32) NOT NULL,
	create_time char(14) NOT NULL
);
COMMENT ON TABLE paper_agree IS '论文点赞表';
COMMENT ON COLUMN paper_agree.op_id IS '点赞人的ID';
COMMENT ON COLUMN paper_agree.paper_id IS '被点赞的论文ID';
COMMENT ON COLUMN paper_agree.create_time IS '点赞时间';
CREATE TABLE patent_agree (
	op_id char(32) NOT NULL,
	patent_id char(32) NOT NULL,
	create_time char(14) NOT NULL
);
COMMENT ON TABLE patent_agree IS '专利点赞表';
COMMENT ON COLUMN patent_agree.op_id IS '点赞人的ID';
COMMENT ON COLUMN patent_agree.patent_id IS '被点赞的专利ID';
COMMENT ON COLUMN patent_agree.create_time IS '点赞时间';
ALTER TABLE patent_agree ADD PRIMARY KEY (op_id,patent_id);
ALTER TABLE paper_agree ADD PRIMARY KEY (op_id,paper_id);
ALTER TABLE organization ALTER COLUMN is_join SET DEFAULT '0';
UPDATE organization set is_join='0' WHERE is_join is null;
ALTER TABLE organization ALTER COLUMN is_join SET NOT NULL;

src/main/resources/project-test-dev.properties

@@ -149,7 +149,7 @@ com_ekexiu_portal_service_ArticleService.tmpPath::java.io.File=/kexiu/www/html1/
com_ekexiu_portal_service_ArticleService.articlePath::java.io.File=/kexiu/webdata1/data/article
com_ekexiu_portal_service_ArticleService.dateFormat::java.lang.String=yyyyMMdd
#科研文章图片尺寸
com_ekexiu_portal_service_ArticleService.artMaxLen::int=640
com_ekexiu_portal_service_ArticleService.artMaxLen::int=200
#资源分享图片尺寸
com_ekexiu_portal_service_ImagesService.resImageMaxLen::int=240
#认证图片保存目录

src/main/resources/project-test.properties

@@ -149,7 +149,7 @@ com_ekexiu_portal_service_ArticleService.tmpPath::java.io.File=/kexiu/www/html/i
com_ekexiu_portal_service_ArticleService.articlePath::java.io.File=/kexiu/webdata/data/article
com_ekexiu_portal_service_ArticleService.dateFormat::java.lang.String=yyyyMMdd
#科研文章图片尺寸
com_ekexiu_portal_service_ArticleService.artMaxLen::int=640
com_ekexiu_portal_service_ArticleService.artMaxLen::int=200
#资源分享图片尺寸
com_ekexiu_portal_service_ImagesService.resImageMaxLen::int=240
#认证图片保存目录

src/main/resources/project.properties

@@ -149,7 +149,7 @@ com_ekexiu_portal_service_ArticleService.tmpPath::java.io.File=/kexiu/www/html/i
com_ekexiu_portal_service_ArticleService.articlePath::java.io.File=/kexiu/webdata/data/article
com_ekexiu_portal_service_ArticleService.dateFormat::java.lang.String=yyyyMMdd
#科研文章图片尺寸
com_ekexiu_portal_service_ArticleService.artMaxLen::int=640
com_ekexiu_portal_service_ArticleService.artMaxLen::int=200
#资源分享图片尺寸
com_ekexiu_portal_service_ImagesService.resImageMaxLen::int=240
#认证图片保存目录